From: Mike Baker <mbm@openwrt.org>
Date: Wed, 10 May 2006 19:06:22 +0000 (+0000)
Subject: Convert packages to new template
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=07425d330063f606ad4c2f351d790389b65e6847;p=openwrt%2Fstaging%2Fnbd.git

Convert packages to new template

SVN-Revision: 3752
---

diff --git a/openwrt/package/bridge/Makefile b/openwrt/package/bridge/Makefile
index bd71165b6d..44856c9f16 100644
--- a/openwrt/package/bridge/Makefile
+++ b/openwrt/package/bridge/Makefile
@@ -30,10 +30,8 @@ $(call Build/Configure/Default,--with-linux-headers=$(LINUX_DIR))
 endef
 
 define Package/busybox/install
-	mkdir -p $(IDIR_BRIDGE)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/brctl/brctl $(IDIR_BRIDGE)/usr/sbin/
-	$(STRIP) $(IDIR_BRIDGE)/usr/sbin/brctl
-	$(IPKG_BUILD) $(IDIR_BRIDGE) $(PACKAGE_DIR)
+	install -m0755 -d $(IDIR_DNSMASQ)/usr/sbin
+	install -m0755 $(PKG_BUILD_DIR)/brctl/brctl $(IDIR_BRIDGE)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,bridge))
diff --git a/openwrt/package/busybox/Makefile b/openwrt/package/busybox/Makefile
index 3f061b82db..23dcc1cf8d 100644
--- a/openwrt/package/busybox/Makefile
+++ b/openwrt/package/busybox/Makefile
@@ -33,7 +33,6 @@ endef
 define Package/busybox/install
 	$(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(1)" \
 		EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR) install
-	$(STRIP) $(1)/bin/busybox
 endef
 
 $(eval $(call BuildPackage,busybox))
diff --git a/openwrt/package/dnsmasq/Makefile b/openwrt/package/dnsmasq/Makefile
index 19c6d35627..76b1ac0d99 100644
--- a/openwrt/package/dnsmasq/Makefile
+++ b/openwrt/package/dnsmasq/Makefile
@@ -25,13 +25,11 @@ URL:=http://www.thekelleys.org.uk/dnsmasq/
 endef
 
 define Package/dnsmasq/install
-	install -d -m0755 $(IDIR_DNSMASQ)/usr/sbin
-	install -d -m0755 $(IDIR_DNSMASQ)/etc/init.d/
+	install -m0755 -d $(IDIR_DNSMASQ)/usr/sbin
+	install -m0755 -d $(IDIR_DNSMASQ)/etc/init.d/
 	install -m0755 $(PKG_BUILD_DIR)/src/dnsmasq $(IDIR_DNSMASQ)/usr/sbin/
 	install -m0644 ./files/dnsmasq.conf $(IDIR_DNSMASQ)/etc/dnsmasq.conf
 	install -m0755 ./files/dnsmasq.init $(IDIR_DNSMASQ)/etc/init.d/S50dnsmasq
-	$(RSTRIP) $(IDIR_DNSMASQ)
-	$(IPKG_BUILD) $(IDIR_DNSMASQ) $(PACKAGE_DIR)
 endef
 
 $(eval $(call BuildPackage,dnsmasq))
diff --git a/openwrt/package/dropbear/Config.in b/openwrt/package/dropbear/Config.in
deleted file mode 100644
index efdc70b1a6..0000000000
--- a/openwrt/package/dropbear/Config.in
+++ /dev/null
@@ -1,14 +0,0 @@
-config BR2_PACKAGE_DROPBEAR
-	prompt "dropbear.......................... Small SSH 2 client/server"
-	tristate
-	default y
-	help
-	  A small SSH 2 server/client designed for small memory environments.
-	  
-	  http://matt.ucc.asn.au/dropbear/
-
-config BR2_PACKAGE_DBCONVERT
-	prompt   "dropbearconvert................. Utility for converting SSH keys"
-	tristate
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_DROPBEAR
diff --git a/openwrt/package/dropbear/Makefile b/openwrt/package/dropbear/Makefile
index 75eaf6e44c..ea452f2f62 100644
--- a/openwrt/package/dropbear/Makefile
+++ b/openwrt/package/dropbear/Makefile
@@ -5,20 +5,33 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=dropbear
 PKG_VERSION:=0.48.1
 PKG_RELEASE:=1
-PKG_MD5SUM:=ca8e53a766faec831882831364568421
 
-PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://matt.ucc.asn.au/dropbear/releases/
+PKG_MD5SUM:=ca8e53a766faec831882831364568421
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Package/dropbear
+SECTION:=base
+CATEGORY:=Base system
+DEFAULT:=y
+TITLE:=Small SSH 2 client/server
+DESCRIPTION:=A small SSH 2 server/client designed for small memory environments.
+URL:=http://matt.ucc.asn.au/dropbear/
+endef
 
-$(PKG_BUILD_DIR)/.configured:
+define Package/dropbearconvert
+$(call Package/dropbear)
+DEFAULT:=m
+TITLE:=Utility for converting SSH keys
+DESCRIPTION:=Utility for converting SSH keys
+DEPENDS:=zlib
+endef
+
+define Build/Configure
 	$(SED) 's,^/\* #define PKG_MULTI.*,#define PKG_MULTI,g' $(PKG_BUILD_DIR)/options.h
 	$(SED) 's,^#define DO_HOST_LOOKUP,/* & */,g' $(PKG_BUILD_DIR)/options.h
 	(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
@@ -61,9 +74,9 @@ $(PKG_BUILD_DIR)/.configured:
 		--disable-pututxline \
 		--disable-zlib \
 	);
-	touch $@
+endef
 
-$(PKG_BUILD_DIR)/.built:
+define Buid/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		LD=$(TARGET_CC) \
 		PROGRAMS="dropbear dbclient dropbearkey scp" \
@@ -71,24 +84,26 @@ $(PKG_BUILD_DIR)/.built:
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		LD=$(TARGET_CC) \
 		PROGRAMS="dropbearconvert"
-	touch $@
+endef
 	
-$(IPKG_DBCONVERT):
-	mkdir -p $(IDIR_DBCONVERT)/usr/bin
-	install -m 755 $(PKG_BUILD_DIR)/dropbearconvert \
-		$(IDIR_DBCONVERT)/usr/bin/dropbearconvert
-	$(IPKG_BUILD) $(IDIR_DBCONVERT) $(PACKAGE_DIR)
-
-$(IPKG_DROPBEAR):
+define Package/dropbear/install
 	mkdir -p $(IDIR_DROPBEAR)/usr/bin
 	mkdir -p $(IDIR_DROPBEAR)/usr/sbin
 	install -m 755 $(PKG_BUILD_DIR)/dropbearmulti \
 		$(IDIR_DROPBEAR)/usr/sbin/dropbear
-	$(STRIP) $(IDIR_DROPBEAR)/usr/sbin/dropbear
 	ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/scp
 	ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/ssh
 	ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dbclient
 	ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dropbearkey
 	mkdir -p $(IDIR_DROPBEAR)/etc/init.d
 	install -m 755 ./files/S50dropbear $(IDIR_DROPBEAR)/etc/init.d/
-	$(IPKG_BUILD) $(IDIR_DROPBEAR) $(PACKAGE_DIR)
+endef
+
+define Package/dropbearconvert/install
+	mkdir -p $(IDIR_DBCONVERT)/usr/bin
+	install -m 755 $(PKG_BUILD_DIR)/dropbearconvert \
+		$(IDIR_DBCONVERT)/usr/bin/dropbearconvert
+endef
+
+$(eval $(call BuildPackage,dropbear))
+$(eval $(call BuildPackage,dropbearconvert))
diff --git a/openwrt/package/dropbear/ipkg/dropbear.control b/openwrt/package/dropbear/ipkg/dropbear.control
deleted file mode 100644
index 0aa8cc5b82..0000000000
--- a/openwrt/package/dropbear/ipkg/dropbear.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: dropbear
-Priority: optional
-Section: net
-Description: a small SSH 2 server/client designed for small memory environments.
diff --git a/openwrt/package/dropbear/ipkg/dropbearconvert.control b/openwrt/package/dropbear/ipkg/dropbearconvert.control
deleted file mode 100644
index 9dd5ecd1aa..0000000000
--- a/openwrt/package/dropbear/ipkg/dropbearconvert.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: dropbearconvert
-Priority: optional
-Depends: zlib
-Section: net
-Description: Utility for converting SSH keys
diff --git a/openwrt/package/ebtables/Makefile b/openwrt/package/ebtables/Makefile
index 04adbf6e82..e672ac13c1 100644
--- a/openwrt/package/ebtables/Makefile
+++ b/openwrt/package/ebtables/Makefile
@@ -26,8 +26,6 @@ endef
 define Package/ebtables/install
 	install -d -m0755 $(IDIR_DNSMASQ)/usr/sbin
 	install -m0755 $(PKG_BUILD_DIR)/ebtables $(IDIR_EBTABLES)/usr/sbin/ebtables
-	$(RSTRIP) $(IDIR_EBTABLES)
-	$(IPKG_BUILD) $(IDIR_EBTABLES) $(PACKAGE_DIR)
 ended
 
 $(eval $(call BuildPackage,ebtables))
diff --git a/openwrt/package/haserl/Config.in b/openwrt/package/haserl/Config.in
deleted file mode 100644
index a766be73ff..0000000000
--- a/openwrt/package/haserl/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_HASERL
-	prompt "haserl............................ A CGI wrapper to embed shell scripts in HTML documents"
-	tristate
-	default m if CONFIG_DEVEL
-	help
-	  A CGI wrapper to embed shell scripts in HTML documents.
-	  
-	  http://haserl.sourceforge.net/
-
diff --git a/openwrt/package/haserl/Makefile b/openwrt/package/haserl/Makefile
index 05c6b47b1e..8f35fbf623 100644
--- a/openwrt/package/haserl/Makefile
+++ b/openwrt/package/haserl/Makefile
@@ -5,57 +5,26 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=haserl
 PKG_VERSION:=0.8.0
 PKG_RELEASE:=1
-PKG_MD5SUM:=bd9195d086566f56634c0bcbbbcbebea
 
-PKG_SOURCE_URL:=@SF/haserl
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/haserl
+PKG_MD5SUM:=bd9195d086566f56634c0bcbbbcbebea
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,HASERL,haserl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-$(PKG_BUILD_DIR)/.configured:
-	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) -DMAX_UPLOAD_KB=8192" \
-		./configure \
-		  --target=$(GNU_TARGET_NAME) \
-		  --host=$(GNU_TARGET_NAME) \
-		  --build=$(GNU_HOST_NAME) \
-		  --program-prefix="" \
-		  --program-suffix="" \
-		  --prefix=/usr \
-		  --exec-prefix=/usr \
-		  --bindir=/usr/bin \
-		  --datadir=/usr/share \
-		  --includedir=/usr/include \
-		  --infodir=/usr/share/info \
-		  --libdir=/usr/lib \
-		  --libexecdir=/usr/lib \
-		  --localstatedir=/var \
-		  --mandir=/usr/share/man \
-		  --sbindir=/usr/sbin \
-		  --sysconfdir=/etc \
-		  $(DISABLE_LARGEFILE) \
-		  $(DISABLE_NLS) \
-	)
-	touch $@
-
-$(PKG_BUILD_DIR)/.built:
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-	touch $@
+define Package/haserl
+SECTION:=base
+# CATEGORY:=FIXME
+TITLE:=A CGI wrapper to embed shell scripts in HTML documents
+DESCRIPTION:=A CGI wrapper to embed shell scripts in HTML documents.
+URL:=http://haserl.sourceforge.net/
+endef
 
