Index: packages/libs/apr/Makefile
===================================================================
--- packages/libs/apr/Makefile	(revision 7848)
+++ packages/libs/apr/Makefile	(working copy)
@@ -9,13 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=apr
-PKG_VERSION:=1.2.8
-PKG_RELEASE:=1
+PKG_VERSION:=1.2.9
+PKG_RELEASE:=2
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://apache.d-s-s-p.de/apr/
-PKG_MD5SUM:=814f19528d9cfc79aef188dd752e04d8
-PKG_CAT:=zcat
+PKG_MD5SUM:=86a5a7d0f8807b97645956a2b4ed6f14
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -28,57 +27,48 @@
   DEPENDS:=+libpthread
   TITLE:=Apache Portable Runtime Library
   DESCRIPTION:=\
-  	Apache Portable Runtime Library
+	Apache Portable Runtime Library
   URL:=http://apr.apache.org/
 endef
 
-define Build/Configure	
-	$(call Build/Configure/Default, \
-		--with-devrandom=/dev/urandom \
-		--disable-dso \
-		--disable-ipv6 \
-		, \
-		ac_cv_file__dev_zero=yes \
-		apr_cv_process_shared_works=no \
-		apr_cv_mutex_robust_shared=no \
-		apr_cv_tcp_nodelay_with_cork=yes \
-		ac_cv_sizeof_ssize_t=4 \
-		LDFLAGS="-lpthread -L$(STAGING_DIR)/lib" \
-		CFLAGS="-I$(STAGING_DIR)/include" \
-	)
-endef
+CONFIGURE_ARGS += \
+	--with-devrandom=/dev/urandom \
+	--disable-dso \
+	--disable-ipv6 \
+	, \
+	ac_cv_file__dev_zero=yes \
+	apr_cv_process_shared_works=no \
+	apr_cv_mutex_robust_shared=no \
+	apr_cv_tcp_nodelay_with_cork=yes \
+	ac_cv_sizeof_ssize_t=4 \
+	LDFLAGS="-lpthread -L$(STAGING_DIR)/lib"
 
