use Build/Configure/Default macro, Makefile cleanup

git-svn-id: svn://svn.openwrt.org/openwrt/packages@5329 3c298f89-4303-0410-b956-a3cf2f4a3e73

libs/bluez-libs/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=bluez-libs
 PKG_VERSION:=2.24
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://bluez.sourceforge.net/download
 PKG_MD5SUM:=d0ba50e251ae1e7f2c09024facde8e40
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,55 +26,22 @@ define Package/bluez-libs
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Bluetooth library
-  DESCRIPTION:=Bluetooth library.
   URL:=http://www.bluez.org/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-static \
-		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=/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) \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/bluez-libs/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include/bluetooth
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/bluetooth/*.h $(STAGING_DIR)/usr/include/bluetooth
@@ -88,4 +55,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libbluetooth.{a,so*}
 endef
 
+define Package/bluez-libs/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,bluez-libs))

libs/curl/Makefile

@@ -12,7 +12,6 @@ PKG_NAME:=curl
 PKG_VERSION:=7.14.0
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://curl.haxx.se/download/ \
 	http://www.mirrorspace.org/curl/ \
@@ -24,103 +23,67 @@ PKG_SOURCE_URL:=http://curl.haxx.se/download/ \
 PKG_MD5SUM:=46ce665e47d37fce1a0bad935cce58a9
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/libcurl
+define Package/curl/Default
-  SECTION:=libs
+  SECTION:=net
-  CATEGORY:=Libraries
+  CATEGORY:=Network
-  DEPENDS:=+libopenssl +zlib
-  TITLE:=A client-side URL transfer utility
-  DESCRIPTION:=A client-side URL transfer utility.
   URL:=http://curl.haxx.se/
 endef
 
 define Package/curl
-  SECTION:=net
+  $(call Package/curl/Default)
-  CATEGORY:=Network
   DEPENDS:=+libcurl
   TITLE:=A client-side URL transfer library
-  DESCRIPTION:=A client-side URL transfer library.
+endef
-  URL:=http://curl.haxx.se/
+
+define Package/libcurl
+  $(call Package/curl/Default)
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=+libopenssl +zlib
+  TITLE:=A client-side URL transfer utility
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(strip $(TARGET_CFLAGS))" \
+		--enable-static \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--disable-thread \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		--enable-cookies \
-		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
+		--enable-crypto-auth \
-		./configure \
+		--enable-nonblocking \
-			--target=$(GNU_TARGET_NAME) \
+		--enable-file \
-			--host=$(GNU_TARGET_NAME) \
+		--enable-ftp \
-			--build=$(GNU_HOST_NAME) \
+		--enable-http \
-			--program-prefix="" \
+		--enable-ipv6 \
-			--program-suffix="" \
+		--disable-ares \
-			--prefix=/usr \
+		--disable-debug \
-			--exec-prefix=/usr \
+		--disable-dict \
-			--bindir=/usr/bin \
+		--disable-gopher \
-			--datadir=/usr/share \
+		--disable-ldap \
-			--includedir=/usr/include \
+		--disable-manual \
-			--infodir=/usr/share/info \
+		--disable-sspi \
-			--libdir=/usr/lib \
+		--disable-telnet \
-			--libexecdir=/usr/lib \
+		--disable-verbose \
-			--localstatedir=/var \
+		--with-random="/dev/urandom" \
-			--mandir=/usr/share/man \
+		--with-ssl="$(STAGING_DIR)/usr" \
-			--sbindir=/usr/sbin \
+		--without-ca-bundle \
-			--sysconfdir=/etc \
+		--without-gnutls \
-			$(DISABLE_LARGEFILE) \
+		--without-libidn \
-			$(DISABLE_NLS) \
+		--with-zlib="$(STAGING_DIR)/usr" \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
-			--with-gnu-ld \
-			--disable-thread \
-			--enable-cookies \
-			--enable-crypto-auth \
-			--enable-nonblocking \
-			--enable-file \
-			--enable-ftp \
-			--enable-http \
-			--enable-ipv6 \
-			--disable-ares \
-			--disable-debug \
-			--disable-dict \
-			--disable-gopher \
-			--disable-ldap \
-			--disable-manual \
-			--disable-sspi \
-			--disable-telnet \
-			--disable-verbose \
-			--with-random="/dev/urandom" \
-			--with-ssl="$(STAGING_DIR)/usr" \
-			--without-ca-bundle \
-			--without-gnutls \
-			--without-libidn \
-			--with-zlib="$(STAGING_DIR)/usr" \
 	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libcurl/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.so.* $(1)/usr/lib/
-endef
-
-define Package/curl/install
-	install -m0755 -d $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/curl $(1)/usr/bin/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/curl-config $(STAGING_DIR)/usr/bin/
@@ -133,11 +96,20 @@ define Build/InstallDev
 endef
 
 define Build/UninstallDev
-	rm -rf \
+	rm -rf	$(STAGING_DIR)/usr/bin/curl-config \
-		$(STAGING_DIR)/usr/bin/curl-config \
 		$(STAGING_DIR)/usr/include/curl \
 		$(STAGING_DIR)/usr/lib/libcurl.{a,so*}
 endef
 
-$(eval $(call BuildPackage,libcurl))
+define Package/curl/install
+	install -d -m0755 $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/curl $(1)/usr/bin/
+endef
+
+define Package/libcurl/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,curl))
+$(eval $(call BuildPackage,libcurl))

libs/cyrus-sasl/Makefile

@@ -12,13 +12,14 @@ PKG_NAME:=cyrus-sasl
 PKG_VERSION:=2.1.20
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://ftp.andrew.cmu.edu/pub/cyrus-mail/
 PKG_MD5SUM:=268ead27f4ac39bcfe17d9e38e0f2977
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
 PKG_BUILDDEP:=libopenssl
 
 include $(INCLUDE_DIR)/package.mk
@@ -27,80 +28,53 @@ define Package/libsasl2
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=A general purpose authentication library
-  DESCRIPTION:=A general purpose authentication library.
   URL:=http://asg.web.cmu.edu/sasl/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-static \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--disable-sample \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		--enable-staticdlopen \
-		./configure \
+		--disable-java \
-			--target=$(GNU_TARGET_NAME) \
+		--disable-alwaystrue \
-			--host=$(GNU_TARGET_NAME) \
+		--disable-checkapop \
-			--build=$(GNU_HOST_NAME) \
+		--enable-cram \
-			--program-prefix="" \
+		--enable-digest \
-			--program-suffix="" \
+		--disable-otp \
-			--prefix=/usr \
+		--disable-srp \
-			--exec-prefix=/usr \
+		--disable-srp-setpass \
-			--bindir=/usr/bin \
+		--disable-krb4 \
-			--datadir=/usr/share \
+		--disable-gssapi \
-			--includedir=/usr/include \
+		--disable-gss_mutexes \
-			--infodir=/usr/share/info \
+		--enable-plain \
-			--libdir=/usr/lib \
+		--enable-anon \
-			--libexecdir=/usr/lib \
+		--disable-login \
-			--localstatedir=/var \
+		--disable-ntlm \
-			--mandir=/usr/share/man \
+		--disable-sql \
-			--sbindir=/usr/sbin \
+		--with-dblib="none" \
-			--sysconfdir=/etc \
+		--without-gdbm \
-			$(DISABLE_NLS) \
+		--with-devrandom="/dev/urandom" \
-			$(DISABLE_LARGEFILE) \
+		--without-pam \
-			--enable-shared \
+		--without-saslauthd \
-			--enable-static \
+		--without-authdaemond \
-			--disable-sample \
+		--without-pwcheck \
-			--enable-staticdlopen \
+		--with-ipctype=unix \
-			--disable-java \
+		--with-openssl="$(STAGING_DIR)/usr" \
-			--disable-alwaystrue \
+		--without-des \
-			--disable-checkapop \
+		--without-opie \
-			--enable-cram \
+		--without-ldap \
-			--enable-digest \
+		--without-mysql \
-			--disable-otp \
+		--without-pgsql \
-			--disable-srp \
+		--without-sqlite \
-			--disable-srp-setpass \
+		--without-rc4 \
-			--disable-krb4 \
+		--without-dmalloc \
-			--disable-gssapi \
+		--without-sfio \
-			--disable-gss_mutexes \
-			--enable-plain \
-			--enable-anon \
-			--disable-login \
-			--disable-ntlm \
-			--disable-sql \
-			--with-dblib="none" \
-			--without-gdbm \
-			--with-devrandom="/dev/urandom" \
-			--without-pam \
-			--without-saslauthd \
-			--without-authdaemond \
-			--without-pwcheck \
-			--with-ipctype=unix \
-			--with-openssl="$(STAGING_DIR)/usr" \
-			--without-des \
-			--without-opie \
-			--without-ldap \
-			--without-mysql \
-			--without-pgsql \
-			--without-sqlite \
-			--without-rc4 \
-			--without-dmalloc \
-			--without-sfio \
 	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR)/include \
 		CC="$(HOSTCC)" \
 		LINK="$(HOSTCC) -o makemd5 -lc" \
@@ -112,13 +86,6 @@ define Build/Compile
 		all install
 endef
 
-define Package/libsasl2/install
-	install -m0755 -d $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsasl2.so.* $(1)/usr/lib/
-	install -m0755 -d $(1)/usr/lib/sasl2
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/lib*.so.* $(1)/usr/lib/sasl2/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include/
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/sasl $(STAGING_DIR)/usr/include/
@@ -131,10 +98,16 @@ define Build/InstallDev
 endef
 
 define Build/UninstallDev
-	rm -rf \
+	rm -rf	$(STAGING_DIR)/usr/include/sasl \
-		$(STAGING_DIR)/usr/include/sasl \
 		$(STAGING_DIR)/usr/lib/libsasl{2,}.{a,so*} \
 		$(STAGING_DIR)/usr/lib/sasl2
 endef
 
+define Package/libsasl2/install
+	install -d -m0755 $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsasl2.so.* $(1)/usr/lib/
+	install -d -m0755 $(1)/usr/lib/sasl2
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/lib*.so.* $(1)/usr/lib/sasl2/
+endef
+
 $(eval $(call BuildPackage,libsasl2))

libs/expat/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=expat
 PKG_VERSION:=1.95.8
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MD5SUM:=aff487543845a82fe262e6e2922b4c8e
 PKG_SOURCE_URL:=@SF/expat
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,54 +26,24 @@ define Package/libexpat
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=An XML parsing library
-  DESCRIPTION:=A fast, non-validating, stream-oriented XML parsing library.
+  DESCRIPTION:=\
+  	A fast, non-validating, stream-oriented XML parsing library.
   URL:=http://expat.sourceforge.net/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-static \
-		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=/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_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared \
-			--enable-static \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libexpat/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/xmlwf $(STAGING_DIR)/usr/bin/
@@ -90,4 +60,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libexpat.{a,so*}
 endef
 
+define Package/libexpat/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libexpat))

libs/freetype/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=libfreetype
 PKG_VERSION:=2.1.9
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/freetype-$(PKG_VERSION)
 PKG_SOURCE:=freetype-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/freetype
 PKG_MD5SUM:=ec1b903e4be5f073caa72458ea58c29c
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/freetype-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -27,57 +27,29 @@ define Package/libfreetype
   CATEGORY:=Libraries
   DEPENDS:=+zlib
   TITLE:=A free, high-quality and portable font engine
-  DESCRIPTION:=A free, high-quality and portable font engine.\\\
+  DESCRIPTION:=\
-    The FreeType project is a team of volunteers who develop free, \\\
+	The FreeType project is a team of volunteers who develop free, \\\
-    portable and high-quality software solutions for digital typography.\\\
+	portable and high-quality software solutions for digital typography.\\\
-    They specifically target embedded systems and focus on bringing small, \\\
+	They specifically target embedded systems and focus on bringing small, \\\
-    efficient and ubiquitous products.
+	efficient and ubiquitous products.
   URL:=http://www.freetype.org/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-shared \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--enable-static \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+	)
-		$(TARGET_CONFIGURE_OPTS) \
+	$(SED) 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec="$(STAGING_DIR)/usr/lib $(STAGING_DIR)/lib"|g' \
-		./configure \
+		$(PKG_BUILD_DIR)/builds/unix/libtool
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--sbindir=/usr/sbin \
-			--libexecdir=/usr/lib \
-			--sysconfdir=/etc \
-			--datadir=/usr/share \
-			--localstatedir=/var \
-			--mandir=/usr/man \
-			--infodir=/usr/info \
-			$(DISABLE_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared=yes \
-			--enable-static=yes \
-			--disable-rpath \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libfreetype/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreetype.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/freetype-config $(STAGING_DIR)/usr/bin/
@@ -101,4 +73,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/pkgconfig/freetype2.pc
 endef
 
+define Package/libfreetype/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreetype.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libfreetype))

libs/glib/Makefile

@@ -12,7 +12,6 @@ PKG_NAME:=glib
 PKG_VERSION:=1.2.10
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.gtk.org/pub/gtk/v1.2 \
 	http://ftp.gwdg.de/pub/misc/grafik/gimp/gtk/v1.2/ \
@@ -21,6 +20,7 @@ PKG_SOURCE_URL:=ftp://ftp.gtk.org/pub/gtk/v1.2 \
 PKG_MD5SUM:=6fe30dad87c77b91b632def29dd69ef9
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -30,68 +30,44 @@ define Package/glib1
   CATEGORY:=Libraries
   DEPENDS:=+libpthread
   TITLE:=The GLib library of C routines
-  DESCRIPTION:=The GLib library of C routines.\\\
+  DESCRIPTION:=\
-    GLib is a library containing many useful C routines for things such \\\
+	GLib is a library containing many useful C routines for things such \\\
-    as trees, hashes, and lists.
+	as trees, hashes, and lists.
   URL:=http://www.gtk.org/
 endef
 
+# commas are interpreted by the $(call ...) macro, so define an intermediate variable holding our settings
+PKG_CONFIGURE_VARS:=\
+	glib_cv_prog_cc_ansi_proto=no \
+	glib_cv_has__inline=yes \
+	glib_cv_has__inline__=yes \
+	glib_cv_hasinline=yes \
+	glib_cv_sane_realloc=yes \
+	glib_cv_va_copy=no \
+	glib_cv___va_copy=yes \
+	glib_cv_va_val_copy=yes \
+	glib_cv_rtldglobal_broken=no \
+	glib_cv_uscore=no \
+	glib_cv_func_pthread_mutex_trylock_posix=yes \
+	glib_cv_func_pthread_cond_timedwait_posix=yes \
+	glib_cv_sizeof_gmutex=24 \
+	glib_cv_byte_contents_gmutex="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" \
+
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		glib_cv_sizeof_gmutex=24 \
+		--enable-shared \
-		glib_cv_prog_cc_ansi_proto="no" \
+		--enable-static \
-		glib_cv_has__inline="yes" \
+		, \
-		glib_cv_has__inline__="yes" \
+		$(PKG_CONFIGURE_VARS) \
-		glib_cv_hasinline="yes" \
+	)
-		glib_cv_sane_realloc="yes" \
-		glib_cv_va_copy="no" \
-		glib_cv___va_copy="yes" \
-		glib_cv_va_val_copy="yes" \
-		glib_cv_rtldglobal_broken="no" \
-		glib_cv_uscore="no" \
-		glib_cv_func_pthread_mutex_trylock_posix="yes" \
-		glib_cv_func_pthread_cond_timedwait_posix="yes" \
-		glib_cv_sizeof_gmutex="24" \
-		glib_cv_byte_contents_gmutex="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
-		./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 \
-			--sbindir=/usr/sbin \
-			--libexecdir=/usr/lib \
-			--sysconfdir=/etc \
-			--datadir=/usr/share \
-			--localstatedir=/var \
-			--mandir=/usr/man \
-			--infodir=/usr/info \
-			$(DISABLE_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared=yes \
-			--enable-static=yes \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		install
 endef
 
-define Package/glib1/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-1.2.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/glib-config $(STAGING_DIR)/usr/bin/
@@ -116,4 +92,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc
 endef
 
+define Package/glib1/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-1.2.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,glib1))

libs/gnutls/Makefile

@@ -12,7 +12,6 @@ PKG_NAME:=gnutls
 PKG_VERSION:=1.0.25
 PKG_RELEASE:=0
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.gnutls.org/pub/gnutls/ \
 	ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/ \
@@ -22,125 +21,81 @@ PKG_SOURCE_URL:=ftp://ftp.gnutls.org/pub/gnutls/ \
 PKG_MD5SUM:=3585b5b204135e51e0efc9084b3e028b
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/libgnutls
+define Package/gnutls/Default
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libgcrypt
+  TITLE:=GNU TLS
-  TITLE:=GNU TLS library
+  DESCRIPTION:=\
-  DESCRIPTION:=The GNU TLS library.\\\
+	GnuTLS is a project that aims to develop a library which provides a \\\
-    GnuTLS is a project that aims to develop a library which provides a \\\
+	secure layer, over a reliable transport layer. Currently the GnuTLS \\\
-    secure layer, over a reliable transport layer. Currently the GnuTLS \\\
+	library implements the proposed standards by the IETF's TLS working \\\
-    library implements the proposed standards by the IETF's TLS working \\\
+	group.
-    group.\\\
-    \\\
-    This packages contains the GnuTLS shared libraries, needed by other programs.
-  URL:=http://www.gnu.org/software/gnutls/
-endef
-
-define Package/libgnutls-openssl
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=libgnutls
-  TITLE:=GNU TLS OpenSSL compatibility layer library
-  DESCRIPTION:=The GNU TLS OpenSSL compatibility layer library.\\\
-    GnuTLS is a project that aims to develop a library which provides a \\\
-    secure layer, over a reliable transport layer. Currently the GnuTLS \\\
-    library implements the proposed standards by the IETF's TLS working \\\
-    group.\\\
-    \\\
-    This packages contains the GnuTLS OpenSSL compatibility layer shared library.
   URL:=http://www.gnu.org/software/gnutls/
 endef
 
 define Package/gnutls-utils
+  $(call Package/gnutls/Default)
   SECTION:=utils
   CATEGORY:=Utilities
   DEPENDS:=+libgnutls
-  TITLE:=GNU TLS utilitis
+  TITLE+= (utilities)
-  DESCRIPTION:=The GNU TLS utilities.\\\
+  DESCRIPTION+=\\\
-    GnuTLS is a project that aims to develop a library which provides a \\\
+	\\\
-    secure layer, over a reliable transport layer. Currently the GnuTLS \\\
+	This package contains some GnuTLS utilities.
-    library implements the proposed standards by the IETF's TLS working \\\
+endef
-    group.\\\
+
-    \\\
+define Package/libgnutls
-    This packages contains some GnuTLS utilities.
+  $(call Package/gnutls/Default)
-  URL:=http://www.gnu.org/software/gnutls/
+  DEPENDS:=+libgcrypt
+  TITLE+= (library)
+  DESCRIPTION+=\\\
+	\\\
+	This package contains the GnuTLS shared libraries, needed by other programs.
+endef
+
+define Package/libgnutls-openssl
+  $(call Package/gnutls/Default)
+  DEPENDS:=libgnutls
+  TITLE+= (OpenSSL compat library)
+  DESCRIPTION+=\\\
+	\\\
+	This package contains the GnuTLS OpenSSL compatibility layer shared library.
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	(cd $(PKG_BUILD_DIR); touch \
-		touch configure.in ; \
+		configure.in \
-		touch acinclude.m4 ; \
+		acinclude.m4 \
-		touch aclocal.m4 ; \
+		aclocal.m4 \
-		touch Makefile.in ; \
+		Makefile.in \
-		touch config.h.in ; \
+		config.h.in \
-		touch configure ; \
+		configure \
-		$(TARGET_CONFIGURE_OPTS) \
+	)
-		CFLAGS="$(TARGET_CFLAGS)" \
+	$(call Build/Configure/Default, \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
+		--enable-shared \
-		LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
+		--enable-static \
-		./configure \
+		--disable-srp-authentication \
-			--target=$(GNU_TARGET_NAME) \
+		--disable-anon-authentication \
-			--host=$(GNU_TARGET_NAME) \
+		--disable-openpgp-authentication \
-			--build=$(GNU_HOST_NAME) \
+		--with-included-opencdk=yes \
-			--program-prefix="" \
+		--with-included-libtasn1=yes \
-			--program-suffix="" \
+		--with-included-libcfg=yes \
-			--prefix=/usr \
+		--without-zlib \
-			--exec-prefix=/usr \
+		--without-lzo \
-			--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_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
-			--disable-srp-authentication \
-			--disable-anon-authentication \
-			--disable-openpgp-authentication \
-			--with-included-opencdk=yes \
-			--with-included-libtasn1=yes \
-			--with-included-libcfg=yes \
-			--without-zlib \
-			--without-lzo \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libgnutls/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra}.so.* $(1)/usr/lib/
-endef
-
-define Package/libgnutls-openssl/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls-openssl.so.* $(1)/usr/lib/
-endef
-
-define Package/gnutls-utils/install
-	install -m0755 -d $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/certtool $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} $(1)/usr/bin/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/libgnutls{,-extra}-config $(STAGING_DIR)/usr/bin/
@@ -157,14 +112,29 @@ define Build/InstallDev
 endef
 
 define Build/UninstallDev
-	rm -rf \
+	rm -rf	$(STAGING_DIR)/usr/bin/libgnutls{,-extra}-config \
-		$(STAGING_DIR)/usr/bin/libgnutls{,-extra}-config \
 		$(STAGING_DIR)/usr/include/gnutls \
 		$(STAGING_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} \
 		$(STAGING_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc \
 		$(STAGING_DIR)/usr/share/aclocal/libgnutls{,-extra}.m4
 endef
 
+define Package/gnutls-utils/install
+	install -d -m0755 $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/certtool $(1)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} $(1)/usr/bin/
+endef
+
+define Package/libgnutls/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra}.so.* $(1)/usr/lib/
+endef
+
+define Package/libgnutls-openssl/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls-openssl.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,gnutls-utils))
 $(eval $(call BuildPackage,libgnutls))
 $(eval $(call BuildPackage,libgnutls-openssl))
-$(eval $(call BuildPackage,gnutls-utils))

libs/id3lib/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=id3lib
 PKG_VERSION:=3.8.3
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/id3lib
 PKG_MD5SUM:=19f27ddd2dda4b2d26a559a4f0f402a7
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -27,58 +27,28 @@ define Package/id3lib
   CATEGORY:=Libraries
   DEPENDS:=+zlib +uclibcxx
   TITLE:=An ID3v1/ID3v2 tag manipulation library
-  DESCRIPTION:=An ID3v1/ID3v2 tag manipulation library.\\\
   URL:=http://www.id3lib.org/
 endef
 
+# commas are interpreted by the $(call ...) macro, so define a intermediate variable holding our settings
+PKG_CONFIGURE_LIBS:=-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic,-lz,-lm,-lc
+
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)"  \
+		--enable-static \
-		CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -fno-rtti"  \
+		, \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(LINUX_DIR)/include" \
+		CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti"  \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		LIBS="$(PKG_CONFIGURE_LIBS)" \
-		LIBS="-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic,-lz,-lm,-lc" \
+	)
-		./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) \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
-			--with-gnu-ld \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/id3lib/install
-	install -d -m0755 $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3-*.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/id3 $(STAGING_DIR)/usr/include/
@@ -96,4 +66,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libid3-*.so.*
 endef
 
+define Package/id3lib/install
+	install -d -m0755 $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3-*.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,id3lib))

libs/libao/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=libao
 PKG_VERSION:=0.8.6
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.xiph.org/releases/ao/
 PKG_MD5SUM:=12e136a4c0995068ff134997c84421ed
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -27,63 +27,29 @@ define Package/libao
   DEPENDS:=+alsa-lib
   CATEGORY:=Libraries
   TITLE:=A cross platform audio library
-  DESCRIPTION:=A cross platform audio library.\\\
+  DESCRIPTION:=\
-    Libao is a cross-platform audio library that allows programs to \\\
+	Libao is a cross-platform audio library that allows programs to \\\
-    output audio using a simple API on a wide variety of platforms.
+	output audio using a simple API on a wide variety of platforms.
   URL:=http://www.xiph.org/ao/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(strip $(TARGET_CFLAGS))" \
+		--enable-static \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--disable-esd \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		--disable-arts \
-		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
+		--disable-nas \
-		./configure \
+		--disable-polyp \
-			--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) \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
-			--with-gnu-ld \
-			--disable-esd \
-			--disable-arts \
-			--disable-nas \
-			--disable-polyp \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libao/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libao.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/ao $(STAGING_DIR)/usr/include/
@@ -102,4 +68,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/pkgconfig/ao.pc
 endef
 
+define Package/libao/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libao.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libao))

libs/libart/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=libart
 PKG_VERSION:=2.3.17
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_lgpl-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)_lgpl-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/2.3
 PKG_MD5SUM:=f1f6b3e5490f382535dccb288f5d8b14
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_lgpl-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,59 +26,29 @@ define Package/libart
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=An high-performance 2D graphics library
-  DESCRIPTION:=An high-performance 2D graphics library.\\\
+  DESCRIPTION:=\
-    A library of functions for 2D graphics supporting a superset of the \\\
+	A library of functions for 2D graphics supporting a superset of the \\\
-    PostScript imaging model, designed to be integrated with graphics, artwork, \\\
+	PostScript imaging model, designed to be integrated with graphics, artwork, \\\
-    and illustration programs. It is written in optimized C, and is fully \\\
+	and illustration programs. It is written in optimized C, and is fully \\\
-    compatible with C++. With a small footprint of 10,000 lines of code, it is \\\
+	compatible with C++. With a small footprint of 10,000 lines of code, it is \\\
-    especially suitable for embedded applications.
+	especially suitable for embedded applications.
   URL:=http://www.levien.com/libart/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-shared \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
+		--enable-static \
-		LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
+	)
-		$(TARGET_CONFIGURE_OPTS) \
-		./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 \
-			--sbindir=/usr/sbin \
-			--libexecdir=/usr/lib \
-			--sysconfdir=/etc \
-			--datadir=/usr/share \
-			--localstatedir=/var \
-			--mandir=/usr/man \
-			--infodir=/usr/info \
-			$(DISABLE_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared=yes \
-			--enable-static=yes \
-			--disable-rpath \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		HOSTCC="$(HOSTCC)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libart/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libart_lgpl_2.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/libart2-config $(STAGING_DIR)/usr/bin/
@@ -100,4 +70,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/pkgconfig/libart-2.0.pc
 endef
 
+define Package/libart/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libart_lgpl_2.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libart))

libs/libaudiofile/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=libaudiofile
 PKG_VERSION:=0.2.6
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.cti.ecp.fr/~beauxir5/peercast
 PKG_MD5SUM:=460f848ce5f4a33ae66b15a4fb7720ec
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,60 +26,27 @@ define Package/libaudiofile
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Audio File library
-  DESCRIPTION:=Audio File library.\\\
+  DESCRIPTION:=\
-    The audiofile library allows the processing of audio data to and from audio \\\
+	The audiofile library allows the processing of audio data to and from audio \\\
-    files of many common formats (currently AIFF, AIFF-C, WAVE, NeXT/Sun, BICS, \\\
+	files of many common formats (currently AIFF, AIFF-C, WAVE, NeXT/Sun, BICS, \\\
-    and raw data).
+	and raw data).
   URL:=http://www.68k.org/~michael/audiofile/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-static \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--with-build-cc="$(HOSTCC)" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+	)
-		ac_cv_linux_vers=$(BR2_DEFAULT_KERNEL_HEADERS) \
-		./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_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared \
-			--enable-static \
-			--with-build-cc="$(HOSTCC)" \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CCOPT="$(TARGET_CFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libaudiofile/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libaudiofile.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/audiofile-config $(STAGING_DIR)/usr/bin/
@@ -104,4 +71,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/pkgconfig/libaudiofile.pc
 endef
 
+define Package/libaudiofile/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libaudiofile.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libaudiofile))

libs/libdaemon/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=libdaemon
 PKG_VERSION:=0.10
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://0pointer.de/lennart/projects/libdaemon/
 PKG_MD5SUM:=6812a5e4063b5016f25e9a0cebbd3dd9
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,69 +26,34 @@ define Package/libdaemon
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=A lightweight C library that eases the writing of UNIX daemons
-  DESCRIPTION:=A lightweight C library that eases the writing of UNIX daemons.\\\
+  DESCRIPTION:=\
-    libdaemon is a lightweight C library that eases the writing of UNIX daemons.\\\
+	libdaemon is a lightweight C library that eases the writing of UNIX daemons.\\\
-    It consists of the following parts:\\\
+	It consists of the following parts:\\\
-    \\\
+	- A wrapper around fork() which does the correct daemonization procedure of a process\\\
-      * A wrapper around fork() which does the correct daemonization procedure of a process\\\
+	- A wrapper around syslog() for simpler and compatible log output to Syslog or STDERR\\\
-      * A wrapper around syslog() for simpler and compatible log output to Syslog or STDERR\\\
+	- An API for writing PID files\\\
-      * An API for writing PID files\\\
+	- An API for serializing UNIX signals into a pipe for usage with select() or poll()\\\
-      * An API for serializing UNIX signals into a pipe for usage with select() or poll()\\\
+	- An API for running subprocesses with STDOUT and STDERR redirected to syslog\\\
-      * An API for running subprocesses with STDOUT and STDERR redirected to syslog\\\
+	\\\
-    \\\
+	APIs like these are used in most daemon software available. It is not that \\\
-    APIs like these are used in most daemon software available. It is not that \\\
+	simple to get it done right and code duplication is not a goal.
-    simple to get it done right and code duplication is not a goal.
   URL:=http://0pointer.de/lennart/projects/libdaemon/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-static \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--disable-lynx \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+	)
-		ac_cv_func_setpgrp_void=yes \
-		./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) \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
-			--with-gnu-ld \
-			--disable-lynx \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libdaemon/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/libdaemon $(STAGING_DIR)/usr/include/
@@ -109,4 +74,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/pkgconfig/libdaemon.pc
 endef
 
+define Package/libdaemon/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libdaemon))

libs/libdnet/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=libdnet
 PKG_VERSION:=1.10
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/libdnet-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=416b765e9d9961501ac85e9a366fd219
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/libdnet-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,66 +26,34 @@ define Package/libdnet
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Low-level network library
-  DESCRIPTION:=Low-level network library.\\\
+  DESCRIPTION:=\
-    libdnet is a library of simplified, portable interface to several \\\
+	libdnet is a library of simplified, portable interface to several \\\
-    low-level networking routines.
+	low-level networking routines.
   URL:=http://sourceforge.net/projects/libdnet/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	(cd $(PKG_BUILD_DIR); touch \
-		touch configure.in; \
+		configure.in \
-		touch include.m4; \
+		include.m4 \
-		touch aclocal.m4; \
+		aclocal.m4 \
-		touch Makefile.in; \
+		Makefile.in \
-		touch configure; \
+		configure \
-		$(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" \
-		ac_cv_dnet_bsd_bpf=no \
-		./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/run \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared \
-			--enable-static \
 	);
+	$(call Build/Configure/Default, \
+		--enable-shared \
+		--enable-static \
+		, \
+		ac_cv_dnet_bsd_bpf=no \
+	)
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libdnet/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdnet.so.* $(1)/usr/lib/
-	install -m0755 -d $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnet $(1)/usr/sbin/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/dnet-config $(STAGING_DIR)/usr/bin/
@@ -104,4 +72,11 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libdnet.{a,so*}
 endef
 
+define Package/libdnet/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdnet.so.* $(1)/usr/lib/
+	install -d -m0755 $(1)/usr/sbin
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnet $(1)/usr/sbin/
+endef
+
 $(eval $(call BuildPackage,libdnet))

libs/libelf/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=libelf
 PKG_VERSION:=0.8.8
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.mr511.de/software/
 PKG_MD5SUM:=be84e553686dd50c8b6d520f86f46521
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,61 +26,29 @@ define Package/libelf
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=ELF object file access library
-  DESCRIPTION:=ELF object file access library
   URL:=http://www.stud.uni-hannover.de/~michael/software/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-static \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--enable-elf64=yes \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		, \
 		mr_cv_target_elf=yes \
 		libelf_64bit=yes \
 		libelf_cv_struct_elf64_ehdr=yes \
 		libelf_cv_type_elf64_addr=no \
 		libelf_cv_struct_elf64_rel=yes \
-		./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) \
-			--enable-shared \
-			--enable-static \
-			--enable-elf64=yes \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" LD="$(TARGET_CROSS)ld" ARCH=$(ARCH) \
 		instroot="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libelf/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelf.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/libelf* $(STAGING_DIR)/usr/include/
@@ -94,4 +62,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libelf.{a,so*}
 endef
 
+define Package/libelf/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libelf.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libelf))

libs/libevent/Makefile

@@ -26,63 +26,32 @@ define Package/libevent
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Event notification library
-  DESCRIPTION:=Event notification library for event-driven network servers.\\\
+  DESCRIPTION:=\
-    The libevent API provides a mechanism to execute a callback function \\\
+	The libevent API provides a mechanism to execute a callback function \\\
-    when a specific event occurs on a file descriptor or after a timeout \\\
+	when a specific event occurs on a file descriptor or after a timeout \\\
-    has been reached. Furthermore, libevent also support callbacks due \\\
+	has been reached. Furthermore, libevent also support callbacks due \\\
-    to signals or regular timeouts.\\\
+	to signals or regular timeouts.\\\
-    \\\
+	\\\
-    libevent is meant to replace the event loop found in event driven \\\
+	libevent is meant to replace the event loop found in event driven \\\
-    network servers. An application just needs to call event_dispatch() \\\
+	network servers. An application just needs to call event_dispatch() \\\
-    and then add or remove events dynamically without having to change \\\
+	and then add or remove events dynamically without having to change \\\
-    the event loop.
+	the event loop.
   URL:=http://www.monkey.org/~provos/libevent/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-static \
-		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=/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) \
-			--enable-shared \
-			--enable-static \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libevent/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent-$(PKG_VERSION).so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/event.h $(STAGING_DIR)/usr/include/
@@ -98,4 +67,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libevent-$(PKG_VERSION).so*
 endef
 
+define Package/libevent/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent-$(PKG_VERSION).so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libevent))

libs/libgcrypt/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=libgcrypt
 PKG_VERSION:=1.2.1
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ftp.gnupg.org/gcrypt/libgcrypt/
 PKG_MD5SUM:=b6d3217c9333c520fe54d2e8dc5e60ec
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -27,63 +27,31 @@ define Package/libgcrypt
   CATEGORY:=Libraries
   DEPENDS:=+libgpg-error
   TITLE:=GNU crypto library
-  DESCRIPTION:=The GNU crypto library.\\\
+  DESCRIPTION:=\
-    This is a general purpose cryptographic library based on the code from \\\
+	This is a general purpose cryptographic library based on the code from \\\
-    GnuPG. It provides functions for all cryptograhic building blocks: \\\
+	GnuPG. It provides functions for all cryptograhic building blocks: \\\
-    symmetric ciphers (AES, DES, Blowfish, CAST5, Twofish, Arcfour), hash \\\
+	symmetric ciphers (AES, DES, Blowfish, CAST5, Twofish, Arcfour), hash \\\
-    algorithms (MD4, MD5, RIPE-MD160, SHA-1, TIGER-192), MACs (HMAC for all \\\
+	algorithms (MD4, MD5, RIPE-MD160, SHA-1, TIGER-192), MACs (HMAC for all \\\
-    hash algorithms), public key algorithms (RSA, ElGamal, DSA), large \\\
+	hash algorithms), public key algorithms (RSA, ElGamal, DSA), large \\\
-    integer functions, random numbers and a lot of supporting functions.
+	integer functions, random numbers and a lot of supporting functions.
   URL:=http://directory.fsf.org/security/libgcrypt.html
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-static \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--disable-asm \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		--with-gpg-error-prefix="$(STAGING_DIR)/usr" \
-		./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_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
-			--disable-asm \
-			--with-gpg-error-prefix="$(STAGING_DIR)/usr" \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libgcrypt/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/libgcrypt-config $(STAGING_DIR)/usr/bin/
@@ -103,4 +71,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/share/aclocal/libgcrypt.m4
 endef
 
+define Package/libgcrypt/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libgcrypt))

libs/libgdbm/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=libgdbm
 PKG_VERSION:=1.8.3
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/gdbm-$(PKG_VERSION)
 PKG_SOURCE:=gdbm-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/gdbm
 PKG_MD5SUM:=1d1b1d5c0245b1c00aff92da751e9aa1
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/gdbm-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,57 +26,24 @@ define Package/libgdbm
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=GNU database manager
-  DESCRIPTION:=GNU database manager.
   URL:=http://www.gnu.org/software/gdbm/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-static \
-		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=/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_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared \
-			--enable-static \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		BINOWN=`id -u` \
 		BINGRP=`id -g` \
-		$(TARGET_CONFIGURE_OPTS) \
 		INSTALL_ROOT="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libgdbm/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/gdbm.h $(STAGING_DIR)/usr/include/
@@ -90,4 +57,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libgdbm.{a,so*}
 endef
 
+define Package/libgdbm/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgdbm.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libgdbm))

libs/libgpg-error/Makefile

@@ -12,7 +12,6 @@ PKG_NAME:=libgpg-error
 PKG_VERSION:=1.0
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgpg-error/ \
 	http://mirrors.rootmode.com/ftp.gnupg.org/libgpg-error/ \
@@ -21,6 +20,7 @@ PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgpg-error/ \
 PKG_MD5SUM:=ff409db977e4a4897aa09ea420a28a2f
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -29,59 +29,29 @@ define Package/libgpg-error
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=GnuPG error handling helper library
-  DESCRIPTION:=An helper library for common error codes and descriptions.\\\
+  DESCRIPTION:=\
-    This is a library that defines common error values for all GnuPG \\\
+	An helper library for common error codes and descriptions.\\\
-    components.  Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, \\\
+	This is a library that defines common error values for all GnuPG \\\
-    Libksba, DirMngr, Pinentry, SmartCard Daemon and possibly more in the \\\
+	components.  Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, \\\
-    future.
+	Libksba, DirMngr, Pinentry, SmartCard Daemon and possibly more in the \\\
+	future.
   URL:=http://www.gnupg.org/related_software/libgpg-error/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-static \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--disable-rpath \
-		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=/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_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libgpg-error/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/gpg-error-config $(STAGING_DIR)/usr/bin/
@@ -101,4 +71,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/share/aclocal/gpg-error.m4
 endef
 
+define Package/libgpg-error/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libgpg-error))

libs/libid3tag/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=libid3tag
 PKG_VERSION:=0.15.1b
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/mad
 PKG_MD5SUM:=e5808ad997ba32c498803822078748c3
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -27,60 +27,27 @@ define Package/libid3tag
   CATEGORY:=Libraries
   DEPENDS:=+zlib
   TITLE:=An ID3 tag manipulation library
-  DESCRIPTION:=An ID3 tag manipulation library.\\\
+  DESCRIPTION:=\
-    libid3tag is a library for reading and (eventually) writing ID3 tags, both \\\
+	libid3tag is a library for reading and (eventually) writing ID3 tags, both \\\
-    ID3v1 and the various versions of ID3v2.
+	ID3v1 and the various versions of ID3v2.
   URL:=http://mad.sourceforge.net/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-static \
-		CPPFLAGS="-I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \
+		--disable-debugging \
-		LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
+		--disable-profiling \
-		./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_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
-			--with-gnu-ld \
-			--disable-debugging \
-			--disable-profiling \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libid3tag/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3tag.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/id3tag.h $(STAGING_DIR)/usr/include/
@@ -94,4 +61,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libid3tag.{a,so*}
 endef
 
+define Package/libid3tag/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3tag.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libid3tag))

libs/libmad/Makefile

@@ -12,87 +12,53 @@ PKG_NAME:=libmad
 PKG_VERSION:=0.15.1b
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/mad \
 	ftp://ftp.mars.org/pub/mpeg/
 PKG_MD5SUM:=1be543bc30c56fb6bea1d7bf6a64e66c
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
 FPM:=default
 ifeq ($(ARCH),i386)
-FPM:=intel
+  FPM:=intel
 endif
 ifeq ($(ARCH),mipsel)
-FPM:=mips
+  FPM:=mips
 endif
 
 define Package/libmad
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=An high-quality MPEG audio decoding library
-  DESCRIPTION:=An high-quality MPEG audio decoding library.\\\
+  DESCRIPTION:=\
-    MAD is a high-quality MPEG audio decoder. It currently supports \\\
+	MAD is a high-quality MPEG audio decoder. It currently supports \\\
-    MPEG-1 and the MPEG-2 extension to lower sampling frequencies, \\\
+	MPEG-1 and the MPEG-2 extension to lower sampling frequencies, \\\
-    as well as the de facto MPEG 2.5 format. All three audio layers - \\\
+	as well as the de facto MPEG 2.5 format. All three audio layers - \\\
-    Layer I, Layer II, and Layer III (i.e. MP3) - are fully implemented.
+	Layer I, Layer II, and Layer III (i.e. MP3) - are fully implemented.
   URL:=http://www.underbit.com/products/mad/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(strip $(TARGET_CFLAGS))" \
+		--enable-static \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--enable-fpm="$(FPM)" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		--disable-debugging \
-		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
+		--enable-speed \
-		./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) \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
-			--with-gnu-ld \
-			--enable-fpm=$(FPM) \
-			--disable-debugging \
-			--enable-speed \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libmad/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/mad.h $(STAGING_DIR)/usr/include/
@@ -106,4 +72,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libmad.{a,so*}
 endef
 
+define Package/libmad/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmad.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libmad))

libs/libol/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=libol
 PKG_VERSION:=0.3.17
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.balabit.com/downloads/libol/0.3
 PKG_MD5SUM:=28cc52e84bdb472b7830f9ad120a62a7
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,44 +26,17 @@ define Package/libol
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Support library for syslog-ng
-  DESCRIPTION:=Support library for syslog-ng.
   URL:=http://www.balabit.com/products/syslog_ng/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-static \
-		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=/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) \
-			--enable-shared \
-			--enable-static \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	# pass CFLAGS again to override -O2 set by configure
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CFLAGS="$(TARGET_CFLAGS)" \
@@ -71,11 +44,6 @@ define Build/Compile
 		all install
 endef
 
-define Package/libol/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libol.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/libol-config $(STAGING_DIR)/usr/bin/
@@ -92,4 +60,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libol.{*a,so*}
 endef
 
+define Package/libol/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libol.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libol))

libs/libosip2/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=libosip2
 PKG_VERSION:=2.2.0
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/osip
 PKG_MD5SUM:=f1237af0250c59b318bd64a59f5750ea
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -27,61 +27,29 @@ define Package/libosip2
   CATEGORY:=Libraries
   DEPENDS:=+libpthread
   TITLE:=The GNU oSIP library
-  DESCRIPTION:=The GNU oSIP library.\\\
+  DESCRIPTION:=\
-    GNU oSIP library, a Session Initiation Protocol (SIP) implementation.
+	GNU oSIP library, a Session Initiation Protocol (SIP) implementation.
   URL:=http://www.gnu.org/software/osip/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(strip $(TARGET_CFLAGS))" \
+		--enable-static \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--disable-debug \
-		LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
+		--disable-trace \
-		./configure \
+		--enable-pthread \
-			--target=$(GNU_TARGET_NAME) \
+		--enable-semaphore \
-			--host=$(GNU_TARGET_NAME) \
+		--enable-ntimer \
-			--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) \
-			--enable-shared \
-			--enable-static \
-			--with-gnu-ld \
-			--disable-debug \
-			--disable-trace \
-			--enable-pthread \
-			--enable-semaphore \
-			--enable-ntimer \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libosip2/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/osip{,parser}2 $(STAGING_DIR)/usr/include/
@@ -98,4 +66,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/pkgconfig/libosip2.pc
 endef
 
+define Package/libosip2/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libosip2))

libs/libpng/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=libpng
 PKG_VERSION:=1.2.8
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-config
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-config.tar.gz
 PKG_SOURCE_URL:=@SF/libpng
 PKG_MD5SUM:=e5a39003eed16103cbbd3b6a8bc6b1f9
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-config
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -27,55 +27,23 @@ define Package/libpng
   CATEGORY:=Libraries
   DEPENDS:=+zlib
   TITLE:=A PNG format files handling library
-  DESCRIPTION:=A PNG (Portable Network Graphics) format files handling library.
   URL:=http://www.libpng.org/pub/png/libpng.html
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-static \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--with-zlib="$(STAGING_DIR)/usr" \
-		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=/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) \
-			--enable-shared \
-			--enable-static \
-			--with-zlib=$(STAGING_DIR)/usr/ \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libpng/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/libpng{,12}-config $(STAGING_DIR)/usr/bin/
@@ -99,4 +67,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/pkgconfig/libpng{,12}.pc
 endef
 
+define Package/libpng/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpng{,12}.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libpng))

libs/libtasn1/Makefile

@@ -12,7 +12,6 @@ PKG_NAME:=libtasn1
 PKG_VERSION:=0.2.13
 PKG_RELEASE:=0
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.gnutls.org/pub/gnutls/libtasn1/ \
 	ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/libtasn1/ \
@@ -22,6 +21,7 @@ PKG_SOURCE_URL:=ftp://ftp.gnutls.org/pub/gnutls/libtasn1/ \
 PKG_MD5SUM:=d124b11908cfb88883fe71472c25d53a
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -30,63 +30,33 @@ define Package/libtasn1
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=An ASN.1 and DER structures manipulation library
-  DESCRIPTION:=An ASN.1 and DER structures manipulation library. \\\
+  DESCRIPTION:=\
-    This is a library for Abstract Syntax Notation One (ASN.1) and \\\
+	This is a library for Abstract Syntax Notation One (ASN.1) and \\\
-    Distinguish Encoding Rules (DER) manipulation.
+	Distinguish Encoding Rules (DER) manipulation.
   URL:=ftp://ftp.gnutls.org/pub/gnutls/libtasn1/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	(cd $(PKG_BUILD_DIR); touch \
-		touch configure.ac ; \
+		configure.ac \
-		touch acinclude.m4 ; \
+		acinclude.m4 \
-		touch aclocal.m4 ; \
+		aclocal.m4 \
-		touch Makefile.in ; \
+		Makefile.in \
-		touch config.h.in ; \
+		config.h.in \
-		touch configure ; \
+		configure \
-		$(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=/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_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
 	);
+	$(call Build/Configure/Default, \
+		--enable-shared \
+		--enable-static \
+	)
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libtasn1/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtasn1.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/libtasn1-config $(STAGING_DIR)/usr/bin/
@@ -106,4 +76,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/share/aclocal/libtasn1.m4
 endef
 
+define Package/libtasn1/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtasn1.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libtasn1))

libs/libusb/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=libusb
 PKG_VERSION:=0.1.10a
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/libusb
 PKG_MD5SUM:=c6062b29acd2cef414bcc34e0decbdd1
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,55 +26,22 @@ define Package/libusb
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=A library for accessing Linux USB devices
-  DESCRIPTION:=A library for accessing Linux USB devices.
   URL:=http://libusb.sourceforge.net/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-static \
-		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=/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_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared \
-			--enable-static \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" LD="$(TARGET_CROSS)ld" ARCH=$(ARCH) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libusb/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libusb*.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/libusb-config $(STAGING_DIR)/usr/bin/
@@ -91,4 +58,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libusb*.{a,so*}
 endef
 
+define Package/libusb/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libusb*.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libusb))

libs/libvorbisidec/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=libvorbisidec
 PKG_VERSION:=1.2.0-dave
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://users.tpg.com.au/davico/openwrt/
 PKG_MD5SUM:=cb8e51aab92ef164f8e0e8853f7164fa
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,61 +26,27 @@ define Package/libvorbisidec
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=A fixed-point Ogg/Vorbis decoder library
-  DESCRIPTION:=A fixed-point Ogg/Vorbis decoder library.\\\
+  DESCRIPTION:=\
-    libvorbisidec is "tremor", a fixed-point implementation of libvorbis.\\\
+	libvorbisidec is "tremor", a fixed-point implementation of libvorbis.\\\
-    It also has libogg built-in. It is suitable as a replacement for \\\
+	It also has libogg built-in. It is suitable as a replacement for \\\
-    libvorbis and libogg in tremor-aware applications.\\\
+	libvorbis and libogg in tremor-aware applications.\\\
-    Tremor is a decoder only. 
+	Tremor is a decoder only. 
   URL:=http://http://wiki.xiph.org/index.php/Tremor
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(strip $(TARGET_CFLAGS))" \
+		--enable-static \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+	)
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
-		./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) \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
-			--with-gnu-ld \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libvorbisidec/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libvorbisidec.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/tremor $(STAGING_DIR)/usr/include/
@@ -94,4 +60,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libvorbisidec.{a,so*}
 endef
 
+define Package/libvorbisidec/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libvorbisidec.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libvorbisidec))

libs/libxml2/Makefile

@@ -12,13 +12,13 @@ PKG_NAME:=libxml2
 PKG_VERSION:=2.6.20
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://xmlsoft.org/sources/ \
 	ftp://fr.rpmfind.net/pub/libxml/
 PKG_MD5SUM:=8f0b3ce721bda11401e656b90ba4e78c
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -28,83 +28,51 @@ define Package/libxml2
   CATEGORY:=Libraries
   DEPENDS:=+libpthread +zlib
   TITLE:=Gnome XML library
-  DESCRIPTION:=A library for manipulating XML and HTML resources.
+  DESCRIPTION:=\
+  	A library for manipulating XML and HTML resources.
   URL:=http://xmlsoft.org/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(strip $(TARGET_CFLAGS))" \
+		--enable-static \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--without-c14n \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		--without-catalog \
-		./configure \
+		--without-debug \
-			--target=$(GNU_TARGET_NAME) \
+		--without-docbook \
-			--host=$(GNU_TARGET_NAME) \
+		--with-html \
-			--build=$(GNU_HOST_NAME) \
+		--without-ftp \
-			--program-prefix="" \
+		--without-http \
-			--program-suffix="" \
+		--without-iconv \
-			--prefix=/usr \
+		--without-iso8859x \
-			--exec-prefix=/usr \
+		--without-legacy \
-			--bindir=/usr/bin \
+		--with-output \
-			--datadir=/usr/share \
+		--without-pattern \
-			--includedir=/usr/include \
+		--without-push \
-			--infodir=/usr/share/info \
+		--without-python \
-			--libdir=/usr/lib \
+		--with-reader \
-			--libexecdir=/usr/lib \
+		--without-readline \
-			--localstatedir=/var \
+		--without-regexps \
-			--mandir=/usr/share/man \
+		--with-sax1 \
-			--sbindir=/usr/sbin \
+		--with-schemas \
-			--sysconfdir=/etc \
+		--with-threads \
-			$(DISABLE_LARGEFILE) \
+		--with-tree \
-			$(DISABLE_NLS) \
+		--with-valid \
-			--enable-shared \
+		--with-writer \
-			--enable-static \
+		--with-xinclude \
-			--disable-rpath \
+		--with-xpath \
-			--with-gnu-ld \
+		--with-xptr \
-			--without-c14n \
+		--with-zlib \
-			--without-catalog \
+	)
-			--without-debug \
-			--without-docbook \
-			--with-html \
-			--without-ftp \
-			--without-http \
-			--without-iconv \
-			--without-iso8859x \
-			--without-legacy \
-			--with-output \
-			--without-pattern \
-			--without-push \
-			--without-python \
-			--with-reader \
-			--without-readline \
-			--without-regexps \
-			--with-sax1 \
-			--with-schemas \
-			--with-threads \
-			--with-tree \
-			--with-valid \
-			--with-writer \
-			--with-xinclude \
-			--with-xpath \
-			--with-xptr \
-			--with-zlib \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libxml2/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/xml2-config $(STAGING_DIR)/usr/bin/
@@ -131,4 +99,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
 endef
 
+define Package/libxml2/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libxml2))

libs/libxslt/Makefile

@@ -12,13 +12,13 @@ PKG_NAME:=libxslt
 PKG_VERSION:=1.1.14
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://xmlsoft.org/sources/ \
 	ftp://fr.rpmfind.net/pub/libxml/
 PKG_MD5SUM:=db71660bb7d01ccd4e6be990af8d813b
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -28,64 +28,34 @@ define Package/libxslt
   CATEGORY:=Libraries
   DEPENDS:=+libxml2
   TITLE:=Gnome XSLT library
-  DESCRIPTION:=A library for XML transformation using XSLT.
+  DESCRIPTION:=\
+  	A library for XML transformation using XSLT.
   URL:=http://xmlsoft.org/XSLT/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(strip $(TARGET_CFLAGS))" \
+		--enable-static \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/libxml2" \
+		--with-libxml-prefix="$(STAGING_DIR)/usr" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		--with-libxml-include-prefix="$(STAGING_DIR)/usr/include" \
-		./configure \
+		--with-libxml-libs-prefix="$(STAGING_DIR)/usr/lib" \
-			--target=$(GNU_TARGET_NAME) \
+		--without-python \
-			--host=$(GNU_TARGET_NAME) \
+		--without-crypto \
-			--build=$(GNU_HOST_NAME) \
+		--without-debug \
-			--program-prefix="" \
+		--without-mem-debug \
-			--program-suffix="" \
+		--without-debugger \
-			--prefix=/usr \
+		, \
-			--exec-prefix=/usr \
+		CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/libxml2" \
-			--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) \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
-			--with-gnu-ld \
-			--with-libxml-prefix="$(STAGING_DIR)/usr" \
-			--with-libxml-include-prefix="$(STAGING_DIR)/usr/include" \
-			--with-libxml-libs-prefix="$(STAGING_DIR)/usr/lib" \
-			--without-python \
-			--without-crypto \
-			--without-debug \
-			--without-mem-debug \
-			--without-debugger \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libxslt/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libxslt.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/xslt-config $(STAGING_DIR)/usr/bin/
@@ -113,4 +83,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/pkgconfig/libxslt.pc
 endef
 
+define Package/libxslt/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libxslt.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libxslt))

libs/lzo/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=lzo
 PKG_VERSION:=2.02
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.oberhumer.com/opensource/lzo/download/
 PKG_MD5SUM:=6760e5819f4238328709bf93bf10071c
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,55 +26,23 @@ define Package/liblzo
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=A real-time data compression library
-  DESCRIPTION:=A real-time data compression library.
   URL:=http://www.oberhumer.com/opensource/lzo/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(strip $(TARGET_CFLAGS))" \
+		--enable-static \
-		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=/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) \
-			--enable-shared \
-			--enable-static \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CFLAGS_O="$(TARGET_CFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/liblzo/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblzo2.so.* $(1)/usr/lib
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/lzo $(STAGING_DIR)/usr/include/
@@ -88,4 +56,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/liblzo2.{a,so*}
 endef
 
+define Package/liblzo/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/liblzo2.so.* $(1)/usr/lib
+endef
+
 $(eval $(call BuildPackage,liblzo))

libs/mysql/Makefile

@@ -12,7 +12,6 @@ PKG_NAME:=mysql
 PKG_VERSION:=5.0.18
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=\
 	http://mysql.planetmirror.com/Downloads/MySQL-5.0/ \
@@ -22,7 +21,9 @@ PKG_SOURCE_URL:=\
 PKG_MD5SUM:=f18153b0239aaa03fc5a751f2d82cb71
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
 PKG_BUILDDEP:=libncurses libreadline
 
 include $(INCLUDE_DIR)/package.mk
@@ -32,63 +33,40 @@ define Package/libmysqlclient
   CATEGORY:=Libraries
   DEPENDS:=zlib
   TITLE:=MySQL client library
-  DESCRIPTION:=MySQL client library.
   URL:=http://dev.mysql.com/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	(cd $(PKG_BUILD_DIR); touch \
-		touch configure.in; \
+		configure.in \
-		touch aclocal.m4; \
+		aclocal.m4 \
-		touch Makefile.in; \
+		Makefile.in \
-		touch config.h.in; \
+		config.h.in \
-		touch configure; \
+		configure \
-		$(TARGET_CONFIGURE_OPTS) \
+	);
-		CFLAGS="$(TARGET_CFLAGS)" \
+	$(call Build/Configure/Default, \
-		CXXFLAGS="$(TARGET_CFLAGS)" \
+		--enable-shared \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--enable-static \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		--disable-assembler \
+		--with-pthread \
+		--without-raid \
+		--with-unix-socket-path=/tmp \
+		--without-libwrap \
+		--without-pstack \
+		--with-low-memory \
+		--without-server \
+		--without-embedded-server \
+		--without-query-cache \
+		--without-mysqlfs \
+		--without-vio \
+		--without-openssl \
+		--without-docs \
+		--without-bench \
+		--without-readline \
+		--with-named-thread-libs=-lpthread \
+		, \
 		mysql_cv_compress=yes \
 		mysql_cv_gethostname_style=glibc2 \
-		./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) \
-			--enable-shared \
-			--enable-static \
-			--disable-assembler \
-			--with-pthread \
-			--without-raid \
-			--with-unix-socket-path=/tmp \
-			--without-libwrap \
-			--without-pstack \
-			--with-low-memory \
-			--without-server \
-			--without-embedded-server \
-			--without-query-cache \
-			--without-mysqlfs \
-			--without-vio \
-			--without-openssl \
-			--without-docs \
-			--without-bench \
-			--without-readline \
-			--with-named-thread-libs=-lpthread \
 	);
 endef
 
@@ -116,11 +94,6 @@ define Build/Compile
 		install
 endef
 
-define Package/libmysqlclient/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/mysql_config $(STAGING_DIR)/usr/bin/
@@ -138,4 +111,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/mysql
 endef
 
+define Package/libmysqlclient/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libmysqlclient))

libs/opencdk/Makefile

@@ -12,7 +12,6 @@ PKG_NAME:=opencdk
 PKG_VERSION:=0.5.5
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.gnutls.org/pub/gnutls/opencdk/ \
 	ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/opencdk/ \
@@ -22,6 +21,7 @@ PKG_SOURCE_URL:=ftp://ftp.gnutls.org/pub/gnutls/opencdk/ \
 PKG_MD5SUM:=aaff60107f0153873192ffda00699a96
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -31,67 +31,37 @@ define Package/libopencdk
   CATEGORY:=Libraries
   DEPENDS:=+libgcrypt
   TITLE:=The Open Crypto Development Kit library
-  DESCRIPTION:=The Open Crypto Development Kit library.\\\
+  DESCRIPTION:=\
-    This library provides basic parts of the OpenPGP message format.\\\
+	This library provides basic parts of the OpenPGP message format.\\\
-    For reference, please read the rfc2440.txt in the doc/ directory.\\\
+	For reference, please read the rfc2440.txt in the doc/ directory.\\\
-    Due to some possible security problems, the library also implements \\\
+	Due to some possible security problems, the library also implements \\\
-    parts of draft-ietf-openpgp-rfc2440bis-08.txt. If you want to exchange \\\
+	parts of draft-ietf-openpgp-rfc2440bis-08.txt. If you want to exchange \\\
-    messages with earlier PGP version < 7, you should use the compat mode.
+	messages with earlier PGP version < 7, you should use the compat mode.
   URL:=ftp://ftp.gnutls.org/pub/gnutls/opencdk/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	(cd $(PKG_BUILD_DIR); touch \
-		touch configure.ac ; \
+		configure.ac \
-		touch acinclude.m4 ; \
+		acinclude.m4 \
-		touch aclocal.m4 ; \
+		aclocal.m4 \
-		touch Makefile.in ; \
+		Makefile.in \
-		touch config.h.in ; \
+		config.h.in \
-		touch configure ; \
+		configure \
-		$(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=/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_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
-			--with-libgcrypt-prefix="$(STAGING_DIR)/usr" \
 	);
+	$(call Build/Configure/Default, \
+		--enable-shared \
+		--enable-static \
+		--with-libgcrypt-prefix="$(STAGING_DIR)/usr" \
+	)
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libopencdk/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libopencdk.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/opencdk-config $(STAGING_DIR)/usr/bin/
@@ -108,4 +78,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libopencdk.{a,so*}
 endef
 
+define Package/libopencdk/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libopencdk.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libopencdk))

libs/pcre/Makefile

@@ -12,52 +12,28 @@ PKG_NAME:=pcre
 PKG_VERSION:=5.0
 PKG_RELEASE:=3
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/pcre
 PKG_MD5SUM:=813850808894d99fb5b1c41ec6335d4f
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libpcre
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=A Perl Compatible Regular Expression library
-  DESCRIPTION:=A Perl Compatible Regular Expression library.
   URL:=http://www.pcre.org/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-static \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--enable-utf8 \
-		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=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=$(STAGING_DIR)/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_LARGEFILE) \
-			$(DISABLE_NLS) \
-			--enable-shared \
-			--enable-static \
-			--enable-utf8 \
-	);
 endef
 
 define Build/Compile
@@ -72,11 +48,6 @@ define Build/Compile
 		all
 endef
 
-define Package/libpcre/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/.libs/libpcre{,posix}.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/bin
 	$(CP) $(PKG_BUILD_DIR)/pcre-config $(STAGING_DIR)/usr/bin/
@@ -93,4 +64,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libpcre{,posix}.{a,so*}
 endef
 
+define Package/libpcre/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/.libs/libpcre{,posix}.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libpcre))

libs/radiusclient-ng/Makefile

@@ -12,27 +12,32 @@ PKG_NAME:=radiusclient-ng
 PKG_VERSION:=0.5.2
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://download.berlios.de/radiusclient-ng/
 PKG_MD5SUM:=c54eb70e964bdd22dd44b39a9b4df8ca
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
+define Package/radiusclient-ng/Default
+  DESCRIPTION:=\
+	Purpose of this project is to build a portable, easy-to-use and standard \\\
+	compliant library suitable for developing free and commercial software \\\
+	that need support for RADIUS protocol (RFCs 2128 and 2139).
+  URL:=http://developer.berlios.de/projects/radiusclient-ng/
+endef
+  
 define Package/libradiusclient-ng
+  $(call Package/radiusclient-ng/Default)
   SECTION:=libs
   CATEGORY:=Libraries
-  TITLE:=A RADIUS client library
+  TITLE:=RADIUS client library
-  DESCRIPTION:=A RADIUS client library.\\\
+  DESCRIPTION+=\\\
-    Purpose of this project is to build a portable, easy-to-use and standard \\\
+	\\\
-    compliant library suitable for developing free and commercial software \\\
+	This package contains shared libraries, needed by other programs.
-    that need support for RADIUS protocol (RFCs 2128 and 2139).\\\
-    \\\
-    This package contains shared libraries, needed by other programs.
-  URL:=http://developer.berlios.de/projects/radiusclient-ng/
 endef
 
 define Package/libradiusclient-ng/conffiles
@@ -43,72 +48,29 @@ define Package/libradiusclient-ng/conffiles
 endef
 
 define Package/radiusclient-ng
+  $(call Package/radiusclient-ng/Default)
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=+libradiusclient-ng
-  TITLE:=A RADIUS client
+  TITLE:=RADIUS client
-  DESCRIPTION:=A RADIUS client.\\\
+  DESCRIPTION+=\\\
-    Purpose of this project is to build a portable, easy-to-use and standard \\\
+	\\\
-    compliant library suitable for developing free and commercial software \\\
+	This package contains a RADIUS client.
-    that need support for RADIUS protocol (RFCs 2128 and 2139).\\\
-    \\\
-    This package contains a RADIUS client.
-  URL:=http://www.balabit.com/products/syslog_ng/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-static \
-		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=/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) \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
-			--with-gnu-ld \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libradiusclient-ng/install
-	install -d -m0755 $(1)/etc
-	$(CP) $(PKG_INSTALL_DIR)/etc/radiusclient-ng $(1)/etc/
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libradiusclient-ng.so.* $(1)/usr/lib/
-endef
-
-define Package/radiusclient-ng/install
-	install -d -m0755 $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/rad{acct,iusclient,login,status} $(1)/usr/sbin/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/radiusclient-ng.h $(STAGING_DIR)/usr/include/
@@ -122,5 +84,17 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libradiusclient-ng.{a,so}*
 endef
 
+define Package/libradiusclient-ng/install
+	install -d -m0755 $(1)/etc
+	$(CP) $(PKG_INSTALL_DIR)/etc/radiusclient-ng $(1)/etc/
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libradiusclient-ng.so.* $(1)/usr/lib/
+endef
+
+define Package/radiusclient-ng/install
+	install -d -m0755 $(1)/usr/sbin
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/rad{acct,iusclient,login,status} $(1)/usr/sbin/
+endef
+
 $(eval $(call BuildPackage,libradiusclient-ng))
 $(eval $(call BuildPackage,radiusclient-ng))

libs/readline/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=readline
 PKG_VERSION:=5.1
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/readline
 PKG_MD5SUM:=7ee5a692db88b30ca48927a13fd60e46
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,61 +26,30 @@ define Package/libreadline
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Command lines edition library
-  DESCRIPTION:=Command lines edition library\\\
+  DESCRIPTION:=\
-    The Readline library provides a set of functions for use by applications \\\
+	The Readline library provides a set of functions for use by applications \\\
-    that allow users to edit command lines as they are typed in. Both Emacs \\\
+	that allow users to edit command lines as they are typed in. Both Emacs \\\
-    and vi editing modes are available. The Readline library includes \\\
+	and vi editing modes are available. The Readline library includes \\\
-    additional functions to maintain a list of previously-entered command \\\
+	additional functions to maintain a list of previously-entered command \\\
-    lines, to recall and perhaps reedit those lines, and perform csh-like \\\
+	lines, to recall and perhaps reedit those lines, and perform csh-like \\\
-    history expansion on previous commands.
+	history expansion on previous commands.
   URL:=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(strip $(TARGET_CFLAGS))" \
+		--enable-static \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--without-curses \
-		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=/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) \
-			--enable-shared \
-			--enable-static \
-			--without-curses \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libreadline/install
-	install -m0755 -d $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/readline $(STAGING_DIR)/usr/include/
@@ -94,4 +63,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/lib{history,readline}.{a,so*}
 endef
 
+define Package/libreadline/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{history,readline}.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libreadline))

libs/serdisplib/Makefile

@@ -12,65 +12,36 @@ PKG_NAME:=serdisplib
 PKG_VERSION:=1.96
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/serdisplib
 PKG_MD5SUM:=b074e02d8d63f34cba8ec45c23f63f78
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/serdisplib
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=A display control library
-  DESCRIPTION:=A display control library.\\\
+  DESCRIPTION:=\
-    serdisplib is a library to drive serial and parallel displays \\\
+	serdisplib is a library to drive serial and parallel displays \\\
-    with built-in controllers.
+	with built-in controllers.
   URL:=http://serdisplib.sourceforge.net/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-static \
-		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=/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) \
-			--enable-shared \
-			--disable-static \
-			--with-gnu-ld \
-	);
 endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) all
 endef
 
-define Package/serdisplib/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libserdisp.so.* $(1)/usr/lib
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_BUILD_DIR)/include/serdisplib $(STAGING_DIR)/usr/include/
@@ -84,4 +55,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/libserdisp.{a,so*}
 endef
 
+define Package/serdisplib/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/lib/libserdisp.so.* $(1)/usr/lib
+endef
+
 $(eval $(call BuildPackage,serdisplib))

libs/speex/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=speex
 PKG_VERSION:=1.1.8
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://us.speex.org/download 
 PKG_MD5SUM:=734892c8ca5e7e835828048a1289a0cc
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,66 +26,34 @@ define Package/libspeex
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=Open source speech compression codec library
-  DESCRIPTION:=Open source patent-free speech compression codec library.\\\
+  DESCRIPTION:=\
-    Speex is an Open Source/Free Software patent-free audio compression \\\
+	Open source patent-free speech compression codec library.\\\
-    format designed for speech. The Speex Project aims to lower the \\\
+	Speex is an Open Source/Free Software patent-free audio compression \\\
-    barrier of entry for voice applications by providing a free \\\
+	format designed for speech. The Speex Project aims to lower the \\\
-    alternative to expensive proprietary speech codecs. Moreover, Speex \\\
+	barrier of entry for voice applications by providing a free \\\
-    is well-adapted to Internet applications and provides useful features \\\
+	alternative to expensive proprietary speech codecs. Moreover, Speex \\\
-    that are not present in most other codecs.\\\
+	is well-adapted to Internet applications and provides useful features \\\
-    \\\
+	that are not present in most other codecs.\\\
-    This package contains the shared codec library, needed by other programs.
+	\\\
+	This package contains the shared codec library, needed by other programs.
   URL:=http://www.speex.org/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(strip $(TARGET_CFLAGS))" \
+		--enable-static \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--disable-oggtest \
-		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=/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) \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
-			--with-gnu-ld \
-			--disable-oggtest \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 	  	bin_PROGRAMS="" \
 		all install
 endef
 
-define Package/libspeex/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/speex $(STAGING_DIR)/usr/include/
@@ -104,4 +72,9 @@ define Build/UninstallDev
 		$(STAGING_DIR)/usr/lib/pkgconfig/speex.pc
 endef
 
+define Package/libspeex/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libspeex.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libspeex))

libs/sqlite2/Makefile

@@ -12,50 +12,54 @@ PKG_NAME:=sqlite2
 PKG_VERSION:=2.8.17
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/sqlite-$(PKG_VERSION)
 PKG_SOURCE:=sqlite-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.sqlite.org/
 PKG_MD5SUM:=838dbac20b56d2c4292e98848505a05b
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/sqlite-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
 PKG_BUILDDEP:=libncurses libreadline
 
 include $(INCLUDE_DIR)/package.mk
 
+define Package/sqlite2/Default
+  TITLE:=SQLite (v2.x) database engine
+  DESCRIPTION:=\
+	SQLite is a small C library that implements a self-contained, embeddable, \\\
+	zero-configuration SQL database engine.
+  URL:=http://www.sqlite.org/
+endef
+
 define Package/libsqlite2
+  $(call Package/sqlite2/Default)
   SECTION:=libs
   CATEGORY:=Libraries
-  TITLE:=Self-contained SQL database engine
+  TITLE+= (library)
-  DESCRIPTION:=Self-contained, embeddable, zero-configuration SQL database engine.\\\
+  DESCRIPTION+=\\\
-    SQLite is a small C library that implements a self-contained, embeddable, \\\
+	\\\
-    zero-configuration SQL database engine.\\\
+	This package contains the SQLite (v2.x) shared library, used by other programs.
-    \\\
-    This package contains the shared library, needed by other programs.
-  URL:=http://www.sqlite.org/
 endef
 
 define Package/sqlite2-cli
+  $(call Package/sqlite2/Default)
   SECTION:=utils
   CATEGORY:=Utilities
   DEPENDS:=+libsqlite2 +libncurses +libreadline
-  TITLE:=Command line interface for SQLite
+  TITLE+= (cli)
-  DESCRIPTION:=Command line interface for SQLite.\\\
+  DESCRIPTION+=\\\
-    SQLite is a small C library that implements a self-contained, embeddable, \\\
+	\\\
-    zero-configuration SQL database engine.\\\
+	This package contains a terminal-based front-end to the SQLite (v2.x) library \\\
-    \\\
+	that can evaluate queries interactively and display the results in \\\
-    This package contains a terminal-based front-end to the SQLite library \\\
+	multiple formats.
-    that can evaluate queries interactively and display the results in \\\
-    multiple formats.
-  URL:=http://www.sqlite.org/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-static \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		, \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
 		config_BUILD_CC="$(HOSTCC)" \
 		config_BUILD_CFLAGS="-O2" \
 		config_TARGET_CC="$(TARGET_CC)" \
@@ -63,48 +67,15 @@ define Build/Configure
 		config_TARGET_READLINE_INC="-I$(STAGING_DIR)/usr/include" \
 		config_TARGET_READLINE_LIBS="-L$(STAGING_DIR)/usr/lib -lreadline -lncurses" \
 		config_TARGET_TCL_INC="-DNO_TCL=1" \
-		./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) \
-			--enable-shared \
-			--enable-static \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libsqlite2/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite.so.* $(1)/usr/lib/
-endef
-
-define Package/sqlite2-cli/install
-	install -d -m0755 $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/sqlite $(1)/usr/bin/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite.h $(STAGING_DIR)/usr/include/
@@ -117,11 +88,20 @@ define Build/InstallDev
 endef
 
 define Build/UninstallDev
-	rm -rf \
+	rm -rf	$(STAGING_DIR)/usr/include/sqlite.h \
-		$(STAGING_DIR)/usr/include/sqlite.h \
 		$(STAGING_DIR)/usr/lib/libsqlite.{a,so*} \
 		$(STAGING_DIR)/usr/lib/pkgconfig/sqlite.pc
 endef
 
+define Package/libsqlite2/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite.so.* $(1)/usr/lib/
+endef
+
+define Package/sqlite2-cli/install
+	install -d -m0755 $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/sqlite $(1)/usr/bin/
+endef
+
 $(eval $(call BuildPackage,libsqlite2))
 $(eval $(call BuildPackage,sqlite2-cli))

libs/sqlite3/Makefile

@@ -12,100 +12,69 @@ PKG_NAME:=sqlite
 PKG_VERSION:=3.3.3
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.sqlite.org/
 PKG_MD5SUM:=eb5d9d7e7853b3af78e767d709b7fced
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
 PKG_BUILDDEP:=libncurses libreadline
 
 include $(INCLUDE_DIR)/package.mk
 
+define Package/sqlite3/Default
+  TITLE:=SQLite (v3.x) database engine
+  DESCRIPTION:=\
+	SQLite is a small C library that implements a self-contained, embeddable, \\\
+	zero-configuration SQL database engine.
+  URL:=http://www.sqlite.org/
+endef
+
 define Package/libsqlite3
+  $(call Package/sqlite3/Default)
   SECTION:=libs
   CATEGORY:=Libraries
-  TITLE:=Self-contained SQL database engine
+  TITLE+= (library)
-  DESCRIPTION:=Self-contained, embeddable, zero-configuration SQL database engine.\\\
+  DESCRIPTION+=\\\
-    SQLite is a small C library that implements a self-contained, embeddable, \\\
+	This package contains the SQLite (v3.x) shared library, used by other programs.
-    zero-configuration SQL database engine.\\\
-    \\\
-    This package contains the shared library, needed by other programs.
-  URL:=http://www.sqlite.org/
 endef
 
 define Package/sqlite3-cli
+  $(call Package/sqlite3/Default)
   SECTION:=utils
   CATEGORY:=Utilities
   DEPENDS:=+libsqlite3 +libncurses +libreadline
-  TITLE:=Command line interface for SQLite
+  TITLE+= (cli)
-  DESCRIPTION:=Command line interface for SQLite.\\\
+  DESCRIPTION+=\\\
-    SQLite is a small C library that implements a self-contained, embeddable, \\\
+	\\\
-    zero-configuration SQL database engine.\\\
+	This package contains a terminal-based front-end to the SQLite (v3.x) library \\\
-    \\\
+	that can evaluate queries interactively and display the results in \\\
-    This package contains a terminal-based front-end to the SQLite library \\\
+	multiple formats.
-    that can evaluate queries interactively and display the results in \\\
-    multiple formats.
-  URL:=http://www.sqlite.org/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-static \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--disable-tcl \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		, \
 		config_BUILD_CC="$(HOSTCC)" \
 		config_BUILD_CFLAGS="-O2" \
 		config_TARGET_CC="$(TARGET_CC)" \
 		config_TARGET_CFLAGS="$(TARGET_CFLAGS)" \
 		config_TARGET_READLINE_INC="-I$(STAGING_DIR)/usr/include" \
 		config_TARGET_READLINE_LIBS="-L$(STAGING_DIR)/usr/lib -lreadline -lncurses" \
-		./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) \
-			--enable-shared \
-			--enable-static \
-			--disable-tcl \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libsqlite3/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.so.* $(1)/usr/lib/
-endef
-
-define Package/sqlite3-cli/install
-	install -d -m0755 $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/sqlite3 $(1)/usr/bin/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite3.h $(STAGING_DIR)/usr/include/
@@ -118,11 +87,20 @@ define Build/InstallDev
 endef
 
 define Build/UninstallDev
-	rm -rf \
+	rm -rf	$(STAGING_DIR)/usr/include/sqlite3.h \
-		$(STAGING_DIR)/usr/include/sqlite3.h \
 		$(STAGING_DIR)/usr/lib/libsqlite3.{a,so*} \
 		$(STAGING_DIR)/usr/lib/pkgconfig/sqlite3.pc
 endef
 
+define Package/libsqlite3/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.so.* $(1)/usr/lib/
+endef
+
+define Package/sqlite3-cli/install
+	install -d -m0755 $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/sqlite3 $(1)/usr/bin/
+endef
+
 $(eval $(call BuildPackage,libsqlite3))
 $(eval $(call BuildPackage,sqlite3-cli))

net/chillispot/Makefile

@@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=chillispot
 PKG_VERSION:=1.1.0
 PKG_RELEASE:=1
-PKG_MD5SUM:=9d2597756af3fa14d7331b4a3651fc9b
 
-PKG_SOURCE_URL:=http://www.chillispot.org/download
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.chillispot.org/download
+PKG_MD5SUM:=9d2597756af3fa14d7331b4a3651fc9b
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -27,14 +27,14 @@ define Package/chillispot
   CATEGORY:=Network
   DEPENDS:=@+PACKAGE_KMOD_TUN
   TITLE:=Wireless LAN HotSpot controller
-  DESCRIPTION:=Wireless LAN HotSpot controller\\\
+  DESCRIPTION:=\
-    ChilliSpot is an open source captive portal or wireless LAN \\\
+	ChilliSpot is an open source captive portal or wireless LAN \\\
-    access point controller. It is used for authenticating users \\\
+	access point controller. It is used for authenticating users \\\
-    of a wireless LAN. It supports web based login which is today's \\\
+	of a wireless LAN. It supports web based login which is today's \\\
-    standard for public HotSpots and it supports Wireless Protected \\\
+	standard for public HotSpots and it supports Wireless Protected \\\
-    Access (WPA) which is the standard of the future. Authentication, \\\
+	Access (WPA) which is the standard of the future. Authentication, \\\
-    authorization and accounting (AAA) is handled by your favorite \\\
+	authorization and accounting (AAA) is handled by your favorite \\\
-    radius server.
+	radius server.
   URL:=http://www.chillispot.org/
 endef
 
@@ -42,43 +42,10 @@ define Package/chillispot/conffiles
 /etc/chilli.conf
 endef
 
-define Build/Configure
+# uses GNU configure
-	(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=/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) \
-			--enable-shared \
-			--disable-static \
-			--with-gnu-ld \
-	);
-endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef

net/ez-ipupdate/Makefile

@@ -12,20 +12,20 @@ PKG_NAME:=ez-ipupdate
 PKG_VERSION:=3.0.11b8
 PKG_RELEASE:=2
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/e/ez-ipupdate \
 	http://ftp.de.debian.org/debian/pool/main/e/ez-ipupdate
 PKG_MD5SUM:=000211add4c4845ffa4211841bff4fb0
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ez-ipupdate
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Dynamic DNS services client
-  DESCRIPTION:=Dynamic DNS services client.
   URL:=http://ez-ipupdate.com/
 endef
 
@@ -33,44 +33,19 @@ define Package/ez-ipupdate/conffiles
 /etc/ez-ipupdate.conf
 endef
 
-define Build/Configure
+# uses GNU configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		./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) \
-	);
-endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR)
 endef
 
 define Package/ez-ipupdate/install
-	install -d -m0755 $(1)/etc
-	install -m0600 ./files/$(PKG_NAME).conf $(1)/etc/
-	install -d -m0755 $(1)/etc/hotplug.d/iface
-	install -m0755 ./files/$(PKG_NAME).hotplug $(1)/etc/hotplug.d/iface/10-$(PKG_NAME)
 	install -d -m0755 $(1)/usr/sbin
-	install -m0755 $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/
+	install -m0755 $(PKG_BUILD_DIR)/ez-ipupdate $(1)/usr/sbin/
+	install -d -m0755 $(1)/etc
+	install -m0600 ./files/ez-ipupdate.conf $(1)/etc/
+	install -d -m0755 $(1)/etc/hotplug.d/iface
+	install -m0755 ./files/ez-ipupdate.hotplug $(1)/etc/hotplug.d/iface/10-ez-ipupdate
 endef
 
 $(eval $(call BuildPackage,ez-ipupdate))

net/gmediaserver/Makefile

@@ -1,3 +1,4 @@
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -10,10 +11,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=gmediaserver
 PKG_VERSION:=0.9.0
 PKG_RELEASE:=1
-PKG_MD5SUM:=93de0f8dcbc1353a0d0dd5b5ab4b3142
 
-PKG_SOURCE_URL:=http://savannah.nongnu.org/download/gmediaserver/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://savannah.nongnu.org/download/gmediaserver/
+PKG_MD5SUM:=93de0f8dcbc1353a0d0dd5b5ab4b3142
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -26,65 +27,33 @@ define Package/gmediaserver
   CATEGORY:=Network
   DEPENDS:=+id3lib +libupnp
   TITLE:=An UPnP music media server
-  DESCRIPTION:=An UPnP music media server.
   URL:=http://www.nongnu.org/gmediaserver/
 endef
 
-
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--disable-rpath \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--with-id3lib="$(STAGING_DIR)/usr" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--with-libupnp="$(STAGING_DIR)/usr" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		, \
 		LIBS=" -lixml -lthreadutil -lupnp -luClibc++ -lz" \
 		am_cv_func_iconv=no \
-		./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) \
-			--enable-shared \
-			--disable-static \
-			--disable-rpath \
-			--with-gnu-ld \
-			--with-id3lib="$(STAGING_DIR)/usr" \
-			--with-libupnp="$(STAGING_DIR)/usr" \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
 define Package/gmediaserver/install
-	install -m0755 -d $(1)/etc/default
+	install -d -m0755 $(1)/usr/sbin
-	install -m0644 ./files/gmediaserver.default $(1)/etc/default/gmediaserver
-	install -m0755 -d $(1)/etc/init.d
-	install -m0755 ./files/gmediaserver.init $(1)/etc/init.d/gmediaserver
-	install -m0755 -d $(1)/usr/sbin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/gmediaserver $(1)/usr/sbin/
-	$(RSTRIP) $(1)
+	install -d -m0755 $(1)/etc/default
-	$(IPKG_BUILD) $(1) $(PACKAGE_DIR)
+	install -m0644 ./files/gmediaserver.default $(1)/etc/default/gmediaserver
+	install -d -m0755 $(1)/etc/init.d
+	install -m0755 ./files/gmediaserver.init $(1)/etc/init.d/gmediaserver
 endef
 
 $(eval $(call BuildPackage,gmediaserver))

net/icecast/Makefile

@@ -1,3 +1,4 @@
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -10,10 +11,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=icecast
 PKG_VERSION:=2.3.0
 PKG_RELEASE:=1
-PKG_MD5SUM:=35256fbc4a93571662af2ed18fbbfcc5
 
-PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/icecast/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/icecast/
+PKG_MD5SUM:=35256fbc4a93571662af2ed18fbbfcc5
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -26,61 +27,33 @@ define Package/icecast
   CATEGORY:=Network
   DEPENDS:=+libcurl +libvorbisidec +libxml2 +libxslt
   TITLE:=A streaming media server for Ogg/Vorbis and MP3 audio streams
-  DESCRIPTION:=Icecast is a streaming media server which currently supports Ogg\\\
+  DESCRIPTION:=\
-Vorbis and MP3 audio streams. It can be used to create an Internet\\\
+	Icecast is a streaming media server which currently supports Ogg \\\
-radio station or a privately running jukebox and many things in\\\
+	Vorbis and MP3 audio streams. It can be used to create an Internet \\\
-between. It is very versatile in that new formats can be added\\\
+	radio station or a privately running jukebox and many things in \\\
-relatively easily and supports open standards for commuincation and\\\
+	between. It is very versatile in that new formats can be added \\\
-interaction.\\\
+	relatively easily and supports open standards for commuincation and \\\
+	interaction.
   URL:=http://www.icecast.org/
 endef
 
 
 define Build/Configure
-        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+	$(call Build/Configure/Default, \
-                $(TARGET_CONFIGURE_OPTS) \
+		--enable-yp \
-                CFLAGS="$(TARGET_CFLAGS)" \
+		--with-curl="yes" \
-                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/libxml2 " \
+		--with-curl-config="$(STAGING_DIR)/usr/bin/curl-config" \
-                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		--with-ogg="$(STAGING_DIR)/usr" \
-                PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
+		--with-speex="no" \
-                ./configure \
+		--with-theora="no" \
-                        --target=$(GNU_TARGET_NAME) \
+		--with-vorbis="$(STAGING_DIR)/usr" \
-                        --host=$(GNU_TARGET_NAME) \
+		--with-xslt-config="$(STAGING_DIR)/usr/bin/xslt-config" \
-                        --build=$(GNU_HOST_NAME) \
+		, \
-                        --program-prefix="" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/libxml2 " \
-                        --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) \
-                        --enable-shared \
-                        --disable-static \
-                        --disable-rpath \
-                        --with-gnu-ld \
-                        --enable-yp \
-                        --with-curl="yes" \
-                        --with-curl-config="$(STAGING_DIR)/usr/bin/curl-config" \
-                        --with-ogg="$(STAGING_DIR)/usr" \
-                        --with-speex="no" \
-                        --with-theora="no" \
-                        --with-vorbis="$(STAGING_DIR)/usr" \
-                        --with-xslt-config="$(STAGING_DIR)/usr/bin/xslt-config" \
-        );
 endef
 
 define Build/Compile	
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install

net/knock/Makefile

@@ -1,3 +1,9 @@
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id$
 
 include $(TOPDIR)/rules.mk
@@ -5,10 +11,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=knock
 PKG_VERSION:=0.5
 PKG_RELEASE:=1
-PKG_MD5SUM:=ca09d61458974cff90a700aba6120891
 
-PKG_SOURCE_URL:=http://www.zeroflux.org/knock/files/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.zeroflux.org/knock/files/
+PKG_MD5SUM:=ca09d61458974cff90a700aba6120891
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -16,83 +22,54 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/knock
+define Package/knock/Default
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=+libpcap
-  TITLE:=A port-knocking client
+  TITLE:=Port-knocking
-  DESCRIPTION:=It listens to all traffic on an ethernet (or PPP) interface,\\\
+  DESCRIPTION:=\
-looking for special "knock" sequences of port-hits. A client\\\
+	It listens to all traffic on an ethernet (or PPP) interface, \\\
-makes these port-hits by sending a TCP (or UDP) packet to a\\\
+	looking for special "knock" sequences of port-hits. A client \\\
-port on the server. This port need not be open -- since\\\
+	makes these port-hits by sending a TCP (or UDP) packet to a \\\
-knockd listens at the link-layer level, it sees all traffic\\\
+	port on the server. This port need not be open -- since \\\
-even if it's destined for a closed port. When the server\\\
+	knockd listens at the link-layer level, it sees all traffic \\\
-detects a specific sequence of port-hits, it runs a command\\\
+	even if it's destined for a closed port. When the server \\\
-defined in its configuration file. This can be used to open\\\
+	detects a specific sequence of port-hits, it runs a command \\\
-up holes in a firewall for quick access.\\\
+	defined in its configuration file. This can be used to open \\\
+	up holes in a firewall for quick access.
   URL:=http://www.zeroflux.org/cgi-bin/cvstrac/knock/wiki
 endef
 
+define Package/knock
+  $(call Package/knock/Default)
+  TITLE+= client
+  DESCRIPTION+=\\\
+	\\\
+	This package contains the port-knocking client.
+endef
+
 define Package/knockd
-  SECTION:=net
+  $(call Package/knock/Default)
-  CATEGORY:=Network
+  TITLE+= server
-  DEPENDS:=+libpcap
+  DESCRIPTION+=\\\
-  TITLE:=A port-knocking server
+	\\\
-  DESCRIPTION:=It listens to all traffic on an ethernet (or PPP) interface,\\\
+	This package contains the port-knocking server.
-looking for special "knock" sequences of port-hits. A client\\\
-makes these port-hits by sending a TCP (or UDP) packet to a\\\
-port on the server. This port need not be open -- since\\\
-knockd listens at the link-layer level, it sees all traffic\\\
-even if it's destined for a closed port. When the server\\\
-detects a specific sequence of port-hits, it runs a command\\\
-defined in its configuration file. This can be used to open\\\
-up holes in a firewall for quick access.\\\
-  URL:=http://www.zeroflux.org/cgi-bin/cvstrac/knock/wiki
 endef
 
 define Package/knockd/conffiles
 /etc/knockd.conf
 endef
 
-
 define Build/Configure
-        (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+	$(call Build/Configure/Default, \
-                $(TARGET_CONFIGURE_OPTS) \
+		, \
-                CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \
-                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
                 ac_cv_lib_pcap_pcap_open_live=yes \
-                ./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/kismet \
-                        $(DISABLE_LARGEFILE) \
-                        $(DISABLE_NLS) \
-                        --enable-shared \
-                        --disable-static \
-                        --disable-rpath \
-                        --with-gnu-ld \
-        );
 endef
 	
 define Build/Compile	
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CFLAGS="-I$(STAGING_DIR)/usr/include" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef

net/matrixtunnel/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=matrixtunnel
 PKG_VERSION:=0.1
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://znerol.ch/files
 PKG_MD5SUM:=ffbbe0c50cc1863f6080aca302f7e2c8
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -27,55 +27,29 @@ define Package/matrixtunnel
   CATEGORY:=Network
   DEPENDS:=+libmatrixssl
   TITLE:=SSL tunnel based on matrixssl
-  DESCRIPTION:=SSL tunnel based on matrixssl.\\\
+  DESCRIPTION:=\
-    matrixtunnel is a stripped down version of stunnel \\\
+	matrixtunnel is a stripped down version of stunnel \\\
-    based on matrixssl library
+	based on matrixssl library.
   URL:=http://znerol.ch/svn/matrixtunnel/trunk/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--without-libiconv-prefix \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--without-libintl-prefix \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--with-matrixssl-src="$(BUILD_DIR)/matrixssl" \
-		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=/usr/sbin \
-			--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) \
-			--without-libiconv-prefix \
-			--without-libintl-prefix \
-			--with-matrixssl-src=$(BUILD_DIR)/matrixssl \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR)/src \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
 define Package/matrixtunnel/install
-	install -d -m0755 $(1)/usr/sbin
+	install -d -m0755 $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/matrixtunnel $(1)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/matrixtunnel $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,matrixtunnel))

net/mtr/Makefile

@@ -11,11 +11,12 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=mtr
 PKG_VERSION:=0.69
 PKG_RELEASE:=1
-PKG_MD5SUM:=58904d6d8d70114195cdeb653d56914c
 
-PKG_SOURCE_URL:=ftp://ftp.bitwizard.nl/mtr/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=ftp://ftp.bitwizard.nl/mtr/
+PKG_MD5SUM:=58904d6d8d70114195cdeb653d56914c
 PKG_CAT:=zcat
+
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
@@ -26,63 +27,38 @@ define Package/mtr
   CATEGORY:=Network
   DEPENDS:=+libncurses
   TITLE:=Full screen ncurses traceroute tool
-  DESCRIPTION:=mtr combines the functionality of the 'traceroute' and 'ping' programs\\\
+  DESCRIPTION:=\
+	mtr combines the functionality of the 'traceroute' and 'ping' programs \\\
 	in a single network diagnostic tool.\\\
-	As mtr starts, it investigates the network connection between the host\\\
+	As mtr starts, it investigates the network connection between the host \\\
-	mtr runs on and a user-specified destination host.  After it\\\
+	mtr runs on and a user-specified destination host.  After it \\\
-	determines the address of each network hop between the machines,\\\
+	determines the address of each network hop between the machines, \\\
-	it sends a sequence ICMP ECHO requests to each one to determine the\\\
+	it sends a sequence ICMP ECHO requests to each one to determine the \\\
-	quality of the link to each machine.  As it does this, it prints\\\
+	quality of the link to each machine.  As it does this, it prints \\\
-	running statistics about each machine.\\\
+	running statistics about each machine.
   URL:=http://www.bitwizard.nl/mtr/
 endef
 
 define Build/Configure
-    (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
+	(cd $(PKG_BUILD_DIR); touch \
-		touch configure.in; \
+		configure.in \
-		touch aclocal.m4; \
+		aclocal.m4 \
-		touch Makefile.in; \
+		Makefile.in \
-		touch img/Makefile.in; \
+		img/Makefile.in \
-		touch stamp-h.in; \
+		stamp-h.in \
-		touch config.h.in; \
+		config.h.in \
-		touch configure; \
+		configure \
-		$(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" \
-		ac_cv_lib_resolv_res_mkquery=yes \
-		./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) \
-			--without-gtk \
 	);
+	$(call Build/Configure/Default, \
+		--without-gtk \
+		, \
+		ac_cv_lib_resolv_res_mkquery=yes \
+	)
 endef
 
 define Build/Compile	
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
 		all install
 endef
 

net/nsca/Makefile

@@ -5,18 +5,20 @@
 # See /LICENSE for more information.
 #
 # $Id$
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nsca
 PKG_VERSION:=2.6
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/nagios
 PKG_MD5SUM:=d526a3ac3c29648c729c5fb4fb332488
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/send-nsca
@@ -24,7 +26,6 @@ define Package/send-nsca
   CATEGORY:=Network
   DEPENDS:=+libmcrypt
   TITLE:=Nagios Service Check Acceptor (NSCA) client
-  DESCRIPTION:=Nagios Service Check Acceptor (NSCA) client.
   URL:=http://www.nagios.org/
 endef
 
@@ -33,32 +34,11 @@ define Package/send-nsca/conffiles
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--with-libmcrypt-prefix="$(STAGING_DIR)/usr" \
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		, \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		CFLAGS="$$$$CFLAGS $$$$CPPFLAGS" \
-		./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) \
-			--with-libmcrypt-prefix="$(STAGING_DIR)/usr" \
-	);
 endef
 
 define Build/Compile

net/slurm/Makefile

@@ -11,11 +11,12 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=slurm
 PKG_VERSION:=0.3.3
 PKG_RELEASE:=1
-PKG_MD5SUM:=e68d09202b835c644f7f6b7f070f29a2
 
-PKG_SOURCE_URL:=http://www.wormulon.net/files/code/slurm/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.wormulon.net/files/code/slurm/
+PKG_MD5SUM:=e68d09202b835c644f7f6b7f070f29a2
 PKG_CAT:=zcat
+
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
@@ -26,54 +27,32 @@ define Package/slurm
   CATEGORY:=Network
   DEPENDS:=+libncurses
   TITLE:=A realtime network interface monitor
-  DESCRIPTION:=A realtime network interface monitor with the following features:\\\
+  DESCRIPTION:=\
-		* realtime traffic statistics divided into incoming and outgoing\\\
+	A realtime network interface monitor with the following features: \\\
-		* optional combined view\\\
+	- realtime traffic statistics divided into incoming and outgoing ;\\\
-		* can monitor any kind of network interface\\\
+	- optional combined view ;\\\
-		* shows detailed statistics about the interface.\\\
+	- can monitor any kind of network interface ;\\\
-		* it's themeable\\\
+	- shows detailed statistics about the interface ;\\\
+	- it's themeable.
   URL:=http://www.wormulon.net/projects/slurm
 endef
 
 define Build/Configure	
-	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
+	(cd $(PKG_BUILD_DIR); touch \
-		touch configure.in; \
+		configure.in \
-		touch aclocal.m4; \
+		aclocal.m4 \
-		touch Makefile.in; \
+		Makefile.in \
-		touch config.h.in; \
+		config.h.in \
-		touch configure; \
+		configure \
-		$(TARGET_CONFIGURE_OPTS) \
+	);
-		CFLAGS="$(TARGET_CFLAGS)" \
+	$(call Build/Configure/Default, \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		, \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
 		LIBS="-lncurses" \
 		ac_cv_lib_ncurses_use_default_colors=yes \
-		./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) \
-	);
 endef
 
 define Build/Compile	
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install

net/tcpdump/Makefile

@@ -11,13 +11,13 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=tcpdump
 PKG_VERSION:=3.9.4
 PKG_RELEASE:=1
-PKG_MD5SUM:=4b64755bbc8ba1af49c747271a6df5b8
 
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.tcpdump.org/release/ \
 	http://ftp.gwdg.de/pub/misc/tcpdump/ \
 	http://www.at.tcpdump.org/ \
 	http://www.br.tcpdump.org/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_MD5SUM:=4b64755bbc8ba1af49c747271a6df5b8
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -30,49 +30,21 @@ define Package/tcpdump
   CATEGORY:=Network
   DEPENDS:=+libpcap
   TITLE:=Network monitoring and data acquisition tool
-  DESCRIPTION:=A tool for network monitoring and data acquisition.
   URL:=http://www.tcpdump.org/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
+	$(call Build/Configure/Default, \
-		BUILD_CC="$(TARGET_CC)" HOSTCC="$(HOSTCC)" \
+		--enable-ipv6 \
-		$(TARGET_CONFIGURE_OPTS) \
+		--without-crypto \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		, \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		BUILD_CC="$(TARGET_CC)" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		HOSTCC="$(HOSTCC)" \
-		ac_cv_linux_vers=2 \
 		td_cv_buggygetaddrinfo="no" \
-		./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_NLS) \
-			$(DISABLE_LARGEFILE) \
-			--enable-shared \
-			--disable-static \
-			--enable-ipv6 \
-			--without-crypto \
-		);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CCOPT="$(TARGET_CFLAGS)" INCLS="-I. -I$(STAGING_DIR)/usr/include" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \

net/wput/Makefile

@@ -12,49 +12,25 @@ PKG_NAME:=wput
 PKG_VERSION:=0.5
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=@SF/wput
 PKG_MD5SUM:=441b2e07219f78167b29a7ac33488fff
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/wput
   SECTION:=net
   CATEGORY:=Network
   TITLE:=A wget-like command-line FTP client
-  DESCRIPTION:=A wget-like command-line FTP client.
   URL:=http://itooktheredpill.dyndns.org/wput/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--disable-g-switch \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		./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) \
-			--enable-shared \
-			--disable-static \
-			--disable-g-switch \
 	)
 endef
 

net/xinetd/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=xinetd
 PKG_VERSION:=2.3.13
 PKG_RELEASE:=2
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.xinetd.org/
 PKG_MD5SUM:=4295b5fe12350f09b5892b363348ac8b
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,7 +26,6 @@ define Package/xinetd
   SECTION:=net
   CATEGORY:=Network
   TITLE:=A powerful and secure super-server
-  DESCRIPTION:=A powerful and secure super-server.
   URL:=http://www.xinetd.org/
 endef
 
@@ -35,54 +34,26 @@ define Package/xinetd/conffiles
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--without-libwrap \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--with-loadavg \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
+	)
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
-		./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) \
-			--enable-shared \
-			--disable-static \
-			--without-libwrap \
-			--with-loadavg \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		build install
 endef
 
 define Package/xinetd/install
+	install -d -m0755 $(1)/usr/sbin
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/xinetd $(1)/usr/sbin/
 	install -d -m0755 $(1)/etc
 	install -m0644 ./files/xinetd.conf $(1)/etc/xinetd.conf
 	install -d -m0755 $(1)/etc/xinetd.d
 	install -d -m0755 $(1)/etc/init.d
 	install -m0755 ./files/xinetd.init $(1)/etc/init.d/xinetd
-	install -d -m0755 $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/xinetd $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,xinetd))

net/xsupplicant/Makefile

@@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=xsupplicant
 PKG_VERSION:=1.2.7
 PKG_RELEASE:=1
-PKG_MD5SUM:=f66c49cd6e4f331d05bf83513ed91990
 
-PKG_SOURCE_URL:=@SF/open1x
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/open1x
+PKG_MD5SUM:=f66c49cd6e4f331d05bf83513ed91990
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -27,8 +27,9 @@ define Package/xsupplicant
   CATEGORY:=Network
   DEPENDS:=+libopenssl +wireless-tools
   TITLE:=A fully compliant 802.1x authenticator
-  DESCRIPTION:=This software allows a GNU/Linux or BSD workstation to authenticate with\\\
+  DESCRIPTION:=\
-	a RADIUS server using 802.1x and various EAP protocols.\\\
+  	This software allows a GNU/Linux or BSD workstation to authenticate with \\\
+	a RADIUS server using 802.1x and various EAP protocols.
   URL:=http://open1x.sourceforge.net/
 endef
 
@@ -37,48 +38,22 @@ define Package/xsupplicant/conffiles
 endef
 
 define Build/Configure	
-	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
+	(cd $(PKG_BUILD_DIR); touch \
-		touch configure.in; \
+		configure.in \
-		touch aclocal.m4; \
+		aclocal.m4 \
-		touch Makefile.in; \
+		Makefile.in \
-		touch configure; \
+		configure \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include \
-			-I$(PKG_BUILD_DIR)/lib/libxsupconfig/ \
-			-I$(STAGING_DIR)/usr/include/madwifi" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-		CC="$(TARGET_CROSS)gcc" \
-		./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) \
-			--with-openssl="$(STAGING_DIR)/usr" \
-			--with-madwifi-path="$(STAGING_DIR)/usr/include/madwifi" \
 	);
+	$(call Build/Configure/Default, \
+		--with-openssl="$(STAGING_DIR)/usr" \
+		--with-madwifi-path="$(STAGING_DIR)/usr/include/madwifi" \
+		, \
+		CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/madwifi" \
+	)
 endef
 
 define Build/Compile	
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
 		DESTDIR=$(PKG_INSTALL_DIR) \
 		all install
 endef

sound/mpd/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=mpd
 PKG_VERSION:=0.12.0
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://users.tpg.com.au/davico/openwrt/
 PKG_MD5SUM:=65e62cc813f2186dff0f96f164a853f8
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -27,10 +27,10 @@ define Package/mpd
   CATEGORY:=Sound
   DEPENDS:=+libflac +libid3tag +libmad +libvorbisidec
   TITLE:=Music Player Daemon
-  DESCRIPTION:=Music Player Daemon.\\\
+  DESCRIPTION:=\
-    MPD is a music player supporting flac, mp3 and ogg files.\\\
+	MPD is a music player supporting flac, mp3 and ogg files.\\\
-    It is typically controlled over a network using one of it's many \\\
+	It is typically controlled over a network using one of it's many \\\
-    clients including mpc(console), gmpc(gnome), phpmp(php) etc.
+	clients including mpc(console), gmpc(gnome), phpmp(php) etc.
   URL:=http://www.musicpd.org/
 endef
 
@@ -38,59 +38,29 @@ define Package/mpd/conffiles
 /etc/mpd.conf
 endef
 
-PKG_CONFIGURE_OPTIONS := \
-	--disable-alsa \
-	--disable-shout \
-	--disable-mod \
-	--disable-audiofile \
-	--disable-iconv \
-	--disable-mpc \
-	--disable-aac \
-	--with-id3tag-includes="$(STAGING_DIR)/usr/include" \
-	--with-id3tag-libraries="$(STAGING_DIR)/usr/lib" \
-	--with-libFLAC-includes="$(STAGING_DIR)/usr/include" \
-	--with-libFLAC-libraries="$(STAGING_DIR)/usr/lib" \
-	--with-mad-includes="$(STAGING_DIR)/usr/include" \
-	--with-mad-libraries="$(STAGING_DIR)/usr/lib" \
-	--with-tremor \
-	--with-tremor-includes="$(STAGING_DIR)/usr/include" \
-	--with-tremor-libraries="$(STAGING_DIR)/usr/lib" \
-
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--disable-alsa \
-		CFLAGS="$(strip $(TARGET_CFLAGS))" \
+		--disable-shout \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--disable-mod \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		--disable-audiofile \
-		./configure \
+		--disable-iconv \
-			--target=$(GNU_TARGET_NAME) \
+		--disable-mpc \
-			--host=$(GNU_TARGET_NAME) \
+		--disable-aac \
-			--build=$(GNU_HOST_NAME) \
+		--with-id3tag-includes="$(STAGING_DIR)/usr/include" \
-			--program-prefix="" \
+		--with-id3tag-libraries="$(STAGING_DIR)/usr/lib" \
-			--program-suffix="" \
+		--with-libFLAC-includes="$(STAGING_DIR)/usr/include" \
-			--prefix=/usr \
+		--with-libFLAC-libraries="$(STAGING_DIR)/usr/lib" \
-			--exec-prefix=/usr \
+		--with-mad-includes="$(STAGING_DIR)/usr/include" \
-			--bindir=/usr/bin \
+		--with-mad-libraries="$(STAGING_DIR)/usr/lib" \
-			--datadir=/usr/share \
+		--with-tremor \
-			--includedir=/usr/include \
+		--with-tremor-includes="$(STAGING_DIR)/usr/include" \
-			--infodir=/usr/share/info \
+		--with-tremor-libraries="$(STAGING_DIR)/usr/lib" \
-			--libdir=/usr/lib \
+	)
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_LARGEFILE) \
-			$(DISABLE_NLS) \
-			$(PKG_CONFIGURE_OPTIONS) \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef

utils/gnupg/Makefile

@@ -12,66 +12,47 @@ PKG_NAME:=gnupg
 PKG_VERSION:=1.4.2.1
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/gnupg \
 	ftp://ftp.gnupg.org/gcrypt/gnupg
 PKG_MD5SUM:=2d59ed50d92f69994dbfbe00fe1612e4
 PKG_CAT:=bzcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/gnupg
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=GNU Privacy Guard
-  DESCRIPTION:=GNU Privacy Guard (GnuPG).\\\
+  DESCRIPTION:=\
-    GPG is an encryption program.
+	GPG is an encryption program.
   URL:=http://www.gnupg.org/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--disable-rpath \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--with-gnu-ld \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--disable-asm \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		--disable-gnupg-iconv \
-		./configure \
+		--disable-card-support \
-			--target=$(GNU_TARGET_NAME) \
+		--disable-agent-support \
-			--host=$(GNU_TARGET_NAME) \
+		--disable-bzip2 \
-			--build=$(GNU_HOST_NAME) \
+		--disable-exec \
-			--program-prefix="" \
+		--disable-ldap \
-			--program-suffix="" \
+		--disable-hkp \
-			--prefix=/usr \
+		--disable-finger \
-			--exec-prefix=/usr \
+		--disable-ftp \
-			--bindir=/usr/bin \
+		--disable-dns-srv \
-			--datadir=/usr/share \
+		--enable-fake-curl \
-			--includedir=/usr/include \
+		--disable-regex \
-			--infodir=/usr/share/info \
+	)
-			--libdir=/usr/lib \
+endef
-			--libexecdir=/usr/lib \
+
-			--localstatedir=/var \
+define Build/Compile
-			--mandir=/usr/share/man \
+	$(MAKE) -C $(PKG_BUILD_DIR)
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_LARGEFILE) \
-			$(DISABLE_NLS) \
-			--disable-asm \
-			--disable-gnupg-iconv \
-			--disable-card-support \
-			--disable-agent-support \
-			--disable-bzip2 \
-			--disable-exec \
-			--disable-ldap \
-			--disable-hkp \
-			--disable-finger \
-			--disable-ftp \
-			--disable-dns-srv \
-			--enable-fake-curl \
-			--disable-nls \
-			--disable-rpath \
-			--disable-regex \
-	);
 endef
 
 define Package/gnupg/install

utils/lcd4linux/Makefile

@@ -12,13 +12,14 @@ PKG_NAME:=lcd4linux
 PKG_VERSION:=0.10.0+cvs20051015
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/l/lcd4linux/ \
 		http://ftp.de.debian.org/debian/pool/main/l/lcd4linux/
 PKG_MD5SUM:=5b5ac629be4bb5c29104fb8f6b7fa444
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/lcd4linux
@@ -26,46 +27,25 @@ define Package/lcd4linux
   CATEGORY:=Utilities
   DEPENDS:=+libncurses
   TITLE:=LCD display utility
-  DESCRIPTION:=LCD display utility.\\\
+  DESCRIPTION:=\
-    LCD4Linux is a small program that grabs information from the kernel and \\\
+	LCD4Linux is a small program that grabs information from the kernel and \\\
-    some subsystems and displays it on an external liquid crystal display.
+	some subsystems and displays it on an external liquid crystal display.
   URL:=http://lcd4linux.bulix.org/
 endef
 
+# commas are interpreted by the $(call ...) macro, so define a intermediate variable holding our drivers spec
+PKG_CONFIGURE_DRIVERS:=all,!PNG,!RouterBoard,!X11
+
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--without-x \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--with-drivers="$(PKG_CONFIGURE_DRIVERS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--with-plugins=wireless \
-		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=/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) \
-			--without-x \
-			--with-drivers='all,!PNG,!RouterBoard,!X11' \
-			--with-plugins=wireless \
-	);
 endef
 
 define Build/Compile
-  $(call Build/Compile/Default, CFLAGS="$(TARGET_CFLAGS) -Wall")
+	$(MAKE) -C $(PKG_BUILD_DIR)
 endef
 
 define Package/lcd4linux/install

utils/rsync/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=rsync
 PKG_VERSION:=2.6.5
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://rsync.samba.org/ftp/rsync/
 PKG_MD5SUM:=3691cdf1540d0649ba679edce6bae8fc
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -27,51 +27,27 @@ define Package/rsync
   CATEGORY:=Utilities
   DEPENDS:=+libpopt
   TITLE:=A fast incremental file transfer utility
-  DESCRIPTION:=A fast incremental file transfer utility.
   URL:=http://rsync.samba.org/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--with-included-popt=no \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--disable-debug \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
+		--disable-ipv6 \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		--disable-locale \
-		./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) \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(TARGET_CONFIGURE_OPTS) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
 define Package/rsync/install
 	install -d -m0755 $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/rsync $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,rsync))

utils/screen/Makefile

@@ -11,10 +11,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=screen
 PKG_VERSION:=4.0.2
 PKG_RELEASE:=1
-PKG_MD5SUM:=ed68ea9b43d9fba0972cb017a24940a1
 
-PKG_SOURCE_URL:=@GNU/screen
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@GNU/screen
+PKG_MD5SUM:=ed68ea9b43d9fba0972cb017a24940a1
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -27,41 +27,13 @@ define Package/screen
   CATEGORY:=Utilities
   DEPENDS:=+libncurses
   TITLE:=Full-screen terminal window manager
-  DESCRIPTION:=Screen is a full-screen window manager that multiplexes a physical\\\
+  DESCRIPTION:=\
-	terminal between several processes, typically interactive shells.\\\
+  	Screen is a full-screen window manager that multiplexes a physical\\\
+	terminal between several processes, typically interactive shells.
   URL:=http://www.gnu.org/software/screen/
 endef
 
-define Build/Configure	
+# uses GNU configure
-	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
-		./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) \
-		  --enable-shared \
-		  --disable-static \
-	);
-endef
 
 define Build/Compile	
 	$(MAKE) -C $(PKG_BUILD_DIR)

utils/setserial/Makefile

@@ -12,52 +12,29 @@ PKG_NAME:=setserial
 PKG_VERSION:=2.17
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/setserial
 PKG_MD5SUM:=c4867d72c41564318e0107745eb7a0f2
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/setserial
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Serial port configuration utility
-  DESCRIPTION:=Serial port configuration utility.\\\
+  DESCRIPTION:=\
-    setserial  is a program designed to set and/or report the \\\
+	setserial  is a program designed to set and/or report the \\\
-    configuration information associated with a serial port. This \\\
+	configuration information associated with a serial port. This \\\
-    information  includes what I/O port and IRQ a particular \\\
+	information  includes what I/O port and IRQ a particular \\\
-    serial port is using, and whether or not the break key should \\\
+	serial port is using, and whether or not the break key should \\\
-    be interpreted as the Secure Attention Key, and so on.
+	be interpreted as the Secure Attention Key, and so on.
   URL:=http://setserial.sourceforge.net/
 endef
 
-define Build/Configure
+# uses GNU configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		./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) \
-	);
-endef
 
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
@@ -65,10 +42,10 @@ define Build/Compile
 endef
 
 define Package/setserial/install
-	install -d -m0755 $(1)/etc/init.d
-	install -m0755 ./files/serial.init $(1)/etc/init.d/setserial
 	install -d -m0755 $(1)/usr/sbin
 	install -m0755 $(PKG_BUILD_DIR)/setserial $(1)/usr/sbin/
+	install -d -m0755 $(1)/etc/init.d
+	install -m0755 ./files/serial.init $(1)/etc/init.d/setserial
 endef
 
 $(eval $(call BuildPackage,setserial))

utils/usbutils/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=usbutils
 PKG_VERSION:=0.71
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/linux-usb
 PKG_MD5SUM:=479d7c7098ef44cc95e7978fd71c712c
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -27,44 +27,17 @@ define Package/usbutils
   CATEGORY:=Utilities
   DEPENDS:=+libusb
   TITLE:=USB devices listing utilities
-  DESCRIPTION:=USB devices listing utilities.
   URL:=http://linux-usb.sourceforge.net/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-static \
-		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=/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) \
-			--enable-shared \
-			--enable-static \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install