-$(IPKG_HASERL):
+define Package/haserl/install
 	install -m0755 -d $(IDIR_HASERL)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/haserl $(IDIR_HASERL)/usr/bin/
-	$(RSTRIP) $(IDIR_HASERL)
-	$(IPKG_BUILD) $(IDIR_HASERL) $(PACKAGE_DIR)
+	install -m0755 $(PKG_INSTALL_DIR)/usr/bin/haserl $(IDIR_HASERL)/usr/bin/
+endef
 
+$(eval $(call BuildPackage,haserl))
diff --git a/openwrt/package/haserl/ipkg/haserl.control b/openwrt/package/haserl/ipkg/haserl.control
deleted file mode 100644
index 0243b6d754..0000000000
--- a/openwrt/package/haserl/ipkg/haserl.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: haserl
-Priority: optional
-Section: web
-Description: a CGI wrapper to embed shell scripts in HTML documents
diff --git a/openwrt/package/ipkg/Config.in b/openwrt/package/ipkg/Config.in
deleted file mode 100644
index 4cbd295001..0000000000
--- a/openwrt/package/ipkg/Config.in
+++ /dev/null
@@ -1,18 +0,0 @@
-config BR2_PACKAGE_IPKG
-	prompt "ipkg.............................. The itsy package management system"
-	tristate
-	default n if BUSYBOX_CONFIG_IPKG
-	default y if ! BUSYBOX_CONFIG_IPKG
-	help
-	  Lightweight package management system
-	  ipkg is the Itsy Package Management System, for handling
-	  installation and removal of packages on a system. It can
-	  recursively follow dependencies and download all packages
-	  necessary to install a particular package.
-	  
-	  ipkg knows how to install both .ipk and .deb packages.
-	  
-	  ipkg is intended to serve the same functions (and more) for
-	  Familiar that dpkg and apt serve for Debian, (while taking
-	  up much less space).
-
diff --git a/openwrt/package/ipkg/Makefile b/openwrt/package/ipkg/Makefile
deleted file mode 100644
index 3dddcc5556..0000000000
--- a/openwrt/package/ipkg/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id$
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ipkg
-PKG_VERSION:=0.99.154
-PKG_RELEASE:=1
-PKG_MD5SUM:=b60aeea3b86cecf0eb26b161d122fbcc
-
-PKG_SOURCE_URL:=http://www.handhelds.org/packages/ipkg \
-	http://www.gtlib.gatech.edu/pub/handhelds.org/packages/ipkg \
-	http://ftp.gwdg.de/pub/linux/handhelds/packages/ipkg
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-include $(TOPDIR)/package/rules.mk
-
-$(eval $(call PKG_template,IPKG,ipkg,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-$(PKG_BUILD_DIR)/.configured:
-	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-		./configure \
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_LARGEFILE) \
-			$(DISABLE_NLS) \
-	)
-	touch $@
-
-$(PKG_BUILD_DIR)/.built:
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC=$(TARGET_CC) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-	touch $@
-
-$(IPKG_IPKG):
-	install -d -m0755 $(IDIR_IPKG)/bin
-	$(CP) $(PKG_INSTALL_DIR)/bin/ipkg-cl $(IDIR_IPKG)/bin/ipkg
-	install -d -m0755 $(IDIR_IPKG)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libipkg.so.* $(IDIR_IPKG)/usr/lib/
-	$(RSTRIP) $(IDIR_IPKG)
-	$(IPKG_BUILD) $(IDIR_IPKG) $(PACKAGE_DIR)
diff --git a/openwrt/package/ipkg/ipkg/ipkg.control b/openwrt/package/ipkg/ipkg/ipkg.control
deleted file mode 100644
index 7bf87d1dd6..0000000000
--- a/openwrt/package/ipkg/ipkg/ipkg.control
+++ /dev/null
@@ -1,16 +0,0 @@
-Package: ipkg
-Section: base
-Priority: required
-Essential: yes
-Description: lightweight package management system
- ipkg is the Itsy Package Management System, for handling
- installation and removal of packages on a system. It can
- recursively follow dependencies and download all packages
- necessary to install a particular package.
- .
- ipkg knows how to install both .ipk and .deb packages.
- .
- ipkg is intended to serve the same functions (and more) for
- Familiar that dpkg and apt serve for Debian, (while taking
- up much less space).
-
diff --git a/openwrt/package/iproute2/Config.in b/openwrt/package/iproute2/Config.in
deleted file mode 100644
index 349e3b7df2..0000000000
--- a/openwrt/package/iproute2/Config.in
+++ /dev/null
@@ -1,21 +0,0 @@
-menu "iproute2.......................... A collection of utilites for controlling TCP/IP networking and Traffic Control"
-
-config BR2_COMPILE_IPROUTE2
-	tristate
-	default n
-	depends BR2_PACKAGE_IPROUTE2_IP || BR2_PACKAGE_IPROUTE2_TC
-
-config BR2_PACKAGE_IP
-	prompt   "ip.............................. A routing control utility"
-	tristate
-	default m if CONFIG_DEVEL
-	select BR2_COMPILE_IPROUTE2
-
-config BR2_PACKAGE_TC
-	prompt   "tc.............................. A traffic control utility"
-	tristate
-	default m if CONFIG_DEVEL
-	select BR2_COMPILE_IPROUTE2
-	select BR2_PACKAGE_KMOD_SCHED
-
-endmenu
diff --git a/openwrt/package/iproute2/Makefile b/openwrt/package/iproute2/Makefile
index f829293f4a..0fe03bc825 100644
--- a/openwrt/package/iproute2/Makefile
+++ b/openwrt/package/iproute2/Makefile
@@ -5,19 +5,38 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=iproute2
 PKG_VERSION:=2.6.15-060110
 PKG_RELEASE:=1