-define Build/Compile	
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
+MAKE_FLAGS += \
+	DESTDIR="$(PKG_INSTALL_DIR)" \
+	all install
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/bin
-	$(CP)   $(PKG_INSTALL_DIR)/usr/bin/apr-1-config \
-		$(STAGING_DIR)/usr/bin
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP)   $(PKG_INSTALL_DIR)/usr/include/apr-1/ \
-		$(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP)   $(PKG_INSTALL_DIR)/usr/lib/*apr* \
-		$(STAGING_DIR)/usr/lib/
-	mkdir -p $(STAGING_DIR)/usr/share/
-	$(CP)   $(PKG_INSTALL_DIR)/usr/share/build-1/ \
-		$(STAGING_DIR)/usr/share/
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/apr-1-config $(STAGING_DIR)/usr/bin
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/ $(STAGING_DIR)/usr/include/
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*apr* $(STAGING_DIR)/usr/lib/
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/share/
+	$(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/ $(STAGING_DIR)/usr/share/
 	$(SED) "s,/usr/share/build-1,$(STAGING_DIR)/usr/share/build-1," $(STAGING_DIR)/usr/share/build-1/apr_rules.mk
-	$(SED)  "s,\"/usr\",$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/apr-1-config
-	$(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libapr-1.la
-	$(SED)  "s,"bindir\=\"/usr/bin\"",bindir=\"$(STAGING_DIR)/usr/bin\"," $(STAGING_DIR)/usr/bin/apr-1-config
-	$(SED)  "s,"datadir\=\"/usr/share\"",datadir=\"$(STAGING_DIR)/usr/share\"," $(STAGING_DIR)/usr/bin/apr-1-config
-	$(SED)  "s,"installbuilddir\=\"/usr/share/build-1\"",installbuilddir=\"$(STAGING_DIR)/usr/share/build-1\"," $(STAGING_DIR)/usr/bin/apr-1-config
+	$(SED) "s,\"/usr\",$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/apr-1-config
+	$(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libapr-1.la
+	$(SED) "s,"bindir\=\"/usr/bin\"",bindir=\"$(STAGING_DIR)/usr/bin\"," $(STAGING_DIR)/usr/bin/apr-1-config
+	$(SED) "s,"datadir\=\"/usr/share\"",datadir=\"$(STAGING_DIR)/usr/share\"," $(STAGING_DIR)/usr/bin/apr-1-config
+	$(SED) "s,"installbuilddir\=\"/usr/share/build-1\"",installbuilddir=\"$(STAGING_DIR)/usr/share/build-1\"," $(STAGING_DIR)/usr/bin/apr-1-config
 endef
 
 define Build/UninstallDev
-	rm	$(STAGING_DIR)/usr/bin/apr-config \
+	rm -rf \
+		$(STAGING_DIR)/usr/bin/apr-config \
 		$(STAGING_DIR)/usr/lib/{libapr-1*,apr.exp} \
-	rm -rf	$(STAGING_DIR)/usr/share/build-1/ \
+		$(STAGING_DIR)/usr/share/build-1/ \
 		$(STAGING_DIR)/usr/include/apr-1/
 endef
 
Index: packages/utils/apr-util/Makefile
===================================================================
--- packages/utils/apr-util/Makefile	(revision 7848)
+++ packages/utils/apr-util/Makefile	(working copy)
@@ -10,12 +10,11 @@
 
 PKG_NAME:=apr-util
 PKG_VERSION:=1.2.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://apache.autinity.de/apr/
-PKG_MD5SUM:=a2e2e54d65e9eae961f7171335cf2550
-PKG_CAT:=zcat
+PKG_MD5SUM:=b122f35ee6883a216cd2e7d44504521e
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -30,48 +29,38 @@
   URL:=http://apr.apache.org/
 endef
 
-define Build/Configure	
-	$(call Build/Configure/Default, \
-		--with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
-		--with-expat="$(STAGING_DIR)/usr" \
-		, \
-		ac_cv_file_dbd_apr_dbd_mysql_c=no \
-		APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1" \
-		CFLAGS="-I$(STAGING_DIR)/usr/lib/libiconv/include/" \
-		LDFLAGS="-ldl -L$(STAGING_DIR)/lib \
-			 -L$(STAGING_DIR)/usr/lib" \
-	)
-endef
+CONFIGURE_ARGS += \
+	--with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
+	--with-expat="$(STAGING_DIR)/usr" \
+	, \
+	ac_cv_file_dbd_apr_dbd_mysql_c=no \
+	APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1" \
+	CFLAGS="-I$(STAGING_DIR)/usr/lib/libiconv/include/" \
+	LDFLAGS="-ldl -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib"
 
-define Build/Compile	
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
+MAKE_FLAGS += \
+	DESTDIR="$(PKG_INSTALL_DIR)" \
+	all install
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/bin
-	$(CP)   $(PKG_INSTALL_DIR)/usr/bin/apu-1-config \
-	 	$(STAGING_DIR)/usr/bin
-	mkdir -p $(STAGING_DIR)/usr/include/apr-1/
-	$(CP)   $(PKG_INSTALL_DIR)/usr/include/apr-1/* \
-		$(STAGING_DIR)/usr/include/apr-1/
-	mkdir -p $(STAGING_DIR)/usr/lib 
-		$(CP)   $(PKG_INSTALL_DIR)/usr/lib/*aprutil* \
-		$(STAGING_DIR)/usr/lib/
-	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig/
-		$(CP)   $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \
-		$(STAGING_DIR)/usr/lib/pkgconfig/
-	$(SED)  "s,\"/usr\",$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/apu-1-config
-	$(SED)  "s,bindir\=\"/usr/bin\",bindir\=\"$(STAGING_DIR)/usr/bin\"," $(STAGING_DIR)/usr/bin/apu-1-config
-	$(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libaprutil-1.la
-	
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/apu-1-config $(STAGING_DIR)/usr/bin
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/apr-1/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* $(STAGING_DIR)/usr/include/apr-1/
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib 
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil* $(STAGING_DIR)/usr/lib/
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib/pkgconfig/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+	$(SED) "s,\"/usr\",$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/apu-1-config
+	$(SED) "s,bindir\=\"/usr/bin\",bindir\=\"$(STAGING_DIR)/usr/bin\"," $(STAGING_DIR)/usr/bin/apu-1-config
+	$(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libaprutil-1.la
 endef
 
 define Build/UninstallDev
-	rm 	$(STAGING_DIR)/usr/bin/apu-1-config \
-		$(STAGING_DIR)/usr/lib/{*aprutil-1*,aprutil.exp}
-	rm -rf	$(STAGING_DIR)/usr/include/apr-1
+	rm -rf \
+		$(STAGING_DIR)/usr/bin/apu-1-config \
+		$(STAGING_DIR)/usr/lib/{libaprutil*,*aprutil-1*,aprutil.exp} \
+		$(STAGING_DIR)/usr/include/apr-1
 endef
 
 define Package/apr-util/install