-PKG_MD5SUM:=04f57a6d366d36426d276178b600f5c5
 
-PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://developer.osdl.org/dev/iproute2/download/
+PKG_MD5SUM:=04f57a6d366d36426d276178b600f5c5
 PKG_CAT:=zcat
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,IP,ip,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,TC,tc,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+# define Package/iproute2
+# SECTION:=base
+# CATEGORY:=Network
+# DEFAULT:=n
+# MENU:=1
+# TITLE:=A collection of utilites for controlling TCP/IP networking and Traffic Control
+# endef
+
+define Package/ip
+SECTION:=base
+CATEGORY:=Network
+DEFAULT:=n
+DEPENDS:=iproute2
+TITLE:=A routing control utility
+endef
+
+define Package/tc
+$(call Package/ip)
+# DEPENDS:=kmod-sched
+TITLE:=A traffic control utility
+endef
 
-$(PKG_BUILD_DIR)/.configured:
+define Build/Configure
 	$(SED) "s:-O2:${TARGET_CFLAGS}:g" $(PKG_BUILD_DIR)/Makefile
 	$(SED) "s,-I/usr/include/db3,," $(PKG_BUILD_DIR)/Makefile
 	$(SED) "s,^KERNEL_INCLUDE.*,KERNEL_INCLUDE=$(LINUX_DIR)/include," \
@@ -27,22 +46,23 @@ $(PKG_BUILD_DIR)/.configured:
 	# For now disable compiling of the misc directory because it seems to fail
 	rm -rf $(PKG_BUILD_DIR)/misc 
 	$(SED) "s, misc,," $(PKG_BUILD_DIR)/Makefile
-	touch $@
+endef
 
-$(PKG_BUILD_DIR)/.built:
+define Build/Compile
 	$(MAKE) -j1 -C $(PKG_BUILD_DIR)/netem HOSTCC=$(HOSTCC) CFLAGS="-D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall -I ../include -DRESOLVE_HOSTNAMES"
 	$(MAKE) -j1 -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS) KERNEL_INCLUDE=$(LINUX_DIR)/include all tc/tc ip/ip
-	touch $@
+endef
 
-$(IPKG_IP):
-	mkdir -p $(IDIR_IP)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/ip/ip $(IDIR_IP)/usr/sbin/
-	$(STRIP) $(IDIR_IP)/usr/sbin/*
-	$(IPKG_BUILD) $(IDIR_IP) $(PACKAGE_DIR)
+define Package/ip/install
+	install -d -m0755 $(IDIR_IP)/usr/sbin
+	install -m0755 $(PKG_BUILD_DIR)/ip/ip $(IDIR_IP)/usr/sbin/
+endef
 
-$(IPKG_TC):
-	mkdir -p $(IDIR_TC)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/tc/tc $(IDIR_TC)/usr/sbin/
-	$(STRIP) $(IDIR_TC)/usr/sbin/*
-	$(IPKG_BUILD) $(IDIR_TC) $(PACKAGE_DIR)
+define Package/tc/install
+	install -d -m0755 $(IDIR_TC)/usr/sbin
+	install -m0755 $(PKG_BUILD_DIR)/tc/tc $(IDIR_TC)/usr/sbin/
+endef
 
+# $(eval $(call BuildPackage,iproute2))
+# $(eval $(call BuildPackage,ip))
+# $(eval $(call BuildPackage,tc))
diff --git a/openwrt/package/iproute2/ipkg/ip.control b/openwrt/package/iproute2/ipkg/ip.control
deleted file mode 100644
index 8206dd37a0..0000000000
--- a/openwrt/package/iproute2/ipkg/ip.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: ip
-Section: net
-Priority: optional
-Description: iproute2 routing control utility
diff --git a/openwrt/package/iproute2/ipkg/tc.control b/openwrt/package/iproute2/ipkg/tc.control
deleted file mode 100644
index 8950da394d..0000000000
--- a/openwrt/package/iproute2/ipkg/tc.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: tc
-Section: net
-Priority: optional
-Description: iproute2 traffic control utility
-Depends: kmod-sched
diff --git a/openwrt/package/ipsec-tools/Config.in b/openwrt/package/ipsec-tools/Config.in
deleted file mode 100644
index bdd3e210f6..0000000000
--- a/openwrt/package/ipsec-tools/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_IPSEC_TOOLS
-	prompt "ipsec-tools....................... IPsec management tools"
-	tristate
-	depends BR2_LINUX_2_6
-	select BR2_PACKAGE_LIBOPENSSL
-	default m if CONFIG_DEVEL
-	help
-	  IPsec management tools
-	  
-	  http://ipsec-tools.sourceforge.net/
-
diff --git a/openwrt/package/ipsec-tools/Makefile b/openwrt/package/ipsec-tools/Makefile
index 06d49e9686..6d27397c0f 100644
--- a/openwrt/package/ipsec-tools/Makefile
+++ b/openwrt/package/ipsec-tools/Makefile
@@ -5,20 +5,25 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=ipsec-tools
 PKG_VERSION:=0.6.4
 PKG_RELEASE:=1
-PKG_MD5SUM:=d0242a943c82c0cbf28005966ff35e21
 
-PKG_SOURCE_URL:=@SF/ipsec-tools
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=@SF/ipsec-tools
+PKG_MD5SUM:=d0242a943c82c0cbf28005966ff35e21
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,IPSEC_TOOLS,ipsec-tools,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Package/ipsec-tools
+SECTION:=base
+CATEGORY:=Network
+DEFAULT:=y
+TITLE:=IPsec management tools
+DESCRIPTION:=IPsec management tools
+URL:=http://ipsec-tools.sourceforge.net/
+endef
 
-$(PKG_BUILD_DIR)/.configured:
+define Build/Configure
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
 		touch configure.ac; \
 		touch aclocal.m4; \
@@ -59,27 +64,19 @@ $(PKG_BUILD_DIR)/.configured:
 			--without-libradius \
 			--without-libpam \
 	);
-	touch $@
+endef
 
-$(PKG_BUILD_DIR)/.built:
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CFLAGS="$(TARGET_CFLAGS) -Wall" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-	touch $@
-
-$(IPKG_IPSEC_TOOLS):
+define Package/ipsec-tools/install
 	install -d -m0755 $(IDIR_IPSEC_TOOLS)/etc
-	$(CP) $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(IDIR_IPSEC_TOOLS)/etc/
 	install -d -m0755 $(IDIR_IPSEC_TOOLS)/usr/lib/
+	install -d -m0755 $(IDIR_IPSEC_TOOLS)/usr/sbin
+	$(CP) $(PKG_BUILD_DIR)/src/racoon/samples/racoon.conf $(IDIR_IPSEC_TOOLS)/etc/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libipsec.so.* $(IDIR_IPSEC_TOOLS)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libracoon.so.* $(IDIR_IPSEC_TOOLS)/usr/lib/
-	install -d -m0755 $(IDIR_IPSEC_TOOLS)/usr/sbin
 	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/plainrsa-gen $(IDIR_IPSEC_TOOLS)/usr/sbin/
 	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoon $(IDIR_IPSEC_TOOLS)/usr/sbin/
 	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/racoonctl $(IDIR_IPSEC_TOOLS)/usr/sbin/
 	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/setkey $(IDIR_IPSEC_TOOLS)/usr/sbin/
-	$(RSTRIP) $(IDIR_IPSEC_TOOLS)
-	$(IPKG_BUILD) $(IDIR_IPSEC_TOOLS) $(PACKAGE_DIR)
+endef
+
+$(eval $(call BuildPackage,ipsec-tools))
diff --git a/openwrt/package/ipsec-tools/ipkg/ipsec-tools.conffiles b/openwrt/package/ipsec-tools/ipkg/ipsec-tools.conffiles
deleted file mode 100644
index 434045463a..0000000000
--- a/openwrt/package/ipsec-tools/ipkg/ipsec-tools.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/racoon.conf
diff --git a/openwrt/package/ipsec-tools/ipkg/ipsec-tools.control b/openwrt/package/ipsec-tools/ipkg/ipsec-tools.control
deleted file mode 100644
index c1cade10bd..0000000000
--- a/openwrt/package/ipsec-tools/ipkg/ipsec-tools.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: ipsec-tools
-Priority: optional
-Section: net
-Depends: libopenssl
-Description: IPsec management tools
diff --git a/openwrt/package/ipset/Makefile b/openwrt/package/ipset/Makefile
index ffaabc6fe9..c938819799 100644
--- a/openwrt/package/ipset/Makefile
+++ b/openwrt/package/ipset/Makefile
@@ -28,7 +28,6 @@ define Package/ipset/install
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR=$(IDIR_IPSET) PREFIX=/usr install
 	rm -rf $(IDIR_IPSET)/usr/man
-	$(IPKG_BUILD) $(IDIR_IPSET) $(PACKAGE_DIR)
 endef
 
 $(eval $(call BuildPackage,ipset))
diff --git a/openwrt/package/iptables/Config.in b/openwrt/package/iptables/Config.in
deleted file mode 100644
index 6a2a85616b..0000000000
--- a/openwrt/package/iptables/Config.in
+++ /dev/null
@@ -1,167 +0,0 @@
-menu "iptables.......................... IPv4 / IPv6 firewall administration"
-
-config BR2_COMPILE_IPTABLES
-	bool
-	default n
-	depends BR2_PACKAGE_IPTABLES || BR2_PACKAGE_IP6TABLES
-
-config BR2_PACKAGE_IPTABLES
-	prompt "iptables.......................... IPv4 firewall administration tool"
-	tristate
-	default y
-	select BR2_COMPILE_IPTABLES
-	help
-	  IPv4 firewall, NAT, and packet mangling tools.
-	  
-	  http://www.iptables.org/
-
-config BR2_PACKAGE_IPTABLES_EXTRA
-	prompt   "iptables-extra.................. Extra Iptables extensions for IPv4 firewalling (meta-package)"
-	tristate
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_IPTABLES
-	select BR2_PACKAGE_KMOD_IPTABLES_EXTRA
-	select BR2_PACKAGE_IPTABLES_MOD_CONNTRACK
-	select BR2_PACKAGE_IPTABLES_MOD_EXTRA
-	select BR2_PACKAGE_IPTABLES_MOD_FILTER
-	select BR2_PACKAGE_IPTABLES_MOD_IMQ
-	select BR2_PACKAGE_IPTABLES_MOD_IPOPT
-	select BR2_PACKAGE_IPTABLES_MOD_IPSEC
-	select BR2_PACKAGE_IPTABLES_MOD_NAT
-	select BR2_PACKAGE_IPTABLES_MOD_ULOG
-	help
-	  Extra Iptables extensions for IPv4 firewalling (meta-package)
-
-config BR2_PACKAGE_IPTABLES_MOD_CONNTRACK
-	prompt   "iptables-mod-conntrack.......... Iptables extensions for connection tracking"
-	tristate
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_IPTABLES
-	select BR2_PACKAGE_KMOD_IPT_CONNTRACK
-	help
-	  Iptables (IPv4) extensions for connection tracking
-
-	  Includes:
-            * libipt_conntrack
-            * libipt_helper
-            * libipt_connmark/CONNMARK
-
-config BR2_PACKAGE_IPTABLES_MOD_FILTER
-	prompt   "iptables-mod-filter............. Iptables extension for packet content inspection"
-	tristate
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_IPTABLES
-	select BR2_PACKAGE_KMOD_IPT_FILTER
-	help
-	  Iptables (IPv4) extension for packet content inspection
-
-	  Includes:
-            * libipt_ipp2p
-            * libipt_layer7
-
-config BR2_PACKAGE_IPTABLES_MOD_IMQ
-       	prompt "iptables-mod-imq................ Iptables extensions for Intermediate Queuing Device QoS-support"
-       	tristate
-       	default m if CONFIG_DEVEL
-       	depends BR2_PACKAGE_IPTABLES
-       	select BR2_PACKAGE_KMOD_IMQ
-       	help
-          Iptables (IPv4) extensions for Intermediate Queuing Device QoS-support
-
-          Includes:
-            * libipt_IMQ
-
-config BR2_PACKAGE_IPTABLES_MOD_IPOPT
-	prompt   "iptables-mod-ipopt.............. Iptables extensions for matching/changing IP packet options"
-	tristate
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_IPTABLES
-	select BR2_PACKAGE_KMOD_IPT_IPOPT
-	help
-	  Extra Iptables (IPv4) extensions for matching/changing IP packet options
-
-	  Includes:
-            * libipt_dscp/DSCP
-            * libipt_ecn/ECN
-            * libipt_length
-            * libipt_mac
-            * libipt_tos/TOS
-            * libipt_tcpmms
-            * libipt_ttl/TTL
-            * libipt_unclean
-
-config BR2_PACKAGE_IPTABLES_MOD_IPSEC
-	prompt   "iptables-mod-ipsec.............. Iptables extensions for matching special IPsec packets"
-	tristate
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_IPTABLES
-	select BR2_PACKAGE_KMOD_IPT_IPSEC
-	help
-	  Iptables (IPv4) extensions for matching special IPsec packets
-
-	  Includes:
-            * libipt_ah
-            * libipt_esp
-
-config BR2_PACKAGE_IPTABLES_MOD_NAT
-	prompt   "iptables-mod-nat................ Iptables extensions for different NAT targets"
-	tristate
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_IPTABLES
-	select BR2_PACKAGE_KMOD_IPT_NAT
-	help
-	  Iptables (IPv4) extensions for different NAT targets
-
-	  Includes:
-	    * libipt_REDIRECT
-
-config BR2_PACKAGE_IPTABLES_MOD_ULOG
-	prompt   "iptables-mod-ulog............... Iptables extensions for user-space packet logging"
-	tristate
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_IPTABLES
-	select BR2_PACKAGE_KMOD_IPT_ULOG
-	help
-	  Iptables (IPv4) extensions for user-space packet logging
-
-          Includes:
-            * libipt_ULOG
-
-config BR2_PACKAGE_IPTABLES_MOD_EXTRA
-	prompt   "iptables-mod-extra.............. Other extra Iptables extensions"
-	tristate
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_IPTABLES
-	select BR2_PACKAGE_KMOD_IPT_EXTRA
-	help
-	  Other extra Iptables (IPv4) extensions
-
-          Includes:
-            * libipt_limit
-            * libipt_owner
-            * libipt_physdev
-            * libipt_pkttype
-            * libipt_recent
-
-config BR2_PACKAGE_IPTABLES_UTILS
-	prompt   "iptables-utils.................. Save and restore utilities"
-	tristate
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_IPTABLES
-	help
-	  iptables-save and iptables-restore for Iptables (IPv4)
-	  
-	  http://www.iptables.org/
-
-config BR2_PACKAGE_IP6TABLES
-	prompt "ip6tables......................... IPv6 firewall administration tool"
-	tristate
-	default m if CONFIG_DEVEL
-	select BR2_COMPILE_IPTABLES
-	select BR2_PACKAGE_KMOD_IPV6
-	help
-	  IPv6 firewall, NAT, and packet mangling tools.
-	  
-	  http://www.iptables.org/
-
-endmenu
diff --git a/openwrt/package/iptables/ipkg/iptables.conffiles b/openwrt/package/iptables/ipkg/iptables.conffiles
deleted file mode 100644
index 06194ca679..0000000000
--- a/openwrt/package/iptables/ipkg/iptables.conffiles
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/config/firewall
-/etc/firewall.user
diff --git a/openwrt/package/mtd/Config.in b/openwrt/package/mtd/Config.in
deleted file mode 100644
index 5420dff561..0000000000
--- a/openwrt/package/mtd/Config.in
+++ /dev/null
@@ -1,15 +0,0 @@
-config BR2_PACKAGE_MTD
-	prompt "mtd............................... Update utility for trx firmware images"
-	tristate
-	default y
-	help
-	  Update utility for trx firmware images.
-
-config BR2_PACKAGE_MTD_STATIC
-	prompt "mtd-static........................ Update utility for trx firmware images (statically linked)"
-	tristate
-	default n
-	help
-	  Update utility for trx firmware images (statically linked). To update
-	  from other firmware or older OpenWrt releases.
-
diff --git a/openwrt/package/mtd/Makefile b/openwrt/package/mtd/Makefile
index 61e7e74c23..381184b1d3 100644
--- a/openwrt/package/mtd/Makefile
+++ b/openwrt/package/mtd/Makefile
@@ -9,29 +9,20 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,MTD,$(PKG_NAME),$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,MTD_STATIC,mtd-static,$(PKG_RELEASE),$(ARCH)))
-
-$(PKG_BUILD_DIR)/.prepared:
-	mkdir -p $(PKG_BUILD_DIR)
-	touch $@
-
-$(PKG_BUILD_DIR)/.configured:
-	touch $@
-
-$(PKG_BUILD_DIR)/.built:
+define Package/mtd
+SECTION:=base
+CATEGORY:=Util
+DEFAULT:=y
+TITLE:=Update utility for trx firmware images
+DESCRIPTION:=Update utility for trx firmware images. To update \\\
+from other firmware or older OpenWrt releases.
+endef
+
+define Build/Compile
 	$(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/mtd mtd.c
-	$(TARGET_CC) -static $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/mtd-static mtd.c
-	touch $@
+endef
 
-$(IPKG_MTD): 
+define Package/mtd/install
 	install -d -m0755 $(IDIR_MTD)/sbin
 	install -m0755 $(PKG_BUILD_DIR)/mtd $(IDIR_MTD)/sbin
-	$(RSTRIP) $(IDIR_MTD)/sbin/*
-	$(IPKG_BUILD) $(IDIR_MTD) $(PACKAGE_DIR)
-
-$(IPKG_MTD_STATIC): 
-	install -d -m0755 $(IDIR_MTD_STATIC)/sbin
-	install -m0755 $(PKG_BUILD_DIR)/mtd-static $(IDIR_MTD_STATIC)/sbin
-	$(RSTRIP) $(IDIR_MTD_STATIC)/sbin/*
-	$(IPKG_BUILD) $(IDIR_MTD_STATIC) $(PACKAGE_DIR)
+endef
diff --git a/openwrt/package/mtd/ipkg/mtd-static.control b/openwrt/package/mtd/ipkg/mtd-static.control
deleted file mode 100644
index ded243a8bc..0000000000
--- a/openwrt/package/mtd/ipkg/mtd-static.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: mtd-static
-Priority: optional
-Section: sys
-Description: Tool for modifying the flash chip (statically linked)
diff --git a/openwrt/package/mtd/ipkg/mtd.control b/openwrt/package/mtd/ipkg/mtd.control
deleted file mode 100644
index 3145581c9b..0000000000
--- a/openwrt/package/mtd/ipkg/mtd.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: mtd
-Priority: optional
-Section: sys
-Description: Tool for modifying the flash chip
diff --git a/openwrt/package/nvram/Config.in b/openwrt/package/nvram/Config.in
deleted file mode 100644
index be4138275f..0000000000
--- a/openwrt/package/nvram/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_NVRAM
-	prompt "nvram............................. Broadcom config utility"
-	tristate
-	default y 
-	depends BR2_LINUX_2_4_BRCM
-	help
-	  control utility for broadcom's 'nvram' config area
-
diff --git a/openwrt/package/nvram/Makefile b/openwrt/package/nvram/Makefile
index dd460fc06d..762eb58183 100644
--- a/openwrt/package/nvram/Makefile
+++ b/openwrt/package/nvram/Makefile
@@ -9,30 +9,26 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,NVRAM,nvram,$(PKG_RELEASE),$(ARCH)))
-
-$(PKG_BUILD_DIR)/.prepared:
+define Package/nvram
+SECTION:=base
+# CATEGORY:=FIXME
+DEFAULT:=n
+TITLE:=Broadcom config utility
+DESCRIPTION:=control utility for broadcom's 'nvram' config area
+endef
+
+define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)
 	$(CP) ./src/* $(PKG_BUILD_DIR)
-	touch $@
-
-$(PKG_BUILD_DIR)/.configured:
-	touch $@
-
-$(PKG_BUILD_DIR)/.built:
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) -I $(STAGING_DIR)/usr/include"
-	touch $@
+endef
 
 $(IPKG_NVRAM):
-	mkdir -p $(IDIR_NVRAM)/usr/lib
+define Package/nvram/install
+	install -d -m0755  $(IDIR_NVRAM)/usr/lib
+	install -d -m0755 $(IDIR_NVRAM)/usr/sbin
 	$(CP) $(PKG_BUILD_DIR)/*.so $(IDIR_NVRAM)/usr/lib
-	mkdir -p $(IDIR_NVRAM)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/nvram $(IDIR_NVRAM)/usr/sbin
-	$(RSTRIP) $(IDIR_NVRAM)
-	$(IPKG_BUILD) $(IDIR_NVRAM) $(PACKAGE_DIR)
-
+	install -m0755 $(PKG_BUILD_DIR)/nvram $(IDIR_NVRAM)/usr/sbin
+endef
 
 compile-targets: install-dev
 install-dev: $(PKG_BUILD_DIR)/.built
diff --git a/openwrt/package/nvram/ipkg/nvram.control b/openwrt/package/nvram/ipkg/nvram.control
deleted file mode 100644
index c7ea64d19c..0000000000
--- a/openwrt/package/nvram/ipkg/nvram.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: nvram
-Priority: optional
-Section: sys
-Description: NVRAM utility and libraries for Broadcom hardware
-
diff --git a/openwrt/package/pcmcia-cs/Config.in b/openwrt/package/pcmcia-cs/Config.in
deleted file mode 100644
index afcfa39ffd..0000000000
--- a/openwrt/package/pcmcia-cs/Config.in
+++ /dev/null
@@ -1,17 +0,0 @@
-config BR2_COMPILE_PCMCIA_CS
-	tristate
-	default n
-	depends BR2_PACKAGE_PCMCIA_UTILS
-
-config BR2_PACKAGE_PCMCIA_UTILS
-	prompt "pcmcia-utils...................... PCMCIA/Cardbus management utilities"
-	tristate
-	depends BR2_LINUX_PCMCIA_SUPPORT
-	select BR2_COMPILE_PCMCIA_CS
-	select BR2_PACKAGE_KMOD_PCMCIA_CORE
-	default m if CONFIG_DEVEL
-	help
-	  PCMCIA/Cardbus management utilities
-	  
-	  http://pcmcia-cs.sourceforge.net/
-
diff --git a/openwrt/package/pcmcia-cs/Makefile b/openwrt/package/pcmcia-cs/Makefile
index b99633a5fa..a9c7ba8001 100644
--- a/openwrt/package/pcmcia-cs/Makefile
+++ b/openwrt/package/pcmcia-cs/Makefile
@@ -5,20 +5,25 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=pcmcia-cs
 PKG_VERSION:=3.2.8
 PKG_RELEASE:=1
-PKG_MD5SUM:=0d6d65be8896eff081aee996049afaa5
 
-PKG_SOURCE_URL:=@SF/$(PKG_NAME)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/$(PKG_NAME)
+PKG_MD5SUM:=0d6d65be8896eff081aee996049afaa5
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,PCMCIA_UTILS,pcmcia-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Package/pcmcia-cs
+SECTION:=base
+# CATEGORY:=FIXME
+DEFAULT:=n
+TITLE:=PCMCIA/Cardbus management utilities
+DESCRIPTION:=PCMCIA/Cardbus management utilities
+URL:=http://pcmcia-cs.sourceforge.net/
+endef
 
-$(PKG_BUILD_DIR)/.configured:
+define Build/Configure
 	( cd $(PKG_BUILD_DIR); \
 		./Configure \
 			--noprompt \
@@ -35,22 +40,14 @@ $(PKG_BUILD_DIR)/.configured:
 			--nox11 \
 			--sysv --rcdir="/etc" \
 	)
-	touch $@
-
-$(PKG_BUILD_DIR)/.built: 
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		all install
-	touch $@
+endef
 
-$(IPKG_PCMCIA_UTILS):
+define Package/pcmcia-cs/install
 	install -m0755 -d $(IDIR_PCMCIA_UTILS)/etc
-	$(CP) $(PKG_INSTALL_DIR)/etc/pcmcia $(IDIR_PCMCIA_UTILS)/etc/
 	install -m0755 -d $(IDIR_PCMCIA_UTILS)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/sbin/cardctl $(IDIR_PCMCIA_UTILS)/usr/sbin/
-	$(CP) $(PKG_INSTALL_DIR)/sbin/cardmgr $(IDIR_PCMCIA_UTILS)/usr/sbin/
-	$(RSTRIP) $(IDIR_PCMCIA_UTILS)
-	$(IPKG_BUILD) $(IDIR_PCMCIA_UTILS) $(PACKAGE_DIR)
+	install -m0644 $(PKG_INSTALL_DIR)/etc/pcmcia $(IDIR_PCMCIA_UTILS)/etc/
+	install -m0755 $(PKG_INSTALL_DIR)/sbin/cardctl $(IDIR_PCMCIA_UTILS)/usr/sbin/
+	install -m0755 $(PKG_INSTALL_DIR)/sbin/cardmgr $(IDIR_PCMCIA_UTILS)/usr/sbin/
+endef
 
+$(eval $(call BuildPackage,pcmcia-cs))
diff --git a/openwrt/package/pcmcia-cs/ipkg/pcmcia-utils.conffiles b/openwrt/package/pcmcia-cs/ipkg/pcmcia-utils.conffiles
deleted file mode 100644
index 04ca204799..0000000000
--- a/openwrt/package/pcmcia-cs/ipkg/pcmcia-utils.conffiles
+++ /dev/null
@@ -1,10 +0,0 @@
-/etc/pcmcia/config.opts
-/etc/pcmcia/ftl.opts
-/etc/pcmcia/ide.opts
-/etc/pcmcia/ieee1394.opts
-/etc/pcmcia/memory.opts
-/etc/pcmcia/network.opts
-/etc/pcmcia/parport.opts
-/etc/pcmcia/scsi.opts
-/etc/pcmcia/serial.opts
-/etc/pcmcia/wireless.opts
diff --git a/openwrt/package/pcmcia-cs/ipkg/pcmcia-utils.control b/openwrt/package/pcmcia-cs/ipkg/pcmcia-utils.control
deleted file mode 100644
index ba760a61ba..0000000000
--- a/openwrt/package/pcmcia-cs/ipkg/pcmcia-utils.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: pcmcia-utils
-Priority: optional
-Section: sys
-Depends: kmod-pcmcia-core
-Description: PCMCIA/Cardbus management utilities
diff --git a/openwrt/package/pptp/Makefile b/openwrt/package/pptp/Makefile
index 870341c87d..de7c50c2d4 100644
--- a/openwrt/package/pptp/Makefile
+++ b/openwrt/package/pptp/Makefile
@@ -5,34 +5,30 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=pptp
 PKG_VERSION:=1.6.0
 PKG_RELEASE:=3
-PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631
 
-PKG_SOURCE_URL:=@SF/pptpclient
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/pptpclient
+PKG_MD5SUM:=9a706327fb9827541d7c86d48ceb9631
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,PPTP,pptp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Package/pptp
+SECTION:=base
+# CATEGORY:=FIXME
+TITLE:=PPTP (Point-to-Point Tunneling Protocol) client
+DESCRIPTION:=A Point-to-Point Tunneling Protocol Client
+URL:=http://pptpclient.sourceforge.net/
+endef
 
-$(PKG_BUILD_DIR)/.configured:
-	touch $@
-
-$(PKG_BUILD_DIR)/.built:
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC=$(TARGET_CC) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		all
-	touch $@
-
-$(IPKG_PPTP):
+define Package/pptp/install
 	install -d -m0755 $(IDIR_PPTP)/sbin
-	install -m0755 ./files/ifup.pptp $(IDIR_PPTP)/sbin/ifup.pptp
 	install -d -m0755 $(IDIR_PPTP)/etc/ppp
-	install -m0644 ./files/options.pptp $(IDIR_PPTP)/etc/ppp/
 	install -d -m0755 $(IDIR_PPTP)/usr/sbin
+	install -m0755 ./files/ifup.pptp $(IDIR_PPTP)/sbin/ifup.pptp
+	install -m0644 ./files/options.pptp $(IDIR_PPTP)/etc/ppp/
 	install -m0755 $(PKG_BUILD_DIR)/pptp $(IDIR_PPTP)/usr/sbin/
-	$(RSTRIP) $(IDIR_PPTP)
-	$(IPKG_BUILD) $(IDIR_PPTP) $(PACKAGE_DIR)
+endef
+
+$(eval $(call BuildPackage,pptp))
diff --git a/openwrt/package/robocfg/Config.in b/openwrt/package/robocfg/Config.in
deleted file mode 100644
index db90c8b113..0000000000
--- a/openwrt/package/robocfg/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_ROBOCFG
-	prompt "robocfg........................... BCM5325E/536x switch configuration utility"
-	tristate
-	default m if CONFIG_DEVEL
-	help
-	  Broadcom BCM5325E/536x switch configuration utility
-
diff --git a/openwrt/package/robocfg/Makefile b/openwrt/package/robocfg/Makefile
index 54daea8e86..194c022a41 100644
--- a/openwrt/package/robocfg/Makefile
+++ b/openwrt/package/robocfg/Makefile
@@ -10,21 +10,23 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/robocfg
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,ROBOCFG,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-$(PKG_BUILD_DIR)/.prepared:
-	mkdir -p $(PKG_BUILD_DIR)
-	touch $@
-
-$(PKG_BUILD_DIR)/.configured:
-	touch $@
-
-$(PKG_BUILD_DIR)/.built:
+define Package/robocfg
+SECTION:=base
+# CATEGORY:=FIXME
+DEFAULT:=n
+TITLE:=BCM5325E/536x switch configuration utility
+DESCRIPTION:=Broadcom BCM5325E/536x switch configuration utility
+endef
+
+define Build/Compile
 	$(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/robocfg robocfg.c
-	touch $@
+endef
 
-$(IPKG_ROBOCFG):
+define Package/robocfg/install
 	install -d -m0755 $(IDIR_ROBOCFG)/sbin
 	install -m0755 $(PKG_BUILD_DIR)/robocfg $(IDIR_ROBOCFG)/sbin/
 	$(RSTRIP) $(IDIR_ROBOCFG)
 	$(IPKG_BUILD) $(IDIR_ROBOCFG) $(PACKAGE_DIR)
+endef
+
+$(eval $(call BuildPackage,robocfg))
diff --git a/openwrt/package/robocfg/ipkg/robocfg.control b/openwrt/package/robocfg/ipkg/robocfg.control
deleted file mode 100644
index 0d8b54c975..0000000000
--- a/openwrt/package/robocfg/ipkg/robocfg.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: robocfg
-Priority: optional
-Section: net
-Description: Broadcom BCM5325E/536x switch configuration utility
diff --git a/openwrt/package/rules.mk b/openwrt/package/rules.mk
index 2acc2b80fd..fe68b07707 100644
--- a/openwrt/package/rules.mk
+++ b/openwrt/package/rules.mk
@@ -146,6 +146,7 @@ $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared
 $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $(PKG_BUILD_DIR)/.built
 	$(call Package/$(1)/install,$$(IDIR_$(1)))
 	mkdir -p $(PACKAGE_DIR)
+	$(RSTRIP) $$(IDIR_$(1))
 	$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
 
 $$(INFO_$(1)): $$(IPKG_$(1))
diff --git a/openwrt/package/udev/Config.in b/openwrt/package/udev/Config.in
deleted file mode 100644
index e9601d10c6..0000000000
--- a/openwrt/package/udev/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_UDEV
-	prompt "udev.............................. Dynamic device management subsystem"
-	tristate
-	default m if CONFIG_DEVEL
-	select BR2_COMPILE_UTIL_LINUX
-	help
-	  udev provides a dynamic device directory containing only the files for 
-	  actually present devices. It creates or removes device node files in 
-	  the /dev directory, or it renames network interfaces.
-	  
-	  http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
diff --git a/openwrt/package/udev/Makefile b/openwrt/package/udev/Makefile
index 39d79b4c01..9b7c9171ae 100644
--- a/openwrt/package/udev/Makefile
+++ b/openwrt/package/udev/Makefile
@@ -7,54 +7,44 @@ PKG_VERSION:=077
 PKG_RELEASE:=1
 PKG_MD5SUM:=61ec646daf7795e9777e8f33975408fe
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ \
 	http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ \
 	ftp://ftp.de.kernel.org/pub/linux/utils/kernel/hotplug/ \
 	http://ftp.de.kernel.org/pub/linux/utils/kernel/hotplug/ \
 	ftp://ftp.fr.kernel.org/pub/linux/utils/kernel/hotplug/ \
 	http://ftp.fr.kernel.org/pub/linux/utils/kernel/hotplug/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_CAT:=bzcat
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,UDEV,udev,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-$(PKG_BUILD_DIR)/.configured:
-	touch $@
-
-$(PKG_BUILD_DIR)/.built:
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CROSS="$(TARGET_CROSS)" \
-		STRIP="/bin/true" \
-		OPTFLAGS="$(TARGET_CFLAGS)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		INSTALL="install -c" \
-		all install
-	touch $@
-
-$(IPKG_UDEV):
+define Package/udev
+SECTION:=base
+# CATEGORY:=FIXME
+DEFAULT:=n
+TITLE:=Dynamic device management subsystem
+DESCRIPTION:=udev provides a dynamic device directory containing only the files for \\\
+actually present devices. It creates or removes device node files in \\\
+the /dev directory, or it renames network interfaces. \\\
+URL:=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
+endef
+
+define Package/udev/install
 	install -d -m0775 $(IDIR_UDEV)/etc/udev
-	$(CP) $(PKG_INSTALL_DIR)/etc/udev/* $(IDIR_UDEV)/etc/udev/
 	install -d -m0775 $(IDIR_UDEV)/lib/udev
 	install -d -m0775 $(IDIR_UDEV)/sbin/
+	install -d -m0775 $(IDIR_UDEV)/usr/bin/
+	install -d -m0775 $(IDIR_UDEV)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/etc/udev/* $(IDIR_UDEV)/etc/udev/
 	$(CP) $(PKG_INSTALL_DIR)/sbin/udev $(IDIR_UDEV)/sbin/
 	$(CP) $(PKG_INSTALL_DIR)/sbin/udevcontrol $(IDIR_UDEV)/sbin/
 	$(CP) $(PKG_INSTALL_DIR)/sbin/udevd $(IDIR_UDEV)/sbin/
 	$(CP) $(PKG_INSTALL_DIR)/sbin/udevsend $(IDIR_UDEV)/sbin/
 	$(CP) $(PKG_INSTALL_DIR)/sbin/udevstart $(IDIR_UDEV)/sbin/
-	install -d -m0775 $(IDIR_UDEV)/usr/bin/
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/udevinfo $(IDIR_UDEV)/usr/bin/
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/udevtest $(IDIR_UDEV)/usr/bin/
-	install -d -m0775 $(IDIR_UDEV)/usr/sbin/
 	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/udevmonitor $(IDIR_UDEV)/usr/sbin/
-	$(RSTRIP) $(IDIR_UDEV)
-	$(IPKG_BUILD) $(IDIR_UDEV) $(PACKAGE_DIR)
+endef
 
-mostlyclean:
-	-$(MAKE) -C $(PKG_BUILD_DIR) clean
-	rm -f $(PKG_BUILD_DIR)/.built
+$(eval $(call BuildPackage,udev))
diff --git a/openwrt/package/udev/ipkg/udev.conffiles b/openwrt/package/udev/ipkg/udev.conffiles
deleted file mode 100644
index 50a5fb8891..0000000000
--- a/openwrt/package/udev/ipkg/udev.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/udev/udev.conf
diff --git a/openwrt/package/udev/ipkg/udev.control b/openwrt/package/udev/ipkg/udev.control
deleted file mode 100644
index 7ca98a0aab..0000000000
--- a/openwrt/package/udev/ipkg/udev.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: udev
-Priority: optional
-Section: base
-Description: Dynamic device management subsystem
diff --git a/openwrt/package/wificonf/Makefile b/openwrt/package/wificonf/Makefile
index 5f8c9a03a6..5e5c667af4 100644
--- a/openwrt/package/wificonf/Makefile
+++ b/openwrt/package/wificonf/Makefile
@@ -9,21 +9,19 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/wificonf
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,WIFICONF,$(PKG_NAME),$(PKG_RELEASE),$(ARCH)))
-
-$(PKG_BUILD_DIR)/.prepared:
-	mkdir -p $@
-	touch $@
-
-$(PKG_BUILD_DIR)/.configured:
-	touch $@
-
-$(PKG_BUILD_DIR)/.built:
+define Package/wificonf
+SECTION:=base
+CATEGORY:=Network
+DEFAULT:=y
+TITLE:=replacement utility for wlconf
+DESCRIPTION:=Replacement utility for wlconf
+endef
+
+define Build/Compile
 	$(TARGET_CC) $(TARGET_CFLAGS) -Iinclude/ -I$(STAGING_DIR)/usr/include -o $(PKG_BUILD_DIR)/wifi wificonf.c -L$(STAGING_DIR)/usr/lib -lnvram -lshared $(STAGING_DIR)/usr/lib/libiw.so
-	touch $@
+endef
 
-$(IPKG_WIFICONF):
+define Package/wificonf/install
 	install -d -m0755 $(IDIR_WIFICONF)/sbin
 	install -m0755 $(PKG_BUILD_DIR)/wifi $(IDIR_WIFICONF)/sbin/
-	$(RSTRIP) $(IDIR_WIFICONF)
-	$(IPKG_BUILD) $(IDIR_WIFICONF) $(PACKAGE_DIR)
+endef
diff --git a/openwrt/package/wireless-tools/Config.in b/openwrt/package/wireless-tools/Config.in
deleted file mode 100644
index deed30fda0..0000000000
--- a/openwrt/package/wireless-tools/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_WIRELESS_TOOLS
-	prompt "wireless-tools.................... Tools for manipulating Linux Wireless Extensions"
-	tristate
-	default y
-	help
-	  Tools for configuring Wireless Adapters implementing the "Wireless Extension"
-
diff --git a/openwrt/package/wireless-tools/Makefile b/openwrt/package/wireless-tools/Makefile
index 8d1da1990a..f981f7b5b6 100644
--- a/openwrt/package/wireless-tools/Makefile
+++ b/openwrt/package/wireless-tools/Makefile
@@ -5,23 +5,25 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=wireless-tools
 PKG_VERSION:=28
 PKG_RELEASE:=1
-PKG_MD5SUM:=599c94497f9c9073c7b052d3dcb7cd16
 
-PKG_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
+PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.28
 PKG_SOURCE:=wireless_tools.$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
+PKG_MD5SUM:=599c94497f9c9073c7b052d3dcb7cd16
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/wireless_tools.28
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,WIRELESS_TOOLS,wireless-tools,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Package/wireless-tools
+SECTION:=base
+CATEGORY:=Network
+DEFAULT:=y
+TITLE:=Tools for manipulating Linux Wireless Extensions
+DESCRIPTION:=Tools for configuring Wireless Adapters implementing the "Wireless Extension"
+URL:=http://hplabs.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
+endef
 
-$(PKG_BUILD_DIR)/.configured:
-	touch $@
-
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS) -I." \
 		libiw.so.28 iwmulticall
@@ -31,15 +33,14 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
 		INSTALL_DIR="$(PKG_INSTALL_DIR)/usr/sbin" \
 		INSTALL_LIB="$(PKG_INSTALL_DIR)/usr/lib" \
 		install-iwmulticall
-	touch $@
+endef
 
-$(IPKG_WIRELESS_TOOLS):
-	mkdir -p $(IDIR_WIRELESS_TOOLS)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libiw.so.28 $(IDIR_WIRELESS_TOOLS)/usr/lib/
-	mkdir -p $(IDIR_WIRELESS_TOOLS)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(IDIR_WIRELESS_TOOLS)/usr/sbin/
-	$(RSTRIP) $(IDIR_WIRELESS_TOOLS)
-	$(IPKG_BUILD) $(IDIR_WIRELESS_TOOLS) $(PACKAGE_DIR)
+define Package/wireless-tools/install
+	install -d -m0755  $(IDIR_WIRELESS_TOOLS)/usr/lib
+	install -d -m0755 $(IDIR_WIRELESS_TOOLS)/usr/sbin
+	install -m0755 $(PKG_BUILD_DIR)/libiw.so.28 $(IDIR_WIRELESS_TOOLS)/usr/lib/
+	install -m0755 $(PKG_INSTALL_DIR)/usr/sbin/iw{config,getid,list,priv,spy} $(IDIR_WIRELESS_TOOLS)/usr/sbin/
+endef
 
 install-dev: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/usr/{lib,include}
@@ -50,6 +51,3 @@ install-dev: $(PKG_BUILD_DIR)/.built
 uninstall-dev:
 	rm -f $(STAGING_DIR)/usr/lib/libiw.*
 	rm -f $(STAGING_DIR)/usr/include/{iwlib,wireless}.h
-
-compile-targets: install-dev
-clean-targets: uninstall-dev
diff --git a/openwrt/package/wireless-tools/ipkg/wireless-tools.control b/openwrt/package/wireless-tools/ipkg/wireless-tools.control
deleted file mode 100644
index 5f472d958d..0000000000
--- a/openwrt/package/wireless-tools/ipkg/wireless-tools.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: wireless-tools
-Priority: optional
-Section: net
-Description: Tools for setting up WiFi cards using the Wireless Extension
diff --git a/openwrt/package/zlib/Config.in b/openwrt/package/zlib/Config.in
deleted file mode 100644
index 4b96d94153..0000000000
--- a/openwrt/package/zlib/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_ZLIB
-	prompt "zlib.............................. Library implementing the deflate compression method"
-	tristate
-	default m if CONFIG_DEVEL
-	help
-	  A library implementing the 'deflate' compression method
-	  
-	  http://www.zlib.net/
-
diff --git a/openwrt/package/zlib/Makefile b/openwrt/package/zlib/Makefile
index cfd82800a8..aaa3f4d429 100644
--- a/openwrt/package/zlib/Makefile
+++ b/openwrt/package/zlib/Makefile
@@ -5,21 +5,28 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=zlib
 PKG_VERSION:=1.2.3
 PKG_RELEASE:=3
-PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.zlib.net \
 	@SF/zlib
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6
 PKG_CAT:=bzcat
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+define Package/zlib
+SECTION:=base
+CATEGORY:=Libraries
+DEFAULT:=n
+TITLE:=Library implementing the deflate compression method
+DESCRIPTION:=A library implementing the 'deflate' compression method
+URL:=http://www.zlib.net/
+endef
 
-$(PKG_BUILD_DIR)/.configured:
+define Build/Configure
 	(cd $(PKG_BUILD_DIR); \
 		$(TARGET_CONFIGURE_OPTS) \
 		LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
@@ -28,9 +35,9 @@ $(PKG_BUILD_DIR)/.configured:
 		--prefix=/usr \
 		--shared \
 	);
-	touch $@
+endef
 
-$(PKG_BUILD_DIR)/.built:
+define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
@@ -39,13 +46,12 @@ $(PKG_BUILD_DIR)/.built:
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		install
-	touch $@
+endef
 
-$(IPKG_ZLIB):
+define Package/zlib/install
 	install -m0755 -d $(IDIR_ZLIB)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(IDIR_ZLIB)/usr/lib/
-	$(RSTRIP) $(IDIR_ZLIB)
-	$(IPKG_BUILD) $(IDIR_ZLIB) $(PACKAGE_DIR)
+endef
 
 $(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built
 	mkdir -p $(STAGING_DIR)/usr/include
@@ -60,6 +66,3 @@ uninstall-dev:
 	rm -rf $(STAGING_DIR)/usr/include/zconf.h
 	rm -rf $(STAGING_DIR)/usr/include/zlib.h
 	rm -rf $(STAGING_DIR)/usr/lib/libz.*
-
-compile-targets: install-dev
-clean-targets: uninstall-dev
diff --git a/openwrt/package/zlib/ipkg/zlib.control b/openwrt/package/zlib/ipkg/zlib.control
deleted file mode 100644
index 35fcac26e5..0000000000
--- a/openwrt/package/zlib/ipkg/zlib.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: zlib
-Priority: optional
-Section: libs
-Description: an implementation of the deflate compression method (library)