Merge branch 'master' of git+ssh://openadk.org/git/openadk

author: Waldemar Brodkorb <wbx@openadk.org> 2010-02-07 20:15:44 +0100
committer: Waldemar Brodkorb <wbx@openadk.org> 2010-02-07 20:15:44 +0100
commit: 483e9fde0b3923169c3c70720ca94b032dd30ae8 (patch)
tree: bd4ea28db271093276fe295b2da2e000a28aa857 /package
parent: 10997d993a55465525b026b9404f5809687e9e3c (diff)
parent: 25448b89bc693d56b074cd7b2a9c60ddc12f7404 (diff)
590 files changed, 3820 insertions, 4140 deletions
diff --git a/package/.template/Makefile b/package/.template/Makefile
index 32c24923c..977e4aede 100644
--- a/package/.template/Makefile
+++ b/package/.template/Makefile
@@ -6,12 +6,13 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		@PKG@
 PKG_VERSION:=		@VER@
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		@add md5sum of package here@
-PKG_DESCR:=		@add short description@
-PKG_SECTION:=		@add section@
-PKG_DEPENDS:=		@add dependendant package names@
-PKG_URL:=		@add project url@
-PKG_SITES:=		@add download url without package name@
+PKG_MD5SUM:=		add md5sum of package here
+PKG_DESCR:=		add short description
+PKG_SECTION:=		add section
+PKG_DEPENDS:=		add dependendant package names
+PKG_BUILDDEP+=		add packages which need to be compiled
+PKG_URL:=		add project url
+PKG_SITES:=		add download url without package name
 
 # if downloaded package is not ending with .tar.gz use following
 #DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
@@ -20,13 +21,13 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,@UPKG@,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
+#CONFIG_STYLE:=		manual
 # use following to add ./configure options
 #CONFIGURE_ARGS+=	--disable-foo
 # overwrite any configure variables
 #CONFIGURE_ENV+=	ac_cv_func_setpgrp_void=yes
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
+#BUILD_STYLE:=		manual
+#INSTALL_STYLE:=	manual
 
 # please install all files and directories to the package dir
 post-install:
@@ -34,4 +35,5 @@ post-install:
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/@PKG@ \
 		$(IDIR_@UPKG@)/usr/bin
 
+# please remove ALL above comments, before commiting
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/6tunnel/Makefile b/package/6tunnel/Makefile
index a621af7b8..edce0ecaa 100644
--- a/package/6tunnel/Makefile
+++ b/package/6tunnel/Makefile
@@ -4,25 +4,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		6tunnel
-PKG_VERSION:=		0.11rc1
+PKG_VERSION:=		0.11rc2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b325fa9d238e32195fbb3fc3646b0d28
+PKG_MD5SUM:=		74e02d4f0704b3083a01feda66033449
 PKG_DESCR:=		IPv4/IPv6 tunnel proxy
 PKG_SECTION:=		net
 PKG_DEPENDS:=		kmod-ipv6
+PKG_URL:=		http://toxygen.net/6tunnel/
 PKG_SITES:=		http://toxygen.net/6tunnel/
 
-WRKDIST=		${WRKDIR}/$(PKG_NAME)-0.11
-
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,6TUNNEL,6tunnel,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,6TUNNEL,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV+=		ac_cv_path_STRIP=$(STRIP) \
-			ac_cv_func_vsnprintf=yes
-ALL_TARGET=		default
-BUILD_STYLE=		auto
+AUTOTOOL_STYLE:=	autoconf
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_6TUNNEL)/usr/sbin
diff --git a/package/6tunnel/patches/patch-Makefile_in b/package/6tunnel/patches/patch-Makefile_in
new file mode 100644
index 000000000..0a26cdeef
--- /dev/null
+++ b/package/6tunnel/patches/patch-Makefile_in
@@ -0,0 +1,27 @@
+--- 6tunnel-0.11rc2.orig/Makefile.in	2002-11-24 02:18:47.000000000 +0100
++++ 6tunnel-0.11rc2/Makefile.in	2010-02-05 14:22:35.462572327 +0100
+@@ -10,19 +10,18 @@ INSTALL = @INSTALL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+ 
+-default:	6tunnel
++all:	6tunnel
+ 
+ 6tunnel:	6tunnel.c
+ 
+ .PHONY:	install
+ 
+ install:
+-	$(STRIP) 6tunnel
+-	$(INSTALL) -d $(bindir)
+-	$(INSTALL) 6tunnel $(bindir)
++	$(INSTALL) -d $(DESTDIR)$(bindir)
++	$(INSTALL) 6tunnel $(DESTDIR)$(bindir)
+ 
+-	$(INSTALL) -d $(mandir)/man1
+-	$(INSTALL) 6tunnel.1 $(mandir)/man1
++	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
++	$(INSTALL) 6tunnel.1 $(DESTDIR)$(mandir)/man1
+ 
+ .PHONY:	clean
+ 
diff --git a/package/6tunnel/patches/patch-Makefile_in.orig b/package/6tunnel/patches/patch-Makefile_in.orig
new file mode 100644
index 000000000..d5663cc00
--- /dev/null
+++ b/package/6tunnel/patches/patch-Makefile_in.orig
@@ -0,0 +1,18 @@
+--- 6tunnel-0.11rc2.orig/Makefile.in	2002-11-24 02:18:47.000000000 +0100
++++ 6tunnel-0.11rc2/Makefile.in	2010-02-05 14:21:39.992115665 +0100
+@@ -10,14 +10,13 @@ INSTALL = @INSTALL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+ 
+-default:	6tunnel
++all:	6tunnel
+ 
+ 6tunnel:	6tunnel.c
+ 
+ .PHONY:	install
+ 
+ install:
+-	$(STRIP) 6tunnel
+ 	$(INSTALL) -d $(bindir)
+ 	$(INSTALL) 6tunnel $(bindir)
+ 
diff --git a/package/Config.in b/package/Config.in
index 346672c77..21c2d2e33 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -165,7 +165,7 @@ source "package/sispmctl/Config.in"
 source "package/stress/Config.in"
 source "package/sysstat/Config.in"
 source "package/swconfig/Config.in"
-#source "package/udev/Config.in"
+source "package/udev/Config.in"
 source "package/watchdog/Config.in"
 endmenu
 
@@ -189,7 +189,7 @@ source "package/sipsak/Config.in"
 source "package/tcpdump/Config.in"
 source "package/tptest/Config.in"
 source "package/traceroute/Config.in"
-#source "package/trafshow/Config.in"
+source "package/trafshow/Config.in"
 source "package/ttcp/Config.in"
 endmenu
 
@@ -354,6 +354,7 @@ source "package/libnfsidmap/Config.in"
 source "package/libnfnetlink/Config.in"
 source "package/libnfnetlink/Config.in.lib"
 source "package/libnids/Config.in"
+source "package/libnids/Config.in.lib"
 source "package/libnl/Config.in"
 source "package/libnl/Config.in.lib"
 source "package/libogg/Config.in"
@@ -384,14 +385,18 @@ source "package/postgresql/Config.in.lib"
 source "package/libpthread/Config.in"
 source "package/libpthread/Config.in.lib"
 source "package/libthread_db/Config.in"
+source "package/libthread_db/Config.in.lib"
 source "package/readline/Config.in"
 source "package/readline/Config.in.lib"
+source "package/cyrus-sasl/Config.in"
 source "package/cyrus-sasl/Config.in.lib"
 source "package/sdl/Config.in"
 source "package/sdl/Config.in.lib"
 source "package/sdl-image/Config.in"
 source "package/sdl-image/Config.in.lib"
+source "package/net-snmp/Config.in.lib"
 source "package/speex/Config.in"
+source "package/speex/Config.in.lib"
 source "package/openssl/Config.in.lib"
 source "package/sqlite/Config.in.lib"
 source "package/librpcsecgss/Config.in"
@@ -411,6 +416,7 @@ source "package/libtirpc/Config.in.lib"
 source "package/libtorrent/Config.in"
 source "package/libtorrent/Config.in.lib"
 source "package/libupnp/Config.in"
+source "package/libupnp/Config.in.lib"
 source "package/libusb/Config.in"
 source "package/libusb/Config.in.lib"
 source "package/libusb-compat/Config.in"
diff --git a/package/adkinstall/Makefile b/package/adkinstall/Makefile
index d250a1e70..f8ada2ebe 100644
--- a/package/adkinstall/Makefile
+++ b/package/adkinstall/Makefile
@@ -19,6 +19,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ADKINSTALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile
index 590786ee1..50b2f005b 100644
--- a/package/aiccu/Makefile
+++ b/package/aiccu/Makefile
@@ -20,10 +20,12 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,AICCU,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=	manual
+INSTALL_STYLE:=	manual
+
 TCFLAGS+=	-D_REENTRANT -D_GNU_SOURCE -DAICCU_CONSOLE \
 		-D_LINUX -DHAS_IFHEAD -DAICCU_TYPE=\"linux\"
 TLDFLAGS+=	-lpthread -lresolv
-BUILD_STYLE:=	auto
 MAKE_FLAGS+=	CC='${TARGET_CC}' CFLAGS='${TCFLAGS}' LDFLAGS='${TLDFLAGS}'
 
 do-install:
diff --git a/package/aiccu/extra/common/dn_skipname.c b/package/aiccu/src/common/dn_skipname.c
index f2219f335..f2219f335 100644
--- a/package/aiccu/extra/common/dn_skipname.c
+++ b/package/aiccu/src/common/dn_skipname.c
diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile
index c03c57915..ff8e99cff 100644
--- a/package/aircrack-ng/Makefile
+++ b/package/aircrack-ng/Makefile
@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		aircrack-ng
 PKG_VERSION:=		1.0
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		openssl libpcap
 PKG_MD5SUM:=		dafbfaf944ca9d523fde4bae86f0c067
 PKG_DESCR:=		set of tools for auditing wireless networks
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libpthread libopenssl libpcap
+PKG_BUILDDEP+=		openssl libpcap
 PKG_URL:=		http://www.aircrack-ng.org
 PKG_SITES:=		http://download.aircrack-ng.org/
 
@@ -18,21 +18,26 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,AIRCRACK_NG,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=	auto
-INSTALL_STYLE:=	auto
-XAKE_FLAGS+=	CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS) -Wall" \
-		CROSS="$(TARGET_CROSS)" OSNAME="Linux" \
-		prefix="/usr"
+CONFIG_STYLE:=		manual
+
+XAKE_FLAGS+=		CC="$(TARGET_CC)" \
+			CFLAGS="$(TARGET_CFLAGS) -Wall" \
+			OSNAME="Linux" prefix="/usr"
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_AIRCRACK_NG)/usr/bin
 	$(INSTALL_DIR) $(IDIR_AIRCRACK_NG)/usr/sbin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/aircrack-ng $(IDIR_AIRCRACK_NG)/usr/bin/
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/airdecap-ng $(IDIR_AIRCRACK_NG)/usr/bin/
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/packetforge-ng $(IDIR_AIRCRACK_NG)/usr/bin/
-	$(INSTALL_BIN) $(WRKINST)/usr/sbin/aireplay-ng $(IDIR_AIRCRACK_NG)/usr/sbin/
-	$(INSTALL_BIN) $(WRKINST)/usr/sbin/airodump-ng $(IDIR_AIRCRACK_NG)/usr/sbin/
-	$(INSTALL_BIN) $(WRKINST)/usr/sbin/airtun-ng $(IDIR_AIRCRACK_NG)/usr/sbin/
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/aircrack-ng \
+		$(IDIR_AIRCRACK_NG)/usr/bin/
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/airdecap-ng \
+		$(IDIR_AIRCRACK_NG)/usr/bin/
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/packetforge-ng \
+		$(IDIR_AIRCRACK_NG)/usr/bin/
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/aireplay-ng \
+		$(IDIR_AIRCRACK_NG)/usr/sbin/
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/airodump-ng \
+		$(IDIR_AIRCRACK_NG)/usr/sbin/
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/airtun-ng \
+		$(IDIR_AIRCRACK_NG)/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile
index 219564ab3..64387c3d8 100644
--- a/package/alsa-lib/Makefile
+++ b/package/alsa-lib/Makefile
@@ -9,9 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		b28a12348905fb6915bc41f0edb2ecce
 PKG_DESCR:=		ALSA sound library
 PKG_SECTION:=		libs
-PKG_URL:=		http://www.alsa-project.org
-PKG_SITES:=		ftp://ftp.task.gda.pl/pub/linux/misc/alsa/lib/ \
-			ftp://ftp.alsa-project.org/pub/lib/
+PKG_URL:=		http://www.alsa-project.org/
+PKG_SITES:=		ftp://ftp.alsa-project.org/pub/lib/
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
@@ -19,14 +18,11 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ALSA_LIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-python
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/lib ${IDIR_ALSA_LIB}/usr/share/alsa
-	${CP} ${WRKINST}/usr/lib/libasound.so.* ${IDIR_ALSA_LIB}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libasound.so* ${IDIR_ALSA_LIB}/usr/lib/
 	${CP} ${WRKINST}/usr/share/alsa/* ${IDIR_ALSA_LIB}/usr/share/alsa/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 8da03270a..602444248 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -21,10 +21,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ALSA_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-alsamixer
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_ALSA_UTILS}/usr/bin 
diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile
index 6b4142600..307853fab 100644
--- a/package/apr-util/Makefile
+++ b/package/apr-util/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=              apr-util
 PKG_VERSION:=           0.9.15
 PKG_RELEASE:=           1
-PKG_BUILDDEP+=		expat apr
 PKG_MD5SUM:=            dc772ae295f49ddb8ee8e69a9716c53b
 PKG_DESCR:=		Apache Portable Runtime utility library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libexpat apr
+PKG_BUILDDEP+=		expat apr
 PKG_URL:=		http://apr.apache.org
 PKG_SITES:=		http://apache.mirror.clusters.cc/apr/
 
@@ -18,12 +18,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,APR_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=       gnu
 CONFIGURE_ARGS+=	--without-berkeley-db
 CONFIGURE_ARGS+=	--with-apr=${STAGING_DIR}/usr
 CONFIGURE_ARGS+=	--with-expat=${STAGING_DIR}/usr
-BUILD_STYLE:=           auto
-INSTALL_STYLE:=         auto
 XAKE_FLAGS+=		apr_builddir=${STAGING_DIR}/usr/share/build \
 			apr_builders=${STAGING_DIR}/usr/share/build
 
diff --git a/package/apr/Makefile b/package/apr/Makefile
index 53048e334..486a96842 100644
--- a/package/apr/Makefile
+++ b/package/apr/Makefile
@@ -6,12 +6,13 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		apr
 PKG_VERSION:=		0.9.17
 PKG_RELEASE:=		1
-ifeq ($(ADK_PACKAGE_APR_THREADING),y)
-PKG_BUILDDEP+=		libpthread
-endif
 PKG_MD5SUM:=		ca1e22d98081a03a33c2a0b8684eb192
 PKG_DESCR:=		Apache Portable Runtime library
 PKG_SECTION:=		libs
+ifeq ($(ADK_PACKAGE_APR_THREADING),y)
+PKG_DEPENDS:=		libpthread
+PKG_BUILDDEP+=		libpthread
+endif
 PKG_URL:=		http://apr.apache.org
 PKG_SITES:=		http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/
 
@@ -21,13 +22,8 @@ PKGFD_FULL=		Enable threading support
 
 include ${TOPDIR}/mk/package.mk
 
-ifeq (${ADK_PACKAGE_APR_THREADING},y)
-PKG_DEPENDS:=		libpthread
-endif
-
 $(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 # uClibc setpgrp does not take arguments
 CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes
 CONFIGURE_ENV+=		ac_cv_sizeof_size_t=4
@@ -43,16 +39,15 @@ else
 CONFIGURE_ARGS+=	--disable-threads
 endif
 
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_APR}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libapr-0.so* ${IDIR_APR}/usr/lib/
 	${INSTALL_DIR} ${STAGING_DIR}/usr/share/build
 	${CP} ${WRKINST}/usr/share/build/* ${STAGING_DIR}/usr/share/build/
 	# we need to patch paths to get apr-util compiling
-	$(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config
-	$(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_DIR}\2," ${WRKINST}/usr/bin/apr-config
+	$(SED) "s,\(^installbuilddir=\"\)\(.*\),\1${STAGING_DIR}\2," \
+		${WRKINST}/usr/bin/apr-config
+	$(SED) "s,\(^datadir=\"\)\(.*\),\1${STAGING_DIR}\2," \
+		${WRKINST}/usr/bin/apr-config
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/arpd/Makefile b/package/arpd/Makefile
index 2dc9cfed8..3d0f31f07 100644
--- a/package/arpd/Makefile
+++ b/package/arpd/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		arpd
 PKG_VERSION:=		0.2
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libpcap libdnet libevent
 PKG_MD5SUM:=		e2911fa9de1b92ef50deda1489ae944d
 PKG_DESCR:=		Generates ARP responses for IP address ranges
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libpcap libdnet libevent
+PKG_BUILDDEP+=		libpcap libdnet libevent
 PKG_URL:=		http://niels.xtdnet.nl/honeyd/
 PKG_SITES:=		http://niels.xtdnet.nl/honeyd/
 
@@ -20,11 +20,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ARPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-libdnet=${STAGING_DIR}/usr \
 			--with-libevent=${STAGING_DIR}/usr \
 			--with-libpcap=${STAGING_DIR}/usr
-BUILD_STYLE=		auto
 MAKE_FLAGS+=		CCOPT="${TARGET_CFLAGS}" \
 			INCLS="-I. -I${STAGING_DIR}/usr/include" \
 			LIBS="-L${STAGING_DIR}/usr/lib -lpcap -ldnet -levent"
diff --git a/package/arpwatch/Makefile b/package/arpwatch/Makefile
index 7f181cb31..bdad7803c 100644
--- a/package/arpwatch/Makefile
+++ b/package/arpwatch/Makefile
@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		arpwatch
 PKG_VERSION:=		2.1a15
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libpcap
 PKG_MD5SUM:=		cebfeb99c4a7c2a6cee2564770415fe7
-PKG_DESCR:=		Ethernet monitor program for keeping track of ethernet/ip address pairings
+PKG_DESCR:=		Ethernet monitor program
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libpcap
+PKG_BUILDDEP+=		libpcap
 PKG_URL:=		http://www-nrg.ee.lbl.gov
 PKG_SITES:=		ftp://ftp.ee.lbl.gov/
 
@@ -18,8 +18,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,ARPWATCH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
+INSTALL_STYLE:=		manual
+
 MAKE_FLAGS+=		ARPDIR=/etc/arpwatch \
 			CCOPT="$(TARGET_CFLAGS)" \
 			INCLS="-I. -I$(STAGING_DIR)/usr/include" \
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 86d311c83..7f042b7f4 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -114,14 +114,13 @@ else
 CONFIGURE_ARGS+=	--without-postgres
 endif
 
+INSTALL_STYLE:=		manual
+
 TLDFLAGS+=		-lm
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
 MAKE_ENV=		ASTCFLAGS="${TCPPFLAGS} -DHAVE_STRTOQ" \
 			ASTLDFLAGS="${TLDFLAGS}"
 MAKE_FLAGS+=		DESTDIR="$(WRKINST)" \
 			OPTIMIZE="${TARGET_OPTIMIZATION}" \
-			CXX="${TARGET_CC}" \
 			STRIP="${TARGET_CROSS}strip" \
 			NOISY_BUILD=1
 ALL_TARGET:=		all install samples
@@ -129,6 +128,9 @@ ALL_TARGET:=		all install samples
 pre-configure:
 	cd "$(WRKBUILD)/menuselect"; ./configure 
 
+pre-build:
+	$(MAKE) -C $(WRKBUILD)/menuselect
+
 post-build:
 	cd ${WRKBUILD}/sounds ; \
 	tar xzf asterisk-core-sounds-en-gsm-1.4.17.tar.gz ; \
diff --git a/package/asterisk/patches/patch-Makefile b/package/asterisk/patches/patch-Makefile
new file mode 100644
index 000000000..1ba02c900
--- /dev/null
+++ b/package/asterisk/patches/patch-Makefile
@@ -0,0 +1,13 @@
+--- asterisk-1.6.2.1.orig/Makefile	2009-12-10 22:04:20.000000000 +0100
++++ asterisk-1.6.2.1/Makefile	2010-02-05 21:05:41.313084404 +0100
+@@ -366,8 +366,8 @@ makeopts: configure
+ 	@exit 1
+ 
+ menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
+-	menuselect/menuselect --check-deps $@
+-	menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
++	./menuselect/menuselect --check-deps $@
++	./menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
+ 
+ $(MOD_SUBDIRS_EMBED_LDSCRIPT):
+ 	+@echo "EMBED_LDSCRIPTS+="`$(SILENTMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
diff --git a/package/atftp/Makefile b/package/atftp/Makefile
index 7cea94e68..81939a111 100644
--- a/package/atftp/Makefile
+++ b/package/atftp/Makefile
@@ -6,24 +6,22 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		atftp
 PKG_VERSION:=		0.7
 PKG_RELEASE:=		2
-PKG_BUILDDEP+=		readline ncurses
 PKG_MD5SUM:=		3b27365772d918050b2251d98a9c7c82
 PKG_DESCR:=		TFTP client
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libreadline libncurses
+PKG_BUILDDEP+=		readline ncurses
 PKG_URL:=		http://freshmeat.net/projects/atftp
 PKG_SITES:=		ftp://ftp.mamalinux.com/pub/atftp/
-PKG_DESCR_1:=		TFTP server
+
+PKG_DESCR_TFTP_SERVER:=	TFTP server
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,ATFTP,atftp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,ATFTPD,atftpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
+$(eval $(call PKG_template,ATFTPD,atftpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_TFTP_SERVER},${PKG_SECTION}))
 
 MAKE_FLAGS+=		CFLAGS="${TCFLAGS} -Wall -D_REENTRANT -fno-inline"
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	# atftp client
diff --git a/package/atk/Makefile b/package/atk/Makefile
index 0980de0cc..2b3437450 100644
--- a/package/atk/Makefile
+++ b/package/atk/Makefile
@@ -21,10 +21,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ATK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_ATK}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libatk-*.so* ${IDIR_ATK}/usr/lib
diff --git a/package/aufs2-util/Makefile b/package/aufs2-util/Makefile
index e0c69b166..53aa3bab4 100644
--- a/package/aufs2-util/Makefile
+++ b/package/aufs2-util/Makefile
@@ -17,9 +17,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,AUFS_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
 MAKE_FLAGS+=		KDIR=${LINUX_DIR}
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 do-extract:
 	mkdir -p ${WRKBUILD}
diff --git a/package/autoconf/Makefile b/package/autoconf/Makefile
index b03662330..07f525241 100644
--- a/package/autoconf/Makefile
+++ b/package/autoconf/Makefile
@@ -17,10 +17,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,AUTOCONF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_AUTOCONF}/usr/bin
 	${CP} ${WRKINST}/usr/bin/auto* ${IDIR_AUTOCONF}/usr/bin
diff --git a/package/automake/Makefile b/package/automake/Makefile
index 3f5bd4b85..4256f0d97 100644
--- a/package/automake/Makefile
+++ b/package/automake/Makefile
@@ -5,10 +5,11 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		automake
 PKG_VERSION:=		1.10
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		452163c32d061c53a7acc0e8c1b689ba
 PKG_DESCR:=		GNU automake
 PKG_SECTION:=		utils
+PKG_DEPENDS:=		microperl
 PKG_URL:=		http://www.gnu.org/software/automake/
 PKG_SITES:=		${MASTER_SITE_GNU:=${PKG_NAME}/}
 PKG_OPTS:=		noscripts
@@ -17,13 +18,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,AUTOMAKE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/automake ${IDIR_AUTOMAKE}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/aclocal ${IDIR_AUTOMAKE}/usr/bin
+	${INSTALL_DIR} ${IDIR_AUTOMAKE}/usr/share/automake-${PKG_VERSION}/
+	${CP} ${WRKINST}/usr/share/automake-${PKG_VERSION}/Automake \
+		${IDIR_AUTOMAKE}/usr/share/automake-${PKG_VERSION}/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/autossh/Makefile b/package/autossh/Makefile
index b5e184463..d1bb28b24 100644
--- a/package/autossh/Makefile
+++ b/package/autossh/Makefile
@@ -19,11 +19,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,AUTOSSH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-CONFIGURE_ARGS+=	ac_cv_lib_nsl_gethostbyname=no
-BUILD_STYLE:=		auto
-
-do-install:
+post-install:
 	$(INSTALL_DIR) $(IDIR_AUTOSSH)/usr/bin
 	$(INSTALL_BIN) $(WRKBUILD)/autossh $(IDIR_AUTOSSH)/usr/bin/
 
diff --git a/package/autossh/patches/patch-Makefile_in b/package/autossh/patches/patch-Makefile_in
new file mode 100644
index 000000000..098c3fee1
--- /dev/null
+++ b/package/autossh/patches/patch-Makefile_in
@@ -0,0 +1,36 @@
+--- autossh-1.4b.orig/Makefile.in	2008-04-11 22:47:46.000000000 +0200
++++ autossh-1.4b/Makefile.in	2010-02-05 17:49:30.511836749 +0100
+@@ -45,18 +45,18 @@ distclean:	allclean
+ 		- /bin/rm -f Makefile
+ 
+ install:	$(TARGET)
+-		mkdir -p -m 755 $(bindir)
+-		mkdir -p -m 755 $(prefix)/share/doc/autossh
+-		mkdir -p -m 755 $(datadir)/examples/autossh
+-		mkdir -p -m 755 $(mandir)/man1
+-		cp $(TARGET) $(bindir)
+-		cp CHANGES README $(datadir)/doc/autossh
+-		cp autossh.host	$(datadir)/examples/autossh
+-		cp rscreen $(datadir)/examples/autossh
+-		cp autossh.1 $(mandir)/man1
+-		chmod 755 $(bindir)/$(TARGET)
+-		chmod 644 $(datadir)/doc/autossh/CHANGES
+-		chmod 644 $(datadir)/doc/autossh/README
+-		chmod 644 $(datadir)/examples/autossh/autossh.host 
+-		chmod 644 $(datadir)/examples/autossh/rscreen
+-		chmod 644 $(mandir)/man1/autossh.1 
++		mkdir -p -m 755 $(DESTDIR)$(bindir)
++		mkdir -p -m 755 $(DESTDIR)$(prefix)/share/doc/autossh
++		mkdir -p -m 755 $(DESTDIR)$(datadir)/examples/autossh
++		mkdir -p -m 755 $(DESTDIR)$(mandir)/man1
++		cp $(TARGET) $(DESTDIR)$(bindir)
++		cp CHANGES README $(DESTDIR)$(datadir)/doc/autossh
++		cp autossh.host	$(DESTDIR)$(datadir)/examples/autossh
++		cp rscreen $(DESTDIR)$(datadir)/examples/autossh
++		cp autossh.1 $(DESTDIR)$(mandir)/man1
++		chmod 755 $(DESTDIR)$(bindir)/$(TARGET)
++		chmod 644 $(DESTDIR)$(datadir)/doc/autossh/CHANGES
++		chmod 644 $(DESTDIR)$(datadir)/doc/autossh/README
++		chmod 644 $(DESTDIR)$(datadir)/examples/autossh/autossh.host 
++		chmod 644 $(DESTDIR)$(datadir)/examples/autossh/rscreen
++		chmod 644 $(DESTDIR)$(mandir)/man1/autossh.1 
diff --git a/package/avahi/Makefile b/package/avahi/Makefile
index 231a97367..ec3cd6fa1 100644
--- a/package/avahi/Makefile
+++ b/package/avahi/Makefile
@@ -25,7 +25,6 @@ $(eval $(call PKG_template,AVAHI_DNSCONFD,avahi-dnsconfd,${PKG_VERSION}-${PKG_RE
 $(eval $(call PKG_template,LIBAVAHI,libavahi,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIB},libs))
 
 TLDFLAGS+=		-lintl
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--enable-glib \
 			--disable-qt3 \
 			--disable-qt4 \
@@ -51,8 +50,6 @@ CONFIGURE_ARGS+=	--enable-glib \
 			--with-distro=none \
 			--with-avahi-user=avahi \
 			--with-avahi-group=avahi
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	# avahi daemon
diff --git a/package/axtls/Makefile b/package/axtls/Makefile
index 9b01f12ba..38261392f 100644
--- a/package/axtls/Makefile
+++ b/package/axtls/Makefile
@@ -13,8 +13,8 @@ PKG_DEPENDS:=		libaxtls
 PKG_URL:=		http://axtls.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=axtls/}
 
-PKG_DESCR_1:=		small tls library
-PKG_SECTION_1:=		libs
+PKG_DESCR_LIB:=		small tls library
+PKG_SECTION_LIB:=		libs
 
 DISTFILES:=		axTLS-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/axTLS
@@ -22,9 +22,11 @@ WRKDIST=		${WRKDIR}/axTLS
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,AXHTTPD,axhttpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION_1}))
+$(eval $(call PKG_template,LIBAXTLS,libaxtls,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_LIB},${PKG_SECTION_LIB}))
+
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
 
-BUILD_STYLE=		auto
 XAKE_FLAGS+=		STRIP='' \
 			CC='${TARGET_CC}' \
 			OPT_CFLAGS='${TARGET_CFLAGS} -fPIC' \
@@ -37,7 +39,7 @@ do-configure:
 do-install:
 	# axtls library
 	${INSTALL_DIR} ${IDIR_LIBAXTLS}/usr/lib
-	$(CP) $(WRKBUILD)/_stage/libaxtls.so.* $(IDIR_LIBAXTLS)/usr/lib/
+	$(CP) $(WRKBUILD)/_stage/libaxtls.so* $(IDIR_LIBAXTLS)/usr/lib/
 	# awhttpd server
 	${INSTALL_DIR} ${IDIR_AXHTTPD}/www
 	${INSTALL_DIR} ${IDIR_AXHTTPD}/usr/sbin
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 92949ea13..e771a5084 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -18,11 +18,13 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,BASE_FILES,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 PKGDFLT_BASE_FILES=	y if !ADK_TOOLCHAIN_ONLY
+
+CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 do-install:
-	$(CP) ./extra/* $(IDIR_BASE_FILES)
+	$(CP) ./src/* $(IDIR_BASE_FILES)
 	$(CP) $(TOPDIR)/target/$(ADK_TARGET)/files/* $(IDIR_BASE_FILES)
 ifeq (${ADK_TARGET_ROOTFS_NFSROOT},y)
 	@-rm $(IDIR_BASE_FILES)/etc/network/interfaces
diff --git a/package/base-files/extra/etc/banner b/package/base-files/src/etc/banner
index 49dbb9685..49dbb9685 100644
--- a/package/base-files/extra/etc/banner
+++ b/package/base-files/src/etc/banner
diff --git a/package/base-files/extra/etc/functions.sh b/package/base-files/src/etc/functions.sh
index 5d76f4843..5d76f4843 100644
--- a/package/base-files/extra/etc/functions.sh
+++ b/package/base-files/src/etc/functions.sh
diff --git a/package/base-files/extra/etc/group b/package/base-files/src/etc/group
index c4e77f316..c4e77f316 100644
--- a/package/base-files/extra/etc/group
+++ b/package/base-files/src/etc/group
diff --git a/package/base-files/extra/etc/hosts b/package/base-files/src/etc/hosts
index 87d837fc7..87d837fc7 100644
--- a/package/base-files/extra/etc/hosts
+++ b/package/base-files/src/etc/hosts
diff --git a/package/base-files/extra/etc/init.d/boot b/package/base-files/src/etc/init.d/boot
index f71e46240..f71e46240 100644
--- a/package/base-files/extra/etc/init.d/boot
+++ b/package/base-files/src/etc/init.d/boot
diff --git a/package/base-files/extra/etc/init.d/done b/package/base-files/src/etc/init.d/done
index e5b655bb6..e5b655bb6 100644
--- a/package/base-files/extra/etc/init.d/done
+++ b/package/base-files/src/etc/init.d/done
diff --git a/package/base-files/extra/etc/init.d/rcK b/package/base-files/src/etc/init.d/rcK
index e94d1a296..e94d1a296 100755
--- a/package/base-files/extra/etc/init.d/rcK
+++ b/package/base-files/src/etc/init.d/rcK
diff --git a/package/base-files/extra/etc/init.d/rcS b/package/base-files/src/etc/init.d/rcS
index fd56feebf..fd56feebf 100755
--- a/package/base-files/extra/etc/init.d/rcS
+++ b/package/base-files/src/etc/init.d/rcS
diff --git a/package/base-files/extra/etc/inittab b/package/base-files/src/etc/inittab
index 960ea77d8..960ea77d8 100644
--- a/package/base-files/extra/etc/inittab
+++ b/package/base-files/src/etc/inittab
diff --git a/package/base-files/extra/etc/ipkg.conf b/package/base-files/src/etc/ipkg.conf
index 6c9242620..6c9242620 100644
--- a/package/base-files/extra/etc/ipkg.conf
+++ b/package/base-files/src/etc/ipkg.conf
diff --git a/package/base-files/extra/etc/mdev.conf b/package/base-files/src/etc/mdev.conf
index 99c910d0b..99c910d0b 100644
--- a/package/base-files/extra/etc/mdev.conf
+++ b/package/base-files/src/etc/mdev.conf
diff --git a/package/base-files/extra/etc/modules b/package/base-files/src/etc/modules
index 014f40f2b..014f40f2b 100644
--- a/package/base-files/extra/etc/modules
+++ b/package/base-files/src/etc/modules
diff --git a/package/base-files/extra/etc/network/if-post-down.d/01-bridge b/package/base-files/src/etc/network/if-post-down.d/01-bridge
index 47f3c976b..47f3c976b 100755
--- a/package/base-files/extra/etc/network/if-post-down.d/01-bridge
+++ b/package/base-files/src/etc/network/if-post-down.d/01-bridge
diff --git a/package/base-files/extra/etc/network/if-post-down.d/02-vlan b/package/base-files/src/etc/network/if-post-down.d/02-vlan
index e448a7641..e448a7641 100755
--- a/package/base-files/extra/etc/network/if-post-down.d/02-vlan
+++ b/package/base-files/src/etc/network/if-post-down.d/02-vlan
diff --git a/package/base-files/extra/etc/network/if-pre-up.d/01-atm b/package/base-files/src/etc/network/if-pre-up.d/01-atm
index 5c168c001..5c168c001 100755
--- a/package/base-files/extra/etc/network/if-pre-up.d/01-atm
+++ b/package/base-files/src/etc/network/if-pre-up.d/01-atm
diff --git a/package/base-files/extra/etc/network/if-pre-up.d/02-vlan b/package/base-files/src/etc/network/if-pre-up.d/02-vlan
index 35b7fca59..35b7fca59 100755
--- a/package/base-files/extra/etc/network/if-pre-up.d/02-vlan
+++ b/package/base-files/src/etc/network/if-pre-up.d/02-vlan
diff --git a/package/base-files/extra/etc/network/if-pre-up.d/03-bridge b/package/base-files/src/etc/network/if-pre-up.d/03-bridge
index 41ddb2b58..41ddb2b58 100755
--- a/package/base-files/extra/etc/network/if-pre-up.d/03-bridge
+++ b/package/base-files/src/etc/network/if-pre-up.d/03-bridge
diff --git a/package/base-files/extra/etc/network/if-up.d/01-bridge b/package/base-files/src/etc/network/if-up.d/01-bridge
index e5962f12f..e5962f12f 100755
--- a/package/base-files/extra/etc/network/if-up.d/01-bridge
+++ b/package/base-files/src/etc/network/if-up.d/01-bridge
diff --git a/package/base-files/extra/etc/network/interfaces b/package/base-files/src/etc/network/interfaces
index f1bd92ed2..f1bd92ed2 100644
--- a/package/base-files/extra/etc/network/interfaces
+++ b/package/base-files/src/etc/network/interfaces
diff --git a/package/base-files/extra/etc/passwd b/package/base-files/src/etc/passwd
index 32531eb92..32531eb92 100644
--- a/package/base-files/extra/etc/passwd
+++ b/package/base-files/src/etc/passwd
diff --git a/package/base-files/extra/etc/profile b/package/base-files/src/etc/profile
index 1b8f4a6a6..1b8f4a6a6 100644
--- a/package/base-files/extra/etc/profile
+++ b/package/base-files/src/etc/profile
diff --git a/package/base-files/extra/etc/protocols b/package/base-files/src/etc/protocols
index dfe58ed22..dfe58ed22 100644
--- a/package/base-files/extra/etc/protocols
+++ b/package/base-files/src/etc/protocols
diff --git a/package/base-files/extra/etc/rc.conf b/package/base-files/src/etc/rc.conf
index 024007589..024007589 100644
--- a/package/base-files/extra/etc/rc.conf
+++ b/package/base-files/src/etc/rc.conf
diff --git a/package/base-files/extra/etc/shadow b/package/base-files/src/etc/shadow
index 3683d71ea..3683d71ea 100644
--- a/package/base-files/extra/etc/shadow
+++ b/package/base-files/src/etc/shadow
diff --git a/package/base-files/extra/etc/sysctl.conf b/package/base-files/src/etc/sysctl.conf
index 73260cf9d..73260cf9d 100644
--- a/package/base-files/extra/etc/sysctl.conf
+++ b/package/base-files/src/etc/sysctl.conf
diff --git a/package/base-files/extra/init b/package/base-files/src/init
index 618547693..618547693 100755
--- a/package/base-files/extra/init
+++ b/package/base-files/src/init
diff --git a/package/base-files/extra/lib/mdev/init b/package/base-files/src/lib/mdev/init
index d2ae13e9c..d2ae13e9c 100644
--- a/package/base-files/extra/lib/mdev/init
+++ b/package/base-files/src/lib/mdev/init
diff --git a/package/base-files/extra/sbin/adkupdate b/package/base-files/src/sbin/adkupdate
index db1dfb73a..db1dfb73a 100755
--- a/package/base-files/extra/sbin/adkupdate
+++ b/package/base-files/src/sbin/adkupdate
diff --git a/package/base-files/extra/usr/share/udhcpc/default.script b/package/base-files/src/usr/share/udhcpc/default.script
index 02e4a7a3c..02e4a7a3c 100755
--- a/package/base-files/extra/usr/share/udhcpc/default.script
+++ b/package/base-files/src/usr/share/udhcpc/default.script
diff --git a/package/bash/Makefile b/package/bash/Makefile
index 531ff7f82..82b6c2334 100644
--- a/package/bash/Makefile
+++ b/package/bash/Makefile
@@ -17,9 +17,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,BASH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 XAKE_FLAGS+=		LIBS_FOR_BUILD=''
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_BASH)/bin
diff --git a/package/bc/Makefile b/package/bc/Makefile
index 3a231028a..dbe613550 100644
--- a/package/bc/Makefile
+++ b/package/bc/Makefile
@@ -17,10 +17,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,BC,bc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,DC,dc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-
 post-install:
 	# bc
 	${INSTALL_DIR} ${IDIR_BC}/usr/bin
diff --git a/package/bigreqsproto/Makefile b/package/bigreqsproto/Makefile
index b5dad3a5b..52b61b367 100644
--- a/package/bigreqsproto/Makefile
+++ b/package/bigreqsproto/Makefile
@@ -10,9 +10,4 @@ PKG_MD5SUM:=		882d49cc3bb591dbdccdf9e680bd2e4b
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/bind/Makefile b/package/bind/Makefile
index 2a75cfba4..b270af1a1 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -33,16 +33,11 @@ $(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE}
 $(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_6},${PKG_SECTION}))
 $(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_7},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV+=         BUILD_CC="${TARGET_CC}" \
-			ac_cv_lib_nsl_inet_ntoa=no
 CONFIGURE_ARGS+=	--with-randomdev=/dev/urandom \
 			--disable-threads \
 			--with-openssl=${STAGING_DIR}/usr/ \
 			--enable-epoll \
 			--with-libtool
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 pre-build:
 	${MAKE} -C ${WRKBUILD}/lib/dns \
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index c622a1af7..9d1df7793 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -12,12 +12,9 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,BINUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TCFLAGS+=		-fPIC
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-werror \
 			--host=$(REAL_GNU_TARGET_NAME) \
 			--target=$(REAL_GNU_TARGET_NAME)
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-patch:
 	${PREVENT_PATCH} ${PATCH} ${WRKDIST} \
diff --git a/package/bison/Makefile b/package/bison/Makefile
index 7c742fe6e..4c36f5892 100644
--- a/package/bison/Makefile
+++ b/package/bison/Makefile
@@ -16,10 +16,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BISON,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_BISON}/usr/bin ${IDIR_BISON}/usr/share/bison
 	${INSTALL_BIN} ${WRKINST}/usr/bin/bison ${IDIR_BISON}/usr/bin
diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile
index 8efc3c104..a0fbdab1a 100644
--- a/package/bitlbee/Makefile
+++ b/package/bitlbee/Makefile
@@ -4,33 +4,24 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		bitlbee
-PKG_VERSION:=		1.2.3
+PKG_VERSION:=		1.2.4
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libiconv openssl glib
-PKG_MD5SUM:=		2b1674d98804970809de3da3edf0bed2
+PKG_MD5SUM:=		26b9bfc5446bdf0e932e8074d117be67
 PKG_DESCR:=		IRC gateway to IM chat networks
 PKG_SECTION:=		net
-PKG_DEPENDS:=		glib libopenssl libiconv
+PKG_DEPENDS:=		glib libiconv libopenssl
+PKG_BUILDDEP+=		glib libiconv openssl
 PKG_URL:=		http://www.bitlbee.org
-PKG_SITES:=		http://get.bitlbee.org/src/ \
-			http://get.bitlbee.be/src/ \
-			http://get.us.bitlbee.org/src/ \
-			http://ftp.snt.utwente.nl/pub/software/bitlbee/src/
+PKG_SITES:=		http://get.bitlbee.org/src/
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BITLBEE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-do-configure:
-		(cd $(WRKBUILD); \
-			$(TARGET_CONFIGURE_OPTS) \
-			CFLAGS="$(TARGET_CFLAGS) -fPIC" \
-			CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-			LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
-			STAGING_DIR="$(STAGING_DIR)" \
-			STRIP="$(STRIP)" \
-			./configure \
-			--target=${REAL_GNU_TARGET_NAME} \
+CONFIG_STYLE:=		minimal
+
+TCFLAGS+=		-fPIC
+CONFIGURE_ARGS:=	--target=${REAL_GNU_TARGET_NAME} \
 			--prefix=/usr/ \
 			--bindir=/usr/sbin/ \
 			--etcdir=/etc/bitlbee/ \
@@ -39,19 +30,16 @@ do-configure:
 			--arch=Linux \
 			--cpu="${ARCH}" \
 			--debug=0 \
-			--strip=1 \
+			--strip=0 \
 			--ipv6=1 \
-			--ssl=openssl \
-		);
+			--ssl=openssl
 
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 INSTALL_TARGET=		install-etc install-bin
 
 post-configure:
 	@echo 'CFLAGS+="-I${STAGING_DIR}/usr/include/iconv"' >> \
 		${WRKBUILD}/Makefile.settings
-	@echo 'LFLAGS+="-L${STAGING_DIR}/usr/lib/iconv"' >> \
+	@echo 'LFLAGS+="-L${STAGING_DIR}/usr/lib"' >> \
 		${WRKBUILD}/Makefile.settings
 
 post-install:
diff --git a/package/bitlbee/patches/patch-Makefile b/package/bitlbee/patches/patch-Makefile
deleted file mode 100644
index 8269d1977..000000000
--- a/package/bitlbee/patches/patch-Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- bitlbee-1.2.3.orig/Makefile	2008-09-06 14:33:14.000000000 +0200
-+++ bitlbee-1.2.3/Makefile	2009-08-28 11:18:09.268088045 +0200
-@@ -111,16 +111,16 @@ $(subdirs):
- 
- $(objects): %.o: %.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@
- 
- $(objects): Makefile Makefile.settings config.h
- 
- $(OUTFILE): $(objects) $(subdirs)
- 	@echo '*' Linking $(OUTFILE)
--	@$(CC) $(objects) $(subdirobjs) -o $(OUTFILE) $(LFLAGS) $(EFLAGS)
-+	$(CC) -shared $(objects) $(subdirobjs) -o $(OUTFILE) $(LDFLAGS) $(EFLAGS)
- ifndef DEBUG
- 	@echo '*' Stripping $(OUTFILE)
--	@-$(STRIP) $(OUTFILE)
-+	-$(STRIP) $(OUTFILE)
- endif
- 
- encode: crypting.c
diff --git a/package/bitlbee/patches/patch-configure b/package/bitlbee/patches/patch-configure
index 9f13c535c..1f4538ac4 100644
--- a/package/bitlbee/patches/patch-configure
+++ b/package/bitlbee/patches/patch-configure
@@ -1,4 +1,3 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- bitlbee-1.2.3.orig/configure	2008-09-06 14:33:13.000000000 +0200
 +++ bitlbee-1.2.3/configure	2008-10-08 16:07:32.000000000 +0200
 @@ -19,7 +19,6 @@ libevent='/usr/'
diff --git a/package/bitlbee/patches/patch-lib_Makefile b/package/bitlbee/patches/patch-lib_Makefile
deleted file mode 100644
index e43ddb2a0..000000000
--- a/package/bitlbee/patches/patch-lib_Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- bitlbee-1.2.3.orig/lib/Makefile	2008-09-06 14:33:13.000000000 +0200
-+++ bitlbee-1.2.3/lib/Makefile	2009-08-28 11:12:29.546939473 +0200
-@@ -12,7 +12,7 @@
- objects = arc.o base64.o $(EVENT_HANDLER) http_client.o ini.o md5.o misc.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o
- 
- CFLAGS += -Wall
--LFLAGS += -r
-+#LFLAGS += -r
- 
- # [SH] Phony targets
- all: lib.o
-@@ -32,10 +32,10 @@ distclean: clean $(subdirs)
- 
- lib.o: $(objects) $(subdirs)
- 	@echo '*' Linking lib.o
--	@$(LD) $(LFLAGS) $(objects) -o lib.o
-+	$(CC) -shared $(LDFLAGS) $(objects) -o lib.o
- 
- $(objects): ../Makefile.settings Makefile
- 
- $(objects): %.o: %.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@
diff --git a/package/bitlbee/patches/patch-protocols_Makefile b/package/bitlbee/patches/patch-protocols_Makefile
deleted file mode 100644
index 9e0f621f9..000000000
--- a/package/bitlbee/patches/patch-protocols_Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- bitlbee-1.2.3.orig/protocols/Makefile	2008-09-06 14:33:13.000000000 +0200
-+++ bitlbee-1.2.3/protocols/Makefile	2009-08-28 11:13:32.079800935 +0200
-@@ -21,7 +21,7 @@ subdirobjs = $(PROTOOBJS)
- # Expansion of variables
- subdirobjs := $(join $(subdirs),$(addprefix /,$(subdirobjs)))
- CFLAGS += -Wall
--LFLAGS += -r
-+#LFLAGS += -r
- 
- # [SH] Phony targets
- all: protocols.o
-@@ -44,10 +44,10 @@ $(subdirs):
- 
- protocols.o: $(objects) $(subdirs)
- 	@echo '*' Linking protocols.o
--	@$(LD) $(LFLAGS) $(objects) $(subdirobjs) -o protocols.o
-+	$(CC) -shared $(LDFLAGS) $(objects) $(subdirobjs) -o protocols.o
- 
- $(objects): ../Makefile.settings Makefile
- 
- $(objects): %.o: %.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@
diff --git a/package/bitlbee/patches/patch-protocols_jabber_Makefile b/package/bitlbee/patches/patch-protocols_jabber_Makefile
deleted file mode 100644
index 5bf35809d..000000000
--- a/package/bitlbee/patches/patch-protocols_jabber_Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- bitlbee-1.2.3.orig/protocols/jabber/Makefile	2008-09-06 14:33:13.000000000 +0200
-+++ bitlbee-1.2.3/protocols/jabber/Makefile	2009-08-28 11:15:01.100110500 +0200
-@@ -12,7 +12,7 @@
- objects = conference.o io.o iq.o jabber.o jabber_util.o message.o presence.o sasl.o
- 
- CFLAGS += -Wall
--LFLAGS += -r
-+#LFLAGS += -r
- 
- # [SH] Phony targets
- all: jabber_mod.o
-@@ -34,8 +34,8 @@ $(objects): ../../Makefile.settings Make
- 
- $(objects): %.o: %.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@
- 
- jabber_mod.o: $(objects)
- 	@echo '*' Linking jabber_mod.o
--	@$(LD) $(LFLAGS) $(objects) -o jabber_mod.o
-+	$(CC) -shared $(LDFLAGS) $(objects) -o jabber_mod.o
diff --git a/package/bitlbee/patches/patch-protocols_msn_Makefile b/package/bitlbee/patches/patch-protocols_msn_Makefile
deleted file mode 100644
index df4370d39..000000000
--- a/package/bitlbee/patches/patch-protocols_msn_Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- bitlbee-1.2.3.orig/protocols/msn/Makefile	2008-09-06 14:33:13.000000000 +0200
-+++ bitlbee-1.2.3/protocols/msn/Makefile	2009-08-28 11:13:50.455844911 +0200
-@@ -12,7 +12,7 @@
- objects = msn.o msn_util.o ns.o passport.o sb.o tables.o
- 
- CFLAGS += -Wall
--LFLAGS += -r
-+#LFLAGS += -r
- 
- # [SH] Phony targets
- all: msn_mod.o
-@@ -34,10 +34,10 @@ $(objects): ../../Makefile.settings Make
- 
- $(objects): %.o: %.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@
- 
- msn_mod.o: $(objects)
- 	@echo '*' Linking msn_mod.o
--	@$(LD) $(LFLAGS) $(objects) -o msn_mod.o
-+	$(CC) -shared $(LDFLAGS) $(objects) -o msn_mod.o
- 	
- 
diff --git a/package/bitlbee/patches/patch-protocols_oscar_Makefile b/package/bitlbee/patches/patch-protocols_oscar_Makefile
deleted file mode 100644
index 2ff710800..000000000
--- a/package/bitlbee/patches/patch-protocols_oscar_Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- bitlbee-1.2.3.orig/protocols/oscar/Makefile	2008-09-06 14:33:13.000000000 +0200
-+++ bitlbee-1.2.3/protocols/oscar/Makefile	2009-08-28 11:16:04.032452435 +0200
-@@ -12,7 +12,7 @@
- objects = admin.o auth.o bos.o buddylist.o chat.o chatnav.o conn.o icq.o im.o info.o misc.o msgcookie.o rxhandlers.o rxqueue.o search.o service.o snac.o ssi.o stats.o tlv.o txqueue.o oscar_util.o oscar.o
- 
- CFLAGS += -Wall
--LFLAGS += -r
-+#LFLAGS += -r
- 
- # [SH] Phony targets
- all: oscar_mod.o
-@@ -34,8 +34,8 @@ $(objects): ../../Makefile.settings Make
- 
- $(objects): %.o: %.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@
- 
- oscar_mod.o: $(objects)
- 	@echo '*' Linking oscar_mod.o
--	@$(LD) $(LFLAGS) $(objects) -o oscar_mod.o
-+	$(CC) -shared $(LDFLAGS) $(objects) -o oscar_mod.o
diff --git a/package/bitlbee/patches/patch-protocols_yahoo_Makefile b/package/bitlbee/patches/patch-protocols_yahoo_Makefile
deleted file mode 100644
index 51a294aa8..000000000
--- a/package/bitlbee/patches/patch-protocols_yahoo_Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- bitlbee-1.2.3.orig/protocols/yahoo/Makefile	2008-09-06 14:33:13.000000000 +0200
-+++ bitlbee-1.2.3/protocols/yahoo/Makefile	2009-08-28 11:14:08.877306693 +0200
-@@ -12,7 +12,7 @@
- objects = yahoo.o crypt.o libyahoo2.o yahoo_fn.o yahoo_httplib.o yahoo_util.o
- 
- CFLAGS += -Wall -DSTDC_HEADERS -DHAVE_STRING_H -DHAVE_STRCHR -DHAVE_MEMCPY -DHAVE_GLIB
--LFLAGS += -r
-+#LFLAGS += -r
- 
- # [SH] Phony targets
- all: yahoo_mod.o
-@@ -34,8 +34,8 @@ $(objects): ../../Makefile.settings Make
- 
- $(objects): %.o: %.c
- 	@echo '*' Compiling $<
--	@$(CC) -c $(CFLAGS) $< -o $@
-+	$(CC) -c $(CFLAGS) $< -o $@
- 
- yahoo_mod.o: $(objects)
- 	@echo '*' Linking yahoo_mod.o
--	@$(LD) $(LFLAGS) $(objects) -o yahoo_mod.o
-+	$(CC) -shared $(LDFLAGS) $(objects) -o yahoo_mod.o
diff --git a/package/bluez-firmware/Makefile b/package/bluez-firmware/Makefile
index 038e04d45..50961a2d7 100644
--- a/package/bluez-firmware/Makefile
+++ b/package/bluez-firmware/Makefile
@@ -15,12 +15,9 @@ PKG_SITES:=		http://bluez.sourceforge.net/download/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BLUEZ_FIRMWARE,bluez-firmware,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BLUEZ_FIRMWARE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--libdir=/lib
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_BLUEZ_FIRMWARE}/lib/firmware
diff --git a/package/bluez/Makefile b/package/bluez/Makefile
index de238080f..c2c13ddc8 100644
--- a/package/bluez/Makefile
+++ b/package/bluez/Makefile
@@ -23,7 +23,6 @@ XAKE_FLAGS+=		V=1 CCLD="$(TARGET_CC) -all-static -pthread"
 else
 XAKE_FLAGS+=            V=1
 endif
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_prog_cc_pie=no
 CONFIGURE_ARGS+=	--enable-tools \
 			--enable-alsa \
@@ -35,8 +34,6 @@ CONFIGURE_ARGS+=	--enable-tools \
 			--enable-netlink \
 			--disable-pie \
 			--disable-cups
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 ifneq ($(ADK_STATIC),y)
diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile
index c4458cb31..7add9631c 100644
--- a/package/bogofilter/Makefile
+++ b/package/bogofilter/Makefile
@@ -18,18 +18,17 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BOGOFILTER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	autotool gnu
+AUTOTOOL_STYLE:=	autotool
 CONFIGURE_ENV+=		LIBS="-liconv"
 CONFIGURE_ARGS+=	--without-libsqlite3-prefix \
 			--without-libqdbm-prefix \
 			--with-included-gsl \
 			--with-libdb-prefix=${STAGING_DIR}/usr \
 			--disable-transactions
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_BOGOFILTER}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/${PKG_NAME} ${IDIR_BOGOFILTER}/usr/bin/
+	${INSTALL_BIN} ${WRKINST}/usr/bin/bogofilter \
+		 ${IDIR_BOGOFILTER}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile
index cdd6c2439..0d0dccb7f 100644
--- a/package/bridge-utils/Makefile
+++ b/package/bridge-utils/Makefile
@@ -17,13 +17,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BRIDGE_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	autoconf gnu
+AUTOTOOL_STYLE:=	autoconf
 CONFIGURE_ARGS+=	--with-linux-headers=${LINUX_DIR}
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_BRIDGE_UTILS}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/brctl ${IDIR_BRIDGE_UTILS}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/brctl \
+		${IDIR_BRIDGE_UTILS}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 8481fd64f..800042444 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -18,6 +18,10 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,BUSYBOX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=	manual
+BUILD_STYLE:=	manual
+INSTALL_STYLE:=	manual
+
 ${TOPDIR}/.busyboxcfg: ${TOPDIR}/.config
 	grep BUSYBOX_ $(TOPDIR)/.config|sed -e 's/BUSYBOX_/CONFIG_/' > \
 		${TOPDIR}/.busyboxcfg
diff --git a/package/busybox/config/findutils/Config.in b/package/busybox/config/findutils/Config.in
index 1869113ca..ba2e5f557 100644
--- a/package/busybox/config/findutils/Config.in
+++ b/package/busybox/config/findutils/Config.in
@@ -8,6 +8,7 @@ menu "Finding Utilities"
 config BUSYBOX_FIND
 	bool "find"
 	default y
+	depends on !ADK_PACKAGE_FINDUTILS
 	help
 	  find is used to search your system to find specified files.
 
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 264beae90..20c583388 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -94,6 +94,7 @@ config BUSYBOX_DNSD
 config BUSYBOX_ETHER_WAKE
 	bool "ether-wake"
 	default n
+	depends on !ADK_PACKAGE_ETHER_WAKE
 	help
 	  Send a magic packet to wake up sleeping machines.
 
diff --git a/package/busybox/files/busybox.postinst b/package/busybox/files/busybox.postinst
index 71d18be30..9f1f9987b 100644
--- a/package/busybox/files/busybox.postinst
+++ b/package/busybox/files/busybox.postinst
@@ -2,7 +2,7 @@
 . $IPKG_INSTROOT/etc/functions.sh
 add_rcconf network network YES
 add_rcconf crond crond NO
-add_rcconf watchdog watchdog YES
+add_rcconf watchdog watchdog NO
 add_rcconf watchdog_flags watchdog_flags '-t 10 -T 20'
 add_rcconf 'use "-C32" normally, "NO" to disable' syslogd_flags '-C32'
 add_rcconf inetd inetd NO
diff --git a/package/bwm/Makefile b/package/bwm/Makefile
index 24c22034b..c26ae51ec 100644
--- a/package/bwm/Makefile
+++ b/package/bwm/Makefile
@@ -18,6 +18,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BWM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=	manual
+BUILD_STYLE:=	manual
+INSTALL_STYLE:=	manual
+
 do-build:
 	${TARGET_CC} ${TARGET_CFLAGS} ${WRKBUILD}/bwm.c -o ${WRKBUILD}/bwm
 
diff --git a/package/bzip2/Makefile b/package/bzip2/Makefile
index 62ac57e50..c954587af 100644
--- a/package/bzip2/Makefile
+++ b/package/bzip2/Makefile
@@ -16,10 +16,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,BZIP2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+
 TCFLAGS+=		-fPIC
 XAKE_FLAGS+=		PREFIX=${WRKINST}/usr
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_BZIP2}/usr/bin
diff --git a/package/ca-certificates/Makefile b/package/ca-certificates/Makefile
index 8a9bf04e4..90754fbc7 100644
--- a/package/ca-certificates/Makefile
+++ b/package/ca-certificates/Makefile
@@ -22,8 +22,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,CA_CERTS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
+CONFIG_STYLE:=		manual
 
 post-install:
 ifeq (${ADK_PACKAGE_CA_CERTS_SMALL},n)
@@ -39,5 +38,4 @@ else
 	${INSTALL_DATA} ./cert.pem ${IDIR_CA_CERTS}/etc/ssl/
 endif
 
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ca-certificates/extra/update-ca-certificates b/package/ca-certificates/src/update-ca-certificates
index c86f7676f..c86f7676f 100644
--- a/package/ca-certificates/extra/update-ca-certificates
+++ b/package/ca-certificates/src/update-ca-certificates
diff --git a/package/cairo/Makefile b/package/cairo/Makefile
index ec6f2dd54..b15c9280e 100644
--- a/package/cairo/Makefile
+++ b/package/cairo/Makefile
@@ -22,11 +22,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CAIRO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-ft=yes \
 			--enable-xlib=yes
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_CAIRO}/usr/lib
diff --git a/package/cbtt/Makefile b/package/cbtt/Makefile
index 2062528ca..8f8573813 100644
--- a/package/cbtt/Makefile
+++ b/package/cbtt/Makefile
@@ -10,7 +10,7 @@ PKG_MD5SUM:=		19abea2817c49ccc9438e9671c402984
 PKG_DESCR:=		Bittorrent tracker
 PKG_SECTION:=		net
 PKG_DEPENDS:=		zlib
-PKG_BUILDDEP+=		mysql zlib
+PKG_BUILDDEP+=		zlib
 ifeq (${ADK_COMPILE_CBTT_WITH_UCLIBCXX},y)
 PKG_BUILDDEP+=		uclibc++
 endif
@@ -19,9 +19,6 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=bnbtusermods/}
 
 PKG_HOST_DEPENDS:=	!cygwin
 
-PKG_DESCR_1:=		Bittorrent tracker with mysql support
-PKG_DEPENDS_1:=		${PKG_DEPENDS} libmysqlclient
-
 DISTFILES:=		${PKG_NAME}80-${PKG_VERSION}-src.tar.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}80-${PKG_VERSION}-src
 
@@ -36,11 +33,11 @@ PKG_DEPENDS_1+=		libstdcxx
 endif
 
 $(eval $(call PKG_template,CBTT,cbtt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,CBTT_MYSQL,cbtt-mysql,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION}))
 
-BUILD_STYLE=		auto
-TLDFLAGS+=		-shared -L. -L${STAGING_DIR}/usr/lib/mysql \
-			-lmysqlclient -lz -lpthread -lm -lgcc
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+TLDFLAGS+=		-shared -L. -lz -lpthread -lm -lgcc
 ifeq ($(ADK_TARGET_LIB_UCLIBCXX),y)
 TLDFLAGS+=		-nodefaultlibs -lz -lpthread \
 			-luClibc++ -lc -lm -lgcc
@@ -51,7 +48,5 @@ TCFLAGS+=		-fPIC
 do-install:
 	${INSTALL_DIR} ${IDIR_CBTT}/usr/bin
 	${INSTALL_BIN} ${WRKBUILD}/bnbt ${IDIR_CBTT}/usr/bin/
-	${INSTALL_DIR} ${IDIR_CBTT_MYSQL}/usr/bin
-	${INSTALL_BIN} ${WRKBUILD}/bnbtmysql ${IDIR_CBTT_MYSQL}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile
index 5d7fc7ae1..95c9658b2 100644
--- a/package/cfgfs/Makefile
+++ b/package/cfgfs/Makefile
@@ -22,11 +22,8 @@ $(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG
 
 PKGDFLT_CFGFS=		y
 
-BUILD_STYLE:=		auto
-
-do-configure:
-	mkdir -p ${WRKBUILD}
-	${CP} ./src/* ${WRKBUILD}
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
 
 do-install:
 	${INSTALL_DIR} ${IDIR_CFGFS}/sbin
diff --git a/package/cgilib/Makefile b/package/cgilib/Makefile
index 7d8b2c59b..316b5e143 100644
--- a/package/cgilib/Makefile
+++ b/package/cgilib/Makefile
@@ -16,10 +16,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CGILIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_CGILIB}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libcgi.so* ${IDIR_CGILIB}/usr/lib/
diff --git a/package/cgilib/extra/m4/libtool.m4 b/package/cgilib/src/m4/libtool.m4
index 2f42cf831..2f42cf831 100644
--- a/package/cgilib/extra/m4/libtool.m4
+++ b/package/cgilib/src/m4/libtool.m4
diff --git a/package/cgilib/extra/m4/ltoptions.m4 b/package/cgilib/src/m4/ltoptions.m4
index 34151a3ba..34151a3ba 100644
--- a/package/cgilib/extra/m4/ltoptions.m4
+++ b/package/cgilib/src/m4/ltoptions.m4
diff --git a/package/cgilib/extra/m4/ltsugar.m4 b/package/cgilib/src/m4/ltsugar.m4
index 9000a057d..9000a057d 100644
--- a/package/cgilib/extra/m4/ltsugar.m4
+++ b/package/cgilib/src/m4/ltsugar.m4
diff --git a/package/cgilib/extra/m4/ltversion.m4 b/package/cgilib/src/m4/ltversion.m4
index b8e154fe6..b8e154fe6 100644
--- a/package/cgilib/extra/m4/ltversion.m4
+++ b/package/cgilib/src/m4/ltversion.m4
diff --git a/package/cgilib/extra/m4/lt~obsolete.m4 b/package/cgilib/src/m4/lt~obsolete.m4
index 637bb2066..637bb2066 100644
--- a/package/cgilib/extra/m4/lt~obsolete.m4
+++ b/package/cgilib/src/m4/lt~obsolete.m4
diff --git a/package/chillispot/Makefile b/package/chillispot/Makefile
index 4d2ff3de6..b4baec4fc 100644
--- a/package/chillispot/Makefile
+++ b/package/chillispot/Makefile
@@ -17,13 +17,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CHILLISPOT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_CHILLISPOT}/usr/sbin ${IDIR_CHILLISPOT}/etc
-	${INSTALL_BIN} ./files/chilli.conf \
+	${INSTALL_DATA} ./files/chilli.conf \
 		${IDIR_CHILLISPOT}/etc/
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/chilli ${IDIR_CHILLISPOT}/usr/sbin/
 
diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index 24d337b1d..1f8f003eb 100644
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		collectd
-PKG_VERSION:=		4.7.0
+PKG_VERSION:=		4.9.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b077e3398bd6fac0e53e9df4794db264
+PKG_MD5SUM:=		31a63d8e3a796dee247024f70426ed1c
 PKG_DESCR:=		System statistics collection daemon
 PKG_SECTION:=		console
 PKG_DEPENDS:=		libpthread
@@ -36,7 +36,6 @@ ifneq (${ADK_PACKAGE_COLLECTD_PING},y)
 DISABLE_PING:=--disable-ping
 endif
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-apache \
 			--disable-apcups \
 			--disable-apple_sensors \
@@ -44,6 +43,7 @@ CONFIGURE_ARGS+=	--disable-apache \
 			--disable-battery \
 			${DISABLE_CPU} \
 			--disable-cpufreq \
+			--disable-contextswitch \
 			--disable-disk \
 			--enable-csv \
 			--disable-df \
@@ -59,6 +59,7 @@ CONFIGURE_ARGS+=	--disable-apache \
 			--disable-ipvs \
 			--disable-irq \
 			${DISABLE_LOAD} \
+			--disable-madwifi \
 			--disable-mbmon \
 			--disable-memcached \
 			${DISABLE_MEMORY} \
@@ -90,19 +91,22 @@ CONFIGURE_ARGS+=	--disable-apache \
 			--disable-unixsock \
 			--disable-users \
 			--disable-vserver \
-			--enable-wireless \
+			--disable-wireless \
+			--disable-write_http \
 			--with-fp-layout=nothing \
 			--without-java \
 			--without-libiptc \
 			--with-nan-emulation
 
 XAKE_FLAGS+=		LIBS='-lm'
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_COLLECTD}/usr/sbin ${IDIR_COLLECTD}/usr/lib/collectd
-	${CP} ${WRKINST}/usr/sbin/collectd ${IDIR_COLLECTD}/usr/sbin/
-	${CP} ${WRKINST}/usr/lib/collectd/*.so ${IDIR_COLLECTD}/usr/lib/collectd/
+	${INSTALL_DIR} ${IDIR_COLLECTD}/usr/lib/collectd \
+		${IDIR_COLLECTD}/usr/sbin/ ${IDIR_COLLECTD}/etc
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/collectd ${IDIR_COLLECTD}/usr/sbin/
+	${CP} ${WRKINST}/usr/lib/collectd/*.so \
+		${IDIR_COLLECTD}/usr/lib/collectd/
+	${INSTALL_DATA} ./files/collectd.conf \
+		${IDIR_COLLECTD}/etc
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/collectd/files/collectd.conf b/package/collectd/files/collectd.conf
new file mode 100644
index 000000000..faf2bf981
--- /dev/null
+++ b/package/collectd/files/collectd.conf
@@ -0,0 +1,847 @@
+#
+# Config file for collectd(1).
+# Please read collectd.conf(5) for a list of options.
+# http://collectd.org/
+#
+
+##############################################################################
+# Global                                                                     #
+#----------------------------------------------------------------------------#
+# Global settings for the daemon.                                            #
+##############################################################################
+
+#Hostname    "localhost"
+FQDNLookup   true
+#BaseDir     "/usr/var/lib/collectd"
+#PIDFile     "/usr/var/run/collectd.pid"
+#PluginDir   "/usr/lib/collectd"
+#TypesDB     "/usr/share/collectd/types.db"
+#Interval     10
+#ReadThreads  5
+
+##############################################################################
+# Logging                                                                    #
+#----------------------------------------------------------------------------#
+# Plugins which provide logging functions should be loaded first, so log     #
+# messages generated when loading or configuring other plugins can be        #
+# accessed.                                                                  #
+##############################################################################
+
+LoadPlugin syslog
+##LoadPlugin logfile
+
+#<Plugin logfile>
+#	LogLevel info
+#	File STDOUT
+#	Timestamp true
+#</Plugin>
+
+<Plugin syslog>
+	LogLevel info
+</Plugin>
+
+##############################################################################
+# LoadPlugin section                                                         #
+#----------------------------------------------------------------------------#
+# Lines beginning with a single `#' belong to plugins which have been built  #
+# but are disabled by default.                                               #
+#                                                                            #
+# Lines begnning with `##' belong to plugins which have not been built due   #
+# to missing dependencies or because they have been deactivated explicitly.  #
+##############################################################################
+
+##LoadPlugin apache
+##LoadPlugin apcups
+##LoadPlugin apple_sensors
+##LoadPlugin ascent
+##LoadPlugin battery
+##LoadPlugin bind
+#LoadPlugin conntrack
+##LoadPlugin contextswitch
+LoadPlugin cpu
+##LoadPlugin cpufreq
+LoadPlugin csv
+#LoadPlugin curl
+##LoadPlugin curl_json
+##LoadPlugin dbi
+##LoadPlugin df
+##LoadPlugin disk
+##LoadPlugin dns
+##LoadPlugin email
+##LoadPlugin entropy
+##LoadPlugin exec
+##LoadPlugin filecount
+##LoadPlugin fscache
+##LoadPlugin gmond
+##LoadPlugin hddtemp
+##LoadPlugin interface
+##LoadPlugin iptables
+##LoadPlugin ipmi
+##LoadPlugin ipvs
+##LoadPlugin irq
+##LoadPlugin java
+##LoadPlugin libvirt
+LoadPlugin load
+##LoadPlugin madwifi
+##LoadPlugin mbmon
+##LoadPlugin memcachec
+##LoadPlugin memcached
+LoadPlugin memory
+##LoadPlugin multimeter
+##LoadPlugin mysql
+##LoadPlugin netapp
+##LoadPlugin netlink
+##LoadPlugin network
+##LoadPlugin nfs
+##LoadPlugin nginx
+##LoadPlugin notify_desktop
+##LoadPlugin notify_email
+##LoadPlugin ntpd
+##LoadPlugin nut
+#LoadPlugin olsrd
+##LoadPlugin onewire
+##LoadPlugin openvpn
+##LoadPlugin oracle
+##LoadPlugin perl
+##LoadPlugin ping
+##LoadPlugin postgresql
+##LoadPlugin powerdns
+##LoadPlugin processes
+#LoadPlugin protocols
+##LoadPlugin python
+##LoadPlugin routeros
+##LoadPlugin rrdcached
+##LoadPlugin rrdtool
+##LoadPlugin sensors
+##LoadPlugin serial
+##LoadPlugin snmp
+##LoadPlugin swap
+#LoadPlugin table
+#LoadPlugin tail
+##LoadPlugin tape
+#LoadPlugin tcpconns
+##LoadPlugin teamspeak2
+##LoadPlugin ted
+##LoadPlugin thermal
+##LoadPlugin tokyotyrant
+##LoadPlugin unixsock
+#LoadPlugin uptime
+##LoadPlugin users
+#LoadPlugin uuid
+#LoadPlugin vmem
+##LoadPlugin vserver
+##LoadPlugin wireless
+##LoadPlugin write_http
+##LoadPlugin xmms
+##LoadPlugin zfs_arc
+
+##############################################################################
+# Plugin configuration                                                       #
+#----------------------------------------------------------------------------#
+# In this section configuration stubs for each plugin are provided. A desc-  #
+# ription of those options is available in the collectd.conf(5) manual page. #
+##############################################################################
+
+#<Plugin apache>
+#	URL "http://localhost/status?auto"
+#	User "www-user"
+#	Password "secret"
+#	CACert "/etc/ssl/ca.crt"
+#</Plugin>
+
+#<Plugin apcups>
+#	Host "localhost"
+#	Port "3551"
+#</Plugin>
+
+#<Plugin ascent>
+#	URL "http://localhost/ascent/status/"
+#	User "www-user"
+#	Password "secret"
+#	CACert "/etc/ssl/ca.crt"
+#</Plugin>
+
+#<Plugin "bind">
+#  URL "http://localhost:8053/"
+#  OpCodes         true
+#  QTypes          true
+#
+#  ServerStats     true
+#  ZoneMaintStats  true
+#  ResolverStats   false
+#  MemoryStats     true
+#
+#  <View "_default">
+#    QTypes        true
+#    ResolverStats true
+#    CacheRRSets   true
+#
+#    Zone "127.in-addr.arpa/IN"
+#  </View>
+#</Plugin>
+
+#<Plugin csv>
+#	DataDir "/usr/var/lib/collectd/csv"
+#	StoreRates false
+#</Plugin>
+
+#<Plugin curl>
+#  <Page "stock_quotes">
+#    URL "http://finance.google.com/finance?q=NYSE%3AAMD"
+#    User "foo"
+#    Password "bar"
+#    MeasureResponseTime false
+#    <Match>
+#      Regex "<span +class=\"pr\"[^>]*> *([0-9]*\\.[0-9]+) *</span>"
+#      DSType "GaugeAverage"
+#      Type "stock_value"
+#      Instance "AMD"
+#    </Match>
+#  </Page>
+#</Plugin>
+
+#<Plugin curl_json>
+## See: http://wiki.apache.org/couchdb/Runtime_Statistics
+#  <URL "http://localhost:5984/_stats">
+#    Instance "httpd"
+#    <Key "httpd/requests/count">
+#      Type "http_requests"
+#    </Key>
+#
+#    <Key "httpd_request_methods/*/count">
+#      Type "http_request_methods"
+#    </Key>
+#
+#    <Key "httpd_status_codes/*/count">
+#      Type "http_response_codes"
+#    </Key>
+#  </URL>
+## Database status metrics:
+#  <URL "http://localhost:5984/_all_dbs">
+#    Instance "dbs"
+#    <Key "*/doc_count">
+#      Type "gauge"
+#    </Key>
+#    <Key "*/doc_del_count">
+#      Type "counter"
+#    </Key>
+#    <Key "*/disk_size">
+#      Type "bytes"
+#    </Key>
+#  </URL>
+#</Plugin>
+
+#<Plugin dbi>
+#	<Query "num_of_customers">
+#		Statement "SELECT 'customers' AS c_key, COUNT(*) AS c_value FROM customers_tbl"
+#		<Result>
+#			Type "gauge"
+#			InstancesFrom "c_key"
+#			ValuesFrom "c_value"
+#		</Result>
+#	</Query>
+#	<Database "customers_db">
+#		Driver "mysql"
+#		DriverOption "host" "localhost"
+#		DriverOption "username" "collectd"
+#		DriverOption "password" "AeXohy0O"
+#		DriverOption "dbname" "custdb0"
+#		#SelectDB "custdb0"
+#		Query "num_of_customers"
+#		#Query "..."
+#	</Database>
+#</Plugin>
+
+#<Plugin df>
+#	Device "/dev/hda1"
+#	Device "192.168.0.2:/mnt/nfs"
+#	MountPoint "/home"
+#	FSType "ext3"
+#	IgnoreSelected false
+#	ReportByDevice false
+#	ReportReserved false
+#	ReportInodes false
+#</Plugin>
+
+#<Plugin disk>
+#	Disk "/^[hs]d[a-f][0-9]?$/"
+#	IgnoreSelected false
+#</Plugin>
+
+#<Plugin dns>
+#	Interface "eth0"
+#	IgnoreSource "192.168.0.1"
+#	SelectNumericQueryTypes true
+#</Plugin>
+
+#<Plugin email>
+#	SocketFile "/usr/var/run/collectd-email"
+#	SocketGroup "collectd"
+#	SocketPerms "0770"
+#	MaxConns 5
+#</Plugin>
+
+#<Plugin exec>
+#	Exec "user:group" "/path/to/exec"
+#	NotificationExec "user:group" "/path/to/exec"
+#</Plugin>
+
+#<Plugin filecount>
+#	<Directory "/path/to/dir">
+#		Instance "foodir"
+#		Name "*.conf"
+#		MTime "-5m"
+#		Size "+10k"
+#		Recursive true
+#	</Directory>
+#</Plugin>
+
+#<Plugin "gmond">
+#  MCReceiveFrom "239.2.11.71" "8649"
+#  <Metric "swap_total">
+#    Type "swap"
+#    TypeInstance "total"
+#    DataSource "value"
+#  </Metric>
+#  <Metric "swap_free">
+#    Type "swap"
+#    TypeInstance "free"
+#    DataSource "value"
+#  </Metric>
+#</Plugin>
+
+#<Plugin hddtemp>
+#  Host "127.0.0.1"
+#  Port "7634"
+#
+#  #----------------------------------------------------------------#
+#  # `TranslateDevicename' enables backwards compatibility behavior #
+#  # and is enabled by default. Setting this option to `false' is   #
+#  # highly recommended.                                            #
+#  #----------------------------------------------------------------#
+#  TranslateDevicename false
+#</Plugin>
+
+#<Plugin interface>
+#	Interface "eth0"
+#	IgnoreSelected false
+#</Plugin>
+
+#<Plugin ipmi>
+#	Sensor "some_sensor"
+#	Sensor "another_one"
+#	IgnoreSelected false
+#	NotifySensorAdd false
+#	NotifySensorRemove true
+#	NotifySensorNotPresent false
+#</Plugin>
+
+#<Plugin iptables>
+#	Chain table chain
+#</Plugin>
+
+#<Plugin irq>
+#	Irq 7
+#	Irq 8
+#	Irq 9
+#	IgnoreSelected true
+#</Plugin>
+
+#<Plugin "java">
+#	JVMArg "-verbose:jni"
+#	JVMArg "-Djava.class.path=/usr/share/collectd/java"
+#
+#	LoadPlugin "org.collectd.java.Foobar"
+#	<Plugin "org.collectd.java.Foobar">
+#	  # To be parsed by the plugin
+#	</Plugin>
+#</Plugin>
+
+#<Plugin libvirt>
+#	Connection "xen:///"
+#	RefreshInterval 60
+#	Domain "name"
+#	BlockDevice "name:device"
+#	InterfaceDevice "name:device"
+#	IgnoreSelected false
+#	HostnameFormat name
+#</Plugin>
+
+#<Plugin madwifi>
+#	Interface "wlan0"
+#	IgnoreSelected false
+#	Source "SysFS"
+#	WatchSet "None"
+#	WatchAdd "node_octets"
+#	WatchAdd "node_rssi"
+#	WatchAdd "is_rx_acl"
+#	WatchAdd "is_scan_active"
+#</Plugin>
+
+#<Plugin mbmon>
+#	Host "127.0.0.1"
+#	Port "411"
+#</Plugin>
+
+#<Plugin memcachec>
+#	<Page "plugin_instance">
+#		Server "localhost"
+#		Key "page_key"
+#		<Match>
+#			Regex "(\\d+) bytes sent"
+#			DSType CounterAdd
+#			Type "ipt_octets"
+#			Instance "type_instance"
+#		</Match>
+#	</Page>
+#</Plugin>
+
+#<Plugin memcached>
+#	Host "127.0.0.1"
+#	Port "11211"
+#</Plugin>
+
+#<Plugin mysql>
+#	<Database db_name>
+#		Host "database.serv.er"
+#		User "db_user"
+#		Password "secret"
+#		Database "db_name"
+#		MasterStats true
+#	</Database>
+#
+#	<Database db_name2>
+#		Host "localhost"
+#		Socket "/var/run/mysql/mysqld.sock"
+#		SlaveStats true
+#		SlaveNotifications true
+#	</Database>
+#</Plugin>
+
+#<Plugin netapp>
+#	<Host "netapp1.example.com">
+#		Protocol      "https"
+#		Address       "10.0.0.1"
+#		Port          443
+#		User          "username"
+#		Password      "aef4Aebe"
+#		Interval      30
+#
+#		<WAFL>
+#			Interval 30
+#			GetNameCache   true
+#			GetDirCache    true
+#			GetBufferCache true
+#			GetInodeCache  true
+#		</WAFL>
+#
+#		<Disks>
+#			Interval 30
+#			GetBusy true
+#		</Disks>
+#
+#		<VolumePerf>
+#			Interval 30
+#			GetIO      "volume0"
+#			IgnoreSelectedIO      false
+#			GetOps     "volume0"
+#			IgnoreSelectedOps     false
+#			GetLatency "volume0"
+#			IgnoreSelectedLatency false
+#		</VolumePerf>
+#
+#		<VolumeUsage>
+#			Interval 30
+#			GetCapacity "vol0"
+#			GetCapacity "vol1"
+#			IgnoreSelectedCapacity false
+#			GetSnapshot "vol1"
+#			GetSnapshot "vol3"
+#			IgnoreSelectedSnapshot false
+#		</VolumeUsage>
+#
+#		<System>
+#			Interval 30
+#			GetCPULoad     true
+#			GetInterfaces  true
+#			GetDiskOps     true
+#			GetDiskIO      true
+#		</System>
+#	</Host>
+#</Plugin>
+
+#<Plugin netlink>
+#	Interface "All"
+#	VerboseInterface "All"
+#	QDisc "eth0" "pfifo_fast-1:0"
+#	Class "ppp0" "htb-1:10"
+#	Filter "ppp0" "u32-1:0"
+#	IgnoreSelected false
+#</Plugin>
+
+##<Plugin network>
+##	Server "ff18::efc0:4a42" "25826"
+##	Server "239.192.74.66" "25826"
+#	Listen "ff18::efc0:4a42" "25826"
+#	Listen "239.192.74.66" "25826"
+#	TimeToLive "128"
+#	Forward false
+#	CacheFlush 1800
+#	ReportStats false
+##</Plugin>
+
+#<Plugin nginx>
+#	URL "http://localhost/status?auto"
+#	User "www-user"
+#	Password "secret"
+#	CACert "/etc/ssl/ca.crt"
+#</Plugin>
+
+#<Plugin notify_desktop>
+#	OkayTimeout 1000
+#	WarningTimeout 5000
+#	FailureTimeout 0
+#</Plugin>
+
+#<Plugin notify_email>
+#       SMTPServer "localhost"
+#	SMTPPort 25
+#	SMTPUser "my-username"
+#	SMTPPassword "my-password"
+#	From "collectd@main0server.com"
+#	# <WARNING/FAILURE/OK> on <hostname>. beware! do not use not more than two %s in this string!!!
+#	Subject "Aaaaaa!! %s on %s!!!!!"
+#	Recipient "email1@domain1.net"
+#	Recipient "email2@domain2.com"
+#</Plugin>
+
+#<Plugin ntpd>
+#	Host "localhost"
+#	Port 123
+#	ReverseLookups false
+#</Plugin>
+
+#<Plugin nut>
+#	UPS "upsname@hostname:port"
+#</Plugin>
+
+#<Plugin olsrd>
+#	Host "127.0.0.1"
+#	Port "2006"
+#	CollectLinks "Summary"
+#	CollectRoutes "Summary"
+#	CollectTopology "Summary"
+#</Plugin>
+
+#<Plugin onewire>
+#	Device "-s localhost:4304"
+#	Sensor "F10FCA000800"
+#	IgnoreSelected false
+#</Plugin>
+
+#<Plugin openvpn>
+#	StatusFile "/etc/openvpn/openvpn-status.log"
+#</Plugin>
+
+#<Plugin oracle>
+#  <Query "out_of_stock">
+#    Statement "SELECT category, COUNT(*) AS value FROM products WHERE in_stock = 0 GROUP BY category"
+#    <Result>
+#      Type "gauge"
+#      InstancesFrom "category"
+#      ValuesFrom "value"
+#    </Result>
+#  </Query>
+#  <Database "product_information">
+#    ConnectID "db01"
+#    Username "oracle"
+#    Password "secret"
+#    Query "out_of_stock"
+#  </Database>
+#</Plugin>
+
+#<Plugin perl>
+#	IncludeDir "/my/include/path"
+#	BaseName "Collectd::Plugin"
+#	EnableDebugger ""
+#	LoadPlugin Monitorus
+#	LoadPlugin OpenVZ
+#
+#	<Plugin foo>
+#		Foo "Bar"
+#		Qux "Baz"
+#	</Plugin>
+#</Plugin>
+
+#<Plugin ping>
+#	Host "host.foo.bar"
+#	Interval 1.0
+#	Timeout 0.9
+#	TTL 255
+#	SourceAddress "1.2.3.4"
+#	Device "eth0"
+#	MaxMissed -1
+#</Plugin>
+
+#<Plugin postgresql>
+#	<Query magic>
+#		Statement "SELECT magic FROM wizard WHERE host = $1;"
+#		Param hostname
+#		<Result>
+#			Type gauge
+#			InstancePrefix "magic"
+#			ValuesFrom magic
+#		</Result>
+#	</Query>
+#	<Query rt36_tickets>
+#		Statement "SELECT COUNT(type) AS count, type \
+#		                  FROM (SELECT CASE \
+#		                               WHEN resolved = 'epoch' THEN 'open' \
+#		                               ELSE 'resolved' END AS type \
+#		                               FROM tickets) type \
+#		                  GROUP BY type;"
+#		<Result>
+#			Type counter
+#			InstancePrefix "rt36_tickets"
+#			InstancesFrom "type"
+#			ValuesFrom "count"
+#		</Result>
+#	</Query>
+#	<Database foo>
+#		Host "hostname"
+#		Port "5432"
+#		User "username"
+#		Password "secret"
+#		SSLMode "prefer"
+#		KRBSrvName "kerberos_service_name"
+#		Query magic
+#	</Database>
+#	<Database bar>
+#		Service "service_name"
+#		Query backend # predefined
+#		Query rt36_tickets
+#	</Database>
+#</Plugin>
+
+#<Plugin powerdns>
+#  <Server "server_name">
+#    Collect "latency"
+#    Collect "udp-answers" "udp-queries"
+#    Socket "/var/run/pdns.controlsocket"
+#  </Server>
+#  <Recursor "recursor_name">
+#    Collect "questions"
+#    Collect "cache-hits" "cache-misses"
+#    Socket "/var/run/pdns_recursor.controlsocket"
+#  </Recursor>
+#  LocalSocket "/opt/collectd/var/run/collectd-powerdns"
+#</Plugin>
+
+#<Plugin processes>
+#	Process "name"
+#</Plugin>
+
+#<Plugin protocols>
+#	Value "/^Tcp:/"
+#	IgnoreSelected false
+#</Plugin>
+
+#<Plugin python>
+#	ModulePath "/path/to/your/python/modules"
+#	LogTraces true
+#	Interactive true
+#	Import "spam"
+#
+#	<Module spam>
+#		spam "wonderful" "lovely"
+#	</Module>
+#</Plugin>
+
+#<Plugin routeros>
+#	<Router>
+#		Host "router.example.com"
+#		Port "8728"
+#		User "admin"
+#		Password "dozaiTh4"
+#		CollectInterface true
+#		CollectRegistrationTable true
+#	</Router>
+#</Plugin>
+
+#<Plugin rrdcached>
+#	DaemonAddress "unix:/tmp/rrdcached.sock"
+#	DataDir "/usr/var/lib/collectd/rrd"
+#	CreateFiles true
+#	CollectStatistics true
+#</Plugin>
+
+#<Plugin rrdtool>
+#	DataDir "/usr/var/lib/collectd/rrd"
+#	CacheTimeout 120
+#	CacheFlush   900
+#</Plugin>
+
+#<Plugin sensors>
+#	Sensor "it8712-isa-0290/temperature-temp1"
+#	Sensor "it8712-isa-0290/fanspeed-fan3"
+#	Sensor "it8712-isa-0290/voltage-in8"
+#	IgnoreSelected false
+#</Plugin>
+
+#<Plugin snmp>
+#   <Data "powerplus_voltge_input">
+#       Type "voltage"
+#       Table false
+#       Instance "input_line1"
+#       Values "SNMPv2-SMI::enterprises.6050.5.4.1.1.2.1"
+#   </Data>
+#   <Data "hr_users">
+#       Type "users"
+#       Table false
+#       Instance ""
+#       Values "HOST-RESOURCES-MIB::hrSystemNumUsers.0"
+#   </Data>
+#   <Data "std_traffic">
+#       Type "if_octets"
+#       Table true
+#       Instance "IF-MIB::ifDescr"
+#       Values "IF-MIB::ifInOctets" "IF-MIB::ifOutOctets"
+#   </Data>
+#
+#   <Host "some.switch.mydomain.org">
+#       Address "192.168.0.2"
+#       Version 1
+#       Community "community_string"
+#       Collect "std_traffic"
+#       Interval 120
+#   </Host>
+#   <Host "some.server.mydomain.org">
+#       Address "192.168.0.42"
+#       Version 2
+#       Community "another_string"
+#       Collect "std_traffic" "hr_users"
+#   </Host>
+#   <Host "some.ups.mydomain.org">
+#       Address "192.168.0.3"
+#       Version 1
+#       Community "more_communities"
+#       Collect "powerplus_voltge_input"
+#       Interval 300
+#   </Host>
+#</Plugin>
+
+#<Plugin "table">
+#	<Table "/proc/slabinfo">
+#		Instance "slabinfo"
+#		Separator " "
+#		<Result>
+#			Type gauge
+#			InstancePrefix "active_objs"
+#			InstancesFrom 0
+#			ValuesFrom 1
+#		</Result>
+#		<Result>
+#			Type gauge
+#			InstancePrefix "objperslab"
+#			InstancesFrom 0
+#			ValuesFrom 4
+#		</Result>
+#	</Table>
+#</Plugin>
+
+#<Plugin "tail">
+#  <File "/var/log/exim4/mainlog">
+#    Instance "exim"
+#    <Match>
+#      Regex "S=([1-9][0-9]*)"
+#      DSType "CounterAdd"
+#      Type "ipt_bytes"
+#      Instance "total"
+#    </Match>
+#    <Match>
+#      Regex "\\<R=local_user\\>"
+#      DSType "CounterInc"
+#      Type "counter"
+#      Instance "local_user"
+#    </Match>
+#  </File>
+#</Plugin>
+
+#<Plugin tcpconns>
+#	ListeningPorts false
+#	LocalPort "25"
+#	RemotePort "25"
+#</Plugin>
+
+#<Plugin teamspeak2>
+#	Host "127.0.0.1"
+#	Port "51234"
+#	Server "8767"
+#</Plugin>
+
+#<Plugin ted>
+#	Device "/dev/ttyUSB0"
+#	Retries 0
+#</Plugin>
+
+#<Plugin thermal>
+#	ForceUseProcfs false
+#	Device "THRM"
+#	IgnoreSelected false
+#</Plugin>
+
+#<Plugin tokyotyrant>
+#	Host "localhost"
+#	Port "1978"
+#</Plugin>
+
+#<Plugin unixsock>
+#	SocketFile "/usr/var/run/collectd-unixsock"
+#	SocketGroup "collectd"
+#	SocketPerms "0660"
+#</Plugin>
+
+#<Plugin uuid>
+#	UUIDFile "/etc/uuid"
+#</Plugin>
+
+#<Plugin vmem>
+#	Verbose false
+#</Plugin>
+
+#<Plugin write_http>
+#	<URL "http://example.com/collectd-post">
+#		User "collectd"
+#		Password "weCh3ik0"
+#	</URL>
+#</Plugin>
+
+##############################################################################
+# Filter configuration                                                       #
+#----------------------------------------------------------------------------#
+# The following configures collectd's filtering mechanism. Before changing   #
+# anything in this section, please read the `FILTER CONFIGURATION' section   #
+# in the collectd.conf(5) manual page.                                       #
+##############################################################################
+
+# Load required matches:
+#LoadPlugin match_empty_counter
+#LoadPlugin match_hashed
+#LoadPlugin match_regex
+#LoadPlugin match_value
+#LoadPlugin match_timediff
+
+# Load required targets:
+##LoadPlugin target_notification
+##LoadPlugin target_replace
+#LoadPlugin target_scale
+##LoadPlugin target_set
+
+#----------------------------------------------------------------------------#
+# The following block demonstrates the default behavior if no filtering is   #
+# configured at all: All values will be sent to all available write plugins. #
+#----------------------------------------------------------------------------#
+
+#<Chain "PostCache">
+#  Target "write"
+#</Chain>
diff --git a/package/comgt/Makefile b/package/comgt/Makefile
index afc21e322..50816d485 100644
--- a/package/comgt/Makefile
+++ b/package/comgt/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		comgt
 PKG_VERSION:=		0.32
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		db2452680c3d953631299e331daf49ef
-PKG_DESCR:=		Option GlobeTrotter GPRS/EDGE/3G/HSDPA and Vodafone 3G/GPRS datacard control tool
+PKG_DESCR:=		3G/GPRS datacard control tool
 PKG_SECTION:=		console
 PKG_URL:=		http://sourceforge.net/projects/comgt
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=comgt/}
@@ -19,7 +19,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,COMGT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE=		auto
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 ALL_TARGET=		comgt
 
 do-install:
diff --git a/package/compositeproto/Makefile b/package/compositeproto/Makefile
index b22dc08d3..6f7572f55 100644
--- a/package/compositeproto/Makefile
+++ b/package/compositeproto/Makefile
@@ -10,9 +10,4 @@ PKG_MD5SUM:=		6994a209774fe7877fd8e0c9fafe2466
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cpio/Makefile b/package/cpio/Makefile
index cb3e641d1..5bcbc2351 100644
--- a/package/cpio/Makefile
+++ b/package/cpio/Makefile
@@ -16,10 +16,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CPIO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_CPIO}/usr/bin
 	${CP} ${WRKINST}/usr/bin/cpio ${IDIR_CPIO}/usr/bin
diff --git a/package/cpufrequtils/Makefile b/package/cpufrequtils/Makefile
index 0e4d22450..27044290b 100644
--- a/package/cpufrequtils/Makefile
+++ b/package/cpufrequtils/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		cpufrequtils
 PKG_VERSION:=		007
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		40271a1e1eadce31457e9891cdb071f1
-PKG_DESCR:=		Userspace utilities for the Linux kernel cpufreq subsystem
+PKG_DESCR:=		utilities for the Linux kernel cpufreq subsystem
 PKG_SECTION:=		utils
 PKG_URL:=		http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html
 PKG_SITES:=		http://www.kernel.org/pub/linux/utils/kernel/cpufreq/
@@ -16,9 +16,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,CPUFREQUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-MAKE_FLAGS+=		CROSS=${TARGET_CROSS}
+CONFIG_STYLE:=		manual
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_CPUFREQUTILS)/usr/lib
diff --git a/package/cpufrequtils/patches/patch-Makefile b/package/cpufrequtils/patches/patch-Makefile
index c85aba1ab..2aec7173f 100644
--- a/package/cpufrequtils/patches/patch-Makefile
+++ b/package/cpufrequtils/patches/patch-Makefile
@@ -1,5 +1,5 @@
 --- cpufrequtils-007.orig/Makefile	2010-01-16 14:47:44.000000000 +0100
-+++ cpufrequtils-007/Makefile	2010-01-23 18:52:15.905985935 +0100
++++ cpufrequtils-007/Makefile	2010-02-05 18:20:59.944334337 +0100
 @@ -27,11 +27,11 @@
  DEBUG ?=	false
  
@@ -133,7 +133,7 @@
  install-lib:
  	$(INSTALL) -d $(DESTDIR)${libdir}
 -	$(LIBTOOL) --mode=install $(INSTALL) libcpufreq.la $(DESTDIR)${libdir}/libcpufreq.la
-+	$(INSTALL) libcpufreq.so* $(DESTDIR)${libdir}/
++	cp -Rp libcpufreq.so* $(DESTDIR)${libdir}/
  	$(INSTALL) -d $(DESTDIR)${includedir}
  	$(INSTALL_DATA) lib/cpufreq.h $(DESTDIR)${includedir}/cpufreq.h
  
diff --git a/package/cryptinit/Makefile b/package/cryptinit/Makefile
index 6ffcef02e..0366fa2ef 100644
--- a/package/cryptinit/Makefile
+++ b/package/cryptinit/Makefile
@@ -15,15 +15,13 @@ NO_DISTFILES:=		1
 
 include ${TOPDIR}/mk/package.mk
 
+CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
-pre-configure:
-	mkdir -p ${WRKBUILD}
-
 do-build:
 	${TARGET_CC} ${TCPPFLAGS} ${TCFLAGS} -c -o ${WRKBUILD}/cryptinit.o \
-		./src/cryptinit.c
+		${WRKBUILD}/cryptinit.c
 	( cd ${WRKBUILD}; \
 	${TARGET_CC} -static -o cryptinit cryptinit.o \
 		 ${STAGING_DIR}/usr/lib/libcryptsetup.a \
diff --git a/package/cryptsetup/Makefile b/package/cryptsetup/Makefile
index 7e41abe3b..d3bd57e6f 100644
--- a/package/cryptsetup/Makefile
+++ b/package/cryptsetup/Makefile
@@ -4,12 +4,14 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cryptsetup
-PKG_VERSION:=		1.0.7
+PKG_VERSION:=		1.1.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		5eea2a77391a8a1a651b31cbaef59e22
+PKG_MD5SUM:=		8177f1833f4d6aaacc5812046d2010b6
 PKG_DESCR:=		LUKS cryptsetup tools
 PKG_SECTION:=		crypto
-PKG_DEPENDS:=		libgcrypt device-mapper libuuid libpopt kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc kmod-crypto-sha256 kmod-blk-dev-dm
+PKG_DEPENDS:=		libgcrypt device-mapper libuuid libpopt \
+			kmod-dm-crypt kmod-crypto-aes kmod-crypto-cbc \
+			kmod-crypto-sha256 kmod-blk-dev-dm
 PKG_BUILDDEP+=		libgcrypt popt e2fsprogs lvm
 PKG_URL:=		http://cryptsetup.googlecode.com
 PKG_SITES:=		http://cryptsetup.googlecode.com/files/
@@ -22,27 +24,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CRYPTSETUP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-CONFIGURE_ARGS+=	--disable-static
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
-# hackish way to although build the static libraries for cryptinit
-pre-configure:
-	(cd ${WRKBUILD}; \
-		env ${CONFIGURE_ENV} \
-		./configure --enable-static --disable-nls \
-			--build=${GNU_HOST_NAME} \
-			--host=${GNU_TARGET_NAME} \
-			--target=${GNU_TARGET_NAME} \
-	);
-	$(MAKE) -C $(WRKBUILD) CC="$(TARGET_CC)"
-	$(MAKE) -C $(WRKBUILD) CC="$(TARGET_CC)" DESTDIR='${WRKINST}' install
-	$(MAKE) -C $(WRKBUILD) CC="$(TARGET_CC)" clean
+AUTOTOOL_STYLE:=	autotool
+CONFIGURE_ARGS+=	--disable-selinux
 
 post-install:
 	${INSTALL_DIR} ${IDIR_CRYPTSETUP}/usr/sbin ${IDIR_CRYPTSETUP}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libcryptsetup.so.* \
+	${CP} ${WRKINST}/usr/lib/libcryptsetup.so* \
 		${IDIR_CRYPTSETUP}/usr/lib
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/cryptsetup \
 		${IDIR_CRYPTSETUP}/usr/sbin
diff --git a/package/cryptsetup/patches/patch-configure_in b/package/cryptsetup/patches/patch-configure_in
new file mode 100644
index 000000000..2b4c32ad9
--- /dev/null
+++ b/package/cryptsetup/patches/patch-configure_in
@@ -0,0 +1,31 @@
+--- cryptsetup-1.1.0.orig/configure.in	2010-01-17 11:26:31.000000000 +0100
++++ cryptsetup-1.1.0/configure.in	2010-02-05 17:05:34.911823330 +0100
+@@ -80,7 +80,7 @@ LIBS=$saved_LIBS
+ if test "x$enable_selinux" != xno; then
+ 	AC_CHECK_LIB(sepol, sepol_bool_set)
+ 	AC_CHECK_LIB(selinux, is_selinux_enabled)
+-	if test x$enable_static = xyes; then
++	if test x$enable_static_cryptsetup = xyes; then
+ 		SELINUX_STATIC_LIBS=$LIBS
+ 		# Check if we need -pthread with --enable-static and selinux
+ 		saved_LIBS2=$LIBS
+@@ -91,7 +91,7 @@ if test "x$enable_selinux" != xno; then
+ 	fi
+ fi
+ 
+-if test x$enable_static = xyes; then
++if test x$enable_static_cryptsetup = xyes; then
+ 	saved_LIBS2=$LIBS
+ 	LIBS="$LIBS -static"
+ 	# Check if it there is still not some missing dependency like static selinux libs
+@@ -135,8 +135,8 @@ CS_NUM_WITH([luks1-keybits],[key length 
+ 
+ dnl ==========================================================================
+ 
+-AM_CONDITIONAL(STATIC_CRYPTSETUP, test x$enable_static = xyes)
+-AM_CONDITIONAL(DYNAMIC_CRYPTSETUP, test x$enable_static = xno)
++AM_CONDITIONAL(STATIC_CRYPTSETUP, test x$enable_static_cryptsetup = xyes)
++AM_CONDITIONAL(DYNAMIC_CRYPTSETUP, test x$enable_static_cryptsetup = xno)
+ 
+ dnl ==========================================================================
+ 
diff --git a/package/cryptsetup/patches/patch-lib_setup_c b/package/cryptsetup/patches/patch-lib_setup_c
deleted file mode 100644
index 97b356f68..000000000
--- a/package/cryptsetup/patches/patch-lib_setup_c
+++ /dev/null
@@ -1,17 +0,0 @@
-already added in svn upstream
---- cryptsetup-1.0.7.orig/lib/setup.c	2009-07-22 13:12:44.000000000 +0200
-+++ cryptsetup-1.0.7/lib/setup.c	2009-08-22 15:10:32.000000000 +0200
-@@ -542,7 +542,12 @@ static int __crypt_luks_open(int arg, st
- start:
- 	mk=NULL;
- 
--	if(get_key(prompt, &password, &passwordLen, 0, options->key_file, options->passphrase_fd, options->timeout, options->flags))
-+	if(options->passphrase) {
-+		passwordLen = strlen(options->passphrase);
-+		password = safe_alloc(passwordLen + 1);
-+		strncpy(password, options->passphrase, passwordLen + 1);
-+		tries = 0;
-+	} else if(get_key(prompt, &password, &passwordLen, 0, options->key_file, options->passphrase_fd, options->timeout, options->flags))
- 		tries--;
- 	else
- 		tries = 0;
diff --git a/package/ctorrent/Makefile b/package/ctorrent/Makefile
index 6cc8878fa..aad41b850 100755
--- a/package/ctorrent/Makefile
+++ b/package/ctorrent/Makefile
@@ -7,7 +7,6 @@ PKG_NAME:=		ctorrent
 PKG_VERSION:=		dnh3.3.2
 PKG_RELEASE:=		1
 PKG_BUILDDEP+=		openssl
-#PKG_CXX:=		CTORRENT
 PKG_MD5SUM:=		59b23dd05ff70791cd6449effa7fc3b6
 PKG_DESCR:=		console-based BitTorrent client
 PKG_SECTION:=		net
@@ -18,15 +17,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-#ifeq ($(ADK_COMPILE_CTORRENT_WITH_UCLIBCXX),y)
-#TCXXFLAGS+=		-fno-threadsafe-statics -fno-builtin -fno-rtti -nostdinc++
-#TLDFLAGS+=		-lgcc_s -luClibc++ -lc -lm -nodefaultlibs
-#endif
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_CTORRENT}/usr/bin
 	${CP} ${WRKINST}/usr/bin/ctorrent ${IDIR_CTORRENT}/usr/bin
diff --git a/package/cups/Makefile b/package/cups/Makefile
index fc9db155b..13ed31d70 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -11,9 +11,9 @@ PKG_MD5SUM:=		d95e2d588e3d36e563027a963b117b1b
 PKG_DESCR:=		Common Unix Printing System
 PKG_SECTION:=		net
 PKG_DEPENDS:=		zlib libpthread
+PKG_BUILDDEP+=		zlib
 PKG_URL:=		http://www.cups.org
-PKG_SITES:=		http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/cups/${PKG_VERSION}/ \
-			ftp://ftp.easysw.com/pub/cups/${PKG_VERSION}/
+PKG_SITES:=		ftp://ftp.easysw.com/pub/cups/${PKG_VERSION}/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}-source.tar.bz2
 
@@ -21,7 +21,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CUPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_func_sigset=no \
 			OPTIM='-fPIC'
 CONFIGURE_ARGS+=	--with-cups-user=0 \
@@ -41,8 +40,7 @@ CONFIGURE_ARGS+=	--with-cups-user=0 \
 			--disable-cdsassl \
 			--disable-dbus \
 			--disable-ssl
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
+
 FAKE_FLAGS+=		DSTROOT="${WRKINST}" STRIP="/bin/true"
 XAKE_FLAGS+=		OPTIM='-fPIC'
 
@@ -66,8 +64,10 @@ post-install:
 		${IDIR_CUPS}/usr/share/doc/cups/
 	rm -f ${IDIR_CUPS}/usr/bin/cups-config
 	${CP} ${WRKINST}/usr/lib/libcups*.so* ${IDIR_CUPS}/usr/lib/
-	${CP} ${WRKINST}/usr/lib/cups/cgi-bin/* ${IDIR_CUPS}/usr/lib/cups/cgi-bin/
-	${CP} ${WRKINST}/usr/lib/cups/daemon/* ${IDIR_CUPS}/usr/lib/cups/daemon/
+	${CP} ${WRKINST}/usr/lib/cups/cgi-bin/* \
+		${IDIR_CUPS}/usr/lib/cups/cgi-bin/
+	${CP} ${WRKINST}/usr/lib/cups/daemon/* \
+		${IDIR_CUPS}/usr/lib/cups/daemon/
 	${CP} ${WRKINST}/usr/share/cups/banners/* \
 		${IDIR_CUPS}/usr/share/cups/banners/
 	${CP} ${WRKINST}/usr/share/cups/templates/*.tmpl \
diff --git a/package/curl/Makefile b/package/curl/Makefile
index 26037200c..9f771defb 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -32,7 +32,11 @@ $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS
 $(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_LIB},${PKG_DESCR_LIB},${PKG_SECTION_LIB}))
 $(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_LIB_DEV},${PKG_SECTION_LIB_DEV}))
 
-CONFIGURE_STYLE:=	gnu
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_CURL}+=		curl-install
+SUB_INSTALLS-${ADK_PACKAGE_LIBCURL_DEV}+=	libcurl-dev-install
+
 CONFIGURE_ENV+=		curl_typeof_curl_socklen_t=socklen_t
 CONFIGURE_ARGS+=	--disable-thread \
 			--enable-cookies \
@@ -54,14 +58,18 @@ CONFIGURE_ARGS+=	--disable-thread \
 			--without-ca-bundle \
 			--without-gnutls \
 			--without-libidn
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
-post-install:
-	${INSTALL_DIR} ${IDIR_CURL}/usr/bin ${IDIR_LIBCURL}/usr/lib
-	${CP} ${WRKINST}/usr/bin/curl ${IDIR_CURL}/usr/bin/
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+	${INSTALL_DIR} ${IDIR_LIBCURL}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib/
+
+curl-install:
+	${INSTALL_DIR} ${IDIR_CURL}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/curl ${IDIR_CURL}/usr/bin/
+
+libcurl-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/include/curl
-	${CP} ${WRKINST}/usr/include/curl/*.h ${IDIR_LIBCURL_DEV}/usr/include/curl/
+	${CP} ${WRKINST}/usr/include/curl/*.h \
+		${IDIR_LIBCURL_DEV}/usr/include/curl/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cutter/Makefile b/package/cutter/Makefile
index be28c34da..91317e914 100755
--- a/package/cutter/Makefile
+++ b/package/cutter/Makefile
@@ -18,8 +18,13 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CUTTER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 do-build:
-	${TARGET_CC} ${TARGET_CFLAGS} ${WRKBUILD}/cutter.c -o ${WRKBUILD}/cutter
+	${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} ${WRKBUILD}/cutter.c \
+		-o ${WRKBUILD}/cutter
 
 do-install:
 	${INSTALL_DIR} ${IDIR_CUTTER}/usr/sbin
diff --git a/package/cxxtools/Makefile b/package/cxxtools/Makefile
index 326bed156..7a3e3f142 100644
--- a/package/cxxtools/Makefile
+++ b/package/cxxtools/Makefile
@@ -13,15 +13,14 @@ PKG_DEPENDS:=		libiconv
 PKG_BUILDDEP+=		libiconv
 PKG_URL:=		http://www.tntnet.org
 PKG_SITES:=		http://www.tntnet.org/download/
-#PKG_CXX:=		CXXTOOLS
-
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,CXXTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
-TCXXFLAGS+=		-fno-builtin -nostdinc++ -I${STAGING_DIR}/usr/include/uClibc++ -Wl,-E
+TCXXFLAGS+=		-fno-builtin -nostdinc++ \
+			-I${STAGING_DIR}/usr/include/uClibc++ -Wl,-E
 TLDFLAGS+=		-luClibc++ -liconv -lm -nodefaultlibs -shared
 else
 TLDFLAGS+=		-liconv -shared
@@ -29,21 +28,10 @@ endif
 
 TCFLAGS+=		-fPIC
 TCXXFLAGS+=		-fPIC
-CONFIGURE_STYLE:=	gnu
-CONFIGURE_ENV+=		ac_cv_lib_nsl_setsockopt=no
 CONFIGURE_ARGS+=	--with-libiconv-prefix='${STAGING_DIR}/usr'
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto confprog
-
-#ifeq (${ADK_COMPILE_CXXTOOLS_WITH_UCLIBCXX},y)
-# add workaround because libtool tries to link libstdc++
-#post-configure:
-#	${SED} 's#postdeps="-lstdc.*#postdeps=""#' \
-#		${WRKBUILD}/libtool
-#endif
 
 post-install:
 	${INSTALL_DIR} ${IDIR_CXXTOOLS}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libcxxtools.so.* ${IDIR_CXXTOOLS}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libcxxtools.so* ${IDIR_CXXTOOLS}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile
index 60bb943ef..54dfc4195 100644
--- a/package/cyrus-sasl/Makefile
+++ b/package/cyrus-sasl/Makefile
@@ -6,10 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		cyrus-sasl
 PKG_VERSION:=		2.1.22
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		45dde9d19193ae9dd388eb68b2027bc9
 PKG_DESCR:=		a general purpose authentication library
 PKG_SECTION:=		libs
+PKG_DEPENDS:=		libopenssl
+PKG_BUILDDEP+=		openssl
 PKG_URL:=		http://asg.web.cmu.edu/sasl
 PKG_SITES:=		http://ftp.andrew.cmu.edu/pub/cyrus-mail/
 
@@ -17,7 +18,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-sample \
 			--enable-staticdlopen \
 			--disable-java \
@@ -55,8 +55,6 @@ CONFIGURE_ARGS+=	--disable-sample \
 			--without-dmalloc \
 			--without-sfio \
 			--disable-static
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 pre-build:
 	${MAKE} -C ${WRKBUILD}/include \
@@ -70,7 +68,8 @@ pre-build:
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBSASL2}/usr/lib/sasl2
-	${CP} ${WRKINST}/usr/lib/libsasl2.so.* ${IDIR_LIBSASL2}/usr/lib/
-	${CP} ${WRKINST}/usr/lib/sasl2/lib*.so.* ${IDIR_LIBSASL2}/usr/lib/sasl2/
+	${CP} ${WRKINST}/usr/lib/libsasl2.so* ${IDIR_LIBSASL2}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/sasl2/lib*.so* \
+		${IDIR_LIBSASL2}/usr/lib/sasl2/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/damageproto/Makefile b/package/damageproto/Makefile
index 3b63e93e7..129f2837d 100644
--- a/package/damageproto/Makefile
+++ b/package/damageproto/Makefile
@@ -10,9 +10,4 @@ PKG_MD5SUM:=		423516fd64e43e8671120056b0d9f597
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile
index 62e23fc53..f48f2d2ad 100644
--- a/package/dansguardian/Makefile
+++ b/package/dansguardian/Makefile
@@ -25,15 +25,13 @@ CONFIGURE_ENV+=		CXXFLAGS="-fno-threadsafe-statics -fno-builtin -nostdinc++ \
 			LIBS="-nodefaultlibs -luClibc++ -lgcc -lm"
 endif
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-orig-ip \
 			--with-proxyuser=proxy \
 			--with-proxygroup=proxy
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_DANSGUARDIAN}/usr/sbin ${IDIR_DANSGUARDIAN}/etc/dansguardian \
+	${INSTALL_DIR} ${IDIR_DANSGUARDIAN}/usr/sbin \
+		${IDIR_DANSGUARDIAN}/etc/dansguardian \
 		${IDIR_DANSGUARDIAN}/usr/share/dansguardian/languages/ukenglish
 	${CP} ${WRKINST}/usr/share/dansguardian/languages/ukenglish/* \
 		${IDIR_DANSGUARDIAN}/usr/share/dansguardian/languages/ukenglish
@@ -41,6 +39,7 @@ post-install:
 		${IDIR_DANSGUARDIAN}/usr/share/dansguardian
 	${CP} ${WRKINST}/etc/dansguardian/* \
 		${IDIR_DANSGUARDIAN}/etc/dansguardian
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/dansguardian ${IDIR_DANSGUARDIAN}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/dansguardian \
+		${IDIR_DANSGUARDIAN}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile
index b664183c1..b3e63f2c9 100644
--- a/package/davfs2/Makefile
+++ b/package/davfs2/Makefile
@@ -28,11 +28,8 @@ endif
 
 $(eval $(call PKG_template,DAVFS2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-neon
 CONFIGURE_ENV+=		LIBS=-liconv
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_DAVFS2}/etc/davfs2
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index 4dcb4067b..0e40fe548 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -13,6 +13,7 @@ PKG_DEPENDS:=		libexpat
 PKG_BUILDDEP+=		expat
 PKG_URL:=		http://dbus.freedesktop.org
 PKG_SITES:=		http://dbus.freedesktop.org/releases/dbus/
+
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
 endif
@@ -21,7 +22,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,DBUS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-tests \
 			--disable-abstract-sockets \
 			--without-x \
@@ -32,8 +32,6 @@ CONFIGURE_ARGS+=	--disable-tests \
 			--disable-xml-docs \
 			--disable-doxygen-docs
 CONFIGURE_ENV+=		ac_cv_have_abstract_sockets=no
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 pre-install:
 	${INSTALL_DIR} $(STAGING_DIR)/usr/include/dbus-1.0/dbus
@@ -41,7 +39,8 @@ pre-install:
 		$(STAGING_DIR)/usr/include/dbus-1.0/dbus/
 
 post-install:
-	${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib ${IDIR_DBUS}/usr/bin
+	${INSTALL_DIR} ${IDIR_DBUS}/etc ${IDIR_DBUS}/usr/lib \
+		${IDIR_DBUS}/usr/bin
 	${CP} ${WRKINST}/etc/dbus-1 ${IDIR_DBUS}/etc/
 	${CP} ${WRKINST}/usr/lib/libdbus-1.so.* ${IDIR_DBUS}/usr/lib/
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dbus-daemon ${IDIR_DBUS}/usr/bin/
diff --git a/package/deco/Makefile b/package/deco/Makefile
index d0cab8dba..9cabc38ae 100644
--- a/package/deco/Makefile
+++ b/package/deco/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		deco
 PKG_VERSION:=		39
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		ncurses
 PKG_MD5SUM:=		f77f60e8be0cae1f814cba1ef61bf4d0
 PKG_DESCR:=		Text-based, full featured file manager
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		libncurses
+PKG_BUILDDEP+=		ncurses
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=deco/}
 
 DISTFILES:=		${PKG_NAME}${PKG_VERSION}.tgz
@@ -20,8 +20,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,DECO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
+INSTALL_STYLE:=		manual
 
 do-install:
 	${INSTALL_DIR} ${IDIR_DECO}/usr/bin ${IDIR_DECO}/usr/lib/deco
diff --git a/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile
index b68e80096..7069f2ba1 100644
--- a/package/dhcp-forwarder/Makefile
+++ b/package/dhcp-forwarder/Makefile
@@ -19,14 +19,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,DHCP_FORWARDER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-dietlibc
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 XAKE_FLAGS+=		cfg_filename="/etc/dhcp-fwd.conf"
 
 post-install:
-	${INSTALL_DIR} ${IDIR_DHCP_FORWARDER}/usr/sbin ${IDIR_DHCP_FORWARDER}/etc
+	${INSTALL_DIR} ${IDIR_DHCP_FORWARDER}/usr/sbin \
+		${IDIR_DHCP_FORWARDER}/etc
 	${INSTALL_DATA} ${WRKBUILD}/contrib/dhcp-fwd.conf \
 		${IDIR_DHCP_FORWARDER}/etc/
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/dhcp-fwd \
diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile
index d8ec43a10..6bd7cf6a9 100644
--- a/package/dhcp/Makefile
+++ b/package/dhcp/Makefile
@@ -20,10 +20,7 @@ $(eval $(call PKG_template,DHCP_SERVER,dhcp-server,${PKG_VERSION}-${PKG_RELEASE}
 $(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_RELAY},${PKG_SECTION}))
 
 #TCFLAGS+=		-D_GNU_SOURCE
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_file__dev_random=yes
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_DHCP_RELAY}/usr/sbin
diff --git a/package/dialog/Makefile b/package/dialog/Makefile
index 2763a0946..cefcfaa32 100644
--- a/package/dialog/Makefile
+++ b/package/dialog/Makefile
@@ -20,9 +20,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,DIALOG,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 MAKE_FILE:=		makefile
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_DIALOG)/usr/bin
diff --git a/package/diffutils/Makefile b/package/diffutils/Makefile
index 70f1f53cd..1253b59b9 100644
--- a/package/diffutils/Makefile
+++ b/package/diffutils/Makefile
@@ -17,9 +17,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,DIFFUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ENV+=		ac_use_included_regex=no
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_DIFFUTILS}/usr/bin
diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile
index a291c127c..fc7a2bcc3 100644
--- a/package/digitemp/Makefile
+++ b/package/digitemp/Makefile
@@ -18,9 +18,11 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,DIGITEMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 TCFLAGS+=		-I./src -I./userial
 ALL_TARGET=		ds2490
-BUILD_STYLE:=		auto
 
 do-install:
 	${INSTALL_DIR} ${IDIR_DIGITEMP}/usr/sbin
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 21c4ba847..8bcb361f9 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -16,8 +16,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,DNSMASQ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=		manual
 INSTALL_STYLE:=		manual
+
 MAKE_FLAGS+=		BINDIR=/usr/sbin MANDIR=/usr/man COPTS="${TCFLAGS}"
 
 do-install:
diff --git a/package/dosfstools/Makefile b/package/dosfstools/Makefile
index ae7e2bc57..8fcf39a54 100644
--- a/package/dosfstools/Makefile
+++ b/package/dosfstools/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dosfstools
-PKG_VERSION:=		3.0.0
+PKG_VERSION:=		3.0.9
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		94c2ea84b191de958f765ee239457bd9
+PKG_MD5SUM:=		bd273cf8aa6341c0b52cbac72050bcf4
 PKG_DESCR:=		Utilities to create and check MS-DOS FAT filesystems
 PKG_SECTION:=		admin
 PKG_URL:=		http://www.daniel-baumann.ch/software/dosfstools
@@ -14,10 +14,10 @@ PKG_SITES:=		http://www.daniel-baumann.ch/software/dosfstools/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,DOSFSTOOLS,dosfstools,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DOSFSTOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
 
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 XAKE_FLAGS+=		PREFIX="" \
 			OPTFLAGS="${TARGET_CFLAGS} -D_FILE_OFFSET_BITS=64"
 
diff --git a/package/dovecot/Makefile b/package/dovecot/Makefile
index 8153e9426..d4acd7275 100644
--- a/package/dovecot/Makefile
+++ b/package/dovecot/Makefile
@@ -4,19 +4,18 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		dovecot
-PKG_VERSION:=		1.1.14
+PKG_VERSION:=		1.2.10
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		60b1deccc0ae77e5669060d2b1894e5e
+PKG_MD5SUM:=		b7d0081b17ff6afae85e8dc14157fa57
 PKG_DESCR:=		A minimal and secure imap server
 PKG_SECTION:=		net
 PKG_URL:=		http://www.dovecot.org
-PKG_SITES:=		http://www.dovecot.org/releases/1.1/
+PKG_SITES:=		http://www.dovecot.org/releases/1.2/
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,DOVECOT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ignore_signed_size=1 \
 			have_rquota=no \
 			signed_size_t=no \
@@ -40,12 +39,10 @@ CONFIGURE_ARGS+=	--with-notify=none \
 			--with-ioloop=epoll \
 			--with-ssl \
                 	--with-moduledir=/usr/lib/dovecot/modules
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_DOVECOT}/etc
-	${INSTALL_DIR} ${IDIR_DOVECOT}/usr/sbin/dovecot
+	${INSTALL_DIR} ${IDIR_DOVECOT}/usr/lib/dovecot
 	${INSTALL_DATA} ./files/dovecot.conf ${IDIR_DOVECOT}/etc
 	${INSTALL_DIR} ${IDIR_DOVECOT}/usr/lib/dovecot/modules/{imap,lda,pop3}
 	$(CP) ${WRKINST}/usr/lib/dovecot/modules/*.so \
@@ -56,7 +53,9 @@ post-install:
 		${IDIR_DOVECOT}/usr/lib/dovecot/modules/lda/
 	$(CP) ${WRKINST}/usr/lib/dovecot/modules/pop3/*.so \
 		${IDIR_DOVECOT}/usr/lib/dovecot/modules/pop3/
-	$(CP) ${WRKINST}/usr/sbin/dovecot/* \
-	    ${IDIR_DOVECOT}/usr/sbin/dovecot/
+	$(INSTALL_BIN) ${WRKINST}/usr/sbin/dovecot/* \
+		${IDIR_DOVECOT}/usr/lib/dovecot/
+	$(INSTALL_BIN) ${WRKINST}/usr/sbin/dovecot \
+		${IDIR_DOVECOT}/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/dovecot/patches/patch-configure b/package/dovecot/patches/patch-configure
deleted file mode 100644
index 5ccf6bfba..000000000
--- a/package/dovecot/patches/patch-configure
+++ /dev/null
@@ -1,41 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- dovecot-1.1.14.orig/configure	2009-04-17 04:38:09.000000000 +0200
-+++ dovecot-1.1.14/configure	2009-05-14 00:37:04.000000000 +0200
-@@ -30129,23 +30129,6 @@ if ! $RPCGEN -c /dev/null > /dev/null; t
- fi
- 
- 
--have_rquota=no
--if test -f /usr/include/rpcsvc/rquota.x && test -n "$RPCGEN"; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_RQUOTA
--_ACEOF
--
--  have_rquota=yes
--fi
-- if test "$have_rquota" = "yes"; then
--  HAVE_RQUOTA_TRUE=
--  HAVE_RQUOTA_FALSE='#'
--else
--  HAVE_RQUOTA_TRUE='#'
--  HAVE_RQUOTA_FALSE=
--fi
--
- 
- if test "$want_solr" != "no"; then
-   # Extract the first word of "curl-config", so it can be a program name with args.
-@@ -30684,13 +30667,6 @@ echo "$as_me: error: conditional \"BUILD
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
--if test -z "${HAVE_RQUOTA_TRUE}" && test -z "${HAVE_RQUOTA_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"HAVE_RQUOTA\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"HAVE_RQUOTA\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
--fi
- if test -z "${BUILD_SOLR_TRUE}" && test -z "${BUILD_SOLR_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"BUILD_SOLR\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
diff --git a/package/dovecot/patches/patch-src_lib-sql_sql-drivers-register_c b/package/dovecot/patches/patch-src_lib-sql_sql-drivers-register_c
deleted file mode 100644
index 6c0403839..000000000
--- a/package/dovecot/patches/patch-src_lib-sql_sql-drivers-register_c
+++ /dev/null
@@ -1,13 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- dovecot-1.1.14.orig/src/lib-sql/sql-drivers-register.c	2009-04-17 04:40:53.000000000 +0200
-+++ dovecot-1.1.14/src/lib-sql/sql-drivers-register.c	2009-05-14 00:37:59.000000000 +0200
-@@ -1,9 +1,5 @@
- /* this file automatically generated by Makefile */
- #include "lib.h"
- #include "sql-api.h"
--extern struct sql_db driver_pgsql_db;
--extern struct sql_db driver_mysql_db;
- void sql_drivers_register_all(void) {
--sql_driver_register(&driver_pgsql_db);
--sql_driver_register(&driver_mysql_db);
- }
diff --git a/package/dovecot/patches/patch-src_plugins_quota_Makefile_in b/package/dovecot/patches/patch-src_plugins_quota_Makefile_in
deleted file mode 100644
index ff405c296..000000000
--- a/package/dovecot/patches/patch-src_plugins_quota_Makefile_in
+++ /dev/null
@@ -1,70 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- dovecot-1.1.14.orig/src/plugins/quota/Makefile.in	2009-04-17 04:38:14.000000000 +0200
-+++ dovecot-1.1.14/src/plugins/quota/Makefile.in	2009-05-14 00:44:46.000000000 +0200
-@@ -55,12 +55,11 @@ LTLIBRARIES = $(module_LTLIBRARIES)
- lib10_quota_plugin_la_DEPENDENCIES =
- am__lib10_quota_plugin_la_SOURCES_DIST = quota.c quota-count.c \
- 	quota-fs.c quota-dict.c quota-dirsize.c quota-maildir.c \
--	quota-plugin.c quota-storage.c rquota_xdr.c
-+	quota-plugin.c quota-storage.c
- am__objects_1 = quota.lo quota-count.lo quota-fs.lo quota-dict.lo \
- 	quota-dirsize.lo quota-maildir.lo quota-plugin.lo \
- 	quota-storage.lo
--@HAVE_RQUOTA_TRUE@am__objects_2 = rquota_xdr.lo
--am_lib10_quota_plugin_la_OBJECTS = $(am__objects_1) $(am__objects_2)
-+am_lib10_quota_plugin_la_OBJECTS = $(am__objects_1)
- lib10_quota_plugin_la_OBJECTS = $(am_lib10_quota_plugin_la_OBJECTS)
- lib10_quota_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-@@ -244,9 +243,6 @@ lib10_quota_plugin_la_LDFLAGS = -module 
- module_LTLIBRARIES = \
- 	lib10_quota_plugin.la
- 
--@HAVE_RQUOTA_TRUE@lib10_quota_plugin_la_LIBADD = \
--@HAVE_RQUOTA_TRUE@	-lrpcsvc
--
- quota_dist_sources = \
- 	quota.c \
- 	quota-count.c \
-@@ -258,11 +254,8 @@ quota_dist_sources = \
- 	quota-storage.c
- 
- lib10_quota_plugin_la_SOURCES = \
--	$(quota_dist_sources) \
--	$(RQUOTA_XDR)
-+	$(quota_dist_sources) 
- 
--@HAVE_RQUOTA_TRUE@RQUOTA_XDR = rquota_xdr.c
--@HAVE_RQUOTA_TRUE@RQUOTA_X = /usr/include/rpcsvc/rquota.x
- noinst_HEADERS = \
- 	quota.h \
- 	quota-fs.h \
-@@ -347,7 +340,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quota-plugin.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quota-storage.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quota.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rquota_xdr.Plo@am__quote@
- 
- .c.o:
- @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -553,20 +545,6 @@ uninstall-am: uninstall-moduleLTLIBRARIE
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- 	tags uninstall uninstall-am uninstall-moduleLTLIBRARIES
- 
--@HAVE_RQUOTA_TRUE@rquota_xdr.c: Makefile $(RQUOTA_X)
--@HAVE_RQUOTA_TRUE@	(echo '#include "lib.h"'; \
--@HAVE_RQUOTA_TRUE@	 echo '#include <rpc/rpc.h>'; \
--@HAVE_RQUOTA_TRUE@	 $(RPCGEN) -c $(RQUOTA_X) | \
--@HAVE_RQUOTA_TRUE@	  sed -e 's/IXDR_PUT/(void)IXDR_PUT/g' \
--@HAVE_RQUOTA_TRUE@	    -e 's,/usr/include/rpcsvc/rquota.h,rquota.h,' \
--@HAVE_RQUOTA_TRUE@	    -e 's/int32_t \*buf/int32_t *buf ATTR_UNUSED/' \
--@HAVE_RQUOTA_TRUE@	    -e 's/^static char rcsid.*//' ) > rquota_xdr.c
--
--@HAVE_RQUOTA_TRUE@rquota.h: Makefile $(RQUOTA_X)
--@HAVE_RQUOTA_TRUE@	$(RPCGEN) -h $(RQUOTA_X) > rquota.h
--
--@HAVE_RQUOTA_TRUE@quota-fs.lo: rquota.h
--
- install-exec-local:
- 	for d in imap pop3 lda; do \
- 	  $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 43a157700..6625cb21c 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -7,22 +7,23 @@ PKG_NAME:=		dropbear
 PKG_VERSION:=		0.52
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		1c69ec674481d7745452f68f2ea5597e
-PKG_DESCR:=		SSH 2 server/client designed for small memory environments
+PKG_DESCR:=		SSH 2 server/client designed for embedded systems 
 PKG_SECTION:=		net
 PKG_URL:=		http://matt.ucc.asn.au/dropbear
-PKG_SITES:=		http://matt.ucc.asn.au/dropbear/releases/ \
-			http://www.mirrors.wiretapped.net/security/cryptography/apps/ssh/dropbear/
+PKG_SITES:=		http://matt.ucc.asn.au/dropbear/releases/
 
-PKG_DESCR_1:=		Utility for converting SSH keys
+PKG_DESCR_UTIL:=	Utility for converting SSH keys
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
+$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_UTIL},${PKG_SECTION}))
 
 PKGDFLT_DROPBEAR:=	y if !ADK_TOOLCHAIN_ONLY
 
-CONFIGURE_STYLE=	gnu
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 CONFIGURE_ARGS+=	--disable-pam \
 			--enable-openpty \
 			--enable-syslog \
diff --git a/package/dsniff/Makefile b/package/dsniff/Makefile
index 3e7925e41..edc333b66 100644
--- a/package/dsniff/Makefile
+++ b/package/dsniff/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		dsniff
 PKG_VERSION:=		2.4b1
 PKG_RELEASE:=		2
-PKG_BUILDDEP+=		libnids openssl gdbm
 PKG_MD5SUM:=		2f761fa3475682a7512b0b43568ee7d6
 PKG_DESCR:=		tools for network auditing and penetration testing
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libnet libpcap libnids libopenssl libgdbm
+PKG_BUILDDEP+=		libnids openssl gdbm libpcap libnet
 PKG_URL:=		http://www.monkey.org/~dugsong/dsniff
 PKG_SITES:=		http://www.monkey.org/~dugsong/dsniff/beta/
 
@@ -20,8 +20,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,DSNIFF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-CONFIGURE_ENV+=		ac_cv_lib_nsl_gethostbyname=no
 CONFIGURE_ARGS+=	--without-db \
 			--without-x \
 			--with-gdbm="${STAGING_DIR}/usr" \
@@ -29,8 +27,6 @@ CONFIGURE_ARGS+=	--without-db \
 			--with-libpcap="${STAGING_DIR}/usr" \
 			--with-libnet="${STAGING_DIR}/usr" \
 			--with-openssl="${STAGING_DIR}/usr"
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 FAKE_FLAGS+=		install_prefix="${WRKINST}"
 
 post-install:
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 436bd3a13..2bc49ab16 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -30,12 +30,10 @@ $(eval $(call PKG_template,LIBCOM_ERR,libcom-err,${PKG_VERSION}-${PKG_RELEASE},,
 $(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_SS},${PKG_SECTION_SS}))
 $(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_BLKID},${PKG_SECTION_BLKID}))
 
-CONFIGURE_STYLE:=	gnu
+XAKE_FLAGS+=		V=1
 CONFIGURE_ARGS+=	--enable-elf-shlibs \
 			--disable-tls \
 			--enable-dynamic-e2fsck
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 INSTALL_TARGET+=	install-libs
 
 pre-build:
diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile
index 2a2c7dfe3..7dafb0ff1 100644
--- a/package/ebtables/Makefile
+++ b/package/ebtables/Makefile
@@ -19,8 +19,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,EBTABLES,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
+CONFIG_STYLE:=		manual
 
 post-install:
 	${INSTALL_DIR} ${IDIR_EBTABLES}/etc
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index 83d74ab10..932871dcf 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -14,6 +14,10 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,EGLIBC,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,EGLIBC_DEV,$(PKG_NAME)-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 SUB_INSTALLS-y:=
 SUB_INSTALLS-m:=
 SUB_INSTALLS-${ADK_PACKAGE_EGLIBC_DEV}+=	eglibc-dev-install
diff --git a/package/elinks/Makefile b/package/elinks/Makefile
index cb810d76f..b2d0c6014 100644
--- a/package/elinks/Makefile
+++ b/package/elinks/Makefile
@@ -6,20 +6,21 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		elinks
 PKG_VERSION:=		0.11.7
 PKG_RELEASE:=		2
-PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		145c510cae41c204d0f23dce4bdd23ab
 PKG_DESCR:=		advanced text web browser
 PKG_SECTION:=		text
 PKG_DEPENDS:=		libopenssl
-PKG_URL:=		http://elinks.or.cz
+PKG_BUILDDEP+=		openssl
+PKG_URL:=		http://elinks.or.cz/
 PKG_SITES:=		http://elinks.or.cz/download/
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ELINKS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+INSTALL_STYLE:=		manual
+
 TCFLAGS+=		-fPIC
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		$(shell echo ac_cv_file_./features.conf | tr [:blank:]-/. _)=yes
 CONFIGURE_ENV+=		$(shell echo ac_cv_file_${WRKBUILD}/features.conf | tr [:blank:]-/. _)=yes
 CONFIGURE_ARGS+=	--enable-small \
@@ -43,8 +44,7 @@ CONFIGURE_ARGS+=	--enable-small \
 			--without-spidermonkey \
 			--without-x \
 			--without-zlib
-BUILD_STYLE:=		auto
-MAKE_FLAGS+=		V=1 CC='${TARGET_CC}' LD='${TARGET_CC}'
+MAKE_FLAGS+=		CC='${TARGET_CC}' LD='${TARGET_LD}'
 
 do-install:
 	${INSTALL_DIR} ${IDIR_ELINKS}/usr/bin
diff --git a/package/elinks/patches/patch-Makefile_lib b/package/elinks/patches/patch-Makefile_lib
deleted file mode 100644
index 28b35fc6f..000000000
--- a/package/elinks/patches/patch-Makefile_lib
+++ /dev/null
@@ -1,17 +0,0 @@
---- elinks-0.11.7.orig/Makefile.lib	2009-08-22 13:15:08.000000000 +0200
-+++ elinks-0.11.7/Makefile.lib	2009-08-28 12:26:30.526558172 +0200
-@@ -43,12 +43,12 @@ quiet_cmd_compile = '      [$(CC_COLOR)C
- 
- # Rule to compile a set of .o files into one .o file
- quiet_cmd_ld_objs = "      [$(LD_COLOR)LD$(END_COLOR)]   $(RELPATH)$@"
--      cmd_ld_objs = $(LD) -r -o $@ $(filter $(OBJS), $^) \
-+      cmd_ld_objs = $(LD) -shared -o $@ $(filter $(OBJS), $^) \
-       		    $(foreach subdir,$(sort $(filter-out src,$(SUBDIRS))), \
- 			    `test -e $(subdir)/$(LIB_O_NAME) && echo $(subdir)/$(LIB_O_NAME)`)
- 
-    quiet_cmd_link = '    [$(LINK_COLOR)LINK$(END_COLOR)]   $(RELPATH)$@'
--         cmd_link = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
-+         cmd_link = $(CC) -shared $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
-  quiet_cmd_sparse = '    [SPARSE]   $(RELPATH)$(2)'
-        cmd_sparse = $(SPARSE) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(SPARSE_FLAGS) $(2)
diff --git a/package/esound/Makefile b/package/esound/Makefile
index b6ceecc2c..3bcf528ec 100644
--- a/package/esound/Makefile
+++ b/package/esound/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		esound
 PKG_VERSION:=		0.2.41
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libaudiofile
 PKG_MD5SUM:=		3d8973ed87053d7acc1f4d44af2c4688
 PKG_DESCR:=		Enlightened Sound Daemon
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libaudiofile
+PKG_BUILDDEP+=		libaudiofile
 PKG_URL:=		http://www.tux.org/~ricdude/EsounD.html
 PKG_SITES:=		ftp://ftp.gnome.org/pub/gnome/sources/esound/0.2/
 
@@ -18,13 +18,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ESOUND,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_ESOUND}/usr/bin ${IDIR_ESOUND}/usr/lib
 	${INSTALL_BIN} ${WRKINST}/usr/bin/esd ${IDIR_ESOUND}/usr/bin/
-	$(CP) $(WRKINST)/usr/lib/libesd.so.* $(IDIR_ESOUND)/usr/lib/
+	$(CP) $(WRKINST)/usr/lib/libesd.so* $(IDIR_ESOUND)/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ether-wake/Makefile b/package/ether-wake/Makefile
index ec8f43ccd..39985ea08 100644
--- a/package/ether-wake/Makefile
+++ b/package/ether-wake/Makefile
@@ -15,11 +15,16 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ETHER_WAKE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 do-build:
-	${TARGET_CC} ${TARGET_CFLAGS} -o ${WRKBUILD}/${PKG_NAME} ${WRKBUILD}/${PKG_NAME}.c
+	${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} -o \
+		${WRKBUILD}/ether-wake ${WRKBUILD}/ether-wake.c
 
 do-install:
 	${INSTALL_DIR} ${IDIR_ETHER_WAKE}/usr/sbin
-	${INSTALL_BIN} ${WRKBUILD}/${PKG_NAME} ${IDIR_ETHER_WAKE}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/ether-wake ${IDIR_ETHER_WAKE}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ether-wake/extra/ether-wake.c b/package/ether-wake/src/ether-wake.c
index 4bee57f90..4bee57f90 100644
--- a/package/ether-wake/extra/ether-wake.c
+++ b/package/ether-wake/src/ether-wake.c
diff --git a/package/ethtool/Makefile b/package/ethtool/Makefile
index 3172231da..76b3b16c9 100644
--- a/package/ethtool/Makefile
+++ b/package/ethtool/Makefile
@@ -15,10 +15,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ETHTOOL,ethtool,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_ETHTOOL}/usr/sbin
 	${CP} ${WRKINST}/usr/sbin/ethtool ${IDIR_ETHTOOL}/usr/sbin
diff --git a/package/evieext/Makefile b/package/evieext/Makefile
index de5796c1b..b1765b721 100644
--- a/package/evieext/Makefile
+++ b/package/evieext/Makefile
@@ -10,9 +10,4 @@ PKG_MD5SUM:=		68e61ce53caa495a3ad4085f66010eb8
 PKG_SITES:=		ftp://ftp.x.org/pub/individual/proto/
 
 include $(TOPDIR)/mk/package.mk
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/evilwm/Makefile b/package/evilwm/Makefile
index 1dabdf9d5..95b1a422a 100644
--- a/package/evilwm/Makefile
+++ b/package/evilwm/Makefile
@@ -18,9 +18,9 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,EVILWM,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+
 MAKE_FLAGS+=		XROOT="$(STAGING_DIR)/usr"
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_EVILWM)/usr/bin
diff --git a/package/exmap/Makefile b/package/exmap/Makefile
index 22acc5997..5f551b785 100644
--- a/package/exmap/Makefile
+++ b/package/exmap/Makefile
@@ -27,10 +27,10 @@ $(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP
 $(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_EXMAPSERVER},${PKG_SECTION}))
 $(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR_KMOD_EXMAP},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
+INSTALL_STYLE:=		manual
+
 CONFIGURE_ARGS+=	--disable-doc
 CONFIGURE_ENV+=		LIBS="-lncurses"
-BUILD_STYLE:=		auto
 
 pre-build:
 	KERNEL_PATH=${LINUX_DIR} \
diff --git a/package/expat/Makefile b/package/expat/Makefile
index d0c570f3e..6d267e53e 100644
--- a/package/expat/Makefile
+++ b/package/expat/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:=		a XML parsing library
 PKG_SECTION:=		libs
 PKG_URL:=		http://expat.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=expat/}
+
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
 endif
@@ -19,10 +20,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBEXPAT,libexpat,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBEXPAT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libexpat.so* ${IDIR_LIBEXPAT}/usr/lib/
diff --git a/package/ez-ipupdate/Makefile b/package/ez-ipupdate/Makefile
index 2d1b0db96..73888a990 100644
--- a/package/ez-ipupdate/Makefile
+++ b/package/ez-ipupdate/Makefile
@@ -19,8 +19,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,EZIPUPDATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
+INSTALL_STYLE:=		manual
 
 do-install:
 	${INSTALL_DIR} ${IDIR_EZIPUPDATE}/etc ${IDIR_EZIPUPDATE}/usr/sbin
diff --git a/package/faad2/Makefile b/package/faad2/Makefile
index 5c55d5344..ab794dab2 100644
--- a/package/faad2/Makefile
+++ b/package/faad2/Makefile
@@ -16,14 +16,11 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBFAAD2,libfaad2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--without-mpeg4ip \
 			--without-xmms
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBFAAD2}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libfaad.so.* ${IDIR_LIBFAAD2}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libfaad.so* ${IDIR_LIBFAAD2}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fakeidentd/Makefile b/package/fakeidentd/Makefile
index ecf18041e..a5a6aa027 100644
--- a/package/fakeidentd/Makefile
+++ b/package/fakeidentd/Makefile
@@ -18,8 +18,13 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FAKEIDENTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 do-build:
-	${TARGET_CC} ${TARGET_CFLAGS} -o ${WRKBUILD}/${PKG_NAME} ${WRKBUILD}/identd.c
+	${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} -o \
+		${WRKBUILD}/fakeidentd ${WRKBUILD}/identd.c
 
 do-install:
 	${INSTALL_DIR} ${IDIR_FAKEIDENTD}/usr/sbin
diff --git a/package/fbset/Makefile b/package/fbset/Makefile
index 1591e6704..6d3784cb0 100644
--- a/package/fbset/Makefile
+++ b/package/fbset/Makefile
@@ -15,6 +15,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FBSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
diff --git a/package/fetchmail/Makefile b/package/fetchmail/Makefile
index ea569df1d..f22a409ab 100644
--- a/package/fetchmail/Makefile
+++ b/package/fetchmail/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		fetchmail
 PKG_VERSION:=		6.3.9
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		72c20ad2b9629f1a109668b05a84d823
-PKG_DESCR:=		fetch mail from a POP, IMAP, ETRN, or ODMR-capable server
+PKG_DESCR:=		fetch mail from a POP or IMAP server
 PKG_SECTION:=		text
 ifeq (${ADK_PACKAGE_FETCHMAIL_SSL},y)
 PKG_DEPENDS:=		libopenssl
@@ -25,10 +25,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FETCHMAIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--without-hesiod
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 ifeq (${ADK_PACKAGE_FETCHMAIL_SSL},y)
 CONFIGURE_ARGS+=	--with-ssl='${STAGING_DIR}/usr'
@@ -38,6 +35,7 @@ endif
 
 post-install:
 	${INSTALL_DIR} ${IDIR_FETCHMAIL}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/${PKG_NAME} ${IDIR_FETCHMAIL}/usr/bin/
+	${INSTALL_BIN} ${WRKINST}/usr/bin/fetchmail \
+		 ${IDIR_FETCHMAIL}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index 1f920ec4a..a2d577fbe 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		be8503f15c3b81ba00eb8379ca8dcf33
 PKG_DESCR:=		solution to record, convert and stream audio and video
 PKG_SECTION:=		sound
+PKG_DEPENDS:=		libfaad2
+PKG_BUILDDEP+=		faad2
 PKG_URL:=		http://www.ffmpeg.org
 PKG_SITES:=		http://www.ffmpeg.org/releases/
 
@@ -18,37 +20,31 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FFMPEG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	manual
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
+CONFIG_STYLE:=		minimal
 
 include ${TOPDIR}/mk/cpu.mk
 
-do-configure:
-	cd ${WRKBUILD}; \
-		env ${CONFIGURE_ENV} \
-		${BASH} ${WRKSRC}/configure \
-		--prefix=/usr \
-		--arch=${CPU_ARCH} \
-		--enable-cross-compile \
-		--source-path=${WRKSRC} \
-		--cross-prefix=${TARGET_CROSS} \
-		--cc=$(TARGET_CC) \
-		--host-cc=$(HOSTCC) \
-		--disable-debug \
-		--disable-stripping \
-		--enable-small \
-		--enable-shared \
-		--enable-static \
-		--disable-ffmpeg \
-		--disable-ffplay \
-		--disable-ffserver \
-		--disable-vhook \
-		--enable-gpl \
-		--enable-swscale \
-		--enable-postproc \
-		--enable-libfaad \
-		${CONFIGURE_CPU_OPTS}
+CONFIGURE_ARGS:=	--prefix=/usr \
+			--arch=${CPU_ARCH} \
+			--enable-cross-compile \
+			--source-path=${WRKSRC} \
+			--cross-prefix=${TARGET_CROSS} \
+			--cc=$(TARGET_CC) \
+			--host-cc=$(HOSTCC) \
+			--disable-debug \
+			--disable-stripping \
+			--enable-small \
+			--enable-shared \
+			--enable-static \
+			--disable-ffmpeg \
+			--disable-ffplay \
+			--disable-ffserver \
+			--disable-vhook \
+			--enable-gpl \
+			--enable-swscale \
+			--enable-postproc \
+			--enable-libfaad \
+			${CONFIGURE_CPU_OPTS}
 
 post-install:
 	${INSTALL_DIR} ${IDIR_FFMPEG}/usr/lib
diff --git a/package/file/Makefile b/package/file/Makefile
index c535ee35b..c090033f4 100644
--- a/package/file/Makefile
+++ b/package/file/Makefile
@@ -17,10 +17,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 pre-configure:
 	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
 		CFLAGS="-static" \
diff --git a/package/findutils/Makefile b/package/findutils/Makefile
index 69f7f0e57..25c4e9ac7 100644
--- a/package/findutils/Makefile
+++ b/package/findutils/Makefile
@@ -13,21 +13,17 @@ PKG_DEPENDS:=		libpthread
 PKG_URL:=		http://www.gnu.org/software/findutils/
 PKG_SITES:=		http://ftp.gnu.org/pub/gnu/findutils/
 
-# FIXME: test this port with some libc different from glibc
-
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FINDUTILS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-# the following prevents gnulib from defining it's own fseeko (which conflicts with the libc one)
 CONFIGURE_ENV+=		gl_cv_func_wcwidth_works=yes
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_FINDUTILS)/usr/{s,}bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/{find,locate,oldfind,updatedb,xargs} $(IDIR_FINDUTILS)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/sbin/{bigram,code,frcode} $(IDIR_FINDUTILS)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/{find,locate,oldfind,updatedb,xargs} \
+		 $(IDIR_FINDUTILS)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/{bigram,code,frcode} \
+		$(IDIR_FINDUTILS)/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fixesproto/Makefile b/package/fixesproto/Makefile
index 4900aee48..07cf45150 100644
--- a/package/fixesproto/Makefile
+++ b/package/fixesproto/Makefile
@@ -10,9 +10,4 @@ PKG_MD5SUM:=		95806b9b648639d4c3e5b226d10927c0
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/flac/Makefile b/package/flac/Makefile
index d5c06c17f..fa7ccb9f8 100644
--- a/package/flac/Makefile
+++ b/package/flac/Makefile
@@ -16,13 +16,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBFLAC,libflac,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-asm-optimizations \
 			--disable-xmms-plugin \
 			--disable-cpplibs \
 			--disable-ogg
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBFLAC}/usr/lib
diff --git a/package/flex/Makefile b/package/flex/Makefile
index bb2eda080..824371592 100644
--- a/package/flex/Makefile
+++ b/package/flex/Makefile
@@ -16,10 +16,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FLEX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_FLEX}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/flex ${IDIR_FLEX}/usr/bin
diff --git a/package/font-adobe-100dpi/Makefile b/package/font-adobe-100dpi/Makefile
index 013910dd5..d41034333 100644
--- a/package/font-adobe-100dpi/Makefile
+++ b/package/font-adobe-100dpi/Makefile
@@ -18,10 +18,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FONT_ADOBE_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	$(INSTALL_DIR) $(IDIR_FONT_ADOBE_100DPI)/usr/share/fonts/X11/100dpi
 	$(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \
diff --git a/package/font-adobe-75dpi/Makefile b/package/font-adobe-75dpi/Makefile
index 34ace47f1..2af0aa60c 100644
--- a/package/font-adobe-75dpi/Makefile
+++ b/package/font-adobe-75dpi/Makefile
@@ -18,10 +18,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FONT_ADOBE_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	$(INSTALL_DIR) $(IDIR_FONT_ADOBE_75DPI)/usr/share/fonts/X11/75dpi
 	$(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \
diff --git a/package/font-bh-100dpi/Makefile b/package/font-bh-100dpi/Makefile
index 7af15ff0c..e70fb4810 100644
--- a/package/font-bh-100dpi/Makefile
+++ b/package/font-bh-100dpi/Makefile
@@ -16,10 +16,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FONT_BH_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	$(INSTALL_DIR) $(IDIR_FONT_BH_100DPI)/usr/share/fonts/X11/100dpi
 	$(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \
diff --git a/package/font-bh-75dpi/Makefile b/package/font-bh-75dpi/Makefile
index 48ae24be3..e3e3aa3d4 100644
--- a/package/font-bh-75dpi/Makefile
+++ b/package/font-bh-75dpi/Makefile
@@ -16,10 +16,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FONT_BH_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	$(INSTALL_DIR) $(IDIR_FONT_BH_75DPI)/usr/share/fonts/X11/75dpi
 	$(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \
diff --git a/package/font-bh-lucidatypewriter-100dpi/Makefile b/package/font-bh-lucidatypewriter-100dpi/Makefile
index 1c99e99f1..9d8635e55 100644
--- a/package/font-bh-lucidatypewriter-100dpi/Makefile
+++ b/package/font-bh-lucidatypewriter-100dpi/Makefile
@@ -16,10 +16,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FONT_BH_LUCIDATYPEWRITER_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	$(INSTALL_DIR) $(IDIR_FONT_BH_LUCIDATYPEWRITER_100DPI)/usr/share/fonts/X11/100dpi
 	$(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \
diff --git a/package/font-bh-lucidatypewriter-75dpi/Makefile b/package/font-bh-lucidatypewriter-75dpi/Makefile
index 76e23c0e7..a84ebb107 100644
--- a/package/font-bh-lucidatypewriter-75dpi/Makefile
+++ b/package/font-bh-lucidatypewriter-75dpi/Makefile
@@ -16,10 +16,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FONT_BH_LUCIDATYPEWRITER_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	$(INSTALL_DIR) $(IDIR_FONT_BH_LUCIDATYPEWRITER_75DPI)/usr/share/fonts/X11/75dpi
 	$(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \
diff --git a/package/font-bh-ttf/Makefile b/package/font-bh-ttf/Makefile
index 944c400ad..5d816443f 100644
--- a/package/font-bh-ttf/Makefile
+++ b/package/font-bh-ttf/Makefile
@@ -16,10 +16,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FONT_BH_TTF,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	$(INSTALL_DIR) $(IDIR_FONT_BH_TTF)/usr/share/fonts/X11/TTF
 	$(CP) ${WRKINST}/usr/share/fonts/X11/TTF/* \
diff --git a/package/font-bh-type1/Makefile b/package/font-bh-type1/Makefile
index 27885e75c..81ff1c74c 100644
--- a/package/font-bh-type1/Makefile
+++ b/package/font-bh-type1/Makefile
@@ -16,10 +16,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FONT_BH_TYPE1,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	$(INSTALL_DIR) $(IDIR_FONT_BH_TYPE1)/usr/share/fonts/X11/Type1
 	$(CP) ${WRKINST}/usr/share/fonts/X11/Type1/* \
diff --git a/package/font-bitstream-100dpi/Makefile b/package/font-bitstream-100dpi/Makefile
index 05cff3d1a..efb8e66a2 100644
--- a/package/font-bitstream-100dpi/Makefile
+++ b/package/font-bitstream-100dpi/Makefile
@@ -16,10 +16,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FONT_BITSTREAM_100DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	$(INSTALL_DIR) $(IDIR_FONT_BITSTREAM_100DPI)/usr/share/fonts/X11/100dpi
 	$(CP) ${WRKINST}/usr/share/fonts/X11/100dpi/* \
diff --git a/package/font-bitstream-75dpi/Makefile b/package/font-bitstream-75dpi/Makefile
index a58f28fef..6a7dcae13 100644
--- a/package/font-bitstream-75dpi/Makefile
+++ b/package/font-bitstream-75dpi/Makefile
@@ -16,10 +16,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FONT_BITSTREAM_75DPI,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	$(INSTALL_DIR) $(IDIR_FONT_BITSTREAM_75DPI)/usr/share/fonts/X11/75dpi
 	$(CP) ${WRKINST}/usr/share/fonts/X11/75dpi/* \
diff --git a/package/font-bitstream-type1/Makefile b/package/font-bitstream-type1/Makefile
index a32aa4bd0..4672b2463 100644
--- a/package/font-bitstream-type1/Makefile
+++ b/package/font-bitstream-type1/Makefile
@@ -16,10 +16,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FONT_BITSTREAM_TYPE1,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	$(INSTALL_DIR) $(IDIR_FONT_BITSTREAM_TYPE1)/usr/share/fonts/X11/Type1
 	$(CP) ${WRKINST}/usr/share/fonts/X11/Type1/* \
diff --git a/package/font-misc-misc/Makefile b/package/font-misc-misc/Makefile
index deba7e3f3..1c16cf0c5 100644
--- a/package/font-misc-misc/Makefile
+++ b/package/font-misc-misc/Makefile
@@ -17,10 +17,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FONT_MISC_MISC,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	$(INSTALL_DIR) $(IDIR_FONT_MISC_MISC)/usr/share/fonts/X11/misc
 	$(CP) ${WRKINST}/usr/share/fonts/X11/misc/* \
diff --git a/package/font-util/Makefile b/package/font-util/Makefile
index eb89dd3e3..cdd1632b2 100644
--- a/package/font-util/Makefile
+++ b/package/font-util/Makefile
@@ -16,10 +16,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FONT_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_FONT_UTIL}/usr/share/fonts/X11/util
 	${CP} ${WRKINST}/usr/share/fonts/X11/util/* \
diff --git a/package/font-xfree86-type1/Makefile b/package/font-xfree86-type1/Makefile
index a2960a494..41e6c0d34 100644
--- a/package/font-xfree86-type1/Makefile
+++ b/package/font-xfree86-type1/Makefile
@@ -16,10 +16,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,FONT_XFREE86_TYPE1,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	$(INSTALL_DIR) $(IDIR_FONT_XFREE86_TYPE1)/usr/share/fonts/X11/Type1
 	$(CP) ${WRKINST}/usr/share/fonts/X11/Type1/* \
diff --git a/package/fontcacheproto/Makefile b/package/fontcacheproto/Makefile
index 34f567d0b..ce103cade 100644
--- a/package/fontcacheproto/Makefile
+++ b/package/fontcacheproto/Makefile
@@ -10,9 +10,4 @@ PKG_MD5SUM:=		dc8c34a8c3559bf3b008bcdf7ba5a743
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile
index 824704dcd..2c6b18a65 100644
--- a/package/fontconfig/Makefile
+++ b/package/fontconfig/Makefile
@@ -20,11 +20,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FONTCONFIG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--with-arch=${ARCH} \
 			--disable-docs
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_FONTCONFIG}/usr/lib
diff --git a/package/fontsproto/Makefile b/package/fontsproto/Makefile
index 82c2ebe6a..718d10a53 100644
--- a/package/fontsproto/Makefile
+++ b/package/fontsproto/Makefile
@@ -10,9 +10,4 @@ PKG_MD5SUM:=		6819fc82585daac68cec17938b659bf0
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fping/Makefile b/package/fping/Makefile
index a7842392f..002639da2 100644
--- a/package/fping/Makefile
+++ b/package/fping/Makefile
@@ -18,13 +18,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-
-do-build:
-	${MAKE} CC="${TARGET_CC}" CFLAGS="${TARGET_CFLAGS}" -C ${WRKBUILD} ${PKG_NAME}
-
-do-install:
-	${INSTALL_DIR} ${IDIR_FPING}/usr/bin
-	${CP} ${WRKBUILD}/${PKG_NAME} ${IDIR_FPING}/usr/bin/${PKG_NAME}
+post-install:
+	${INSTALL_DIR} ${IDIR_FPING}/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/fping ${IDIR_FPING}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/fprobe-ulog/Makefile b/package/fprobe-ulog/Makefile
index 7b7fda126..6192723ee 100644
--- a/package/fprobe-ulog/Makefile
+++ b/package/fprobe-ulog/Makefile
@@ -18,12 +18,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FPROBE_ULOG,fprobe-ulog,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-piddir=/var \
 			--with-membulk=index8 \
 			--with-hash=xor8
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_FPROBE_ULOG}/usr/sbin
diff --git a/package/fprobe/Makefile b/package/fprobe/Makefile
index 6e4edf980..510dd466f 100644
--- a/package/fprobe/Makefile
+++ b/package/fprobe/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		fprobe
 PKG_VERSION:=		1.1
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libpcap
 PKG_MD5SUM:=		65850d0470078269b33eee58cba77ac2
 PKG_DESCR:=		NetFlow probe
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libpcap libpthread
+PKG_BUILDDEP+=		libpcap
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=fprobe/}
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
@@ -19,14 +19,11 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FPROBE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-piddir=/var \
 			--with-pcap=${STAGING_DIR}/usr/include \
 			--with-libpcap=${STAGING_DIR}/usr/lib \
 			--with-membulk=index8 \
 			--with-hash=xor8 \
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_FPROBE}/usr/sbin
diff --git a/package/freeradius-client/Makefile b/package/freeradius-client/Makefile
index f6e94cf6f..17d7db7ee 100644
--- a/package/freeradius-client/Makefile
+++ b/package/freeradius-client/Makefile
@@ -21,10 +21,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,FREERADIUS_CLIENT,freeradius-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBFREERADIUS_CLIENT,libfreeradius-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_func_uname=no
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_FREERADIUS_CLIENT}/usr/sbin
diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile
index 69f19397c..b202f44fd 100644
--- a/package/freeradius-server/Makefile
+++ b/package/freeradius-server/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		freeradius-server
-PKG_VERSION:=		2.1.7
+PKG_VERSION:=		2.1.8
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b1f77c5e3116bcb0ac0aa9080a06ebf1
+PKG_MD5SUM:=		aa2ae711387af144df7c351b28b8789c
 PKG_DESCR:=		a flexible RADIUS server
 PKG_SECTION:=		net
 PKG_MULTI:=		1
@@ -25,9 +25,7 @@ PKG_BUILDDEP+=		postgresql
 PKG_DEPENDS_PGSQL:=	libpq
 endif
 PKG_URL:=		http://www.freeradius.org
-PKG_SITES:=		ftp://ftp.freeradius.org/pub/radius/ \
-			http://freeradius.portal-to-web.de/ \
-			ftp://ftp.uk.freeradius.org/pub/radius/
+PKG_SITES:=		ftp://ftp.freeradius.org/pub/radius/
 
 PKG_HOST_DEPENDS:=	!cygwin
 
@@ -46,34 +44,31 @@ PKG_DESCR_MYSQL:=	MySQL module
 PKG_DESCR_PGSQL:=	PostgreSQL module
 PKG_DESCR_UTILS:=	Misc. client utilities
 
-PKG_CONFIGURE_OPTIONS:=
+PKG_CONFIGURE_OPTS:=
 
 ifneq (${ADK_PACKAGE_FREERADIUS_MOD_LDAP},)
-PKG_CONFIGURE_LIBS+=   -lcrypto -lssl
-PKG_CONFIGURE_OPTIONS+=        \
-	--with-rlm_ldap-include-dir="${STAGING_DIR}/usr/include" \
-	--with-rlm_ldap-lib-dir="${STAGING_DIR}/usr/lib"
+PKG_CONFIGURE_LIBS+=	-lcrypto -lssl
+PKG_CONFIGURE_OPTS+=	--with-rlm_ldap-include-dir="${STAGING_DIR}/usr/include" \
+			--with-rlm_ldap-lib-dir="${STAGING_DIR}/usr/lib"
 else
-PKG_CONFIGURE_OPTIONS+=        --without-rlm_ldap
+PKG_CONFIGURE_OPTS+=	--without-rlm_ldap
 endif
 
 ifneq (${ADK_PACKAGE_FREERADIUS_MOD_SQL_MYSQL},)
 PKG_CONFIGURE_LIBS+=	-lz
-PKG_CONFIGURE_OPTIONS+=	\
-	--with-mysql-include-dir="${STAGING_DIR}/usr/include" \
-	--with-mysql-lib-dir="${STAGING_DIR}/usr/lib/mysql" \
-	--without-threads \
-	--with-rlm_sql
+PKG_CONFIGURE_OPTS+=	--with-mysql-include-dir="${STAGING_DIR}/usr/include" \
+			--with-mysql-lib-dir="${STAGING_DIR}/usr/lib/mysql" \
+			--without-threads \
+			--with-rlm_sql
 else
-PKG_CONFIGURE_OPTIONS+=	--without-rlm_sql_mysql
+PKG_CONFIGURE_OPTS+=	--without-rlm_sql_mysql
 endif
 ifneq (${ADK_PACKAGE_FREERADIUS_MOD_SQL_PGSQL},)
-PKG_CONFIGURE_OPTIONS+=	\
-	--with-rlm_sql_postgresql-include-dir="${STAGING_DIR}/usr/include" \
-	--with-rlm_sql_postgresql-lib-dir="${STAGING_DIR}/usr/lib" \
-	--with-rlm_sql
+PKG_CONFIGURE_OPTS+=	--with-rlm_sql_postgresql-include-dir="${STAGING_DIR}/usr/include" \
+			--with-rlm_sql_postgresql-lib-dir="${STAGING_DIR}/usr/lib" \
+			--with-rlm_sql
 else
-PKG_CONFIGURE_OPTIONS+=	--without-rlm_sql_postgresql
+PKG_CONFIGURE_OPTS+=	--without-rlm_sql_postgresql
 endif
 
 include ${TOPDIR}/mk/package.mk
@@ -124,16 +119,15 @@ $(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL,rlm_sql,sql.conf))
 $(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL_MYSQL,rlm_sql_mysql,))
 $(eval $(call PKG_mod_template,FREERADIUS_MOD_SQL_PGSQL,rlm_sql_postgresql,))
 
-CONFIGURE_STYLE:=	gnu
-CONFIGURE_ENV+=		ac_cv_lib_nsl_inet_ntoa=no
-CONFIGURE_ARGS+=	${PKG_CONFIGURE_OPTIONS} \
+CONFIGURE_ARGS+=	${PKG_CONFIGURE_OPTS} \
 			--with-openssl-includes=${STAGING_DIR}/usr/include \
 			--with-openssl-libraries=${STAGING_DIR}/usr/lib \
+			--with-system-libltld \
 			--enable-strict-dependencies \
 			--with-raddbdir=/etc/freeradius \
 			--without-edir \
 			--without-snmp \
-			--with-experimental-modules \
+			--without-experimental-modules \
 			--without-rlm_attr-rewrite \
 			--without-rlm_checkval \
 			--without-rlm_counter \
@@ -168,16 +162,16 @@ CONFIGURE_ARGS+=	${PKG_CONFIGURE_OPTIONS} \
 			--without-rlm_sql_sqlite \
 			--libdir=/usr/lib/freeradius \
 			--libexecdir=/usr/lib/freeradius
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 FAKE_FLAGS+=		R="${WRKINST}" \
 			INSTALLSTRIP=""
 
 post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
 	${INSTALL_DIR} ${IDIR_FREERADIUS_SERVER}/etc/freeradius
 	${CP} ./files/users ${IDIR_FREERADIUS_SERVER}/etc/freeradius/
-	${INSTALL_DATA} ./files/radiusd.conf ${IDIR_FREERADIUS_SERVER}/etc/freeradius
-	${INSTALL_DATA} ./files/clients.conf ${IDIR_FREERADIUS_SERVER}/etc/freeradius
+	${INSTALL_DATA} ./files/radiusd.conf \
+		${IDIR_FREERADIUS_SERVER}/etc/freeradius
+	${INSTALL_DATA} ./files/clients.conf \
+		${IDIR_FREERADIUS_SERVER}/etc/freeradius
 	for f in dictionary; do \
 		${CP} ${WRKINST}/etc/freeradius/$${f} \
 		  ${IDIR_FREERADIUS_SERVER}/etc/freeradius/ ; \
@@ -203,6 +197,7 @@ post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
 	rm -rf ${IDIR_FREERADIUS_DEMOCERTS}/etc/freeradius/certs/demoCA/index*
 	rm -rf ${IDIR_FREERADIUS_DEMOCERTS}/etc/freeradius/certs/demoCA/serial*
 	${INSTALL_DIR} ${IDIR_FREERADIUS_UTILS}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/radclient ${IDIR_FREERADIUS_UTILS}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/radclient \
+		${IDIR_FREERADIUS_UTILS}/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/freeradius-server/files/freeradius.conffiles b/package/freeradius-server/files/freeradius-server.conffiles
index 56552e6c1..56552e6c1 100644
--- a/package/freeradius-server/files/freeradius.conffiles
+++ b/package/freeradius-server/files/freeradius-server.conffiles
diff --git a/package/freeradius-server/files/freeradius.postinst b/package/freeradius-server/files/freeradius-server.postinst
index c65fa195f..c65fa195f 100644
--- a/package/freeradius-server/files/freeradius.postinst
+++ b/package/freeradius-server/files/freeradius-server.postinst
diff --git a/package/freeradius-server/patches/patch-share_dictionary b/package/freeradius-server/patches/patch-share_dictionary
deleted file mode 100644
index 075c19c71..000000000
--- a/package/freeradius-server/patches/patch-share_dictionary
+++ /dev/null
@@ -1,440 +0,0 @@
---- freeradius-server-2.1.7.orig/share/dictionary	2009-09-14 16:43:29.000000000 +0200
-+++ freeradius-server-2.1.7/share/dictionary	2009-11-19 22:39:16.000000000 +0100
-@@ -1,224 +1,224 @@
--# -*- text -*-
--#
--# Version $Id$
--#
--#	DO NOT EDIT THE FILES IN THIS DIRECTORY
--#
--#	The files in this directory are maintained and updated by
--#	the FreeRADIUS project.  Newer releases of software may update
--#	or change these files.
--#
--#	Use the main dictionary file (usually /etc/raddb/dictionary)
--#	for local system attributes and $INCLUDEs.
--#
--#
--#
--#	This file contains dictionary translations for parsing
--#	requests and generating responses.  All transactions are
--#	composed of Attribute/Value Pairs.  The value of each attribute
--#	is specified as one of 4 data types.  Valid data types are:
--#
--#	text       - printable, generally UTF-8 encoded (subset of 'string')
--#	string     - 0-253 octets
--#	ipaddr     - 4 octets in network byte order
--#	integer    - 32 bit value in big endian order (high byte first)
--#	date       - 32 bit value in big endian order - seconds since
--#		     00:00:00 GMT,  Jan.  1,  1970
--#	ifid       - 8 octets in network byte order
--#	ipv6addr   - 16 octets in network byte order
--#	ipv6prefix - 18 octets in network byte order
--#	ether      - 6 octets of hh:hh:hh:hh:hh:hh
--#		     where 'h' is hex digits, upper or lowercase.
--#
--#	FreeRADIUS includes extended data types which are not defined
--#	in the RFC's.  These data types are:
--#
--#	abinary - Ascend's binary filter format.
--#	octets  - raw octets, printed and input as hex strings.
--#		  e.g.: 0x123456789abcdef
--#
--#
--#	Enumerated values are stored in the user file with dictionary
--#	VALUE translations for easy administration.
--#
--#	Example:
--#
--#	ATTRIBUTE	  VALUE
--#	---------------   -----
--#	Framed-Protocol = PPP
--#	7		= 1	(integer encoding)
--#
--
--#
--#	Include compatibility dictionary for older users file. Move
--#	this directive to the end of this file if you want to see the
--#	old names in the logfiles, INSTEAD OF the new names.
--#
--$INCLUDE dictionary.compat
--
--#
--#	Include the RFC dictionaries next.
--#
--#	For a complete list of the standard attributes and values,
--#	see:
--#		http://www.iana.org/assignments/radius-types
--#
--$INCLUDE dictionary.rfc2865
--$INCLUDE dictionary.rfc2866
--$INCLUDE dictionary.rfc2867
--$INCLUDE dictionary.rfc2868
--$INCLUDE dictionary.rfc2869
--$INCLUDE dictionary.rfc3162
--$INCLUDE dictionary.rfc3576
--$INCLUDE dictionary.rfc3580
--$INCLUDE dictionary.rfc4072
--$INCLUDE dictionary.rfc4372
--$INCLUDE dictionary.rfc4675
--$INCLUDE dictionary.rfc4679
--$INCLUDE dictionary.rfc4818
--$INCLUDE dictionary.rfc4849
--$INCLUDE dictionary.rfc5176
--$INCLUDE dictionary.rfc5580
--
--#
--#	Include vendor dictionaries after the standard ones.
-+## -*- text -*-
-+##
-+## Version $Id$
-+##
-+##	DO NOT EDIT THE FILES IN THIS DIRECTORY
-+##
-+##	The files in this directory are maintained and updated by
-+##	the FreeRADIUS project.  Newer releases of software may update
-+##	or change these files.
-+##
-+##	Use the main dictionary file (usually /etc/raddb/dictionary)
-+##	for local system attributes and $INCLUDEs.
-+##
-+##
-+##
-+##	This file contains dictionary translations for parsing
-+##	requests and generating responses.  All transactions are
-+##	composed of Attribute/Value Pairs.  The value of each attribute
-+##	is specified as one of 4 data types.  Valid data types are:
-+##
-+##	text       - printable, generally UTF-8 encoded (subset of 'string')
-+##	string     - 0-253 octets
-+##	ipaddr     - 4 octets in network byte order
-+##	integer    - 32 bit value in big endian order (high byte first)
-+##	date       - 32 bit value in big endian order - seconds since
-+##		     00:00:00 GMT,  Jan.  1,  1970
-+##	ifid       - 8 octets in network byte order
-+##	ipv6addr   - 16 octets in network byte order
-+##	ipv6prefix - 18 octets in network byte order
-+##	ether      - 6 octets of hh:hh:hh:hh:hh:hh
-+##		     where 'h' is hex digits, upper or lowercase.
-+##
-+##	FreeRADIUS includes extended data types which are not defined
-+##	in the RFC's.  These data types are:
-+##
-+##	abinary - Ascend's binary filter format.
-+##	octets  - raw octets, printed and input as hex strings.
-+##		  e.g.: 0x123456789abcdef
-+##
-+##
-+##	Enumerated values are stored in the user file with dictionary
-+##	VALUE translations for easy administration.
-+##
-+##	Example:
-+##
-+##	ATTRIBUTE	  VALUE
-+##	---------------   -----
-+##	Framed-Protocol = PPP
-+##	7		= 1	(integer encoding)
-+##
- #
--$INCLUDE dictionary.3com
--$INCLUDE dictionary.3gpp
--$INCLUDE dictionary.3gpp2
--$INCLUDE dictionary.acc
--$INCLUDE dictionary.airespace
--$INCLUDE dictionary.alcatel
--$INCLUDE dictionary.alteon
--$INCLUDE dictionary.alvarion
--$INCLUDE dictionary.apc
--$INCLUDE dictionary.aruba
--$INCLUDE dictionary.azaire
--$INCLUDE dictionary.ascend
--$INCLUDE dictionary.bay
--$INCLUDE dictionary.bintec
--$INCLUDE dictionary.cablelabs
--$INCLUDE dictionary.cabletron
--$INCLUDE dictionary.chillispot
--$INCLUDE dictionary.cisco
-+##
-+##	Include compatibility dictionary for older users file. Move
-+##	this directive to the end of this file if you want to see the
-+##	old names in the logfiles, INSTEAD OF the new names.
-+##
-+##$INCLUDE dictionary.compat
- #
--#	 The Cisco VPN300 dictionary is the same as the altiga one.
--#	 You shouldn't use both at the same time.
-+##
-+##	Include the RFC dictionaries next.
-+##
-+##	For a complete list of the standard attributes and values,
-+##	see:
-+##		http://www.iana.org/assignments/radius-types
-+##
-+#$INCLUDE dictionary.rfc2865
-+#$INCLUDE dictionary.rfc2866
-+#$INCLUDE dictionary.rfc2867
-+#$INCLUDE dictionary.rfc2868
-+#$INCLUDE dictionary.rfc2869
-+#$INCLUDE dictionary.rfc3162
-+#$INCLUDE dictionary.rfc3576
-+#$INCLUDE dictionary.rfc3580
-+#$INCLUDE dictionary.rfc4072
-+#$INCLUDE dictionary.rfc4372
-+#$INCLUDE dictionary.rfc4675
-+#$INCLUDE dictionary.rfc4679
-+#$INCLUDE dictionary.rfc4818
-+#$INCLUDE dictionary.rfc4849
-+#$INCLUDE dictionary.rfc5176
-+#$INCLUDE dictionary.rfc5580
- #
--#$INCLUDE dictionary.cisco.vpn3000
--$INCLUDE dictionary.cisco.vpn5000
--$INCLUDE dictionary.cisco.bbsm
--$INCLUDE dictionary.clavister
--$INCLUDE dictionary.colubris
--$INCLUDE dictionary.cosine
--#$INCLUDE dictionary.dhcp
--$INCLUDE dictionary.digium
--$INCLUDE dictionary.epygi
--$INCLUDE dictionary.erx
--$INCLUDE dictionary.ericsson
--$INCLUDE dictionary.extreme
-+##
-+##	Include vendor dictionaries after the standard ones.
-+##
-+#$INCLUDE dictionary.3com
-+#$INCLUDE dictionary.3gpp
-+#$INCLUDE dictionary.3gpp2
-+#$INCLUDE dictionary.acc
-+#$INCLUDE dictionary.airespace
-+#$INCLUDE dictionary.alcatel
-+#$INCLUDE dictionary.alteon
-+#$INCLUDE dictionary.alvarion
-+#$INCLUDE dictionary.apc
-+#$INCLUDE dictionary.aruba
-+#$INCLUDE dictionary.azaire
-+#$INCLUDE dictionary.ascend
-+#$INCLUDE dictionary.bay
-+#$INCLUDE dictionary.bintec
-+#$INCLUDE dictionary.cablelabs
-+#$INCLUDE dictionary.cabletron
-+#$INCLUDE dictionary.chillispot
-+#$INCLUDE dictionary.cisco
-+##
-+##	 The Cisco VPN300 dictionary is the same as the altiga one.
-+##	 You shouldn't use both at the same time.
-+##
-+##$INCLUDE dictionary.cisco.vpn3000
-+#$INCLUDE dictionary.cisco.vpn5000
-+#$INCLUDE dictionary.cisco.bbsm
-+#$INCLUDE dictionary.clavister
-+#$INCLUDE dictionary.colubris
-+#$INCLUDE dictionary.cosine
-+##$INCLUDE dictionary.dhcp
-+#$INCLUDE dictionary.digium
-+#$INCLUDE dictionary.epygi
-+#$INCLUDE dictionary.erx
-+#$INCLUDE dictionary.ericsson
-+#$INCLUDE dictionary.extreme
- $INCLUDE dictionary.freeradius
--$INCLUDE dictionary.freeswitch
--$INCLUDE dictionary.fortinet
--$INCLUDE dictionary.foundry
--$INCLUDE dictionary.gandalf
--$INCLUDE dictionary.gemtek
--$INCLUDE dictionary.h3c
--$INCLUDE dictionary.hp
--$INCLUDE dictionary.huawei
--$INCLUDE dictionary.iea
--$INCLUDE dictionary.infonet
--$INCLUDE dictionary.issanni
--$INCLUDE dictionary.itk
--$INCLUDE dictionary.ipunplugged
--$INCLUDE dictionary.juniper
--$INCLUDE dictionary.jradius
--$INCLUDE dictionary.karlnet
--$INCLUDE dictionary.lancom
--$INCLUDE dictionary.livingston
--$INCLUDE dictionary.localweb
--$INCLUDE dictionary.lucent
--$INCLUDE dictionary.manzara
--$INCLUDE dictionary.merit
--$INCLUDE dictionary.microsoft
--$INCLUDE dictionary.mikrotik
--$INCLUDE dictionary.navini
--$INCLUDE dictionary.netscreen
--$INCLUDE dictionary.networkphysics
--$INCLUDE dictionary.nexans
--$INCLUDE dictionary.ntua
--$INCLUDE dictionary.nokia
--#
--#  Commented out because of attribute conflicts.
--#
--#$INCLUDE dictionary.nokia.conflict
--$INCLUDE dictionary.nomadix
--$INCLUDE dictionary.nortel
--#
--#  Commented out because of attribute conflicts.
-+#$INCLUDE dictionary.freeswitch
-+#$INCLUDE dictionary.fortinet
-+#$INCLUDE dictionary.foundry
-+#$INCLUDE dictionary.gandalf
-+#$INCLUDE dictionary.gemtek
-+#$INCLUDE dictionary.h3c
-+#$INCLUDE dictionary.hp
-+#$INCLUDE dictionary.huawei
-+#$INCLUDE dictionary.iea
-+#$INCLUDE dictionary.infonet
-+#$INCLUDE dictionary.issanni
-+#$INCLUDE dictionary.itk
-+#$INCLUDE dictionary.ipunplugged
-+#$INCLUDE dictionary.juniper
-+#$INCLUDE dictionary.jradius
-+#$INCLUDE dictionary.karlnet
-+#$INCLUDE dictionary.lancom
-+#$INCLUDE dictionary.livingston
-+#$INCLUDE dictionary.localweb
-+#$INCLUDE dictionary.lucent
-+#$INCLUDE dictionary.manzara
-+#$INCLUDE dictionary.merit
-+#$INCLUDE dictionary.microsoft
-+#$INCLUDE dictionary.mikrotik
-+#$INCLUDE dictionary.navini
-+#$INCLUDE dictionary.netscreen
-+#$INCLUDE dictionary.networkphysics
-+#$INCLUDE dictionary.nexans
-+#$INCLUDE dictionary.ntua
-+#$INCLUDE dictionary.nokia
-+##
-+##  Commented out because of attribute conflicts.
-+##
-+##$INCLUDE dictionary.nokia.conflict
-+#$INCLUDE dictionary.nomadix
-+#$INCLUDE dictionary.nortel
-+##
-+##  Commented out because of attribute conflicts.
-+##
-+##$INCLUDE dictionary.openser
-+#$INCLUDE dictionary.packeteer
-+#$INCLUDE dictionary.patton
-+#$INCLUDE dictionary.propel
-+#$INCLUDE dictionary.prosoft
-+#$INCLUDE dictionary.quiconnect
-+#$INCLUDE dictionary.quintum
-+#$INCLUDE dictionary.redback
-+#$INCLUDE dictionary.redcreek
-+#$INCLUDE dictionary.riverstone
-+#$INCLUDE dictionary.roaringpenguin
-+#$INCLUDE dictionary.shasta
-+#$INCLUDE dictionary.shiva
-+#$INCLUDE dictionary.slipstream
-+#$INCLUDE dictionary.sonicwall
-+#$INCLUDE dictionary.springtide
-+#$INCLUDE dictionary.starent
-+#$INCLUDE dictionary.telebit
-+#$INCLUDE dictionary.trapeze
-+#$INCLUDE dictionary.tropos
-+#$INCLUDE dictionary.t_systems_nova
-+#$INCLUDE dictionary.usr
-+#$INCLUDE dictionary.utstarcom
-+#$INCLUDE dictionary.valemount
-+#$INCLUDE dictionary.versanet
-+#$INCLUDE dictionary.vqp
-+#$INCLUDE dictionary.waverider
-+#$INCLUDE dictionary.walabi
-+#$INCLUDE dictionary.wimax
-+#$INCLUDE dictionary.wispr
-+#$INCLUDE dictionary.xedia
-+#$INCLUDE dictionary.xylan
- #
--#$INCLUDE dictionary.openser
--$INCLUDE dictionary.packeteer
--$INCLUDE dictionary.patton
--$INCLUDE dictionary.propel
--$INCLUDE dictionary.prosoft
--$INCLUDE dictionary.quiconnect
--$INCLUDE dictionary.quintum
--$INCLUDE dictionary.redback
--$INCLUDE dictionary.redcreek
--$INCLUDE dictionary.riverstone
--$INCLUDE dictionary.roaringpenguin
--$INCLUDE dictionary.shasta
--$INCLUDE dictionary.shiva
--$INCLUDE dictionary.slipstream
--$INCLUDE dictionary.sonicwall
--$INCLUDE dictionary.springtide
--$INCLUDE dictionary.starent
--$INCLUDE dictionary.telebit
--$INCLUDE dictionary.trapeze
--$INCLUDE dictionary.tropos
--$INCLUDE dictionary.t_systems_nova
--$INCLUDE dictionary.usr
--$INCLUDE dictionary.utstarcom
--$INCLUDE dictionary.valemount
--$INCLUDE dictionary.versanet
--$INCLUDE dictionary.vqp
--$INCLUDE dictionary.waverider
--$INCLUDE dictionary.walabi
--$INCLUDE dictionary.wimax
--$INCLUDE dictionary.wispr
--$INCLUDE dictionary.xedia
--$INCLUDE dictionary.xylan
--
-+##
-+##	And finally the server internal attributes.
-+##
-+#$INCLUDE dictionary.freeradius.internal
- #
--#	And finally the server internal attributes.
-+##
-+##	Miscellaneous attributes defined in weird places that
-+##	don't really belong anywhere else...
-+##
-+#ATTRIBUTE	Originating-Line-Info			94	string
- #
--$INCLUDE dictionary.freeradius.internal
--
-+##  As defined in draft-sterman-aaa-sip-00.txt
-+#ATTRIBUTE	Digest-Response				206	string
-+#ATTRIBUTE	Digest-Attributes			207	octets	# stupid format
- #
--#	Miscellaneous attributes defined in weird places that
--#	don't really belong anywhere else...
-+##
-+##	Integer Translations
-+##
-+#VALUE	Service-Type			Voice			12
-+#VALUE	Service-Type			Fax			13
-+#VALUE	Service-Type			Modem-Relay		14
-+#VALUE	Service-Type			IAPP-Register		15
-+#VALUE	Service-Type			IAPP-AP-Check		16
- #
--ATTRIBUTE	Originating-Line-Info			94	string
--
--#  As defined in draft-sterman-aaa-sip-00.txt
--ATTRIBUTE	Digest-Response				206	string
--ATTRIBUTE	Digest-Attributes			207	octets	# stupid format
--
-+#VALUE	Framed-Protocol			GPRS-PDP-Context	7
- #
--#	Integer Translations
-+#VALUE	NAS-Port-Type			Wireless-CDMA2000	22
-+#VALUE	NAS-Port-Type			Wireless-UMTS		23
-+#VALUE	NAS-Port-Type			Wireless-1X-EV		24
-+#VALUE	NAS-Port-Type			IAPP			25
- #
--VALUE	Service-Type			Voice			12
--VALUE	Service-Type			Fax			13
--VALUE	Service-Type			Modem-Relay		14
--VALUE	Service-Type			IAPP-Register		15
--VALUE	Service-Type			IAPP-AP-Check		16
--
--VALUE	Framed-Protocol			GPRS-PDP-Context	7
--
--VALUE	NAS-Port-Type			Wireless-CDMA2000	22
--VALUE	NAS-Port-Type			Wireless-UMTS		23
--VALUE	NAS-Port-Type			Wireless-1X-EV		24
--VALUE	NAS-Port-Type			IAPP			25
--
--VALUE	Framed-Protocol			PPTP			9
-+#VALUE	Framed-Protocol			PPTP			9
diff --git a/package/freeradius-server/patches/patch-src_main_event_c b/package/freeradius-server/patches/patch-src_main_event_c
index 8dbcddf99..1750f53d5 100644
--- a/package/freeradius-server/patches/patch-src_main_event_c
+++ b/package/freeradius-server/patches/patch-src_main_event_c
@@ -1,15 +1,15 @@
---- freeradius-server-2.1.7.orig/src/main/event.c	2009-09-14 16:43:29.000000000 +0200
-+++ freeradius-server-2.1.7/src/main/event.c	2009-11-19 22:55:03.000000000 +0100
-@@ -1143,7 +1143,7 @@ static void wait_a_bit(void *ctx)
- 			break;
+--- freeradius-server-2.1.8.orig/src/main/event.c	2009-12-30 16:44:35.000000000 +0100
++++ freeradius-server-2.1.8/src/main/event.c	2010-02-05 19:43:55.803074411 +0100
+@@ -1177,7 +1177,7 @@ static void wait_a_bit(void *ctx)
  		}
  
+ 	stop_processing:
 -#if defined(HAVE_PTHREAD_H) || defined(WITH_PROXY)
 +#if defined(HAVE_PTHREAD_H)
  		/*
  		 *	A child thread MAY still be running on the
  		 *	request.  Ask the thread to stop working on
-@@ -1617,7 +1617,9 @@ static int originated_coa_request(REQUES
+@@ -1646,7 +1646,9 @@ static int originated_coa_request(REQUES
  	 */
  	request->num_proxied_requests = 1;
  	request->num_proxied_responses = 0;
diff --git a/package/freeradius-server/patches/patch-src_main_modules_c b/package/freeradius-server/patches/patch-src_main_modules_c
new file mode 100644
index 000000000..c72807f5c
--- /dev/null
+++ b/package/freeradius-server/patches/patch-src_main_modules_c
@@ -0,0 +1,11 @@
+--- freeradius-server-2.1.8.orig/src/main/modules.c	2009-12-30 16:44:35.000000000 +0100
++++ freeradius-server-2.1.8/src/main/modules.c	2010-02-05 20:05:22.174324929 +0100
+@@ -22,6 +22,8 @@
+  * Copyright 2000  Alan Curry <pacman@world.std.com>
+  */
+ 
++#define lt__PROGRAM__LTX_preloaded_symbols lt_libltdl_LTX_preloaded_symbols
++
+ #include <freeradius-devel/ident.h>
+ RCSID("$Id$")
+ 
diff --git a/package/freeradius-server/patches/patch-src_modules_rlm_eap_Makefile_in b/package/freeradius-server/patches/patch-src_modules_rlm_eap_Makefile_in
index 17bbf64c2..da95c44c1 100644
--- a/package/freeradius-server/patches/patch-src_modules_rlm_eap_Makefile_in
+++ b/package/freeradius-server/patches/patch-src_modules_rlm_eap_Makefile_in
@@ -1,5 +1,5 @@
---- freeradius-server-2.1.7.orig/src/modules/rlm_eap/Makefile.in	2009-09-14 16:43:29.000000000 +0200
-+++ freeradius-server-2.1.7/src/modules/rlm_eap/Makefile.in	2009-11-19 22:37:45.000000000 +0100
+--- freeradius-server-2.1.8.orig/src/modules/rlm_eap/Makefile.in	2009-12-30 16:44:35.000000000 +0100
++++ freeradius-server-2.1.8/src/modules/rlm_eap/Makefile.in	2010-02-05 20:33:01.401922559 +0100
 @@ -37,7 +37,7 @@ radeapclient.lo: radeapclient.c $(HEADER
  
  install-subdirs:
diff --git a/package/freetype/Makefile b/package/freetype/Makefile
index 6acb8c2da..eab453ba6 100644
--- a/package/freetype/Makefile
+++ b/package/freetype/Makefile
@@ -22,12 +22,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBFREETYPE,libfreetype,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBFREETYPE}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libfreetype.so.* ${IDIR_LIBFREETYPE}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libfreetype.so* ${IDIR_LIBFREETYPE}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/frickin/Makefile b/package/frickin/Makefile
index e43d5d0eb..0c16037a8 100644
--- a/package/frickin/Makefile
+++ b/package/frickin/Makefile
@@ -15,7 +15,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FRICKIN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE=		auto
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
 
 do-install:
 	${INSTALL_DIR} ${IDIR_FRICKIN}/usr/sbin
diff --git a/package/frickin/patches/patch-Makefile b/package/frickin/patches/patch-Makefile
new file mode 100644
index 000000000..eb8052f4f
--- /dev/null
+++ b/package/frickin/patches/patch-Makefile
@@ -0,0 +1,9 @@
+--- frickin-1.3.orig/Makefile	2004-10-13 18:24:56.000000000 +0200
++++ frickin-1.3/Makefile	2010-02-05 19:12:36.101852925 +0100
+@@ -1,5 +1,5 @@
+ #CFLAGS = -g -Wall
+-CFLAGS = -O3 -Wall
++CFLAGS ?= -O3 -Wall
+ 
+ all: frickin
+ 
diff --git a/package/frickin/patches/patch-src_Makefile b/package/frickin/patches/patch-src_Makefile
new file mode 100644
index 000000000..97e0adf86
--- /dev/null
+++ b/package/frickin/patches/patch-src_Makefile
@@ -0,0 +1,9 @@
+--- frickin-1.3.orig/src/Makefile	2004-10-13 18:24:56.000000000 +0200
++++ frickin-1.3/src/Makefile	2010-02-05 19:13:44.344334596 +0100
+@@ -1,5 +1,5 @@
+ #CFLAGS = -g3 -Wall
+-CFLAGS = -O3 -Wall
++CFLAGS ?= -O3 -Wall
+ 
+ all: frickin
+ 
diff --git a/package/frickin/patches/patch-src_main_c b/package/frickin/patches/patch-src_main_c
new file mode 100644
index 000000000..8a893d3c0
--- /dev/null
+++ b/package/frickin/patches/patch-src_main_c
@@ -0,0 +1,20 @@
+--- frickin-1.3.orig/src/main.c	2005-05-31 16:51:36.000000000 +0200
++++ frickin-1.3/src/main.c	2010-02-05 19:12:23.654334206 +0100
+@@ -259,7 +259,7 @@ int _connect_to_server()
+ 	{
+ 		SIN sin;
+ 
+-		bzero(&sin, sizeof(SIN));
++		memset(&sin, 0, sizeof(SIN));
+ 		sin.sin_family = AF_INET;
+ 		sin.sin_port = htons(PPTP_PORT);
+ 		sin.sin_addr.s_addr = inet_addr(g_target_ip);
+@@ -713,7 +713,7 @@ int main(int argc, char **argv)
+ 	{
+ 		SIN sin;
+ 
+-		bzero(&sin, sizeof(SIN));
++		memset(&sin, 0, sizeof(SIN));
+ 		sin.sin_family = AF_INET;
+ 		sin.sin_port = htons(PPTP_PORT);
+ 		sin.sin_addr.s_addr = inet_addr(g_listen_ip);
diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 692427867..f2682d4aa 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -17,7 +17,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,FUSE_UTILS,fuse-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--enable-lib \
 			--disable-shared \
 			--enable-static \
@@ -26,8 +25,6 @@ CONFIGURE_ARGS+=	--enable-lib \
 			--disable-auto-modprobe \
 			--disable-mtab \
 			--disable-kernel-module
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
 
 post-install:
 	${INSTALL_DIR} ${IDIR_FUSE_UTILS}/usr/bin
diff --git a/package/gatling/Makefile b/package/gatling/Makefile
index cb1c48188..38a1afcb8 100644
--- a/package/gatling/Makefile
+++ b/package/gatling/Makefile
@@ -20,7 +20,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GATLING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 MAKE_FILE:=		GNUmakefile
 ALL_TARGET:=		gatling
 TCPPFLAGS+=		-I${STAGING_DIR}/usr/include/owfat
diff --git a/package/gawk/Makefile b/package/gawk/Makefile
index e47aad514..a4d1bbb03 100644
--- a/package/gawk/Makefile
+++ b/package/gawk/Makefile
@@ -17,9 +17,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,GAWK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ARGS+=	--disable-libsigsegv
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_GAWK}/usr/bin
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 4e613efef..534395d7a 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -18,7 +18,6 @@ $(eval $(call PKG_template,GCC,gcc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},
 
 TCFLAGS:=		''
 TCPPFLAGS:=		''
-CONFIGURE_STYLE:=	gnu
 ifeq ($(ADK_LINUX_MIPS64_LEMOTE),y)
 CONFIGURE_ARGS+=	--with-abi=64
 endif
@@ -37,8 +36,6 @@ CONFIGURE_ARGS+=	--enable-languages=c,c++ \
 			--disable-libgomp \
 			--disable-multilib \
 			--disable-libstdcxx-pch
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_GCC}/usr/lib/gcc ${IDIR_GCC}/usr/bin
diff --git a/package/gdb/Makefile b/package/gdb/Makefile
index 86152fced..e01721222 100644
--- a/package/gdb/Makefile
+++ b/package/gdb/Makefile
@@ -15,14 +15,11 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TCFLAGS+=		${TCPPFLAGS} -fPIC
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--without-uiout --enable-gdbmi \
 			--disable-tui --disable-gdbtk --without-x \
 			--without-included-gettext --disable-sim \
 			--enable-threads --with-curses --disable-werror \
 			--enable-static
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 XAKE_FLAGS+=		LDFLAGS='${TLDFLAGS}'
 
 post-install:
diff --git a/package/gdbm/Makefile b/package/gdbm/Makefile
index d1d001112..fcef44550 100644
--- a/package/gdbm/Makefile
+++ b/package/gdbm/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		gdbm
 PKG_VERSION:=		1.8.3
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		1d1b1d5c0245b1c00aff92da751e9aa1
-PKG_DESCR:=		disk file format database which stores key/data-pairs in single files
+PKG_DESCR:=		disk file format database
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.gnu.org/software/gdbm
 PKG_SITES:=		${MASTER_SITE_GNU:=gdbm/}
@@ -16,15 +16,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBGDBM,libgdbm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 XAKE_FLAGS+=		BINOWN=`id -u` \
 			BINGRP=`id -g` \
 			INSTALL_ROOT="${WRKINST}"
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBGDBM}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libgdbm.so.* ${IDIR_LIBGDBM}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libgdbm.so* ${IDIR_LIBGDBM}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index 8b6034b43..cfbed5260 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -14,10 +14,6 @@ WRKSRC=                 ${WRKDIST}/gdb/gdbserver
 
 $(eval $(call PKG_template,GDBSERVER,gdbserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_GDBSERVER}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/gdbserver ${IDIR_GDBSERVER}/usr/bin/
diff --git a/package/gettext/Makefile b/package/gettext/Makefile
index 0a06b3f32..4ef29852e 100644
--- a/package/gettext/Makefile
+++ b/package/gettext/Makefile
@@ -13,6 +13,7 @@ PKG_DEPENDS:=		libiconv libpthread
 PKG_BUILDDEP+=		libiconv libpthread
 PKG_URL:=		http://www.gnu.org/software/gettext/
 PKG_SITES:=		${MASTER_SITE_GNU:=gettext/}
+
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
 endif
@@ -23,7 +24,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GETTEXT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-java \
 			--disable-native-java \
 			--disable-csharp \
@@ -37,8 +37,6 @@ CONFIGURE_ARGS+=	--disable-java \
 CONFIGURE_ENV+=		nls_cv_use_gnu_gettext=yes \
 			ac_cv_gnu_library_2=no \
 			gt_use_preinstalled_gnugettext=no
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_GETTEXT}/usr/lib
diff --git a/package/git/Makefile b/package/git/Makefile
index 1e38b5099..171f857d8 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -21,13 +21,10 @@ $(eval $(call PKG_template,GIT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
 MAKE_ENV+=		NO_PERL=1 NO_NSEC=1 NO_TCLTK=1 \
 			NO_CROSS_DIRECTORY_HARDLINKS=1 \
 			CURLDIR=${STAGING_DIR} EXPATDIR=${STAGING_DIR}
-XAKE_FLAGS+=		V=1 uname_S=Linux uname_O=GNU/Linux
-CONFIGURE_STYLE:=	gnu
+XAKE_FLAGS+=		uname_S=Linux uname_O=GNU/Linux
 CONFIGURE_ENV+=		ac_cv_c_c99_format=yes \
 			ac_cv_fread_reads_directories=no \
 			ac_cv_snprintf_returns_bogus=no
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_GIT)/usr/bin $(IDIR_GIT)/usr/sbin/git-core
diff --git a/package/gkrellmd/Makefile b/package/gkrellmd/Makefile
index 51daec7b3..65b9b9fd8 100644
--- a/package/gkrellmd/Makefile
+++ b/package/gkrellmd/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		gkrellmd
 PKG_VERSION:=		2.3.2
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		glib
 PKG_MD5SUM:=		db8a983a60577a6b4886db96d6def011
 PKG_DESCR:=		The GNU Krell Monitors Server
 PKG_SECTION:=		net
 PKG_DEPENDS:=		glib libpthread
+PKG_BUILDDEP+=		glib
 PKG_URL:=		http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html
 PKG_SITES:=		http://members.dslextreme.com/users/billw/gkrellm/
 
@@ -21,7 +21,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GKRELLMD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE=	auto
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
 
 do-install:
 	${INSTALL_DIR} ${IDIR_GKRELLMD}/usr/bin ${IDIR_GKRELLMD}/etc
diff --git a/package/glib/Makefile b/package/glib/Makefile
index a2e5a3fc2..8d1430ea7 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -6,13 +6,14 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		glib
 PKG_VERSION:=		2.22.2
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		gettext libiconv
 PKG_MD5SUM:=		00eb873975e2ef9361b8177131c7c943
 PKG_DESCR:=		low-level core library that forms the basis of GTK+
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		gettext libiconv libpthread
+PKG_BUILDDEP+=		gettext libiconv
 PKG_URL:=		http://www.gtk.org/
 PKG_SITES:=		ftp://ftp.gtk.org/pub/glib/2.22/
+
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
 endif
@@ -21,7 +22,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-debug=no \
 			--disable-mem-pools \
 			--disable-rebuilds \
@@ -34,11 +34,13 @@ CONFIGURE_ENV+=		glib_cv_long_long_format=ll \
 			glib_cv_uscore=no \
 			ac_cv_func_posix_getpwuid_r=yes \
 			ac_cv_func_posix_getgrgid_r=yes
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_GLIB}/usr/lib
-	${CP} ${WRKINST}/usr/lib/lib*.so.* ${IDIR_GLIB}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libgio*.so* ${IDIR_GLIB}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libglib*.so* ${IDIR_GLIB}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libgobject*.so* ${IDIR_GLIB}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libgmodule*.so* ${IDIR_GLIB}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libgthread*.so* ${IDIR_GLIB}/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 27f5baafc..ddda531a9 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -30,6 +30,10 @@ GLIBC_CONFOPTS:=          \
 $(eval $(call PKG_template,GLIBC,glibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,GLIBC_DEV,glibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 SUB_INSTALLS-y:=
 SUB_INSTALLS-m:=
 SUB_INSTALLS-${ADK_PACKAGE_GLIBC_DEV}+=		glibc-dev-install
diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile
index eb38904cd..11b830abe 100644
--- a/package/gmediaserver/Makefile
+++ b/package/gmediaserver/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		gmediaserver
 PKG_VERSION:=		0.13.0
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		id3lib libupnp
 PKG_MD5SUM:=		c422de386331e2a1a859d45f6fa270a3
 PKG_DESCR:=		An UPnP music media server
 PKG_SECTION:=		net
 PKG_DEPENDS:=		id3lib libupnp
+PKG_BUILDDEP+=		id3lib libupnp
 PKG_URL:=		http://www.gnu.org/software/gmediaserver
 PKG_SITES:=		http://savannah.nongnu.org/download/gmediaserver/
 
@@ -18,13 +18,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GMEDIASERVER,gmediaserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+=		LIBS=" -lixml -lthreadutil -lupnp -lz" \
 			am_cv_func_iconv=no
 CONFIGURE_ARGS+=	--with-id3lib="${STAGING_DIR}/usr" \
 			--with-libupnp="${STAGING_DIR}/usr"
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 ifeq ($(ADK_TARGET_LIB_UCLIBCXX),y)
 CONFIGURE_ENV+=		LIBS=" -lixml -lthreadutil -lupnp -luClibc++ -lz"
@@ -32,6 +29,7 @@ endif
 
 post-install:
 	${INSTALL_DIR} ${IDIR_GMEDIASERVER}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/gmediaserver ${IDIR_GMEDIASERVER}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/bin/gmediaserver \
+		${IDIR_GMEDIASERVER}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gmp/Makefile b/package/gmp/Makefile
index e3e0c7d0d..b7e6c2e82 100644
--- a/package/gmp/Makefile
+++ b/package/gmp/Makefile
@@ -12,12 +12,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBGMP,libgmp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBGMP}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libgmp.so.* ${IDIR_LIBGMP}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libgmp.so* ${IDIR_LIBGMP}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/gnupg/Makefile b/package/gnupg/Makefile
index 0a14439f5..950b1ffbe 100644
--- a/package/gnupg/Makefile
+++ b/package/gnupg/Makefile
@@ -18,9 +18,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GNUPG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-CONFIGURE_ENV+=		ac_cv_c_bigendian=no \
-			ac_cv_sizeof_off_t=8
 CONFIGURE_ARGS+=	--disable-asm \
 			--disable-gnupg-iconv \
 			--disable-card-support \
@@ -34,11 +31,13 @@ CONFIGURE_ARGS+=	--disable-asm \
 			--disable-dns-srv \
 			--enable-fake-curl \
 			--disable-regex
-BUILD_STYLE:=		auto
 
-do-install:
+post-install:
 	${INSTALL_DIR} ${IDIR_GNUPG}/usr/bin/
-	${INSTALL_BIN} ${WRKBUILD}/g10/gpg ${IDIR_GNUPG}/usr/bin/
+	${INSTALL_DIR} ${IDIR_GNUPG}/usr/share/gnupg
+	${INSTALL_DATA} ${WRKINST}/usr/share/gnupg/options.skel \
+		${IDIR_GNUPG}/usr/share/gnupg
+	${INSTALL_BIN} ${WRKINST}/usr/bin/gpg ${IDIR_GNUPG}/usr/bin/
 # we need root privileges for secure memory (locked pages)
 	chmod u+s ${IDIR_GNUPG}/usr/bin/gpg
 
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 603e67cc9..4745d1594 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -26,13 +26,10 @@ $(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEAS
 $(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--without-libopencdk-prefix \
 			--disable-camellia \
 			--with-libgcrypt-prefix=${STAGING_DIR}/usr \
 			--without-libz-prefix
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBGNUTLS}/usr/lib
diff --git a/package/gperf/Makefile b/package/gperf/Makefile
index da90d16b8..eb6045495 100644
--- a/package/gperf/Makefile
+++ b/package/gperf/Makefile
@@ -16,10 +16,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GPERF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_GPERF}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/gperf ${IDIR_GPERF}/usr/bin
diff --git a/package/gpm/Makefile b/package/gpm/Makefile
index 8058b82a6..2b2866ef0 100644
--- a/package/gpm/Makefile
+++ b/package/gpm/Makefile
@@ -16,10 +16,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GPM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 TCFLAGS+=		-I${WRKSRC}/src/headers
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_GPM}/usr/sbin ${IDIR_GPM}/usr/lib
diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile
index 6adea4d87..8b88305da 100644
--- a/package/gpsd/Makefile
+++ b/package/gpsd/Makefile
@@ -21,7 +21,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,GPSD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,GPSD_CLIENTS,gpsd-clients,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		EGREP="grep -E" \
 			CPP="$(TARGET_CC) -E" \
 			ac_cv_func_strlcpy=no \
@@ -30,8 +29,6 @@ CONFIGURE_ENV+=		EGREP="grep -E" \
 # --disable-python breaks configure script
 CONFIGURE_ARGS+=	--without-x \
 			--disable-dbus
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 ifeq ($(ADK_COMPILE_GPSD_WITH_UCLIBCXX),y)
 TCXXFLAGS+=		-fno-builtin -fno-rtti -nostdinc++ \
diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile
index 0ae841ec6..f7ae5c08b 100644
--- a/package/grub-bin/Makefile
+++ b/package/grub-bin/Makefile
@@ -22,6 +22,8 @@ $(eval $(call PKG_template,GRUB_BIN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${
 
 PKGDFLT_GRUB_BIN=	y
 
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 do-install:
diff --git a/package/grub/Makefile b/package/grub/Makefile
index 894910f16..37d20708a 100644
--- a/package/grub/Makefile
+++ b/package/grub/Makefile
@@ -19,13 +19,10 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,GRUB,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-grub-emu \
 			--disable-efiemu \
 			--disable-grub-mkfont \
 			--disable-grub-fstest
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} $(IDIR_GRUB)/usr/{sbin,lib,bin} 
diff --git a/package/gsm/Makefile b/package/gsm/Makefile
index 308c174c9..ef5beb10b 100644
--- a/package/gsm/Makefile
+++ b/package/gsm/Makefile
@@ -23,14 +23,14 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBGSM,libgsm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,GSM_UTILS,gsm-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+
 XAKE_FLAGS+=		COPTS="${TARGET_CFLAGS} -fPIC" \
 			INSTALL_ROOT="${WRKINST}"
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBGSM}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libgsm.so.1.0.10 ${IDIR_LIBGSM}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libgsm.so* ${IDIR_LIBGSM}/usr/lib
 	${INSTALL_DIR} ${IDIR_GSM_UTILS}/usr/bin
 	${CP} ${WRKINST}/usr/bin/toast ${IDIR_GSM_UTILS}/usr/bin
 
diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile
index 45e00ca4a..95ed06d3c 100644
--- a/package/gtk+/Makefile
+++ b/package/gtk+/Makefile
@@ -4,15 +4,16 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gtk+
-PKG_VERSION:=		2.18.3
+PKG_VERSION:=		2.18.6
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		cairo atk pango libXext renderproto libXrender
-PKG_MD5SUM:=		8b34f75642ff6cc783dfa7e3af0ba443
+PKG_MD5SUM:=		f98617af9f6be3065f64248f78dae2b7
 PKG_DESCR:=		GTK+ library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		glib
+PKG_BUILDDEP+=		cairo atk pango libXext renderproto libXrender
 PKG_URL:=		http://www.gtk.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/gnome/sources/gtk+/2.18/
+
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
 endif
@@ -21,13 +22,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GTK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		gio_can_sniff=no \
 			ac_cv_path_GTK_UPDATE_ICON_CACHE="" 
 CONFIGURE_ARGS+=	--without-libtiff \
 			--without-libjpeg
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_GTK}/usr/lib
diff --git a/package/haserl/Makefile b/package/haserl/Makefile
index 59c1f6d0c..8a44ad07f 100644
--- a/package/haserl/Makefile
+++ b/package/haserl/Makefile
@@ -17,9 +17,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,HASERL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TCFLAGS+=		-DMAX_UPLOAD_KB=8192
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_HASERL}/usr/bin
diff --git a/package/hdparm/Makefile b/package/hdparm/Makefile
index 2e8921870..ab2e42d6a 100644
--- a/package/hdparm/Makefile
+++ b/package/hdparm/Makefile
@@ -14,10 +14,9 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=hdparm/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,HDPARM,hdparm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,HDPARM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-MAKE_ENV+=		STRIP=${TARGET_CROSS}strip
-BUILD_STYLE=		auto
+CONFIG_STYLE:=		manual
 
 post-install:
 	${INSTALL_DIR} ${IDIR_HDPARM}/usr/sbin
diff --git a/package/hdparm/patches/patch-Makefile b/package/hdparm/patches/patch-Makefile
new file mode 100644
index 000000000..26a759821
--- /dev/null
+++ b/package/hdparm/patches/patch-Makefile
@@ -0,0 +1,19 @@
+--- hdparm-9.15.orig/Makefile	2008-12-10 01:14:28.000000000 +0100
++++ hdparm-9.15/Makefile	2010-02-05 22:40:21.943083430 +0100
+@@ -13,7 +13,7 @@ oldmandir = $(manprefix)/man
+ CC ?= gcc
+ STRIP ?= strip
+ 
+-CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
++CFLAGS ?= -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
+ 
+ #LDFLAGS = -s -static
+ LDFLAGS = -s
+@@ -28,7 +28,6 @@ all: hdparm
+ 
+ hdparm: hdparm.h sgio.h $(OBJS)
+ 	$(CC) $(LDFLAGS) -o hdparm $(OBJS)
+-	$(STRIP) hdparm
+ 
+ hdparm.o:	hdparm.h sgio.h
+ 
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index b7ac0e376..96e1e2406 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		6e5028077e2a6b101a4a72801ba71b9e
 PKG_DESCR:=		Kerberos 5 server
 PKG_SECTION:=		net
+PKG_NOPARALLEL:=	1
 PKG_DEPENDS:=		libheimdal libheimdal-client libncurses libcom-err
 PKG_BUILDDEP+=		openssl ncurses e2fsprogs
 ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_BDB},y)
@@ -73,11 +74,8 @@ endif
 
 TCFLAGS+=		-I${STAGING_DIR}/usr/include/et -pthread
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	${CONFIGURE_OPTS}
 CONFIGURE_ENV+=		ac_cv_func_getaddrinfo_numserv=yes
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 ifeq ($(ADK_HOST_CYGWIN),y)
 EXEEXT:=		.exe
@@ -96,6 +94,8 @@ pre-configure:
 		${STAGING_TOOLS}/bin
 	${INSTALL_BIN} ${WRKBUILD}/lib/sl/slc$(EXEEXT) \
 		${STAGING_TOOLS}/bin
+	${MAKE} -C ${WRKBUILD}/lib/asn1 clean
+	${MAKE} -C ${WRKBUILD}/lib/roken clean
 	${MAKE} -C ${WRKBUILD} clean
 
 post-install:
diff --git a/package/heyu/Makefile b/package/heyu/Makefile
index bef18a7e7..78ab5e17e 100644
--- a/package/heyu/Makefile
+++ b/package/heyu/Makefile
@@ -19,8 +19,14 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,HEYU,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-do-build:
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+do-configure:
 	(cd ${WRKBUILD} && ${BASH} ./Configure linux);
+
+do-build:
 	${MAKE} -C ${WRKBUILD} \
 		CC="${TARGET_CC}" LD=${TARGET_CROSS}ld \
 		CFLAGS="${TARGET_CFLAGS} -I${WRKBUILD} -DSYSV -DPOSIX -DHAS_ITIMER -DLINUX -DHASSELECT -DHASTZ"
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 29827f7c9..0b8a93464 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -21,7 +21,8 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,HOSTAPD,hostapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,HOSTAPD_UTILS,hostapd-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
 
 do-configure:
 	${CP} ./files/hostapd.config ${WRKBUILD}/.config
diff --git a/package/htpdate/Makefile b/package/htpdate/Makefile
index e8dbe39f3..39fcc7c9b 100644
--- a/package/htpdate/Makefile
+++ b/package/htpdate/Makefile
@@ -4,23 +4,22 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		htpdate
-PKG_VERSION:=		1.0.3
+PKG_VERSION:=		1.0.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		82953fe72d2f40411585222f85f2afab
+PKG_MD5SUM:=		a3da5ad8965345eb734695c765010acf
 PKG_DESCR:=		an HTP (Hypertext Time Protocol) implementation
 PKG_SECTION:=		net
-PKG_URL:=		http://www.clevervest.com/twiki/bin/view/HTP
+PKG_URL:=		http://www.vervest.org/htp/
 PKG_SITES:=		http://www.clevervest.com/htp/archive/c/
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,HTPDATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE=		auto
+CONFIG_STYLE:=		manual
 
-do-install:
+post-install:
 	${INSTALL_DIR} ${IDIR_HTPDATE}/usr/sbin
 	${INSTALL_BIN} ${WRKBUILD}/htpdate ${IDIR_HTPDATE}/usr/sbin/
 
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/htpdate/patches/patch-Makefile b/package/htpdate/patches/patch-Makefile
index 46b1a9cef..9afe7bc70 100644
--- a/package/htpdate/patches/patch-Makefile
+++ b/package/htpdate/patches/patch-Makefile
@@ -1,14 +1,35 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- htpdate-1.0.3.orig/Makefile	2008-09-02 22:24:09.000000000 +0200
-+++ htpdate-1.0.3/Makefile	2009-05-29 14:24:39.045810534 +0200
+--- htpdate-1.0.4.orig/Makefile	2008-10-13 21:04:08.000000000 +0200
++++ htpdate-1.0.4/Makefile	2010-02-05 22:49:58.954334284 +0100
 @@ -2,8 +2,8 @@ prefix = /usr
  bindir = ${prefix}/bin
  mandir = ${prefix}/share/man
  
 -CC = gcc
--CFLAGS += -Wall -pedantic -ansi -O2
+-CFLAGS += -Wall -O2
 +CC ?= gcc
-+CFLAGS ?= -Wall -pedantic -ansi -O2
- #CFLAGS += -Wall -ansi -O2
++CFLAGS ?= -Wall -O2
+ #CFLAGS += -Wall -pedantic -ansi -O2
  
  INSTALL = /usr/bin/install -c
+@@ -15,15 +15,14 @@ htpdate: htpdate.c
+ 	$(CC) $(CFLAGS) -o htpdate htpdate.c
+ 
+ install: all
+-	$(STRIP) htpdate
+-	mkdir -p $(bindir)
+-	$(INSTALL) -m 755 htpdate $(bindir)/htpdate
+-	mkdir -p $(mandir)/man8
+-	$(INSTALL) -m 644 htpdate.8.gz $(mandir)/man8/htpdate.8.gz
++	mkdir -p $(DESTDIR)$(bindir)
++	$(INSTALL) -m 755 htpdate $(DESTDIR)$(bindir)/htpdate
++	mkdir -p $(DESTDIR)$(mandir)/man8
++	$(INSTALL) -m 644 htpdate.8.gz $(DESTDIR)$(mandir)/man8/htpdate.8.gz
+ 
+ clean:
+ 	rm -rf htpdate
+ 
+ uninstall:
+-	rm -rf $(bindir)/htpdate
+-	rm -rf $(mandir)/man8/htpdate.8.gz
++	rm -rf $(DESTDIR)$(bindir)/htpdate
++	rm -rf $(DESTDIR)$(mandir)/man8/htpdate.8.gz
diff --git a/package/htpdate/patches/patch-htpdate_c b/package/htpdate/patches/patch-htpdate_c
index 6dec28424..c8294b11c 100644
--- a/package/htpdate/patches/patch-htpdate_c
+++ b/package/htpdate/patches/patch-htpdate_c
@@ -1,7 +1,6 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- htpdate-1.0.3.orig/htpdate.c	2008-09-02 22:24:09.000000000 +0200
-+++ htpdate-1.0.3/htpdate.c	2009-05-29 14:28:27.252071728 +0200
-@@ -351,6 +351,7 @@ static int setclock( double timedelta, i
+--- htpdate-1.0.4.orig/htpdate.c	2008-10-13 21:04:08.000000000 +0200
++++ htpdate-1.0.4/htpdate.c	2010-02-05 22:48:28.624323989 +0100
+@@ -353,6 +353,7 @@ static int setclock( double timedelta, i
  }
  
  
@@ -9,15 +8,16 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  static int htpdate_adjtimex( double drift ) {
  	struct timex		tmx;
  	long				freq;
-@@ -379,6 +380,7 @@ static int htpdate_adjtimex( double drif
+@@ -381,7 +382,7 @@ static int htpdate_adjtimex( double drif
  	}
  
  }
+-
 +#endif
  
- 
  static void showhelp() {
-@@ -404,7 +406,6 @@ Usage: htpdate [-046abdhlqstxD] [-i pid 
+ 	puts("htpdate version "VERSION"\n\
+@@ -406,7 +407,6 @@ Usage: htpdate [-046abdhlqstxD] [-i pid 
    -s    set time\n\
    -t    turn off sanity time check\n\
    -u    run daemon as user\n\
@@ -25,7 +25,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
    host  web server hostname or ip address (maximum of 16)\n\
    port  port number (default 80 and 8080 for proxy server)\n");
  
-@@ -584,9 +585,11 @@ int main( int argc, char *argv[] ) {
+@@ -586,9 +586,11 @@ int main( int argc, char *argv[] ) {
  				}
  			}
  			break;
@@ -37,7 +37,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  		case 'D':			/* run as daemon */
  			daemonize = 1;
  			logmode = 1;
-@@ -777,6 +780,7 @@ int main( int argc, char *argv[] ) {
+@@ -779,6 +781,7 @@ int main( int argc, char *argv[] ) {
  					printlog( 0, "Drift %.2f PPM, %.2f s/day", \
  							drift*1e6, drift*86400 );
  
@@ -45,7 +45,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  					/* Adjust system clock */
  					if ( setmode == 3 ) {
  						starttime = time(NULL);
-@@ -787,6 +791,7 @@ int main( int argc, char *argv[] ) {
+@@ -789,6 +792,7 @@ int main( int argc, char *argv[] ) {
  						/* Drop root privileges again */
  						if ( sw_uid ) seteuid( sw_uid );
  					}
diff --git a/package/httping/Makefile b/package/httping/Makefile
index 7d4e0b754..7f0d6add6 100644
--- a/package/httping/Makefile
+++ b/package/httping/Makefile
@@ -4,13 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		httping
-PKG_VERSION:=		1.3.0
+PKG_VERSION:=		1.4.1
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		openssl
-PKG_MD5SUM:=		41c912a9ecc904e51d7260053fc2195c
+PKG_MD5SUM:=		bde1ff3c01343d2371d8f34fbf8a1d9a
 PKG_DESCR:=		Httping is like 'ping' but for http-requests
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libopenssl
+PKG_BUILDDEP+=		openssl
 PKG_SITES:=		http://www.vanheusden.com/httping/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
@@ -19,11 +19,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,HTTPING,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-MAKE_FLAGS+=		STAGING_DIR=${STAGING_DIR}
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=		manual
 
-do-install:
-	${INSTALL_DIR} ${IDIR_HTTPING}/usr/sbin
-	${CP} ${WRKBUILD}/${PKG_NAME} ${IDIR_HTTPING}/usr/sbin/
+post-install:
+	${INSTALL_DIR} ${IDIR_HTTPING}/usr/bin
+	${CP} ${WRKINST}/usr/bin/httping ${IDIR_HTTPING}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/httping/patches/patch-Makefile b/package/httping/patches/patch-Makefile
deleted file mode 100644
index 89099b868..000000000
--- a/package/httping/patches/patch-Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-$Id$
---- httping-1.2.3.orig/Makefile	2007-05-01 14:05:43.000000000 +0000
-+++ httping-1.2.3/Makefile	2007-06-20 14:19:59.000000000 +0000
-@@ -15,8 +15,8 @@
- include version
- 
- DEBUG=-g # -D_DEBUG
--LDFLAGS+=-lssl -lcrypto $(DEBUG)
--CFLAGS+=-O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG)
-+LDFLAGS+=-lssl -lcrypto $(DEBUG) -L$(STAGING_DIR)/usr/lib
-+CFLAGS+=-O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG) -I$(STAGING_DIR)/usr/include
- 
- OBJS=mem.o http.o io.o str.o error.o utils.o main.o tcp.o mssl.o res.o
- 
diff --git a/package/httping/patches/patch-io_c b/package/httping/patches/patch-io_c
deleted file mode 100644
index b1ac1166b..000000000
--- a/package/httping/patches/patch-io_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id$
---- httping-1.2.3.orig/io.c	2007-05-01 14:05:43.000000000 +0000
-+++ httping-1.2.3/io.c	2007-06-20 14:19:11.000000000 +0000
-@@ -37,7 +37,7 @@ ssize_t myread(int fd, char *whereto, si
- 		struct timeval to;
- 		fd_set rfds;
- 
--		FD_ZERO(&rfds);
-+		//FD_ZERO(&rfds);
- 		FD_SET(fd, &rfds);
- 
- 		to.tv_sec  = timeout / 1000;
diff --git a/package/httping/patches/patch-str_c b/package/httping/patches/patch-str_c
deleted file mode 100644
index 8778ef40b..000000000
--- a/package/httping/patches/patch-str_c
+++ /dev/null
@@ -1,16 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- httping-1.3.0.orig/str.c	2009-02-18 16:32:43.000000000 +0100
-+++ httping-1.3.0/str.c	2009-06-01 21:31:19.000000000 +0200
-@@ -18,6 +18,7 @@
- #include "mem.h"
- #include "utils.h"
- 
-+/*
- #ifndef strndup
- char *strndup(char *in, int size)
- {
-@@ -29,3 +30,4 @@ char *strndup(char *in, int size)
- 	return out;
- }
- #endif
-+*/
diff --git a/package/httping/patches/patch-str_h b/package/httping/patches/patch-str_h
deleted file mode 100644
index c7b81ed65..000000000
--- a/package/httping/patches/patch-str_h
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- httping-1.3.0.orig/str.h	2009-02-18 16:32:43.000000000 +0100
-+++ httping-1.3.0/str.h	2009-06-01 21:30:39.000000000 +0200
-@@ -15,6 +15,8 @@
- 
- #include <string.h>
- 
-+/*
- #ifndef strndup
- char *strndup(char *in, int size);
- #endif
-+*/
diff --git a/package/httptunnel/Makefile b/package/httptunnel/Makefile
index 4d4171d30..8df81f557 100644
--- a/package/httptunnel/Makefile
+++ b/package/httptunnel/Makefile
@@ -16,10 +16,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,HTTPTUNNEL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_HTTPTUNNEL}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/hts ${IDIR_HTTPTUNNEL}/usr/bin/
diff --git a/package/icecast/Makefile b/package/icecast/Makefile
index fe9d193ca..9428af1df 100644
--- a/package/icecast/Makefile
+++ b/package/icecast/Makefile
@@ -18,8 +18,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,ICECAST,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+AUTOTOOL_STYLE:=	autotool
+
 TCPPFLAGS+=		-I${STAGING_DIR}/usr/include/libxml2
-CONFIGURE_STYLE=	autotool gnu
 CONFIGURE_ARGS+=	--disable-yp \
 			--with-curl="yes" \
 			--with-curl-config="${STAGING_DIR}/usr/bin/curl-config" \
@@ -28,8 +29,6 @@ CONFIGURE_ARGS+=	--disable-yp \
 			--with-speex="no" \
 			--with-theora="no" \
 			--with-xslt-config="${STAGING_DIR}/usr/bin/xslt-config"
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_ICECAST}/etc
@@ -37,7 +36,9 @@ post-install:
 	${INSTALL_DIR} ${IDIR_ICECAST}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/icecast ${IDIR_ICECAST}/usr/bin/
 	${INSTALL_DIR} ${IDIR_ICECAST}/usr/share/icecast
-	${CP} ${WRKINST}/usr/share/icecast/admin ${IDIR_ICECAST}/usr/share/icecast/
-	${CP} ${WRKINST}/usr/share/icecast/web ${IDIR_ICECAST}/usr/share/icecast/
+	${CP} ${WRKINST}/usr/share/icecast/admin \
+		${IDIR_ICECAST}/usr/share/icecast/
+	${CP} ${WRKINST}/usr/share/icecast/web \
+		${IDIR_ICECAST}/usr/share/icecast/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/icecast/patches/patch-m4_xiph_curl_m4 b/package/icecast/patches/patch-m4_xiph_curl_m4
index b88806380..5c6abbce6 100644
--- a/package/icecast/patches/patch-m4_xiph_curl_m4
+++ b/package/icecast/patches/patch-m4_xiph_curl_m4
@@ -1,4 +1,3 @@
-$Id$
 --- icecast-2.3.2.orig/m4/xiph_curl.m4	2008-04-19 03:54:26.000000000 +0200
 +++ icecast-2.3.2/m4/xiph_curl.m4	2008-08-29 12:34:17.000000000 +0200
 @@ -52,7 +52,7 @@ AC_CHECK_HEADERS([curl/curl.h],, curl_ok
diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile
index 5df274613..983ac7a1d 100644
--- a/package/id3lib/Makefile
+++ b/package/id3lib/Makefile
@@ -6,12 +6,12 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		id3lib
 PKG_VERSION:=		3.8.3
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		zlib libiconv
-PKG_CXX:=		ID3LIB
 PKG_MD5SUM:=		19f27ddd2dda4b2d26a559a4f0f402a7
 PKG_DESCR:=		An ID3v1/ID3v2 tagging library
 PKG_SECTION:=		libs
+PKG_CXX:=		ID3LIB
 PKG_DEPENDS:=		zlib libiconv
+PKG_BUILDDEP+=		zlib libiconv
 PKG_URL:=		http://id3lib.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=id3lib/}
 
@@ -20,10 +20,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,ID3LIB,id3lib,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TCFLAGS+=		-fPIC
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-cxx-warnings=no
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 ifeq ($(ADK_COMPILE_ID3LIB_WITH_UCLIBCXX),y)
 TCXXFLAGS+=		-fno-builtin -fno-rtti -nostdinc++ \
@@ -35,6 +32,6 @@ endif
 
 post-install:
 	${INSTALL_DIR} ${IDIR_ID3LIB}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libid3-*.so.* ${IDIR_ID3LIB}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libid3-*.so* ${IDIR_ID3LIB}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/iftop/Makefile b/package/iftop/Makefile
index c6059a58b..374cf5410 100644
--- a/package/iftop/Makefile
+++ b/package/iftop/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		iftop
 PKG_VERSION:=		0.17
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libpcap libpthread ncurses
 PKG_MD5SUM:=		062bc8fb3856580319857326e0b8752d
 PKG_DESCR:=		display bandwith usage on an interface
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libncurses libpcap libpthread
+PKG_BUILDDEP+=		libpcap libpthread ncurses
 PKG_URL:=		http://www.ex-parrot.com/~pdw/iftop
 PKG_SITES:=		http://www.ex-parrot.com/~pdw/iftop/download/
 
@@ -18,10 +18,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IFTOP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_IFTOP}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/iftop ${IDIR_IFTOP}/usr/bin/
diff --git a/package/igmpproxy/Makefile b/package/igmpproxy/Makefile
index cfa09f93e..567b1c12f 100644
--- a/package/igmpproxy/Makefile
+++ b/package/igmpproxy/Makefile
@@ -18,13 +18,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IGMPPROXY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
+TCFLAGS+=		-std=gnu99
 
 post-install:
 	${INSTALL_DIR} ${IDIR_IGMPPROXY}/usr/sbin ${IDIR_IGMPPROXY}/etc
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/${PKG_NAME} ${IDIR_IGMPPROXY}/usr/sbin/
-	${INSTALL_DATA} ${WRKINST}/etc/${PKG_NAME}.conf ${IDIR_IGMPPROXY}/etc
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/igmpproxy \
+		 ${IDIR_IGMPPROXY}/usr/sbin/
+	${INSTALL_DATA} ${WRKINST}/etc/igmpproxy.conf ${IDIR_IGMPPROXY}/etc
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/inputproto/Makefile b/package/inputproto/Makefile
index c61a053f4..e9243c8cf 100644
--- a/package/inputproto/Makefile
+++ b/package/inputproto/Makefile
@@ -10,9 +10,4 @@ PKG_MD5SUM:=		13d91739cf70a781f1db24d8d3677574
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ipcad/Makefile b/package/ipcad/Makefile
index d238b86ab..342822d26 100644
--- a/package/ipcad/Makefile
+++ b/package/ipcad/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		ipcad
 PKG_VERSION:=		3.7.3
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libpcap
 PKG_MD5SUM:=		125605249958894148ec26d3c88189f5
 PKG_DESCR:=		IP Cisco Accounting Daemon
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libpcap
+PKG_BUILDDEP+=		libpcap
 PKG_URL:=		http://lionet.info/ipcad
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=ipcad/}
 
@@ -18,14 +18,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IPCAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-CONFIGURE_ENV+=		ac_cv_lib_nsl_inet_pton=no
 CONFIGURE_ARGS+=	--with-ifst=linux \
 			--with-psrc=pcap \
 			--with-pcap-include="${STAGING_DIR}/usr/include" \
 			--with-pcap-libraries="${STAGING_DIR}/usr/lib"
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 pre-build:
 	touch $(WRKBUILD)/cfglex.c $(WRKBUILD)/cslex.c
diff --git a/package/iperf/Makefile b/package/iperf/Makefile
index 23231a8d6..2876f1464 100644
--- a/package/iperf/Makefile
+++ b/package/iperf/Makefile
@@ -6,21 +6,17 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		iperf
 PKG_VERSION:=		2.0.4
 PKG_RELEASE:=		1
-PKG_CXX:=		IPERF
 PKG_MD5SUM:=		8c5bc14cc2ea55f18f22afe3c23e3dcb
 PKG_DESCR:=		Internet Protocol bandwidth measuring tool
 PKG_SECTION:=		net
+PKG_CXX:=		IPERF
 PKG_DEPENDS:=		libpthread
 PKG_URL:=		http://sourceforge.net/projects/iperf
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=iperf/}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,IPERF,iperf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+$(eval $(call PKG_template,IPERF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq ($(ADK_COMPILE_IPERF_WITH_UCLIBCXX),y)
 TCXXFLAGS+=		-fno-builtin -fno-rtti -nostdinc++
diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index a70b675b5..f65a61e2c 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -42,10 +42,7 @@ TCFLAGS+=		-D_GNU_SOURCE
 XAKE_FLAGS+=		CCOPTS="${TCFLAGS}" MFLAGS="CC=${TARGET_CC}" \
 			HOSTCFLAGS="-I${LINUX_HEADER_DIR}/include"
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_FLAGS+=	KERNEL_INCLUDE="${LINUX_DIR}/include"
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 INSTALL_y:=
 INSTALL_m:=
@@ -72,7 +69,8 @@ install-tc:
 
 install-tc-atm:
 	${INSTALL_DIR} ${IDIR_TC_ATM}/usr/lib/tc
-	${INSTALL_DATA} ${WRKINST}/usr/lib/tc/q_atm.so ${IDIR_TC_ATM}/usr/lib/tc/
+	${INSTALL_DATA} ${WRKINST}/usr/lib/tc/q_atm.so \
+		${IDIR_TC_ATM}/usr/lib/tc/
 
 install-ifstat:
 	${INSTALL_DIR} ${IDIR_IFSTAT}/usr/sbin
diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile
index f17d09f22..3bee75f27 100644
--- a/package/ipsec-tools/Makefile
+++ b/package/ipsec-tools/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		ipsec-tools
 PKG_VERSION:=		0.7.2
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		72861f005746ee27984b2ee715ecc629
 PKG_DESCR:=		IPsec management tools
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libopenssl
+PKG_BUILDDEP+=		openssl
 PKG_URL:=		http://ipsec-tools.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=ipsec-tools/}
 
@@ -20,15 +20,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IPSEC_TOOLS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-kernel-headers="${LINUX_DIR}/include" \
 			--without-readline \
 			--disable-security-context \
 			--with-openssl="${STAGING_DIR}/usr" \
 			--without-libradius \
 			--without-libpam
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_IPSEC_TOOLS}/usr/sbin ${IDIR_IPSEC_TOOLS}/usr/lib
@@ -40,7 +37,8 @@ post-install:
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/plainrsa-gen \
 		${IDIR_IPSEC_TOOLS}/usr/sbin/
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/racoon ${IDIR_IPSEC_TOOLS}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/racoonctl ${IDIR_IPSEC_TOOLS}/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/racoonctl \
+		${IDIR_IPSEC_TOOLS}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/setkey ${IDIR_IPSEC_TOOLS}/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index d41c12d1e..0dfca4d14 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -19,9 +19,9 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,KMOD_IPSET,kmod-ipset,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+
 XAKE_FLAGS+=		PREFIX=/usr
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 ALL_TARGET:=		binaries
 INSTALL_TARGET:=	binaries_install
 
diff --git a/package/iptables-snmp/Makefile b/package/iptables-snmp/Makefile
index 4b3bff57f..cebcfc057 100644
--- a/package/iptables-snmp/Makefile
+++ b/package/iptables-snmp/Makefile
@@ -17,9 +17,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,IPTABLES_SNMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 FAKE_FLAGS+=		INSTALL_PREFIX="${WRKINST}"
 
 post-install:
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index f5f2d2392..f07604877 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -9,7 +9,11 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		c67cf30e281a924def6426be0973df56
 PKG_DESCR:=		The netfilter firewalling software
 PKG_SECTION:=		net
-PKG_DEPENDS:=		kmod-ip-nf-iptables kmod-nf-conntrack kmod-nf-conntrack-ipv4 kmod-nf-nat kmod-ip-nf-target-masquerade kmod-ip-nf-target-reject kmod-ip-nf-filter kmod-ip-nf-match-state kmod-netfilter-xt-target-tcpmss
+PKG_DEPENDS:=		kmod-ip-nf-iptables kmod-nf-conntrack 
+PKG_DEPENDS+=		kmod-nf-conntrack-ipv4 kmod-nf-nat 
+PKG_DEPENDS+=		kmod-ip-nf-target-masquerade kmod-ip-nf-target-reject
+PKG_DEPENDS+=		kmod-ip-nf-filter kmod-ip-nf-match-state 
+PKG_DEPENDS+=		kmod-netfilter-xt-target-tcpmss
 PKG_URL:=		http://www.netfilter.org
 PKG_SITES:=		http://www.netfilter.org/projects/iptables/files/ \
 			ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \
@@ -27,10 +31,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-devel
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 SUB_INSTALL-${ADK_PACKAGE_IP6TABLES}+=			ip6tables-install
 
diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile
index ccd333219..e45ec244e 100644
--- a/package/iptraf/Makefile
+++ b/package/iptraf/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		iptraf
 PKG_VERSION:=		3.0.0
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		ncurses
 PKG_MD5SUM:=		377371c28ee3c21a76f7024920649ea8
 PKG_DESCR:=		A console-based network monitoring program.
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libncurses
+PKG_BUILDDEP+=		ncurses
 PKG_URL:=		http://iptraf.seul.org
 PKG_SITES:=		ftp://iptraf.seul.org/pub/iptraf/ \
 			ftp://the.wiretapped.net/pub/security/network-monitoring/iptraf/
@@ -19,6 +19,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IPTRAF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 do-build:
 	${MAKE} -C ${WRKBUILD}/src \
 		${TARGET_CONFIGURE_OPTS} \
diff --git a/package/irssi/Makefile b/package/irssi/Makefile
index 1b502cff0..820bb94d7 100644
--- a/package/irssi/Makefile
+++ b/package/irssi/Makefile
@@ -27,15 +27,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IRSSI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-perl=no \
 			--with-gnu-ld \
 			--with-textui \
 			--with-terminfo \
 			--without-bot \
-			--without-proxy \
-			--enable-static
-BUILD_STYLE=		auto
+			--without-proxy
 
 ifeq (${ADK_PACKAGE_IRSSI_SSL},y)
 CONFIGURE_ARGS+=	--enable-ssl
@@ -43,9 +40,8 @@ else
 CONFIGURE_ARGS+=	--disable-ssl
 endif
 
-do-install:
+post-install:
 	${INSTALL_DIR} ${IDIR_IRSSI}/usr/bin
-	${INSTALL_BIN} ${WRKBUILD}/src/fe-text/${PKG_NAME} \
-		${IDIR_IRSSI}/usr/bin/
+	${INSTALL_BIN} ${WRKINST}/usr/bin/irssi ${IDIR_IRSSI}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/iw/Makefile b/package/iw/Makefile
index 106b702e4..d2ea171a6 100644
--- a/package/iw/Makefile
+++ b/package/iw/Makefile
@@ -20,9 +20,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IW,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+
 XAKE_FLAGS:=		V=1
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_IW}/usr/sbin
diff --git a/package/jamvm/Makefile b/package/jamvm/Makefile
index 6a5ef3e18..0a734af58 100644
--- a/package/jamvm/Makefile
+++ b/package/jamvm/Makefile
@@ -20,7 +20,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,JAMVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 CONFIGURE_ARGS+=	--enable-ffi
 
 do-build:
@@ -36,6 +38,7 @@ do-install:
 	${INSTALL_DIR} ${IDIR_JAMVM}/usr/bin
 	${INSTALL_DIR} ${IDIR_JAMVM}/usr/share/jamvm
 	${INSTALL_BIN} ${WRKINST}/usr/bin/jamvm ${IDIR_JAMVM}/usr/bin
-	${CP} ${WRKINST}/usr/share/jamvm/classes.zip ${IDIR_JAMVM}/usr/share/jamvm
+	${CP} ${WRKINST}/usr/share/jamvm/classes.zip \
+		${IDIR_JAMVM}/usr/share/jamvm
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/jpeg/Makefile b/package/jpeg/Makefile
index 972eb44a5..34d1c72ea 100644
--- a/package/jpeg/Makefile
+++ b/package/jpeg/Makefile
@@ -23,10 +23,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBJPEG,libjpeg,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBJPEG}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libjpeg.so* ${IDIR_LIBJPEG}/usr/lib/
diff --git a/package/kbproto/Makefile b/package/kbproto/Makefile
index 62da57203..f84afa463 100644
--- a/package/kbproto/Makefile
+++ b/package/kbproto/Makefile
@@ -10,9 +10,4 @@ PKG_MD5SUM:=		4deef518a03bc94a7a25902bb7c98dd6
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/kismet/Makefile b/package/kismet/Makefile
index e6ecf710c..a14a54838 100644
--- a/package/kismet/Makefile
+++ b/package/kismet/Makefile
@@ -18,6 +18,8 @@ $(eval $(call PKG_template,KISMET_CLIENT,kismet-client,${PKG_VERSION}-${PKG_RELE
 $(eval $(call PKG_template,KISMET_DRONE,kismet-drone,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,KISMET_SERVER,kismet-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+INSTALL_STYLE:=		manual
+
 ifeq ($(ADK_COMPILE_KISMET_WITH_UCLIBCXX),y)
 TCFLAGS+=		-fno-builtin -fno-rtti -nostdinc++ -I${STAGING_DIR}/usr/include/uClibc++
 TLDFLAGS+=		-luClibc++ -lc -lm -lgcc_s -nodefaultlibs 
@@ -26,12 +28,10 @@ CONFIGURE_ENV+=		CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ \
 else
 TLDFLAGS+=		-shared
 endif
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--sysconfdir=/etc/kismet \
 			--enable-syspcap=yes \
 			--disable-setuid \
 			--disable-gpsmap
-BUILD_STYLE=		auto
 
 do-install:
 	${INSTALL_DIR} ${IDIR_KISMET}/usr/bin/
diff --git a/package/knock/Makefile b/package/knock/Makefile
index 60c0af0bb..cbfeb9093 100644
--- a/package/knock/Makefile
+++ b/package/knock/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		knock
 PKG_VERSION:=		0.5
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libpcap
 PKG_MD5SUM:=		ca09d61458974cff90a700aba6120891
 PKG_DESCR:=		A port-knocking client
 PKG_SECTION:=		net
 PKG_URL:=		http://www.zeroflux.org/projects/knock
+PKG_BUILDDEP+=		libpcap
 PKG_SITES:=		http://www.zeroflux.org/proj/knock/files/
 
 PKG_DESCR_1:=		A port-knocking server
@@ -22,10 +22,7 @@ $(eval $(call PKG_template,KNOCK,knock,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESC
 $(eval $(call PKG_template,KNOCKD,knockd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION}))
 
 TCXXFLAGS+=		${TCPPFLAGS} ${TCFLAGS}
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+=		ac_cv_lib_pcap_pcap_open_live=yes
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_KNOCK}/usr/bin
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 6f1c72a18..533e50c39 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -26,7 +26,6 @@ $(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE}
 $(eval $(call PKG_template,LIBKRB5,libkrb5,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_LIB},${PKG_SECTION_LIB}))
 
 TCFLAGS+=		-I${STAGING_DIR}/usr/include/et
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-static \
 			--disable-profiled \
 			--with-system-ss \
@@ -37,8 +36,6 @@ CONFIGURE_ENV+=		krb5_cv_attr_constructor_destructor=yes,yes \
 			ac_cv_printf_positional=yes \
 			ac_cv_file__etc_environment=no \
 			ac_cv_file__etc_TIMEZONE=no
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-extract:
 	(cd ${WRKDIR}; tar xzf ${PKG_NAME}-${PKG_VERSION}.tar.gz)
diff --git a/package/l2tpns/Makefile b/package/l2tpns/Makefile
index 5a5b95a22..677eca10e 100644
--- a/package/l2tpns/Makefile
+++ b/package/l2tpns/Makefile
@@ -18,8 +18,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,L2TPNS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_FLAGS:=		auto
-INSTALL_STYLE:=		auto
+CONFIG_STYLE:=		manual
 
 post-install:
 	${INSTALL_DIR} ${IDIR_L2TPNS}/etc/l2tpns
diff --git a/package/lame/Makefile b/package/lame/Makefile
index 5d86199a6..1488591ad 100644
--- a/package/lame/Makefile
+++ b/package/lame/Makefile
@@ -18,17 +18,13 @@ PKG_SECTION_1:=		libs
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LAME,lame,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LAME,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBLAME,liblame,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION_1}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-
 post-install:
 	$(INSTALL_DIR) $(IDIR_LAME)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/lame $(IDIR_LAME)/usr/bin/
 	$(INSTALL_DIR) $(IDIR_LIBLAME)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/lib*.so* $(IDIR_LIBLAME)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libmp3lame.so* $(IDIR_LIBLAME)/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/less/Makefile b/package/less/Makefile
index ff82edefc..4b5d28bbb 100644
--- a/package/less/Makefile
+++ b/package/less/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		less
 PKG_VERSION:=		429
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		ncurses
 PKG_MD5SUM:=		206f2f13b9b0a35e45df660fcb6af31d
 PKG_DESCR:=		A text mode pager
 PKG_SECTION:=		text
 PKG_DEPENDS:=		libncurses
+PKG_BUILDDEP+=		ncurses
 PKG_URL:=		http://www.greenwoodsoftware.com/less
 PKG_SITES:=		http://www.greenwoodsoftware.com/less/
 
@@ -18,11 +18,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LESS,less,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-
-do-install:
+post-install:
 	${INSTALL_DIR} ${IDIR_LESS}/usr/bin
-	${INSTALL_BIN} ${WRKBUILD}/less ${IDIR_LESS}/usr/bin/
+	${INSTALL_BIN} ${WRKINST}/usr/bin/less ${IDIR_LESS}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libICE/Makefile b/package/libICE/Makefile
index 4f7e7e660..13fd7b39d 100644
--- a/package/libICE/Makefile
+++ b/package/libICE/Makefile
@@ -16,10 +16,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBICE,libice,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBICE}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libICE.so* ${IDIR_LIBICE}/usr/lib/
diff --git a/package/libSM/Makefile b/package/libSM/Makefile
index d00f16fb0..dfedcaa23 100644
--- a/package/libSM/Makefile
+++ b/package/libSM/Makefile
@@ -17,10 +17,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBSM,libsm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBSM}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libSM.so* ${IDIR_LIBSM}/usr/lib/
diff --git a/package/libX11/Makefile b/package/libX11/Makefile
index e1a990ada..866579cbf 100644
--- a/package/libX11/Makefile
+++ b/package/libX11/Makefile
@@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		libX11
 PKG_VERSION:=		1.3.2
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		xproto xextproto xtrans libXdmcp libXau xcmiscproto bigreqsproto kbproto inputproto
 PKG_MD5SUM:=		b68aebbfcac1174c4c95d260e9369766
 PKG_DESCR:=		X11 client-side library
 PKG_SECTION:=		x11
+PKG_BUILDDEP+=		xproto xextproto xtrans libXdmcp libXau xcmiscproto bigreqsproto kbproto inputproto
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 ifeq ($(ADK_STATIC),y)
@@ -21,14 +21,11 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBX11,libx11,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 XAKE_FLAGS+=		HOSTCPPFLAGS=-I${STAGING_DIR}/usr/include/xproto
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-xlocale \
 			--disable-specs \
 			--disable-xf86bigfont \
 			--disable-malloc0returnsnull \
 			--without-xcb
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBX11}/usr/lib ${IDIR_LIBX11}/usr/share/X11
diff --git a/package/libXau/Makefile b/package/libXau/Makefile
index a82823a74..bb57992d0 100644
--- a/package/libXau/Makefile
+++ b/package/libXau/Makefile
@@ -19,10 +19,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBXAU,libxau,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBXAU}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXau.so* ${IDIR_LIBXAU}/usr/lib/
diff --git a/package/libXaw/Makefile b/package/libXaw/Makefile
index 4d6277f05..9b6481da8 100644
--- a/package/libXaw/Makefile
+++ b/package/libXaw/Makefile
@@ -16,10 +16,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBXAW,libxaw,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-docs
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBXAW}/usr/lib
diff --git a/package/libXdmcp/Makefile b/package/libXdmcp/Makefile
index d0d6f461f..b525949b6 100644
--- a/package/libXdmcp/Makefile
+++ b/package/libXdmcp/Makefile
@@ -19,10 +19,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBXDMCP,libxdmcp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBXDMCP}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXdmcp.so* ${IDIR_LIBXDMCP}/usr/lib/
diff --git a/package/libXext/Makefile b/package/libXext/Makefile
index 259a66019..42e972aaf 100644
--- a/package/libXext/Makefile
+++ b/package/libXext/Makefile
@@ -20,10 +20,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBXEXT,libxext,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBXEXT}/usr/lib
diff --git a/package/libXfont/Makefile b/package/libXfont/Makefile
index 4606b2115..c51d2e58b 100644
--- a/package/libXfont/Makefile
+++ b/package/libXfont/Makefile
@@ -19,9 +19,6 @@ $(eval $(call PKG_template,LIBXFONT,libxfont,$(PKG_VERSION)-${PKG_RELEASE},${PKG
 
 XAKE_FLAGS+=		V=1
 CONFIGURE_ENV+=		ac_cv_path_XMLTO=true
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBXFONT}/usr/lib
diff --git a/package/libXmu/Makefile b/package/libXmu/Makefile
index 208bf5256..c208c65e6 100644
--- a/package/libXmu/Makefile
+++ b/package/libXmu/Makefile
@@ -6,20 +6,16 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		libXmu
 PKG_VERSION:=		1.0.5
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libXt
 PKG_MD5SUM:=		f49e3587cdc299707da0786a681f9c05
 PKG_DESCR:=		miscellaneous utility functions for X libraries
 PKG_SECTION:=		x11
+PKG_BUILDDEP+=		libXt
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBXMU,libxmu,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBXMU}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libXmu.so* ${IDIR_LIBXMU}/usr/lib/
diff --git a/package/libXpm/Makefile b/package/libXpm/Makefile
index da5a647fe..05170d5bd 100644
--- a/package/libXpm/Makefile
+++ b/package/libXpm/Makefile
@@ -15,10 +15,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBXPM,libxpm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_search_gettext=no
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBXPM}/usr/lib
diff --git a/package/libXrender/Makefile b/package/libXrender/Makefile
index 145c36988..4fcfcd89e 100644
--- a/package/libXrender/Makefile
+++ b/package/libXrender/Makefile
@@ -20,10 +20,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBXRENDER,libxrender,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBXRENDER}/usr/lib
diff --git a/package/libXt/Makefile b/package/libXt/Makefile
index e14d75f1a..8f42e9c2d 100644
--- a/package/libXt/Makefile
+++ b/package/libXt/Makefile
@@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		libXt
 PKG_VERSION:=		1.0.7
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libSM
 PKG_MD5SUM:=		28f627c7a5ca08c2413ce91d21c177d8
 PKG_DESCR:=		X Toolkit Intrinsics
 PKG_SECTION:=		x11
+PKG_BUILDDEP+=		libSM
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
@@ -17,11 +17,8 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 XAKE_FLAGS+=		HOSTCPPFLAGS=-I${STAGING_DIR}/usr/include/xproto
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull \
 			--disable-install-makestrs
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBXT}/usr/lib
diff --git a/package/libXt/patches/patch-util_Makefile_in b/package/libXt/patches/patch-util_Makefile_in
index 7a9a888b7..a02ec514f 100644
--- a/package/libXt/patches/patch-util_Makefile_in
+++ b/package/libXt/patches/patch-util_Makefile_in
@@ -1,5 +1,27 @@
 --- libXt-1.0.7.orig/util/Makefile.in	2009-10-09 06:51:17.000000000 +0200
-+++ libXt-1.0.7/util/Makefile.in	2009-12-11 18:16:05.000000000 +0100
++++ libXt-1.0.7/util/Makefile.in	2010-02-05 23:31:14.324191435 +0100
+@@ -63,10 +63,10 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ am__mv = mv -f
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
++	$(LIBTOOLFLAGS) --mode=compile $(CC_FOR_BUILD) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ 	$(AM_CFLAGS) $(CFLAGS)
+ AM_V_CC = $(am__v_CC_$(V))
+@@ -75,7 +75,7 @@ am__v_CC_0 = @echo "  CC    " $@;
+ AM_V_at = $(am__v_at_$(V))
+ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+ am__v_at_0 = @
+-CCLD = $(CC)
++CCLD = $(CC_FOR_BUILD)
+ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 @@ -131,7 +131,7 @@ CFLAGS = @CFLAGS_FOR_BUILD@
  CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
  CHANGELOG_CMD = @CHANGELOG_CMD@
@@ -30,17 +52,17 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='makestrs.c' object='makestrs-makestrs.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 -@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
++@am__fastdepCC_FALSE@	$(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
  
  makestrs-makestrs.obj: makestrs.c
 -@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.obj -MD -MP -MF $(DEPDIR)/makestrs-makestrs.Tpo -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
-+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.obj -MD -MP -MF $(DEPDIR)/makestrs-makestrs.Tpo -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
++@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.obj -MD -MP -MF $(DEPDIR)/makestrs-makestrs.Tpo -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
  @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/makestrs-makestrs.Tpo $(DEPDIR)/makestrs-makestrs.Po
  @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='makestrs.c' object='makestrs-makestrs.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 -@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
++@am__fastdepCC_FALSE@	$(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(makestrs_CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
  
  mostlyclean-libtool:
  	-rm -f *.lo
diff --git a/package/libXv/Makefile b/package/libXv/Makefile
index 4165f8547..13172660e 100644
--- a/package/libXv/Makefile
+++ b/package/libXv/Makefile
@@ -16,10 +16,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBXV,libxv,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBXV}/usr/lib
diff --git a/package/libXxf86dga/Makefile b/package/libXxf86dga/Makefile
index c850aa81e..15209dd30 100644
--- a/package/libXxf86dga/Makefile
+++ b/package/libXxf86dga/Makefile
@@ -6,20 +6,17 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		libXxf86dga
 PKG_VERSION:=		1.1.1
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		xf86dgaproto libXext libXaw
 PKG_MD5SUM:=		ecb81708157e1a1eeaba0e124f0ade08
 PKG_DESCR:=		client library for the XFree86-DGA extension
 PKG_SECTION:=		x11
+PKG_BUILDDEP+=		xf86dgaproto libXext libXaw
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBXXF86DGA,libxxf86dga,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+= 	--disable-malloc0returnsnull
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBXXF86DGA}/usr/lib
diff --git a/package/libao/Makefile b/package/libao/Makefile
index d728b47ee..116769b9a 100644
--- a/package/libao/Makefile
+++ b/package/libao/Makefile
@@ -16,16 +16,13 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBAO,libao,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-esd \
 			--disable-arts \
 			--disable-nas \
 			--disable-polyp
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBAO}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libao.so.* ${IDIR_LIBAO}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libao.so* ${IDIR_LIBAO}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libart/Makefile b/package/libart/Makefile
index 3f21e9300..b41a9377a 100644
--- a/package/libart/Makefile
+++ b/package/libart/Makefile
@@ -18,12 +18,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBART,libart,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBART}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libart_lgpl_2.so.* ${IDIR_LIBART}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libart_lgpl_2.so* ${IDIR_LIBART}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libaudiofile/Makefile b/package/libaudiofile/Makefile
index 4818887bd..4b4f74d35 100644
--- a/package/libaudiofile/Makefile
+++ b/package/libaudiofile/Makefile
@@ -16,14 +16,11 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBAUDIOFILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_linux_vers=2
 CONFIGURE_ARGS+=	--with-build-cc=${HOSTCC}
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBAUDIOFILE}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libaudiofile.so.* ${IDIR_LIBAUDIOFILE}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libaudiofile.so* ${IDIR_LIBAUDIOFILE}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libc/Makefile b/package/libc/Makefile
index 700f97a66..29b30d546 100644
--- a/package/libc/Makefile
+++ b/package/libc/Makefile
@@ -14,6 +14,10 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBC,libc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 # do nothing, use native c library
 do-install:
 	${INSTALL_DIR} $(IDIR_LIBC)/lib
diff --git a/package/libcli/Makefile b/package/libcli/Makefile
index 41d4eead2..46be223bc 100755
--- a/package/libcli/Makefile
+++ b/package/libcli/Makefile
@@ -16,11 +16,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBCLI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+CONFIG_STYLE:=		manual
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBCLI}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libcli.so.* ${IDIR_LIBCLI}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libcli.so* ${IDIR_LIBCLI}/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libdaemon/Makefile b/package/libdaemon/Makefile
index 1e5eaeae5..59df1fed9 100644
--- a/package/libdaemon/Makefile
+++ b/package/libdaemon/Makefile
@@ -16,12 +16,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBDAEMON,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 # uClibc setpgrp does not take arguments
 CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes
 CONFIGURE_ARGS+=	--disable-lynx
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBDAEMON}/usr/lib
diff --git a/package/libdb/Makefile b/package/libdb/Makefile
index 40cdb4763..9cb09cb85 100644
--- a/package/libdb/Makefile
+++ b/package/libdb/Makefile
@@ -14,59 +14,29 @@ PKG_SITES:=		http://www.openadk.org/distfiles/
 
 DISTFILES:=		db-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/db-${PKG_VERSION}
+WRKBUILD=		${WRKSRC}/build_unix
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBDB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-do-configure:
-	(cd ${WRKBUILD}/build_unix ; \
-		${TARGET_CONFIGURE_OPTS} \
-		CFLAGS="${TARGET_CFLAGS}" \
-		CPPFLAGS="-I${STAGING_DIR}/usr/include" \
-		LDFLAGS="-L${STAGING_DIR}/usr/lib" \
-		../dist/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 \
-		--enable-shared \
-		--enable-static \
-		--enable-smallbuild \
-		--disable-debug_rop \
-		--disable-debug_wop \
-		--disable-diagnostic \
-		--disable-java \
-		--disable-cxx \
-		--disable-posixmutexes \
-		--disable-uimutexes \
-		--disable-tcl \
-		--disable-rpc \
-		--disable-compat185 \
-		--disable-statistics \
-		--disable-replication \
-		--disable-cryptography \
-		--disable-queue \
-		--with-mutex=UNIX/fcntl \
-		);
-
-do-install:
-	${MAKE} -C ${WRKBUILD}/build_unix \
-		DESTDIR="${WRKINST}" install
+CONFIGURE_PROG:=	dist/configure
+CONFIGURE_ARGS+=	--enable-smallbuild \
+			--disable-debug_rop \
+			--disable-debug_wop \
+			--disable-diagnostic \
+			--disable-java \
+			--disable-cxx \
+			--disable-posixmutexes \
+			--disable-uimutexes \
+			--disable-tcl \
+			--disable-rpc \
+			--disable-compat185 \
+			--disable-statistics \
+			--disable-replication \
+			--disable-cryptography \
+			--disable-queue \
+			--with-mutex=UNIX/fcntl
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBDB}/usr/lib
diff --git a/package/libdnet/Makefile b/package/libdnet/Makefile
index a1e028bbb..ebe03f276 100644
--- a/package/libdnet/Makefile
+++ b/package/libdnet/Makefile
@@ -14,17 +14,13 @@ PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=$(PKG_NAME)/}
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBDNET,libdnet,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBDNET,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+=		ac_cv_dnet_bsd_bpf=no
 CONFIGURE_ARGS+=	--without-check
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_LIBDNET)/usr/lib
-	$(INSTALL_DIR) $(IDIR_LIBDNET)/usr/sbin
-	$(CP) $(WRKINST)/usr/lib/libdnet.so.* $(IDIR_LIBDNET)/usr/lib/
+	$(CP) $(WRKINST)/usr/lib/libdnet.so* $(IDIR_LIBDNET)/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libelf/Makefile b/package/libelf/Makefile
index cc308facb..a5847bc87 100644
--- a/package/libelf/Makefile
+++ b/package/libelf/Makefile
@@ -13,19 +13,16 @@ PKG_SITES:=		http://www.mr511.de/software/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBELF,libelf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBELF,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+=		mr_cv_target_elf=yes \
 			ac_cv_sizeof_long_long=8
 CONFIGURE_ARGS+=	--enable-elf64=yes \
 			--disable-sanity-checks
-BUILD_STYLE=		auto
-INSTALL_STYLE=		confprog auto
 FAKE_FLAGS+=		instroot="${WRKINST}"
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBELF}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libelf.so.* ${IDIR_LIBELF}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libelf.so* ${IDIR_LIBELF}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libevent/Makefile b/package/libevent/Makefile
index 8a35575c3..fb664f92f 100644
--- a/package/libevent/Makefile
+++ b/package/libevent/Makefile
@@ -14,15 +14,11 @@ PKG_SITES:=		http://www.monkey.org/~provos/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBEVENT,libevent,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+$(eval $(call PKG_template,LIBEVENT,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_LIBEVENT)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libevent-$(PKG_VERSION).so.* \
+	$(CP) $(WRKINST)/usr/lib/libevent-$(PKG_VERSION).so* \
 		$(IDIR_LIBEVENT)/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libffi/Makefile b/package/libffi/Makefile
index d17d844a8..de82811d8 100644
--- a/package/libffi/Makefile
+++ b/package/libffi/Makefile
@@ -14,14 +14,10 @@ PKG_SITES:=		ftp://sourceware.org/pub/libffi/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+$(eval $(call PKG_template,LIBFFI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBFFI}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libffi.so.* ${IDIR_LIBFFI}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libffi.so* ${IDIR_LIBFFI}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libfontenc/Makefile b/package/libfontenc/Makefile
index f815b6c72..3b2238bb1 100644
--- a/package/libfontenc/Makefile
+++ b/package/libfontenc/Makefile
@@ -6,20 +6,17 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		libfontenc
 PKG_VERSION:=		1.0.5
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		xproto zlib
 PKG_MD5SUM:=		0fa1988d08021225d18ced519a30d2b1
 PKG_DESCR:=		helps to deal with different encodings of fonts
 PKG_SECTION:=		x11
+PKG_DEPENDS:=		zlib
+PKG_BUILDDEP+=		xproto zlib
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBFONTENC,libfontenc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBFONTENC}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libfontenc.so* ${IDIR_LIBFONTENC}/usr/lib/
diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile
index e9794bd1d..20b5da9c8 100644
--- a/package/libgcrypt/Makefile
+++ b/package/libgcrypt/Makefile
@@ -18,11 +18,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBGCRYPT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-asm \
 			--with-gpg-error-prefix="${STAGING_DIR}/usr"
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBGCRYPT}/usr/lib
diff --git a/package/libgd/Makefile b/package/libgd/Makefile
index b6eac8885..3dfd06b33 100644
--- a/package/libgd/Makefile
+++ b/package/libgd/Makefile
@@ -18,18 +18,16 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBGD,libgd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	autotool gnu
+AUTOTOOL_STYLE:=	autotool
 CONFIGURE_ENV+=		LIBPNG12_CONFIG="${STAGING_DIR}/usr/bin/libpng12-config"
 CONFIGURE_ARGS+=	--without-x \
 			--without-freetype \
 			--with-jpeg=${STAGING_DIR}/usr \
 			--with-png=${STAGING_DIR}/usr \
 			--without-xpm 
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBGD}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libgd.so.* ${IDIR_LIBGD}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libgd.so* ${IDIR_LIBGD}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile
index 415196934..20fbc14cd 100644
--- a/package/libgpg-error/Makefile
+++ b/package/libgpg-error/Makefile
@@ -18,10 +18,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBGPG_ERROR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBGPG_ERROR}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libgpg-error.so* \
diff --git a/package/libgssglue/Makefile b/package/libgssglue/Makefile
index c239cc54f..dea01211d 100644
--- a/package/libgssglue/Makefile
+++ b/package/libgssglue/Makefile
@@ -13,11 +13,7 @@ PKG_SITES:=		http://www.citi.umich.edu/projects/nfsv4/linux/libgssglue/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBGSSGLUE,libgssglue,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
+$(eval $(call PKG_template,LIBGSSGLUE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_LIBGSSGLUE)/usr/lib
diff --git a/package/libiconv/Makefile b/package/libiconv/Makefile
index 9d9d0413a..1fbb35271 100644
--- a/package/libiconv/Makefile
+++ b/package/libiconv/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:=		character set conversion library
 PKG_SECTION:=		libs
 PKG_URL:=		http://www.gnu.org/software/libiconv
 PKG_SITES:=		${MASTER_SITE_GNU:=libiconv/}
+
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
 endif
@@ -20,9 +21,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBICONV,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
 TCFLAGS+=		-fPIC
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 FAKE_FLAGS+=		libdir="${WRKINST}/usr/lib" \
 			includedir="${WRKINST}/usr/include" \
 INSTALL_TARGET=		install-lib
diff --git a/package/libid3tag/Makefile b/package/libid3tag/Makefile
index 3ab98c3c2..0a0f1cf68 100644
--- a/package/libid3tag/Makefile
+++ b/package/libid3tag/Makefile
@@ -6,22 +6,19 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libid3tag
 PKG_VERSION:=		0.15.1b
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		zlib
 PKG_MD5SUM:=		e5808ad997ba32c498803822078748c3
 PKG_DESCR:=		an ID3 tag manipulation library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
+PKG_BUILDDEP+=		zlib
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=mad/}
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBID3TAG,libid3tag,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-debugging \
 			--disable-profiling
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
 
 pre-install:
 	${INSTALL_DIR} ${WRKINST}/usr/lib/pkgconfig
diff --git a/package/liblzo/Makefile b/package/liblzo/Makefile
index c10b4d689..f15759356 100644
--- a/package/liblzo/Makefile
+++ b/package/liblzo/Makefile
@@ -16,14 +16,11 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-static
-BUILD_STYLE:=		auto
 MAKE_FLAGS+=		CFLAGS_O="${TARGET_CFLAGS}"
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBLZO}/usr/lib/
-	${CP} ${WRKINST}/usr/lib/liblzo2.so.* ${IDIR_LIBLZO}/usr/lib
+	${CP} ${WRKINST}/usr/lib/liblzo2.so* ${IDIR_LIBLZO}/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libmad/Makefile b/package/libmad/Makefile
index 045bd6d8e..e881756ef 100644
--- a/package/libmad/Makefile
+++ b/package/libmad/Makefile
@@ -26,12 +26,9 @@ endif
 #FPM:=mips
 #endif
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--enable-fpm=${FPM} \
 			--disable-debugging \
 			--enable-speed
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 pre-install:
 	${INSTALL_DIR} ${WRKINST}/usr/lib/pkgconfig
diff --git a/package/libmms/Makefile b/package/libmms/Makefile
index f9cc90dfb..f32301a3e 100644
--- a/package/libmms/Makefile
+++ b/package/libmms/Makefile
@@ -16,10 +16,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBMMS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBMMS}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libmms.so* ${IDIR_LIBMMS}/usr/lib/
diff --git a/package/libnet/Makefile b/package/libnet/Makefile
index e1ad7ca7b..679da1c05 100644
--- a/package/libnet/Makefile
+++ b/package/libnet/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libnet
 PKG_VERSION:=		1.1.4
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libpcap
 PKG_MD5SUM:=		c5e06418a89cc4209f677a776a798fd9
 PKG_DESCR:=		a low-level packet creation library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libpcap
+PKG_BUILDDEP+=		libpcap
 PKG_URL:=		http://sourceforge.net/projects/libnet-dev/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libnet-dev/libnet-${PKG_VERSION}/}
 
@@ -23,14 +23,11 @@ endif
 
 $(eval $(call PKG_template,LIBNET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_libnet_have_pf_packet=yes \
 			ac_cv_libnet_endianess=${ENDIAN} \
 			LL_INT_TYPE=linux \
 			ac_cv_lbl_unaligned_fail=no
 CONFIGURE_ARGS+=	--with-pf_packet=yes
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBNET}/usr/lib
diff --git a/package/libnetfilter_queue/Makefile b/package/libnetfilter_queue/Makefile
index a5769a212..737b3d5cc 100644
--- a/package/libnetfilter_queue/Makefile
+++ b/package/libnetfilter_queue/Makefile
@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		libnetfilter_queue
 PKG_VERSION:=		0.0.17
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libnfnetlink
 PKG_MD5SUM:=		2cde35e678ead3a8f9eb896bf807a159
 PKG_DESCR:=		API to packets that have been queued by the kernel packet filter
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libnfnetlink
+PKG_BUILDDEP+=		libnfnetlink
 PKG_URL:=		http://www.netfilter.org/projects/libnetfilter_queue/
 PKG_SITES:=		http://www.netfilter.org/projects/libnetfilter_queue/files/
 
@@ -20,10 +20,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBNETFILTER_QUEUE,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	$(INSTALL_DIR) $(IDIR_LIBNETFILTER_QUEUE)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libnetfilter_queue*so* \
diff --git a/package/libnfnetlink/Makefile b/package/libnfnetlink/Makefile
index e73fe97ba..51111e768 100644
--- a/package/libnfnetlink/Makefile
+++ b/package/libnfnetlink/Makefile
@@ -18,10 +18,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBNFNETLINK,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	$(INSTALL_DIR) $(IDIR_LIBNFNETLINK)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libnfnetlink.so* $(IDIR_LIBNFNETLINK)/usr/lib/
diff --git a/package/libnfsidmap/Makefile b/package/libnfsidmap/Makefile
index 1a4bd35af..eca543039 100644
--- a/package/libnfsidmap/Makefile
+++ b/package/libnfsidmap/Makefile
@@ -16,10 +16,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBNFSIDMAP,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-
 post-install:
 	$(INSTALL_DIR) $(IDIR_LIBNFSIDMAP)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libnfsidmap.so* \
diff --git a/package/libnids/Makefile b/package/libnids/Makefile
index 3129465d3..704f9d183 100644
--- a/package/libnids/Makefile
+++ b/package/libnids/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libnids
 PKG_VERSION:=		1.23
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libnet libpcap
 PKG_MD5SUM:=		af35e8ef403a0ca95df2da94db856428
 PKG_DESCR:=		Network Intrusion Detection System library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libnet libpcap
+PKG_BUILDDEP+=		libnet libpcap
 PKG_URL:=		http://libnids.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libnids/}
 
@@ -18,12 +18,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBNIDS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	autoconf gnu
+AUTOTOOL_STYLE:=	autoconf
 CONFIGURE_ARGS+=	--with-libpcap=${STAGING_DIR}/usr
-CONFIGURE_ENV+=		ac_cv_lib_nsl_gethostbyname=no
 XAKE_FLAGS+=		install_prefix="${WRKINST}"
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBNIDS}/usr/lib
diff --git a/package/libnl/Makefile b/package/libnl/Makefile
index 4f7372e47..1cbe9f093 100644
--- a/package/libnl/Makefile
+++ b/package/libnl/Makefile
@@ -13,11 +13,7 @@ PKG_SITES:=		http://downloads.openwrt.org/sources/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBNL,libnl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
+$(eval $(call PKG_template,LIBNL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBNL}/usr/lib
diff --git a/package/libogg/Makefile b/package/libogg/Makefile
index 3242d1b91..baebf4e9a 100644
--- a/package/libogg/Makefile
+++ b/package/libogg/Makefile
@@ -16,12 +16,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBOGG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBOGG}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libogg.so.* ${IDIR_LIBOGG}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libogg.so* ${IDIR_LIBOGG}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libol/Makefile b/package/libol/Makefile
index ae0c7dca6..3b2067089 100644
--- a/package/libol/Makefile
+++ b/package/libol/Makefile
@@ -16,13 +16,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBOL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV+=		ac_cv_lib_nsl_gethostbyname=no
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBOL}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libol.so.* ${IDIR_LIBOL}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libol.so* ${IDIR_LIBOL}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libosip2/Makefile b/package/libosip2/Makefile
index 1b5ab5b03..fa6b20068 100644
--- a/package/libosip2/Makefile
+++ b/package/libosip2/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		libosip2
 PKG_VERSION:=		3.3.0
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		81493bb4d4ae6d55b71a0d4369339125
-PKG_DESCR:=		GNU oSIP library, a SIP (Session Initiation Protocol) implementation
+PKG_DESCR:=		a SIP (Session Initiation Protocol) implementation
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libpthread
 PKG_URL:=		http://www.gnu.org/software/osip
@@ -17,17 +17,14 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBOSIP2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV+=		ac_cv_lib_nsl_nis_add=no
 CONFIGURE_ARGS+=	--disable-trace \
 			--enable-pthread \
 			--enable-semaphore \
 			--enable-ntimer
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBOSIP2}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libosip{,parser}2.so.* ${IDIR_LIBOSIP2}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libosip{,parser}2.so* \
+		${IDIR_LIBOSIP2}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libowfat/Makefile b/package/libowfat/Makefile
index 1af2234df..02cd4f89a 100644
--- a/package/libowfat/Makefile
+++ b/package/libowfat/Makefile
@@ -14,8 +14,8 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
+CONFIG_STYLE:=		manual
+
 TCFLAGS+=		${TCPPFLAGS}
 MAKE_FILE=		GNUmakefile
 MAKE_FLAGS+=		DIET= CC='${TARGET_CC}' CROSS=${TARGET_CROSS}
diff --git a/package/libp11/Makefile b/package/libp11/Makefile
index 92ab3a367..34ea80d0d 100644
--- a/package/libp11/Makefile
+++ b/package/libp11/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libp11
 PKG_VERSION:=		0.2.4
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		openssl libtool
 PKG_MD5SUM:=		9e2c5cbececde245e2d2f535bd49ce35
 PKG_DESCR:=		library implementing a small layer on top of PKCS11 API
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libopenssl libltdl
+PKG_BUILDDEP+=		openssl libtool
 PKG_URL:=		http://www.opensc-project.org/libp11
 PKG_SITES:=		http://www.opensc-project.org/files/libp11/
 
@@ -18,12 +18,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBP11,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBP11}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libp11.so.* ${IDIR_LIBP11}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libp11.so* ${IDIR_LIBP11}/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index 2eb2ac249..b9ef5c807 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -14,21 +14,15 @@ PKG_SITES:=		http://www.tcpdump.org/release/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBPCAP,libpcap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBPCAP,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+=		ac_cv_linux_vers=26
 CONFIGURE_ARGS+=	--disable-yydebug \
 			--with-build-cc=$(HOSTCC) \
 			--with-pcap=linux
-BUILD_STYLE=		auto
 TCFLAGS+=		${TCPPFLAGS}
-INSTALL_STYLE=		auto
 INSTALL_TARGET=		install install-shared
 
-pre-install:
-	${INSTALL_DIR} ${WRKINST}/usr/bin
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBPCAP}/usr/lib/
 	${CP} ${WRKINST}/usr/lib/libpcap.so* ${IDIR_LIBPCAP}/usr/lib/
diff --git a/package/libpciaccess/Makefile b/package/libpciaccess/Makefile
index fdc2da826..9fe0cd9ef 100644
--- a/package/libpciaccess/Makefile
+++ b/package/libpciaccess/Makefile
@@ -13,14 +13,11 @@ PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,LIBPCIACCESS,libpciaccess,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
+$(eval $(call PKG_template,LIBPCIACCESS,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBPCIACCESS}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libpciaccess.so* ${IDIR_LIBPCIACCESS}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libpciaccess.so* \
+		${IDIR_LIBPCIACCESS}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libpng/Makefile b/package/libpng/Makefile
index d8f206b59..87da9297b 100644
--- a/package/libpng/Makefile
+++ b/package/libpng/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libpng
 PKG_VERSION:=		1.2.36
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		zlib
 PKG_MD5SUM:=		4779cd011409ea9b591e11638781f0bf
 PKG_DESCR:=		A library for reading/writing PNG images
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
+PKG_BUILDDEP+=		zlib
 PKG_URL:=		http://www.libpng.org/pub/png/libpng.html
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libpng/}
 
@@ -22,12 +22,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBPNG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto confprog
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBPNG}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libpng{,12}.so.* ${IDIR_LIBPNG}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libpng{,12}.so* ${IDIR_LIBPNG}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libpri/Makefile b/package/libpri/Makefile
index fa0be1090..4a1e80329 100644
--- a/package/libpri/Makefile
+++ b/package/libpri/Makefile
@@ -16,13 +16,13 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBPRI,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=		manual
+
 MAKE_FLAGS+=		CC='${TARGET_CC}' LDCONFIG=''
 FAKE_FLAGS+=		INSTALL_BASE=/usr
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBPRI}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libpri.so.* ${IDIR_LIBPRI}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libpri.so* ${IDIR_LIBPRI}/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index b7ff49f7e..d1ea2621a 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -24,7 +24,11 @@ endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBPTHREAD,libpthread,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBPTHREAD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
 
 do-install:
 	${INSTALL_DIR} ${IDIR_LIBPTHREAD}/lib
diff --git a/package/librpcsecgss/Makefile b/package/librpcsecgss/Makefile
index 50b856deb..69bd9f6db 100644
--- a/package/librpcsecgss/Makefile
+++ b/package/librpcsecgss/Makefile
@@ -17,10 +17,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBRPCSECGSS,librpcsecgss,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	$(INSTALL_DIR) $(IDIR_LIBRPCSECGSS)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/librpcsecgss.so* $(IDIR_LIBRPCSECGSS)/usr/lib/
diff --git a/package/libshout/Makefile b/package/libshout/Makefile
index fef009845..479c8c57c 100644
--- a/package/libshout/Makefile
+++ b/package/libshout/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libshout
 PKG_VERSION:=		2.2.2
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libvorbis
 PKG_MD5SUM:=		4f75fc9901c724b712c371c9a1e782d3
 PKG_DESCR:=		Library which can be used to write a source client for streaming
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libvorbis libogg
+PKG_BUILDDEP+=		libvorbis
 PKG_URL:=		http://directory.fsf.org/project/libshout
 PKG_SITES:=		http://downloads.us.xiph.org/releases/libshout/
 
@@ -18,14 +18,11 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBSHOUT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-speex=no \
 			--with-theora=no
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBSHOUT}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libshout.so.* ${IDIR_LIBSHOUT}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libshout.so* ${IDIR_LIBSHOUT}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libsigc++/Makefile b/package/libsigc++/Makefile
index a4a5fc825..f19f49e5f 100644
--- a/package/libsigc++/Makefile
+++ b/package/libsigc++/Makefile
@@ -11,31 +11,13 @@ PKG_DESCR:=		Callback framework for C++
 PKG_SECTION:=		libs
 PKG_URL:=		http://libsigc.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_GNOME:=libsigc++/2.2/}
-#PKG_CXX:=		LIBSIGCXX
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBSIGCXX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-#ifeq ($(ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX),y)
-#CONFIGURE_ENV+=		CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ \
-#			-I${STAGING_DIR}/usr/include/uClibc++" \
-#			LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc"
-#endif
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
-#ifeq (${ADK_COMPILE_LIBSIGCXX_WITH_UCLIBCXX},y)
-# add workaround because libtool tries to link libstdc++
-#post-configure:
-#	${SED} 's#postdeps="-lstdc.*#postdeps=""#' \
-#		${WRKBUILD}/libtool
-#endif
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBSIGCXX}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libsigc-2.0.so.* ${IDIR_LIBSIGCXX}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libsigc-2.0.so* ${IDIR_LIBSIGCXX}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile
index c2aa1ba09..05de53da2 100644
--- a/package/libstdcxx/Makefile
+++ b/package/libstdcxx/Makefile
@@ -13,6 +13,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBSTDCXX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 do-install:
 	${INSTALL_DIR} ${IDIR_LIBSTDCXX}/lib
 ifeq ($(ADK_NATIVE),y)
diff --git a/package/libtasn1/Makefile b/package/libtasn1/Makefile
index e6cc3afa5..2593708f7 100644
--- a/package/libtasn1/Makefile
+++ b/package/libtasn1/Makefile
@@ -16,10 +16,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBTASN1,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBTASN1}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libtasn1.so* ${IDIR_LIBTASN1}/usr/lib
diff --git a/package/libthread_db/Makefile b/package/libthread_db/Makefile
index 42e9311b5..ef3ed22cd 100644
--- a/package/libthread_db/Makefile
+++ b/package/libthread_db/Makefile
@@ -18,6 +18,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBTHREAD_DB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 do-install:
 	${INSTALL_DIR} ${IDIR_LIBTHREAD_DB}/lib
 	${CP} ${STAGING_DIR}/lib/libthread_db*.so* ${IDIR_LIBTHREAD_DB}/lib
diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile
index 13bc06ac5..9c3efa0f8 100644
--- a/package/libtiff/Makefile
+++ b/package/libtiff/Makefile
@@ -23,10 +23,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-cxx
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBTIFF}/usr/lib
diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile
index 987051b3e..1702106c4 100644
--- a/package/libtirpc/Makefile
+++ b/package/libtirpc/Makefile
@@ -20,17 +20,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBTIRPC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-
 ifneq (${ADK_COMPILE_NFS_UTILS_WITH_KERBEROS},y)
 CONFIGURE_ARGS+=	--disable-gss
 else
 CONFIGURE_ARGS+=	--enable-gss
 endif
 
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBTIRPC}/usr/lib ${IDIR_LIBTIRPC}/etc
 	${CP} ${WRKINST}/usr/lib/libtirpc*.so* ${IDIR_LIBTIRPC}/usr/lib/
diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index 512593872..237d358d6 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -17,10 +17,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBTOOL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBLTDL,libltdl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBLTDL}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libltdl.so.* ${IDIR_LIBLTDL}/usr/lib/
diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile
index 5f33fa97b..ea0de0c28 100644
--- a/package/libtorrent/Makefile
+++ b/package/libtorrent/Makefile
@@ -13,32 +13,15 @@ PKG_SECTION:=		libs
 PKG_DEPENDS:=		libopenssl libsigc++
 PKG_URL:=		http://libtorrent.rakshasa.no
 PKG_SITES:=		http://libtorrent.rakshasa.no/downloads/
-#PKG_CXX:=		LIBTORRENT
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-#ifeq ($(ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX),y)
-#CONFIGURE_ENV+=		CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ -fno-strict-aliasing -fno-inline \
-#			-I${STAGING_DIR}/usr/include/uClibc++" \
-#			LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc"
-#endif
-
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-aligned
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
-#ifeq (${ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX},y)
-# add workaround because libtool tries to link libstdc++
-#post-configure:
-#	${SED} 's#postdeps="-lstdc.*#postdeps=""#' \
-#		${WRKBUILD}/libtool
-#endif
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBTORRENT}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libtorrent.so.* ${IDIR_LIBTORRENT}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libtorrent.so* ${IDIR_LIBTORRENT}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile
index 248c73709..f36e728c6 100644
--- a/package/libupnp/Makefile
+++ b/package/libupnp/Makefile
@@ -19,14 +19,14 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBUPNP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+AUTOTOOL_STYLE:=	autotool
+
 TCFLAGS+=		-fPIC
-CONFIGURE_STYLE:=	autotool gnu
 CONFIGURE_ARGS+=	--disable-samples
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto confprog
 
 post-build:
-	sed -i -e 's#^libdir=.*#libdir=#' ${WRKBUILD}/threadutil/libthreadutil.la
+	sed -i -e 's#^libdir=.*#libdir=#' \
+		${WRKBUILD}/threadutil/libthreadutil.la
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBUPNP}/usr/lib
diff --git a/package/libusb-compat/Makefile b/package/libusb-compat/Makefile
index 63048e40c..d10c06083 100644
--- a/package/libusb-compat/Makefile
+++ b/package/libusb-compat/Makefile
@@ -6,10 +6,10 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libusb-compat
 PKG_VERSION:=		0.1.1
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libusb
 PKG_MD5SUM:=		32c775b97da7a11c6be7c487a0c9fc00
 PKG_DESCR:=		a Library for accessing Linux USB devices
 PKG_SECTION:=		libs
+PKG_BUILDDEP+=		libusb
 PKG_URL:=		http://libusb.wiki.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libusb/}
 
@@ -23,10 +23,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBUSB_COMPAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBUSB_COMPAT}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libusb*.so* ${IDIR_LIBUSB_COMPAT}/usr/lib/
diff --git a/package/libusb/Makefile b/package/libusb/Makefile
index b5fe7ccee..a5dec2885 100644
--- a/package/libusb/Makefile
+++ b/package/libusb/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:=		a library for accessing Linux USB devices
 PKG_SECTION:=		libs
 PKG_URL:=		http://libusb.wiki.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=libusb/}
+
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libonly
 endif
@@ -21,10 +22,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBUSB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBUSB}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libusb*.so* ${IDIR_LIBUSB}/usr/lib/
diff --git a/package/libvirt/Makefile b/package/libvirt/Makefile
index 7535732e9..f76bffa39 100644
--- a/package/libvirt/Makefile
+++ b/package/libvirt/Makefile
@@ -22,7 +22,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBVIRT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TCFLAGS+=		-std=c99
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--without-xen \
 			--without-uml \
 			--without-esx \
@@ -31,8 +30,6 @@ CONFIGURE_ARGS+=	--without-xen \
 			--without-vbox \
 			--disable-silent-rules \
 			--without-sasl
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBVIRT}/usr/lib ${IDIR_LIBVIRT}/usr/bin
diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile
index 3837f47f7..76e156ae4 100644
--- a/package/libvorbis/Makefile
+++ b/package/libvorbis/Makefile
@@ -6,10 +6,10 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libvorbis
 PKG_VERSION:=		1.2.0
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libogg
 PKG_MD5SUM:=		478646358c49f34aedcce58948793619
 PKG_DESCR:=		The Vorbis General Audio Compression Codec library
 PKG_SECTION:=		libs
+PKG_BUILDDEP+=		libogg
 PKG_URL:=		http://www.xiph.org/vorbis/
 PKG_SITES:=		http://downloads.xiph.org/releases/vorbis/
 
@@ -18,13 +18,10 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBVORBIS,libvorbis,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBVORBISENC,libvorbisenc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+=		LIBS="-lm -logg"
 CONFIGURE_ARGS+=	--with-ogg="${STAGING_DIR}/usr" \
 			--with-ogg-includes="${STAGING_DIR}/usr/include" \
 			--with-ogg-libraries="${STAGING_DIR}/usr/lib"
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBVORBIS}/usr/lib
diff --git a/package/libvorbisidec/Makefile b/package/libvorbisidec/Makefile
index d68e1a46b..0e6cc53d8 100644
--- a/package/libvorbisidec/Makefile
+++ b/package/libvorbisidec/Makefile
@@ -17,17 +17,12 @@ WRKDIST=		${WRKDIR}/$(PKG_NAME)-$(PKG_VERSION)+$(PKG_VARIANT)
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBVORBISIDEC,libvorbisidec,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBVORBISIDEC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-
-post-extract:
-	cd ${WRKBUILD}; ./autogen.sh
+AUTOTOOL_STYLE:=	autogen
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBVORBISIDEC}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libvorbisidec.so.* ${IDIR_LIBVORBISIDEC}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libvorbisidec.so* ${IDIR_LIBVORBISIDEC}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libxkbfile/Makefile b/package/libxkbfile/Makefile
index d6da115a4..bad308103 100644
--- a/package/libxkbfile/Makefile
+++ b/package/libxkbfile/Makefile
@@ -16,10 +16,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBXKBFILE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBXKBFILE}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libxkbfile.so* ${IDIR_LIBXKBFILE}/usr/lib/
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index d2fa1fc54..c6a911370 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libxml2
 PKG_VERSION:=		2.7.3
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		zlib
 PKG_MD5SUM:=		8f4fda3969237c2a33bdb1583b5d06b2
 PKG_DESCR:=		XML C parser and toolkit
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		zlib
+PKG_BUILDDEP+=		zlib
 PKG_URL:=		http://www.xmlsoft.org/
 PKG_SITES:=		http://xmlsoft.org/sources/ \
 			ftp://fr.rpmfind.net/pub/libxml/
@@ -19,7 +19,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBXML2,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--without-c14n \
 			--without-catalog \
 			--without-debug \
@@ -48,11 +47,8 @@ CONFIGURE_ARGS+=	--without-c14n \
 			--with-xptr \
 			--with-zlib
 
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBXML2}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libxml2.so.* ${IDIR_LIBXML2}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libxml2.so* ${IDIR_LIBXML2}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile
index 6e648c26b..3f18857f4 100644
--- a/package/libxslt/Makefile
+++ b/package/libxslt/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		libxslt
 PKG_VERSION:=		1.1.24
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libxml2
 PKG_MD5SUM:=		e83ec5d27fc4c10c6f612879bea9a153
 PKG_DESCR:=		XSLT Library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libxml2
+PKG_BUILDDEP+=		libxml2
 PKG_URL:=		http://xmlsoft.org/XSLT
 PKG_SITES:=		http://xmlsoft.org/sources/ \
 			ftp://fr.rpmfind.net/pub/libxml/
@@ -19,7 +19,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBXSLT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-libxml-prefix="${STAGING_DIR}/usr" \
 			--with-libxml-include-prefix="${STAGING_DIR}/usr/include/libxml2" \
 			--with-libxml-libs-prefix="${STAGING_DIR}/usr/lib" \
@@ -28,11 +27,9 @@ CONFIGURE_ARGS+=	--with-libxml-prefix="${STAGING_DIR}/usr" \
 			--without-debug \
 			--without-mem-debug \
 			--without-debugger
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBXSLT}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libxslt.so.* ${IDIR_LIBXSLT}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libxslt.so* ${IDIR_LIBXSLT}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile
index 8a3e584c6..0c6954ba2 100644
--- a/package/lighttpd/Makefile
+++ b/package/lighttpd/Makefile
@@ -67,7 +67,6 @@ $(eval $(call PKG_mod_template,LIGHTTPD_MOD_USERTRACK,usertrack))
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_WEBDAV,webdav))
 
 TCPPFLAGS+=		-I$(STAGING_DIR)/usr/include/libxml2
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		PCRE_LIB="-lpcre"
 CONFIGURE_ARGS+=	\
 			--libdir=/usr/lib/lighttpd \
@@ -83,8 +82,6 @@ CONFIGURE_ARGS+=	\
 			--with-pcre \
 			--without-valgrind \
 			--with-webdav-props
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 ifeq (${ADK_COMPILE_LIGHTTPD_WITH_OPENSSL},y)
 CONFIGURE_ARGS+=	--with-openssl='${STAGING_DIR}/usr'
 else
diff --git a/package/links/Makefile b/package/links/Makefile
index 0c69aa24d..1c2c02baa 100644
--- a/package/links/Makefile
+++ b/package/links/Makefile
@@ -18,7 +18,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LINKS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-graphics \
 			--with-ssl \
 			--without-svgalib \
@@ -26,8 +25,6 @@ CONFIGURE_ARGS+=	--enable-graphics \
 			--without-directfb \
 			--without-pmshell \
 			--without-atheos
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LINKS}/usr/bin
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index 3e6089d9e..227459d18 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -26,10 +26,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBATM,libatm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,BR2684CTL,br2684ctl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBATM}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libatm.so* ${IDIR_LIBATM}/usr/lib
diff --git a/package/linux-atm/patches/patch-src_qgen_Makefile_in b/package/linux-atm/patches/patch-src_qgen_Makefile_in
index 211ff90ff..71ecf3f15 100644
--- a/package/linux-atm/patches/patch-src_qgen_Makefile_in
+++ b/package/linux-atm/patches/patch-src_qgen_Makefile_in
@@ -1,5 +1,23 @@
 --- linux-atm-2.5.1.orig/src/qgen/Makefile.in	2009-11-30 17:21:18.000000000 +0100
-+++ linux-atm-2.5.1/src/qgen/Makefile.in	2009-12-17 16:17:11.216421967 +0100
++++ linux-atm-2.5.1/src/qgen/Makefile.in	2010-02-05 22:35:31.371836598 +0100
+@@ -57,14 +57,14 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ am__mv = mv -f
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	--mode=compile $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++	--mode=link $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
+ LEXCOMPILE = $(LEX) $(LFLAGS) $(AM_LFLAGS)
+ LTLEXCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 @@ -91,7 +91,7 @@ CC_FOR_BUILD = @CC_FOR_BUILD@
  CFLAGS = @CFLAGS_FOR_BUILD@
  CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
diff --git a/package/logrotate/Makefile b/package/logrotate/Makefile
index 36b667534..a49e1fe34 100644
--- a/package/logrotate/Makefile
+++ b/package/logrotate/Makefile
@@ -4,29 +4,27 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		logrotate
-PKG_VERSION:=		3.7.1
+PKG_VERSION:=		3.7.8
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		popt
-PKG_MD5SUM:=		552639142e163745f6bcd4f1f3816d8a
+PKG_MD5SUM:=		b3589bea6d8d5afc8a84134fddaae973
 PKG_DESCR:=		logfile rotation utility
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		libpopt
-PKG_SITES:=		http://ftp.debian.org/debian/pool/main/l/logrotate/
-
-DISTFILES:=		${PKG_NAME}_${PKG_VERSION}.orig.tar.gz
+PKG_BUILDDEP+=		popt
+PKG_SITES:=		https://fedorahosted.org/releases/l/o/logrotate/
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LOGROTATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		-D_GNU_SOURCE -DLinux -DVERSION=\"$(PKG_VERSION)\"
-ALL_TARGET=		logrotate
-BUILD_STYLE=		auto
+CONFIG_STYLE:=		manual
+
+TCFLAGS+=              -D_GNU_SOURCE -DVERSION=\"$(PKG_VERSION)\"
 
-do-install:
+post-install:
 	${INSTALL_DIR} ${IDIR_LOGROTATE}/usr/sbin
-	${CP} ${WRKBUILD}/logrotate ${IDIR_LOGROTATE}/usr/sbin
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/logrotate ${IDIR_LOGROTATE}/usr/sbin
 	${INSTALL_DIR} ${IDIR_LOGROTATE}/etc/logrotate.d
-	${CP} ./files/logrotate.conf ${IDIR_LOGROTATE}/etc
+	${INSTALL_DATA} ./files/logrotate.conf ${IDIR_LOGROTATE}/etc
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/logrotate/patches/patch-Makefile b/package/logrotate/patches/patch-Makefile
index 0ac175346..2b348b75f 100644
--- a/package/logrotate/patches/patch-Makefile
+++ b/package/logrotate/patches/patch-Makefile
@@ -1,21 +1,36 @@
-$Id$
---- logrotate-3.7.1.orig/Makefile	Thu Oct  9 22:05:07 2003
-+++ logrotate-3.7.1/Makefile	Sat Jan 20 19:25:23 2007
-@@ -3,7 +3,7 @@ CVSROOT = $(shell cat CVS/Root)
- CVSTAG = r$(subst .,-,$(VERSION))
- OS_NAME = $(shell uname -s)
+--- logrotate-3.7.8.orig/Makefile	2008-05-19 12:25:54.000000000 +0200
++++ logrotate-3.7.8/Makefile	2010-02-06 00:00:58.853084930 +0100
+@@ -1,7 +1,7 @@
+ VERSION = $(shell awk '/Version:/ { print $$2 }' logrotate.spec)
+-OS_NAME = $(shell uname -s)
++OS_NAME = Linux
  LFS = $(shell echo `getconf LFS_CFLAGS 2>/dev/null`)
 -CFLAGS = -Wall -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS)
 +CFLAGS ?= -Wall -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS)
  PROG = logrotate
  MAN = logrotate.8
  LOADLIBES = -lpopt
-@@ -69,7 +69,7 @@ SOURCES = $(subst .o,.c,$(OBJS) $(LIBOBJ
+@@ -96,16 +96,16 @@ test: $(TARGET)
+ 	(cd test; ./test)
  
- ifeq ($(RPM_OPT_FLAGS),)
- CFLAGS += -g
--LDFLAGS = -g
-+LDFLAGS ?= -g
- endif
+ install:
+-	[ -d $(PREFIX)/$(BINDIR) ] || mkdir -p $(PREFIX)/$(BINDIR)
+-	[ -d $(PREFIX)/$(MANDIR) ] || mkdir -p $(PREFIX)/$(MANDIR)
+-	[ -d $(PREFIX)/$(MANDIR)/man8 ] || mkdir -p $(PREFIX)/$(MANDIR)/man8
++	[ -d $(DESTDIR)/$(BINDIR) ] || mkdir -p $(DESTDIR)/$(BINDIR)
++	[ -d $(DESTDIR)/$(MANDIR) ] || mkdir -p $(DESTDIR)/$(MANDIR)
++	[ -d $(DESTDIR)/$(MANDIR)/man8 ] || mkdir -p $(DESTDIR)/$(MANDIR)/man8
  
- ifeq (.depend,$(wildcard .depend))
+ 	if [ "$(OS_NAME)" = HP-UX ]; then \
+-	$(INSTALL) $(PROG) $(PREFIX)/$(BINDIR) 0755 bin bin; \
+-	$(INSTALL) $(MAN) $(PREFIX)/$(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"` 0644 bin bin; \
++	$(INSTALL) $(PROG) $(DESTDIR)/$(BINDIR) 0755 bin bin; \
++	$(INSTALL) $(MAN) $(DESTDIR)/$(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"` 0644 bin bin; \
+ 	else \
+-	$(INSTALL) -m 755 $(PROG) $(PREFIX)/$(BINDIR); \
+-	$(INSTALL) -m 644 $(MAN) $(PREFIX)/$(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"`/$(MAN); \
++	$(INSTALL) -m 755 $(PROG) $(DESTDIR)/$(BINDIR); \
++	$(INSTALL) -m 644 $(MAN) $(DESTDIR)/$(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"`/$(MAN); \
+ 	fi
+ 
+ co:
diff --git a/package/logrotate/patches/patch-config_c b/package/logrotate/patches/patch-config_c
deleted file mode 100644
index deea32c0f..000000000
--- a/package/logrotate/patches/patch-config_c
+++ /dev/null
@@ -1,59 +0,0 @@
-$Id$
---- logrotate-3.7.1.orig/config.c	Thu Aug  7 13:13:14 2003
-+++ logrotate-3.7.1/config.c	Sat Jan 20 18:54:35 2007
-@@ -142,12 +142,17 @@ static int checkFile(const char * fname)
- 	(!fname[1] || (fname[1] == '.' && !fname[2])))
- 	return 0;
- 
-+    /* Don't include 'hidden' files either; this breaks Gentoo 
-+       portage config file management http://bugs.gentoo.org/87683 */
-+    if (fname[0] == '.')
-+	return 0;
-+
-     /* Check if fname is ending in a taboo-extension; if so, return
-        false */
-     for (i = 0; i < tabooCount; i++) {
- 	if (!strcmp(fname + strlen(fname) - strlen(tabooExts[i]),
- 	    tabooExts[i])) {
--	    message(MESS_ERROR, "Ignoring %s, because of %s "
-+	    message(MESS_DEBUG, "Ignoring %s, because of %s "
- 		    "ending\n", fname, tabooExts[i]);
- 
- 	    return 0;
-@@ -511,6 +516,14 @@ static int readConfigFile(const char * c
- 		newlog->flags &= ~LOG_FLAG_IFEMPTY;
- 
- 		*endtag = oldchar, start = endtag;
-+	    } else if (!strcmp(start, "dateext")) {
-+		newlog->flags |= LOG_FLAG_DATEEXT;
-+
-+		*endtag = oldchar, start = endtag;
-+	    } else if (!strcmp(start, "nodateext")) {
-+		newlog->flags &= ~LOG_FLAG_DATEEXT;
-+
-+		*endtag = oldchar, start = endtag;
- 	    } else if (!strcmp(start, "noolddir")) {
- 		newlog->oldDir = NULL;
- 
-@@ -667,6 +680,21 @@ static int readConfigFile(const char * c
- 		      message(MESS_ERROR, "%s:%d bad start count '%s'\n",
- 			      configFile, lineNum, start);
- 		      return 1;
-+		    }
-+		    *endtag = oldchar, start = endtag;
-+		}
-+	    } else if (!strcmp(start, "maxage")) {
-+		*endtag = oldchar, start = endtag;
-+
-+		if (!isolateValue(configFile, lineNum, "maxage count", &start,
-+				  &endtag)) {
-+		    oldchar = *endtag, *endtag = '\0';
-+
-+		    newlog->rotateAge = strtoul(start, &chptr, 0);
-+		    if (*chptr || newlog->rotateAge < 0) {
-+			message(MESS_ERROR, "%s:%d bad maximum age '%s'\n",
-+				configFile, lineNum, start);
-+			return 1;
- 		    }
- 		    *endtag = oldchar, start = endtag;
- 		}
diff --git a/package/logrotate/patches/patch-logrotate_8 b/package/logrotate/patches/patch-logrotate_8
deleted file mode 100644
index 0673a449c..000000000
--- a/package/logrotate/patches/patch-logrotate_8
+++ /dev/null
@@ -1,28 +0,0 @@
-$Id$
---- logrotate-3.7.1.orig/logrotate.8	Thu Aug  7 13:13:14 2003
-+++ logrotate-3.7.1/logrotate.8	Sat Jan 20 18:54:35 2007
-@@ -200,6 +200,11 @@ file for the omitted attributes. This op
- Log files are rotated every day.
- 
- .TP
-+\fBdateext\fR
-+Archive old versions of log files adding a daily extension like YYYYMMDD
-+instead of simply adding a number.
-+
-+.TP
- \fBdelaycompress\fR
- Postpone compression of the previous log file to the next rotation cycle.
- This has only effect when used in combination with \fBcompress\fR.
-@@ -244,6 +249,12 @@ instead of the about-to-expire file.
- \fBmaillast\fR
- When using the \fBmail\fR command, mail the about-to-expire file,
- instead of the just-rotated file (this is the default).
-+
-+.TP
-+\fBmaxage\fR \fIcount\fR
-+Remove rotated logs older than <count> days. The age is only checked
-+if the logfile is to be rotated. The files are mailed to the
-+configured address if \fBmaillast\fR and \fBmail\fR are configured.
- 
- .TP
- \fBmissingok\fR
diff --git a/package/logrotate/patches/patch-logrotate_c b/package/logrotate/patches/patch-logrotate_c
deleted file mode 100644
index 0222b1e5c..000000000
--- a/package/logrotate/patches/patch-logrotate_c
+++ /dev/null
@@ -1,429 +0,0 @@
-$Id$
---- logrotate-3.7.1.orig/logrotate.c	Tue Oct 19 23:41:24 2004
-+++ logrotate-3.7.1/logrotate.c	Sat Jan 20 18:56:30 2007
-@@ -11,6 +11,7 @@
- #include <sys/wait.h>
- #include <time.h>
- #include <unistd.h>
-+#include <glob.h>
- 
- #ifdef WITH_SELINUX
- #include <selinux/selinux.h>
-@@ -22,6 +23,10 @@ int selinux_enabled=0;
- #include "log.h"
- #include "logrotate.h"
- 
-+#if !defined(GLOB_ABORTED) && defined(GLOB_ABEND)
-+#define GLOB_ABORTED GLOB_ABEND
-+#endif
-+
- typedef struct {
-     char * fn;
-     struct tm lastRotated;	/* only tm.mon, tm_mday, tm_year are good! */
-@@ -42,6 +47,14 @@ int debug = 0;
- char * mailCommand = DEFAULT_MAIL_COMMAND;
- time_t nowSecs = 0;
- 
-+static int globerr(const char * pathname, int theerr) {
-+    message(MESS_ERROR, "error accessing %s: %s\n", pathname,
-+	strerror(theerr));
-+
-+    /* We want the glob operation to continue, so return 0 */
-+    return 1;
-+}
-+
- static logState * findState(const char * fn, struct stateSet * sip) {
-     int i;
-     logState * states = sip->states;
-@@ -49,9 +62,11 @@ static logState * findState(const char *
-     struct tm now = *localtime(&nowSecs);
-     time_t lr_time;
- 
-+    /* find the filename fn in the statesPtr list */
-     for (i = 0; i < numStates; i++) 
- 	if (!strcmp(fn, states[i].fn)) break;
- 
-+    /* not in statesPtr list, so add new entry */
-     if (i == numStates) {
- 	i = numStates++;
- 	states = realloc(states, sizeof(*states) * numStates);
-@@ -75,10 +90,7 @@ static logState * findState(const char *
- }
- 
- static int runScript(char * logfn, char * script) {
--    int fd;
--    char *filespec;
-     int rc;
--    char buf[256];
- 
-     if (debug) {
- 	message(MESS_DEBUG, "running script with arg %s: \"%s\"\n", 
-@@ -86,39 +98,24 @@ static int runScript(char * logfn, char 
- 	return 0;
-     }
- 
--    filespec = buf;
--    snprintf(buf, sizeof(buf), "%s/logrotate.XXXXXX", getenv("TMPDIR") ?: "/tmp");
--    fd = -1;
--    if (!filespec || (fd = mkstemp(filespec)) < 0 || fchmod(fd, 0700)) {
--	message(MESS_DEBUG, "error creating %s: %s\n", filespec,
--		strerror(errno));
--	if (fd >= 0) {
--	    close(fd);
--	    unlink(filespec);
--	}
--	return -1;
--    }
--
--    if (write(fd, "#!/bin/sh\n\n", 11) != 11 ||
--	write(fd, script, strlen(script)) != strlen(script)) {
--	message(MESS_DEBUG, "error writing %s\n", filespec);
--	close(fd);
--	unlink(filespec);
--	return -1;
--    }
--
--    close(fd);
--
-     if (!fork()) {
--	execlp(filespec, filespec, logfn, NULL);
-+	execl("/bin/sh", "sh", "-c", script, NULL);
- 	exit(1);
-     }
- 
-     wait(&rc);
-+    return rc;
-+}
- 
--    unlink(filespec);
-+static int removeLogFile(char * name) {
-+    message(MESS_DEBUG, "removing old log %s\n", name);
- 
--    return rc;
-+    if (!debug && unlink(name)) {
-+	message(MESS_ERROR, "Failed to remove old log %s: %s\n",
-+		name, strerror(errno));
-+	return 1;
-+    }
-+    return 0;
- }
- 
- static int compressLogFile(char * name, logInfo * log, struct stat *sb) {
-@@ -265,6 +262,25 @@ static int mailLog(char * logFile, char 
-     return rc;
- }
- 
-+static int mailLogWrapper (char * mailFilename, char * mailCommand, int logNum, logInfo * log) {
-+    /* if the log is compressed (and we're not mailing a
-+     * file whose compression has been delayed), we need
-+     * to uncompress it */
-+    if ((log->flags & LOG_FLAG_COMPRESS) &&
-+	!((log->flags & LOG_FLAG_DELAYCOMPRESS) &&
-+	    (log->flags & LOG_FLAG_MAILFIRST))) {
-+	if (mailLog(mailFilename, mailCommand,
-+		    log->uncompress_prog, log->logAddress,
-+		    log->files[logNum]))
-+	    return 1;
-+    } else {
-+	if (mailLog(mailFilename, mailCommand, NULL,
-+		    log->logAddress, mailFilename))
-+	    return 1;
-+    }
-+    return 0;
-+}
-+
- static int copyTruncate(char * currLog, char * saveLog, struct stat * sb, int flags) {
-     char buf[BUFSIZ];
-     int fdcurr = -1, fdsave = -1;
-@@ -424,12 +440,15 @@ int findNeedRotating(logInfo * log, int 
-         switch (log->criterium) {
-           case ROT_WEEKLY:
-             /* rotate if:
--                  1) the current weekday is before the weekday of the
--                     last rotation
-+                  1) the day of the week is the same as the day of the week of
-+                     the previous rotation but not the same day of the year
-+                     this will rotate it on the same day every week, but not
-+                     twice a day.
-                   2) more then a week has passed since the last
-                      rotation */
--            state->doRotate = ((now.tm_wday < state->lastRotated.tm_wday) ||
--			       ((mktime(&now) - mktime(&state->lastRotated)) >
-+            state->doRotate = ((now.tm_wday == state->lastRotated.tm_wday &&
-+				now.tm_yday != state->lastRotated.tm_yday) ||
-+				((mktime(&now) - mktime(&state->lastRotated)) >
- 				(7 * 24 * 3600)));
-             break;
-           case ROT_MONTHLY:
-@@ -479,6 +498,9 @@ int rotateSingleLog(logInfo * log, int l
-     char * baseName;
-     char * dirName;
-     char * firstRotated;
-+    char * glob_pattern;
-+    glob_t globResult;
-+    int rc;
-     size_t alloc_size;
-     int rotateCount = log->rotateCount ? log->rotateCount : 1;
-     int logStart = (log->logStart == -1) ? 1 : log->logStart;
-@@ -509,7 +531,7 @@ int rotateSingleLog(logInfo * log, int l
- 
-     alloc_size = strlen(dirName) + strlen(baseName) + 
-                  strlen(log->files[logNum]) + strlen(fileext) +
--                 strlen(compext) + 10;
-+                 strlen(compext) + 18;
-     
-     oldName = alloca(alloc_size);
-     newName = alloca(alloc_size);
-@@ -531,16 +553,116 @@ int rotateSingleLog(logInfo * log, int l
-     /* First compress the previous log when necessary */
-     if (log->flags & LOG_FLAG_COMPRESS &&
-         log->flags & LOG_FLAG_DELAYCOMPRESS) {
--        struct stat sbprev;
--	
--        sprintf(oldName, "%s/%s.%d%s", dirName, baseName, logStart, fileext);
--        if (stat(oldName, &sbprev)) {
--            message(MESS_DEBUG, "previous log %s does not exist\n",
--		    oldName);
--        } else {
--	    hasErrors = compressLogFile(oldName, log, &sbprev);
-+	if (log->flags & LOG_FLAG_DATEEXT) {
-+	               /* glob for uncompressed files with our pattern */
-+	    glob_pattern = malloc(strlen(dirName) + strlen(baseName)
-+				  + strlen(fileext) + 44 );
-+	    sprintf(glob_pattern,
-+		    "%s/%s-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]%s",
-+		    dirName, baseName, fileext);
-+	    rc = glob(glob_pattern, 0, globerr, &globResult);
-+	    if (!rc && globResult.gl_pathc > 0) {
-+		for (i = 0; i < globResult.gl_pathc && !hasErrors; i++) {
-+		    struct stat sbprev;
-+		    sprintf(oldName,"%s",(globResult.gl_pathv)[i]);
-+		    if (stat(oldName, &sbprev)) {
-+			message(MESS_DEBUG, "previous log %s does not exist\n", oldName);
-+		    } else {
-+			hasErrors = compressLogFile(oldName, log, &sbprev);
-+		    }
-+		}
-+	    } else {
-+		message (MESS_DEBUG, "glob finding logs to compress failed\n");
-+		/* fallback to old behaviour */
-+		sprintf(oldName, "%s/%s.%d%s", dirName, baseName, logStart, fileext);
-+	    }
-+	    globfree(&globResult);
-+	    free(glob_pattern);
-+	} else {
-+	    struct stat sbprev;
-+
-+	    sprintf(oldName, "%s/%s.%d%s", dirName, baseName, logStart, fileext);
-+	    if (stat(oldName, &sbprev)) {
-+		message(MESS_DEBUG, "previous log %s does not exist\n",
-+			oldName);
-+	    } else {
-+		hasErrors = compressLogFile(oldName, log, &sbprev);
-+	    }
- 	}
-     }
-+
-+    firstRotated = alloca(strlen(dirName) + strlen(baseName) +
-+			  strlen(fileext) + strlen(compext) + 30);
-+
-+    if(log->flags & LOG_FLAG_DATEEXT) {
-+	/* glob for compressed files with our pattern
-+	 * and compress ext */
-+	glob_pattern = malloc(strlen(dirName)+strlen(baseName)
-+			      +strlen(fileext)+strlen(compext)+44);
-+	sprintf(glob_pattern,
-+		"%s/%s-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]%s%s",
-+		dirName, baseName, fileext, compext);
-+	rc = glob(glob_pattern, 0, globerr, &globResult);
-+	if (!rc) {
-+	    /* search for files to drop, if we find one remember it,
-+	     * if we find another one mail and remove the first and
-+	     * remember the second and so on */
-+	    struct stat fst_buf;
-+	    int mail_out = -1;
-+	    /* remove the first (n - rotateCount) matches
-+	     * no real rotation needed, since the files have
-+	     * the date in their name */
-+	    for (i = 0; i < globResult.gl_pathc; i++) {
-+		if( !stat((globResult.gl_pathv)[i],&fst_buf) ) {
-+		    if ((i <= ((int)globResult.gl_pathc - rotateCount)) 
-+			|| ((log->rotateAge > 0)
-+			    && (((nowSecs - fst_buf.st_mtime)/60/60/24)
-+				> log->rotateAge))) {
-+			if ( mail_out != -1 ) {
-+			    if (!hasErrors && log->logAddress) {
-+				char * mailFilename = (globResult.gl_pathv)[mail_out];
-+				hasErrors = mailLogWrapper(mailFilename, mailCommand, logNum, log);
-+				if (!hasErrors)
-+				    hasErrors = removeLogFile(mailFilename);
-+			    }
-+			}
-+			mail_out = i;
-+		    }
-+		}
-+	    }
-+	    if ( mail_out != -1 ) {
-+		/* oldName is oldest Backup found (for unlink later) */
-+		sprintf(oldName, "%s", (globResult.gl_pathv)[mail_out]);
-+		strcpy(disposeName, oldName);
-+	    } else
-+		disposeName = NULL;
-+	} else {
-+	    message (MESS_DEBUG, "glob finding old rotated logs failed\n");
-+	    disposeName = NULL;
-+	}
-+	/* firstRotated is most recently created/compressed rotated log */
-+	sprintf(firstRotated, "%s/%s-%04d%02d%02d%s%s",
-+		dirName, baseName, now.tm_year+1900,
-+		now.tm_mon+1, now.tm_mday, fileext, compext);
-+	globfree(&globResult);
-+	free(glob_pattern);
-+    } else {
-+	if ( log->rotateAge ) {
-+	    struct stat fst_buf;
-+	    for (i=1; i <= rotateCount; i++) {
-+		sprintf(oldName, "%s/%s.%d%s%s", dirName, baseName,
-+			rotateCount + 1, fileext, compext);
-+		if(!stat(oldName,&fst_buf)
-+		    && (((nowSecs - fst_buf.st_mtime)/60/60/24)
-+			> log->rotateAge)) {
-+		    char * mailFilename = (globResult.gl_pathv)[i];
-+		    if (!hasErrors && log->logAddress)
-+			hasErrors = mailLogWrapper(mailFilename, mailCommand, logNum, log);
-+		    if (!hasErrors)
-+			hasErrors = removeLogFile(mailFilename);
-+		}
-+	    }
-+	}
-     
-     sprintf(oldName, "%s/%s.%d%s%s", dirName, baseName,
-             logStart + rotateCount, fileext, compext);
-@@ -548,8 +670,6 @@ int rotateSingleLog(logInfo * log, int l
-     
-     strcpy(disposeName, oldName);
-     
--    firstRotated = alloca(strlen(dirName) + strlen(baseName) +
--                          strlen(fileext) + strlen(compext) + 30);
-     sprintf(firstRotated, "%s/%s.%d%s%s", dirName, baseName,
-             logStart, fileext, 
- 	    (log->flags & LOG_FLAG_DELAYCOMPRESS) ? "" : compext);
-@@ -600,12 +720,27 @@ int rotateSingleLog(logInfo * log, int l
- 	    }
- 	}
-     }
--    
-+    } /* !LOG_FLAG_DATEEXT */
-+ 
-     finalName = oldName;
--    
--    /* note: the gzip extension is *not* used here! */
--    sprintf(finalName, "%s/%s.%d%s", dirName, baseName, logStart, fileext);
--    
-+
-+    if(log->flags & LOG_FLAG_DATEEXT) {
-+	char * destFile = alloca(strlen(dirName) + strlen(baseName) +
-+				 strlen(fileext) + strlen(compext) + 30);
-+	struct stat fst_buf;
-+	sprintf(finalName, "%s/%s-%04d%02d%02d%s",
-+		dirName, baseName, now.tm_year+1900,
-+		now.tm_mon+1, now.tm_mday, fileext);
-+	sprintf(destFile, "%s%s", finalName, compext);
-+	if(!stat(destFile,&fst_buf)) {
-+	    message (MESS_DEBUG, "destination %s already exists, skipping rotation\n", firstRotated);
-+	    hasErrors = 1;
-+	}
-+    } else {
-+	/* note: the gzip extension is *not* used here! */
-+	sprintf(finalName, "%s/%s.%d%s", dirName, baseName, logStart, fileext);
-+    }
-+ 
-     /* if the last rotation doesn't exist, that's okay */
-     if (!debug && access(disposeName, F_OK)) {
-         message(MESS_DEBUG, "log %s doesn't exist -- won't try to "
-@@ -613,9 +748,6 @@ int rotateSingleLog(logInfo * log, int l
-         disposeName = NULL;
-     } 
-     
--    free(dirName);
--    free(baseName);
--    
-     if (!hasErrors) {
-         if (log->pre && !(log->flags & LOG_FLAG_SHAREDSCRIPTS)) {
-             message(MESS_DEBUG, "running prerotate script\n");
-@@ -722,33 +854,12 @@ int rotateSingleLog(logInfo * log, int l
-             else
-                 mailFilename = disposeName;
- 
--            if (mailFilename) {
--		/* if the log is compressed (and we're not mailing a
--		   file whose compression has been delayed), we need
--		   to uncompress it */
--                if ((log->flags & LOG_FLAG_COMPRESS) &&
--		    !((log->flags & LOG_FLAG_DELAYCOMPRESS) &&
--		      (log->flags & LOG_FLAG_MAILFIRST))) {
--		    if (mailLog(mailFilename, mailCommand, 
--				log->uncompress_prog, log->logAddress, 
--				log->files[logNum])) 
--			hasErrors = 1;
--		} else {
--		    if (mailLog(mailFilename, mailCommand, NULL, 
--			        log->logAddress, mailFilename))
--			hasErrors = 1;
--		}
--	    }
-+            if (mailFilename)
-+		hasErrors = mailLogWrapper(mailFilename, mailCommand, logNum, log);
-         }
- 	
-         if (!hasErrors && disposeName) {
--            message(MESS_DEBUG, "removing old log %s\n", disposeName);
--	    
--            if (!debug && unlink(disposeName)) {
--                message(MESS_ERROR, "Failed to remove old log %s: %s\n",
--			disposeName, strerror(errno));
--                hasErrors = 1;
--	    }
-+	    hasErrors = removeLogFile(disposeName);
- 	}
-     }
-     
-@@ -761,6 +872,8 @@ int rotateSingleLog(logInfo * log, int l
- 	  }
- 	}
- #endif
-+    free(dirName);
-+    free(baseName);
-     return hasErrors;
- }
- 
-@@ -1002,7 +1115,7 @@ static int readState(char * stateFilenam
- 	}
- 	
- 	/* Hack to hide earlier bug */
--	if ((year != 1900) && (year < 1996 || year > 2100)) {
-+	if ((year != 1900) && (year < 1970 || year > 2100)) {
- 	    message(MESS_ERROR, "bad year %d for file %s in state file %s\n",
- 		    year, argv[0], stateFilename);
- 	    fclose(f);
-@@ -1047,7 +1160,9 @@ static int readState(char * stateFilenam
- 
- int main(int argc, const char ** argv) {
-     logInfo defConfig = { NULL, NULL, 0, NULL, ROT_SIZE, 
--			  /* threshHold */ 1024 * 1024, 0,
-+			  /* threshHold */ 1024 * 1024,
-+			  /* rotateCount */ 0,
-+			  /* rotateAge */ 0,
- 			  /* log start */ -1,
- 			  /* pre, post */ NULL, NULL,
- 			  /* first, last */ NULL, NULL,
-@@ -1108,8 +1223,7 @@ int main(int argc, const char ** argv) {
- 
-     files = poptGetArgs((poptContext) optCon);
-     if (!files) {
--	fprintf(stderr, "logrotate " VERSION 
--		" - Copyright (C) 1995-2001 Red Hat, Inc.\n");
-+	fprintf(stderr, "logrotate - Copyright (C) 1995-2001 Red Hat, Inc.\n");
- 	fprintf(stderr, "This may be freely redistributed under the terms of "
- 		"the GNU Public License\n\n");
- 	poptPrintUsage(optCon, stderr, 0);
diff --git a/package/logrotate/patches/patch-logrotate_h b/package/logrotate/patches/patch-logrotate_h
deleted file mode 100644
index 9a3adefc5..000000000
--- a/package/logrotate/patches/patch-logrotate_h
+++ /dev/null
@@ -1,19 +0,0 @@
-$Id$
---- logrotate-3.7.1.orig/logrotate.h	Thu Aug  7 13:13:14 2003
-+++ logrotate-3.7.1/logrotate.h	Sat Jan 20 18:54:35 2007
-@@ -15,6 +15,7 @@
- #define LOG_FLAG_MAILFIRST	(1 << 6)
- #define LOG_FLAG_SHAREDSCRIPTS	(1 << 7)
- #define LOG_FLAG_COPY		(1 << 8)
-+#define LOG_FLAG_DATEEXT	(1 << 9)
- 
- #define NO_FORCE_ROTATE 0
- #define FORCE_ROTATE    1
-@@ -34,6 +35,7 @@ typedef struct {
-     enum { ROT_DAYS, ROT_WEEKLY, ROT_MONTHLY, ROT_SIZE, ROT_FORCE } criterium;
-     unsigned int threshhold;
-     int rotateCount;
-+    int rotateAge;
-     int logStart;
-     char * pre, * post, * first, * last;
-     char * logAddress;
diff --git a/package/lrzsz/Makefile b/package/lrzsz/Makefile
index d1b5f1b24..ba6d107e2 100644
--- a/package/lrzsz/Makefile
+++ b/package/lrzsz/Makefile
@@ -16,11 +16,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LRZSZ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-CONFIGURE_ARGS+=	ac_cv_lib_nsl_gethostbyname=no
+INSTALL_STYLE:=		manual
+
 CONFIGURE_ARGS+=	--without-libiconv-prefix \
 			--without-libintl-prefix
-BUILD_STYLE:=		auto
 
 do-install:
 	${INSTALL_DIR} ${IDIR_LRZSZ}/usr/bin
diff --git a/package/lua/Makefile b/package/lua/Makefile
index 583de4562..bafdadb50 100644
--- a/package/lua/Makefile
+++ b/package/lua/Makefile
@@ -22,6 +22,10 @@ $(eval $(call PKG_template,LUA,lua,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},
 $(eval $(call PKG_template,LUAC,luac,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LUA_EXAMPLES,lua-examples,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 do-build:
 	${MAKE} -C ${WRKBUILD} \
 		CC="${TARGET_CC}" \
diff --git a/package/lvm/Makefile b/package/lvm/Makefile
index 6c73678a0..d67bbc43e 100644
--- a/package/lvm/Makefile
+++ b/package/lvm/Makefile
@@ -22,12 +22,9 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LVM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,DEVICE_MAPPER,device-mapper,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_DM},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--with-user="" --with-group="" \
 			--with-optimisation="" \
 			--with-lvm1=none
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	# lvm
diff --git a/package/lynx/Makefile b/package/lynx/Makefile
index 443dd82de..edea58071 100644
--- a/package/lynx/Makefile
+++ b/package/lynx/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME=		lynx
 PKG_VERSION=		2.8.7dev.7
 PKG_RELEASE=		2
-PKG_BUILDDEP+=		ncurses openssl zlib
 PKG_MD5SUM=		83891107c873421e5ac917cc0ab53fe8
 PKG_DESCR:=		Standard text browser
 PKG_SECTION:=		text
 PKG_DEPENDS:=		libncurses libopenssl zlib
+PKG_BUILDDEP+=		ncurses openssl zlib
 PKG_URL:=		http://lynx.isc.org
 PKG_SITES=		http://lynx.isc.org/current/ \
 			${MASTER_SITE_MIRBSD}
@@ -27,7 +27,6 @@ TCPPFLAGS+=		-I${STAGING_DIR}/include/openssl
 TCPPFLAGS+=		-DUSE_OPENSSL_INCL -DUSE_X509_SUPPORT
 TLDFLAGS+=		-lz
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_path_TELNET=telnet \
 			ac_cv_path_TN3270=tn3270 \
 			ac_cv_path_RLOGIN=rlogin \
@@ -80,11 +79,7 @@ CONFIGURE_ARGS+=	\
 			--disable-widec \
 			--disable-locale-charset
 
-#			--prefix=${STAGING_DIR}/usr 
-
 MAKE_FILE:=		makefile
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LYNX}/etc ${IDIR_LYNX}/usr/bin
diff --git a/package/m4/Makefile b/package/m4/Makefile
index df6a82bdf..2f762d7fe 100644
--- a/package/m4/Makefile
+++ b/package/m4/Makefile
@@ -16,11 +16,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,M4,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_func_mbrtowc=no \
 			gl_cv_func_wcrtomb_retval=no
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_M4}/usr/bin
diff --git a/package/macchanger/Makefile b/package/macchanger/Makefile
index e36ef4cd3..723c932b4 100755
--- a/package/macchanger/Makefile
+++ b/package/macchanger/Makefile
@@ -16,10 +16,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MACCHANGER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_MACCHANGER}/usr/bin ${IDIR_MACCHANGER}/usr/share
 	${INSTALL_BIN} ${WRKINST}/usr/bin/macchanger ${IDIR_MACCHANGER}/usr/bin
diff --git a/package/madplay/Makefile b/package/madplay/Makefile
index 1ac596651..9fd699efb 100644
--- a/package/madplay/Makefile
+++ b/package/madplay/Makefile
@@ -19,7 +19,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MADPLAY,madplay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		BUILD_CC="${TARGET_CC}" HOSTCC=${HOST_CC} \
 			LIBS="-lz" \
 			ac_cv_linux_vers=2 \
@@ -31,8 +30,6 @@ CONFIGURE_ARGS+=	--disable-debugging \
 			--without-libintl-prefix \
 			--without-esd \
 			--with-alsa
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_MADPLAY}/usr/bin
diff --git a/package/make/Makefile b/package/make/Makefile
index e8af2ed26..5d546c0af 100644
--- a/package/make/Makefile
+++ b/package/make/Makefile
@@ -16,10 +16,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,MAKE,make,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-
 post-install:
 	$(INSTALL_DIR) $(IDIR_MAKE)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/make $(IDIR_MAKE)/usr/bin
diff --git a/package/maradns/Makefile b/package/maradns/Makefile
index 45c95bc79..235bd1ebd 100644
--- a/package/maradns/Makefile
+++ b/package/maradns/Makefile
@@ -9,26 +9,25 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		9e715104234cc9bf01e2afaad27eb787
 PKG_DESCR:=		small and secure DNS server
 PKG_SECTION:=		net
+PKG_NOPARALLEL:=	1
 PKG_DEPENDS:=		libpthread
 PKG_URL:=		http://www.maradns.org
 PKG_SITES:=		http://www.maradns.org/download/1.4/${PKG_VERSION}/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,MARADNS,maradns,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MARADNS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
 
-BUILD_STYLE:=		auto
-MAKE_FLAGS+=		CFLAGS="${TCFLAGS}" \
-			FLAGS="${TCFLAGS}" \
-			CC="${TARGET_CC}" \
-			HOSTCC="${HOSTCC}"
-INSTALL_STYLE:=		auto
 FAKE_FLAGS+=		PREFIX="${WRKINST}/usr" \
 			RPM_BUILD_ROOT="${WRKINST}"
 
 pre-install:
-	mkdir -p ${WRKINST}/usr/{bin,sbin}
-	mkdir -p ${WRKINST}/usr/man/man{1,5,8}
+	@mkdir -p ${WRKINST}/usr/man/man{1,5,8}
+
+do-configure:
+	(cd ${WRKBUILD} && ./configure);
 
 post-install:
 	${INSTALL_DIR} ${IDIR_MARADNS}/etc/maradns
diff --git a/package/maradns/patches/cross-compile-fix.patch b/package/maradns/patches/cross-compile-fix.patch
index d8ee0e051..8277956c5 100644
--- a/package/maradns/patches/cross-compile-fix.patch
+++ b/package/maradns/patches/cross-compile-fix.patch
@@ -1,7 +1,7 @@
 diff -urN maradns-1.0.26.old/rng/Makefile maradns-1.0.26.dev/rng/Makefile
---- maradns-1.0.26.old/rng/Makefile	2003-08-02 21:39:36.000000000 +0200
-+++ maradns-1.0.26.dev/rng/Makefile	2005-04-30 23:29:30.000000000 +0200
-@@ -20,7 +20,7 @@
+--- maradns-1.4.03.orig/rng/Makefile	2006-01-02 17:59:33.000000000 +0100
++++ maradns-1.4.03/rng/Makefile	2010-02-06 00:19:48.241836878 +0100
+@@ -25,7 +25,7 @@ rng-api-fst.o: rng-alg-fst.o rng-api-fst
  	$(CC) -c $(FLAGS) -o rng-api-fst.o rng-api-fst.c
  
  make_32bit_tables: make_32bit_tables.c
diff --git a/package/maradns/patches/patch-Makefile b/package/maradns/patches/patch-Makefile
new file mode 100644
index 000000000..d1fc651c4
--- /dev/null
+++ b/package/maradns/patches/patch-Makefile
@@ -0,0 +1,94 @@
+--- maradns-1.4.03.orig/Makefile	2006-01-02 17:59:33.000000000 +0100
++++ maradns-1.4.03/Makefile	2010-02-06 00:19:48.471836901 +0100
+@@ -1,15 +1,82 @@
+-# This is a wrapper that runs "./configure ; make"
+-all:
+-	./compile.sh
++VERSION=1.4.03
++COMPILED="Linux system at Sat Feb 6 00:19:48 CET 2010"
++COMPILED_DEBUG="Linux system at Sat Feb 6 00:19:48 CET 2010 (Debug)"
++# Server objects
++SOBJECTS=server/MaraBigHash.o
++# js_string library (buffer overflow resistant string library) objects
++JOBJS=libs/JsStr.o libs/JsStrOS.o libs/JsStrCP.o 
++# MaraHash (assosciative array) library objects
++MHOBJS=libs/MaraHash.o
++# Parser objects
++POBJECTS=parse/ParseMaraRc.o parse/ParseCsv1.o ../parse/ParseIpAcl.o
++# DNS query processing library objects
++DOBJECTS=dns/Queries.o dns/Compress.o dns/bobbit.o
++# Secure random number generator objects
++ROBJECTS=rng/rng-api-fst.o rng/rng-alg-fst.o
++OBJECTS=$(JOBJS) $(MHOBJS) $(SOBJECTS) $(DOBJECTS) $(POBJECTS) $(DOBJECTS) $(ROBJECTS)
++EXECS=server/maradns
+ 
+-debug:
+-	./configure ; make debug
++# Uncomment the following three lines to get this to compile on Solaris
++# LDFLAGS=-lxnet
++# CC=gcc $(LDFLAGS) -DSELECT_PROBLEM
++# M="CC=$(CC)"
++# These are currently unused, but will be needed again if we use flock() again
++# CFLAGS=-I/usr/ucbinclude 
++# L="CC=$(CC) $(CFLAGS)"
++# LDFLAGS=-L/usr/ucblib -lucb -lxnet
++# end the Solaris section
++# Non-Solaris version of "M"
++V="VERSION=$(VERSION)"
++Q="DEFINES=-DSELECT_PROBLEM"
++
++# Debug
++
++FLAGS = -O2 -Wall -DSELECT_PROBLEM
++M="CC=$(CC) $(FLAGS)"
++D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS"
++#FLAGS = -g
++
++all: 
++	cd libs ; make $(M) ; cd ../dns ; make $(M) ; \
++	cd ../rng ; make $(M) ; cd ../parse ; make $(M) ; \
++	cd ../qual ; make $(M) ; cd ../server ; \
++	make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \
++	cd ../tools ; make $(M) ; \
++	cd ../tcp ; make $(M) $(V) ; cat ../00README.FIRST
++
++debug: 
++	cd libs ; make $(D) DEBUG="-DDEBUG -DTHREADS" ; \
++	cd ../dns ; make $(D) ; cd ../rng ; make $(D) ; \
++	cd ../parse ; make $(D) ; cd ../qual ; make $(D) ; \
++	cd ../server ; \
++	make $(D) $(Q) $(V) COMPILED=\"$(COMPILED_DEBUG)\" ; \
++	cd ../tools ; make $(D) ; \
++	cd ../tcp ; make $(D) $(V) ; cat ../00README.FIRST
+ 
+ clean:
+-	./configure ; make clean
++	rm -f $(OBJECTS) core $(EXECS) ; \
++	cp build/Makefile.w Makefile ; cd dns ; make clean ; \
++	cd ../libs ; make clean ; cd ../parse ; make clean ; \
++	cd ../qual ; make clean ; \
++	cd ../server ; make clean ; \
++	cp Makefile.recursive Makefile ; \
++	cd ../test ; make clean ; \
++	cd ../tools ; make clean ; \
++	cd misc ; make clean ; \
++	cd ../../utf8 ; make clean ; \
++	cd ../tcp ; make clean ; \
++	cd ../rng ; make clean ; \
++	cd ../sqa ; make clean ; \
++	# ; cd .. ; find . -type d | grep .deps | xargs rm -fr ; find . -name '*.o' | xargs rm
+ 
+-uninstall:
+-	./configure ; make uninstall
++strip:
++	cd server; strip maradns ; cd ../tcp ; \
++	strip zoneserver getzone fetchzone ; \
++	cd ../tools ; strip askmara
+ 
+ install:
+-	echo Please compile MaraDNS first
++	VERSION=$(VERSION) ./build/install.sh
++
++uninstall:
++	VERSION=$(VERSION) ./build/uninstall.sh
++
diff --git a/package/maradns/patches/patch-build_Makefile_linux b/package/maradns/patches/patch-build_Makefile_linux
new file mode 100644
index 000000000..2e7dec5be
--- /dev/null
+++ b/package/maradns/patches/patch-build_Makefile_linux
@@ -0,0 +1,32 @@
+--- maradns-1.4.03.orig/build/Makefile.linux	2006-11-24 12:44:29.000000000 +0100
++++ maradns-1.4.03/build/Makefile.linux	2010-02-06 00:23:58.393084387 +0100
+@@ -23,23 +23,23 @@ EXECS=server/maradns
+ # LDFLAGS=-L/usr/ucblib -lucb -lxnet
+ # end the Solaris section
+ # Non-Solaris version of "M"
+-V="VERSION=$(VERSION)"
++VER="VERSION=$(VERSION)"
+ Q="DEFINES=-DSELECT_PROBLEM"
+ 
+ # Debug
+ 
+-FLAGS = -O2 -Wall -DSELECT_PROBLEM
+-M="CC=$(CC) $(FLAGS)"
+-D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS"
++CFLAGS ?= -O2 -Wall -DSELECT_PROBLEM
++M="CC=$(CC) $(CFLAGS)"
++D="CC=$(CC) $(CFLAGS) -DDEBUG -DTHREADS"
+ #FLAGS = -g
+ 
+ all: 
+ 	cd libs ; make $(M) ; cd ../dns ; make $(M) ; \
+ 	cd ../rng ; make $(M) ; cd ../parse ; make $(M) ; \
+ 	cd ../qual ; make $(M) ; cd ../server ; \
+-	make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \
++	make $(M) $(VER) COMPILED=\"$(COMPILED)\" ; \
+ 	cd ../tools ; make $(M) ; \
+-	cd ../tcp ; make $(M) $(V) ; cat ../00README.FIRST
++	cd ../tcp ; make $(M) $(VER)
+ 
+ debug: 
+ 	cd libs ; make $(D) DEBUG="-DDEBUG -DTHREADS" ; \
diff --git a/package/maradns/patches/patch-configure b/package/maradns/patches/patch-configure
new file mode 100644
index 000000000..d6d698a78
--- /dev/null
+++ b/package/maradns/patches/patch-configure
@@ -0,0 +1,19 @@
+--- maradns-1.4.03.orig/configure	2007-10-19 15:54:14.000000000 +0200
++++ maradns-1.4.03/configure	2010-02-06 00:22:18.533084157 +0100
+@@ -31,12 +31,12 @@ BUILDDIR=build
+ export BUILDDIR
+ 
+ # Show them the disclaimer
+-cat 00README.FIRST
+-echo -----
+-echo
++#cat 00README.FIRST
++#echo -----
++#echo
+ 
+ # Try to determine what kind of system we are running
+-UNAME=`uname -s`
++UNAME=Linux
+ 
+ # Make sure the Makefile has the current version number of MaraDNS
+ # VERSION is a one line file in the form "VERSION=0.1.23" (without the
diff --git a/package/maradns/patches/patch-dns_Makefile b/package/maradns/patches/patch-dns_Makefile
new file mode 100644
index 000000000..70713032f
--- /dev/null
+++ b/package/maradns/patches/patch-dns_Makefile
@@ -0,0 +1,11 @@
+--- maradns-1.4.03.orig/dns/Makefile	2005-12-20 11:10:40.000000000 +0100
++++ maradns-1.4.03/dns/Makefile	2010-02-06 00:19:48.481829524 +0100
+@@ -3,7 +3,7 @@ JOBJS=../libs/JsStr.o ../libs/JsStrOS.o 
+ MHOBJS=../libs/MaraHash.o
+ OBJECTS=$(DOBJECTS) $(JOBJS) $(MHOBJS)
+ 
+-FLAGS = -g -Wall $(DEBUG)
++#FLAGS = -g -Wall $(DEBUG)
+ #FLAGS = -g $(DEBUG)
+ 
+ all: Queries.o Compress.o bobbit.o Decompress.o
diff --git a/package/maradns/patches/patch-qual_Makefile b/package/maradns/patches/patch-qual_Makefile
new file mode 100644
index 000000000..b78ce7096
--- /dev/null
+++ b/package/maradns/patches/patch-qual_Makefile
@@ -0,0 +1,12 @@
+--- maradns-1.4.03.orig/qual/Makefile	2006-01-02 17:59:33.000000000 +0100
++++ maradns-1.4.03/qual/Makefile	2010-02-06 00:19:48.481829524 +0100
+@@ -2,9 +2,6 @@ DOBJECTS=qual_timestamp.o 
+ JOBJS=../libs/JsStr.o ../libs/JsStrOS.o ../libs/JsStrCP.o 
+ OBJECTS=$(DOBJECTS)
+ 
+-#FLAGS = -g -Wall $(DEBUG)
+-#FLAGS = -g $(DEBUG)
+-
+ all: qual_timestamp.o
+ 
+ clean:
diff --git a/package/maradns/patches/patch-rng_rng-32bit-tables_h b/package/maradns/patches/patch-rng_rng-32bit-tables_h
new file mode 100644
index 000000000..61ebbff70
--- /dev/null
+++ b/package/maradns/patches/patch-rng_rng-32bit-tables_h
@@ -0,0 +1,655 @@
+--- maradns-1.4.03.orig/rng/rng-32bit-tables.h	2010-02-02 18:12:47.000000000 +0100
++++ maradns-1.4.03/rng/rng-32bit-tables.h	2010-02-06 00:19:49.965584207 +0100
+@@ -1,332 +1,332 @@
+ /* This file is automatically generated by the program make_32bit_tables.c */
+ 
+ static const u32 Te0[256] = {
+-0xb3e2509bU, 0x63b4ca06U, 0x85e4a2d4U, 0x216c4602U,
+-0x3a6f3fa8U, 0xa616bd75U, 0x134d0610U, 0x4d60b99cU,
+-0x176ab44dU, 0x7f41f98eU, 0xe277da8fU, 0xcdec08c9U,
+-0x5a0a0dd1U, 0x1b0379aaU, 0x7b664bd3U, 0xa1e0f757U,
+-0xfaa55b5aU, 0xea39a535U, 0xc5a27773U, 0xb17c0938U,
+-0x2023e7deU, 0xd47128c0U, 0x7c9001f1U, 0x22bdbe7dU,
+-0xec804ecbU, 0xb9327682U, 0xbd15c4dfU, 0xc9cbba94U,
+-0xa488e4d6U, 0x014fa1dcU, 0x60653279U, 0xfe82e907U,
+-0x74de7e4bU, 0xa8e12931U, 0x0427b25dU, 0xe65068d2U,
+-0x898d6f33U, 0x928e1699U, 0x1202a7ccU, 0x7a29ea0fU,
+-0x1f24cbf7U, 0x64428024U, 0xdd70f6a6U, 0xbec43ca0U,
+-0x2d058be5U, 0x15f4edeeU, 0x572c61eaU, 0x1cf53388U,
+-0xf974a325U, 0x4046d5a7U, 0x2bbc601bU, 0xdea10ed9U,
+-0x42d88c04U, 0x8f3484cdU, 0x5f621e50U, 0x835d492aU,
+-0xf51d6ec2U, 0x2f9bd246U, 0xbf8b9d7cU, 0xee1e1768U,
+-0x6c0cff9eU, 0x16251591U, 0x37495393U, 0x5cb3e62fU,
+-0x3f072c29U, 0x4bd95262U, 0x05681381U, 0x90104f3aU,
+-0x03d1f87fU, 0x5244726bU, 0xd53e891cU, 0x9ac06923U,
+-0x51958a14U, 0x915feee6U, 0xdfeeaf05U, 0x79f81270U,
+-0xd2c8c33eU, 0x39bec7d7U, 0x764027e8U, 0x4808aa1dU,
+-0xcf72516aU, 0x269a0c20U, 0xab30d14eU, 0xc2543d51U,
+-0x770f8634U, 0xa0af568bU, 0x27d5adfcU, 0x4ffee03fU,
+-0xb4141ab9U, 0x8ce57cb2U, 0x2af3c1c7U, 0xdbc91d58U,
+-0xd6ef7163U, 0x3cd6d456U, 0x5b45ac0dU, 0x3e488df5U,
+-0x32214012U, 0xe1a622f0U, 0x9b8fc8ffU, 0x43972dd8U,
+-0xcca3a915U, 0x286d9864U, 0x31f0b86dU, 0x3498abecU,
+-0x73283469U, 0x6fdd07e1U, 0x682b4dc3U, 0x66dcd987U,
+-0x5663c036U, 0x62fb6bdaU, 0x95785cbbU, 0xe71fc90eU,
+-0x726795b5U, 0xcb55e337U, 0x5dfc47f3U, 0x70f9cc16U,
+-0xb68a431aU, 0x81c31089U, 0xe4ce3171U, 0x0d266c3bU,
+-0xacc69b6cU, 0x985e3080U, 0xda86bc84U, 0x6d435e42U,
+-0x6964ec1fU, 0x06b9ebfeU, 0x84ab0308U, 0xbae38efdU,
+-0x11d35fb3U, 0x00000000U, 0x0ef79444U, 0xfbeafa86U,
+-0xbbac2f21U, 0x650d21f8U, 0xae58c2cfU, 0x86355aabU,
+-0x612a93a5U, 0xf452cf1eU, 0x446167faU, 0x877afb77U,
+-0xf3a4853cU, 0xa7591ca9U, 0x7ddfa02dU, 0x58945472U,
+-0x9c7982ddU, 0xd818e527U, 0x336ee1ceU, 0x07f64a22U,
+-0xa5c7450aU, 0x808cb155U, 0xb7c5e2c6U, 0xef51b6b4U,
+-0x3606f24fU, 0xffcd48dbU, 0x55b23849U, 0x6bfab5bcU,
+-0x4eb141e3U, 0x8e7b2511U, 0x6ab51460U, 0xfd531178U,
+-0x18d281d5U, 0xd38762e2U, 0xf2eb24e0U, 0xca1a42ebU,
+-0xdc3f577aU, 0x88c2ceefU, 0x8daadd6eU, 0x029e59a3U,
+-0x199d2009U, 0xb033a8e4U, 0x0901de66U, 0x0c69cde7U,
+-0x0fb83598U, 0xf7833761U, 0xf6cc96bdU, 0x78b7b3acU,
+-0x7591df97U, 0x49470bc1U, 0xe58190adU, 0x97e60518U,
+-0xd7a0d0bfU, 0x4a96f3beU, 0x9fa87aa2U, 0xe9e85d4aU,
+-0x0b9f87c5U, 0x452ec626U, 0xbc5a6503U, 0xd95744fbU,
+-0x9911915cU, 0x96a9a4c4U, 0x46ff3e59U, 0x4c2f1840U,
+-0x9437fd67U, 0xe3387b53U, 0x3d99758aU, 0xc73c2ed0U,
+-0x2c4a2a39U, 0x254bf45fU, 0x23f21fa1U, 0x1a4cd876U,
+-0xd0569a9dU, 0xb87dd75eU, 0x1dba9254U, 0x38f1660bU,
+-0xa2310f28U, 0x5e2dbf8cU, 0x47b09f85U, 0x14bb4c32U,
+-0xa9ae88edU, 0x50da2bc8U, 0x24045583U, 0xeb7604e9U,
+-0xb55bbb65U, 0x1e6b6a2bU, 0x8212e8f6U, 0xf13adc9fU,
+-0xc0ca64f2U, 0x084e7fbaU, 0xa37eaef4U, 0x35d70a30U,
+-0xedcfef17U, 0xe0e9832cU, 0x30bf19b1U, 0x9ee7db7eU,
+-0xe8a7fc96U, 0x93c1b745U, 0xfc1cb0a4U, 0xb2adf147U,
+-0x109cfe6fU, 0xad893ab0U, 0xaf176313U, 0x2ed4739aU,
+-0x6e92a63dU, 0x9d362301U, 0xf83b02f9U, 0xc6738f0cU,
+-0xc185c52eU, 0xc8841b48U, 0x6793785bU, 0xaa7f7092U,
+-0x4109747bU, 0xc31b9c8dU, 0x71b66dcaU, 0x8b133690U,
+-0xd1193b41U, 0x54fd9995U, 0xc4edd6afU, 0x7e0e5852U,
+-0x3b209e74U, 0x8a5c974cU, 0xf0757d43U, 0x59dbf5aeU,
+-0xce3df0b6U, 0x530bd3b7U, 0x0ad02619U, 0x292239b8U,
++0xb3e2509bU, 0x63b4ca06U, 0x85e4a2d4U, 0x216c4602U, 
++0x3a6f3fa8U, 0xa616bd75U, 0x134d0610U, 0x4d60b99cU, 
++0x176ab44dU, 0x7f41f98eU, 0xe277da8fU, 0xcdec08c9U, 
++0x5a0a0dd1U, 0x1b0379aaU, 0x7b664bd3U, 0xa1e0f757U, 
++0xfaa55b5aU, 0xea39a535U, 0xc5a27773U, 0xb17c0938U, 
++0x2023e7deU, 0xd47128c0U, 0x7c9001f1U, 0x22bdbe7dU, 
++0xec804ecbU, 0xb9327682U, 0xbd15c4dfU, 0xc9cbba94U, 
++0xa488e4d6U, 0x014fa1dcU, 0x60653279U, 0xfe82e907U, 
++0x74de7e4bU, 0xa8e12931U, 0x0427b25dU, 0xe65068d2U, 
++0x898d6f33U, 0x928e1699U, 0x1202a7ccU, 0x7a29ea0fU, 
++0x1f24cbf7U, 0x64428024U, 0xdd70f6a6U, 0xbec43ca0U, 
++0x2d058be5U, 0x15f4edeeU, 0x572c61eaU, 0x1cf53388U, 
++0xf974a325U, 0x4046d5a7U, 0x2bbc601bU, 0xdea10ed9U, 
++0x42d88c04U, 0x8f3484cdU, 0x5f621e50U, 0x835d492aU, 
++0xf51d6ec2U, 0x2f9bd246U, 0xbf8b9d7cU, 0xee1e1768U, 
++0x6c0cff9eU, 0x16251591U, 0x37495393U, 0x5cb3e62fU, 
++0x3f072c29U, 0x4bd95262U, 0x05681381U, 0x90104f3aU, 
++0x03d1f87fU, 0x5244726bU, 0xd53e891cU, 0x9ac06923U, 
++0x51958a14U, 0x915feee6U, 0xdfeeaf05U, 0x79f81270U, 
++0xd2c8c33eU, 0x39bec7d7U, 0x764027e8U, 0x4808aa1dU, 
++0xcf72516aU, 0x269a0c20U, 0xab30d14eU, 0xc2543d51U, 
++0x770f8634U, 0xa0af568bU, 0x27d5adfcU, 0x4ffee03fU, 
++0xb4141ab9U, 0x8ce57cb2U, 0x2af3c1c7U, 0xdbc91d58U, 
++0xd6ef7163U, 0x3cd6d456U, 0x5b45ac0dU, 0x3e488df5U, 
++0x32214012U, 0xe1a622f0U, 0x9b8fc8ffU, 0x43972dd8U, 
++0xcca3a915U, 0x286d9864U, 0x31f0b86dU, 0x3498abecU, 
++0x73283469U, 0x6fdd07e1U, 0x682b4dc3U, 0x66dcd987U, 
++0x5663c036U, 0x62fb6bdaU, 0x95785cbbU, 0xe71fc90eU, 
++0x726795b5U, 0xcb55e337U, 0x5dfc47f3U, 0x70f9cc16U, 
++0xb68a431aU, 0x81c31089U, 0xe4ce3171U, 0x0d266c3bU, 
++0xacc69b6cU, 0x985e3080U, 0xda86bc84U, 0x6d435e42U, 
++0x6964ec1fU, 0x06b9ebfeU, 0x84ab0308U, 0xbae38efdU, 
++0x11d35fb3U, 0x00000000U, 0x0ef79444U, 0xfbeafa86U, 
++0xbbac2f21U, 0x650d21f8U, 0xae58c2cfU, 0x86355aabU, 
++0x612a93a5U, 0xf452cf1eU, 0x446167faU, 0x877afb77U, 
++0xf3a4853cU, 0xa7591ca9U, 0x7ddfa02dU, 0x58945472U, 
++0x9c7982ddU, 0xd818e527U, 0x336ee1ceU, 0x07f64a22U, 
++0xa5c7450aU, 0x808cb155U, 0xb7c5e2c6U, 0xef51b6b4U, 
++0x3606f24fU, 0xffcd48dbU, 0x55b23849U, 0x6bfab5bcU, 
++0x4eb141e3U, 0x8e7b2511U, 0x6ab51460U, 0xfd531178U, 
++0x18d281d5U, 0xd38762e2U, 0xf2eb24e0U, 0xca1a42ebU, 
++0xdc3f577aU, 0x88c2ceefU, 0x8daadd6eU, 0x029e59a3U, 
++0x199d2009U, 0xb033a8e4U, 0x0901de66U, 0x0c69cde7U, 
++0x0fb83598U, 0xf7833761U, 0xf6cc96bdU, 0x78b7b3acU, 
++0x7591df97U, 0x49470bc1U, 0xe58190adU, 0x97e60518U, 
++0xd7a0d0bfU, 0x4a96f3beU, 0x9fa87aa2U, 0xe9e85d4aU, 
++0x0b9f87c5U, 0x452ec626U, 0xbc5a6503U, 0xd95744fbU, 
++0x9911915cU, 0x96a9a4c4U, 0x46ff3e59U, 0x4c2f1840U, 
++0x9437fd67U, 0xe3387b53U, 0x3d99758aU, 0xc73c2ed0U, 
++0x2c4a2a39U, 0x254bf45fU, 0x23f21fa1U, 0x1a4cd876U, 
++0xd0569a9dU, 0xb87dd75eU, 0x1dba9254U, 0x38f1660bU, 
++0xa2310f28U, 0x5e2dbf8cU, 0x47b09f85U, 0x14bb4c32U, 
++0xa9ae88edU, 0x50da2bc8U, 0x24045583U, 0xeb7604e9U, 
++0xb55bbb65U, 0x1e6b6a2bU, 0x8212e8f6U, 0xf13adc9fU, 
++0xc0ca64f2U, 0x084e7fbaU, 0xa37eaef4U, 0x35d70a30U, 
++0xedcfef17U, 0xe0e9832cU, 0x30bf19b1U, 0x9ee7db7eU, 
++0xe8a7fc96U, 0x93c1b745U, 0xfc1cb0a4U, 0xb2adf147U, 
++0x109cfe6fU, 0xad893ab0U, 0xaf176313U, 0x2ed4739aU, 
++0x6e92a63dU, 0x9d362301U, 0xf83b02f9U, 0xc6738f0cU, 
++0xc185c52eU, 0xc8841b48U, 0x6793785bU, 0xaa7f7092U, 
++0x4109747bU, 0xc31b9c8dU, 0x71b66dcaU, 0x8b133690U, 
++0xd1193b41U, 0x54fd9995U, 0xc4edd6afU, 0x7e0e5852U, 
++0x3b209e74U, 0x8a5c974cU, 0xf0757d43U, 0x59dbf5aeU, 
++0xce3df0b6U, 0x530bd3b7U, 0x0ad02619U, 0x292239b8U, 
+ };
+ static const u32 Te1[256] = {
+-0x9bb3e250U, 0x0663b4caU, 0xd485e4a2U, 0x02216c46U,
+-0xa83a6f3fU, 0x75a616bdU, 0x10134d06U, 0x9c4d60b9U,
+-0x4d176ab4U, 0x8e7f41f9U, 0x8fe277daU, 0xc9cdec08U,
+-0xd15a0a0dU, 0xaa1b0379U, 0xd37b664bU, 0x57a1e0f7U,
+-0x5afaa55bU, 0x35ea39a5U, 0x73c5a277U, 0x38b17c09U,
+-0xde2023e7U, 0xc0d47128U, 0xf17c9001U, 0x7d22bdbeU,
+-0xcbec804eU, 0x82b93276U, 0xdfbd15c4U, 0x94c9cbbaU,
+-0xd6a488e4U, 0xdc014fa1U, 0x79606532U, 0x07fe82e9U,
+-0x4b74de7eU, 0x31a8e129U, 0x5d0427b2U, 0xd2e65068U,
+-0x33898d6fU, 0x99928e16U, 0xcc1202a7U, 0x0f7a29eaU,
+-0xf71f24cbU, 0x24644280U, 0xa6dd70f6U, 0xa0bec43cU,
+-0xe52d058bU, 0xee15f4edU, 0xea572c61U, 0x881cf533U,
+-0x25f974a3U, 0xa74046d5U, 0x1b2bbc60U, 0xd9dea10eU,
+-0x0442d88cU, 0xcd8f3484U, 0x505f621eU, 0x2a835d49U,
+-0xc2f51d6eU, 0x462f9bd2U, 0x7cbf8b9dU, 0x68ee1e17U,
+-0x9e6c0cffU, 0x91162515U, 0x93374953U, 0x2f5cb3e6U,
+-0x293f072cU, 0x624bd952U, 0x81056813U, 0x3a90104fU,
+-0x7f03d1f8U, 0x6b524472U, 0x1cd53e89U, 0x239ac069U,
+-0x1451958aU, 0xe6915feeU, 0x05dfeeafU, 0x7079f812U,
+-0x3ed2c8c3U, 0xd739bec7U, 0xe8764027U, 0x1d4808aaU,
+-0x6acf7251U, 0x20269a0cU, 0x4eab30d1U, 0x51c2543dU,
+-0x34770f86U, 0x8ba0af56U, 0xfc27d5adU, 0x3f4ffee0U,
+-0xb9b4141aU, 0xb28ce57cU, 0xc72af3c1U, 0x58dbc91dU,
+-0x63d6ef71U, 0x563cd6d4U, 0x0d5b45acU, 0xf53e488dU,
+-0x12322140U, 0xf0e1a622U, 0xff9b8fc8U, 0xd843972dU,
+-0x15cca3a9U, 0x64286d98U, 0x6d31f0b8U, 0xec3498abU,
+-0x69732834U, 0xe16fdd07U, 0xc3682b4dU, 0x8766dcd9U,
+-0x365663c0U, 0xda62fb6bU, 0xbb95785cU, 0x0ee71fc9U,
+-0xb5726795U, 0x37cb55e3U, 0xf35dfc47U, 0x1670f9ccU,
+-0x1ab68a43U, 0x8981c310U, 0x71e4ce31U, 0x3b0d266cU,
+-0x6cacc69bU, 0x80985e30U, 0x84da86bcU, 0x426d435eU,
+-0x1f6964ecU, 0xfe06b9ebU, 0x0884ab03U, 0xfdbae38eU,
+-0xb311d35fU, 0x00000000U, 0x440ef794U, 0x86fbeafaU,
+-0x21bbac2fU, 0xf8650d21U, 0xcfae58c2U, 0xab86355aU,
+-0xa5612a93U, 0x1ef452cfU, 0xfa446167U, 0x77877afbU,
+-0x3cf3a485U, 0xa9a7591cU, 0x2d7ddfa0U, 0x72589454U,
+-0xdd9c7982U, 0x27d818e5U, 0xce336ee1U, 0x2207f64aU,
+-0x0aa5c745U, 0x55808cb1U, 0xc6b7c5e2U, 0xb4ef51b6U,
+-0x4f3606f2U, 0xdbffcd48U, 0x4955b238U, 0xbc6bfab5U,
+-0xe34eb141U, 0x118e7b25U, 0x606ab514U, 0x78fd5311U,
+-0xd518d281U, 0xe2d38762U, 0xe0f2eb24U, 0xebca1a42U,
+-0x7adc3f57U, 0xef88c2ceU, 0x6e8daaddU, 0xa3029e59U,
+-0x09199d20U, 0xe4b033a8U, 0x660901deU, 0xe70c69cdU,
+-0x980fb835U, 0x61f78337U, 0xbdf6cc96U, 0xac78b7b3U,
+-0x977591dfU, 0xc149470bU, 0xade58190U, 0x1897e605U,
+-0xbfd7a0d0U, 0xbe4a96f3U, 0xa29fa87aU, 0x4ae9e85dU,
+-0xc50b9f87U, 0x26452ec6U, 0x03bc5a65U, 0xfbd95744U,
+-0x5c991191U, 0xc496a9a4U, 0x5946ff3eU, 0x404c2f18U,
+-0x679437fdU, 0x53e3387bU, 0x8a3d9975U, 0xd0c73c2eU,
+-0x392c4a2aU, 0x5f254bf4U, 0xa123f21fU, 0x761a4cd8U,
+-0x9dd0569aU, 0x5eb87dd7U, 0x541dba92U, 0x0b38f166U,
+-0x28a2310fU, 0x8c5e2dbfU, 0x8547b09fU, 0x3214bb4cU,
+-0xeda9ae88U, 0xc850da2bU, 0x83240455U, 0xe9eb7604U,
+-0x65b55bbbU, 0x2b1e6b6aU, 0xf68212e8U, 0x9ff13adcU,
+-0xf2c0ca64U, 0xba084e7fU, 0xf4a37eaeU, 0x3035d70aU,
+-0x17edcfefU, 0x2ce0e983U, 0xb130bf19U, 0x7e9ee7dbU,
+-0x96e8a7fcU, 0x4593c1b7U, 0xa4fc1cb0U, 0x47b2adf1U,
+-0x6f109cfeU, 0xb0ad893aU, 0x13af1763U, 0x9a2ed473U,
+-0x3d6e92a6U, 0x019d3623U, 0xf9f83b02U, 0x0cc6738fU,
+-0x2ec185c5U, 0x48c8841bU, 0x5b679378U, 0x92aa7f70U,
+-0x7b410974U, 0x8dc31b9cU, 0xca71b66dU, 0x908b1336U,
+-0x41d1193bU, 0x9554fd99U, 0xafc4edd6U, 0x527e0e58U,
+-0x743b209eU, 0x4c8a5c97U, 0x43f0757dU, 0xae59dbf5U,
+-0xb6ce3df0U, 0xb7530bd3U, 0x190ad026U, 0xb8292239U,
++0x9bb3e250U, 0x0663b4caU, 0xd485e4a2U, 0x02216c46U, 
++0xa83a6f3fU, 0x75a616bdU, 0x10134d06U, 0x9c4d60b9U, 
++0x4d176ab4U, 0x8e7f41f9U, 0x8fe277daU, 0xc9cdec08U, 
++0xd15a0a0dU, 0xaa1b0379U, 0xd37b664bU, 0x57a1e0f7U, 
++0x5afaa55bU, 0x35ea39a5U, 0x73c5a277U, 0x38b17c09U, 
++0xde2023e7U, 0xc0d47128U, 0xf17c9001U, 0x7d22bdbeU, 
++0xcbec804eU, 0x82b93276U, 0xdfbd15c4U, 0x94c9cbbaU, 
++0xd6a488e4U, 0xdc014fa1U, 0x79606532U, 0x07fe82e9U, 
++0x4b74de7eU, 0x31a8e129U, 0x5d0427b2U, 0xd2e65068U, 
++0x33898d6fU, 0x99928e16U, 0xcc1202a7U, 0x0f7a29eaU, 
++0xf71f24cbU, 0x24644280U, 0xa6dd70f6U, 0xa0bec43cU, 
++0xe52d058bU, 0xee15f4edU, 0xea572c61U, 0x881cf533U, 
++0x25f974a3U, 0xa74046d5U, 0x1b2bbc60U, 0xd9dea10eU, 
++0x0442d88cU, 0xcd8f3484U, 0x505f621eU, 0x2a835d49U, 
++0xc2f51d6eU, 0x462f9bd2U, 0x7cbf8b9dU, 0x68ee1e17U, 
++0x9e6c0cffU, 0x91162515U, 0x93374953U, 0x2f5cb3e6U, 
++0x293f072cU, 0x624bd952U, 0x81056813U, 0x3a90104fU, 
++0x7f03d1f8U, 0x6b524472U, 0x1cd53e89U, 0x239ac069U, 
++0x1451958aU, 0xe6915feeU, 0x05dfeeafU, 0x7079f812U, 
++0x3ed2c8c3U, 0xd739bec7U, 0xe8764027U, 0x1d4808aaU, 
++0x6acf7251U, 0x20269a0cU, 0x4eab30d1U, 0x51c2543dU, 
++0x34770f86U, 0x8ba0af56U, 0xfc27d5adU, 0x3f4ffee0U, 
++0xb9b4141aU, 0xb28ce57cU, 0xc72af3c1U, 0x58dbc91dU, 
++0x63d6ef71U, 0x563cd6d4U, 0x0d5b45acU, 0xf53e488dU, 
++0x12322140U, 0xf0e1a622U, 0xff9b8fc8U, 0xd843972dU, 
++0x15cca3a9U, 0x64286d98U, 0x6d31f0b8U, 0xec3498abU, 
++0x69732834U, 0xe16fdd07U, 0xc3682b4dU, 0x8766dcd9U, 
++0x365663c0U, 0xda62fb6bU, 0xbb95785cU, 0x0ee71fc9U, 
++0xb5726795U, 0x37cb55e3U, 0xf35dfc47U, 0x1670f9ccU, 
++0x1ab68a43U, 0x8981c310U, 0x71e4ce31U, 0x3b0d266cU, 
++0x6cacc69bU, 0x80985e30U, 0x84da86bcU, 0x426d435eU, 
++0x1f6964ecU, 0xfe06b9ebU, 0x0884ab03U, 0xfdbae38eU, 
++0xb311d35fU, 0x00000000U, 0x440ef794U, 0x86fbeafaU, 
++0x21bbac2fU, 0xf8650d21U, 0xcfae58c2U, 0xab86355aU, 
++0xa5612a93U, 0x1ef452cfU, 0xfa446167U, 0x77877afbU, 
++0x3cf3a485U, 0xa9a7591cU, 0x2d7ddfa0U, 0x72589454U, 
++0xdd9c7982U, 0x27d818e5U, 0xce336ee1U, 0x2207f64aU, 
++0x0aa5c745U, 0x55808cb1U, 0xc6b7c5e2U, 0xb4ef51b6U, 
++0x4f3606f2U, 0xdbffcd48U, 0x4955b238U, 0xbc6bfab5U, 
++0xe34eb141U, 0x118e7b25U, 0x606ab514U, 0x78fd5311U, 
++0xd518d281U, 0xe2d38762U, 0xe0f2eb24U, 0xebca1a42U, 
++0x7adc3f57U, 0xef88c2ceU, 0x6e8daaddU, 0xa3029e59U, 
++0x09199d20U, 0xe4b033a8U, 0x660901deU, 0xe70c69cdU, 
++0x980fb835U, 0x61f78337U, 0xbdf6cc96U, 0xac78b7b3U, 
++0x977591dfU, 0xc149470bU, 0xade58190U, 0x1897e605U, 
++0xbfd7a0d0U, 0xbe4a96f3U, 0xa29fa87aU, 0x4ae9e85dU, 
++0xc50b9f87U, 0x26452ec6U, 0x03bc5a65U, 0xfbd95744U, 
++0x5c991191U, 0xc496a9a4U, 0x5946ff3eU, 0x404c2f18U, 
++0x679437fdU, 0x53e3387bU, 0x8a3d9975U, 0xd0c73c2eU, 
++0x392c4a2aU, 0x5f254bf4U, 0xa123f21fU, 0x761a4cd8U, 
++0x9dd0569aU, 0x5eb87dd7U, 0x541dba92U, 0x0b38f166U, 
++0x28a2310fU, 0x8c5e2dbfU, 0x8547b09fU, 0x3214bb4cU, 
++0xeda9ae88U, 0xc850da2bU, 0x83240455U, 0xe9eb7604U, 
++0x65b55bbbU, 0x2b1e6b6aU, 0xf68212e8U, 0x9ff13adcU, 
++0xf2c0ca64U, 0xba084e7fU, 0xf4a37eaeU, 0x3035d70aU, 
++0x17edcfefU, 0x2ce0e983U, 0xb130bf19U, 0x7e9ee7dbU, 
++0x96e8a7fcU, 0x4593c1b7U, 0xa4fc1cb0U, 0x47b2adf1U, 
++0x6f109cfeU, 0xb0ad893aU, 0x13af1763U, 0x9a2ed473U, 
++0x3d6e92a6U, 0x019d3623U, 0xf9f83b02U, 0x0cc6738fU, 
++0x2ec185c5U, 0x48c8841bU, 0x5b679378U, 0x92aa7f70U, 
++0x7b410974U, 0x8dc31b9cU, 0xca71b66dU, 0x908b1336U, 
++0x41d1193bU, 0x9554fd99U, 0xafc4edd6U, 0x527e0e58U, 
++0x743b209eU, 0x4c8a5c97U, 0x43f0757dU, 0xae59dbf5U, 
++0xb6ce3df0U, 0xb7530bd3U, 0x190ad026U, 0xb8292239U, 
+ };
+ static const u32 Te2[256] = {
+-0x509bb3e2U, 0xca0663b4U, 0xa2d485e4U, 0x4602216cU,
+-0x3fa83a6fU, 0xbd75a616U, 0x0610134dU, 0xb99c4d60U,
+-0xb44d176aU, 0xf98e7f41U, 0xda8fe277U, 0x08c9cdecU,
+-0x0dd15a0aU, 0x79aa1b03U, 0x4bd37b66U, 0xf757a1e0U,
+-0x5b5afaa5U, 0xa535ea39U, 0x7773c5a2U, 0x0938b17cU,
+-0xe7de2023U, 0x28c0d471U, 0x01f17c90U, 0xbe7d22bdU,
+-0x4ecbec80U, 0x7682b932U, 0xc4dfbd15U, 0xba94c9cbU,
+-0xe4d6a488U, 0xa1dc014fU, 0x32796065U, 0xe907fe82U,
+-0x7e4b74deU, 0x2931a8e1U, 0xb25d0427U, 0x68d2e650U,
+-0x6f33898dU, 0x1699928eU, 0xa7cc1202U, 0xea0f7a29U,
+-0xcbf71f24U, 0x80246442U, 0xf6a6dd70U, 0x3ca0bec4U,
+-0x8be52d05U, 0xedee15f4U, 0x61ea572cU, 0x33881cf5U,
+-0xa325f974U, 0xd5a74046U, 0x601b2bbcU, 0x0ed9dea1U,
+-0x8c0442d8U, 0x84cd8f34U, 0x1e505f62U, 0x492a835dU,
+-0x6ec2f51dU, 0xd2462f9bU, 0x9d7cbf8bU, 0x1768ee1eU,
+-0xff9e6c0cU, 0x15911625U, 0x53933749U, 0xe62f5cb3U,
+-0x2c293f07U, 0x52624bd9U, 0x13810568U, 0x4f3a9010U,
+-0xf87f03d1U, 0x726b5244U, 0x891cd53eU, 0x69239ac0U,
+-0x8a145195U, 0xeee6915fU, 0xaf05dfeeU, 0x127079f8U,
+-0xc33ed2c8U, 0xc7d739beU, 0x27e87640U, 0xaa1d4808U,
+-0x516acf72U, 0x0c20269aU, 0xd14eab30U, 0x3d51c254U,
+-0x8634770fU, 0x568ba0afU, 0xadfc27d5U, 0xe03f4ffeU,
+-0x1ab9b414U, 0x7cb28ce5U, 0xc1c72af3U, 0x1d58dbc9U,
+-0x7163d6efU, 0xd4563cd6U, 0xac0d5b45U, 0x8df53e48U,
+-0x40123221U, 0x22f0e1a6U, 0xc8ff9b8fU, 0x2dd84397U,
+-0xa915cca3U, 0x9864286dU, 0xb86d31f0U, 0xabec3498U,
+-0x34697328U, 0x07e16fddU, 0x4dc3682bU, 0xd98766dcU,
+-0xc0365663U, 0x6bda62fbU, 0x5cbb9578U, 0xc90ee71fU,
+-0x95b57267U, 0xe337cb55U, 0x47f35dfcU, 0xcc1670f9U,
+-0x431ab68aU, 0x108981c3U, 0x3171e4ceU, 0x6c3b0d26U,
+-0x9b6cacc6U, 0x3080985eU, 0xbc84da86U, 0x5e426d43U,
+-0xec1f6964U, 0xebfe06b9U, 0x030884abU, 0x8efdbae3U,
+-0x5fb311d3U, 0x00000000U, 0x94440ef7U, 0xfa86fbeaU,
+-0x2f21bbacU, 0x21f8650dU, 0xc2cfae58U, 0x5aab8635U,
+-0x93a5612aU, 0xcf1ef452U, 0x67fa4461U, 0xfb77877aU,
+-0x853cf3a4U, 0x1ca9a759U, 0xa02d7ddfU, 0x54725894U,
+-0x82dd9c79U, 0xe527d818U, 0xe1ce336eU, 0x4a2207f6U,
+-0x450aa5c7U, 0xb155808cU, 0xe2c6b7c5U, 0xb6b4ef51U,
+-0xf24f3606U, 0x48dbffcdU, 0x384955b2U, 0xb5bc6bfaU,
+-0x41e34eb1U, 0x25118e7bU, 0x14606ab5U, 0x1178fd53U,
+-0x81d518d2U, 0x62e2d387U, 0x24e0f2ebU, 0x42ebca1aU,
+-0x577adc3fU, 0xceef88c2U, 0xdd6e8daaU, 0x59a3029eU,
+-0x2009199dU, 0xa8e4b033U, 0xde660901U, 0xcde70c69U,
+-0x35980fb8U, 0x3761f783U, 0x96bdf6ccU, 0xb3ac78b7U,
+-0xdf977591U, 0x0bc14947U, 0x90ade581U, 0x051897e6U,
+-0xd0bfd7a0U, 0xf3be4a96U, 0x7aa29fa8U, 0x5d4ae9e8U,
+-0x87c50b9fU, 0xc626452eU, 0x6503bc5aU, 0x44fbd957U,
+-0x915c9911U, 0xa4c496a9U, 0x3e5946ffU, 0x18404c2fU,
+-0xfd679437U, 0x7b53e338U, 0x758a3d99U, 0x2ed0c73cU,
+-0x2a392c4aU, 0xf45f254bU, 0x1fa123f2U, 0xd8761a4cU,
+-0x9a9dd056U, 0xd75eb87dU, 0x92541dbaU, 0x660b38f1U,
+-0x0f28a231U, 0xbf8c5e2dU, 0x9f8547b0U, 0x4c3214bbU,
+-0x88eda9aeU, 0x2bc850daU, 0x55832404U, 0x04e9eb76U,
+-0xbb65b55bU, 0x6a2b1e6bU, 0xe8f68212U, 0xdc9ff13aU,
+-0x64f2c0caU, 0x7fba084eU, 0xaef4a37eU, 0x0a3035d7U,
+-0xef17edcfU, 0x832ce0e9U, 0x19b130bfU, 0xdb7e9ee7U,
+-0xfc96e8a7U, 0xb74593c1U, 0xb0a4fc1cU, 0xf147b2adU,
+-0xfe6f109cU, 0x3ab0ad89U, 0x6313af17U, 0x739a2ed4U,
+-0xa63d6e92U, 0x23019d36U, 0x02f9f83bU, 0x8f0cc673U,
+-0xc52ec185U, 0x1b48c884U, 0x785b6793U, 0x7092aa7fU,
+-0x747b4109U, 0x9c8dc31bU, 0x6dca71b6U, 0x36908b13U,
+-0x3b41d119U, 0x999554fdU, 0xd6afc4edU, 0x58527e0eU,
+-0x9e743b20U, 0x974c8a5cU, 0x7d43f075U, 0xf5ae59dbU,
+-0xf0b6ce3dU, 0xd3b7530bU, 0x26190ad0U, 0x39b82922U,
++0x509bb3e2U, 0xca0663b4U, 0xa2d485e4U, 0x4602216cU, 
++0x3fa83a6fU, 0xbd75a616U, 0x0610134dU, 0xb99c4d60U, 
++0xb44d176aU, 0xf98e7f41U, 0xda8fe277U, 0x08c9cdecU, 
++0x0dd15a0aU, 0x79aa1b03U, 0x4bd37b66U, 0xf757a1e0U, 
++0x5b5afaa5U, 0xa535ea39U, 0x7773c5a2U, 0x0938b17cU, 
++0xe7de2023U, 0x28c0d471U, 0x01f17c90U, 0xbe7d22bdU, 
++0x4ecbec80U, 0x7682b932U, 0xc4dfbd15U, 0xba94c9cbU, 
++0xe4d6a488U, 0xa1dc014fU, 0x32796065U, 0xe907fe82U, 
++0x7e4b74deU, 0x2931a8e1U, 0xb25d0427U, 0x68d2e650U, 
++0x6f33898dU, 0x1699928eU, 0xa7cc1202U, 0xea0f7a29U, 
++0xcbf71f24U, 0x80246442U, 0xf6a6dd70U, 0x3ca0bec4U, 
++0x8be52d05U, 0xedee15f4U, 0x61ea572cU, 0x33881cf5U, 
++0xa325f974U, 0xd5a74046U, 0x601b2bbcU, 0x0ed9dea1U, 
++0x8c0442d8U, 0x84cd8f34U, 0x1e505f62U, 0x492a835dU, 
++0x6ec2f51dU, 0xd2462f9bU, 0x9d7cbf8bU, 0x1768ee1eU, 
++0xff9e6c0cU, 0x15911625U, 0x53933749U, 0xe62f5cb3U, 
++0x2c293f07U, 0x52624bd9U, 0x13810568U, 0x4f3a9010U, 
++0xf87f03d1U, 0x726b5244U, 0x891cd53eU, 0x69239ac0U, 
++0x8a145195U, 0xeee6915fU, 0xaf05dfeeU, 0x127079f8U, 
++0xc33ed2c8U, 0xc7d739beU, 0x27e87640U, 0xaa1d4808U, 
++0x516acf72U, 0x0c20269aU, 0xd14eab30U, 0x3d51c254U, 
++0x8634770fU, 0x568ba0afU, 0xadfc27d5U, 0xe03f4ffeU, 
++0x1ab9b414U, 0x7cb28ce5U, 0xc1c72af3U, 0x1d58dbc9U, 
++0x7163d6efU, 0xd4563cd6U, 0xac0d5b45U, 0x8df53e48U, 
++0x40123221U, 0x22f0e1a6U, 0xc8ff9b8fU, 0x2dd84397U, 
++0xa915cca3U, 0x9864286dU, 0xb86d31f0U, 0xabec3498U, 
++0x34697328U, 0x07e16fddU, 0x4dc3682bU, 0xd98766dcU, 
++0xc0365663U, 0x6bda62fbU, 0x5cbb9578U, 0xc90ee71fU, 
++0x95b57267U, 0xe337cb55U, 0x47f35dfcU, 0xcc1670f9U, 
++0x431ab68aU, 0x108981c3U, 0x3171e4ceU, 0x6c3b0d26U, 
++0x9b6cacc6U, 0x3080985eU, 0xbc84da86U, 0x5e426d43U, 
++0xec1f6964U, 0xebfe06b9U, 0x030884abU, 0x8efdbae3U, 
++0x5fb311d3U, 0x00000000U, 0x94440ef7U, 0xfa86fbeaU, 
++0x2f21bbacU, 0x21f8650dU, 0xc2cfae58U, 0x5aab8635U, 
++0x93a5612aU, 0xcf1ef452U, 0x67fa4461U, 0xfb77877aU, 
++0x853cf3a4U, 0x1ca9a759U, 0xa02d7ddfU, 0x54725894U, 
++0x82dd9c79U, 0xe527d818U, 0xe1ce336eU, 0x4a2207f6U, 
++0x450aa5c7U, 0xb155808cU, 0xe2c6b7c5U, 0xb6b4ef51U, 
++0xf24f3606U, 0x48dbffcdU, 0x384955b2U, 0xb5bc6bfaU, 
++0x41e34eb1U, 0x25118e7bU, 0x14606ab5U, 0x1178fd53U, 
++0x81d518d2U, 0x62e2d387U, 0x24e0f2ebU, 0x42ebca1aU, 
++0x577adc3fU, 0xceef88c2U, 0xdd6e8daaU, 0x59a3029eU, 
++0x2009199dU, 0xa8e4b033U, 0xde660901U, 0xcde70c69U, 
++0x35980fb8U, 0x3761f783U, 0x96bdf6ccU, 0xb3ac78b7U, 
++0xdf977591U, 0x0bc14947U, 0x90ade581U, 0x051897e6U, 
++0xd0bfd7a0U, 0xf3be4a96U, 0x7aa29fa8U, 0x5d4ae9e8U, 
++0x87c50b9fU, 0xc626452eU, 0x6503bc5aU, 0x44fbd957U, 
++0x915c9911U, 0xa4c496a9U, 0x3e5946ffU, 0x18404c2fU, 
++0xfd679437U, 0x7b53e338U, 0x758a3d99U, 0x2ed0c73cU, 
++0x2a392c4aU, 0xf45f254bU, 0x1fa123f2U, 0xd8761a4cU, 
++0x9a9dd056U, 0xd75eb87dU, 0x92541dbaU, 0x660b38f1U, 
++0x0f28a231U, 0xbf8c5e2dU, 0x9f8547b0U, 0x4c3214bbU, 
++0x88eda9aeU, 0x2bc850daU, 0x55832404U, 0x04e9eb76U, 
++0xbb65b55bU, 0x6a2b1e6bU, 0xe8f68212U, 0xdc9ff13aU, 
++0x64f2c0caU, 0x7fba084eU, 0xaef4a37eU, 0x0a3035d7U, 
++0xef17edcfU, 0x832ce0e9U, 0x19b130bfU, 0xdb7e9ee7U, 
++0xfc96e8a7U, 0xb74593c1U, 0xb0a4fc1cU, 0xf147b2adU, 
++0xfe6f109cU, 0x3ab0ad89U, 0x6313af17U, 0x739a2ed4U, 
++0xa63d6e92U, 0x23019d36U, 0x02f9f83bU, 0x8f0cc673U, 
++0xc52ec185U, 0x1b48c884U, 0x785b6793U, 0x7092aa7fU, 
++0x747b4109U, 0x9c8dc31bU, 0x6dca71b6U, 0x36908b13U, 
++0x3b41d119U, 0x999554fdU, 0xd6afc4edU, 0x58527e0eU, 
++0x9e743b20U, 0x974c8a5cU, 0x7d43f075U, 0xf5ae59dbU, 
++0xf0b6ce3dU, 0xd3b7530bU, 0x26190ad0U, 0x39b82922U, 
+ };
+ static const u32 Te3[256] = {
+-0xe2509bb3U, 0xb4ca0663U, 0xe4a2d485U, 0x6c460221U,
+-0x6f3fa83aU, 0x16bd75a6U, 0x4d061013U, 0x60b99c4dU,
+-0x6ab44d17U, 0x41f98e7fU, 0x77da8fe2U, 0xec08c9cdU,
+-0x0a0dd15aU, 0x0379aa1bU, 0x664bd37bU, 0xe0f757a1U,
+-0xa55b5afaU, 0x39a535eaU, 0xa27773c5U, 0x7c0938b1U,
+-0x23e7de20U, 0x7128c0d4U, 0x9001f17cU, 0xbdbe7d22U,
+-0x804ecbecU, 0x327682b9U, 0x15c4dfbdU, 0xcbba94c9U,
+-0x88e4d6a4U, 0x4fa1dc01U, 0x65327960U, 0x82e907feU,
+-0xde7e4b74U, 0xe12931a8U, 0x27b25d04U, 0x5068d2e6U,
+-0x8d6f3389U, 0x8e169992U, 0x02a7cc12U, 0x29ea0f7aU,
+-0x24cbf71fU, 0x42802464U, 0x70f6a6ddU, 0xc43ca0beU,
+-0x058be52dU, 0xf4edee15U, 0x2c61ea57U, 0xf533881cU,
+-0x74a325f9U, 0x46d5a740U, 0xbc601b2bU, 0xa10ed9deU,
+-0xd88c0442U, 0x3484cd8fU, 0x621e505fU, 0x5d492a83U,
+-0x1d6ec2f5U, 0x9bd2462fU, 0x8b9d7cbfU, 0x1e1768eeU,
+-0x0cff9e6cU, 0x25159116U, 0x49539337U, 0xb3e62f5cU,
+-0x072c293fU, 0xd952624bU, 0x68138105U, 0x104f3a90U,
+-0xd1f87f03U, 0x44726b52U, 0x3e891cd5U, 0xc069239aU,
+-0x958a1451U, 0x5feee691U, 0xeeaf05dfU, 0xf8127079U,
+-0xc8c33ed2U, 0xbec7d739U, 0x4027e876U, 0x08aa1d48U,
+-0x72516acfU, 0x9a0c2026U, 0x30d14eabU, 0x543d51c2U,
+-0x0f863477U, 0xaf568ba0U, 0xd5adfc27U, 0xfee03f4fU,
+-0x141ab9b4U, 0xe57cb28cU, 0xf3c1c72aU, 0xc91d58dbU,
+-0xef7163d6U, 0xd6d4563cU, 0x45ac0d5bU, 0x488df53eU,
+-0x21401232U, 0xa622f0e1U, 0x8fc8ff9bU, 0x972dd843U,
+-0xa3a915ccU, 0x6d986428U, 0xf0b86d31U, 0x98abec34U,
+-0x28346973U, 0xdd07e16fU, 0x2b4dc368U, 0xdcd98766U,
+-0x63c03656U, 0xfb6bda62U, 0x785cbb95U, 0x1fc90ee7U,
+-0x6795b572U, 0x55e337cbU, 0xfc47f35dU, 0xf9cc1670U,
+-0x8a431ab6U, 0xc3108981U, 0xce3171e4U, 0x266c3b0dU,
+-0xc69b6cacU, 0x5e308098U, 0x86bc84daU, 0x435e426dU,
+-0x64ec1f69U, 0xb9ebfe06U, 0xab030884U, 0xe38efdbaU,
+-0xd35fb311U, 0x00000000U, 0xf794440eU, 0xeafa86fbU,
+-0xac2f21bbU, 0x0d21f865U, 0x58c2cfaeU, 0x355aab86U,
+-0x2a93a561U, 0x52cf1ef4U, 0x6167fa44U, 0x7afb7787U,
+-0xa4853cf3U, 0x591ca9a7U, 0xdfa02d7dU, 0x94547258U,
+-0x7982dd9cU, 0x18e527d8U, 0x6ee1ce33U, 0xf64a2207U,
+-0xc7450aa5U, 0x8cb15580U, 0xc5e2c6b7U, 0x51b6b4efU,
+-0x06f24f36U, 0xcd48dbffU, 0xb2384955U, 0xfab5bc6bU,
+-0xb141e34eU, 0x7b25118eU, 0xb514606aU, 0x531178fdU,
+-0xd281d518U, 0x8762e2d3U, 0xeb24e0f2U, 0x1a42ebcaU,
+-0x3f577adcU, 0xc2ceef88U, 0xaadd6e8dU, 0x9e59a302U,
+-0x9d200919U, 0x33a8e4b0U, 0x01de6609U, 0x69cde70cU,
+-0xb835980fU, 0x833761f7U, 0xcc96bdf6U, 0xb7b3ac78U,
+-0x91df9775U, 0x470bc149U, 0x8190ade5U, 0xe6051897U,
+-0xa0d0bfd7U, 0x96f3be4aU, 0xa87aa29fU, 0xe85d4ae9U,
+-0x9f87c50bU, 0x2ec62645U, 0x5a6503bcU, 0x5744fbd9U,
+-0x11915c99U, 0xa9a4c496U, 0xff3e5946U, 0x2f18404cU,
+-0x37fd6794U, 0x387b53e3U, 0x99758a3dU, 0x3c2ed0c7U,
+-0x4a2a392cU, 0x4bf45f25U, 0xf21fa123U, 0x4cd8761aU,
+-0x569a9dd0U, 0x7dd75eb8U, 0xba92541dU, 0xf1660b38U,
+-0x310f28a2U, 0x2dbf8c5eU, 0xb09f8547U, 0xbb4c3214U,
+-0xae88eda9U, 0xda2bc850U, 0x04558324U, 0x7604e9ebU,
+-0x5bbb65b5U, 0x6b6a2b1eU, 0x12e8f682U, 0x3adc9ff1U,
+-0xca64f2c0U, 0x4e7fba08U, 0x7eaef4a3U, 0xd70a3035U,
+-0xcfef17edU, 0xe9832ce0U, 0xbf19b130U, 0xe7db7e9eU,
+-0xa7fc96e8U, 0xc1b74593U, 0x1cb0a4fcU, 0xadf147b2U,
+-0x9cfe6f10U, 0x893ab0adU, 0x176313afU, 0xd4739a2eU,
+-0x92a63d6eU, 0x3623019dU, 0x3b02f9f8U, 0x738f0cc6U,
+-0x85c52ec1U, 0x841b48c8U, 0x93785b67U, 0x7f7092aaU,
+-0x09747b41U, 0x1b9c8dc3U, 0xb66dca71U, 0x1336908bU,
+-0x193b41d1U, 0xfd999554U, 0xedd6afc4U, 0x0e58527eU,
+-0x209e743bU, 0x5c974c8aU, 0x757d43f0U, 0xdbf5ae59U,
+-0x3df0b6ceU, 0x0bd3b753U, 0xd026190aU, 0x2239b829U,
++0xe2509bb3U, 0xb4ca0663U, 0xe4a2d485U, 0x6c460221U, 
++0x6f3fa83aU, 0x16bd75a6U, 0x4d061013U, 0x60b99c4dU, 
++0x6ab44d17U, 0x41f98e7fU, 0x77da8fe2U, 0xec08c9cdU, 
++0x0a0dd15aU, 0x0379aa1bU, 0x664bd37bU, 0xe0f757a1U, 
++0xa55b5afaU, 0x39a535eaU, 0xa27773c5U, 0x7c0938b1U, 
++0x23e7de20U, 0x7128c0d4U, 0x9001f17cU, 0xbdbe7d22U, 
++0x804ecbecU, 0x327682b9U, 0x15c4dfbdU, 0xcbba94c9U, 
++0x88e4d6a4U, 0x4fa1dc01U, 0x65327960U, 0x82e907feU, 
++0xde7e4b74U, 0xe12931a8U, 0x27b25d04U, 0x5068d2e6U, 
++0x8d6f3389U, 0x8e169992U, 0x02a7cc12U, 0x29ea0f7aU, 
++0x24cbf71fU, 0x42802464U, 0x70f6a6ddU, 0xc43ca0beU, 
++0x058be52dU, 0xf4edee15U, 0x2c61ea57U, 0xf533881cU, 
++0x74a325f9U, 0x46d5a740U, 0xbc601b2bU, 0xa10ed9deU, 
++0xd88c0442U, 0x3484cd8fU, 0x621e505fU, 0x5d492a83U, 
++0x1d6ec2f5U, 0x9bd2462fU, 0x8b9d7cbfU, 0x1e1768eeU, 
++0x0cff9e6cU, 0x25159116U, 0x49539337U, 0xb3e62f5cU, 
++0x072c293fU, 0xd952624bU, 0x68138105U, 0x104f3a90U, 
++0xd1f87f03U, 0x44726b52U, 0x3e891cd5U, 0xc069239aU, 
++0x958a1451U, 0x5feee691U, 0xeeaf05dfU, 0xf8127079U, 
++0xc8c33ed2U, 0xbec7d739U, 0x4027e876U, 0x08aa1d48U, 
++0x72516acfU, 0x9a0c2026U, 0x30d14eabU, 0x543d51c2U, 
++0x0f863477U, 0xaf568ba0U, 0xd5adfc27U, 0xfee03f4fU, 
++0x141ab9b4U, 0xe57cb28cU, 0xf3c1c72aU, 0xc91d58dbU, 
++0xef7163d6U, 0xd6d4563cU, 0x45ac0d5bU, 0x488df53eU, 
++0x21401232U, 0xa622f0e1U, 0x8fc8ff9bU, 0x972dd843U, 
++0xa3a915ccU, 0x6d986428U, 0xf0b86d31U, 0x98abec34U, 
++0x28346973U, 0xdd07e16fU, 0x2b4dc368U, 0xdcd98766U, 
++0x63c03656U, 0xfb6bda62U, 0x785cbb95U, 0x1fc90ee7U, 
++0x6795b572U, 0x55e337cbU, 0xfc47f35dU, 0xf9cc1670U, 
++0x8a431ab6U, 0xc3108981U, 0xce3171e4U, 0x266c3b0dU, 
++0xc69b6cacU, 0x5e308098U, 0x86bc84daU, 0x435e426dU, 
++0x64ec1f69U, 0xb9ebfe06U, 0xab030884U, 0xe38efdbaU, 
++0xd35fb311U, 0x00000000U, 0xf794440eU, 0xeafa86fbU, 
++0xac2f21bbU, 0x0d21f865U, 0x58c2cfaeU, 0x355aab86U, 
++0x2a93a561U, 0x52cf1ef4U, 0x6167fa44U, 0x7afb7787U, 
++0xa4853cf3U, 0x591ca9a7U, 0xdfa02d7dU, 0x94547258U, 
++0x7982dd9cU, 0x18e527d8U, 0x6ee1ce33U, 0xf64a2207U, 
++0xc7450aa5U, 0x8cb15580U, 0xc5e2c6b7U, 0x51b6b4efU, 
++0x06f24f36U, 0xcd48dbffU, 0xb2384955U, 0xfab5bc6bU, 
++0xb141e34eU, 0x7b25118eU, 0xb514606aU, 0x531178fdU, 
++0xd281d518U, 0x8762e2d3U, 0xeb24e0f2U, 0x1a42ebcaU, 
++0x3f577adcU, 0xc2ceef88U, 0xaadd6e8dU, 0x9e59a302U, 
++0x9d200919U, 0x33a8e4b0U, 0x01de6609U, 0x69cde70cU, 
++0xb835980fU, 0x833761f7U, 0xcc96bdf6U, 0xb7b3ac78U, 
++0x91df9775U, 0x470bc149U, 0x8190ade5U, 0xe6051897U, 
++0xa0d0bfd7U, 0x96f3be4aU, 0xa87aa29fU, 0xe85d4ae9U, 
++0x9f87c50bU, 0x2ec62645U, 0x5a6503bcU, 0x5744fbd9U, 
++0x11915c99U, 0xa9a4c496U, 0xff3e5946U, 0x2f18404cU, 
++0x37fd6794U, 0x387b53e3U, 0x99758a3dU, 0x3c2ed0c7U, 
++0x4a2a392cU, 0x4bf45f25U, 0xf21fa123U, 0x4cd8761aU, 
++0x569a9dd0U, 0x7dd75eb8U, 0xba92541dU, 0xf1660b38U, 
++0x310f28a2U, 0x2dbf8c5eU, 0xb09f8547U, 0xbb4c3214U, 
++0xae88eda9U, 0xda2bc850U, 0x04558324U, 0x7604e9ebU, 
++0x5bbb65b5U, 0x6b6a2b1eU, 0x12e8f682U, 0x3adc9ff1U, 
++0xca64f2c0U, 0x4e7fba08U, 0x7eaef4a3U, 0xd70a3035U, 
++0xcfef17edU, 0xe9832ce0U, 0xbf19b130U, 0xe7db7e9eU, 
++0xa7fc96e8U, 0xc1b74593U, 0x1cb0a4fcU, 0xadf147b2U, 
++0x9cfe6f10U, 0x893ab0adU, 0x176313afU, 0xd4739a2eU, 
++0x92a63d6eU, 0x3623019dU, 0x3b02f9f8U, 0x738f0cc6U, 
++0x85c52ec1U, 0x841b48c8U, 0x93785b67U, 0x7f7092aaU, 
++0x09747b41U, 0x1b9c8dc3U, 0xb66dca71U, 0x1336908bU, 
++0x193b41d1U, 0xfd999554U, 0xedd6afc4U, 0x0e58527eU, 
++0x209e743bU, 0x5c974c8aU, 0x757d43f0U, 0xdbf5ae59U, 
++0x3df0b6ceU, 0x0bd3b753U, 0xd026190aU, 0x2239b829U, 
+ };
+ static const u32 Te4[256] = {
+-0x18181818U, 0x23232323U, 0xc6c6c6c6U, 0xe8e8e8e8U,
+-0x87878787U, 0xb8b8b8b8U, 0x01010101U, 0x4f4f4f4fU,
+-0x36363636U, 0xa6a6a6a6U, 0xd2d2d2d2U, 0xf5f5f5f5U,
+-0x79797979U, 0x6f6f6f6fU, 0x91919191U, 0x52525252U,
+-0x60606060U, 0xbcbcbcbcU, 0x9b9b9b9bU, 0x8e8e8e8eU,
+-0xa3a3a3a3U, 0x0c0c0c0cU, 0x7b7b7b7bU, 0x35353535U,
+-0x1d1d1d1dU, 0xe0e0e0e0U, 0xd7d7d7d7U, 0xc2c2c2c2U,
+-0x2e2e2e2eU, 0x4b4b4b4bU, 0xfefefefeU, 0x57575757U,
+-0x15151515U, 0x77777777U, 0x37373737U, 0xe5e5e5e5U,
+-0x9f9f9f9fU, 0xf0f0f0f0U, 0x4a4a4a4aU, 0xdadadadaU,
+-0x58585858U, 0xc9c9c9c9U, 0x29292929U, 0x0a0a0a0aU,
+-0xb1b1b1b1U, 0xa0a0a0a0U, 0x6b6b6b6bU, 0x85858585U,
+-0xbdbdbdbdU, 0x5d5d5d5dU, 0x10101010U, 0xf4f4f4f4U,
+-0xcbcbcbcbU, 0x3e3e3e3eU, 0x05050505U, 0x67676767U,
+-0xe4e4e4e4U, 0x27272727U, 0x41414141U, 0x8b8b8b8bU,
+-0xa7a7a7a7U, 0x7d7d7d7dU, 0x95959595U, 0xd8d8d8d8U,
+-0xfbfbfbfbU, 0xeeeeeeeeU, 0x7c7c7c7cU, 0x66666666U,
+-0xddddddddU, 0x17171717U, 0x47474747U, 0x9e9e9e9eU,
+-0xcacacacaU, 0x2d2d2d2dU, 0xbfbfbfbfU, 0x07070707U,
+-0xadadadadU, 0x5a5a5a5aU, 0x83838383U, 0x33333333U,
+-0x63636363U, 0x02020202U, 0xaaaaaaaaU, 0x71717171U,
+-0xc8c8c8c8U, 0x19191919U, 0x49494949U, 0xd9d9d9d9U,
+-0xf2f2f2f2U, 0xe3e3e3e3U, 0x5b5b5b5bU, 0x88888888U,
+-0x9a9a9a9aU, 0x26262626U, 0x32323232U, 0xb0b0b0b0U,
+-0xe9e9e9e9U, 0x0f0f0f0fU, 0xd5d5d5d5U, 0x80808080U,
+-0xbebebebeU, 0xcdcdcdcdU, 0x34343434U, 0x48484848U,
+-0xffffffffU, 0x7a7a7a7aU, 0x90909090U, 0x5f5f5f5fU,
+-0x20202020U, 0x68686868U, 0x1a1a1a1aU, 0xaeaeaeaeU,
+-0xb4b4b4b4U, 0x54545454U, 0x93939393U, 0x22222222U,
+-0x64646464U, 0xf1f1f1f1U, 0x73737373U, 0x12121212U,
+-0x40404040U, 0x08080808U, 0xc3c3c3c3U, 0xececececU,
+-0xdbdbdbdbU, 0xa1a1a1a1U, 0x8d8d8d8dU, 0x3d3d3d3dU,
+-0x97979797U, 0x00000000U, 0xcfcfcfcfU, 0x2b2b2b2bU,
+-0x76767676U, 0x82828282U, 0xd6d6d6d6U, 0x1b1b1b1bU,
+-0xb5b5b5b5U, 0xafafafafU, 0x6a6a6a6aU, 0x50505050U,
+-0x45454545U, 0xf3f3f3f3U, 0x30303030U, 0xefefefefU,
+-0x3f3f3f3fU, 0x55555555U, 0xa2a2a2a2U, 0xeaeaeaeaU,
+-0x65656565U, 0xbabababaU, 0x2f2f2f2fU, 0xc0c0c0c0U,
+-0xdedededeU, 0x1c1c1c1cU, 0xfdfdfdfdU, 0x4d4d4d4dU,
+-0x92929292U, 0x75757575U, 0x06060606U, 0x8a8a8a8aU,
+-0xb2b2b2b2U, 0xe6e6e6e6U, 0x0e0e0e0eU, 0x1f1f1f1fU,
+-0x62626262U, 0xd4d4d4d4U, 0xa8a8a8a8U, 0x96969696U,
+-0xf9f9f9f9U, 0xc5c5c5c5U, 0x25252525U, 0x59595959U,
+-0x84848484U, 0x72727272U, 0x39393939U, 0x4c4c4c4cU,
+-0x5e5e5e5eU, 0x78787878U, 0x38383838U, 0x8c8c8c8cU,
+-0xd1d1d1d1U, 0xa5a5a5a5U, 0xe2e2e2e2U, 0x61616161U,
+-0xb3b3b3b3U, 0x21212121U, 0x9c9c9c9cU, 0x1e1e1e1eU,
+-0x43434343U, 0xc7c7c7c7U, 0xfcfcfcfcU, 0x04040404U,
+-0x51515151U, 0x99999999U, 0x6d6d6d6dU, 0x0d0d0d0dU,
+-0xfafafafaU, 0xdfdfdfdfU, 0x7e7e7e7eU, 0x24242424U,
+-0x3b3b3b3bU, 0xababababU, 0xcecececeU, 0x11111111U,
+-0x8f8f8f8fU, 0x4e4e4e4eU, 0xb7b7b7b7U, 0xebebebebU,
+-0x3c3c3c3cU, 0x81818181U, 0x94949494U, 0xf7f7f7f7U,
+-0xb9b9b9b9U, 0x13131313U, 0x2c2c2c2cU, 0xd3d3d3d3U,
+-0xe7e7e7e7U, 0x6e6e6e6eU, 0xc4c4c4c4U, 0x03030303U,
+-0x56565656U, 0x44444444U, 0x7f7f7f7fU, 0xa9a9a9a9U,
+-0x2a2a2a2aU, 0xbbbbbbbbU, 0xc1c1c1c1U, 0x53535353U,
+-0xdcdcdcdcU, 0x0b0b0b0bU, 0x9d9d9d9dU, 0x6c6c6c6cU,
+-0x31313131U, 0x74747474U, 0xf6f6f6f6U, 0x46464646U,
+-0xacacacacU, 0x89898989U, 0x14141414U, 0xe1e1e1e1U,
+-0x16161616U, 0x3a3a3a3aU, 0x69696969U, 0x09090909U,
+-0x70707070U, 0xb6b6b6b6U, 0xd0d0d0d0U, 0xededededU,
+-0xccccccccU, 0x42424242U, 0x98989898U, 0xa4a4a4a4U,
+-0x28282828U, 0x5c5c5c5cU, 0xf8f8f8f8U, 0x86868686U,
++0x18181818U, 0x23232323U, 0xc6c6c6c6U, 0xe8e8e8e8U, 
++0x87878787U, 0xb8b8b8b8U, 0x01010101U, 0x4f4f4f4fU, 
++0x36363636U, 0xa6a6a6a6U, 0xd2d2d2d2U, 0xf5f5f5f5U, 
++0x79797979U, 0x6f6f6f6fU, 0x91919191U, 0x52525252U, 
++0x60606060U, 0xbcbcbcbcU, 0x9b9b9b9bU, 0x8e8e8e8eU, 
++0xa3a3a3a3U, 0x0c0c0c0cU, 0x7b7b7b7bU, 0x35353535U, 
++0x1d1d1d1dU, 0xe0e0e0e0U, 0xd7d7d7d7U, 0xc2c2c2c2U, 
++0x2e2e2e2eU, 0x4b4b4b4bU, 0xfefefefeU, 0x57575757U, 
++0x15151515U, 0x77777777U, 0x37373737U, 0xe5e5e5e5U, 
++0x9f9f9f9fU, 0xf0f0f0f0U, 0x4a4a4a4aU, 0xdadadadaU, 
++0x58585858U, 0xc9c9c9c9U, 0x29292929U, 0x0a0a0a0aU, 
++0xb1b1b1b1U, 0xa0a0a0a0U, 0x6b6b6b6bU, 0x85858585U, 
++0xbdbdbdbdU, 0x5d5d5d5dU, 0x10101010U, 0xf4f4f4f4U, 
++0xcbcbcbcbU, 0x3e3e3e3eU, 0x05050505U, 0x67676767U, 
++0xe4e4e4e4U, 0x27272727U, 0x41414141U, 0x8b8b8b8bU, 
++0xa7a7a7a7U, 0x7d7d7d7dU, 0x95959595U, 0xd8d8d8d8U, 
++0xfbfbfbfbU, 0xeeeeeeeeU, 0x7c7c7c7cU, 0x66666666U, 
++0xddddddddU, 0x17171717U, 0x47474747U, 0x9e9e9e9eU, 
++0xcacacacaU, 0x2d2d2d2dU, 0xbfbfbfbfU, 0x07070707U, 
++0xadadadadU, 0x5a5a5a5aU, 0x83838383U, 0x33333333U, 
++0x63636363U, 0x02020202U, 0xaaaaaaaaU, 0x71717171U, 
++0xc8c8c8c8U, 0x19191919U, 0x49494949U, 0xd9d9d9d9U, 
++0xf2f2f2f2U, 0xe3e3e3e3U, 0x5b5b5b5bU, 0x88888888U, 
++0x9a9a9a9aU, 0x26262626U, 0x32323232U, 0xb0b0b0b0U, 
++0xe9e9e9e9U, 0x0f0f0f0fU, 0xd5d5d5d5U, 0x80808080U, 
++0xbebebebeU, 0xcdcdcdcdU, 0x34343434U, 0x48484848U, 
++0xffffffffU, 0x7a7a7a7aU, 0x90909090U, 0x5f5f5f5fU, 
++0x20202020U, 0x68686868U, 0x1a1a1a1aU, 0xaeaeaeaeU, 
++0xb4b4b4b4U, 0x54545454U, 0x93939393U, 0x22222222U, 
++0x64646464U, 0xf1f1f1f1U, 0x73737373U, 0x12121212U, 
++0x40404040U, 0x08080808U, 0xc3c3c3c3U, 0xececececU, 
++0xdbdbdbdbU, 0xa1a1a1a1U, 0x8d8d8d8dU, 0x3d3d3d3dU, 
++0x97979797U, 0x00000000U, 0xcfcfcfcfU, 0x2b2b2b2bU, 
++0x76767676U, 0x82828282U, 0xd6d6d6d6U, 0x1b1b1b1bU, 
++0xb5b5b5b5U, 0xafafafafU, 0x6a6a6a6aU, 0x50505050U, 
++0x45454545U, 0xf3f3f3f3U, 0x30303030U, 0xefefefefU, 
++0x3f3f3f3fU, 0x55555555U, 0xa2a2a2a2U, 0xeaeaeaeaU, 
++0x65656565U, 0xbabababaU, 0x2f2f2f2fU, 0xc0c0c0c0U, 
++0xdedededeU, 0x1c1c1c1cU, 0xfdfdfdfdU, 0x4d4d4d4dU, 
++0x92929292U, 0x75757575U, 0x06060606U, 0x8a8a8a8aU, 
++0xb2b2b2b2U, 0xe6e6e6e6U, 0x0e0e0e0eU, 0x1f1f1f1fU, 
++0x62626262U, 0xd4d4d4d4U, 0xa8a8a8a8U, 0x96969696U, 
++0xf9f9f9f9U, 0xc5c5c5c5U, 0x25252525U, 0x59595959U, 
++0x84848484U, 0x72727272U, 0x39393939U, 0x4c4c4c4cU, 
++0x5e5e5e5eU, 0x78787878U, 0x38383838U, 0x8c8c8c8cU, 
++0xd1d1d1d1U, 0xa5a5a5a5U, 0xe2e2e2e2U, 0x61616161U, 
++0xb3b3b3b3U, 0x21212121U, 0x9c9c9c9cU, 0x1e1e1e1eU, 
++0x43434343U, 0xc7c7c7c7U, 0xfcfcfcfcU, 0x04040404U, 
++0x51515151U, 0x99999999U, 0x6d6d6d6dU, 0x0d0d0d0dU, 
++0xfafafafaU, 0xdfdfdfdfU, 0x7e7e7e7eU, 0x24242424U, 
++0x3b3b3b3bU, 0xababababU, 0xcecececeU, 0x11111111U, 
++0x8f8f8f8fU, 0x4e4e4e4eU, 0xb7b7b7b7U, 0xebebebebU, 
++0x3c3c3c3cU, 0x81818181U, 0x94949494U, 0xf7f7f7f7U, 
++0xb9b9b9b9U, 0x13131313U, 0x2c2c2c2cU, 0xd3d3d3d3U, 
++0xe7e7e7e7U, 0x6e6e6e6eU, 0xc4c4c4c4U, 0x03030303U, 
++0x56565656U, 0x44444444U, 0x7f7f7f7fU, 0xa9a9a9a9U, 
++0x2a2a2a2aU, 0xbbbbbbbbU, 0xc1c1c1c1U, 0x53535353U, 
++0xdcdcdcdcU, 0x0b0b0b0bU, 0x9d9d9d9dU, 0x6c6c6c6cU, 
++0x31313131U, 0x74747474U, 0xf6f6f6f6U, 0x46464646U, 
++0xacacacacU, 0x89898989U, 0x14141414U, 0xe1e1e1e1U, 
++0x16161616U, 0x3a3a3a3aU, 0x69696969U, 0x09090909U, 
++0x70707070U, 0xb6b6b6b6U, 0xd0d0d0d0U, 0xededededU, 
++0xccccccccU, 0x42424242U, 0x98989898U, 0xa4a4a4a4U, 
++0x28282828U, 0x5c5c5c5cU, 0xf8f8f8f8U, 0x86868686U, 
+ };
diff --git a/package/maradns/patches/patch-server_Makefile b/package/maradns/patches/patch-server_Makefile
new file mode 100644
index 000000000..96595433b
--- /dev/null
+++ b/package/maradns/patches/patch-server_Makefile
@@ -0,0 +1,28 @@
+--- maradns-1.4.03.orig/server/Makefile	2006-01-02 17:59:33.000000000 +0100
++++ maradns-1.4.03/server/Makefile	2010-02-06 00:19:48.471836901 +0100
+@@ -1,11 +1,13 @@
+-SOBJECTS=MaraBigHash.o recursive.o timestamp.o read_kvars.o MaraAnyChain.o
++SOBJECTS=MaraBigHash.o recursive.o timestamp.o read_kvars.o MaraAnyChain.o \
++	udpsuccess.o
+ JOBJS=../libs/JsStr.o ../libs/JsStrOS.o ../libs/JsStrCP.o 
+ MHOBJS=../libs/MaraHash.o
+ MJOBJS=../qual/qual_timestamp.o
++POBJ6=../parse/Csv2_rr_wks.o
+ POBJ5=../parse/Csv2_database.o ../parse/Csv2_rr_txt.o ../parse/Csv2_esc_txt.o
+ POBJ3=../parse/Csv2_rr_soa.o ../parse/Csv2_rr_aaaa.o ../parse/Csv2_rr_a.o
+ POBJ2=../parse/Csv2_read.o ../parse/Csv2_main.o ../parse/Csv2_parse.o $(POBJ3)
+-POBJ4=../parse/ParseIpAcl.o ../parse/Parse_ipv6.o $(POBJ2)
++POBJ4=../parse/ParseIpAcl.o ../parse/Parse_ipv6.o $(POBJ2) $(POBJ6)
+ POBJECTS=../parse/ParseMaraRc.o ../parse/ParseCsv1.o $(POBJ4) $(POBJ5)
+ DOBJECTS=../dns/Queries.o ../dns/Compress.o ../dns/bobbit.o ../dns/Decompress.o
+ ROBJECTS=../rng/rng-api-fst.o ../rng/rng-alg-fst.o
+@@ -46,6 +48,9 @@ timestamp.o: timestamp.c MaraDNS_locale.
+ MaraAnyChain.o: MaraAnyChain.c
+ 	$(CC) -c $(FLAGS) -o MaraAnyChain.o MaraAnyChain.c
+ 
++udpsuccess.o: udpsuccess.c
++	$(CC) -c $(FLAGS) -o udpsuccess.o udpsuccess.c
++
+ maradns: MaraDNS.c $(OBJECTS) MaraDNS_locale.h
+ 	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
+ 
diff --git a/package/maradns/patches/patch-tcp_Makefile b/package/maradns/patches/patch-tcp_Makefile
new file mode 100644
index 000000000..cbb673b59
--- /dev/null
+++ b/package/maradns/patches/patch-tcp_Makefile
@@ -0,0 +1,24 @@
+--- maradns-1.4.03.orig/tcp/Makefile	2005-12-20 11:10:40.000000000 +0100
++++ maradns-1.4.03/tcp/Makefile	2010-02-06 00:19:48.481829524 +0100
+@@ -2,10 +2,11 @@ JOBJS=../libs/JsStr.o ../libs/JsStrOS.o 
+ MJOBJS=../qual/qual_timestamp.o
+ MHOBJS=../libs/MaraHash.o
+ DOBJECTS=../dns/Queries.o ../dns/Compress.o ../dns/bobbit.o ../dns/Decompress.o
++POBJ6=../parse/Csv2_rr_wks.o
+ POBJ5=../parse/Csv2_database.o ../parse/Csv2_rr_txt.o ../parse/Csv2_esc_txt.o
+ POBJ3=../parse/Csv2_rr_soa.o ../parse/Csv2_rr_aaaa.o ../parse/Csv2_rr_a.o
+ POBJ2=../parse/Csv2_read.o ../parse/Csv2_main.o ../parse/Csv2_parse.o $(POBJ3)
+-POBJ4=../parse/ParseIpAcl.o ../parse/Parse_ipv6.o $(POBJ2)
++POBJ4=../parse/ParseIpAcl.o ../parse/Parse_ipv6.o $(POBJ2) $(POBJ6)
+ POBJECTS=../parse/ParseMaraRc.o ../parse/ParseCsv1.o $(POBJ4) $(POBJ5)
+ OBJECTS=../parse/ParseCsv1.o ../parse/ParseMaraRc.o ../parse/ParseIpAcl.o
+ SOBJECTS=../server/timestamp.o ../server/MaraBigHash.o ../server/read_kvars.o \
+@@ -16,7 +17,7 @@ OBJECTS=$(JOBJS) $(MHOBJS) $(MJOBJS) $(D
+ 	$(TCPOBJS)
+ EXECS=getzone zoneserver fetchzone
+ 
+-FLAGS = -g -Wall $(DEBUG)
++#FLAGS = -g -Wall $(DEBUG)
+ #FLAGS = -g $(DEBUG)
+ 
+ all: $(EXECS)
diff --git a/package/mc/Makefile b/package/mc/Makefile
index 20b232bc1..1b89c5b09 100644
--- a/package/mc/Makefile
+++ b/package/mc/Makefile
@@ -4,22 +4,23 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME=		mc
-PKG_VERSION=		4.6.1
+PKG_VERSION=		4.7.0.2
 PKG_RELEASE=		1
-PKG_BUILDDEP+=		glib ncurses
-PKG_MD5SUM=		18b20db6e40480a53bac2870c56fc3c4
+PKG_MD5SUM=		f48b2c8dd140aeb36f59d16a662f0779
 PKG_DESCR:=		norton commander clone
 PKG_SECTION:=		misc
-PKG_DEPENDS:=		libncurses glib
-PKG_URL:=		http://www.midnight-commander.org
-PKG_SITES=		http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/
+PKG_NOPARALLEL:=	1
+PKG_DEPENDS:=		glib libncurses
+PKG_BUILDDEP+=		glib ncurses
+PKG_URL:=		http://www.midnight-commander.org/
+PKG_SITES=		http://openadk.org/distfiles/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,MC,mc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	--disable-charset \
+CONFIGURE_ARGS+=	--enable-charset \
+			--disable-extcharset \
 			--disable-background \
 			--disable-gcc-warnings \
 			--disable-glibtest \
@@ -36,20 +37,14 @@ CONFIGURE_ARGS+=	--disable-charset \
 			--with-screen=ncurses \
 			--with-edit
 CONFIGURE_ENV+=		mc_cv_have_zipinfo=yes \
-			ac_cv_lib_nsl_t_accept=no \
-			ac_cv_lib_nsl_gethostbyname=no \
 			am_cv_func_iconv=no
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-
-pre-install:
-	cp ${WRKSRC}/doc/xnc.hlp ${WRKSRC}/doc/mc.hlp
 
 post-install:
-	${INSTALL_DIR} ${IDIR_MC}/usr/{bin,share/mc}
-	${CP} ${WRKINST}/usr/bin/mc ${IDIR_MC}/usr/bin/
-	cd ${IDIR_MC}/usr/bin && ln -s mc mcedit && ln -s mc mcview
-	cd ${WRKINST}/usr/share/mc && ${CP} cedit.menu mc.ext mc.hint \
-	    mc.lib mc.menu syntax extfs ${IDIR_MC}/usr/share/mc/
+	${INSTALL_DIR} ${IDIR_MC}/etc/mc
+	${INSTALL_DIR} ${IDIR_MC}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/mc ${IDIR_MC}/usr/bin/
+	cd ${IDIR_MC}/usr/bin && ln -fs mc mcedit && ln -fs mc mcview
+	cd ${WRKINST}/etc/mc && ${CP} cedit.menu mc.ext \
+	    mc.lib mc.menu extfs ${IDIR_MC}/etc/mc/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mc/patches/patch-Makefile_in b/package/mc/patches/patch-Makefile_in
new file mode 100644
index 000000000..db881370a
--- /dev/null
+++ b/package/mc/patches/patch-Makefile_in
@@ -0,0 +1,11 @@
+--- mc-4.7.0.2.orig/Makefile.in	2010-02-02 16:24:55.000000000 +0100
++++ mc-4.7.0.2/Makefile.in	2010-02-06 00:46:00.203084693 +0100
+@@ -308,7 +308,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.5
+-SUBDIRS = intl po lib src doc contrib misc
++SUBDIRS = intl po lib src contrib misc
+ EXTRA_DIST = 
+ dist_noinst_SCRIPTS = build-glib2.sh
+ dist_noinst_HEADERS = $(top_srcdir)/version.h
diff --git a/package/mc/patches/patch-lib_mc_ext_in b/package/mc/patches/patch-lib_mc_ext_in
deleted file mode 100644
index 3169ca23a..000000000
--- a/package/mc/patches/patch-lib_mc_ext_in
+++ /dev/null
@@ -1,92 +0,0 @@
-$Id$
-$MirOS: ports/misc/mc/patches/patch-lib_mc_ext_in,v 1.7 2006/09/28 20:31:52 tg Exp $
---- mc-4.6.1.orig/lib/mc.ext.in	2005-07-23 16:51:15.000000000 +0000
-+++ mc-4.6.1/lib/mc.ext.in	2007-03-20 13:32:10.000000000 +0000
-@@ -106,6 +106,42 @@
- 
- ### Archives ###
- 
-+## CPIO
-+
-+# .cgz
-+shell/.cgz
-+	Open=%cd %p#ucpio
-+	View=%view{ascii} gzip -dc %f 2>/dev/null | cpio -itv 2>/dev/null
-+
-+# .cbz
-+shell/.cbz
-+	Open=%cd %p#ucpio
-+	View=%view{ascii} bzip2 -dc %f 2>/dev/null | cpio -itv 2>/dev/null
-+
-+## CPIO (newc) - MirOS extension
-+
-+# .ngz
-+shell/.ngz
-+	Open=%cd %p#ucpio
-+	View=%view{ascii} gzip -dc %f 2>/dev/null | cpio -itv 2>/dev/null
-+
-+# .nbz
-+shell/.nbz
-+	Open=%cd %p#ucpio
-+	View=%view{ascii} bzip2 -dc %f 2>/dev/null | cpio -itv 2>/dev/null
-+
-+# .mcz
-+shell/.mcz
-+	Open=%cd %p#ucpio
-+	View=%view{ascii} gzip -dc %f 2>/dev/null | cpio -itv 2>/dev/null
-+
-+## USTAR
-+
-+# .tbz
-+shell/.tbz
-+	Open=%cd %p#utar
-+	View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf -
-+
- # .tgz, .tpz, .tar.gz, .tar.z, .tar.Z
- regex/\.t([gp]?z|ar\.g?[zZ])$
- 	Open=%cd %p#utar
-@@ -135,6 +171,10 @@ regex/\.(tar|TAR)$
- 	View=%view{ascii} tar tvvf %f
- 
- # lha
-+regex/\.[Ll]([Zz][Hh]|[Hh][Aa])$
-+	Open=%cd %p#ulha
-+	View=%view{ascii} lha l %f
-+
- type/^LHa\ .*archive
- 	Open=%cd %p#ulha
- 	View=%view{ascii} lha l %f
-@@ -191,13 +231,20 @@ regex/\.(rpm|spm)$
- 	Open=%cd %p#rpm
- 	View=%view{ascii} if rpm --nosignature --version >/dev/null 2>&1; then RPM="rpm --nosignature" ; else RPM="rpm" ; fi ; $RPM -qivlp --scripts %f
- 
--# deb
-+# deb - Debian packages
- regex/\.u?deb$
--	Open=%cd %p#deb
--	View=%view{ascii} dpkg-deb -c %f
-+#	Open=%cd %p#deb
-+#	View=%view{ascii} dpkg-deb -c %f
-+	Open=%cd %p#uar
-+	View=%view{ascii} ar p %f control.tar.gz | gzip -d | tar xOf - ./control; echo; ar p %f data.tar.gz | gzip -d | tar tvvf -
-+
-+# ipk - like deb, but tgz instead of ar
-+shell/.ipk
-+	Open=%cd %p#utar
-+	View=%view{ascii} gzip -dc %f 2>&- | tar xOf - ./control.tar.gz | gzip -d | tar xOf - ./control; echo; gzip -dc %f 2>&- | tar xOf - ./data.tar.gz | gzip -d | tar tvvf -
- 
- # ISO9660
--regex/\.iso$
-+regex/\.[Ii][Ss][Oo]$
- 	Open=%cd %p#iso9660
- 	View=%view{ascii} isoinfo -l -i %f
- 
-@@ -417,7 +464,7 @@ type/^PDF
- 
- # html
- regex/\.([hH][tT][mM][lL]?)$
--	Open=(if test -n "@X11_WWW@" && test -n "$DISPLAY"; then (@X11_WWW@ file://%d/%p &) 1>&2; else links %f || lynx -force_html %f || ${PAGER:-more} %f; fi) 2>/dev/null
-+	Open=lynx -force_html %f
- 	View=%view{ascii} lynx -dump -force_html %f
- 
- # StarOffice 5.2
diff --git a/package/mc/patches/patch-lib_mc_lib b/package/mc/patches/patch-lib_mc_lib
deleted file mode 100644
index 51445e0fe..000000000
--- a/package/mc/patches/patch-lib_mc_lib
+++ /dev/null
@@ -1,378 +0,0 @@
-$Id$
-$MirOS: ports/misc/mc/patches/patch-lib_mc_lib,v 1.9 2007/03/01 23:56:43 tg Exp $
---- mc-4.6.1.orig/lib/mc.lib	2004-09-10 09:23:44.000000000 +0000
-+++ mc-4.6.1/lib/mc.lib	2007-03-20 13:32:10.000000000 +0000
-@@ -1,8 +1,27 @@
-+# $MirOS: ports/misc/mc/patches/patch-lib_mc_lib,v 1.9 2007/03/01 23:56:43 tg Exp $
-+#-
-+# Copyright (c) 2003, 2004, 2005, 2006
-+#	Thorsten Glaser <tg@mirbsd.de>
-+#
-+# Provided that these terms and disclaimer and all copyright notices
-+# are retained or reproduced in an accompanying document, permission
-+# is granted to deal in this work without restriction, including un-
-+# limited rights to use, publicly perform, distribute, sell, modify,
-+# merge, give away, or sublicence.
-+#
-+# This work is provided "AS IS" and WITHOUT WARRANTY of any kind, to
-+# the utmost extent permitted by applicable law, neither express nor
-+# implied; without malicious intent or gross negligence. In no event
-+# may a licensor, author or contributor be held liable for indirect,
-+# direct, other damage, loss, or other issues arising in any way out
-+# of dealing in the work, even if advised of the possibility of such
-+# damage or existence of a defect, except proven that it results out
-+# of said person's immediate fault when using the work as intended.
-+
- [Special dirs]
- list=/afs,/coda,/:,/...,/net,/#smb
- 
- [terminal:console]
--insert=\e[2~
- f11=\e[23~
- f12=\e[24~
- f13=\e[25~
-@@ -13,25 +32,25 @@ f17=\e[31~
- f18=\e[32~
- f19=\e[33~
- f20=\e[34~
--kpleft=\eOt
--kpright=\eOv
--kpup=\eOx
-+insert=\e[2~
-+kpasterix=\eOR
-+kpdelete=\eOn
- kpdown=\eOr
--kphome=\eOw
- kpend=\eOq
-+kpenter=\eOM
-+kphome=\eOw
-+kpinsert=\eOp
-+kpleft=\eOt
-+kpminus=\eOS
- kpnpage=\eOs
--kpppage=\eOy
-+kpnumlock=\eOP
- kpplus=\eOl
--kpminus=\eOS
--kpasterix=\eOR
--kpinsert=\eOp
--kpdelete=\eOn
--kpenter=\eOM
-+kpppage=\eOy
-+kpright=\eOv
- kpslash=\eOQ
--kpnumlock=\eOP
-+kpup=\eOx
- 
- [terminal:linux]
--insert=\e[2~
- f11=\e[23~
- f12=\e[24~
- f13=\e[25~
-@@ -42,25 +61,31 @@ f17=\e[31~
- f18=\e[32~
- f19=\e[33~
- f20=\e[34~
--kpleft=\eOt
--kpright=\eOv
--kpup=\eOx
-+insert=\e[2~
-+kpasterix=\eOR
-+kpdelete=\eOn
- kpdown=\eOr
--kphome=\eOw
- kpend=\eOq
-+kpenter=\eOM
-+kphome=\eOw
-+kpinsert=\eOp
-+kpleft=\eOt
-+kpminus=\eOS
- kpnpage=\eOs
--kpppage=\eOy
-+kpnumlock=\eOP
- kpplus=\eOl
--kpminus=\eOS
--kpasterix=\eOR
--kpinsert=\eOp
--kpdelete=\eOn
--kpenter=\eOM
-+kpppage=\eOy
-+kpright=\eOv
- kpslash=\eOQ
--kpnumlock=\eOP
-+kpup=\eOx
- 
- [terminal:xterm]
--insert=\e[2~
-+bs=
-+delete=\e[3~
-+end=\eOF
-+end=\e[4~
-+end=\e[8~
-+end=\e[F
- f11=\e[23~
- f12=\e[24~
- f13=\e[25~
-@@ -71,27 +96,22 @@ f17=\e[31~
- f18=\e[32~
- f19=\e[33~
- f20=\e[34~
--kpleft=\eOt
--kpright=\eOv
--kpup=\eOx
-+home=\eOH
-+home=\e[1~
-+home=\e[7~
-+home=\e[H
-+insert=\e[2~
-+kpasterix=\eOj
- kpdown=\eOr
--kphome=\eOw
- kpend=\eOq
-+kphome=\eOw
-+kpleft=\eOt
-+kpminus=\eOm
- kpnpage=\eOs
--kpppage=\eOy
- kpplus=\eOk
--kpminus=\eOm
--kpasterix=\eOj
--delete=\e[3~
--bs=
--home=\e[1~
--home=\e[7~
--end=\eOF
--end=\e[F
--end=\e[4~
--end=\e[8~
--home=\eOH
--home=\e[H
-+kpppage=\eOy
-+kpright=\eOv
-+kpup=\eOx
- pgdn=\e[6~
- pgup=\e[5~
- 
-@@ -108,14 +128,14 @@ f19=\e[20;2~
- f20=\e[21;2~
- 
- # Arrows for both keypad modes (application and normal).
--up=\e[A
--up=\eOA
--down=\e[B
- down=\eOB
--right=\e[C
--right=\eOC
--left=\e[D
-+down=\e[B
- left=\eOD
-+left=\e[D
-+right=\eOC
-+right=\e[C
-+up=\eOA
-+up=\e[A
- 
- [terminal:gnome]
- copy=xterm
-@@ -126,8 +146,15 @@ copy=xterm
- [terminal:xterm-new]
- copy=xterm
- 
-+[terminal:xterm-xfree86]
-+copy=xterm
-+
- [terminal:xterm-color]
--insert=\e[2~
-+bs=
-+delete=\e[3~
-+end=\eOF
-+end=\e[4~
-+end=\e[8~
- f11=\e[23~
- f12=\e[24~
- f13=\e[25~
-@@ -138,29 +165,27 @@ f17=\e[31~
- f18=\e[32~
- f19=\e[33~
- f20=\e[34~
--kpleft=\eOt
--kpright=\eOv
--kpup=\eOx
-+home=\eOH
-+home=\e[1~
-+home=\e[7~
-+insert=\e[2~
-+kpasterix=\eOj
- kpdown=\eOr
--kphome=\eOw
- kpend=\eOq
-+kphome=\eOw
-+kpleft=\eOt
-+kpminus=\eOm
- kpnpage=\eOs
--kpppage=\eOy
- kpplus=\eOk
--kpminus=\eOm
--kpasterix=\eOj
--delete=\e[3~
--bs=
--home=\e[1~
--home=\e[7~
--home=\eOH
--end=\e[4~
--end=\e[8~
--end=\eOF
-+kpppage=\eOy
-+kpright=\eOv
-+kpup=\eOx
- pgdn=\e[6~
- pgup=\e[5~
- 
- [terminal:ibmpc3]
-+bs=^h
-+end=\e[F
- f11=\e[Y
- f12=\e[Z
- f13=\e[a
-@@ -171,11 +196,9 @@ f17=\e[e
- f18=\e[f
- f19=\e[g
- f20=\e[h
--bs=^h
--end=\e[F
--kpplus=\e[+
--kpminus=\e[-
- kpasterix=\e[*
-+kpminus=\e[-
-+kpplus=\e[+
- 
- [terminal:cons25]
- f11=\e[Y
-@@ -188,3 +211,127 @@ f17=\e[e
- f18=\e[f
- f19=\e[g
- f20=\e[h
-+
-+# Sequences below are used in OpenBSD wscons, also via remote login
-+
-+[terminal:vt220]
-+bs=
-+end=\e[8~
-+f1=\e[11~
-+f2=\e[12~
-+f3=\e[13~
-+f4=\e[14~
-+f5=\e[15~
-+f6=\e[17~
-+f7=\e[18~
-+f8=\e[19~
-+f9=\e[20~
-+f10=\e[21~
-+f11=\e[23~
-+f12=\e[24~
-+home=\e[7~
-+
-+[terminal:wsvt25]
-+bs=
-+end=\e[8~
-+f1=\e[11~
-+f2=\e[12~
-+f3=\e[13~
-+f4=\e[14~
-+f5=\e[15~
-+f6=\e[17~
-+f7=\e[18~
-+f8=\e[19~
-+f9=\e[20~
-+f10=\e[21~
-+f11=\e[23~
-+f12=\e[24~
-+home=\e[7~
-+
-+[terminal:wsvtg]
-+bs=
-+end=\e[8~
-+f1=\e[11~
-+f2=\e[12~
-+f3=\e[13~
-+f4=\e[14~
-+f5=\e[15~
-+f6=\e[17~
-+f7=\e[18~
-+f8=\e[19~
-+f9=\e[20~
-+f10=\e[21~
-+f11=\e[23~
-+f12=\e[24~
-+home=\e[7~
-+
-+# Not a real vt100, but NetBSD wscons in vt220 mode with
-+# $TERM set to vt100. Except F5-F9, this matches screen.
-+
-+[terminal:vt100]
-+bs=
-+complete=�
-+delete=\e[3~
-+end=\e[8~
-+f1=\e[11~
-+f2=\e[12~
-+f3=\e[13~
-+f4=\e[14~
-+f5=\e[15~
-+f6=\e[17~
-+f7=\e[18~
-+f8=\e[19~
-+f9=\e[20~
-+f10=\e[21~
-+f11=\e[23~
-+f12=\e[24~
-+home=\e[7~
-+insert=\e[2~
-+pgdn=\e[6~
-+pgup=\e[5~
-+
-+# GNU screen - depending on its environment, here: wsvt25
-+[terminal:screen]
-+end=\e[8~
-+f10=\e[20~
-+f1=\e[11~
-+f2=\e[12~
-+f3=\e[13~
-+f4=\e[14~
-+f5=\e[15~
-+f6=\e[15~
-+f7=\e[17~
-+f8=\e[18~
-+f9=\e[19~
-+home=\e[7~
-+
-+# PuTTY
-+[terminal:ansi]
-+bs=^h
-+down=\eOB
-+f1=\eOP
-+f2=\eOQ
-+f3=\eOR
-+f4=\eOS
-+left=\eOD
-+right=\eOC
-+up=\eOA
-+
-+# Windows 3.1 TELNET.EXE
-+# (not really useful. The F-Keys, INS etc. don't work.)
-+[terminal:ansi-nt]
-+f1=\eOP
-+f2=\eOQ
-+f3=\eOR
-+f4=\eOS
-+bs=^h
-+up=\e[A
-+down=\e[B
-+left=\e[D
-+right=\e[C
-+delete=
-+
-+# Microsoft Services for Unix 3.5 (native terminal, xterm see above)
-+[terminal:interix]
-+home=\e[H
-+delete=
diff --git a/package/mc/patches/patch-lib_mc_menu b/package/mc/patches/patch-lib_mc_menu
deleted file mode 100644
index c29c0a79d..000000000
--- a/package/mc/patches/patch-lib_mc_menu
+++ /dev/null
@@ -1,17 +0,0 @@
-$Id$
-$MirOS: ports/misc/mc/patches/patch-lib_mc_menu,v 1.9 2007/03/01 23:56:43 tg Exp $
---- mc-4.6.1.orig/lib/mc.menu	2004-08-17 08:31:16.000000000 +0000
-+++ mc-4.6.1/lib/mc.menu	2007-03-20 13:32:10.000000000 +0000
-@@ -1,4 +1,12 @@
- shell_patterns=0
-++ t r & ! t t
-+u       Diff file against opposite
-+	diff -dupa %f %D/%F 2>&1 | less
-+
-+= t d
-+U       Diff dir against opposite
-+	diff -pdu . %D 2>&1 | grep -v "^Only in " | less
-+
- + ! t t
- @       Do something on the current file
- 	CMD=%{Enter command}
diff --git a/package/mc/patches/patch-src_key_c b/package/mc/patches/patch-src_key_c
deleted file mode 100644
index 00b504c71..000000000
--- a/package/mc/patches/patch-src_key_c
+++ /dev/null
@@ -1,13 +0,0 @@
-$Id$
-$MirOS: ports/misc/mc/patches/patch-src_key_c,v 1.1 2006/10/28 22:35:47 tg Exp $
---- mc-4.6.1.orig/src/key.c	2005-06-08 12:27:19.000000000 +0000
-+++ mc-4.6.1/src/key.c	2007-03-20 13:32:10.000000000 +0000
-@@ -86,7 +86,7 @@ int mou_auto_repeat = 100;
- int double_click_speed = 250;
- int old_esc_mode = 0;
- 
--int use_8th_bit_as_meta = 0;
-+int use_8th_bit_as_meta = 1;
- 
- typedef struct key_def {
-     char ch;			/* Holds the matching char code */
diff --git a/package/mc/patches/patch-src_main_c b/package/mc/patches/patch-src_main_c
deleted file mode 100644
index f7b29b3d0..000000000
--- a/package/mc/patches/patch-src_main_c
+++ /dev/null
@@ -1,13 +0,0 @@
-$Id$
-$MirOS: ports/misc/mc/patches/patch-src_main_c,v 1.6 2006/10/28 22:35:48 tg Exp $
---- mc-4.6.1.orig/src/main.c	2005-07-23 16:52:02.000000000 +0000
-+++ mc-4.6.1/src/main.c	2007-03-20 13:32:10.000000000 +0000
-@@ -150,7 +150,7 @@ int auto_save_setup = 1;
- 
- #ifndef HAVE_CHARSET
- /* If true, allow characters in the range 160-255 */
--int eight_bit_clean = 1;
-+int eight_bit_clean = 0;
- 
- /*
-  * If true, also allow characters in the range 128-159.
diff --git a/package/mc/patches/patch-vfs_extfs_iso9660_in b/package/mc/patches/patch-vfs_extfs_iso9660_in
deleted file mode 100644
index d515ff0a8..000000000
--- a/package/mc/patches/patch-vfs_extfs_iso9660_in
+++ /dev/null
@@ -1,31 +0,0 @@
-$Id$
-$MirOS: ports/misc/mc/patches/patch-vfs_extfs_iso9660_in,v 1.1 2006/09/28 20:39:05 tg Exp $
-
-	This does limit names to the C locale, but skips error messages.
-
---- mc-4.6.1.orig/vfs/extfs/iso9660.in	2004-10-29 09:14:38.000000000 +0000
-+++ mc-4.6.1/vfs/extfs/iso9660.in	2007-03-20 13:32:10.000000000 +0000
-@@ -9,15 +9,7 @@
- # tested to comply with isoinfo 2.0's output
- 
- test_iso () {
--    CHARSET=`echo "$save_ctype" | sed -n -e 's/.*\.\(.*\)"$/\1/p' | tr '[A-Z]' '[a-z]'`
--    if test -n "$CHARSET"; then
--	isoinfo -j $CHARSET 2>&1 | grep "Unknown charset" >/dev/null && CHARSET=
--    fi
--    if test -n "$CHARSET"; then
--	JOLIET_OPT="-j $CHARSET -J"
--    else
- 	JOLIET_OPT="-J"
--    fi
-     ISOINFO="isoinfo -R"
-     isoinfo -d -i "$1" | grep "NO Joliet" > /dev/null || ISOINFO="$ISOINFO $JOLIET_OPT"
- }
-@@ -65,7 +57,6 @@ mcisofs_copyout () {
- 	$ISOINFO -i "$1" -x "/$2" > "$3" 
- }
- 
--save_ctype=`locale | grep LC_CTYPE`
- LC_ALL=C
- 
- cmd="$1"
diff --git a/package/mdadm/Makefile b/package/mdadm/Makefile
index 28f61ee6d..217279c9a 100644
--- a/package/mdadm/Makefile
+++ b/package/mdadm/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mdadm
-PKG_VERSION:=		3.0
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		1eb89885b2b881562fc79ed2f5e1a056
+PKG_VERSION:=		3.1.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		8bfeea282d21b5ef8e825122fb359457
 PKG_DESCR:=		tool for managing Linux Software RAID arrays
 PKG_SECTION:=		utils
 PKG_URL:=		http://neil.brown.name/blog/mdadm
@@ -16,9 +16,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MDADM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+
 XAKE_FLAGS+=		CROSS_COMPILE="${TARGET_CROSS}"
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_MDADM}/usr/sbin
diff --git a/package/mdadm/patches/patch-Makefile b/package/mdadm/patches/patch-Makefile
index 79b801c74..cbe429082 100644
--- a/package/mdadm/patches/patch-Makefile
+++ b/package/mdadm/patches/patch-Makefile
@@ -1,5 +1,14 @@
---- mdadm-3.0.orig/Makefile	2009-06-02 07:48:29.000000000 +0200
-+++ mdadm-3.0/Makefile	2010-01-16 09:36:14.000000000 +0100
+--- mdadm-3.1.1.orig/Makefile	2009-11-16 23:55:41.000000000 +0100
++++ mdadm-3.1.1/Makefile	2010-02-06 01:09:39.963074463 +0100
+@@ -42,7 +42,7 @@ KLIBC_GCC = gcc -nostdinc -iwithprefix i
+ 
+ CC = $(CROSS_COMPILE)gcc
+ CXFLAGS = -ggdb
+-CWFLAGS = -Wall -Werror -Wstrict-prototypes
++CWFLAGS = -Wall -Wstrict-prototypes
+ ifdef WARN_UNUSED
+ CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O
+ endif
 @@ -58,7 +58,8 @@ CONFFILE = $(SYSCONFDIR)/mdadm.conf
  CONFFILE2 = $(SYSCONFDIR)/mdadm/mdadm.conf
  MAILCMD =/usr/sbin/sendmail -t
@@ -17,8 +26,8 @@
 -	$(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
 -	$(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
 +	$(INSTALL) -d $(DESTDIR)$(BINDIR) 
-+	$(INSTALL) $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
-+	$(INSTALL) $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
++	$(INSTALL) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
++	$(INSTALL) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
  
  install-static : mdadm.static install-man
 -	$(INSTALL) -D $(STRIP) -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm
diff --git a/package/mdadm/patches/patch-platform-intel_c b/package/mdadm/patches/patch-platform-intel_c
index 1e6e113a1..3102306e7 100644
--- a/package/mdadm/patches/patch-platform-intel_c
+++ b/package/mdadm/patches/patch-platform-intel_c
@@ -1,5 +1,5 @@
---- mdadm-3.0.orig/platform-intel.c	2009-06-02 07:48:29.000000000 +0200
-+++ mdadm-3.0/platform-intel.c	2009-09-02 19:30:09.000000000 +0200
+--- mdadm-3.1.1.orig/platform-intel.c	2009-11-16 23:55:41.000000000 +0100
++++ mdadm-3.1.1/platform-intel.c	2010-02-06 01:07:51.781825419 +0100
 @@ -47,6 +47,7 @@ struct sys_dev *find_driver_devices(cons
  	char path[256];
  	char link[256];
@@ -18,8 +18,8 @@
 +		list->path = realpath(path, rpath);
  		list->next = NULL;
  	}
- 
-@@ -198,9 +201,11 @@ const struct imsm_orom *find_imsm_orom(v
+ 	closedir(driver_dir);
+@@ -203,9 +206,11 @@ const struct imsm_orom *find_imsm_orom(v
  char *devt_to_devpath(dev_t dev)
  {
  	char device[40];
diff --git a/package/mgetty/Makefile b/package/mgetty/Makefile
index b6b3196f4..55655c637 100644
--- a/package/mgetty/Makefile
+++ b/package/mgetty/Makefile
@@ -18,6 +18,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MGETTY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 pre-configure:
 	cp ${WRKBUILD}/policy.h-dist ${WRKBUILD}/policy.h
 	echo "#define	AUTO_PPP" >> ${WRKBUILD}/policy.h
diff --git a/package/miau/Makefile b/package/miau/Makefile
index 5ceb9a48e..3d7f474bc 100644
--- a/package/miau/Makefile
+++ b/package/miau/Makefile
@@ -16,17 +16,15 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MIAU,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-automode \
 			--enable-releasenick \
 			--enable-uptime \
 			--enable-privlog \
 			--enable-onconnect
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_MIAU}/usr/bin ${IDIR_MIAU}/etc/miau
-	${INSTALL_BIN} ${WRKINST}/usr/bin/${PKG_NAME} ${IDIR_MIAU}/usr/bin/
+	${INSTALL_BIN} ${WRKINST}/usr/bin/miau ${IDIR_MIAU}/usr/bin/
 	${INSTALL_DATA} ./files/miaurc ${IDIR_MIAU}/etc/miau/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/miax/Makefile b/package/miax/Makefile
index 0975cf3f3..9117a4c86 100644
--- a/package/miax/Makefile
+++ b/package/miax/Makefile
@@ -21,7 +21,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MIAX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 MAKE_FLAGS+=		CC="${TARGET_CC}" \
 			OFLAGS="${TCFLAGS}" \
 			CPPFLAGS="${TCPPFLAGS}" \
diff --git a/package/microperl/Makefile b/package/microperl/Makefile
index 2d0555f28..82e54df34 100644
--- a/package/microperl/Makefile
+++ b/package/microperl/Makefile
@@ -22,7 +22,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MICROPERL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 MAKE_FLAGS+=		CC="${TARGET_CC}" OPTIMIZE="${TCFLAGS}"
 MAKE_FILE:=		Makefile.micro
 
diff --git a/package/mini_httpd/Makefile b/package/mini_httpd/Makefile
index 3c86442a4..569fd98d7 100644
--- a/package/mini_httpd/Makefile
+++ b/package/mini_httpd/Makefile
@@ -6,27 +6,31 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		mini-httpd
 PKG_VERSION:=		1.19
 PKG_RELEASE:=		10
-ifneq ($(ADK_PACKAGE_MINI_HTTPD_OPENSSL),)
-PKG_BUILDDEP+=		openssl
-endif
 PKG_MD5SUM:=		7c68293ad265ecfe2edea917912f6f1f
 PKG_DESCR:=		A small HTTP server
 PKG_SECTION:=		net
+ifneq ($(ADK_PACKAGE_MINI_HTTPD_OPENSSL),)
+PKG_DEPENDS:=		libopenssl
+PKG_BUILDDEP+=		openssl
+endif
 PKG_URL:=		http://www.acme.com/software/mini_httpd
 PKG_SITES:=		http://www.acme.com/software/mini_httpd/
 
 PKG_DESCR_1:=		htpasswd utility
 PKG_DESCR_2:=		A small HTTP server with SSL support
-PKG_DEPENDS_2:=		libopenssl
 
 DISTFILES:=		mini_httpd-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/mini_httpd-${PKG_VERSION}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,MINI_HTTPD,mini-httpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,MINI_HTTPD_HTPASSWD,mini-httpd-htpasswd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
-$(eval $(call PKG_template,MINI_HTTPD_OPENSSL,mini-httpd-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_2},${PKG_DESCR_2},${PKG_SECTION}))
+$(eval $(call PKG_template,MINI_HTTPD,mini-httpd,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MINI_HTTPD_HTPASSWD,mini-httpd-htpasswd,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION}))
+$(eval $(call PKG_template,MINI_HTTPD_OPENSSL,mini-httpd-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_2},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
 
 do-build:
 	# with OpenSSL
@@ -51,19 +55,23 @@ do-install:
 	# without SSL
 ifneq (${ADK_PACKAGE_MINI_HTTPD},)
 	${INSTALL_DIR} ${IDIR_MINI_HTTPD}/etc
-	${INSTALL_DATA} ./files/mini_httpd.conf ${IDIR_MINI_HTTPD}/etc/mini_httpd.conf
+	${INSTALL_DATA} ./files/mini_httpd.conf \
+		${IDIR_MINI_HTTPD}/etc/mini_httpd.conf
 	${INSTALL_DIR} ${IDIR_MINI_HTTPD}/usr/sbin
 	${INSTALL_BIN} ${WRKBUILD}/mini_httpd ${IDIR_MINI_HTTPD}/usr/sbin/
 	${INSTALL_DIR} ${IDIR_MINI_HTTPD_HTPASSWD}/usr/sbin
-	${INSTALL_BIN} ${WRKBUILD}/htpasswd ${IDIR_MINI_HTTPD_HTPASSWD}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/htpasswd \
+		${IDIR_MINI_HTTPD_HTPASSWD}/usr/sbin/
 endif
 	# with OpenSSL
 ifneq (${ADK_PACKAGE_MINI_HTTPD_OPENSSL},)
 	${INSTALL_DIR} ${IDIR_MINI_HTTPD_OPENSSL}/etc
-	${INSTALL_DATA} ./files/mini_httpd-ssl.conf ${IDIR_MINI_HTTPD_OPENSSL}/etc/mini_httpd.conf
+	${INSTALL_DATA} ./files/mini_httpd-ssl.conf \
+		${IDIR_MINI_HTTPD_OPENSSL}/etc/mini_httpd.conf
 	install -m0600 ./files/mini_httpd.pem ${IDIR_MINI_HTTPD_OPENSSL}/etc/
 	${INSTALL_DIR} ${IDIR_MINI_HTTPD_OPENSSL}/usr/sbin
-	${INSTALL_BIN} ${WRKBUILD}/mini_httpd-openssl ${IDIR_MINI_HTTPD_OPENSSL}/usr/sbin/mini_httpd
+	${INSTALL_BIN} ${WRKBUILD}/mini_httpd-openssl \
+		${IDIR_MINI_HTTPD_OPENSSL}/usr/sbin/mini_httpd
 endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mini_sendmail/Makefile b/package/mini_sendmail/Makefile
index 0724048bd..96aa19382 100644
--- a/package/mini_sendmail/Makefile
+++ b/package/mini_sendmail/Makefile
@@ -19,13 +19,16 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MINI_SENDMAIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 MAKE_FLAGS+=		OFLAGS="${TARGET_CFLAGS}"
 MAKE_FLAGS+=		CC="${TARGET_CC}"
 
 do-install:
 	${INSTALL_DIR} ${IDIR_MINI_SENDMAIL}/usr/sbin
-	${INSTALL_BIN} ${WRKBUILD}/mini_sendmail ${IDIR_MINI_SENDMAIL}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/mini_sendmail \
+		${IDIR_MINI_SENDMAIL}/usr/sbin/
 	ln -sf mini_sendmail ${IDIR_MINI_SENDMAIL}/usr/sbin/sendmail
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/miredo/Makefile b/package/miredo/Makefile
index 8fbe95b48..a9ac0ca8e 100644
--- a/package/miredo/Makefile
+++ b/package/miredo/Makefile
@@ -6,12 +6,12 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		miredo
 PKG_VERSION:=		1.1.6
 PKG_RELEASE:=		1
+PKG_MD5SUM:=		bf49c1ddc068746760787d0cf76e40de
+PKG_DESCR:=		A Teredo client and relay daemon
+PKG_SECTION:=		net
 ifeq (${ADK_COMPILE_MIREDO_WITH_UCLIBCXX},y)
 PKG_BUILDDEP+=		uclibc++
 endif
-PKG_MD5SUM:=		bf49c1ddc068746760787d0cf76e40de
-PKG_DESCR:=		A Teredo (IPv6 tunneling over UDP through NAT) client and relay daemon
-PKG_SECTION:=		net
 PKG_URL:=		http://www.remlab.net
 PKG_SITES:=		http://www.remlab.net/files/miredo/
 
@@ -22,7 +22,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,MIREDO,miredo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,MIREDO_SERVER,miredo-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
+TCFLAGS+=		-std=gnu99
 CONFIGURE_ENV+=		ac_cv_file__proc_self_maps=yes
 CONFIGURE_ARGS+=	--disable-chroot \
 			--without-Judy \
@@ -30,9 +30,8 @@ CONFIGURE_ARGS+=	--disable-chroot \
 			--enable-teredo-relay \
 			--enable-teredo-server \
 			--enable-miredo-user=root
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-XAKE_FLAGS+		 CXXLINK="\$${LINK}" \
+
+XAKE_FLAGS+=		 CXXLINK="\$${LINK}" \
 
 ifeq ($(ADK_TARGET_LIB_UCLIBCXX),y)
 TCXXFLAGS+=		-fno-builtin -fno-rtti -nostdinc++
diff --git a/package/mksh/Makefile b/package/mksh/Makefile
index 1298e4cfe..f3815462f 100644
--- a/package/mksh/Makefile
+++ b/package/mksh/Makefile
@@ -26,6 +26,10 @@ ifeq ($(strip ${ADK_PACKAGE_MKSH_FULL}),)
 TCPPFLAGS+=		-DMKSH_SMALL=1
 endif
 
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 do-build:
 	cd ${WRKBUILD} && CC='${TARGET_CC}' CFLAGS='${TCFLAGS}' \
 	    CPPFLAGS='${TCPPFLAGS}' LDFLAGS='${TLDFLAGS}' \
diff --git a/package/moc/Makefile b/package/moc/Makefile
index 18a255ae1..97b5e8707 100644
--- a/package/moc/Makefile
+++ b/package/moc/Makefile
@@ -6,27 +6,25 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		moc
 PKG_VERSION:=		2.4.4
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libvorbis curl libmad flac ffmpeg
 PKG_MD5SUM:=		647c770a5542a4ae5437386807a89796
 PKG_DESCR:=		console music player
 PKG_SECTION:=		sound
-PKG_DEPENDS:=		libmad libvorbis libcurl libflac ffmpeg
+PKG_DEPENDS:=		libmad libvorbis libcurl libflac ffmpeg libiconv libid3tag
+PKG_BUILDDEP+=		libvorbis curl libmad flac ffmpeg libiconv libid3tag
 PKG_URL:=		http://moc.daper.net
 PKG_SITES:=		ftp://ftp.daper.net/pub/soft/moc/stable/
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MOC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--without-jack \
 			--without-oss \
 			--without-musepack \
 			--without-speex \
 			--without-sndfile
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_MOC}/usr/bin
diff --git a/package/moc/patches/patch-configure b/package/moc/patches/patch-configure
new file mode 100644
index 000000000..0968574d6
--- /dev/null
+++ b/package/moc/patches/patch-configure
@@ -0,0 +1,20 @@
+--- moc-2.4.4.orig/configure	2009-01-04 09:28:51.000000000 +0100
++++ moc-2.4.4/configure	2010-02-06 01:22:38.464334671 +0100
+@@ -13910,7 +13910,7 @@ DECODER_PLUGIN_DIR=decoder_plugins
+ PLUGIN_LDFLAGS='-module -avoid-version'
+ 
+ 
+-OS=`uname 2>/dev/null`
++OS=Linux
+ 
+ case "$OS" in
+ 	Linux)
+@@ -13929,7 +13929,7 @@ _ACEOF
+ 		;;
+ esac
+ 
+-LDFLAGS="$LDFLAGS -export-dynamic"
++LDFLAGS="$LDFLAGS"
+ 
+ { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+ echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
diff --git a/package/monit/Makefile b/package/monit/Makefile
index 80a6caa0a..f5d334734 100644
--- a/package/monit/Makefile
+++ b/package/monit/Makefile
@@ -6,20 +6,19 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		monit
 PKG_VERSION:=		5.0.3
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		dae7859ec10551fc941daeae60dee9d3
 PKG_DESCR:=		An utility for system services monitoring
 PKG_SECTION:=		admin
 PKG_DEPENDS:=		libpthread
+ifeq ($(ADK_COMPILE_MONIT_WITH_SSL),y)
+PKG_DEPENDS:=		libopenssl
+PKG_BUILDDEP+=		openssl
+endif
 PKG_URL:=		http://mmonit.com/monit
 PKG_SITES:=		http://www.tildeslash.com/monit/dist/
 
 include ${TOPDIR}/mk/package.mk
 
-ifeq ($(ADK_COMPILE_MONIT_WITH_SSL),y)
-PKG_DEPENDS+=		libopenssl
-endif
-
 $(eval $(call PKG_template,MONIT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 ifeq ($(ADK_COMPILE_MONIT_WITH_SSL),y)
@@ -28,11 +27,6 @@ else
 CONFIGURE_ARGS+=	--without-ssl
 endif
 
-CONFIGURE_STYLE:=	gnu
-CONFIGURE_ENV+=		ac_cv_lib_nsl_inet_addr=no
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_MONIT}/etc
 	install -m0600 ${WRKBUILD}/monitrc ${IDIR_MONIT}/etc/
diff --git a/package/motion/Makefile b/package/motion/Makefile
index c3a49e3be..a7a9f1bb5 100644
--- a/package/motion/Makefile
+++ b/package/motion/Makefile
@@ -6,13 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		motion
 PKG_VERSION:=		3.2.11
 PKG_RELEASE:=		1
-ifneq ($(ADK_PACKAGE_MOTION),)
-PKG_BUILDDEP+=		jpeg
-endif
 PKG_MD5SUM:=		3a26c00f3250eacf6fa93c7a7e0249d9
 PKG_DESCR:=		Webcam motion sensing and logging
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		libjpeg libpthread
+PKG_BUILDDEP+=		jpeg
 PKG_URL:=		http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=motion/}
 
@@ -20,14 +18,11 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MOTION,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--without-ffmpeg \
 			--without-jpeg-mmx \
 			--without-optimizecpu \
 			--without-mysql \
 			--without-pgsql
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_MOTION}/usr/bin
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index 57918dd15..71fa1fe7e 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -12,42 +12,55 @@ PKG_SECTION:=		net
 PKG_DEPENDS:=		glib libstdcxx
 PKG_BUILDDEP+=		glib
 ifneq ($(ADK_PACKAGE_MPD_WITH_ALSA),)
+PKG_DEPENDS+=		alsa-lib
 PKG_BUILDDEP+=		alsa-lib
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_MP3),)
+PKG_DEPENDS+=		libid3tag libmad
 PKG_BUILDDEP+=		libid3tag libmad
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_MP4),)
+PKG_DEPENDS+=		libfaad2
 PKG_BUILDDEP+=		faad2
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_OGG),)
+PKG_DEPENDS+=		libvorbis libogg
 PKG_BUILDDEP+=		libvorbis
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_TREMOR),)
+PKG_DEPENDS+=		libvorbisidec
 PKG_BUILDDEP+=		libvorbisidec
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_FLAC),)
+PKG_DEPENDS+=		libflac
 PKG_BUILDDEP+=		flac
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_WAV),)
+PKG_DEPENDS+=		libaudiofile
 PKG_BUILDDEP+=		libaudiofile
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_SHOUT),)
+PKG_DEPENDS+=		libshout liblame libvorbis
 PKG_BUILDDEP+=		lame libvorbis libshout
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_CURL),)
+PKG_DEPENDS+=		libcurl
 PKG_BUILDDEP+=		curl
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_MMS),)
+PKG_DEPENDS+=		libmms
 PKG_BUILDDEP+=		libmms
 endif
 ifneq ($(ADK_PACKAGE_MPD_WITH_FFMPEG),)
+PKG_DEPENDS+=		ffmpeg
 PKG_BUILDDEP+=		ffmpeg
 endif
 PKG_URL:=		http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=musicpd/}
 
-PKG_FLAVOURS:=		WITH_ALSA WITH_MP3 WITH_MP4 WITH_TREMOR WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG WITH_SHOUT WITH_CURL
+PKG_FLAVOURS:=		WITH_ALSA WITH_MP3 WITH_MP4 WITH_TREMOR \
+			WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG \
+			WITH_SHOUT WITH_CURL
 PKGFD_WITH_ALSA:=	enable ALSA output
 PKGFD_WITH_MP3:=	enable MP3 support
 PKGFD_WITH_MP4:=	enable MP4 support
@@ -62,60 +75,28 @@ PKGFD_WITH_CURL:=	enable CURL support
 
 include ${TOPDIR}/mk/package.mk
 
-ifneq (${ADK_PACKAGE_MPD_WITH_ALSA},)
-PKG_DEPENDS+=		alsa-lib
-endif
-
-ifneq (${ADK_PACKAGE_MPD_WITH_MP3},)
-PKG_DEPENDS+=		libid3tag libmad
-endif
-
-ifneq (${ADK_PACKAGE_MPD_WITH_MP4},)
-PKG_DEPENDS+=		libfaad2
-endif
-
-ifneq (${ADK_PACKAGE_MPD_WITH_OGG},)
-PKG_DEPENDS+=		libvorbis libogg
-endif
-
-ifneq (${ADK_PACKAGE_MPD_WITH_TREMOR},)
-PKG_DEPENDS+=		libvorbisidec
-endif
-
-ifneq (${ADK_PACKAGE_MPD_WITH_FLAC},)
-PKG_DEPENDS+=		libflac
-endif
-
 ifneq (${ADK_PACKAGE_MPD_WITH_WAV},)
-PKG_DEPENDS+=		libaudiofile
 endif
 
 ifneq (${ADK_PACKAGE_MPD_WITH_SHOUT},)
-PKG_DEPENDS+=		libshout liblame libvorbisenc
 endif
 
 ifneq (${ADK_PACKAGE_MPD_WITH_CURL},)
-PKG_DEPENDS+=		libcurl
 endif
 
 ifneq (${ADK_PACKAGE_MPD_WITH_MMS},)
-PKG_DEPENDS+=		libmms
 endif
 
 ifneq (${ADK_PACKAGE_MPD_WITH_FFMPEG},)
-PKG_DEPENDS+=		ffmpeg
 endif
 
 $(eval $(call PKG_template,MPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu autotool
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-XAKE_FLAGS+=		MPD_CFLAGS='-D_GNU_SOURCE'
+AUTOTOOL_STYLE:=	autotool
 
-CONFIGURE_ENV+=		ac_cv_lib_nsl_gethostbyname=no
-CONFIGURE_ARGS+=	\
-			--disable-httpd-output \
+TCFLAGS+=		-std=gnu99
+XAKE_FLAGS+=		MPD_CFLAGS='-D_GNU_SOURCE'
+CONFIGURE_ARGS+=	--disable-httpd-output \
 			--disable-ao \
 			--disable-jack \
 			--disable-fifo \
diff --git a/package/mpfr/Makefile b/package/mpfr/Makefile
index 6c95863b3..77f2c1d6a 100644
--- a/package/mpfr/Makefile
+++ b/package/mpfr/Makefile
@@ -12,12 +12,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MPFR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_MPFR}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libmpfr.so.* ${IDIR_MPFR}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libmpfr.so* ${IDIR_MPFR}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile
index 3c75f5712..a5a612bac 100644
--- a/package/mplayer/Makefile
+++ b/package/mplayer/Makefile
@@ -9,9 +9,11 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		416fa6a247987305d74572d03dc6dde7
 PKG_DESCR:=		popular video player
 PKG_SECTION:=		video
-PKG_DEPENDS:=		alsa-lib libjpeg libfaad2 libmad libncurses libogg libpng libpthread libvorbis
+PKG_DEPENDS:=		alsa-lib libjpeg libfaad2 libmad libncurses
+PKG_DEPENDS+=		libogg libpng libpthread libvorbis
 PKG_DEPENDS+=		libx11 libxau libxdmcp libxext libxv zlib 
-PKG_BUILDDEP+=		alsa-lib libmad libvorbis faad2 ncurses zlib libX11 libXv libpng libXext
+PKG_BUILDDEP+=		alsa-lib libmad libvorbis faad2 ncurses zlib
+PKG_BUILDDEP+=		libX11 libXv libpng libXext
 PKG_URL:=		http://www.mplayerhq.hu
 PKG_SITES:=		http://openadk.org/distfiles/
 
@@ -21,8 +23,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MPLAYER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
+CONFIG_STYLE:=		manual
 
 ifeq (${ADK_LINUX_X86_ALIX1C},y)
 CONFIGURE_CPU_OPTS:=	\
@@ -44,7 +45,7 @@ CONFIGURE_CPU_OPTS:=	\
 			--disable-3dnow
 endif
 
-ifneq ($(ADK_DEBUG),)
+ifeq ($(ADK_DEBUG),y)
 	CONFIGURE_DEBUG=--enable-debug
 endif
 
diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile
index bec5f0903..d495ff10d 100644
--- a/package/mrd6/Makefile
+++ b/package/mrd6/Makefile
@@ -6,10 +6,10 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		mrd6
 PKG_VERSION:=		0.9.6
 PKG_RELEASE:=		1
-PKG_CXX:=		MRD6
 PKG_MD5SUM:=		93ada53bb414b9d622f80a717bc2694b
 PKG_DESCR:=		IPv6 multicast routing daemon
 PKG_SECTION:=		net
+PKG_CXX:=		MRD6
 PKG_DEPENDS:=		kmod-ipv6
 PKG_SITES:=		http://www.openadk.org/distfiles/
 
@@ -19,14 +19,14 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MRD6,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+
 ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y)
-TCXXFLAGS+=		-fno-builtin -nostdinc++ -nodefaultlibs -I${STAGING_DIR}/usr/include/uClibc++
+TCXXFLAGS+=		-fno-builtin -nostdinc++ -nodefaultlibs \
+			-I${STAGING_DIR}/usr/include/uClibc++
 TLDFLAGS+=		-nodefaultlibs -luClibc++ -shared
 endif
-
 XAKE_FLAGS+=		EXTRA_FLAGS="${TCFLAGS}" 
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_MRD6}/usr/sbin ${IDIR_MRD6}/etc
diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile
index 531b93311..ce223bc89 100644
--- a/package/mt-daapd/Makefile
+++ b/package/mt-daapd/Makefile
@@ -4,10 +4,10 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mt-daapd
-PKG_VERSION:=		0.2.4
-PKG_RELEASE:=		10
-PKG_MD5SUM:=		2e1cdbe6b94ef153e915806f80a28dca
-PKG_DESCR:=		a multi-threaded DAAP (Digital Audio Access Protocol) daemon
+PKG_VERSION:=		0.2.4.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		8117141e8a88bfab54fe98b6bbd5cb3a
+PKG_DESCR:=		a multi-threaded DAAP daemon
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libgdbm libid3tag libpthread
 PKG_BUILDDEP+=		gdbm libid3tag
@@ -18,7 +18,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MT_DAAPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 # uClibc setpgrp does not take arguments
 CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes
 CONFIGURE_ARGS+=	--enable-mdns \
@@ -27,14 +26,15 @@ CONFIGURE_ARGS+=	--enable-mdns \
 			--with-gdbm-includes="${STAGING_DIR}/usr/include" \
 			--with-gdbm-libs="${STAGING_DIR}/usr/lib" \
 			--without-static-libs
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_MT_DAAPD}/etc ${IDIR_MT_DAAPD}/usr/{share,sbin}
-	${INSTALL_DATA} ${WRKBUILD}/contrib/mt-daapd.conf ${IDIR_MT_DAAPD}/etc/
-	${INSTALL_DATA} ${WRKBUILD}/contrib/mt-daapd.playlist ${IDIR_MT_DAAPD}/etc/
+	${INSTALL_DATA} ${WRKBUILD}/contrib/mt-daapd.conf \
+		${IDIR_MT_DAAPD}/etc/
+	${INSTALL_DATA} ${WRKBUILD}/contrib/mt-daapd.playlist \
+		${IDIR_MT_DAAPD}/etc/
 	${CP} ${WRKINST}/usr/share/mt-daapd ${IDIR_MT_DAAPD}/usr/share/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/mt-daapd ${IDIR_MT_DAAPD}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/mt-daapd \
+		${IDIR_MT_DAAPD}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mtd/Makefile b/package/mtd/Makefile
index 92acee50f..800d69f3e 100644
--- a/package/mtd/Makefile
+++ b/package/mtd/Makefile
@@ -11,7 +11,6 @@ PKG_SECTION:=		base
 
 PKG_TARGET_DEPENDS:=	ag241 foxboard
 
-WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1
 
 include ${TOPDIR}/mk/package.mk
@@ -20,14 +19,13 @@ $(eval $(call PKG_template,MTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_D
 
 PKGDFLT_MTD=		y
 
+CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 do-build:
-	mkdir -p ${WRKBUILD}
-	${CP} ./src/* ${WRKBUILD}
-	${TARGET_CC} ${TCPPFLAGS} ${TCFLAGS} -o ${WRKBUILD}/mtd \
-		${WRKBUILD}/mtd.c
+	${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} \
+		-o ${WRKBUILD}/mtd ${WRKBUILD}/mtd.c
 
 do-install:
 	${INSTALL_DIR} ${IDIR_MTD}/sbin
diff --git a/package/mtr/Makefile b/package/mtr/Makefile
index 3147750b2..4c901d8e7 100644
--- a/package/mtr/Makefile
+++ b/package/mtr/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		mtr
 PKG_VERSION:=		0.75
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		ncurses
 PKG_MD5SUM:=		23baca52d0922c2ecba7eba05317868c
 PKG_DESCR:=		ncurses traceroute/ping tool
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libncurses
+PKG_BUILDDEP+=		ncurses
 PKG_URL:=		http://www.bitwizard.nl/mtr
 PKG_SITES:=		ftp://ftp.bitwizard.nl/mtr/
 
@@ -18,11 +18,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MTR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE+=	gnu
 CONFIGURE_ENV+=		ac_cv_lib_resolv_res_mkquery=yes
 CONFIGURE_ARGS+=	--without-gtk
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_MTR}/usr/sbin
diff --git a/package/mutt/Makefile b/package/mutt/Makefile
index 89d85d7c6..f68fc657e 100644
--- a/package/mutt/Makefile
+++ b/package/mutt/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		mutt
 PKG_VERSION:=		1.5.20
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		ncurses openssl
 PKG_MD5SUM:=		027cdd9959203de0c3c64149a7ee351c
 PKG_DESCR:=		Mail text client
 PKG_SECTION:=		text
 PKG_DEPENDS:=		libncurses libopenssl
+PKG_BUILDDEP+=		ncurses openssl
 PKG_URL:=		http://www.mutt.org
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=mutt/}
 
@@ -18,21 +18,18 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MUTT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--includedir=${WRKBUILD}/. \
 			--oldincludedir=${WRKBUILD}/. \
 			--with-homespool="~/Maildir" \
 			--enable-pop \
 			--enable-imap \
 			--with-ssl
-BUILD_STYLE:=		auto
-MAKE_FLAGS+=		CC="${TARGET_CC}"
 
-do-install:
+post-install:
 	${INSTALL_DIR} ${IDIR_MUTT}/usr/bin
-	${INSTALL_BIN} ${WRKBUILD}/mutt ${IDIR_MUTT}/usr/bin/
+	${INSTALL_BIN} ${WRKINST}/usr/bin/mutt ${IDIR_MUTT}/usr/bin/
 ifeq (${ADK_PACKAGE_GPG},y)
-	${INSTALL_BIN} ${WRKBUILD}/pgpewrap ${IDIR_MUTT}/usr/bin/
+	${INSTALL_BIN} ${WRKINST}/usr/bin/pgpewrap ${IDIR_MUTT}/usr/bin/
 endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index c3731953e..b1a9eb3ac 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -20,7 +20,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBMYSQLCLIENT,libmysqlclient,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 CONFIGURE_ENV+=		OPTIMIZE_CFLAGS="${TARGET_CFLAGS}" \
 			OPTIMIZE_CXXFLAGS="${TARGET_CFLAGS}" \
 			ac_cv_lib_nsl_gethostbyname_r=no \
diff --git a/package/nand/Makefile b/package/nand/Makefile
index 54ce99f65..f904bc910 100644
--- a/package/nand/Makefile
+++ b/package/nand/Makefile
@@ -11,7 +11,6 @@ PKG_SECTION:=		base
 
 PKG_TARGET_DEPENDS:=	rb532
 
-WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1
 
 include ${TOPDIR}/mk/package.mk
@@ -20,13 +19,13 @@ $(eval $(call PKG_template,NAND,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_
 
 PKGDFLT_NAND=		y
 
+CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 do-build:
-	mkdir -p ${WRKBUILD}
 	${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} -o ${WRKBUILD}/nand \
-		./src/nand.c
+		${WRKBUILD}/nand.c
 
 do-install:
 	${INSTALL_DIR} ${IDIR_NAND}/sbin
diff --git a/package/nano/Makefile b/package/nano/Makefile
index a4dcc2290..088ad4ca5 100644
--- a/package/nano/Makefile
+++ b/package/nano/Makefile
@@ -6,20 +6,20 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		nano
 PKG_VERSION:=		2.0.9
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		ncurses
 PKG_MD5SUM:=		2be94dc43fb60fff4626a2401a977220
 PKG_DESCR:=		An enhanced clone of the Pico text editor
 PKG_SECTION:=		admin
 PKG_DEPENDS:=		libncurses
+PKG_BUILDDEP+=		ncurses
 PKG_URL:=		http://www.nano-editor.org
 PKG_SITES:=		http://www.nano-editor.org/dist/v2.0/
+
 PKG_FLAVOURS:=		TINY
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,NANO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_header_regex_h=no
 CONFIGURE_ARGS+=	--enable-nanorc \
 			--disable-glibtest \
@@ -35,13 +35,7 @@ CONFIGURE_ARGS+=	--disable-browser \
 			--disable-speller \
 			--disable-operatingdir \
 			--enable-multibuffer
-ifneq (${ADK_UNICODE},)
-CONFIGURE_ARGS+=	--enable-utf8
 endif
-endif
-
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_NANO}/usr/bin
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index cd41f0f92..50b1eaaa5 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -17,7 +17,10 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBNCURSES,libncurses,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBNCURSES_DEV,libncurses-dev,${PKG_VERSION}-${PKG_RELEASE},libncurses,${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_LIBNCURSES_DEV}+=	libncurses-dev-install
+
 CONFIGURE_ENV+=		ac_cv_linux_vers=2
 CONFIGURE_ARGS+=	--without-cxx \
 			--without-cxx-binding \
@@ -39,8 +42,6 @@ CONFIGURE_ARGS+=	--without-cxx \
 			--without-rcs-ids \
 			--enable-const \
 			--enable-echo
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 ALL_TARGET:=		libs
 INSTALL_TARGET:=	install.libs install.data
 
@@ -58,7 +59,7 @@ pre-configure:
 	${MAKE} -C ${WRKBUILD}/include
 	${MAKE} -C ${WRKBUILD}/progs
 
-post-install:
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	# this is installed as libncurses - make libcurses a "link"
 	rm -f ${WRKINST}/usr/lib/libcurses.so*
 	echo 'GROUP(-lncurses)' >${WRKINST}/usr/lib/libcurses.so
@@ -74,6 +75,8 @@ post-install:
 		${INSTALL_DATA} ${WRKINST}/usr/share/terminfo/*/$$f \
 		    ${IDIR_LIBNCURSES}/usr/share/terminfo/$${f:0:1}/$$f; \
 	done
+
+libncurses-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBNCURSES_DEV}/usr/include
 	${CP} ${WRKINST}/usr/include/*.h ${IDIR_LIBNCURSES_DEV}/usr/include
 
diff --git a/package/ndisc/Makefile b/package/ndisc/Makefile
index 4cdefc38e..e191474b2 100644
--- a/package/ndisc/Makefile
+++ b/package/ndisc/Makefile
@@ -20,9 +20,6 @@ $(eval $(call PKG_template,NDISC6,ndisc6,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP
 $(eval $(call PKG_template,RDISC6,rdisc6,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,TCPTRACEROUTE6,tcptraceroute6,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 MAKE_FLAGS+=		CC="${TARGET_CC}"
 
 post-install:
@@ -31,6 +28,7 @@ post-install:
 	${INSTALL_DIR} ${IDIR_RDISC6}/usr/bin
 	${INSTALL_BIN} ${WRKINST}//usr/bin/rdisc6 ${IDIR_RDISC6}/usr/bin/
 	${INSTALL_DIR} ${IDIR_TCPTRACEROUTE6}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/tcptraceroute6 ${IDIR_TCPTRACEROUTE6}/usr/bin/
+	${INSTALL_BIN} ${WRKINST}/usr/bin/tcptraceroute6 \
+		${IDIR_TCPTRACEROUTE6}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ndisc/extra/rdnssd/strverscmp.c b/package/ndisc/src/rdnssd/strverscmp.c
index 6276bca0f..6276bca0f 100644
--- a/package/ndisc/extra/rdnssd/strverscmp.c
+++ b/package/ndisc/src/rdnssd/strverscmp.c
diff --git a/package/neon/Makefile b/package/neon/Makefile
index b284df38b..350dcd8b1 100644
--- a/package/neon/Makefile
+++ b/package/neon/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME=		neon
 PKG_VERSION=		0.28.4
 PKG_RELEASE=		1
-PKG_BUILDDEP+=		libpthread libxml2 openssl zlib
 PKG_MD5SUM=		6c3b94362af743d046e198e9fcbe4a85
 PKG_DESCR:=		HTTP and WebDAV library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libpthread libxml2 libopenssl zlib
+PKG_BUILDDEP+=		libpthread libxml2 openssl zlib
 PKG_UTL:=		http://webdav.org/neon
 PKG_SITES=		http://webdav.org/neon/
 
@@ -18,15 +18,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,NEON,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-ssl=openssl \
 			--without-gssapi \
 			--with-libxml2
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto confprog
 
 post-install:
 	${INSTALL_DIR} ${IDIR_NEON}/usr/lib
-	$(CP) ${WRKINST}/usr/lib/lib*.so.* ${IDIR_NEON}/usr/lib
+	$(CP) ${WRKINST}/usr/lib/lib*.so* ${IDIR_NEON}/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile
index ffa2c7950..4b454fb69 100644
--- a/package/net-snmp/Makefile
+++ b/package/net-snmp/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		net-snmp
 PKG_VERSION:=		5.5
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libelf
 PKG_MD5SUM:=		5b2551e7bd024fbbee84dca22a5f13a1
 PKG_DESCR:=		SNMP Agent
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libnetsnmp libelf
+PKG_BUILDDEP+=		libelf
 PKG_NOPARALLEL:=	1
 PKG_URL:=		http://www.net-snmp.org
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=net-snmp/}
@@ -32,7 +32,6 @@ SNMP_TRANSPORTS_INCLUDED=	UDP TCP Callback Unix
 SNMP_TRANSPORTS_EXCLUDED=	TCPIPv6 UDPIPv6 Alias
 TLDFLAGS+=		-pthread
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--with-logfile=/var/log/snmpd.log \
 			--with-persistent-directory=/usr/lib/snmp/ \
 			--with-default-snmp-version=3 \
@@ -54,8 +53,6 @@ CONFIGURE_ARGS+=	--with-logfile=/var/log/snmpd.log \
 			--without-rpm \
 			--without-zlib
 
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 FAKE_FLAGS+=		INSTALL_PREFIX="${WRKINST}"
 
 post-install:
diff --git a/package/netperf/Makefile b/package/netperf/Makefile
index 9dac7fbd4..c5966bb45 100644
--- a/package/netperf/Makefile
+++ b/package/netperf/Makefile
@@ -19,9 +19,6 @@ $(eval $(call PKG_template,NETPERF,${PKG_NAME},${PKG_VERSION}${PKG_RELEASE},${PK
 
 # uClibc setpgrp does not take arguments
 CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_NETPERF}/usr/bin
diff --git a/package/netstat-nat/Makefile b/package/netstat-nat/Makefile
index 2f1ee958f..2fa7d5543 100644
--- a/package/netstat-nat/Makefile
+++ b/package/netstat-nat/Makefile
@@ -16,12 +16,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,NETSTAT_NAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_NETSTAT_NAT}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/netstat-nat ${IDIR_NETSTAT_NAT}/usr/bin/
+	${INSTALL_BIN} ${WRKINST}/usr/bin/netstat-nat \
+		${IDIR_NETSTAT_NAT}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index 7bdc87085..78017c615 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -36,8 +36,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,NFS_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-#TCPPFLAGS+=		-I${LINUX_DIR}/include
-
 ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y)
 CONFIGURE_ARGS+=	--enable-nfsv4 \
 			--with-krb5=${STAGING_DIR}/usr/ \
@@ -60,10 +58,6 @@ CONFIGURE_ENV+=		knfsd_cv_bsd_signals=no \
 CONFIGURE_ARGS+=	--without-tcp-wrappers \
 			--disable-uuid
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin ${IDIR_NFS_UTILS}/etc
 	${INSTALL_DATA} ./files/rpc ${IDIR_NFS_UTILS}/etc
diff --git a/package/nmap/Makefile b/package/nmap/Makefile
index 8716879cd..22e84125b 100644
--- a/package/nmap/Makefile
+++ b/package/nmap/Makefile
@@ -27,7 +27,6 @@ CONFIGURE_ENV+=		CXXFLAGS="-fno-threadsafe-statics -fno-builtin -fno-rtti -nostd
 			-I${STAGING_DIR}/usr/include/uClibc++" \
 			LIBS="-nodefaultlibs -luClibc++ -lgcc -lm"
 endif
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--without-openssl \
 			--without-zenmap \
 			--without-ndiff \
@@ -35,8 +34,6 @@ CONFIGURE_ARGS+=	--without-openssl \
 			--with-libdnet="${STAGING_DIR}/usr" \
 			--with-libpcap="${STAGING_DIR}/usr" \
 			--with-libpcre="${STAGING_DIR}/usr"
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_NMAP}/usr/share/nmap
diff --git a/package/nmap/extra/sctp.h b/package/nmap/src/sctp.h
index 2c24bfb53..2c24bfb53 100644
--- a/package/nmap/extra/sctp.h
+++ b/package/nmap/src/sctp.h
diff --git a/package/nspr/Makefile b/package/nspr/Makefile
index f06b9564a..4a5fe323b 100644
--- a/package/nspr/Makefile
+++ b/package/nspr/Makefile
@@ -21,9 +21,6 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,NSPR,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_ENV+=		HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}"
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_NSPR)/usr/lib
diff --git a/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in b/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in
new file mode 100644
index 000000000..40d15376f
--- /dev/null
+++ b/package/nspr/patches/patch-mozilla_nsprpub_config_Makefile_in
@@ -0,0 +1,11 @@
+--- nspr-4.8.2.orig/mozilla/nsprpub/config/Makefile.in	2009-03-03 23:04:23.000000000 +0100
++++ nspr-4.8.2/mozilla/nsprpub/config/Makefile.in	2010-02-06 02:01:27.321836181 +0100
+@@ -145,7 +145,7 @@ endif
+ 
+ $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX)
+ 	@$(MAKE_OBJDIR)
+-	$(CC) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@
++	$(CC_FOR_BUILD) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@
+ 
+ install:: nspr.m4
+ 	$(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal
diff --git a/package/nss/Makefile b/package/nss/Makefile
index f84afc8ab..842bfdeb6 100644
--- a/package/nss/Makefile
+++ b/package/nss/Makefile
@@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		nss
 PKG_VERSION:=		3.12.4
 PKG_RELEASE:=		2
-PKG_BUILDDEP+=		nspr zlib
 PKG_MD5SUM:=		1ee3ed9c1900079319bd1de51388d856
 PKG_DESCR:=		Network Security Services (NSS) library
 PKG_SECTION:=		libs
+PKG_BUILDDEP+=		nspr zlib
 PKG_NOPARALLEL:=	1
 PKG_URL:=		http://www.mozilla.org/projects/security/pki/nss/
 PKG_SITES:=		https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_4_RTM/src/
@@ -22,6 +22,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,NSS,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+
 ifeq ($(ADK_LINUX_64),y)
 TCFLAGS+=		-DUSE_64
 MAKE_FLAGS+=		USE_64=1
@@ -32,8 +34,6 @@ TCPPFLAGS+=		-I${STAGING_DIR}/usr/include/nspr
 TCFLAGS+=		-I${STAGING_DIR}/usr/include/nspr
 TLDFLAGS:=		''
 
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 MAKE_FLAGS+=		SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist \
 			ARCHFLAG="${TCFLAGS} ${TCPPFLAGS} -ldl"
 ALL_TARGET:=		build_coreconf all
@@ -41,8 +41,10 @@ XAKE_FLAGS+=		OS_TEST=${ARCH} NSS_DISABLE_DBM=1 OS_TARGET=Linux OS_RELEASE=2.6
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_NSS)/usr/lib
-	${INSTALL_DATA} ${WRKDIST}/dist/lib/lib{ssl3,smime3,nss3,nssutil3}.so $(IDIR_NSS)/usr/lib
+	${INSTALL_DATA} ${WRKDIST}/dist/lib/lib{ssl3,smime3,nss3,nssutil3}.so \
+		$(IDIR_NSS)/usr/lib
 	${INSTALL_DIR} ${STAGING_DIR}/usr/include/nss
-	${INSTALL_DATA} ${WRKDIST}/mozilla/dist/public/nss/* ${STAGING_DIR}/usr/include/nss
+	${INSTALL_DATA} ${WRKDIST}/mozilla/dist/public/nss/* \
+		${STAGING_DIR}/usr/include/nss
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ntfs-3g/Makefile b/package/ntfs-3g/Makefile
index f1a7be0c0..72d418e56 100644
--- a/package/ntfs-3g/Makefile
+++ b/package/ntfs-3g/Makefile
@@ -21,9 +21,6 @@ $(eval $(call PKG_template,NTFS_3G,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${P
 
 CONFIGURE_ARGS+=	--disable-ldconfig \
 			--disable-library
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_NTFS_3G}/bin
diff --git a/package/ntpclient/Makefile b/package/ntpclient/Makefile
index 12187c7b9..8e0a6242d 100644
--- a/package/ntpclient/Makefile
+++ b/package/ntpclient/Makefile
@@ -17,9 +17,11 @@ WRKDIST=		${WRKDIR}/${PKG_NAME}-2007
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,NTPCLIENT,ntpclient,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,NTPCLIENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
 
-BUILD_STYLE:=		auto
 MAKE_FLAGS+=		CC='${TARGET_CC}' CFLAGS='${TCFLAGS}'
 ALL_TARGET:=
 
diff --git a/package/nut/Makefile b/package/nut/Makefile
index 1239402b9..e06a5784f 100644
--- a/package/nut/Makefile
+++ b/package/nut/Makefile
@@ -79,7 +79,6 @@ INSTALL_DRIVERS_tmp+=	snmp-ups
 endif
 INSTALL_DRIVERS=$(shell echo ${INSTALL_DRIVERS_tmp} | tr ' ' ',')
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--with-linux-hiddev=${LINUX_DIR}/include/linux/hiddev.h \
 			--without-cgi \
 			--with-drivers=${INSTALL_DRIVERS} \
@@ -92,9 +91,7 @@ CONFIGURE_ENV+=		CPPFLAGS="${TCPPFLAGS} ${TLDFLAGS}"
 MAKE_FLAGS+=		SSL_CFLAGS="${TCPPFLAGS}" SSL_LDFLAGS="${TLDFLAGS} -lssl -lcrypto"
 endif
 
-BUILD_STYLE:=		auto
 ALL_TARGET:=		all 
-INSTALL_STYLE:=		auto
 INSTALL_TARGET:=	install
 
 ifneq (${ADK_PACKAGE_NUT_USB},)
diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile
index c9d7c9a82..cebeee004 100644
--- a/package/obexftp/Makefile
+++ b/package/obexftp/Makefile
@@ -6,17 +6,18 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		obexftp
 PKG_VERSION:=		0.23
 PKG_RELEASE:=		2
-PKG_BUILDDEP+=		openobex libiconv
 PKG_MD5SUM:=		f20762061b68bc921e80be4aebc349eb
 PKG_DESCR:=		bluetooth ftp application
 PKG_SECTION:=		bluetooth
 PKG_DEPENDS:=		openobex libiconv
+PKG_BUILDDEP+=		openobex libiconv
 PKG_URL:=		http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=openobex/}
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
 PKG_DESCR_LIB:=		obexftp library
 PKG_SECTION_LIB:=	libs
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 ifeq ($(ADK_STATIC),y)
 PKG_OPTS:=		libmix
@@ -31,7 +32,6 @@ ifeq ($(ADK_STATIC),y)
 XAKE_FLAGS+=		STATIC_CFLAGS=-all-static
 endif
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		OPENOBEX_CFLAGS="-I${STAGING_DIR}/usr/include" \
 			OPENOBEX_LIBS="-L${STAGING_DIR}/usr/lib \
 			    -lopenobex -lbluetooth -liconv"
@@ -39,8 +39,6 @@ CONFIGURE_ARGS+=	--disable-perl \
 			--disable-ruby \
 			--disable-tcl \
 			--disable-python
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_OBEXFTP}/usr/bin 
diff --git a/package/olsrd/Makefile b/package/olsrd/Makefile
index bb416c1ff..04923eaff 100644
--- a/package/olsrd/Makefile
+++ b/package/olsrd/Makefile
@@ -36,6 +36,10 @@ $(eval $(call PKG_mod_template,OLSRD_MOD_HTTPINFO,httpinfo))
 $(eval $(call PKG_mod_template,OLSRD_MOD_NAMESERVICE,nameservice))
 $(eval $(call PKG_mod_template,OLSRD_MOD_TAS,tas))
 
+CONFIG_STYLE:=          manual
+BUILD_STYLE:=           manual
+INSTALL_STYLE:=         manual
+
 TCFLAGS+=	-fPIC
 
 do-build:
diff --git a/package/opencdk/Makefile b/package/opencdk/Makefile
index bd01b5187..8c2ef472e 100644
--- a/package/opencdk/Makefile
+++ b/package/opencdk/Makefile
@@ -20,10 +20,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBOPENCDK,libopencdk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--with-libgcrypt-prefix='${STAGING_DIR}/usr'
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBOPENCDK}/usr/lib
diff --git a/package/openct/Makefile b/package/openct/Makefile
index d110e5c02..48a23bac1 100644
--- a/package/openct/Makefile
+++ b/package/openct/Makefile
@@ -18,10 +18,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,OPENCT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_OPENCT}/etc ${IDIR_OPENCT}/usr/bin
 	${INSTALL_DIR} ${IDIR_OPENCT}/usr/sbin ${IDIR_OPENCT}/usr/lib
@@ -36,5 +32,4 @@ post-install:
 	${INSTALL_DATA} ${WRKBUILD}/etc/openct.conf \
 		${IDIR_OPENCT}/etc
 
-		
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/openldap/Makefile b/package/openldap/Makefile
index f2a42debb..db05887d0 100644
--- a/package/openldap/Makefile
+++ b/package/openldap/Makefile
@@ -4,18 +4,15 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openldap
-PKG_VERSION:=		2.4.19
+PKG_VERSION:=		2.4.21
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		cyrus-sasl openssl libdb
-PKG_MD5SUM:=		4a6dab2711fcf141f19bb680bc335887
+PKG_MD5SUM:=		e7128c57b2bacd940e8906057c94ff26
 PKG_DESCR:=		OpenLDAP client libraries
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libopenssl libsasl2
+PKG_BUILDDEP+=		cyrus-sasl openssl libdb
 PKG_URL:=		http://www.openldap.org
-PKG_SITES:=		ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
-			ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ \
-			ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ \
-			ftp://ftp.plig.org/pub/OpenLDAP/openldap-release/
+PKG_SITES:=		ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
 
 PKG_DESCR_1:=		OpenLDAP utilities
 PKG_DEPENDS_1:=		libopenldap
@@ -33,21 +30,25 @@ $(eval $(call PKG_template,OPENLDAP_UTILS,openldap-utils,${PKG_VERSION}-${PKG_RE
 $(eval $(call PKG_template,OPENLDAP_SLAPD,openldap-slapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_2},${PKG_DESCR_2},${PKG_SECTION_2}))
 
 PKG_CONFIGURE_OPTIONS+=	\
-	--enable-slapd \
-	--enable-bdb \
-	--disable-hdb \
-	--disable-relay \
-	--enable-dynamic \
-	--enable-syslog \
-	--enable-local \
-	--disable-syncprov \
-	--disable-slurpd \
-	--without-gssapi \
-	--without-fetch \
-	--with-cyrus-sasl \
-	--with-threads \
-	--with-tls \
-	--with-yielding_select="yes" \
+			--enable-slapd \
+			--enable-bdb \
+			--disable-hdb \
+			--disable-relay \
+			--enable-dynamic \
+			--enable-syslog \
+			--enable-local \
+			--disable-syncprov \
+			--disable-slurpd \
+			--without-gssapi \
+			--without-fetch \
+			--with-cyrus-sasl \
+			--with-threads \
+			--with-tls \
+			--with-yielding_select="yes" \
+
+CONFIGURE_ENV+=		ac_cv_func_memcmp_working=yes
+CONFIGURE_ARGS+=	${PKG_CONFIGURE_OPTIONS}
+XAKE_FLAGS+=		STRIP="" CPPFLAGS="-D_GNU_SOURCE"
 
 pre-configure:
 	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
@@ -66,18 +67,13 @@ pre-configure:
 	${MAKE} -C ${WRKBUILD}/libraries/liblutil clean
 	${MAKE} -C ${WRKBUILD}/libraries/liblunicode clean
 
-CONFIGURE_STYLE:=	gnu
-CONFIGURE_ENV+=		ac_cv_func_memcmp_working=yes
-CONFIGURE_ARGS+=	${PKG_CONFIGURE_OPTIONS}
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-XAKE_FLAGS+=		STRIP="" CPPFLAGS="-D_GNU_SOURCE"
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBOPENLDAP}/etc/openldap
-	${CP} ${WRKINST}/etc/openldap/ldap.conf ${IDIR_LIBOPENLDAP}/etc/openldap/
+	${CP} ${WRKINST}/etc/openldap/ldap.conf \
+		${IDIR_LIBOPENLDAP}/etc/openldap/
 	${INSTALL_DIR} ${IDIR_LIBOPENLDAP}/usr/lib/
-	${CP} ${WRKINST}/usr/lib/lib{lber,ldap}*.so.* ${IDIR_LIBOPENLDAP}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/lib{lber,ldap}*.so* \
+		${IDIR_LIBOPENLDAP}/usr/lib/
 	${INSTALL_DIR} ${IDIR_OPENLDAP_UTILS}/usr/bin
 	${CP} ${WRKINST}/usr/bin/ldap* ${IDIR_OPENLDAP_UTILS}/usr/bin/
 	${INSTALL_DIR} ${IDIR_OPENLDAP_SLAPD}/etc/openldap/schema
diff --git a/package/openntpd/Makefile b/package/openntpd/Makefile
index 5c8cf0fd5..328559f3a 100644
--- a/package/openntpd/Makefile
+++ b/package/openntpd/Makefile
@@ -19,10 +19,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,OPENNTPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
+INSTALL_STYLE:=		manual
+
 CONFIGURE_ARGS+=	--with-privsep-user=ntp \
 			--with-adjtimex
-BUILD_STYLE:=		auto
 
 do-install:
 	${INSTALL_DIR} ${IDIR_OPENNTPD}/etc
diff --git a/package/openntpd/extra/openbsd-compat/port-linux.c b/package/openntpd/src/openbsd-compat/port-linux.c
index f210d4a6d..f210d4a6d 100644
--- a/package/openntpd/extra/openbsd-compat/port-linux.c
+++ b/package/openntpd/src/openbsd-compat/port-linux.c
diff --git a/package/openobex/Makefile b/package/openobex/Makefile
index 96a82afa8..19a2cf399 100644
--- a/package/openobex/Makefile
+++ b/package/openobex/Makefile
@@ -6,10 +6,10 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		openobex
 PKG_VERSION:=		1.5
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		bluez
 PKG_MD5SUM:=		0d83dc86445a46a1b9750107ba7ab65c
 PKG_DESCR:=		implementation of the Object Exchange (OBEX) protocol
 PKG_SECTION:=		bluetooth
+PKG_BUILDDEP+=		bluez
 PKG_URL:=		http://dev.zuckschwerdt.org/openobex/wiki/WikiStart
 PKG_SITES:=		${MASTER_SITE_KERNEL:=bluetooth/}
 
@@ -21,10 +21,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,OPENOBEX,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_OPENOBEX}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libopenobex.so* ${IDIR_OPENOBEX}/usr/lib/
diff --git a/package/opensc/Makefile b/package/opensc/Makefile
index cac67d7c7..702a38751 100644
--- a/package/opensc/Makefile
+++ b/package/opensc/Makefile
@@ -16,17 +16,13 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,OPENSC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_OPENSC}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libopensc.so.* \
+	${CP} ${WRKINST}/usr/lib/libopensc.so* \
 		${IDIR_OPENSC}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libpkcs15init.so.* \
+	${CP} ${WRKINST}/usr/lib/libpkcs15init.so* \
 		${IDIR_OPENSC}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libscconf.so.* \
+	${CP} ${WRKINST}/usr/lib/libscconf.so* \
 		${IDIR_OPENSC}/usr/lib
 	${CP} ${WRKINST}/usr/lib/opensc-pkcs11.so \
 		${IDIR_OPENSC}/usr/lib
diff --git a/package/opensips/Makefile b/package/opensips/Makefile
index dd48a61de..fa0218885 100644
--- a/package/opensips/Makefile
+++ b/package/opensips/Makefile
@@ -6,10 +6,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		opensips
 PKG_VERSION:=		1.5.1
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		87c6fe40c143775d6a1be1beb75c3eb2
 PKG_DESCR:=		a high-performance, configurable, free SIP server
 PKG_SECTION:=		net
+PKG_BUILDDEP+=		openssl
 PKG_MULTI:=		1
 PKG_VARIANT:=		tls
 PKG_URL:=		http://opensips.org
@@ -85,6 +85,10 @@ OPENSIPS_MODULES:=	sl tm rr maxfwd usrloc registrar db_text textops exec mi_fifo
 OPENSIPS_MODULE_FILES:=	$(foreach module,$(OPENSIPS_MODULES),modules/$(module)/$(module).so)
 OPENSIPS_MODULES:=	$(patsubst %,modules/%,$(OPENSIPS_MODULES))
 
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 do-build:
 	$(MAKE) -C $(WRKBUILD) \
 		prefix=/ \
@@ -105,7 +109,8 @@ do-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
 	${INSTALL_DIR} $(IDIR_OPENSIPS)/usr/lib/opensips/modules
 	$(CP) $(WRKBUILD)/$(PKG_NAME) $(IDIR_OPENSIPS)/usr/sbin/
 	(cd $(WRKBUILD);\
-		$(CP) $(OPENSIPS_MODULE_FILES) $(IDIR_OPENSIPS)/usr/lib/opensips/modules/; \
+		$(CP) $(OPENSIPS_MODULE_FILES) \
+		$(IDIR_OPENSIPS)/usr/lib/opensips/modules/; \
 	)
 	$(CP) ./files/opensips.cfg $(IDIR_OPENSIPS)/etc/opensips/
 
diff --git a/package/opensips/files/opensips.cfg b/package/opensips/files/opensips.cfg
index e94262ebe..dbc14024d 100644
--- a/package/opensips/files/opensips.cfg
+++ b/package/opensips/files/opensips.cfg
@@ -1,7 +1,7 @@
 #
 #
 # simple quick-start config script
-# Please refer to the Core CookBook at http://www.openser.org/dokuwiki/doku.php
+# Please refer to the Core CookBook at http://www.opensips.org/dokuwiki/doku.php
 # for a explanation of possible statements, functions and parameters.
 #
 
@@ -26,14 +26,14 @@ port=5060
 #tls_verify_client = 1
 #tls_require_client_certificate = 0
 #tls_method = TLSv1
-#tls_certificate = "/usr/local/etc/openser/tls/user/user-cert.pem"
-#tls_private_key = "/usr/local/etc/openser/tls/user/user-privkey.pem"
-#tls_ca_list = "/usr/local/etc/openser/tls/user/user-calist.pem"
+#tls_certificate = "/usr/local/etc/opensips/tls/user/user-cert.pem"
+#tls_private_key = "/usr/local/etc/opensips/tls/user/user-privkey.pem"
+#tls_ca_list = "/usr/local/etc/opensips/tls/user/user-calist.pem"
 
 # ------------------ module loading ----------------------------------
 
 #set module path
-mpath="/usr/lib/openser/modules/"
+mpath="/usr/lib/opensips/modules/"
 
 # Uncomment this if you want to use SQL database
 #loadmodule "mysql.so"
@@ -56,7 +56,7 @@ loadmodule "mi_fifo.so"
 
 # -- mi_fifo params --
 
-modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo")
+modparam("mi_fifo", "fifo_name", "/tmp/opensips_fifo")
 
 # -- usrloc params --
 
@@ -135,8 +135,8 @@ route{
 		if (method=="REGISTER") {
 
 			# Uncomment this if you want to use digest authentication
-			#if (!www_authorize("openser.org", "subscriber")) {
-			#	www_challenge("openser.org", "0");
+			#if (!www_authorize("opensips.org", "subscriber")) {
+			#	www_challenge("opensips.org", "0");
 			#	exit;
 			#};
 
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 29fd6a055..016923b23 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -44,7 +44,6 @@ CONFIGURE_ARGS+=	--with-kerberos5="${STAGING_DIR}/usr"
 else
 CONFIGURE_ARGS+=	--without-kerberos5
 endif
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		LD='${TARGET_CC}' \
 			ac_cv_func_setlogin=no \
 			ac_cv_lib_nsl_yp_match=no
@@ -63,8 +62,6 @@ CONFIGURE_ARGS+=	--disable-strip \
 			--with-privsep-user=sshd \
 			--with-privsep-path=/var/run/sshd \
 			--with-ssl-dir="${STAGING_DIR}/usr"
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_OPENSSH_SERVER}/etc/ssh
diff --git a/package/openssl-pkcs11/Makefile b/package/openssl-pkcs11/Makefile
index 13d869e36..ce523c517 100644
--- a/package/openssl-pkcs11/Makefile
+++ b/package/openssl-pkcs11/Makefile
@@ -6,10 +6,10 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		openssl-pkcs11
 PKG_VERSION:=		0.1.5
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libp11
 PKG_MD5SUM:=		840af6e54dc21445c54f74e15005ba4d
 PKG_DESCR:=		pkcs11 engine for openssl
 PKG_SECTION:=		crypto
+PKG_BUILDDEP+=		libp11
 PKG_URL:=		http://www.opensc-project.org/engine_pkcs11
 PKG_SITES:=		http://www.opensc-project.org/files/engine_pkcs11/
 
@@ -20,11 +20,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,OPENSSL_PKCS11,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		cross_compiling=yes
 CONFIGURE_ARGS+=	--with-openssl="${STAGING_DIR}/usr"
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_OPENSSL_PKCS11}/usr/lib/engines
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 587abbd6e..319deda11 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -13,9 +13,6 @@ PKG_DEPENDS:=		zlib
 PKG_BUILDDEP+=		zlib
 PKG_URL:=		http://www.openssl.org
 PKG_SITES:=		http://www.openssl.org/source/ \
-			ftp://ftp.funet.fi/pub/crypt/cryptography/libs/openssl/source/ \
-			ftp://ftp.webmonster.de/pub/openssl/source/ \
-			ftp://ftp.sunet.se/pub/security/tools/net/openssl/source/
 
 PKG_DESCR_UTIL:=	OpenSSL (Secure Socket Layer) command line tool
 PKG_SECTION_UTIL:=	admin
@@ -28,8 +25,13 @@ $(eval $(call PKG_template,LIBOPENSSL,libopenssl,${PKG_VERSION}-${PKG_RELEASE},$
 $(eval $(call PKG_template,LIBOPENSSL_DEV,libopenssl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_DEV},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_UTIL},${PKG_DESCR_UTIL},${PKG_SECTION_UTIL}))
 
+SUB_INSTALLS-y:=
+SUB_INSTALLS-m:=
+SUB_INSTALLS-${ADK_PACKAGE_LIBOPENSSL_DEV}+=	libopenssl-dev-install
+
+CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
-INSTALL_STYLE:=		auto
+
 INSTALL_TARGET:=	install_sw
 FAKE_FLAGS+=		INSTALL_PREFIX=${WRKINST}
 
@@ -64,7 +66,7 @@ do-build:
 		OPTIMIZATION_FLAGS="$(TARGET_CFLAGS) -fPIC" \
 		all build-shared
 
-post-install:
+post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_LIBOPENSSL}/usr/lib
 	${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_LIBOPENSSL}/usr/lib
 	chmod 644 ${IDIR_LIBOPENSSL}/usr/lib/lib*.so*
@@ -73,6 +75,8 @@ post-install:
 	${INSTALL_DIR} ${IDIR_OPENSSL_UTIL}/etc/ssl/{,certs,private}
 	${CP} ${WRKSRC}/apps/openssl.cnf ${IDIR_OPENSSL_UTIL}/etc/ssl/
 	chmod 0700 ${IDIR_OPENSSL_UTIL}/etc/ssl/private
+
+libopenssl-dev-install:
 	${INSTALL_DIR} ${IDIR_LIBOPENSSL_DEV}/usr/include
 	${CP} ${WRKINST}/usr/include/* ${IDIR_LIBOPENSSL_DEV}/usr/include
 
diff --git a/package/openswan/Makefile b/package/openswan/Makefile
index ef58ca96f..41906e4d7 100644
--- a/package/openswan/Makefile
+++ b/package/openswan/Makefile
@@ -27,15 +27,14 @@ $(eval $(call PKG_template,OPENSWAN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${
 #XAKE_FLAGS+=		USE_KLIPS=true USE_NETKEY=false
 #endif
 
+CONFIG_STYLE:=		manual
+
 XAKE_FLAGS+=		KERNELSRC="${LINUX_DIR}" \
 			IPSECDIR="/usr/lib/ipsec" \
 			INC_USRLOCAL="/usr" \
 			MODPROBE="insmod" \
 			OSDEP="linux" \
 			BUILDENV="linux"
-
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 ALL_TARGET:=		programs
 
 post-install:
@@ -43,7 +42,7 @@ post-install:
 	${INSTALL_DIR} ${IDIR_OPENSWAN}/usr/libexec/ipsec
 	${INSTALL_DIR} ${IDIR_OPENSWAN}/etc/ipsec.d 
 	${INSTALL_DIR} ${IDIR_OPENSWAN}/usr/sbin
-	${CP} ${WRKINST}/etc/ipsec.conf ${IDIR_OPENSWAN}/etc/
+	${INSTALL_DATA} ${WRKINST}/etc/ipsec.conf ${IDIR_OPENSWAN}/etc/
 	${CP} ${WRKINST}/etc/ipsec.d/* ${IDIR_OPENSWAN}/etc/ipsec.d
 	${CP} ${WRKINST}/usr/lib/ipsec/* ${IDIR_OPENSWAN}/usr/lib/ipsec
 	${CP} ${WRKINST}/usr/libexec/ipsec/* ${IDIR_OPENSWAN}/usr/libexec/ipsec
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index e4fbce369..e8af513fe 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -6,29 +6,23 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		openvpn
 PKG_VERSION:=		2.1.0
 PKG_RELEASE:=		1
-ifeq ($(ADK_PACKAGE_LIBOPENSSL),y)
-PKG_BUILDDEP+=		openssl
-endif
-ifeq ($(ADK_PACKAGE_OPENVPN_LZO),y)
-PKG_BUILDDEP+=		liblzo
-endif
 PKG_MD5SUM:=		452a83326ae198cf961e9ae02539c8fb
 PKG_DESCR:=		Open Source VPN solution using SSL
 PKG_SECTION:=		net
 PKG_DEPENDS:=		kmod-tun
-PKG_URL:=		http://openvpn.net
-PKG_SITES:=		http://openvpn.net/release/ \
-			${MASTER_SITE_SOURCEFORGE:=openvpn/}
-
-include $(TOPDIR)/mk/package.mk
-
 ifeq ($(ADK_COMPILE_OPENVPN_WITH_OPENSSL),y)
 PKG_DEPENDS+=		libopenssl
+PKG_BUILDDEP+=		openssl
 endif
-
 ifneq ($(ADK_COMPILE_OPENVPN_WITH_LZO),y)
 PKG_DEPENDS+=		liblzo
+PKG_BUILDDEP+=		liblzo
 endif
+PKG_URL:=		http://openvpn.net
+PKG_SITES:=		http://openvpn.net/release/ \
+			${MASTER_SITE_SOURCEFORGE:=openvpn/}
+
+include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,OPENVPN,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,OPENVPN_EASY_RSA,openvpn-easy-rsa,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -44,7 +38,6 @@ endif
 ifneq ($(ADK_COMPILE_OPENVPN_WITH_SERVER),y)
 DISABLE_SERVER:=--disable-server
 endif
-
 ifneq ($(ADK_COMPILE_OPENVPN_WITH_HTTP),y)
 DISABLE_HTTP:=--disable-http
 endif
@@ -55,7 +48,6 @@ ifeq ($(ADK_COMPILE_OPENVPN_WITH_SMALL),y)
 ENABLE_SMALL:=--enable-small
 endif
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-pthread \
 			--disable-plugins \
 			--disable-management \
@@ -70,8 +62,6 @@ CONFIGURE_ARGS+=	--disable-pthread \
 			$(DISABLE_HTTP) \
 			$(ENABLE_PASSWORD_SAVE) \
 			$(ENABLE_SMALL)
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	# main package
@@ -79,12 +69,15 @@ post-install:
 	${INSTALL_BIN} $(WRKINST)/usr/sbin/openvpn $(IDIR_OPENVPN)/usr/sbin/
 	$(CP) ./files/openvpn.conf $(IDIR_OPENVPN)/etc/openvpn/
 	# subpackage easy-rsa
-	${INSTALL_DIR} $(IDIR_OPENVPN_EASY_RSA)/usr/sbin $(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/keys
+	${INSTALL_DIR} $(IDIR_OPENVPN_EASY_RSA)/usr/sbin \
+		$(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/keys
 	touch $(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/keys/index.txt
 	$(CP) ./files/serial $(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/keys
 	$(CP) $(WRKBUILD)/easy-rsa/2.0/{build-*,clean-all,inherit-inter,list-crl,pkitool,revoke-full,sign-req,whichopensslcnf} \
 		$(IDIR_OPENVPN_EASY_RSA)/usr/sbin
-	${INSTALL_DATA} $(WRKBUILD)/easy-rsa/2.0/openssl.cnf $(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/openssl.cnf
-	${INSTALL_DATA} $(WRKBUILD)/easy-rsa/2.0/vars $(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/vars
+	${INSTALL_DATA} $(WRKBUILD)/easy-rsa/2.0/openssl.cnf \
+		$(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/openssl.cnf
+	${INSTALL_DATA} $(WRKBUILD)/easy-rsa/2.0/vars \
+		$(IDIR_OPENVPN_EASY_RSA)/etc/easy-rsa/vars
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/oprofile/Makefile b/package/oprofile/Makefile
index 2f19a4fc0..9acd481af 100644
--- a/package/oprofile/Makefile
+++ b/package/oprofile/Makefile
@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		oprofile
 PKG_VERSION:=		0.9.4
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		popt
 PKG_MD5SUM:=		82b059379895cf125261d7d773465915
 PKG_DESCR:=		system-wide profiles
 PKG_SECTION:=		utils
 PKG_DEPENDS:=		libpopt
+PKG_BUILDDEP+=		popt
 PKG_URL:=		http://oprofile.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=oprofile/}
 
@@ -21,10 +21,7 @@ $(eval $(call PKG_template,OPROFILE,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${
 TLDFLAGS+=		-shared
 TCFLAGS+=		-fPIC
 TCXXFLAGS+=		-fPIC
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-kernel-support --with-linux=${LINUX_DIR}
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_OPROFILE)/usr/bin
diff --git a/package/osiris/Makefile b/package/osiris/Makefile
index e7dcd3c1c..b7cb1ebc7 100644
--- a/package/osiris/Makefile
+++ b/package/osiris/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		osiris
 PKG_VERSION:=		4.2.3
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		1951c7dc0fe729af9ffaf58910340d12
 PKG_DESCR:=		Host Integrity Monitoring System (scanning agent)
 PKG_SECTION:=		admin
 PKG_DEPENDS:=		libopenssl libpthread
+PKG_BUILDDEP+=		openssl
 PKG_URL:=		http://osiris.shmoo.com
 PKG_SITES:=		http://osiris.shmoo.com/data/
 
@@ -18,15 +18,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,OSIRISD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_openssldir="${STAGING_DIR}/usr" \
 			ac_cv_have_accrights_in_msghdr=no \
 			ac_cv_have_control_in_msghdr=yes
 CONFIGURE_ARGS+=	--with-osiris-user=root \
 			--with-root-dir=/var/lib/osiris \
 			--with-readline=no
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 XAKE_FLAGS+=		ar=${TARGET_CROSS}ar \
 			INTERACTIVE=0
 TCFLAGS+=		-DOPENSSL_NO_RIPEMD
diff --git a/package/owfs/Makefile b/package/owfs/Makefile
index 9be07eabb..d4be63f91 100644
--- a/package/owfs/Makefile
+++ b/package/owfs/Makefile
@@ -7,7 +7,7 @@ PKG_NAME:=		owfs
 PKG_VERSION:=		2.5p2
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		842170565e8893001a4e78e675322144
-PKG_DESCR:=		A tool to access 1-wire devices through a fuse mounted fs
+PKG_DESCR:=		A tool to access 1-wire devices
 PKG_SECTION:=		admin
 PKG_URL:=		http://owfs.org
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=owfs/}
@@ -16,7 +16,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,OWFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
+INSTALL_STYLE:=		manual
+
 CONFIGURE_ENV+=		BUILD_CC=${TARGET_CC} \
 			LD_EXTRALIBS="" \
 			ac_cv_linux_vers=2 \
@@ -27,13 +28,13 @@ CONFIGURE_ARGS+=	--enable-owfs \
 			--disable-owftpd \
 			--disable-owcapi \
 			--disable-owserver
-BUILD_STYLE:=		auto
 ALL_TARGET:=
 
 do-install:
 	${INSTALL_DIR} ${IDIR_OWFS}/usr/{bin,lib}
 	${INSTALL_BIN} ${WRKBUILD}/module/owlib/src/c/.libs/libow.so.0.0.0 \
 	               ${IDIR_OWFS}/usr/lib/
-	${INSTALL_BIN} ${WRKBUILD}/module/owfs/src/c/.libs/owfs ${IDIR_OWFS}/usr/bin/owfs
+	${INSTALL_BIN} ${WRKBUILD}/module/owfs/src/c/.libs/owfs \
+		${IDIR_OWFS}/usr/bin/owfs
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/p910nd/Makefile b/package/p910nd/Makefile
index bbf315e2f..433f7dbe7 100644
--- a/package/p910nd/Makefile
+++ b/package/p910nd/Makefile
@@ -18,7 +18,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,P910ND,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 MAKE_FLAGS+=		${TARGET_CONFIGURE_OPTS} \
 			CFLAGS="${TARGET_CFLAGS} -DLOCKFILE_DIR=\"\\\"/tmp\\\"\""
 ALL_TARGET:=
diff --git a/package/p910nd/files/p910nd.init b/package/p910nd/files/p910nd.init
index 5107579bc..20e872c42 100644
--- a/package/p910nd/files/p910nd.init
+++ b/package/p910nd/files/p910nd.init
@@ -14,7 +14,7 @@ start)
 	p910nd $p910nd_flags
 	;;
 stop)
-	pkill p910nd
+	pkill p9100d
 	;;
 restart)
 	sh $0 stop
diff --git a/package/palantir/Makefile b/package/palantir/Makefile
index e3c1e1130..c6286f70d 100644
--- a/package/palantir/Makefile
+++ b/package/palantir/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		palantir
 PKG_VERSION:=		2.7
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		jpeg
 PKG_MD5SUM:=		3a5b1fb340857f6d8e357bf39b77583e
 PKG_DESCR:=		A multichannel interactive streaming solution
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libjpeg libpthread
+PKG_BUILDDEP+=		jpeg
 PKG_URL:=		http://www.fastpath.it/products/palantir
 PKG_SITES:=		http://www.fastpath.it/products/palantir/pub/
 
@@ -20,6 +20,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PALANTIR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=          manual
+BUILD_STYLE:=           manual
+INSTALL_STYLE:=         manual
+
 do-build:
 	mkdir -p ${WRKINST}/usr
 	${MAKE} -C ${WRKBUILD}/server/libgsm \
diff --git a/package/pango/Makefile b/package/pango/Makefile
index e6272d4f9..f974c73c5 100644
--- a/package/pango/Makefile
+++ b/package/pango/Makefile
@@ -20,10 +20,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PANGO,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_PANGO}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libpango*.so* ${IDIR_PANGO}/usr/lib
diff --git a/package/parprouted/Makefile b/package/parprouted/Makefile
index d1200520a..8771625ad 100644
--- a/package/parprouted/Makefile
+++ b/package/parprouted/Makefile
@@ -17,7 +17,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PARPROUTED,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=          manual
+INSTALL_STYLE:=         manual
+
 MAKE_FLAGS+=		CC="${TARGET_CC}" \
 			CFLAGS="${TCFLAGS}" \
 			LDFLAGS=""
diff --git a/package/parted/Makefile b/package/parted/Makefile
index 6323c875c..03df2e270 100644
--- a/package/parted/Makefile
+++ b/package/parted/Makefile
@@ -18,10 +18,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,PARTED,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} $(IDIR_PARTED)/usr/sbin $(IDIR_PARTED)/usr/lib
 	${CP} $(WRKINST)/usr/lib/libparted*so* $(IDIR_PARTED)/usr/lib
diff --git a/package/patch/Makefile b/package/patch/Makefile
index 80a608f0d..b5bf8b955 100644
--- a/package/patch/Makefile
+++ b/package/patch/Makefile
@@ -14,11 +14,7 @@ PKG_SITES:=		${MASTER_SITE_GNU:=patch/}
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,PATCH,patch,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+$(eval $(call PKG_template,PATCH,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_PATCH)/usr/bin
diff --git a/package/pciutils/Makefile b/package/pciutils/Makefile
index 23994bb29..816c58356 100644
--- a/package/pciutils/Makefile
+++ b/package/pciutils/Makefile
@@ -6,10 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		pciutils
 PKG_VERSION:=		3.0.3
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		zlib
 PKG_MD5SUM:=		d07da501bb11e6af40acd036536c2e9a
 PKG_DESCR:=		PCI Utilities
 PKG_SECTION:=		sys
+PKG_DEPENDS:=		zlib
+PKG_BUILDDEP+=		zlib
 PKG_URL:=		http://www.kernel.org/pub/software/utils/pciutils
 PKG_SITES:=		http://www.kernel.org/pub/software/utils/pciutils/ \
 			ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/
@@ -18,7 +19,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PCIUTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=          manual
+INSTALL_STYLE:=         manual
+
 MAKE_FLAGS+=		CC="${TARGET_CC}" \
 			CFLAGS="${TCFLAGS}" \
 			IDSDIR="/usr/share" \
diff --git a/package/pcre/Makefile b/package/pcre/Makefile
index 9a412090e..db1b57920 100644
--- a/package/pcre/Makefile
+++ b/package/pcre/Makefile
@@ -16,10 +16,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBPCRE,libpcre,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-cpp
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 XAKE_FLAGS+=		${TARGET_CONFIGURE_OPTS} CFLAGS='${TCFLAGS}'
 
 post-install:
diff --git a/package/pdnsd/Makefile b/package/pdnsd/Makefile
index aea5877f9..36b4896b7 100644
--- a/package/pdnsd/Makefile
+++ b/package/pdnsd/Makefile
@@ -19,10 +19,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,PDNSD,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	$(INSTALL_DIR) $(IDIR_PDNSD)/etc
 	${INSTALL_DATA} ./files/pdnsd.conf ${IDIR_PDNSD}/etc/
diff --git a/package/perl/Makefile b/package/perl/Makefile
index d5eea8ba8..3c997da78 100644
--- a/package/perl/Makefile
+++ b/package/perl/Makefile
@@ -21,7 +21,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PERL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=          manual
+INSTALL_STYLE:=         manual
 
 pre-configure:
 	(cd ${WRKBUILD}; ./Configure -des -Dcc=gcc);
diff --git a/package/php/Makefile b/package/php/Makefile
index e8db1255f..34281b4ac 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -182,11 +182,11 @@ $(eval $(call PKG_mod_template,PHP_MOD_SOCKETS,sockets))
 $(eval $(call PKG_mod_template,PHP_MOD_SQLITE,pdo))
 $(eval $(call PKG_mod_template,PHP_MOD_XML,xml))
 
+INSTALL_STYLE:=		manual
+
 TLDFLAGS+=		-L$(STAGING_DIR)/usr/lib/mysql
 CONFIGURE_ENV+=		LIBS="-ldl"
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	$(PKG_CONFIGURE_OPTS)
-BUILD_STYLE:=		auto
 
 do-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
 	${INSTALL_DIR} $(IDIR_PHP_CLI)/etc
@@ -196,6 +196,7 @@ do-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
 	${INSTALL_DIR} $(IDIR_PHP_FASTCGI)/etc
 	${INSTALL_DATA} ./files/php.ini $(IDIR_PHP_FASTCGI)/etc/
 	${INSTALL_DIR} $(IDIR_PHP_FASTCGI)/usr/sbin
-	${INSTALL_BIN} $(WRKBUILD)/sapi/cgi/php-cgi $(IDIR_PHP_FASTCGI)/usr/sbin/php
+	${INSTALL_BIN} $(WRKBUILD)/sapi/cgi/php-cgi \
+		$(IDIR_PHP_FASTCGI)/usr/sbin/php
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/picocom/Makefile b/package/picocom/Makefile
index 2b7fe906f..8fc72b85c 100644
--- a/package/picocom/Makefile
+++ b/package/picocom/Makefile
@@ -16,7 +16,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PICOCOM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=          manual
+INSTALL_STYLE:=         manual
+
 ALL_TARGET:=		picocom
 
 do-install:
diff --git a/package/pipacs/Makefile b/package/pipacs/Makefile
index 95379106f..06348bafd 100644
--- a/package/pipacs/Makefile
+++ b/package/pipacs/Makefile
@@ -8,21 +8,18 @@ PKG_RELEASE:=		2
 PKG_DESCR:=		an UNIX socket accounting/wiewer program
 PKG_SECTION:=		net
 
-WRKDIST=		${WRKDIR}/${PKG_NAME}
 NO_DISTFILES:=		1
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PIPACS,${PKG_NAME},${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=          manual
+INSTALL_STYLE:=         manual
+
 MAKE_FLAGS+=		CFLAGS="${TCFLAGS} ${TCPPFLAGS}" \
 			${TARGET_CONFIGURE_OPTS}
 
-do-configure:
-	mkdir -p ${WRKBUILD}
-	${CP} ./src/* ${WRKBUILD}
-
 do-install:
 	${INSTALL_DIR} ${IDIR_PIPACS}/usr/bin
 	${INSTALL_BIN} ${WRKBUILD}/pipacs ${IDIR_PIPACS}/usr/bin
diff --git a/package/pixman/Makefile b/package/pixman/Makefile
index 1f58aad45..247baab73 100644
--- a/package/pixman/Makefile
+++ b/package/pixman/Makefile
@@ -19,10 +19,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,PIXMAN,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_PIXMAN}/usr/lib
 	${CP} ${WRKINST}/usr/lib/libpixman-1.so* ${IDIR_PIXMAN}/usr/lib/
diff --git a/package/pmacct/Makefile b/package/pmacct/Makefile
index ac7aa9249..c48e92d81 100644
--- a/package/pmacct/Makefile
+++ b/package/pmacct/Makefile
@@ -6,6 +6,10 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		pmacct
 PKG_VERSION:=		0.11.6
 PKG_RELEASE:=		1
+PKG_MD5SUM:=		e0f3bcba9a73b7a70bbf5a303cd22f77
+PKG_DESCR:=		IP accounting daemons
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libpcap
 PKG_BUILDDEP+=		libpcap
 ifneq ($(ADK_COMPILE_PMACCT_MYSQL),)
 PKG_BUILDDEP+=		mysql
@@ -16,10 +20,6 @@ endif
 ifneq ($(ADK_COMPILE_PMACCT_SQLITE),)
 PKG_BUILDDEP+=		sqlite
 endif
-PKG_MD5SUM:=		e0f3bcba9a73b7a70bbf5a303cd22f77
-PKG_DESCR:=		IP accounting daemons
-PKG_SECTION:=		net
-PKG_DEPENDS:=		libpcap
 PKG_URL:=		http://www.pmacct.net
 PKG_SITES:=		http://www.pmacct.net/
 
@@ -32,10 +32,6 @@ $(eval $(call PKG_template,PMACCT_CLIENT,pmacct-client,$(PKG_VERSION)-${PKG_RELE
 
 CONFIGURE_ENV+=		--with-pcap-includes="$(STAGING_DIR)/usr/include" \
 			--with-pcap-libs="$(STAGING_DIR)/usr/lib"
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 
 post-install:
 	${INSTALL_DIR} $(IDIR_SFACCTD)/usr/sbin
diff --git a/package/popt/Makefile b/package/popt/Makefile
index 6645d5c0e..0e3a0362b 100644
--- a/package/popt/Makefile
+++ b/package/popt/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		popt
 PKG_VERSION:=		1.15
 PKG_RELEASE:=		2
-PKG_BUILDDEP+=		libiconv
 PKG_MD5SUM:=		c61ef795fa450eb692602a661ec8d7f1
 PKG_DESCR:=		a command line option parsing library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libiconv
+PKG_BUILDDEP+=		libiconv
 PKG_URL:=		http://rpm5.org
 PKG_SITES:=		http://rpm5.org/files/popt/
 
@@ -18,13 +18,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBPOPT,libpopt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-#CONFIGURE_ENV+=		am_cv_func_iconv=no
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBPOPT}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libpopt.so.* ${IDIR_LIBPOPT}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libpopt.so* ${IDIR_LIBPOPT}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/portmap/Makefile b/package/portmap/Makefile
index 85faa8d2f..229143a6e 100644
--- a/package/portmap/Makefile
+++ b/package/portmap/Makefile
@@ -6,12 +6,13 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		portmap
 PKG_VERSION:=		6.0
 PKG_RELEASE:=		1
-ifneq ($(strip ${ADK_PACKAGE_PORTMAP_LIBWRAP}),)
-PKG_BUILDDEP+=		tcp_wrappers
-endif
 PKG_MD5SUM:=		ac108ab68bf0f34477f8317791aaf1ff
 PKG_DESCR:=		RPC portmapper
 PKG_SECTION:=		net
+ifneq ($(strip ${ADK_PACKAGE_PORTMAP_LIBWRAP}),)
+PKG_DEPENDS:=		libwrap
+PKG_BUILDDEP+=		tcp_wrappers
+endif
 PKG_URL:=		http://neil.brown.name/portmap
 PKG_SITES:=		http://neil.brown.name/portmap/
 
@@ -20,12 +21,11 @@ WRKDIST=		${WRKDIR}/${PKG_NAME}_${PKG_VERSION}
 
 include ${TOPDIR}/mk/package.mk
 
-ifneq ($(strip ${ADK_PACKAGE_PORTMAP_LIBWRAP}),)
-PKG_DEPENDS:=		libwrap
-endif
-
 $(eval $(call PKG_template,PORTMAP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=          manual
+INSTALL_STYLE:=         manual
+
 ifneq ($(strip ${ADK_PACKAGE_PORTMAP_LIBWRAP}),)
 MAKE_FLAGS+=		WRAP_LIB='-L${STAGING_DIR}/usr/lib -lwrap'
 else
@@ -33,7 +33,6 @@ MAKE_FLAGS+=		NO_TCP_WRAPPER=1
 endif
 TCPPFLAGS+=		-DDAEMON_UID=20 -DDAEMON_GID=20
 TCFLAGS+=		-fPIC
-BUILD_STYLE:=		auto
 MAKE_FLAGS+=		${TARGET_CONFIGURE_OPTS} \
 			CFLAGS='${TCFLAGS}'
 
diff --git a/package/portsentry/Makefile b/package/portsentry/Makefile
index 351438d72..baab74672 100644
--- a/package/portsentry/Makefile
+++ b/package/portsentry/Makefile
@@ -18,7 +18,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PORTSENTRY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=          manual
+INSTALL_STYLE:=         manual
+
 ALL_TARGET:=		linux
 MAKE_FLAGS+=		CC="${TARGET_CC}" CFLAGS="${TCFLAGS}"
 
diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile
index d06cca865..3f89ddf1c 100644
--- a/package/postgresql/Makefile
+++ b/package/postgresql/Makefile
@@ -6,10 +6,10 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		postgresql
 PKG_VERSION:=		8.3.7
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		zlib
 PKG_MD5SUM:=		6e36f3b4dd27ae0c352376ea9f843de2
 PKG_DESCR:=		PostgreSQL database library
 PKG_SECTION:=		libs
+PKG_BUILDDEP+=		zlib
 PKG_URL:=		http://www.postgresql.org
 PKG_SITES:=		ftp://ftp7.de.postgresql.org/pub/ftp.postgresql.org/source/v${PKG_VERSION}/ \
 			ftp://ftp8.de.postgresql.org/pub/ftp.postgresql.org/source/v${PKG_VERSION}/ \
@@ -20,7 +20,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBPQ,libpq,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
+BUILD_STYLE:=           manual
+INSTALL_STYLE:=         manual
+
 PKG_CONFIGURE_ARGS:=\
 			--disable-integer-datetimes \
 			--without-java \
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 09327b6ea..2d38f6a96 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -25,11 +25,7 @@ $(eval $(call PKG_template,PPP_MOD_PPPDUMP,ppp-mod-pppdump,${PKG_VERSION}-${PKG_
 $(eval $(call PKG_template,PPP_MOD_PPPSTATS,ppp-mod-pppstats,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PPP_MOD_PPPUMTS,ppp-mod-pppumts,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		UNAME_S="Linux"
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 XAKE_FLAGS+=		CC="${TARGET_CC}" \
 			COPTS="${TCFLAGS}" \
 			HAVE_INET6="1" \
@@ -70,10 +66,10 @@ post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	$(INSTALL_BIN) ./files/ppp.pre-up \
 		${IDIR_PPP}/etc/network/if-pre-up.d/ppp
 
-
 mod-radius-install:
 	${INSTALL_DIR} ${IDIR_PPP_MOD_RADIUS}/etc/radiusclient
-	${CP} ${WRKBUILD}/pppd/plugins/radius/etc/* ${IDIR_PPP_MOD_RADIUS}/etc/radiusclient
+	${CP} ${WRKBUILD}/pppd/plugins/radius/etc/* \
+		${IDIR_PPP_MOD_RADIUS}/etc/radiusclient
 	rm ${IDIR_PPP_MOD_RADIUS}/etc/radiusclient/radiusclient.conf.in
 	${INSTALL_DIR} ${IDIR_PPP_MOD_RADIUS}/usr/lib/pppd/$(PKG_VERSION)
 	${INSTALL_BIN} $(WRKINST)/usr/lib/pppd/$(PKG_VERSION)/radius.so \
diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index 523711887..6c1700a15 100644
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -16,7 +16,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PPTP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=          manual
+INSTALL_STYLE:=         manual
+
 MAKE_FLAGS+=		CC="${TARGET_CC}" \
 			CFLAGS="${TARGET_CFLAGS}"
 
diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile
index 463c2ac5c..01e1147c0 100644
--- a/package/pptpd/Makefile
+++ b/package/pptpd/Makefile
@@ -17,9 +17,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PPTPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 TCFLAGS+=		-DSBINDIR=\\\"/usr/sbin\\\"
 FAKE_FLAGS+=		INSTALL="install"
 
diff --git a/package/privoxy/Makefile b/package/privoxy/Makefile
index 985ac546e..013392066 100644
--- a/package/privoxy/Makefile
+++ b/package/privoxy/Makefile
@@ -23,17 +23,14 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,PRIVOXY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TLDFLAGS+=		-pthread
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-editor \
 			--disable-jar-files \
 			--sysconfdir=/etc/privoxy
 # uClibc setpgrp does not take arguments
 CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes \
 			ac_cv_lib_nsl_gethostbyname=no
-BUILD_STYLE:=		auto
 MAKE_FLAGS+=		SPECIAL_CFLAGS='${TLDFLAGS}'
 MAKE_FILE:=		GNUmakefile
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_PRIVOXY}/usr/sbin ${IDIR_PRIVOXY}/etc/privoxy
diff --git a/package/privoxy/extra/config.h.in b/package/privoxy/src/config.h.in
index 124f61ba1..124f61ba1 100644
--- a/package/privoxy/extra/config.h.in
+++ b/package/privoxy/src/config.h.in
diff --git a/package/privoxy/extra/configure b/package/privoxy/src/configure
index f4e92ba8d..f4e92ba8d 100644
--- a/package/privoxy/extra/configure
+++ b/package/privoxy/src/configure
diff --git a/package/procmail/Makefile b/package/procmail/Makefile
index ead1496f0..f8c3d2542 100644
--- a/package/procmail/Makefile
+++ b/package/procmail/Makefile
@@ -16,6 +16,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PROCMAIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=          manual
+BUILD_STYLE:=           manual
+INSTALL_STYLE:=         manual
+
 TCFLAGS+=		-DPROCMAIL
 
 do-build:
diff --git a/package/procmail/extra/Makefile.new b/package/procmail/src/Makefile.new
index 3f8ed3ab2..3f8ed3ab2 100644
--- a/package/procmail/extra/Makefile.new
+++ b/package/procmail/src/Makefile.new
diff --git a/package/procps/Makefile b/package/procps/Makefile
index a917a7009..3e4a90250 100644
--- a/package/procps/Makefile
+++ b/package/procps/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		procps
 PKG_VERSION:=		3.2.7
 PKG_RELEASE:=		4
-PKG_BUILDDEP+=		ncurses
 PKG_MD5SUM:=		f490bca772b16472962c7b9f23b1e97d
 PKG_DESCR:=		The /proc file system utilities
 PKG_SECTION:=		utils
 PKG_DEPENDS:=		libncurses
+PKG_BUILDDEP+=		ncurses
 PKG_URL:=		http://procps.sourceforge.net
 PKG_SITES:=		http://procps.sourceforge.net/
 
@@ -18,8 +18,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PROCPS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
+CONFIG_STYLE:=          manual
 
 post-install:
 	${INSTALL_DIR} ${IDIR_PROCPS}/{bin,sbin,usr/bin}
diff --git a/package/proftpd/Makefile b/package/proftpd/Makefile
index 4dcd04eca..d74ff9e35 100644
--- a/package/proftpd/Makefile
+++ b/package/proftpd/Makefile
@@ -9,6 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		4918908fcae9e591ba84c66edff73410
 PKG_DESCR:=		An advanced and very configurable FTP server
 PKG_SECTION:=		utils
+PKG_NOPARALLEL:=	1
 PKG_URL:=		http://www.proftpd.org/
 PKG_SITES:=		ftp://ftp.proftpd.org/distrib/source/
 
@@ -16,12 +17,9 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,PROFTPD,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-cap
 CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes \
 			ac_cv_func_setgrent_void=yes
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_PROFTPD)/etc
diff --git a/package/ptunnel/Makefile b/package/ptunnel/Makefile
index 9389aa5bc..4018ffac8 100644
--- a/package/ptunnel/Makefile
+++ b/package/ptunnel/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		ptunnel
 PKG_VERSION:=		0.61
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libpcap
 PKG_MD5SUM:=		b45f73875f2af48f101816672f83a5fe
 PKG_DESCR:=		Tunnel TCP connections over ICMP packets
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libpcap libpthread
+PKG_BUILDDEP+=		libpcap
 PKG_URL:=		http://www.cti.ecp.fr/~beauxir5/ptunnel/
 PKG_SITES:=		http://www.cti.ecp.fr/~beauxir5/ptunnel/
 
@@ -18,12 +18,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,PTUNNEL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		BUILD_CC="${TARGET_CC}" \
 			ac_cv_linux_vers=2 \
 			td_cv_buggygetaddrinfo="no"
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_PTUNNEL}/usr/sbin
diff --git a/package/python/Makefile b/package/python/Makefile
index 7d087dd1d..7c313dcad 100644
--- a/package/python/Makefile
+++ b/package/python/Makefile
@@ -25,14 +25,10 @@ MAKE_ENV+=		OPT="$(TARGET_CFLAGS)" \
 			HOSTPYTHON=./hostpython \
 			HOSTPGEN=./Parser/hostpgen \
 			PYTHON_DISABLE_MODULES="$(DISMOD)"
-
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		OPT="$(TARGET_CFLAGS)"
 CONFIGURE_ARGS:=	--with-threads \
 			--with-system-ffi \
 			--without-cxx-main
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 pre-configure:
 	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
diff --git a/package/quagga/Makefile b/package/quagga/Makefile
index 0f57fb919..1c6e43862 100644
--- a/package/quagga/Makefile
+++ b/package/quagga/Makefile
@@ -34,7 +34,6 @@ $(eval $(call PKG_template,QUAGGA_RIPNGD,quagga-ripngd,${PKG_VERSION}-${PKG_RELE
 $(eval $(call PKG_template,QUAGGA_RIPD,quagga-ripd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_5},${PKG_SECTION}))
 $(eval $(call PKG_template,QUAGGA_VTYSH,quagga-vtysh,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_6},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		quagga_cv_ipforward_method="proc"
 CONFIGURE_ARGS+=	--localstatedir=/var/run/quagga \
 			--sysconfdir=/etc/quagga \
@@ -43,8 +42,6 @@ CONFIGURE_ARGS+=	--localstatedir=/var/run/quagga \
 			--enable-group=quagga \
 			--disable-pie \
 			--enable-multipath=8
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_QUAGGA}/usr/{lib,sbin}
diff --git a/package/raddump/Makefile b/package/raddump/Makefile
index 9a84d3bd6..d681a2f7c 100755
--- a/package/raddump/Makefile
+++ b/package/raddump/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		raddump
 PKG_VERSION:=		0.3.1
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		openssl libpcap
 PKG_MD5SUM:=		f8c29c67141ea78bb6ae8b97d5149480
 PKG_DESCR:=		interprets captured RADIUS packets
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libpcap libopenssl
+PKG_BUILDDEP+=		openssl libpcap
 PKG_URL:=		http://sourceforge.net/projects/raddump
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=raddump/}
 
@@ -18,9 +18,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,RADDUMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_RADDUMP}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/raddump ${IDIR_RADDUMP}/usr/bin
diff --git a/package/radvd/Makefile b/package/radvd/Makefile
index 0cfab4506..9ac4deffc 100644
--- a/package/radvd/Makefile
+++ b/package/radvd/Makefile
@@ -20,12 +20,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,RADVD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--with-configfile=/etc/radvd.conf \
 			--with-logfile=/var/log/radvd.log \
 			--with-pidfile=/var/run/radvd.pid
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_RADVD}/etc ${IDIR_RADVD}/usr/sbin
diff --git a/package/randrproto/Makefile b/package/randrproto/Makefile
index ec7da9684..fd022fe54 100644
--- a/package/randrproto/Makefile
+++ b/package/randrproto/Makefile
@@ -10,9 +10,4 @@ PKG_MD5SUM:=		15266124b9e2dfcfb25ce6cba24cdd66
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/rarpd/Makefile b/package/rarpd/Makefile
index b7805f693..a4faf0e57 100644
--- a/package/rarpd/Makefile
+++ b/package/rarpd/Makefile
@@ -17,12 +17,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,RARPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--with-libnet="${STAGING_DIR}/usr" \
 			--with-pcap="${STAGING_DIR}/usr"
 TCFLAGS+=		-DNEW_LIBNET_INTERFACE
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_RARPD}/usr/sbin
diff --git a/package/rdate/Makefile b/package/rdate/Makefile
index f35a8e851..fa5bde688 100644
--- a/package/rdate/Makefile
+++ b/package/rdate/Makefile
@@ -17,11 +17,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,RDATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=          manual
+
 MAKE_FILE=		GNUmakefile
-BUILD_STYLE=		auto
 
-do-install:
+post-install:
 	${INSTALL_DIR} ${IDIR_RDATE}/usr/sbin
-	${INSTALL_BIN} ${WRKBUILD}/rdate ${IDIR_RDATE}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/rdate ${IDIR_RDATE}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/rdate/patches/patch-GNUmakefile b/package/rdate/patches/patch-GNUmakefile
new file mode 100644
index 000000000..2cea98ffa
--- /dev/null
+++ b/package/rdate/patches/patch-GNUmakefile
@@ -0,0 +1,12 @@
+--- rdate.orig/GNUmakefile	2007-08-16 12:45:06.000000000 +0200
++++ rdate/GNUmakefile	2010-02-06 02:36:00.723431141 +0100
+@@ -15,8 +15,7 @@ CPPFLAGS+=	-D'__RCSID(x)=static const ch
+ all: rdate
+ 
+ install:
+-	install -c -s -m 555 rdate ${DESTDIR}${BINDIR}/
+-	install -c -m 444 rdate.8 ${DESTDIR}${MANDIR}/man8/
++	install -c -m 755 rdate ${DESTDIR}${BINDIR}/
+ 
+ clean:
+ 	-rm -f rdate *.o
diff --git a/package/readline/Makefile b/package/readline/Makefile
index 68f68cbea..644a87271 100644
--- a/package/readline/Makefile
+++ b/package/readline/Makefile
@@ -6,21 +6,18 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		readline
 PKG_VERSION:=		5.2
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		ncurses
 PKG_MD5SUM:=		e39331f32ad14009b9ff49cc10c5e751
 PKG_DESCR:=		Command line editing library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libncurses
+PKG_BUILDDEP+=		ncurses
 PKG_SITES:=		${MASTER_SITE_GNU:=readline/}
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBREADLINE,libreadline,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+= 	--with-curses
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBREADLINE}/usr/lib
diff --git a/package/reaim/Makefile b/package/reaim/Makefile
index 7b55eeed4..2d0633235 100644
--- a/package/reaim/Makefile
+++ b/package/reaim/Makefile
@@ -17,8 +17,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,REAIM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
+CONFIG_STYLE:=          manual
 
 post-install:
 	${INSTALL_DIR} ${IDIR_REAIM}/usr/sbin
diff --git a/package/renderproto/Makefile b/package/renderproto/Makefile
index afb008a2f..f2a7beae7 100644
--- a/package/renderproto/Makefile
+++ b/package/renderproto/Makefile
@@ -10,9 +10,4 @@ PKG_MD5SUM:=		57216f25b9a5edc561b83a7484cb17e8
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/resourceproto/Makefile b/package/resourceproto/Makefile
index 768c8d332..770d1b203 100644
--- a/package/resourceproto/Makefile
+++ b/package/resourceproto/Makefile
@@ -10,9 +10,4 @@ PKG_MD5SUM:=		587333b4995a3e11ebe4c8ba2742efaf
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/rng-tools/Makefile b/package/rng-tools/Makefile
index 6e0769681..126de7f48 100644
--- a/package/rng-tools/Makefile
+++ b/package/rng-tools/Makefile
@@ -18,10 +18,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,RNG_TOOLS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	$(INSTALL_DIR) $(IDIR_RNG_TOOLS)/usr/sbin
 	$(INSTALL_BIN) $(WRKINST)/usr/sbin/rngd $(IDIR_RNG_TOOLS)/usr/sbin
diff --git a/package/rp-pppoe/Makefile b/package/rp-pppoe/Makefile
index c79f76869..a507e4a39 100644
--- a/package/rp-pppoe/Makefile
+++ b/package/rp-pppoe/Makefile
@@ -22,19 +22,18 @@ $(eval $(call PKG_template,PPPOE_RELAY,pppoe-relay,${PKG_VERSION}-${PKG_RELEASE}
 $(eval $(call PKG_template,PPPOE_SERVER,pppoe-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PPPOE_SNIFF,pppoe-sniff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_func_setvbuf_reversed=no \
 			ac_cv_sizeof_unsigned_short=2 \
 			ac_cv_sizeof_unsigned_int=4 \
 			ac_cv_sizeof_unsigned_long=4 \
 			ac_cv_linux_kernel_pppoe=yes \
 			ac_cv_pack_bitfields_reversed=yes
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_PPPOE_CLIENT}/etc/ppp ${IDIR_PPPOE_CLIENT}/usr/sbin
-	${INSTALL_DATA} ${WRKINST}/etc/ppp/pppoe.conf ${IDIR_PPPOE_CLIENT}/etc/ppp
+	${INSTALL_DIR} ${IDIR_PPPOE_CLIENT}/etc/ppp \
+		${IDIR_PPPOE_CLIENT}/usr/sbin
+	${INSTALL_DATA} ${WRKINST}/etc/ppp/pppoe.conf \
+		${IDIR_PPPOE_CLIENT}/etc/ppp
 	${CP} ${WRKINST}/usr/sbin/pppoe ${IDIR_PPPOE_CLIENT}/usr/sbin/
 	${CP} ${WRKINST}/usr/sbin/pppoe-connect ${IDIR_PPPOE_CLIENT}/usr/sbin/
 	${CP} ${WRKINST}/usr/sbin/pppoe-start ${IDIR_PPPOE_CLIENT}/usr/sbin/
@@ -42,11 +41,16 @@ post-install:
 	${CP} ${WRKINST}/usr/sbin/pppoe-status ${IDIR_PPPOE_CLIENT}/usr/sbin/
 	${CP} ${WRKINST}/usr/sbin/pppoe-setup ${IDIR_PPPOE_CLIENT}/usr/sbin/
 	${INSTALL_DIR} ${IDIR_PPPOE_RELAY}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/pppoe-relay ${IDIR_PPPOE_RELAY}/usr/sbin/
-	${INSTALL_DIR} ${IDIR_PPPOE_SERVER}/etc/ppp ${IDIR_PPPOE_SERVER}/usr/sbin
-	${INSTALL_DATA} ${WRKINST}/etc/ppp/pppoe-server-options ${IDIR_PPPOE_SERVER}/etc/ppp/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/pppoe-server ${IDIR_PPPOE_SERVER}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/pppoe-relay \
+		${IDIR_PPPOE_RELAY}/usr/sbin/
+	${INSTALL_DIR} ${IDIR_PPPOE_SERVER}/etc/ppp \
+		${IDIR_PPPOE_SERVER}/usr/sbin
+	${INSTALL_DATA} ${WRKINST}/etc/ppp/pppoe-server-options \
+		${IDIR_PPPOE_SERVER}/etc/ppp/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/pppoe-server \
+		${IDIR_PPPOE_SERVER}/usr/sbin/
 	${INSTALL_DIR} ${IDIR_PPPOE_SNIFF}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/pppoe-sniff ${IDIR_PPPOE_SNIFF}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/pppoe-sniff \
+		${IDIR_PPPOE_SNIFF}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/rpcbind/Makefile b/package/rpcbind/Makefile
index 6afd4b8bd..ee939d08d 100644
--- a/package/rpcbind/Makefile
+++ b/package/rpcbind/Makefile
@@ -21,10 +21,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,RPCBIND,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TCFLAGS+=		-I${STAGING_DIR}/usr/include/tirpc
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-libwrap
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_RPCBIND)/usr/bin
diff --git a/package/rpcbind/patches/patch-config_h_in b/package/rpcbind/patches/patch-config_h_in
new file mode 100644
index 000000000..0eeab0c48
--- /dev/null
+++ b/package/rpcbind/patches/patch-config_h_in
@@ -0,0 +1,12 @@
+--- rpcbind-0.2.0.orig/config.h.in	2009-05-29 18:37:50.000000000 +0200
++++ rpcbind-0.2.0/config.h.in	2010-02-06 01:51:38.000000000 +0100
+@@ -96,6 +96,9 @@
+ /* Define to the one symbol short name of this package. */
+ #undef PACKAGE_TARNAME
+ 
++/* Define to the home page for this package. */
++#undef PACKAGE_URL
++
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+ 
diff --git a/package/rpcbind/patches/patch-src_rpcbind_c b/package/rpcbind/patches/patch-src_rpcbind_c
new file mode 100644
index 000000000..358bdc0c0
--- /dev/null
+++ b/package/rpcbind/patches/patch-src_rpcbind_c
@@ -0,0 +1,14 @@
+--- rpcbind-0.2.0.orig/src/rpcbind.c	2009-05-29 15:38:22.000000000 +0200
++++ rpcbind-0.2.0/src/rpcbind.c	2010-02-06 01:54:03.194325296 +0100
+@@ -67,7 +67,11 @@
+ #include <pwd.h>
+ #include <string.h>
+ #include <errno.h>
++#if defined(__UCLIBC__)
++#define __nss_configure_lookup(x,y)
++#else
+ #include <nss.h>
++#endif 
+ #include "config.h"
+ #include "rpcbind.h"
+ 
diff --git a/package/rpcbind/patches/patch-src_security_c b/package/rpcbind/patches/patch-src_security_c
new file mode 100644
index 000000000..d7a5582d9
--- /dev/null
+++ b/package/rpcbind/patches/patch-src_security_c
@@ -0,0 +1,41 @@
+--- rpcbind-0.2.0.orig/src/security.c	2009-05-29 15:38:22.000000000 +0200
++++ rpcbind-0.2.0/src/security.c	2010-02-06 01:55:37.383094004 +0100
+@@ -20,12 +20,38 @@
+ /*
+  * XXX for special case checks in check_callit.
+  */
++#if defined(__UCLIBC__)
++
++#define MOUNTPROC_MNT 1
++#define MOUNTPROC_UMNT 3
++
++#define NFS_PROGRAM    100003
++#define YPPROG         100004
++#define MOUNTPROG      100005
++#define YPBINDPROG     100007
++#define YPPASSWDPROG   100009
++#define RQUOTAPROG     100011
++
++#define YPPROC_NULL    0
++#define YPPROC_DOMAIN  1
++#define YPPROC_DOMAIN_NONACK 2
++#define YPPROC_MATCH   3
++#define YPPROC_FIRST   4
++#define YPPROC_NEXT    5
++#define YPPROC_XFR     6
++#define YPPROC_CLEAR   7
++#define YPPROC_ALL     8
++
++#define YPBINDPROC_SETDOM      2
++
++#else 
+ #include <rpcsvc/mount.h>
+ #include <rpcsvc/rquota.h>
+ #include <rpcsvc/nfs_prot.h>
+ #include <rpcsvc/yp.h>
+ #include <rpcsvc/ypclnt.h>
+ #include <rpcsvc/yppasswd.h>
++#endif
+ 
+ #include "rpcbind.h"
+ 
diff --git a/package/rpm/Makefile b/package/rpm/Makefile
index 49c7f8339..fa931b5ba 100644
--- a/package/rpm/Makefile
+++ b/package/rpm/Makefile
@@ -23,11 +23,8 @@ $(eval $(call PKG_template,RPM,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_D
 
 TCPPFLAGS+=		-I${STAGING_DIR}/usr/include/nspr \
 			-I${STAGING_DIR}/usr/include/nss
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS:=	--with-external-db \
 			--without-lua
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_RPM)/usr/bin $(IDIR_RPM)/usr/lib
diff --git a/package/rrdcollect/Makefile b/package/rrdcollect/Makefile
index 78c67ebab..8a73aa105 100644
--- a/package/rrdcollect/Makefile
+++ b/package/rrdcollect/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		rrdcollect
 PKG_VERSION:=		0.2.3
 PKG_RELEASE:=		8
-PKG_BUILDDEP+=		rrdtool
 PKG_MD5SUM:=		5e4305c612bc3cccbaf802c275c81a11
 PKG_DESCR:=		Round-Robin Database (RRD) collecting daemon
 PKG_SECTION:=		admin
 PKG_DEPENDS:=		librrd
+PKG_BUILDDEP+=		rrdtool
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=rrdcollect/}
 
 ifneq (${ADK_PACKAGE_LIBRRD},)
@@ -22,27 +22,27 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,RRDCOLLECT,rrdcollect,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,RRDCOLLECT_EXAMPLE,rrdcollect-example,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-CONFIGURE_ENV+=		LIBS="${RRDTOOL_LIBS} -lz" ac_cv_func_malloc_0_nonnull=yes
+CONFIGURE_ENV+=		LIBS="${RRDTOOL_LIBS} -lz" \
+			ac_cv_func_malloc_0_nonnull=yes
 CONFIGURE_ARGS+=	--enable-exec \
 			--without-rrdtool \
 			--with-librrd \
 			--without-libpcre \
 			--without-libpcap
 TCFLAGS+=		-DSOCKET_COMM
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_RRDCOLLECT}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/rrdcollect ${IDIR_RRDCOLLECT}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/rrdcollect \
+		${IDIR_RRDCOLLECT}/usr/sbin/
 	${INSTALL_DIR} ${IDIR_RRDCOLLECT_EXAMPLE}/etc
 	${INSTALL_DATA} ./files/rrd.conf ./files/rrdcollect.conf \
 		${IDIR_RRDCOLLECT_EXAMPLE}/etc/
 	${INSTALL_DIR} ${IDIR_RRDCOLLECT_EXAMPLE}/usr/bin
 	${INSTALL_BIN} ./files/rrd.sh ${IDIR_RRDCOLLECT_EXAMPLE}/usr/bin/
 	${INSTALL_DIR} ${IDIR_RRDCOLLECT_EXAMPLE}/www/cgi-bin
-	ln -sf /var/lib/rrdcollect/rrd.cgi ${IDIR_RRDCOLLECT_EXAMPLE}/www/cgi-bin/rrd.cgi
+	ln -sf /var/lib/rrdcollect/rrd.cgi \
+		${IDIR_RRDCOLLECT_EXAMPLE}/www/cgi-bin/rrd.cgi
 	ln -sf /var/lib/rrdcollect/img ${IDIR_RRDCOLLECT_EXAMPLE}/www/img
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile
index 6c729367e..268a108ff 100644
--- a/package/rrdtool/Makefile
+++ b/package/rrdtool/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		rrdtool
 PKG_VERSION:=		1.2.30
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libxml2 cgilib freetype libart libpng
 PKG_MD5SUM:=		19b24f7184a8dbf7b48c1bbb565ad9fb
 PKG_DESCR:=		Round Robin Database (RRD) management library and tools
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libart libfreetype libpng zlib
+PKG_BUILDDEP+=		libxml2 cgilib freetype libart libpng
 PKG_SITES:=		http://oss.oetiker.ch/rrdtool/pub/
 
 include ${TOPDIR}/mk/package.mk
@@ -19,7 +19,6 @@ $(eval $(call PKG_template,LIBRRD,librrd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP
 $(eval $(call PKG_template,RRDCGI,rrdcgi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,RRDTOOL,rrdtool,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		rd_cv_ieee_works=yes
 CONFIGURE_ARGS+=	--enable-rrdcgi \
 			--disable-mmap \
@@ -30,8 +29,6 @@ CONFIGURE_ARGS+=	--enable-rrdcgi \
 			--without-x \
 			--with-rrd-default-font=/usr/share/rrdtool/fonts/DejaVuSansMono-Roman.ttf
 TCPPFLAGS+=		-I${STAGING_DIR}/usr/include/freetype2
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_RRDTOOL}/usr/bin
diff --git a/package/rrs/Makefile b/package/rrs/Makefile
index 6f45be506..077943b5a 100644
--- a/package/rrs/Makefile
+++ b/package/rrs/Makefile
@@ -6,14 +6,14 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		rrs
 PKG_VERSION:=		1.70
 PKG_RELEASE:=		2
-PKG_BUILDDEP+=		zlib
+PKG_MD5SUM:=		b400d03c0e39e3e78a7327ba78f789f0
+PKG_DESCR:=		A reverse (connecting) remote shell, with SSL support.
+PKG_SECTION:=		net
 PKG_CXX:=		RRS
+PKG_BUILDDEP+=		zlib
 ifneq ($(ADK_PACKAGE_RRS),)
 PKG_BUILDDEP+=		openssl
 endif
-PKG_MD5SUM:=		b400d03c0e39e3e78a7327ba78f789f0
-PKG_DESCR:=		A reverse (connecting) remote shell, with SSL support.
-PKG_SECTION:=		net
 PKG_URL:=		http://www.cycom.se/dl/rrs
 PKG_SITES:=		http://www.cycom.se/uploads/36/19/
 
@@ -31,6 +31,10 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,RRS,rrs,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,RRS_NOSSL,rrs-nossl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_NOSSL},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=          manual
+BUILD_STYLE:=          manual
+INSTALL_STYLE:=         manual
+
 ifeq ($(ADK_COMPILE_RRS_WITH_UCLIBCXX),y)
 PKG_FLAGS=-fno-builtin -fno-rtti -nostdinc++ -fPIC
 PKG_LDFLAGS=-nodefaultlibs -luClibc++ -lc -lm
@@ -39,7 +43,7 @@ PKG_FLAGS=-fPIC
 PKG_LDFLAGS=-shared
 endif
 
-do-configure:
+do-build:
 ifneq (${ADK_PACKAGE_RRS},)
 	${MAKE} -C ${WRKBUILD} \
 		CC="${TARGET_CC}" \
diff --git a/package/rsync/Makefile b/package/rsync/Makefile
index b34584534..2b804f534 100644
--- a/package/rsync/Makefile
+++ b/package/rsync/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		rsync
 PKG_VERSION:=		3.0.6
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		popt
 PKG_MD5SUM:=		e9865d093a18e4668b9d31b635dc8e99
 PKG_DESCR:=		utility that provides fast incremental file transfer
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libpopt
+PKG_BUILDDEP+=		popt
 PKG_URL:=		http://rsync.samba.org
 PKG_SITES:=		http://rsync.samba.org/ftp/rsync/
 
@@ -18,10 +18,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,RSYNC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_RSYNC}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/rsync ${IDIR_RSYNC}/usr/bin
diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile
index a36c187b3..e7829d172 100644
--- a/package/rtorrent/Makefile
+++ b/package/rtorrent/Makefile
@@ -6,29 +6,18 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		rtorrent
 PKG_VERSION:=		0.8.5
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		ncurses libtorrent curl
 PKG_MD5SUM:=		e701095e1824b7e512a17000f4c0a783
 PKG_DESCR:=		console torrent application
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libncurses libtorrent libcurl
+PKG_BUILDDEP+=		ncurses libtorrent curl
 PKG_URL:=		http://libtorrent.rakshasa.no
 PKG_SITES:=		http://libtorrent.rakshasa.no/downloads/
-#PKG_CXX:=		RTORRENT
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,RTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-#ifeq ($(ADK_COMPILE_RTORRENT_WITH_UCLIBCXX),y)
-#CONFIGURE_ENV+=		CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ \
-#			-I${STAGING_DIR}/usr/include/uClibc++" \
-#			LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc"
-#endif
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_RTORRENT}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/rtorrent ${IDIR_RTORRENT}/usr/bin
diff --git a/package/ruby/Makefile b/package/ruby/Makefile
index 4bda5691e..35835b9b3 100644
--- a/package/ruby/Makefile
+++ b/package/ruby/Makefile
@@ -4,11 +4,12 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ruby
-PKG_VERSION:=		1.9.1-p243
+PKG_VERSION:=		1.9.1-p378
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		515bfd965814e718c0943abf3dde5494
+PKG_MD5SUM:=		9fc5941bda150ac0a33b299e1e53654c
 PKG_DESCR:=		interpreter for the ruby language
 PKG_SECTION:=		net
+PKG_NOPARALLEL:=	1
 PKG_URL:=		http://www.ruby-lang.org
 PKG_SITES:=		ftp://ftp.ruby-lang.org/pub/ruby/1.9/
 
@@ -18,18 +19,15 @@ $(eval $(call PKG_template,RUBY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_
 
 MAKE_FILE:=		GNUmakefile
 XAKE_FLAGS+=		optflags='' debugflags=''
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-wide-getaddrinfo
 # uClibc setpgrp does not take arguments
 CONFIGURE_ENV+=         ac_cv_func_setpgrp_void=yes
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 INSTALL_TARGET:=	install-nodoc
 
 # Enable some ruby extension / options
 post-configure:
 	#echo "option nodynamic" >> ${WRKBUILD}/ext/Setup
-	echo "socket" >> ${WRKBUILD}/ext/Setup
+	#echo "socket" >> ${WRKBUILD}/ext/Setup
 
 post-install:
 	rm ${WRKINST}/usr/lib/*.a
diff --git a/package/rxvt-unicode/Makefile b/package/rxvt-unicode/Makefile
index e6ac62eb3..0ddc09efe 100644
--- a/package/rxvt-unicode/Makefile
+++ b/package/rxvt-unicode/Makefile
@@ -20,11 +20,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,RXVT_UNICODE,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-perl \
 			--disable-utmp
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_RXVT_UNICODE)/usr/bin
diff --git a/package/samba/Makefile b/package/samba/Makefile
index 69ccdef14..e953e2253 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -4,14 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		samba
-PKG_VERSION:=		3.4.3
+PKG_VERSION:=		3.4.5
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		322379680c12057f57685652a35a6b05
+PKG_MD5SUM:=		8e8a484782f2b7716b6c6bd9a7d2bf71
 PKG_DESCR:=		NetBIOS/SMB file and print server
 PKG_SECTION:=		net
 PKG_URL:=		http://www.samba.org
-PKG_SITES:=		ftp://se.samba.org/pub/samba/stable/ \
-			ftp://ftp.easynet.be/samba/stable/
+PKG_SITES:=		http://samba.org/samba/ftp/stable/
 
 WRKSRC=			${WRKDIST}/source3
 
@@ -22,7 +21,6 @@ $(eval $(call PKG_template,SAMBA_CLIENT,samba-client,${PKG_VERSION}-${PKG_RELEAS
 $(eval $(call PKG_template,SAMBA_PASSWD,samba-passwd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TLDFLAGS+=		-Wl,-rpath -Wl,/usr/lib/samba
-
 CONFIGURE_ENV+=		samba_cv_CC_NEGATIVE_ENUM_VALUES=no \
 			samba_cv_USE_SETRESUID=no \
 			ac_cv_lib_ext_nsl_connect=no \
@@ -44,10 +42,6 @@ CONFIGURE_ARGS+=	--libdir=/usr/lib/samba \
 			--without-cluster-support \
 			--without-sendfile-support
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_SAMBA}/etc/samba ${IDIR_SAMBA}/usr/sbin
 	${INSTALL_DIR} ${IDIR_SAMBA}/usr/lib/samba/{charset,vfs}
diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile
index abb31e847..4433e34ad 100644
--- a/package/sane-backends/Makefile
+++ b/package/sane-backends/Makefile
@@ -154,12 +154,9 @@ $(eval $(call PKG_mod_template,SANE_BACKEND_UMAX_PP,umax_pp))
 $(eval $(call PKG_mod_template,SANE_BACKEND_UMAX,umax))
 
 CONFIGURE_ENV+=		ac_cv_func_ioperm=no
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-translations \
 			--without-gphoto2 \
 			--enable-libusb
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
 	${INSTALL_DIR} ${IDIR_SANE_BACKENDS}/etc/sane.d 
diff --git a/package/sangam-atm/Makefile b/package/sangam-atm/Makefile
index 52cb218fe..4277fb7c7 100644
--- a/package/sangam-atm/Makefile
+++ b/package/sangam-atm/Makefile
@@ -19,8 +19,9 @@ include ${TOPDIR}/mk/kernel-vars.mk
 
 $(eval $(call PKG_template,KMOD_SANGAM_ATM,kmod-sangam-atm,${KERNEL_VERSION}+${PKG_VERSION}-${ADK_TARGET}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		manual
-INSTALL_STYLE:=		manual
+CONFIG_STYLE:=          manual
+BUILD_STYLE:=           manual
+INSTALL_STYLE:=         manual
 
 do-build:
 	$(MAKE) ${KERNEL_MAKE_OPTS} LDFLAGS="" SUBDIRS="${WRKBUILD}" modules
diff --git a/package/scanlogd/Makefile b/package/scanlogd/Makefile
index 9d06cfc3d..b21bfa94e 100644
--- a/package/scanlogd/Makefile
+++ b/package/scanlogd/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		scanlogd
 PKG_VERSION:=		2.2.6
 PKG_RELEASE:=		8
-PKG_BUILDDEP+=		libpcap libnids libnet
 PKG_MD5SUM:=		7b8187ea718ebe47f22805b921b909ab
 PKG_DESCR:=		Portscan logger
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libpcap libnet libnids
+PKG_BUILDDEP+=		libpcap libnids libnet
 PKG_URL:=		http://www.openwall.com/scanlogd
 PKG_SITES:=		http://www.openwall.com/scanlogd/ \
 			ftp://ftp.wiretapped.net/pub/openwall/ \
@@ -20,8 +20,11 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SCANLOGD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
-MAKE_FLAGS+=		CC="${TARGET_CC}" LD="${TARGET_CC}" CFLAGS="-c ${TARGET_CFLAGS}" \
+CONFIG_STYLE:=          manual
+INSTALL_STYLE:=         manual
+
+MAKE_FLAGS+=		CC="${TARGET_CC}" LD="${TARGET_CC}" \
+			CFLAGS="-c ${TARGET_CFLAGS}" \
 			LDFLAGS= \
 			PCAP_H="-I${STAGING_DIR}/usr/include" \
 			NIDS_H="-I${STAGING_DIR}/usr/include" \
diff --git a/package/screen/Makefile b/package/screen/Makefile
index 01451b900..1f7b023f2 100644
--- a/package/screen/Makefile
+++ b/package/screen/Makefile
@@ -18,13 +18,11 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SCREEN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		$(foreach flag,rename fchmod fchown strerror lstat _exit utimes vsnprintf getcwd setlocale strftime,ac_cv_func_${flag}=yes)
 CONFIGURE_ARGS+=	--with-sys-screenrc=/etc/screenrc
-BUILD_STYLE:=		auto
 
-do-install:
+post-install:
 	${INSTALL_DIR} ${IDIR_SCREEN}/usr/bin
-	${INSTALL_BIN} ${WRKBUILD}/screen ${IDIR_SCREEN}/usr/bin/
+	${INSTALL_BIN} ${WRKINST}/usr/bin/screen ${IDIR_SCREEN}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/scrnsaverproto/Makefile b/package/scrnsaverproto/Makefile
index 5171f2f62..19496f2c5 100644
--- a/package/scrnsaverproto/Makefile
+++ b/package/scrnsaverproto/Makefile
@@ -10,9 +10,4 @@ PKG_MD5SUM:=		0ed88bdd6945ba207c4f734af48e7e25
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/scsi-spin/Makefile b/package/scsi-spin/Makefile
index f8a551b9b..a7abd2b9a 100644
--- a/package/scsi-spin/Makefile
+++ b/package/scsi-spin/Makefile
@@ -11,14 +11,18 @@ PKG_DESCR:=		Utility to spin down scsi disks
 PKG_SECTION:=		misc
 
 NO_DISTFILES:=		1
-WRKDIST=		${WRKDIR}/scsi-spin
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SCSI_SPIN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 do-build:
-	${TARGET_CC} ${TARGET_CFLAGS} -o ${WRKBUILD}/scsi-spin files/scsi-spin.c
+	${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} -o ${WRKBUILD}/scsi-spin \
+		${WRKBUILD}/scsi-spin.c
 
 do-install:
 	${INSTALL_DIR} ${IDIR_SCSI_SPIN}/usr/sbin
diff --git a/package/scsi-spin/files/scsi-spin.c b/package/scsi-spin/src/scsi-spin.c
index 443934c78..443934c78 100644
--- a/package/scsi-spin/files/scsi-spin.c
+++ b/package/scsi-spin/src/scsi-spin.c
diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile
index d7cd7a2e7..ce8cf9cc9 100644
--- a/package/sdl-image/Makefile
+++ b/package/sdl-image/Makefile
@@ -26,13 +26,10 @@ SUB_INSTALLS-y:=
 SUB_INSTALLS-m:=
 SUB_INSTALLS-${ADK_PACKAGE_LIBSDL_IMAGE_DEV}+=	libsdl-image-dev-install
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-png \
 			--enable-jpg \
 			--enable-bmp \
 			--enable-tif
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	$(INSTALL_DIR) $(IDIR_LIBSDL_IMAGE)/usr/lib
diff --git a/package/sdl/Makefile b/package/sdl/Makefile
index f5f9ff6aa..fa0e0be8d 100644
--- a/package/sdl/Makefile
+++ b/package/sdl/Makefile
@@ -26,7 +26,6 @@ SUB_INSTALLS-y:=
 SUB_INSTALLS-m:=
 SUB_INSTALLS-${ADK_PACKAGE_LIBSDL_DEV}+=	libsdl-dev-install
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-esd \
 			--disable-oss \
 			--enable-alsa \
@@ -35,8 +34,6 @@ CONFIGURE_ARGS+=	--disable-esd \
 			--disable-video-opengl \
 			--enable-input-tslib \
 			--with-x
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	$(INSTALL_DIR) $(IDIR_LIBSDL)/usr/lib
diff --git a/package/ser2net/Makefile b/package/ser2net/Makefile
index 53053d818..3be9a24b7 100644
--- a/package/ser2net/Makefile
+++ b/package/ser2net/Makefile
@@ -15,10 +15,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SER2NET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_lib_nsl_main=no
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_SER2NET}/etc ${IDIR_SER2NET}/usr/sbin
diff --git a/package/serdisplib/Makefile b/package/serdisplib/Makefile
index e49d1e224..85d680f8b 100644
--- a/package/serdisplib/Makefile
+++ b/package/serdisplib/Makefile
@@ -6,10 +6,10 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		serdisplib
 PKG_VERSION:=		1.97.8
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libgd libusb
 PKG_MD5SUM:=		2aa91c43d01d2dfc9fbc1116e3063ae1
 PKG_DESCR:=		display drivers (serial, parallel, USB)
 PKG_SECTION:=		misc
+PKG_BUILDDEP+=		libgd libusb
 PKG_URL:=		http://serdisplib.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=serdisplib/}
 
@@ -17,10 +17,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SERDISPLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+INSTALL_STYLE:=		manual
+
 CONFIGURE_ENV+=		PACKAGE_VERSION_MAJOR=1 PACKAGE_VERSION_MINOR=97
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-libusb
-BUILD_STYLE:=		auto
 TCFLAGS+=		${TCPPFLAGS}
 
 do-install:
diff --git a/package/setpwc/Makefile b/package/setpwc/Makefile
index 12e685bd5..4814b9aec 100644
--- a/package/setpwc/Makefile
+++ b/package/setpwc/Makefile
@@ -18,8 +18,13 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SETPWC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=          manual
+BUILD_STYLE:=           manual
+INSTALL_STYLE:=         manual
+
 do-build:
-	${TARGET_CC} ${TARGET_CFLAGS} -DVERSION=\"${PKG_VERSION}\" -o ${WRKBUILD}/setpwc ${WRKBUILD}/setpwc.c
+	${TARGET_CC} -Wall ${TCFLAGS} -DVERSION=\"${PKG_VERSION}\" \
+		-o ${WRKBUILD}/setpwc ${WRKBUILD}/setpwc.c
 
 do-install:
 	${INSTALL_DIR} ${IDIR_SETPWC}/usr/bin
diff --git a/package/setserial/Makefile b/package/setserial/Makefile
index 47e179329..b106d11a0 100644
--- a/package/setserial/Makefile
+++ b/package/setserial/Makefile
@@ -15,8 +15,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SETSERIAL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
+INSTALL_STYLE:=         manual
 
 do-install:
 	${INSTALL_DIR} ${IDIR_SETSERIAL}/usr/sbin
diff --git a/package/shat/Makefile b/package/shat/Makefile
index b9ab7096a..164280e51 100644
--- a/package/shat/Makefile
+++ b/package/shat/Makefile
@@ -15,6 +15,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SHAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=          manual
+BUILD_STYLE:=           manual
+INSTALL_STYLE:=         manual
+
 do-build:
 	${MAKE} -C ${WRKBUILD}/src \
 		CC="${TARGET_CC}" LD=${TARGET_CROSS}ld \
diff --git a/package/shorewall-common/Makefile b/package/shorewall-common/Makefile
index 44ddbfffe..bfa99f834 100644
--- a/package/shorewall-common/Makefile
+++ b/package/shorewall-common/Makefile
@@ -19,9 +19,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SHOREWALL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-do-install:
-	PREFIX="${WRKINST}" ${WRKBUILD}/install.sh -n
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
 
+do-build:
+	PREFIX="${WRKINST}" ${WRKBUILD}/install.sh -n
 	# remove configfiles folder
 	${RM} -R ${WRKINST}/usr/share/shorewall/configfiles
 
@@ -35,22 +38,34 @@ ifeq ($(ADK_PACKAGE_SHOREWALL_STRIPSHARED),y)
 	gzip -9 ${WRKINST}/usr/share/shorewall/*.template
 endif
 
-post-install:
+do-install:
 	${INSTALL_DIR} ${IDIR_SHOREWALL}/etc/shorewall
 	${INSTALL_DIR} ${IDIR_SHOREWALL}/usr/share/shorewall
 	${INSTALL_DIR} ${IDIR_SHOREWALL}/sbin
-	${INSTALL_DATA} ${WRKINST}/etc/shorewall/* ${IDIR_SHOREWALL}/etc/shorewall/
-	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/actions.std ${IDIR_SHOREWALL}/usr/share/shorewall/
-	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/configpath ${IDIR_SHOREWALL}/usr/share/shorewall/
-	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/modules ${IDIR_SHOREWALL}/usr/share/shorewall/
-	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/rfc1918 ${IDIR_SHOREWALL}/usr/share/shorewall/
-	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/version ${IDIR_SHOREWALL}/usr/share/shorewall/
-	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/action.* ${IDIR_SHOREWALL}/usr/share/shorewall/
-	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/macro.* ${IDIR_SHOREWALL}/usr/share/shorewall/
-	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/lib.* ${IDIR_SHOREWALL}/usr/share/shorewall/
-	${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/firewall ${IDIR_SHOREWALL}/usr/share/shorewall/
-	${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/functions ${IDIR_SHOREWALL}/usr/share/shorewall/
-	${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/wait4ifup ${IDIR_SHOREWALL}/usr/share/shorewall/
+	${INSTALL_DATA} ${WRKINST}/etc/shorewall/* \
+		${IDIR_SHOREWALL}/etc/shorewall/
+	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/actions.std \
+		${IDIR_SHOREWALL}/usr/share/shorewall/
+	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/configpath \
+		${IDIR_SHOREWALL}/usr/share/shorewall/
+	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/modules \
+		${IDIR_SHOREWALL}/usr/share/shorewall/
+	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/rfc1918 \
+		${IDIR_SHOREWALL}/usr/share/shorewall/
+	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/version \
+		${IDIR_SHOREWALL}/usr/share/shorewall/
+	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/action.* \
+		${IDIR_SHOREWALL}/usr/share/shorewall/
+	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/macro.* \
+		${IDIR_SHOREWALL}/usr/share/shorewall/
+	${INSTALL_DATA} ${WRKINST}/usr/share/shorewall/lib.* \
+		${IDIR_SHOREWALL}/usr/share/shorewall/
+	${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/firewall \
+		${IDIR_SHOREWALL}/usr/share/shorewall/
+	${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/functions \
+		${IDIR_SHOREWALL}/usr/share/shorewall/
+	${INSTALL_BIN} ${WRKINST}/usr/share/shorewall/wait4ifup \
+		${IDIR_SHOREWALL}/usr/share/shorewall/
 	${INSTALL_BIN} ${WRKINST}/sbin/shorewall ${IDIR_SHOREWALL}/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/shorewall-shell/Makefile b/package/shorewall-shell/Makefile
index c5d1bfb0c..21971a807 100644
--- a/package/shorewall-shell/Makefile
+++ b/package/shorewall-shell/Makefile
@@ -18,18 +18,26 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SHOREWALL_SHELL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-do-install:
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
+do-build:
 	PREFIX="${WRKINST}" ${WRKBUILD}/install.sh -n
 
 ifeq ($(ADK_PACKAGE_SHOREWALL_STRIPSHARED),y)
 	${BASH} ./files/downstrip ${WRKINST}/usr/share/${PKG_NAME}
 endif
 
-post-install:
+do-install:
 	${INSTALL_DIR} ${IDIR_SHOREWALL_SHELL}/usr/share/${PKG_NAME}
-	${INSTALL_DATA} ${WRKINST}/usr/share/${PKG_NAME}/version ${IDIR_SHOREWALL_SHELL}/usr/share/${PKG_NAME}/
-	${INSTALL_DATA} ${WRKINST}/usr/share/${PKG_NAME}/lib.* ${IDIR_SHOREWALL_SHELL}/usr/share/${PKG_NAME}/
-	${INSTALL_DATA} ${WRKINST}/usr/share/${PKG_NAME}/prog.* ${IDIR_SHOREWALL_SHELL}/usr/share/${PKG_NAME}/
-	${INSTALL_BIN} ${WRKINST}/usr/share/${PKG_NAME}/compiler ${IDIR_SHOREWALL_SHELL}/usr/share/${PKG_NAME}/
+	${INSTALL_DATA} ${WRKINST}/usr/share/${PKG_NAME}/version \
+		${IDIR_SHOREWALL_SHELL}/usr/share/${PKG_NAME}/
+	${INSTALL_DATA} ${WRKINST}/usr/share/${PKG_NAME}/lib.* \
+		${IDIR_SHOREWALL_SHELL}/usr/share/${PKG_NAME}/
+	${INSTALL_DATA} ${WRKINST}/usr/share/${PKG_NAME}/prog.* \
+		${IDIR_SHOREWALL_SHELL}/usr/share/${PKG_NAME}/
+	${INSTALL_BIN} ${WRKINST}/usr/share/${PKG_NAME}/compiler \
+		${IDIR_SHOREWALL_SHELL}/usr/share/${PKG_NAME}/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/siproxd/Makefile b/package/siproxd/Makefile
index 8443ec888..3fbf8040e 100644
--- a/package/siproxd/Makefile
+++ b/package/siproxd/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		siproxd
 PKG_VERSION:=		0.7.1
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libosip2
 PKG_MD5SUM:=		45e5a44803181e2bf3361d562060c904
 PKG_DESCR:=		a SIP (Session Initiation Protocol) proxy
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libosip2 libpthread
+PKG_BUILDDEP+=		libosip2
 PKG_URL:=		http://siproxd.sourceforge.net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=siproxd/}
 
@@ -18,13 +18,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SIPROXD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_SIPROXD}/usr/sbin ${IDIR_SIPROXD}/etc
-	${INSTALL_DATA} ${WRKINST}/etc/siproxd.conf.example ${IDIR_SIPROXD}/etc/siproxd.conf
+	${INSTALL_DATA} ${WRKINST}/etc/siproxd.conf.example \
+		${IDIR_SIPROXD}/etc/siproxd.conf
 	${INSTALL_DATA} ${WRKINST}/etc/siproxd_passwd.cfg ${IDIR_SIPROXD}/etc/
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/siproxd ${IDIR_SIPROXD}/usr/sbin/
 
diff --git a/package/sipsak/Makefile b/package/sipsak/Makefile
index 2249c2cf5..0e6b9d292 100644
--- a/package/sipsak/Makefile
+++ b/package/sipsak/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		sipsak
 PKG_VERSION:=		0.9.6
 PKG_RELEASE:=		2
-PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		c4eb8e282902e75f4f040f09ea9d99d5
 PKG_DESCR:=		a SIP stress and diagnostics utility
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libopenssl
+PKG_BUILDDEP+=		openssl
 PKG_URL:=		http://sipsak.org
 PKG_SITES:=		http://download.berlios.de/sipsak/ \
 			http://ftp.iptel.org/pub/sipsak/
@@ -19,10 +19,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SIPSAK,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-gnutls
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_SIPSAK}/usr/bin
diff --git a/package/sispmctl/Makefile b/package/sispmctl/Makefile
index c65a3a0c0..8c6600089 100644
--- a/package/sispmctl/Makefile
+++ b/package/sispmctl/Makefile
@@ -18,10 +18,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SISPMCTL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_SISPMCTL}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/sispmctl ${IDIR_SISPMCTL}/usr/bin
diff --git a/package/snort/Makefile b/package/snort/Makefile
index 6d1f9c134..4f9cee83e 100644
--- a/package/snort/Makefile
+++ b/package/snort/Makefile
@@ -19,7 +19,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SNORT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-flexresp \
 			--with-libnet-includes="${STAGING_DIR}/usr/include" \
 			--with-libnet-libraries="${STAGING_DIR}/usr/lib" \
@@ -30,8 +29,6 @@ CONFIGURE_ARGS+=	--disable-flexresp \
 			--without-mysql \
 			--without-postgresql \
 			--disable-inline
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_SNORT}/usr/bin
@@ -39,11 +36,16 @@ post-install:
 	${INSTALL_DATA} ${WRKBUILD}/etc/snort.conf ${IDIR_SNORT}/etc/snort/
 	${INSTALL_DATA} ${WRKBUILD}/etc/classification.config \
 		${IDIR_SNORT}/etc/snort/
-	${INSTALL_DATA} ${WRKBUILD}/etc/gen-msg.map ${IDIR_SNORT}/etc/snort/
-	${INSTALL_DATA} ${WRKBUILD}/etc/reference.config ${IDIR_SNORT}/etc/snort/
-	${INSTALL_DATA} ${WRKBUILD}/etc/sid-msg.map ${IDIR_SNORT}/etc/snort/
-	${INSTALL_DATA} ${WRKBUILD}/etc/threshold.conf ${IDIR_SNORT}/etc/snort/
-	${INSTALL_DATA} ${WRKBUILD}/etc/unicode.map ${IDIR_SNORT}/etc/snort/
+	${INSTALL_DATA} ${WRKBUILD}/etc/gen-msg.map \
+		${IDIR_SNORT}/etc/snort/
+	${INSTALL_DATA} ${WRKBUILD}/etc/reference.config \
+		${IDIR_SNORT}/etc/snort/
+	${INSTALL_DATA} ${WRKBUILD}/etc/sid-msg.map \
+		${IDIR_SNORT}/etc/snort/
+	${INSTALL_DATA} ${WRKBUILD}/etc/threshold.conf \
+		${IDIR_SNORT}/etc/snort/
+	${INSTALL_DATA} ${WRKBUILD}/etc/unicode.map \
+		${IDIR_SNORT}/etc/snort/
 	${INSTALL_BIN} ${WRKINST}/usr/bin/snort ${IDIR_SNORT}/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/socat/Makefile b/package/socat/Makefile
index 5ca41edc1..b264096f4 100644
--- a/package/socat/Makefile
+++ b/package/socat/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		socat
 PKG_VERSION:=		1.7.0.0
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		82967132b5a8ca4d07e54370fdcb2662
 PKG_DESCR:=		A multipurpose relay (SOcket CAT)
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libpthread libopenssl
+PKG_BUILDDEP+=		openssl
 PKG_URL:=		http://www.dest-unreach.org/socat
 PKG_SITES:=		http://www.dest-unreach.org/socat/download/
 
@@ -18,15 +18,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SOCAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		sc_cv_termios_ispeed="no" \
 			sc_cv_sys_crdly_shift=9 \
 			sc_cv_sys_tabdly_shift=11 \
 			sc_cv_sys_csize_shift=4
 CONFIGURE_ARGS+=	--disable-libwrap \
 			--disable-readline
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_SOCAT}/usr/bin
diff --git a/package/speex/Makefile b/package/speex/Makefile
index 56dfb2d14..a345b1a97 100644
--- a/package/speex/Makefile
+++ b/package/speex/Makefile
@@ -16,14 +16,11 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBSPEEX,libspeex,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--without-ogg --disable-oggtest --enable-fixed-point
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 XAKE_FLAGS+=		bin_PROGRAMS=""
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBSPEEX}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libspeex.so.* ${IDIR_LIBSPEEX}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libspeex.so* ${IDIR_LIBSPEEX}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile
index bd2825e71..97d0a7535 100644
--- a/package/sqlite/Makefile
+++ b/package/sqlite/Makefile
@@ -6,10 +6,10 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		sqlite
 PKG_VERSION:=		3.6.20
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		ncurses readline
 PKG_MD5SUM:=		0faf8fc8ccff5297513c6532b2b4ce23
 PKG_DESCR:=		Self-contained, embeddable, zero-configuration SQL database
 PKG_SECTION:=		libs
+PKG_BUILDDEP+=		ncurses readline
 PKG_URL:=		http://www.sqlite.org
 PKG_SITES:=		http://www.sqlite.org/
 
@@ -18,7 +18,6 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,LIBSQLITE,libsqlite,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,SQLITE_CLI,sqlite-cli,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		config_BUILD_CC="${HOSTCC}" \
 			config_BUILD_CFLAGS="${HOSTCFLAGS}" \
 			config_TARGET_CC="${TARGET_CC}" \
@@ -29,8 +28,6 @@ MAKE_FLAGS+=		LIBPTHREAD=-lm
 CONFIGURE_ARGS+=	--disable-tcl \
 			--without-tcl \
 			--disable-amalgamation
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBSQLITE}/usr/lib
diff --git a/package/sqlite/extra/sqlite3.h b/package/sqlite/src/sqlite3.h
index fc015b08e..fc015b08e 100644
--- a/package/sqlite/extra/sqlite3.h
+++ b/package/sqlite/src/sqlite3.h
diff --git a/package/squid/Makefile b/package/squid/Makefile
index 3fb78d66d..d10b71a16 100644
--- a/package/squid/Makefile
+++ b/package/squid/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		squid
 PKG_VERSION:=		3.0.STABLE20
 PKG_RELEASE:=		2
-PKG_BUILDDEP+=		openssl
 PKG_MD5SUM:=		b69577cfc5cfb6808ec426e3a933220d
 PKG_DESCR:=		squid web and cache proxy
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libopenssl libpthread
+PKG_BUILDDEP+=		openssl
 PKG_URL:=		http://www.squid-cache.org
 PKG_SITES:=		http://www.squid-cache.org/Versions/v3/3.0/
 PKG_MULTI:=		1
@@ -81,7 +81,7 @@ $(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_SMB_AUTH,ntlm_auth))
 #			LIBS="-nodefaultlibs -luClibc++ -ldl -lm"
 #endif
 
-CONFIGURE_STYLE:=	autotool gnu
+AUTOTOOL_STYLE:=	autotool
 CONFIGURE_ENV+=		ac_cv_sizeof_void_p=4 \
 			ac_cv_sizeof_short=2 \
 			ac_cv_sizeof_int=4 \
@@ -134,8 +134,6 @@ CONFIGURE_ARGS+=	--datadir=/usr/share/squid \
 			--enable-ntlm-auth-helpers="${NTLM_AUTH_HELPERS}" \
 			--enable-digest-auth-helpers="${DIGEST_AUTH_HELPERS}" \
 			--enable-external-acl-helpers="${EXTERNAL_ACL_HELPERS}"
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 #ifeq (${ADK_COMPILE_SQUID_WITH_UCLIBCXX},y)
 # add workaround because libtool tries to link libstdc++
@@ -146,12 +144,14 @@ INSTALL_STYLE:=		auto
 
 post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
 	${INSTALL_DIR} ${IDIR_SQUID}/etc/squid
-	${INSTALL_DATA} ${WRKINST}/etc/squid/mime.conf ${IDIR_SQUID}/etc/squid/
+	${INSTALL_DATA} ${WRKINST}/etc/squid/mime.conf \
+		${IDIR_SQUID}/etc/squid/
 	${INSTALL_DATA} ./files/squid.conf ${IDIR_SQUID}/etc/squid/
 	${INSTALL_DIR} ${IDIR_SQUID}/usr/share/squid
 	${CP} ${WRKINST}/usr/share/squid/* ${IDIR_SQUID}/usr/share/squid/
 	${INSTALL_DIR} ${IDIR_SQUID}/usr/sbin ${IDIR_SQUID}/usr/lib/squid
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/squid ${IDIR_SQUID}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/squid/unlinkd ${IDIR_SQUID}/usr/lib/squid
+	${INSTALL_BIN} ${WRKINST}/usr/lib/squid/unlinkd \
+		${IDIR_SQUID}/usr/lib/squid
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/srelay/Makefile b/package/srelay/Makefile
index c2372448b..b1f772faa 100644
--- a/package/srelay/Makefile
+++ b/package/srelay/Makefile
@@ -15,11 +15,11 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SRELAY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
+INSTALL_STYLE:=		manual
+
 CONFIGURE_ENV+=		ac_cv_lib_nsl_getaddrinfo=no
 CONFIGURE_ARGS+=	--disable-thread \
 			--with-libwrap=no
-BUILD_STYLE:=		auto
 
 do-install:
 	${INSTALL_DIR} ${IDIR_SRELAY}/usr/bin ${IDIR_SRELAY}/etc
diff --git a/package/ssltunnel/Makefile b/package/ssltunnel/Makefile
index 87f653380..005601528 100644
--- a/package/ssltunnel/Makefile
+++ b/package/ssltunnel/Makefile
@@ -6,27 +6,27 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		ssltunnel
 PKG_VERSION:=		1.16
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		openssl ppp
 PKG_MD5SUM:=		4039b50566a33a4077883ea974e476d5
 PKG_DESCR:=		A PPP over SSL vpn tool
 PKG_SECTION:=		net
-PKG_DEPENDS:=		ppp
+PKG_DEPENDS:=		libopenssl ppp
+PKG_BUILDDEP+=		openssl ppp
 PKG_SITES:=		http://www.hsc.fr/ressources/outils/ssltunnel/download/
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SSLTUNNEL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		BUILD_CC="${TARGET_CC}"
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 XAKE_FLAGS+=		CCOPT="${TARGET_CFLAGS}" INCLS="-I. -I${STAGING_DIR}/usr/include"
 
 post-install:
 	${INSTALL_DIR} ${IDIR_SSLTUNNEL}/usr/{bin,sbin}
-	${INSTALL_BIN} ${WRKINST}/usr/bin/pppclient ${IDIR_SSLTUNNEL}/usr/bin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/pppwho ${IDIR_SSLTUNNEL}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/pppserver ${IDIR_SSLTUNNEL}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/bin/pppclient \
+		${IDIR_SSLTUNNEL}/usr/bin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/pppwho \
+		${IDIR_SSLTUNNEL}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/pppserver \
+		${IDIR_SSLTUNNEL}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ssmtp/Makefile b/package/ssmtp/Makefile
index 1fe4431d6..dc3ea501e 100644
--- a/package/ssmtp/Makefile
+++ b/package/ssmtp/Makefile
@@ -17,9 +17,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SSMTP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
+INSTALL_STYLE:=		manual
+
 CONFIGURE_ENV+=		ac_cv_lib_nsl_gethostname=no
-BUILD_STYLE:=		auto
 
 do-install:
 	${INSTALL_DIR} ${IDIR_SSMTP}/etc/ssmtp
diff --git a/package/strace/Makefile b/package/strace/Makefile
index 44f56502a..66e0e14be 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -17,11 +17,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,STRACE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
+INSTALL_STYLE:=		manual
 
 do-install:
 	${INSTALL_DIR} ${IDIR_STRACE}/usr/sbin/
-	${INSTALL_BIN} ${WRKBUILD}/${PKG_NAME} ${IDIR_STRACE}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/strace ${IDIR_STRACE}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/stress/Makefile b/package/stress/Makefile
index dc5a1b286..5b710bf6f 100644
--- a/package/stress/Makefile
+++ b/package/stress/Makefile
@@ -15,10 +15,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,STRESS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-static
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_STRESS}/usr/bin/
diff --git a/package/subversion/Makefile b/package/subversion/Makefile
index 9203f9510..10e6b6d3e 100644
--- a/package/subversion/Makefile
+++ b/package/subversion/Makefile
@@ -6,25 +6,21 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		subversion
 PKG_VERSION:=		1.6.6
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		apr-util expat apr zlib libiconv
-ifneq ($(ADK_PACKAGE_SUBVERSION_NEON),)
-PKG_BUILDDEP+=		neon
-endif
 PKG_MD5SUM:=		0ab0f26f6eb056add1b9d3059a3f4247
 PKG_DESCR:=		revision control program
 PKG_SECTION:=		net
 PKG_DEPENDS:=		zlib apr apr-util libiconv libexpat
+PKG_BUILDDEP+=		apr-util expat apr zlib libiconv
+ifneq ($(ADK_PACKAGE_SUBVERSION_NEON),)
+PKG_DEPENDS+=		neon
+PKG_BUILDDEP+=		neon
+endif
 PKG_SITES:=		http://subversion.tigris.org/downloads/
 
 include ${TOPDIR}/mk/package.mk
 
-ifeq ($(ADK_PACKAGE_SUBVERSION_NEON),y)
-PKG_DEPENDS+=		neon
-endif
-
 $(eval $(call PKG_template,SUBVERSION,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--with-apr=${STAGING_DIR}/usr/bin/apr-config
 CONFIGURE_ARGS+=	--with-apr-util=${STAGING_DIR}/usr/bin/apr-config
 CONFIGURE_ARGS+=	--disable-mod-activation
@@ -36,7 +32,6 @@ CONFIGURE_ARGS+=	--without-jikes
 CONFIGURE_ARGS+=	--without-jdk
 CONFIGURE_ARGS+=	--disable-javahl
 CONFIGURE_ARGS+=	--without-berkeley-db
-
 LIBS= 			-lsqlite3 -laprutil-0 -lapr-0 -lexpat -liconv 
 
 ifeq ($(ADK_PACKAGE_SUBVERSION_NEON),y)
@@ -51,9 +46,6 @@ LIBS+=			-pthread
 endif
 
 CONFIGURE_ENV+=		LIBS='${LIBS}'
-
-BUILD_STYLE:=           auto
-INSTALL_STYLE:=		auto
 INSTALL_TARGET:=	external-install local-install
 
 post-install:
diff --git a/package/swconfig/Makefile b/package/swconfig/Makefile
index f9f183b10..8d7573c36 100644
--- a/package/swconfig/Makefile
+++ b/package/swconfig/Makefile
@@ -6,25 +6,24 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		swconfig
 PKG_VERSION:=		1.0
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libnl
 PKG_DESCR:=		switch configuration utility
 PKG_SECTION:=		misc
+PKG_DEPENDS:=		libnl
+PKG_BUILDDEP+=		libnl
 
 PKG_TARGET_CONFIG:=	rb433
 
-WRKDIST=		${WRKDIR}/${PKG_NAME}-${PKG_VERSION}
 NO_DISTFILES:=		1
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SWCONFIG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-XAKE_FLAGS:=		LIBS="-lnl -lm" CFLAGS="$(TARGET_CFLAGS) -I$(LINUX_DIR)/include"
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
 
-do-configure:
-	mkdir -p ${WRKBUILD}
-	${CP} ./src/* ${WRKBUILD}
+XAKE_FLAGS:=		LIBS="-lnl -lm" CFLAGS="$(TARGET_CFLAGS) \
+			-I$(LINUX_DIR)/include"
 
 do-install:
 	${INSTALL_DIR} ${IDIR_SWCONFIG}/sbin
diff --git a/package/syslog-ng/Makefile b/package/syslog-ng/Makefile
index 5bd1daa0c..3289f0097 100644
--- a/package/syslog-ng/Makefile
+++ b/package/syslog-ng/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		syslog-ng
 PKG_VERSION:=		1.6.12
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libol tcp_wrappers
 PKG_MD5SUM:=		a3cbfdb6e1e5beea181a7349749719f3
 PKG_DESCR:=		A powerful syslog daemon
 PKG_SECTION:=		admin
 PKG_DEPENDS:=		libol libwrap
+PKG_BUILDDEP+=		libol tcp_wrappers
 PKG_URL:=		http://www.balabit.com
 PKG_SITES:=		http://www.balabit.com/downloads/files/syslog-ng/sources/1.6/src/
 
@@ -18,17 +18,17 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SYSLOG_NG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--enable-full-dynamic \
 			--enable-tcp-wrapper
 CONFIGURE_ENV+=		ac_cv_path_libol_config=${STAGING_DIR}/usr/bin
 CONFIGURE_ENV+=		ac_cv_lib_nsl_gethostbyname=no
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_SYSLOG_NG}/usr/sbin ${IDIR_SYSLOG_NG}/etc/syslog-ng
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/syslog-ng ${IDIR_SYSLOG_NG}/usr/sbin/
-	${INSTALL_DATA} ./files/syslog-ng.conf ${IDIR_SYSLOG_NG}/etc/syslog-ng/
+	${INSTALL_DIR} ${IDIR_SYSLOG_NG}/usr/sbin \
+		${IDIR_SYSLOG_NG}/etc/syslog-ng
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/syslog-ng \
+		${IDIR_SYSLOG_NG}/usr/sbin/
+	${INSTALL_DATA} ./files/syslog-ng.conf \
+		${IDIR_SYSLOG_NG}/etc/syslog-ng/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/sysstat/Makefile b/package/sysstat/Makefile
index e1f28029b..e1c5fabf7 100644
--- a/package/sysstat/Makefile
+++ b/package/sysstat/Makefile
@@ -15,8 +15,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,SYSSTAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
+CONFIG_STYLE:=		manual
 
 do-configure:
 	${CP} ./files/CONFIG ${WRKBUILD}/build/
diff --git a/package/tar/Makefile b/package/tar/Makefile
index c1a3823fb..380f8853e 100644
--- a/package/tar/Makefile
+++ b/package/tar/Makefile
@@ -17,11 +17,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TAR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		gl_cv_func_mbrtowc_incomplete_state=no \
 			gl_cv_func_wcrtomb_retval=no
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_TAR}/usr/bin
diff --git a/package/tcl/Makefile b/package/tcl/Makefile
index 939eceaa7..3eb849626 100644
--- a/package/tcl/Makefile
+++ b/package/tcl/Makefile
@@ -20,14 +20,11 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,TCL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 TCFLAGS+=		-ldl
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		tcl_cv_strstr_unbroken=ok \
 			tcl_cv_strtod_buggy=ok \
 			tcl_cv_strtod_unbroken=ok \
 			tcl_cv_strtoul_unbroken=ok
 CONFIGURE_ARGS+=	--enable-man-symlinks
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 INSTALL_TARGET=		install-binaries install-libraries
 
 post-install:
diff --git a/package/tcp_wrappers/Makefile b/package/tcp_wrappers/Makefile
index 5191a1150..35fbf56dd 100644
--- a/package/tcp_wrappers/Makefile
+++ b/package/tcp_wrappers/Makefile
@@ -19,14 +19,17 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBWRAP,libwrap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 ALL_TARGET:=		tidy all
 MAKE_FLAGS+=		OPT_CFLAGS="${TARGET_CFLAGS}" \
 			CC="${TARGET_CC}" \
 			NETGROUP= \
 			VSYSLOG= \
 			BUGS= \
-			EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT -DINET6=1 \
+			EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DHAVE_STRERROR \
+				-DHAVE_WEAKSYMS -D_REENTRANT -DINET6=1 \
 				-Dss_family=__ss_family -Dss_len=__ss_len" \
 			FACILITY=LOG_DAEMON \
 			SEVERITY=LOG_INFO \
@@ -35,10 +38,9 @@ MAKE_FLAGS+=		OPT_CFLAGS="${TARGET_CFLAGS}" \
 
 do-install:
 	${INSTALL_DIR} ${IDIR_LIBWRAP}/usr/lib
-	${CP} ${WRKBUILD}/shared/libwrap.so.* ${IDIR_LIBWRAP}/usr/lib/
+	${CP} ${WRKBUILD}/shared/libwrap.so* ${IDIR_LIBWRAP}/usr/lib/
 	${INSTALL_DIR} ${WRKINST}/usr/lib ${WRKINST}/usr/include
 	${CP} ${WRKBUILD}/tcpd.h ${WRKINST}/usr/include
 	${CP} ${WRKBUILD}/shared/libwrap.so* ${WRKINST}/usr/lib
 
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile
index c704097e1..2f8b3b7c2 100644
--- a/package/tcpdump/Makefile
+++ b/package/tcpdump/Makefile
@@ -21,14 +21,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TCPDUMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		BUILD_CC="${TARGET_CC}" HOSTCC=${HOSTCC} \
 			ac_cv_linux_vers=2 \
 			td_cv_buggygetaddrinfo="no"
 CONFIGURE_ARGS+=	--without-crypto
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-XAKE_FLAGS+=		CCOPT="${TARGET_CFLAGS}" INCLS="-I. -I${STAGING_DIR}/usr/include"
+XAKE_FLAGS+=		CCOPT="${TARGET_CFLAGS}" \
+			INCLS="-I. -I${STAGING_DIR}/usr/include"
 
 post-install:
 	${INSTALL_DIR} ${IDIR_TCPDUMP}/usr/sbin
diff --git a/package/tinc/Makefile b/package/tinc/Makefile
index 0b697916e..29b443a4a 100644
--- a/package/tinc/Makefile
+++ b/package/tinc/Makefile
@@ -6,26 +6,21 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		tinc
 PKG_VERSION:=		1.0.11
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		zlib openssl liblzo
 PKG_MD5SUM:=		ee0b1a3366c6e379cae34be6fa5dcb15
 PKG_DESCR:=		VPN tunnel daemon
 PKG_SECTION:=		net
 PKG_DEPENDS:=		zlib liblzo libopenssl kmod-tun
+PKG_BUILDDEP+=		zlib liblzo openssl
 PKG_URL:=		http://www.tinc-vpn.org
-PKG_SITES:=		http://www.tinc-vpn.org/packages/ \
-			http://ftp.yi.se/pub/tinc/ \
-			http://www.mirrors.wiretapped.net/security/network-security/tinc/
+PKG_SITES:=		http://www.tinc-vpn.org/packages/
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TINC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--with-kernel=${LINUX_DIR} \
 			--with-zlib=${STAGING_DIR}/usr/ \
 			--with-lzo-include=${STAGING_DIR}/usr/include/lzo
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_TINC}/usr/sbin
diff --git a/package/tinyproxy/Makefile b/package/tinyproxy/Makefile
index 5bf6a8af8..88f003d9e 100644
--- a/package/tinyproxy/Makefile
+++ b/package/tinyproxy/Makefile
@@ -16,9 +16,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TINYPROXY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 CONFIGURE_ENV+=		ac_cv_header_libintl_h=no \
 			ac_cv_lib_nsl_gethostbyaddr=no \
 			ac_cv_lib_nsl_gethostname=no
@@ -37,9 +34,17 @@ post-install:
 	${INSTALL_DIR} ${IDIR_TINYPROXY}/usr/sbin \
 		       ${IDIR_TINYPROXY}/etc/tinyproxy \
 		       ${IDIR_TINYPROXY}/usr/share/tinyproxy
-	${INSTALL_DATA} ./files/tinyproxy.conf ${IDIR_TINYPROXY}/etc/tinyproxy
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/tinyproxy ${IDIR_TINYPROXY}/usr/sbin/
-	${INSTALL_DATA} ${WRKINST}/usr/share/tinyproxy/{debug,default,stats}.html ${IDIR_TINYPROXY}/usr/share/tinyproxy/
-	${INSTALL_DATA} ${WRKINST}/usr/share/tinyproxy/HTML_VARIABLES ${IDIR_TINYPROXY}/usr/share/tinyproxy/
+	${INSTALL_DATA} ./files/tinyproxy.conf \
+		${IDIR_TINYPROXY}/etc/tinyproxy
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/tinyproxy \
+		${IDIR_TINYPROXY}/usr/sbin/
+	${INSTALL_DATA} ${WRKINST}/usr/share/tinyproxy/debug.html \
+		${IDIR_TINYPROXY}/usr/share/tinyproxy/
+	${INSTALL_DATA} ${WRKINST}/usr/share/tinyproxy/default.html \
+		${IDIR_TINYPROXY}/usr/share/tinyproxy/
+	${INSTALL_DATA} ${WRKINST}/usr/share/tinyproxy/stats.html \
+		${IDIR_TINYPROXY}/usr/share/tinyproxy/
+	${INSTALL_DATA} ${WRKINST}/usr/share/tinyproxy/HTML_VARIABLES \
+		${IDIR_TINYPROXY}/usr/share/tinyproxy/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/tmsnc/Makefile b/package/tmsnc/Makefile
index 915ef3dc1..7d22319dd 100644
--- a/package/tmsnc/Makefile
+++ b/package/tmsnc/Makefile
@@ -16,12 +16,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TMSNC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${STAGING_DIR}/usr \
 			--with-openssl=${STAGING_DIR}/usr \
 			--with-ncurses=${STAGING_DIR}
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_TMSNC}/usr/bin
diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile
index 0d23f4095..183f4da2b 100644
--- a/package/tntnet/Makefile
+++ b/package/tntnet/Makefile
@@ -9,13 +9,13 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		e2c3c5075a890711a7569730493c0996
 PKG_DESCR:=		small C++ application server
 PKG_SECTION:=		net
-PKG_BUILDDEP+=		cxxtools zlib
+PKG_DEPENDS:=		cxxtools zlib libiconv libpthread
+PKG_BUILDDEP+=		cxxtools zlib libiconv
 ifneq (${ADK_COMPILE_TNTNET_WITH_OPENSSL},)
 PKG_BUILDDEP+=		openssl
 else ifneq (${ADK_COMPILE_TNTNET_WITH_GNUTLS},)
 PKG_BUILDDEP+=		gnutls
 endif
-PKG_DEPENDS:=		cxxtools zlib libpthread libiconv
 PKG_URL:=		http://www.tntnet.org
 PKG_SITES:=		http://www.tntnet.org/download/
 #PKG_CXX:=		TNTNET
@@ -37,7 +37,6 @@ else
 TLDFLAGS+=		-liconv -lpthread -lcxxtools -lm -ldl
 endif
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--without-epoll \
 			--without-sdk \
 			--without-cgi \
@@ -51,8 +50,6 @@ CONFIGURE_ARGS+=	--without-ssl
 endif
 CONFIGURE_ENV+= 	CXXFLAGS='${TCXXFLAGS}' \
 			ac_cv_path_cxxtools_config=${STAGING_DIR}/usr/bin
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 #ifeq (${ADK_COMPILE_TNTNET_WITH_UCLIBCXX},y)
 # add workaround because libtool tries to link libstdc++
@@ -71,7 +68,9 @@ post-install:
 	${INSTALL_DATA} ./files/mime.conf \
 		${IDIR_TNTNET}/etc/tntnet
 	${CP} ${WRKINST}/usr/bin/tntnet ${IDIR_TNTNET}/usr/bin
-	${CP} ${WRKINST}/usr/lib/tntnet/tntnet.so* ${IDIR_TNTNET}/usr/lib/tntnet
-	${CP} ${WRKINST}/usr/lib/libtntnet.so.* ${IDIR_TNTNET}/usr/lib
+	${CP} ${WRKINST}/usr/lib/tntnet/tntnet.so* \
+		${IDIR_TNTNET}/usr/lib/tntnet
+	${CP} ${WRKINST}/usr/lib/libtntnet.so.* \
+		${IDIR_TNTNET}/usr/lib
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/tor/Makefile b/package/tor/Makefile
index f25a3f5bb..414d50a30 100644
--- a/package/tor/Makefile
+++ b/package/tor/Makefile
@@ -6,21 +6,18 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		tor
 PKG_VERSION:=		0.2.1.20
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libevent openssl zlib
 PKG_MD5SUM:=		0d62ee2332fdd95de43debac7435df19
 PKG_DESCR:=		An anonymous Internet communication system
 PKG_SECTION:=		net
-PKG_DEPENDS:=		libevent libopenssl libpthread zlib
+PKG_DEPENDS:=		libevent libopenssl zlib libpthread
+PKG_BUILDDEP+=		libevent openssl zlib
 PKG_URL:=		http://tor.eff.org
 PKG_SITES:=		http://tor.eff.org/dist/ \
-			http://ftp.se.linux.org/crypto/tor/ \
-			http://tor.meulie.net/
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TOR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_libevent_normal=yes \
 			ac_cv_libevent_linker_option="" \
 			ac_cv_libevent_dir="${STAGING_DIR}/usr" \
@@ -29,8 +26,6 @@ CONFIGURE_ENV+=		ac_cv_libevent_normal=yes \
 			tor_cv_time_t_signed=yes \
 			tor_cv_null_is_zero=yes \
 			tor_cv_unaligned_ok=yes
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_TOR}/usr/bin ${IDIR_TOR}/etc/tor
diff --git a/package/tptest/Makefile b/package/tptest/Makefile
index 3f6c0fc3c..436fce42c 100644
--- a/package/tptest/Makefile
+++ b/package/tptest/Makefile
@@ -16,6 +16,10 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,TPTEST,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 do-build:
 	(cd ${WRKSRC}/apps/unix/server && ${MAKE} && ${MAKE} install DESTDIR="${WRKINST}")
 	(cd ${WRKSRC}/apps/unix/client && ${MAKE} && ${MAKE} install DESTDIR="${WRKINST}")
diff --git a/package/traceroute/Makefile b/package/traceroute/Makefile
index 4db926568..fbec99543 100644
--- a/package/traceroute/Makefile
+++ b/package/traceroute/Makefile
@@ -16,12 +16,12 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,TRACEROUTE,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=          manual
+
 MAKE_FLAGS+=		CC="${TARGET_CC}" \
 			AR="${TARGET_CROSS}ar" \
 			RANLIB="${TARGET_CROSS}ranlib" \
 			LDFLAGS="-L${WRKSRC}/libsupp"
-INSTALL_STYLE:=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_TRACEROUTE)/usr/bin
diff --git a/package/trafshow/Makefile b/package/trafshow/Makefile
index d0d0dde3a..6f0411225 100644
--- a/package/trafshow/Makefile
+++ b/package/trafshow/Makefile
@@ -4,25 +4,24 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		trafshow
-PKG_VERSION:=		4.0
+PKG_VERSION:=		5.2.3
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		0b2f0bb23b7832138b7d841437b9e182
+PKG_SECTION:=		net
+PKG_SITES:=		http://www.sfr-fresh.com/linux/misc/
+PKG_NOPARALLEL:=	1
+
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
-PKG_SITES:=		ftp://ftp.nsk.su/pub/RinetSoftware/
-WRKDIST=		${WRKDIR}/trafshow-5.2.3
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TRAFSHOW,trafshow,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TCFLAGS+=		-DHAVE_SOCKADDR_STORAGE -DHAVE_HAS_COLORS -I$(STAGING_DIR)/usr/include
+TCFLAGS+=		-DHAVE_SOCKADDR_STORAGE -DHAVE_HAS_COLORS
 TLDFLAGS+=		-pthread
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-ALL_TARGET=		
 
-do-install:
-	${INSTALL_DIR} ${IDIR_TRAFSHOW}/usr/sbin
-	${INSTALL_BIN} ${WRKBUILD}/trafshow ${IDIR_TRAFSHOW}/usr/sbin/
+post-install:
+	${INSTALL_DIR} ${IDIR_TRAFSHOW}/usr/bin
+	${INSTALL_BIN} ${WRKINST}/usr/bin/trafshow ${IDIR_TRAFSHOW}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/trafshow/patches/patch-Makefile_in b/package/trafshow/patches/patch-Makefile_in
new file mode 100644
index 000000000..d5562d64c
--- /dev/null
+++ b/package/trafshow/patches/patch-Makefile_in
@@ -0,0 +1,24 @@
+--- trafshow-5.2.3.orig/Makefile.in	2004-06-15 10:29:14.000000000 +0200
++++ trafshow-5.2.3/Makefile.in	2010-02-05 23:07:13.164334256 +0100
+@@ -59,6 +59,8 @@ OBJ	= $(CSRC:.c=.o) $(YSRC:.y=.o) $(LSRC
+ 
+ CLEANFILES = $(PROG) $(OBJ) $(GENSRC) y.tab.h
+ 
++all:	$(PROG)
++
+ $(PROG): $(OBJ)
+ 	@rm -f $@
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
+@@ -73,9 +75,9 @@ version.c: VERSION Makefile
+ 	@echo 'char compiled[] = "$(CC) $(CFLAGS) $(LIBS)";' >> $@
+ 
+ install:
+-	./install-sh -c -s -m 555 -o bin -g bin $(PROG) $(BINDEST)/$(PROG)
+-	./install-sh -c -m 444 -o bin -g bin $(PROG).1 $(MANDEST)/man1/$(PROG).1
+-	[ -f /etc/$(PROG) ] || ./install-sh -c -m 444 .trafshow /etc/$(PROG)
++	./install-sh -c -m 755 $(PROG) $(DESTDIR)$(BINDEST)/$(PROG)
++	./install-sh -c -m 644 $(PROG).1 $(DESTDIR)$(MANDEST)/man1/$(PROG).1
++	./install-sh -c -m 644 .trafshow $(DESTDIR)/etc/$(PROG)
+ 
+ clean:
+ 	rm -f $(CLEANFILES)
diff --git a/package/trafshow/patches/patch-session_c b/package/trafshow/patches/patch-session_c
new file mode 100644
index 000000000..cee3cb266
--- /dev/null
+++ b/package/trafshow/patches/patch-session_c
@@ -0,0 +1,11 @@
+--- trafshow-5.2.3.orig/session.c	2006-01-08 06:58:08.000000000 +0100
++++ trafshow-5.2.3/session.c	2010-02-05 22:59:54.974334342 +0100
+@@ -40,7 +40,7 @@
+ #define	ASYNC_MODE	FNDELAY
+ #elif	O_ASYNC
+ #define	ASYNC_MODE	O_ASYNC
+-#elif
++#else
+ #error the fcntl argument to turn ON/OFF non-blocking I/O is unknown
+ #endif
+ 
diff --git a/package/tslib/Makefile b/package/tslib/Makefile
index 9a7c0fd6b..59c960a10 100644
--- a/package/tslib/Makefile
+++ b/package/tslib/Makefile
@@ -19,7 +19,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,TSLIB,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	autogen gnu
+AUTOTOOL_STYLE:=	autogen
 CONFIGURE_ARGS+=	--disable-ucb1x00 \
 			--disable-corgi \
 			--disable-collie \
@@ -27,8 +27,6 @@ CONFIGURE_ARGS+=	--disable-ucb1x00 \
 			--disable-mk712 \
 			--disable-linear-h2200 \
 			--disable-arctic2
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_TSLIB)/etc
diff --git a/package/ttcp/Makefile b/package/ttcp/Makefile
index 81f8daae2..e8df1cd43 100644
--- a/package/ttcp/Makefile
+++ b/package/ttcp/Makefile
@@ -10,14 +10,18 @@ PKG_DESCR:=		A small utility to test TCP connection performance
 PKG_SECTION:=		net
 
 NO_DISTFILES:=		1
-WRKDIST=		${WRKDIR}/ttcp
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,TTCP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=          manual
+BUILD_STYLE:=           manual
+INSTALL_STYLE:=         manual
+
 do-build:
-	${TARGET_CC} ${TARGET_CFLAGS} -o ${WRKBUILD}/ttcp ttcp.c
+	${TARGET_CC} -Wall ${TCPPFLAGS} ${TCFLAGS} -o ${WRKBUILD}/ttcp \
+		${WRKBUILD}/ttcp.c
 
 do-install:
 	${INSTALL_DIR} ${IDIR_TTCP}/usr/bin
diff --git a/package/ttcp/ttcp.c b/package/ttcp/src/ttcp.c
index 3b1f07adf..3b1f07adf 100644
--- a/package/ttcp/ttcp.c
+++ b/package/ttcp/src/ttcp.c
diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile
index 0041fc146..e4b58b198 100644
--- a/package/uclibc++/Makefile
+++ b/package/uclibc++/Makefile
@@ -18,7 +18,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,UCLIBCXX,uclibc++,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=          manual
+INSTALL_STYLE:=         manual
+
 MAKE_FLAGS+=		TOPDIR="${WRKBUILD}/" \
 			${TARGET_CONFIGURE_OPTS} \
 			ARCH_CFLAGS="${TARGET_CFLAGS}" \
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index 5ee7b280c..aeffb3563 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -14,6 +14,10 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,UCLIBC,uclibc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,UCLIBC_DEV,uclibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
+CONFIG_STYLE:=          manual
+BUILD_STYLE:=           manual
+INSTALL_STYLE:=         manual
+
 SUB_INSTALLS-y:=
 SUB_INSTALLS-m:=
 SUB_INSTALLS-${ADK_PACKAGE_UCLIBC_DEV}+=	uclibc-dev-install
@@ -34,6 +38,7 @@ do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	done
 
 uclibc-dev-install:
+	${INSTALL_DIR} ${IDIR_UCLIBC_DEV}/usr/lib
 	${CP} ${STAGING_DIR}/lib/crt* ${IDIR_UCLIBC_DEV}/usr/lib
 	# header package
 	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/linux-$(KERNEL_VERSION) ARCH=$(ARCH) V=1 \
diff --git a/package/udev/Makefile b/package/udev/Makefile
index 4f329db6b..d3c33b962 100644
--- a/package/udev/Makefile
+++ b/package/udev/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		udev
-PKG_VERSION:=		149
+PKG_VERSION:=		151
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b218bd15939e8afc6368e1907a48bb26
+PKG_MD5SUM:=		aeae0e6273dcbec246c3c1b9868ebed1
 PKG_DESCR:=		Dynamic device management subsystem
 PKG_SECTION:=		base
 PKG_URL:=		http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
@@ -14,16 +14,15 @@ PKG_SITES:=		${MASTER_SITE_KERNEL:=utils/kernel/hotplug/}
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
+CFLINE_UDEV:= 		depends on ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_GLIBC\n\t
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,UDEV,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-extras \
 			--disable-logging \
 			--disable-introspection
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_UDEV}/usr/sbin ${IDIR_UDEV}/etc/udev
diff --git a/package/udp-broadcast-relay/Makefile b/package/udp-broadcast-relay/Makefile
index cae0bb095..d2d4bd86b 100644
--- a/package/udp-broadcast-relay/Makefile
+++ b/package/udp-broadcast-relay/Makefile
@@ -16,11 +16,17 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,UDP_BROADCAST_RELAY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 do-build:
-	${TARGET_CC} ${TARGET_CFLAGS} ${WRKBUILD}/main.c -o ${WRKBUILD}/${PKG_NAME}
+	${TARGET_CC} -Wall ${TARGET_CFLAGS} ${WRKBUILD}/main.c \
+		-o ${WRKBUILD}/udp-broadcast-relay
 
 do-install:
 	${INSTALL_DIR} ${IDIR_UDP_BROADCAST_RELAY}/usr/sbin
-	${INSTALL_BIN} ${WRKBUILD}/${PKG_NAME} ${IDIR_UDP_BROADCAST_RELAY}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/udp-broadcast-relay \
+		${IDIR_UDP_BROADCAST_RELAY}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ulogd/Makefile b/package/ulogd/Makefile
index 7679b0318..cfb002702 100644
--- a/package/ulogd/Makefile
+++ b/package/ulogd/Makefile
@@ -53,9 +53,6 @@ SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_SQLITE}+=		ulogd-mod-sqlite-install
 SUB_INSTALLS-${ADK_PACKAGE_ULOGD_MOD_EXTRA}+=		ulogd-mod-extra-install
 
 TCFLAGS+=		-fPIC
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 ifneq (${ADK_PACKAGE_ULOGD_MOD_PCAP},)
 CONFIGURE_ENV+=		ac_cv_header_pcap_h=yes
@@ -79,7 +76,8 @@ post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
 	${INSTALL_DIR} ${IDIR_ULOGD}/usr/sbin ${IDIR_ULOGD}/usr/lib/ulogd/
 	${INSTALL_DIR} ${IDIR_ULOGD}/etc
 	${INSTALL_DATA} ${WRKINST}/etc/ulogd.conf ${IDIR_ULOGD}/etc/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_BASE.so ${IDIR_ULOGD}/usr/lib/ulogd/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/ulogd/ulogd_BASE.so \
+		${IDIR_ULOGD}/usr/lib/ulogd/
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/ulogd ${IDIR_ULOGD}/usr/sbin/
 
 ulogd-mod-extra-install:
diff --git a/package/updatedd/Makefile b/package/updatedd/Makefile
index f13bee501..6859dd6df 100644
--- a/package/updatedd/Makefile
+++ b/package/updatedd/Makefile
@@ -32,10 +32,7 @@ $(eval $(call PKG_template,UPDATEDD_MOD_OVH,updatedd-mod-ovh,${PKG_VERSION}-${PK
 $(eval $(call PKG_template,UPDATEDD_MOD_REGFISH,updatedd-mod-regfish,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,UPDATEDD_MOD_TZO,updatedd-mod-tzo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	ac_cv_lib_nsl_gethostbyname=no
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_UPDATEDD}/usr/bin
diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile
index 01507694b..8d8cba862 100644
--- a/package/usbutils/Makefile
+++ b/package/usbutils/Makefile
@@ -6,21 +6,17 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		usbutils
 PKG_VERSION:=		0.73
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libusb libusb-compat
 PKG_MD5SUM:=		88978b4ad891f610620b1b8e5e0f43eb
 PKG_DESCR:=		A program to list USB devices
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		libusb libusb-compat libpthread
+PKG_BUILDDEP+=		libusb libusb-compat
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=linux-usb/}
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LSUSB,lsusb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LSUSB}/usr/share
 	${INSTALL_DATA} ${WRKINST}/usr/share/usb.ids.gz ${IDIR_LSUSB}/usr/share/
diff --git a/package/ussp-push/Makefile b/package/ussp-push/Makefile
index f22f474fb..db71ffad0 100644
--- a/package/ussp-push/Makefile
+++ b/package/ussp-push/Makefile
@@ -6,20 +6,17 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		ussp-push
 PKG_VERSION:=		0.11
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		openobex
 PKG_MD5SUM:=		5c44983ee27809867041feff6bb4423a
 PKG_DESCR:=		OBEX push command
 PKG_SECTION:=		bluetooth
 PKG_DEPENDS:=		openobex
+PKG_BUILDDEP+=		openobex
 PKG_SITES:=		http://xmailserver.org/
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,USSP_PUSH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 MAKE_FLAGS+=		OBEXINC="${TCPPFLAGS}" \
 			OBEXLIB="${TLDFLAGS} -lopenobex -lbluetooth"
 
diff --git a/package/ustl/Makefile b/package/ustl/Makefile
index 8f9266c4b..c1d8943b4 100644
--- a/package/ustl/Makefile
+++ b/package/ustl/Makefile
@@ -17,8 +17,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,USTL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
+CONFIG_STYLE:=		manual
+
 XAKE_FLAGS+=		CROSS="${TARGET_CROSS}" \
 			OPTFLAGS="${TARGET_CFLAGS}"
 
diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile
index b73689687..513c8e22b 100644
--- a/package/util-linux-ng/Makefile
+++ b/package/util-linux-ng/Makefile
@@ -27,14 +27,11 @@ $(eval $(call PKG_template,SFDISK,sfdisk,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP
 $(eval $(call PKG_template,SWAP_UTILS,swap-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_SWAP},${PKG_DESCR_SWAP},${PKG_SECTION}))
 $(eval $(call PKG_template,LOSETUP,losetup,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_LOOP},${PKG_DESCR_LOOP},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-use-tty-group \
 			--disable-schedutils \
 			--disable-cramfs \
 			--disable-libblkid \
 			--disable-libuuid
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 MAKE_FLAGS+=		OPT="${TCFLAGS}" ARCH="${ARCH}"
 FAKE_FLAGS+=		INSTALLSUID="install -m 4755"
 TCFLAGS+=		-DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK
diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile
index a5950a7c1..a7dfe2886 100644
--- a/package/valgrind/Makefile
+++ b/package/valgrind/Makefile
@@ -20,13 +20,10 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,VALGRIND,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+=		ac_cv_file__proc_self_fd=yes \
 			ac_cv_file__proc_self_exe=yes \
 			ac_cv_file__proc_self_maps=yes
 CONFIGURE_ARGS+=	--disable-tls
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_VALGRIND)/usr/bin
diff --git a/package/vgp/Makefile b/package/vgp/Makefile
index 2b8651130..616108c50 100755
--- a/package/vgp/Makefile
+++ b/package/vgp/Makefile
@@ -16,9 +16,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,VGP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_VGP}/usr/bin/
 	${INSTALL_BIN} ${WRKINST}/usr/bin/vgpd ${IDIR_VGP}/usr/bin/
diff --git a/package/videoproto/Makefile b/package/videoproto/Makefile
index ebda348e4..c28b0a4da 100644
--- a/package/videoproto/Makefile
+++ b/package/videoproto/Makefile
@@ -10,9 +10,4 @@ PKG_MD5SUM:=		888543493cd69c6c78002ac59c3f077f
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/vilistextum/Makefile b/package/vilistextum/Makefile
index 95cdbaa92..0beb9ce2d 100644
--- a/package/vilistextum/Makefile
+++ b/package/vilistextum/Makefile
@@ -17,12 +17,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,VILISTEXTUM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_VILISTEXTUM}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/${PKG_NAME} ${IDIR_VILISTEXTUM}/usr/bin/
+	${INSTALL_BIN} ${WRKINST}/usr/bin/vilistextum \
+		 ${IDIR_VILISTEXTUM}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/vim/Makefile b/package/vim/Makefile
index a831bf041..e27c76ff7 100644
--- a/package/vim/Makefile
+++ b/package/vim/Makefile
@@ -22,7 +22,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,VIM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		vim_cv_toupper_broken=no \
 			vim_cv_getcwd_broken=no \
 			vim_cv_stat_ignores_slash=yes \
@@ -54,8 +53,6 @@ CONFIGURE_ARGS+=	--disable-darwin \
 			--without-x \
 			--with-tlib=ncurses \
 			--disable-multibyte
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 XAKE_FLAGS+=		prefix=/usr \
 			DESTDIR=${WRKINST} \
 			STRIP=:
diff --git a/package/vnc-reflector/Makefile b/package/vnc-reflector/Makefile
index b83ff00f8..48158a886 100644
--- a/package/vnc-reflector/Makefile
+++ b/package/vnc-reflector/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		vnc-reflector
 PKG_VERSION:=		1.2.4
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		jpeg zlib
 PKG_MD5SUM:=		c3f88bc62f228b335c25c07f9744ab0c
 PKG_DESCR:=		specialized VNC server which acts as a proxy
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libjpeg zlib
+PKG_BUILDDEP+=		jpeg zlib
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=vnc-reflector/}
 
 DISTFILES:=		vnc_reflector-${PKG_VERSION}.tar.gz
@@ -20,7 +20,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,VNC_REFLECTOR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 TCPPFLAGS+=		-I.
 TLDFLAGS+=		-lz -ljpeg
 MAKE_FLAGS+=		CC="${TARGET_CC}" CFLAGS="${TCFLAGS} ${TCPPFLAGS} ${TLDFLAGS}"
diff --git a/package/vnstat/Makefile b/package/vnstat/Makefile
index f273378dc..59f88090f 100644
--- a/package/vnstat/Makefile
+++ b/package/vnstat/Makefile
@@ -15,7 +15,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,VNSTAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=          manual
+INSTALL_STYLE:=         manual
+
 MAKE_FLAGS+=		${TARGET_CONFIGURE_OPTS}
 ALL_TARGET:=		vnstat
 
diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile
index c6129d9b2..24a54787c 100644
--- a/package/vpnc/Makefile
+++ b/package/vpnc/Makefile
@@ -4,13 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		vpnc
-PKG_VERSION:=		0.4.0
-PKG_RELEASE:=		2
-PKG_BUILDDEP+=		libgcrypt libgpg-error
-PKG_MD5SUM:=		604807e7dd90fce00a4e2344ee29c76d
+PKG_VERSION:=		0.5.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		4378f9551d5b077e1770bbe09995afb3
 PKG_DESCR:=		client for cisco3000 VPN Concentrator.
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libgcrypt libgpg-error kmod-tun
+PKG_BUILDDEP+=		libgcrypt libgpg-error
 PKG_URL:=		http://www.unix-ag.uni-kl.de/~massar/vpnc/
 PKG_SITES:=		http://www.unix-ag.uni-kl.de/~massar/vpnc/
 
@@ -18,13 +18,11 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,VPNC,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=		manual
 XAKE_FLAGS+=		CC="${TARGET_CC}" \
 			OFLAGS="${TARGET_CFLAGS}" \
 			OS="Linux" \
-			STAGING_DIR=${STAGING_DIR} \
 			PREFIX=/usr
-INSTALL_STYLE:=		auto
 
 post-install:
 	${CP} ${WRKINST}/* ${IDIR_VPNC}/
diff --git a/package/vpnc/patches/patch-Makefile b/package/vpnc/patches/patch-Makefile
index bb3a255a3..563b653c2 100644
--- a/package/vpnc/patches/patch-Makefile
+++ b/package/vpnc/patches/patch-Makefile
@@ -1,51 +1,22 @@
-$Id$
---- vpnc-0.4.0.orig/Makefile	2007-02-19 21:51:12.000000000 +0100
-+++ vpnc-0.4.0/Makefile	2007-04-21 18:39:46.000000000 +0200
-@@ -35,12 +35,11 @@ VERSION := $(shell sh mk-version)
- RELEASE_VERSION := $(shell cat VERSION)
- 
- CC=gcc
--CFLAGS += -W -Wall -O3 -Wmissing-declarations -Wwrite-strings -g
-+CFLAGS += -W -Wall -O3 -Wmissing-declarations -Wwrite-strings -g -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include $(OFLAGS)
- CPPFLAGS = -DVERSION=\"$(VERSION)\"
--LDFLAGS = -g $(shell libgcrypt-config --libs)
--CFLAGS +=  $(shell libgcrypt-config --cflags)
-+LDFLAGS = -g -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lgcrypt -lgpg-error
- 
--ifeq ($(shell uname -s), SunOS)
-+ifeq ($(OS), SunOS)
- LDFLAGS += -lnsl -lresolv -lsocket
+--- vpnc-0.5.3.orig/Makefile	2008-11-19 21:36:12.000000000 +0100
++++ vpnc-0.5.3/Makefile	2010-02-06 04:36:54.194334252 +0100
+@@ -66,7 +66,7 @@ ifneq (,$(findstring Apple,$(shell $(CC)
+ CFLAGS += -fstrict-aliasing -freorder-blocks -fsched-interblock
  endif
  
-@@ -84,21 +83,21 @@ distclean : clean
- 	-rm -f vpnc-debug.c vpnc-debug.h vpnc.ps .depend
- 
- install : all
--	install -d $(DESTDIR)$(ETCDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(MANDIR)/man8
--	install vpnc-script $(DESTDIR)$(ETCDIR)
--	install -m 600 vpnc.conf $(DESTDIR)$(ETCDIR)/default.conf
-+	install -d $(DESTDIR)$(ETCDIR)  $(DESTDIR)$(SBINDIR)
-+#	install vpnc-script $(DESTDIR)$(ETCDIR)
-+#	install -m 600 vpnc.conf $(DESTDIR)$(ETCDIR)/default.conf
- 	install vpnc vpnc-disconnect $(DESTDIR)$(SBINDIR)
--	install pcf2vpnc $(DESTDIR)$(BINDIR)
--	install vpnc.8 $(DESTDIR)$(MANDIR)/man8
-+#	install pcf2vpnc $(DESTDIR)$(BINDIR)
-+#	install vpnc.8 $(DESTDIR)$(MANDIR)/man8
+-all : $(BINS) vpnc.8 vpnc-script
++all : $(BINS) vpnc-script
  
- install-strip : all
--	install -d $(DESTDIR)$(ETCDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(MANDIR)/man8
--	install vpnc-script $(DESTDIR)$(ETCDIR)
--	install -m 600 vpnc.conf $(DESTDIR)$(ETCDIR)/default.conf
--	install pcf2vpnc $(DESTDIR)$(BINDIR)
-+	install -d $(DESTDIR)$(ETCDIR) $(DESTDIR)$(SBINDIR)
-+#	install vpnc-script $(DESTDIR)$(ETCDIR)
-+#	install -m 600 vpnc.conf $(DESTDIR)$(ETCDIR)/default.conf
-+#	install pcf2vpnc $(DESTDIR)$(BINDIR)
- 	install -s vpnc $(DESTDIR)$(SBINDIR)
- 	install vpnc-disconnect $(DESTDIR)$(SBINDIR)
--	install vpnc.8 $(DESTDIR)$(MANDIR)/man8
-+#	install vpnc.8 $(DESTDIR)$(MANDIR)/man8
+ vpnc : $(OBJS) vpnc.o
+ 	$(CC) -o $@ $^ $(LDFLAGS)
+@@ -122,10 +122,6 @@ install-common: all
+ 	install -m600 vpnc.conf $(DESTDIR)$(ETCDIR)/default.conf
+ 	install -m755 vpnc-disconnect $(DESTDIR)$(SBINDIR)
+ 	install -m755 pcf2vpnc $(DESTDIR)$(BINDIR)
+-	install -m644 vpnc.8 $(DESTDIR)$(MANDIR)/man8
+-	install -m644 pcf2vpnc.1 $(DESTDIR)$(MANDIR)/man1
+-	install -m644 cisco-decrypt.1 $(DESTDIR)$(MANDIR)/man1
+-	install -m644 COPYING $(DESTDIR)$(DOCDIR)
  
- uninstall :
- 	rm -f $(DESTDIR)$(SBINDIR)/vpnc \
+ install : install-common
+ 	install -m755 vpnc $(DESTDIR)$(SBINDIR)
diff --git a/package/vpnc/patches/patch-config_c b/package/vpnc/patches/patch-config_c
index ce5cb30e9..9dfbdee43 100644
--- a/package/vpnc/patches/patch-config_c
+++ b/package/vpnc/patches/patch-config_c
@@ -1,7 +1,6 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- vpnc-0.4.0.orig/config.c	2007-02-16 18:22:06.000000000 +0100
-+++ vpnc-0.4.0/config.c	2008-10-16 12:55:57.000000000 +0200
-@@ -485,7 +485,7 @@ static char *get_config_filename(const c
+--- vpnc-0.5.3.orig/config.c	2008-11-19 21:36:12.000000000 +0100
++++ vpnc-0.5.3/config.c	2010-02-06 04:35:05.394334473 +0100
+@@ -456,7 +456,7 @@ static char *get_config_filename(const c
  {
  	char *realname;
  	
diff --git a/package/vrrpd/Makefile b/package/vrrpd/Makefile
index e6b557eb5..cda12887f 100644
--- a/package/vrrpd/Makefile
+++ b/package/vrrpd/Makefile
@@ -15,7 +15,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,VRRPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=          manual
+INSTALL_STYLE:=         manual
+
 MAKE_FLAGS:=		CC="${TARGET_CC}" \
 			DBG_OPT="" \
 			MAIN_OPT="${TARGET_CFLAGS}"
diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile
index 8456fac83..c295af14e 100644
--- a/package/vsftpd/Makefile
+++ b/package/vsftpd/Makefile
@@ -16,9 +16,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,VSFTPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=          manual
+
 ALL_TARGET:=		vsftpd
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_VSFTPD}/etc ${IDIR_VSFTPD}/usr/sbin
diff --git a/package/vtun/Makefile b/package/vtun/Makefile
index 460e4c08d..194c94893 100644
--- a/package/vtun/Makefile
+++ b/package/vtun/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		vtun
 PKG_VERSION:=		3.0.1
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		zlib openssl liblzo
 PKG_MD5SUM:=		c342ffe77055d4248a38f0b380f28c1b
 PKG_DESCR:=		A VPN tunnel daemon
 PKG_SECTION:=		net
-PKG_DEPENDS:=		libopenssl zlib kmod-tun
+PKG_DEPENDS:=		zlib libopenssl liblzo kmod-tun
+PKG_BUILDDEP+=		zlib openssl liblzo
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=vtun/}
 
 PKG_HOST_DEPENDS:=	!freebsd
@@ -19,10 +19,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,VTUN,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
+INSTALL_STYLE:=		manual
+
 CONFIGURE_ARGS+=	--with-ssl-headers=$(STAGING_DIR)/usr/include/openssl \
 			--disable-lzo
-BUILD_STYLE:=		auto
 ALL_TARGET:=		vtund
 
 do-install:
diff --git a/package/watchdog/Makefile b/package/watchdog/Makefile
index eda6f83cb..14abf0ca3 100644
--- a/package/watchdog/Makefile
+++ b/package/watchdog/Makefile
@@ -15,10 +15,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,WATCHDOG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_WATCHDOG}/usr/sbin ${IDIR_WATCHDOG}/etc/
 	${INSTALL_DATA} ./files/watchdog.conf ${IDIR_WATCHDOG}/etc/
diff --git a/package/watchdog/patches/patch-src_mntent_c b/package/watchdog/patches/patch-src_mntent_c
new file mode 100644
index 000000000..f2277bdbf
--- /dev/null
+++ b/package/watchdog/patches/patch-src_mntent_c
@@ -0,0 +1,11 @@
+--- watchdog-5.7.orig/src/mntent.c	2010-01-06 13:42:08.000000000 +0100
++++ watchdog-5.7/src/mntent.c	2010-02-06 04:39:34.804334839 +0100
+@@ -157,7 +157,7 @@ my_getmntent (mntFILE *mfp) {
+ 		if (fgets (buf, sizeof(buf), mfp->mntent_fp) == NULL)
+ 			return NULL;
+ 
+-		s = index (buf, '\n');
++		s = strchr (buf, '\n');
+ 		if (s == NULL) {
+ 			/* extremely long line - assume file was corrupted */
+ 			mfp->mntent_errs = 1;
diff --git a/package/watchdog/patches/patch-src_umount_c b/package/watchdog/patches/patch-src_umount_c
new file mode 100644
index 000000000..6b5a82c1f
--- /dev/null
+++ b/package/watchdog/patches/patch-src_umount_c
@@ -0,0 +1,11 @@
+--- watchdog-5.7.orig/src/umount.c	2010-01-06 13:42:08.000000000 +0100
++++ watchdog-5.7/src/umount.c	2010-02-06 04:39:47.664334843 +0100
+@@ -212,7 +212,7 @@ umount_one (const char *spec, const char
+ 	    if (res < 0)
+ 		 umnt_err2 = errno;
+ 	    /* Do not complain about remote NFS mount points */
+-	    if (errno == ENOENT && index(spec, ':'))
++	    if (errno == ENOENT && strchr(spec, ':'))
+ 		 umnt_err2 = 0;
+        }
+   }
diff --git a/package/wccpd/Makefile b/package/wccpd/Makefile
index b55011567..9763248f2 100644
--- a/package/wccpd/Makefile
+++ b/package/wccpd/Makefile
@@ -15,11 +15,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,WCCPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 # uClibc setpgrp does not take arguments
 CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_WCCPD}/usr/sbin
diff --git a/package/wdfs/Makefile b/package/wdfs/Makefile
index a9abb551b..bdc8ae8d4 100644
--- a/package/wdfs/Makefile
+++ b/package/wdfs/Makefile
@@ -17,10 +17,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,WDFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_WDFS}/usr/bin
 	${CP} ${WRKINST}/usr/bin/wdfs ${IDIR_WDFS}/usr/bin
diff --git a/package/weechat/Makefile b/package/weechat/Makefile
index 804657cf8..6fd545c95 100644
--- a/package/weechat/Makefile
+++ b/package/weechat/Makefile
@@ -6,23 +6,25 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		weechat
 PKG_VERSION:=		0.1.8
 PKG_RELEASE:=		2
-PKG_BUILDDEP+=		ncurses gnutls lua libiconv
 PKG_MD5SUM:=		73d6bc211ac32c597f0d278506480a20
 PKG_DESCR:=		Lightweight IRC client
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libncurses libiconv
-PKG_URL:=		http://weechat.flashtux.org/download/
-PKG_SITES:=		http://weechat.flashtux.org/download/
-
-include ${TOPDIR}/mk/package.mk
-
+PKG_BUILDDEP+=		ncurses libiconv
 ifeq (${ADK_COMPILE_WEECHAT_WITH_TLS},y)
 PKG_DEPENDS+=		gnutls
+PKG_BUILDDEP+=		gnutls
 endif
 
 ifeq (${ADK_COMPILE_WEECHAT_WITH_LUA},y)
 PKG_DEPENDS+=		liblua
+PKG_BUILDDEP+=		lua
 endif
+PKG_URL:=		http://weechat.flashtux.org/download/
+PKG_SITES:=		http://weechat.flashtux.org/download/
+
+include ${TOPDIR}/mk/package.mk
+
 
 $(eval $(call PKG_template,WEECHAT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
@@ -36,7 +38,6 @@ ifneq (${ADK_COMPILE_WEECHAT_WITH_LUA},y)
 DISABLE_LUA:=		--disable-lua
 endif
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	${ENABLE_TLS} \
 			--with-debug=0 \
 			--disable-perl \
@@ -44,11 +45,10 @@ CONFIGURE_ARGS+=	${ENABLE_TLS} \
 			--disable-ruby \
 			--with-libiconv-prefix='${STAGING_DIR}/usr' \
 			${DISABLE_LUA}
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_WEECHAT}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/weechat-curses ${IDIR_WEECHAT}/usr/bin/
+	${INSTALL_BIN} ${WRKINST}/usr/bin/weechat-curses \
+		${IDIR_WEECHAT}/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/wget/Makefile b/package/wget/Makefile
index 6a4e37a76..8269ef55b 100644
--- a/package/wget/Makefile
+++ b/package/wget/Makefile
@@ -16,10 +16,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,WGET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_WGET}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/wget ${IDIR_WGET}/usr/bin
diff --git a/package/wifidog/Makefile b/package/wifidog/Makefile
index 3f179810b..9acd5624b 100644
--- a/package/wifidog/Makefile
+++ b/package/wifidog/Makefile
@@ -17,17 +17,15 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,WIFIDOG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_func_memcmp_working=yes \
 			ac_cv_lib_nsl_main=no \
 			ac_cv_func_setvbuf_reversed=no
-BUILD_STYLE+=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_WIFIDOG}/usr/{bin,lib} ${IDIR_WIFIDOG}/etc
 	${INSTALL_DATA} ./files/wifidog.conf ${IDIR_WIFIDOG}/etc/
-	${INSTALL_BIN} ${WRKBUILD}/scripts/init.d/wifidog ${IDIR_WIFIDOG}/usr/bin/wifidog-init
+	${INSTALL_BIN} ${WRKBUILD}/scripts/init.d/wifidog \
+		${IDIR_WIFIDOG}/usr/bin/wifidog-init
 	${INSTALL_BIN} ${WRKINST}/usr/bin/wifidog \
 		       ${WRKINST}/usr/bin/wdctl ${IDIR_WIFIDOG}/usr/bin/
 	${CP} ${WRKINST}/usr/lib/libhttpd.so* ${IDIR_WIFIDOG}/usr/lib/
diff --git a/package/wireless-firmware/Makefile b/package/wireless-firmware/Makefile
index 3d0999637..25de67aff 100644
--- a/package/wireless-firmware/Makefile
+++ b/package/wireless-firmware/Makefile
@@ -18,7 +18,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,WIRELESS_FIRMWARE_RT61,wireless-firmware-rt61,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-INSTALL_STYLE=		manual
+CONFIG_STYLE:=          manual
+BUILD_STYLE:=           manual
+INSTALL_STYLE:=         manual
 
 do-install:
 	${INSTALL_DIR} ${IDIR_WIRELESS_FIRMWARE_RT61}/lib/firmware
diff --git a/package/wol/Makefile b/package/wol/Makefile
index 9279ba9e0..5df4c6b56 100644
--- a/package/wol/Makefile
+++ b/package/wol/Makefile
@@ -15,12 +15,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,WOL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	ac_cv_func_mmap_fixed_mapped=yes \
 			jm_cv_func_working_malloc=yes \
 			ac_cv_func_alloca_works=yes
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_WOL}/usr/bin
diff --git a/package/wondershaper/Makefile b/package/wondershaper/Makefile
index 870e0ab61..2e8fe6bb2 100644
--- a/package/wondershaper/Makefile
+++ b/package/wondershaper/Makefile
@@ -16,9 +16,14 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,WONDERSHAPER,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIG_STYLE:=          manual
+BUILD_STYLE:=           manual
+INSTALL_STYLE:=         manual
+
 do-install:
 	${INSTALL_DIR} ${IDIR_WONDERSHAPER}/usr/sbin ${IDIR_WONDERSHAPER}/etc
-	${INSTALL_BIN} ${WRKBUILD}/wshaper.htb ${IDIR_WONDERSHAPER}/usr/sbin/wshaper
+	${INSTALL_BIN} ${WRKBUILD}/wshaper.htb \
+		${IDIR_WONDERSHAPER}/usr/sbin/wshaper
 	${INSTALL_DATA} ${WRKBUILD}/wshaper.conf ${IDIR_WONDERSHAPER}/etc/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile
index 9e4ae77ff..6d6b49f2a 100644
--- a/package/wpa_supplicant/Makefile
+++ b/package/wpa_supplicant/Makefile
@@ -6,13 +6,13 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		wpa_supplicant
 PKG_VERSION:=		0.6.9
 PKG_RELEASE:=		1
-ifeq (${ADK_COMPILE_WPA_SUPPLICANT_WITH_OPENSSL},y)
-PKG_BUILDDEP+=		openssl
-endif
 PKG_MD5SUM:=		0efb8fcedf0a8acf6f423dfdb0658fdd
 PKG_DESCR:=		WPA Supplicant with support for WPA and WPA2
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libopenssl
+ifeq (${ADK_COMPILE_WPA_SUPPLICANT_WITH_OPENSSL},y)
+PKG_BUILDDEP+=		openssl
+endif
 PKG_SITES:=		http://hostap.epitest.fi/releases/
 
 WRKSRC=			${WRKDIST}/${PKG_NAME}
@@ -21,7 +21,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,WPA_SUPPLICANT,wpa-supplicant,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE:=		auto
+CONFIG_STYLE:=          manual
+INSTALL_STYLE:=         manual
+
 MAKE_FLAGS+=		CPPFLAGS='${TCPPFLAGS}' \
 			LDFLAGS='${TLDFLAGS}' \
 			OPT_FLAGS='${TCFLAGS}' \
@@ -32,8 +34,11 @@ do-configure:
 
 do-install:
 	${INSTALL_DIR} ${IDIR_WPA_SUPPLICANT}/usr/sbin
-	${INSTALL_BIN} ${WRKBUILD}/wpa_cli ${IDIR_WPA_SUPPLICANT}/usr/sbin/
-	${INSTALL_BIN} ${WRKBUILD}/wpa_passphrase ${IDIR_WPA_SUPPLICANT}/usr/sbin/
-	${INSTALL_BIN} ${WRKBUILD}/wpa_supplicant ${IDIR_WPA_SUPPLICANT}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/wpa_cli \
+		${IDIR_WPA_SUPPLICANT}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/wpa_passphrase \
+		${IDIR_WPA_SUPPLICANT}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/wpa_supplicant \
+		${IDIR_WPA_SUPPLICANT}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/wput/Makefile b/package/wput/Makefile
index cb25e10ae..40649b3e4 100644
--- a/package/wput/Makefile
+++ b/package/wput/Makefile
@@ -4,23 +4,20 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		wput
-PKG_VERSION:=		0.5
+PKG_VERSION:=		0.6.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		441b2e07219f78167b29a7ac33488fff
+PKG_MD5SUM:=		92b41efed4db8eb4f3443c23bf7ceecf
 PKG_DESCR:=		a wget-like command-line FTP client
 PKG_SECTION:=		net
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=wput/}
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
-WRKDIST=		${WRKDIR}/${PKG_NAME}
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,WPUT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-g-switch
-BUILD_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_WPUT}/usr/bin
diff --git a/package/wput/patches/patch-Makefile b/package/wput/patches/patch-Makefile
new file mode 100644
index 000000000..a4b70f58c
--- /dev/null
+++ b/package/wput/patches/patch-Makefile
@@ -0,0 +1,21 @@
+--- wput-0.6.1.orig/Makefile	2007-12-12 18:30:04.000000000 +0100
++++ wput-0.6.1/Makefile	2010-02-06 04:45:45.273084356 +0100
+@@ -1,6 +1,6 @@
+ #wput makefile
+ PACKAGE     = wput
+-prefix      = /usr/local
++prefix      = /usr
+ datadir     = $(prefix)/share
+ mandir	    = $(datadir)/man/man1
+ exec_prefix = ${prefix}
+@@ -16,8 +16,8 @@ win-clean:
+ 
+ install: all
+ 	cd po && $(MAKE) $(MAKEDEFS) $@
+-	install -m0755 wput $(bindir)
+-	install -m0644 doc/wput.1.gz $(mandir)
++	install -m0755 wput $(DESTDIR)$(bindir)
++	install -m0644 doc/wput.1.gz $(DESTDIR)$(mandir)
+ 	@echo "----------------"
+ 	@echo "Wput installed. See 'wput -h' or 'man wput' for usage information."
+ 	@echo "Further documentation is located in the doc/USAGE.* files."
diff --git a/package/wput/patches/patch-Makefile_in b/package/wput/patches/patch-Makefile_in
new file mode 100644
index 000000000..da30515f6
--- /dev/null
+++ b/package/wput/patches/patch-Makefile_in
@@ -0,0 +1,12 @@
+--- wput-0.6.1.orig/Makefile.in	2007-12-12 18:30:04.000000000 +0100
++++ wput-0.6.1/Makefile.in	2010-02-06 04:46:02.964324514 +0100
+@@ -16,8 +16,7 @@ win-clean:
+ 
+ install: all
+ 	cd po && $(MAKE) $(MAKEDEFS) $@
+-	install -m0755 wput $(bindir)
+-	install -m0644 doc/wput.1.gz $(mandir)
++	install -m0755 wput $(DESTDIR)$(bindir)
+ 	@echo "----------------"
+ 	@echo "Wput installed. See 'wput -h' or 'man wput' for usage information."
+ 	@echo "Further documentation is located in the doc/USAGE.* files."
diff --git a/package/wput/patches/patch-Makefile_in.orig b/package/wput/patches/patch-Makefile_in.orig
new file mode 100644
index 000000000..4d6db67ab
--- /dev/null
+++ b/package/wput/patches/patch-Makefile_in.orig
@@ -0,0 +1,13 @@
+--- wput-0.6.1.orig/Makefile.in	2007-12-12 18:30:04.000000000 +0100
++++ wput-0.6.1/Makefile.in	2010-02-06 04:45:29.434334308 +0100
+@@ -16,8 +16,8 @@ win-clean:
+ 
+ install: all
+ 	cd po && $(MAKE) $(MAKEDEFS) $@
+-	install -m0755 wput $(bindir)
+-	install -m0644 doc/wput.1.gz $(mandir)
++	install -m0755 wput $(DESTDIR)$(bindir)
++	install -m0644 doc/wput.1.gz $(DESTDIR)$(mandir)
+ 	@echo "----------------"
+ 	@echo "Wput installed. See 'wput -h' or 'man wput' for usage information."
+ 	@echo "Further documentation is located in the doc/USAGE.* files."
diff --git a/package/wput/patches/patch-config_status b/package/wput/patches/patch-config_status
new file mode 100644
index 000000000..176dcb666
--- /dev/null
+++ b/package/wput/patches/patch-config_status
@@ -0,0 +1,160 @@
+--- wput-0.6.1.orig/config.status	2007-12-12 18:30:04.000000000 +0100
++++ wput-0.6.1/config.status	2010-02-06 04:45:45.083075667 +0100
+@@ -334,14 +334,14 @@ Report bugs to <bug-autoconf@gnu.org>."
+ 
+ ac_cs_version="\
+ wput config.status 0.6
+-configured by ./configure, generated by GNU Autoconf 2.61,
+-  with options \"\"
++configured by /home/wbx/openadk/build_qemu-x86_uclibc/w-wput-0.6.1-1/wput-0.6.1/configure, generated by GNU Autoconf 2.61,
++  with options \"'--build=x86_64-linux-gnu' '--host=i586-linux' '--target=i586-linux' '--program-prefix=' '--program-suffix=' '--prefix=/usr' '--datadir=/usr/share' '--mandir=/usr/share/man' '--libexecdir=/usr/sbin' '--localstatedir=/var' '--sysconfdir=/etc' '--disable-nls' '--enable-shared' '--enable-static' '--disable-dependency-tracking' '--disable-libtool-lock' '--disable-debug' '--disable-g-switch' 'build_alias=x86_64-linux-gnu' 'host_alias=i586-linux' 'target_alias=i586-linux' 'CC=/home/wbx/openadk/cross_qemu-x86_uclibc/host/bin/i586-linux-uclibc-gcc' 'CFLAGS=-fno-ident -Os -pipe -march=i586 -fomit-frame-pointer' 'LDFLAGS=-Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib -L/home/wbx/openadk/cross_qemu-x86_uclibc/target/lib -L/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib' 'CPPFLAGS=-I/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/include -DNDEBUG'\"
+ 
+ Copyright (C) 2006 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+ 
+-ac_pwd='/home/hagen/studium/projects/wput'
++ac_pwd='/home/wbx/openadk/build_qemu-x86_uclibc/w-wput-0.6.1-1/wput-0.6.1'
+ srcdir='.'
+ INSTALL='/usr/bin/install -c'
+ # If no file are specified by the user, then we need to provide default
+@@ -409,10 +409,10 @@ if $ac_cs_silent; then
+ fi
+ 
+ if $ac_cs_recheck; then
+-  echo "running CONFIG_SHELL=/bin/bash /bin/bash ./configure " $ac_configure_extra_args " --no-create --no-recursion" >&6
++  echo "running CONFIG_SHELL=/bin/bash /bin/bash /home/wbx/openadk/build_qemu-x86_uclibc/w-wput-0.6.1-1/wput-0.6.1/configure " '--build=x86_64-linux-gnu' '--host=i586-linux' '--target=i586-linux' '--program-prefix=' '--program-suffix=' '--prefix=/usr' '--datadir=/usr/share' '--mandir=/usr/share/man' '--libexecdir=/usr/sbin' '--localstatedir=/var' '--sysconfdir=/etc' '--disable-nls' '--enable-shared' '--enable-static' '--disable-dependency-tracking' '--disable-libtool-lock' '--disable-debug' '--disable-g-switch' 'build_alias=x86_64-linux-gnu' 'host_alias=i586-linux' 'target_alias=i586-linux' 'CC=/home/wbx/openadk/cross_qemu-x86_uclibc/host/bin/i586-linux-uclibc-gcc' 'CFLAGS=-fno-ident -Os -pipe -march=i586 -fomit-frame-pointer' 'LDFLAGS=-Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib -L/home/wbx/openadk/cross_qemu-x86_uclibc/target/lib -L/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib' 'CPPFLAGS=-I/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/include -DNDEBUG' $ac_configure_extra_args " --no-create --no-recursion" >&6
+   CONFIG_SHELL=/bin/bash
+   export CONFIG_SHELL
+-  exec /bin/bash "./configure" $ac_configure_extra_args --no-create --no-recursion
++  exec /bin/bash "/home/wbx/openadk/build_qemu-x86_uclibc/w-wput-0.6.1-1/wput-0.6.1/configure" '--build=x86_64-linux-gnu' '--host=i586-linux' '--target=i586-linux' '--program-prefix=' '--program-suffix=' '--prefix=/usr' '--datadir=/usr/share' '--mandir=/usr/share/man' '--libexecdir=/usr/sbin' '--localstatedir=/var' '--sysconfdir=/etc' '--disable-nls' '--enable-shared' '--enable-static' '--disable-dependency-tracking' '--disable-libtool-lock' '--disable-debug' '--disable-g-switch' 'build_alias=x86_64-linux-gnu' 'host_alias=i586-linux' 'target_alias=i586-linux' 'CC=/home/wbx/openadk/cross_qemu-x86_uclibc/host/bin/i586-linux-uclibc-gcc' 'CFLAGS=-fno-ident -Os -pipe -march=i586 -fomit-frame-pointer' 'LDFLAGS=-Wl,-O2 -Wl,-rpath -Wl,/usr/lib -Wl,-rpath-link -Wl,/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib -L/home/wbx/openadk/cross_qemu-x86_uclibc/target/lib -L/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib' 'CPPFLAGS=-I/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/include -DNDEBUG' $ac_configure_extra_args --no-create --no-recursion
+ fi
+ 
+ exec 5>>config.log
+@@ -510,16 +510,16 @@ s,@PACKAGE_VERSION@,|#_!!_#|0.6,g
+ s,@PACKAGE_STRING@,|#_!!_#|wput 0.6,g
+ s,@PACKAGE_BUGREPORT@,|#_!!_#|,g
+ s,@exec_prefix@,|#_!!_#|${prefix},g
+-s,@prefix@,|#_!!_#|/usr/local,g
++s,@prefix@,|#_!!_#|/usr,g
+ s,@program_transform_name@,|#_!!_#|s\,x\,x\,,g
+ s,@bindir@,|#_!!_#|${exec_prefix}/bin,g
+ s,@sbindir@,|#_!!_#|${exec_prefix}/sbin,g
+-s,@libexecdir@,|#_!!_#|${exec_prefix}/libexec,g
++s,@libexecdir@,|#_!!_#|/usr/sbin,g
+ s,@datarootdir@,|#_!!_#|${prefix}/share,g
+-s,@datadir@,|#_!!_#|${datarootdir},g
+-s,@sysconfdir@,|#_!!_#|${prefix}/etc,g
++s,@datadir@,|#_!!_#|/usr/share,g
++s,@sysconfdir@,|#_!!_#|/etc,g
+ s,@sharedstatedir@,|#_!!_#|${prefix}/com,g
+-s,@localstatedir@,|#_!!_#|${prefix}/var,g
++s,@localstatedir@,|#_!!_#|/var,g
+ s,@includedir@,|#_!!_#|${prefix}/include,g
+ s,@oldincludedir@,|#_!!_#|/usr/include,g
+ s,@docdir@,|#_!!_#|${datarootdir}/doc/${PACKAGE_TARNAME},g
+@@ -530,25 +530,25 @@ s,@pdfdir@,|#_!!_#|${docdir},g
+ s,@psdir@,|#_!!_#|${docdir},g
+ s,@libdir@,|#_!!_#|${exec_prefix}/lib,g
+ s,@localedir@,|#_!!_#|${datarootdir}/locale,g
+-s,@mandir@,|#_!!_#|${datarootdir}/man,g
++s,@mandir@,|#_!!_#|/usr/share/man,g
+ s,@DEFS@,|#_!!_#|-DHAVE_CONFIG_H,g
+ s,@ECHO_C@,|#_!!_#|,g
+ s,@ECHO_N@,|#_!!_#|-n,g
+ s,@ECHO_T@,|#_!!_#|,g
+ s,@LIBS@,|#_!!_#|,g
+-s,@build_alias@,|#_!!_#|,g
+-s,@host_alias@,|#_!!_#|,g
+-s,@target_alias@,|#_!!_#|,g
++s,@build_alias@,|#_!!_#|x86_64-linux-gnu,g
++s,@host_alias@,|#_!!_#|i586-linux,g
++s,@target_alias@,|#_!!_#|i586-linux,g
+ s,@PACKAGE@,|#_!!_#|wput,g
+ s,@VERSION@,|#_!!_#|0.6,g
+-s,@CC@,|#_!!_#|gcc,g
+-s,@CFLAGS@,|#_!!_#| -Wall  -g,g
+-s,@LDFLAGS@,|#_!!_#|,g
+-s,@CPPFLAGS@,|#_!!_#|,g
+-s,@ac_ct_CC@,|#_!!_#|gcc,g
++s,@CC@,|#_!!_#|/home/wbx/openadk/cross_qemu-x86_uclibc/host/bin/i586-linux-uclibc-gcc,g
++s,@CFLAGS@,|#_!!_#|-fno-ident -Os -pipe -march=i586 -fomit-frame-pointer -Wall,g
++s,@LDFLAGS@,|#_!!_#|-Wl\,-O2 -Wl\,-rpath -Wl\,/usr/lib -Wl\,-rpath-link -Wl\,/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib -L/home/wbx/openadk/cross_qemu-x86_uclibc/target/lib -L/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib,g
++s,@CPPFLAGS@,|#_!!_#|-I/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/include -DNDEBUG,g
++s,@ac_ct_CC@,|#_!!_#|,g
+ s,@EXEEXT@,|#_!!_#|,g
+ s,@OBJEXT@,|#_!!_#|o,g
+-s,@CPP@,|#_!!_#|gcc -E,g
++s,@CPP@,|#_!!_#|/home/wbx/openadk/cross_qemu-x86_uclibc/host/bin/i586-linux-uclibc-gcc -E,g
+ s,@GREP@,|#_!!_#|/bin/grep,g
+ s,@EGREP@,|#_!!_#|/bin/grep -E,g
+ s,@SET_MAKE@,|#_!!_#|,g
+@@ -556,29 +556,29 @@ s,@INSTALL_PROGRAM@,|#_!!_#|${INSTALL},g
+ s,@INSTALL_SCRIPT@,|#_!!_#|${INSTALL},g
+ s,@INSTALL_DATA@,|#_!!_#|${INSTALL} -m 644,g
+ s,@MKINSTALLDIRS@,|#_!!_#|$(top_builddir)/./mkinstalldirs,g
+-s,@USE_NLS@,|#_!!_#|yes,g
++s,@USE_NLS@,|#_!!_#|no,g
+ s,@MSGFMT@,|#_!!_#|/usr/bin/msgfmt,g
+ s,@GMSGFMT@,|#_!!_#|/usr/bin/msgfmt,g
+ s,@XGETTEXT@,|#_!!_#|/usr/bin/xgettext,g
+ s,@MSGMERGE@,|#_!!_#|/usr/bin/msgmerge,g
+-s,@build@,|#_!!_#|i686-pc-linux-gnu,g
+-s,@build_cpu@,|#_!!_#|i686,g
++s,@build@,|#_!!_#|x86_64-pc-linux-gnu,g
++s,@build_cpu@,|#_!!_#|x86_64,g
+ s,@build_vendor@,|#_!!_#|pc,g
+ s,@build_os@,|#_!!_#|linux-gnu,g
+-s,@host@,|#_!!_#|i686-pc-linux-gnu,g
+-s,@host_cpu@,|#_!!_#|i686,g
++s,@host@,|#_!!_#|i586-pc-linux-gnu,g
++s,@host_cpu@,|#_!!_#|i586,g
+ s,@host_vendor@,|#_!!_#|pc,g
+ s,@host_os@,|#_!!_#|Linux,g
+-s,@LIBICONV@,|#_!!_#|-liconv,g
+-s,@LTLIBICONV@,|#_!!_#|-liconv,g
++s,@LIBICONV@,|#_!!_#|/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib/libiconv.so -Wl\,-rpath -Wl\,/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib,g
++s,@LTLIBICONV@,|#_!!_#|-L/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib -liconv -R/home/wbx/openadk/cross_qemu-x86_uclibc/target/usr/lib,g
+ s,@INTLLIBS@,|#_!!_#|,g
+ s,@LIBINTL@,|#_!!_#|,g
+ s,@LTLIBINTL@,|#_!!_#|,g
+-s,@POSUB@,|#_!!_#|po,g
++s,@POSUB@,|#_!!_#|,g
+ s,@GETOPT@,|#_!!_#|,g
+ s,@MEMDBG@,|#_!!_#|,g
+-s,@GNUTLS_CFLAGS@,|#_!!_#|-INONE/include,g
+-s,@GNUTLS_LIBS@,|#_!!_#| -lgnutls-openssl,g
++s,@GNUTLS_CFLAGS@,|#_!!_#|,g
++s,@GNUTLS_LIBS@,|#_!!_#|,g
+ s,@LIBOBJS@,|#_!!_#|,g
+ s,@LTLIBOBJS@,|#_!!_#|,g
+ :end
+@@ -776,11 +776,11 @@ case `sed -n '/datarootdir/ {
+   { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+ echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+   ac_datarootdir_hack='
+-  s&@datadir@&${datarootdir}&g
++  s&@datadir@&/usr/share&g
+   s&@docdir@&${datarootdir}/doc/${PACKAGE_TARNAME}&g
+   s&@infodir@&${datarootdir}/info&g
+   s&@localedir@&${datarootdir}/locale&g
+-  s&@mandir@&${datarootdir}/man&g
++  s&@mandir@&/usr/share/man&g
+     s&\${datarootdir}&${prefix}/share&g' ;;
+ esac
+   sed "/^[	 ]*VPATH[	 ]*=/{
+@@ -852,14 +852,7 @@ s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_IOCTL\)[	
+ s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_TERMIO_H\)[	 (].*,\1define\2 1 ,
+ s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_TERMIO\)[	 (].*,\1define\2 1 ,
+ s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_LOCALE_H\)[	 (].*,\1define\2 1 ,
+-s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_LIBINTL_H\)[	 (].*,\1define\2 1 ,
+ s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_GETOPT_H\)[	 (].*,\1define\2 1 ,
+-s,^\([	 #]*\)[^	 ]*\([	 ]*ENABLE_NLS\)[	 (].*,\1define\2 1 ,
+-s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_GETTEXT\)[	 (].*,\1define\2 1 ,
+-s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_DCGETTEXT\)[	 (].*,\1define\2 1 ,
+-s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_GNUTLS_OPENSSL_H\)[	 (].*,\1define\2 1 ,
+-s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_GNUTLS\)[	 (].*,\1define\2 1 ,
+-s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_SSL\)[	 (].*,\1define\2 1 ,
+ s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_LONG_LONG\)[	 (].*,\1define\2 1 ,
+ s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_UNSIGNED_LONG_LONG\)[	 (].*,\1define\2 1 ,
+ s,^\([	 #]*\)[^	 ]*\([	 ]*HAVE_LONG_LONG\)[	 (].*,\1define\2 1 ,
diff --git a/package/wput/patches/patch-po_Makefile b/package/wput/patches/patch-po_Makefile
new file mode 100644
index 000000000..f636bff65
--- /dev/null
+++ b/package/wput/patches/patch-po_Makefile
@@ -0,0 +1,50 @@
+--- wput-0.6.1.orig/po/Makefile	2007-12-12 18:30:04.000000000 +0100
++++ wput-0.6.1/po/Makefile	2010-02-06 04:45:45.653081691 +0100
+@@ -20,9 +20,9 @@ srcdir = .
+ top_srcdir = ..
+ 
+ 
+-prefix = /usr/local
++prefix = /usr
+ exec_prefix = ${prefix}
+-datadir = ${prefix}/share
++datadir = /usr/share
+ localedir = $(datadir)/locale
+ gettextsrcdir = $(datadir)/gettext/po
+ 
+@@ -124,7 +124,7 @@ EXTRA_LOCALE_CATEGORIES =
+ 	mv t-$@ $@
+ 
+ 
+-all: all-yes
++all: all-no
+ 
+ all-yes: stamp-po
+ all-no:
+@@ -191,7 +191,7 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
+ 
+ install: install-exec install-data
+ install-exec:
+-install-data: install-data-yes
++install-data: install-data-no
+ 	if test "$(PACKAGE)" = "gettext-tools"; then \
+ 	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+ 	  for file in $(DISTFILES.common) Makevars.template; do \
+@@ -250,7 +250,7 @@ install-strip: install
+ 
+ installdirs: installdirs-exec installdirs-data
+ installdirs-exec:
+-installdirs-data: installdirs-data-yes
++installdirs-data: installdirs-data-no
+ 	if test "$(PACKAGE)" = "gettext-tools"; then \
+ 	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+ 	else \
+@@ -295,7 +295,7 @@ installcheck:
+ 
+ uninstall: uninstall-exec uninstall-data
+ uninstall-exec:
+-uninstall-data: uninstall-data-yes
++uninstall-data: uninstall-data-no
+ 	if test "$(PACKAGE)" = "gettext-tools"; then \
+ 	  for file in $(DISTFILES.common) Makevars.template; do \
+ 	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
diff --git a/package/wput/patches/patch-po_Makefile_in b/package/wput/patches/patch-po_Makefile_in
new file mode 100644
index 000000000..45610ddbb
--- /dev/null
+++ b/package/wput/patches/patch-po_Makefile_in
@@ -0,0 +1,50 @@
+--- wput-0.6.1.orig/po/Makefile.in	2007-12-12 18:30:04.000000000 +0100
++++ wput-0.6.1/po/Makefile.in	2010-02-06 04:45:45.453076297 +0100
+@@ -20,9 +20,9 @@ srcdir = .
+ top_srcdir = ..
+ 
+ 
+-prefix = /usr/local
++prefix = /usr
+ exec_prefix = ${prefix}
+-datadir = ${prefix}/share
++datadir = /usr/share
+ localedir = $(datadir)/locale
+ gettextsrcdir = $(datadir)/gettext/po
+ 
+@@ -74,7 +74,7 @@ CATALOGS = @CATALOGS@
+ 	mv t-$@ $@
+ 
+ 
+-all: all-yes
++all: all-no
+ 
+ all-yes: stamp-po
+ all-no:
+@@ -141,7 +141,7 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot
+ 
+ install: install-exec install-data
+ install-exec:
+-install-data: install-data-yes
++install-data: install-data-no
+ 	if test "$(PACKAGE)" = "gettext-tools"; then \
+ 	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+ 	  for file in $(DISTFILES.common) Makevars.template; do \
+@@ -200,7 +200,7 @@ install-strip: install
+ 
+ installdirs: installdirs-exec installdirs-data
+ installdirs-exec:
+-installdirs-data: installdirs-data-yes
++installdirs-data: installdirs-data-no
+ 	if test "$(PACKAGE)" = "gettext-tools"; then \
+ 	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+ 	else \
+@@ -245,7 +245,7 @@ installcheck:
+ 
+ uninstall: uninstall-exec uninstall-data
+ uninstall-exec:
+-uninstall-data: uninstall-data-yes
++uninstall-data: uninstall-data-no
+ 	if test "$(PACKAGE)" = "gettext-tools"; then \
+ 	  for file in $(DISTFILES.common) Makevars.template; do \
+ 	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
diff --git a/package/wput/patches/patch-src_Makefile b/package/wput/patches/patch-src_Makefile
new file mode 100644
index 000000000..42f51da44
--- /dev/null
+++ b/package/wput/patches/patch-src_Makefile
@@ -0,0 +1,19 @@
+--- wput-0.6.1.orig/src/Makefile	2007-12-12 18:30:04.000000000 +0100
++++ wput-0.6.1/src/Makefile	2010-02-06 04:45:45.363075315 +0100
+@@ -1,12 +1,12 @@
+ #wput.mk
+ #mm make file for wput
+ SHELL=/bin/bash
+-prefix=/usr/local
++prefix=/usr
+ bindir=${exec_prefix}/bin
+ localedir=$(prefix)/share/locale
+-CC=gcc
+-CFLAGS=  -Wall  -g -DLOCALEDIR=\"$(localedir)\" -INONE/include
+-LIBS=   -lgnutls-openssl
++CC=/home/wbx/openadk/cross_qemu-x86_uclibc/host/bin/i586-linux-uclibc-gcc
++CFLAGS= -fno-ident -Os -pipe -march=i586 -fomit-frame-pointer -Wall -DLOCALEDIR=\"$(localedir)\" 
++LIBS=  
+ EXE=../wput
+ GETOPT=
+ MEMDBG=
diff --git a/package/wput/patches/patch-src_config_h b/package/wput/patches/patch-src_config_h
new file mode 100644
index 000000000..52a23c2ed
--- /dev/null
+++ b/package/wput/patches/patch-src_config_h
@@ -0,0 +1,27 @@
+--- wput-0.6.1.orig/src/config.h	2007-12-12 18:30:04.000000000 +0100
++++ wput-0.6.1/src/config.h	2010-02-06 04:45:45.543084453 +0100
+@@ -7,13 +7,13 @@
+ #define HAVE_IOCTL 1
+ 
+ /* Define if you have the <libintl.h> header file.  */
+-#define HAVE_LIBINTL_H 1
++/* #undef HAVE_LIBINTL_H */
+ 
+ /* Define if you have the <locale.h> header file.  */
+ #define HAVE_LOCALE_H 1
+ 
+ /* Define this if you want the NLS support.  */
+-#define ENABLE_NLS 1
++/* #undef ENABLE_NLS */
+ 
+ /* Define to 1 if you have the <gnugetopt/getopt.h> header file. */
+ /* #undef HAVE_GNUGETOPT_GETOPT_H */
+@@ -64,7 +64,7 @@
+ #define STDC_HEADERS 1
+ 
+ /* Define if all libs needed for ssl support are existing */
+-#define HAVE_SSL 1
++/* #undef HAVE_SSL */
+ 
+ /* Define to 1 if you have the long long type */
+ #define HAVE_LONG_LONG 1
diff --git a/package/xauth/Makefile b/package/xauth/Makefile
index c18f936d0..a12c62f34 100644
--- a/package/xauth/Makefile
+++ b/package/xauth/Makefile
@@ -18,10 +18,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XAUTH,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	$(INSTALL_DIR) $(IDIR_XAUTH)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/xauth $(IDIR_XAUTH)/usr/bin
diff --git a/package/xcmiscproto/Makefile b/package/xcmiscproto/Makefile
index f4e299044..df4b324c2 100644
--- a/package/xcmiscproto/Makefile
+++ b/package/xcmiscproto/Makefile
@@ -10,9 +10,4 @@ PKG_MD5SUM:=		bacfb0f3cb4d6e1a71770307bfdba129
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xextproto/Makefile b/package/xextproto/Makefile
index 50780b44c..8d61db142 100644
--- a/package/xextproto/Makefile
+++ b/package/xextproto/Makefile
@@ -10,9 +10,4 @@ PKG_MD5SUM:=		6c55283718dbeb826bcf899b9e89faba
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xf86-input-evtouch/Makefile b/package/xf86-input-evtouch/Makefile
index 4f7506523..6dbab29d9 100644
--- a/package/xf86-input-evtouch/Makefile
+++ b/package/xf86-input-evtouch/Makefile
@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		xf86-input-evtouch
 PKG_VERSION:=		0.8.8
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		xorg-server
 PKG_MD5SUM:=		4d8e092356d8353002f60a4907046c13
 PKG_DESCR:=		X11 driver for touchscreen
 PKG_SECTION:=		x11
 PKG_DEPENDS:=		xorg-server kmod-input-evdev
+PKG_BUILDDEP+=		xorg-server
 PKG_SITES:=		http://www.conan.de/touchscreen/
 
 DISTFILES:= 		${PKG_NAME}-${PKG_VERSION}.tar.bz2
@@ -21,10 +21,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XF86_INPUT_EVTOUCH,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_XF86_INPUT_EVTOUCH}/usr/lib/xorg/modules/input
 	${CP} ${WRKINST}/usr/lib/xorg/modules/input/evtouch_drv.so \
diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile
index 062624fdc..0b66eea6e 100644
--- a/package/xf86-input-keyboard/Makefile
+++ b/package/xf86-input-keyboard/Makefile
@@ -19,14 +19,9 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XF86_INPUT_KEYBOARD,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_XF86_INPUT_KEYBOARD}/usr/lib/xorg/modules/input
 	${CP} ${WRKINST}/usr/lib/xorg/modules/input/kbd_drv.so \
 		${IDIR_XF86_INPUT_KEYBOARD}/usr/lib/xorg/modules/input/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
-
diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile
index 093f1bec8..4755fedc1 100644
--- a/package/xf86-input-mouse/Makefile
+++ b/package/xf86-input-mouse/Makefile
@@ -19,10 +19,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XF86_INPUT_MOUSE,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_XF86_INPUT_MOUSE}/usr/lib/xorg/modules/input
 	${CP} ${WRKINST}/usr/lib/xorg/modules/input/mouse_drv.so \
diff --git a/package/xf86-video-cirrus/Makefile b/package/xf86-video-cirrus/Makefile
index a86ba2730..22e4b24e3 100644
--- a/package/xf86-video-cirrus/Makefile
+++ b/package/xf86-video-cirrus/Makefile
@@ -19,10 +19,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XF86_VIDEO_CIRRUS,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_XF86_VIDEO_CIRRUS}/usr/lib/xorg/modules/drivers
 	${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/cirrus_*.so \
diff --git a/package/xf86-video-geode/Makefile b/package/xf86-video-geode/Makefile
index b98613082..837c76954 100644
--- a/package/xf86-video-geode/Makefile
+++ b/package/xf86-video-geode/Makefile
@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		xf86-video-geode
 PKG_VERSION:=		2.11.6
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		xorg-server
 PKG_MD5SUM:=		a673c0f88037d12fbb96d9fefc82785b
 PKG_DESCR:=		X11 driver for AMD Geode VGA chip
 PKG_SECTION:=		x11
 PKG_DEPENDS:=		xorg-server
+PKG_BUILDDEP+=		xorg-server
 PKG_SITES:=		http://xorg.freedesktop.org/releases/individual/driver/
 
 PKG_TARGET_DEPENDS:=	alix1c
@@ -19,10 +19,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XF86_VIDEO_GEODE,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_XF86_VIDEO_GEODE}/usr/lib/xorg/modules/drivers
 	${CP} ${WRKINST}/usr/lib/xorg/modules/drivers/geode_drv.so \
diff --git a/package/xf86dga/Makefile b/package/xf86dga/Makefile
index 1adb287ae..c3e7e5e86 100644
--- a/package/xf86dga/Makefile
+++ b/package/xf86dga/Makefile
@@ -11,9 +11,4 @@ PKG_MD5SUM:=		ac30b5705f487554c5de0b466e846c31
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xf86dgaproto/Makefile b/package/xf86dgaproto/Makefile
index 88979a522..34009118f 100644
--- a/package/xf86dgaproto/Makefile
+++ b/package/xf86dgaproto/Makefile
@@ -10,9 +10,4 @@ PKG_MD5SUM:=		1fe79dc07857ad3e1fb8b8f2bdd70d1b
 PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile
index f323ef9e6..6b86959ad 100644
--- a/package/xfsprogs/Makefile
+++ b/package/xfsprogs/Makefile
@@ -19,12 +19,10 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,XFSPROGS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	autoconf gnu
+AUTOTOOL_STYLE:=	autoconf
 CONFIGURE_ARGS+=	--enable-gettext=no \
 			--with-gnu-ld
 CONFIGURE_ENV+=		DEBUG=" " OPTIMIZER=" "
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
 ALL_TARGET=		
 
 post-install:
diff --git a/package/xinetd/Makefile b/package/xinetd/Makefile
index b210a8c76..7147efbdb 100644
--- a/package/xinetd/Makefile
+++ b/package/xinetd/Makefile
@@ -16,12 +16,9 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XINETD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--without-libwrap \
 			--with-loadavg
-BUILD_STYLE:=		auto
 ALL_TARGET:=		build
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_XINETD}/etc/xinetd.d ${IDIR_XINETD}/usr/sbin
diff --git a/package/xkbcomp/Makefile b/package/xkbcomp/Makefile
index ca3b8a9e2..a52d74957 100644
--- a/package/xkbcomp/Makefile
+++ b/package/xkbcomp/Makefile
@@ -15,10 +15,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XKBCOMP,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_XKBCOMP}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/xkbcomp ${IDIR_XKBCOMP}/usr/bin
diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile
index cb105a795..7f5f258f4 100644
--- a/package/xkeyboard-config/Makefile
+++ b/package/xkeyboard-config/Makefile
@@ -16,13 +16,10 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XKEYBOARD_CONFIG,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb
-	${CP} ${WRKINST}/usr/share/X11/xkb/* ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb
+	${CP} ${WRKINST}/usr/share/X11/xkb/* \
+		${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb
 	rm ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb/rules/*.lst 
 	rm ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb/rules/*.xml
 	rm -rf ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb/symbols/sun_vndr
diff --git a/package/xlsfonts/Makefile b/package/xlsfonts/Makefile
index c85687366..d76e6c722 100644
--- a/package/xlsfonts/Makefile
+++ b/package/xlsfonts/Makefile
@@ -16,10 +16,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,XLSFONTS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_XLSFONTS}/usr/bin
 	${CP} ${WRKINST}/usr/bin/xlsfonts \
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 1b604fbe4..35b7597a6 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -9,8 +9,14 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		913a672cbd6da516de15965d594e20b9
 PKG_DESCR:=		Xorg server
 PKG_SECTION:=		x11
-PKG_DEPENDS:=		libopenssl libxfont pixman libpciaccess libxkbfile libfontenc xkeyboard-config xkbcomp libxau libxaw libxmu libxpm libxrender libxt libxxf86dga libxext libxdmcp libxv libsm libice libx11
-PKG_BUILDDEP+=		libX11 randrproto renderproto fixesproto damageproto scrnsaverproto resourceproto fontsproto videoproto compositeproto evieext libxkbfile libXfont pixman libpciaccess openssl xf86dgaproto
+PKG_DEPENDS:=		libopenssl libxfont pixman libpciaccess libxkbfile \
+			libfontenc xkeyboard-config xkbcomp libxau libxaw \
+			libxmu libxpm libxrender libxt libxxf86dga libxext \
+			libxdmcp libxv libsm libice libx11
+PKG_BUILDDEP+=		libX11 randrproto renderproto fixesproto damageproto \
+			scrnsaverproto resourceproto fontsproto videoproto \
+			compositeproto evieext libxkbfile libXfont pixman \
+			libpciaccess openssl xf86dgaproto
 PKG_URL:=		http://www.x.org
 PKG_SITES:=		${MASTER_SITE_XORG}
 
@@ -20,7 +26,6 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		V=1
 CONFIGURE_ARGS+=	\
 			--with-fontdir=/usr/share/fonts/X11 \
@@ -49,12 +54,13 @@ CONFIGURE_ARGS+=	\
 			--with-xkb-output=/tmp \
 			--with-os-vendor=OpenADK \
 			--with-vendor-web="http://openadk.org"
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/bin
-	$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/{extensions,fonts,linux,multimedia}
+	$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/linux
+	$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions
+	$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/fonts	
+	$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia
 	${CP} ${WRKINST}/usr/lib/xorg/protocol.txt \
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/
 	${CP} ${WRKINST}/usr/bin/* $(IDIR_XORG_SERVER)/usr/bin
diff --git a/package/xproto/Makefile b/package/xproto/Makefile
index 9f8207fca..a3c76afe2 100644
--- a/package/xproto/Makefile
+++ b/package/xproto/Makefile
@@ -11,10 +11,6 @@ PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 # workaround for makekeys compile on non-Linux systems
 post-install:
 	${INSTALL_DIR} ${STAGING_DIR}/usr/include/xproto
diff --git a/package/xtrans/Makefile b/package/xtrans/Makefile
index b71477dfb..7928210f4 100644
--- a/package/xtrans/Makefile
+++ b/package/xtrans/Makefile
@@ -13,11 +13,8 @@ PKG_SITES:=		${MASTER_SITE_XORG}
 
 include $(TOPDIR)/mk/package.mk
 
-#$(eval $(call PKG_template,XTRANS,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,XTRANS,${PKG_NAME},$(PKG_VERSION)-$(PKG_RELEASE),${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--datadir=/usr/lib
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xz/Makefile b/package/xz/Makefile
index 0caa69fca..58d3379cb 100644
--- a/package/xz/Makefile
+++ b/package/xz/Makefile
@@ -16,10 +16,6 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,XZ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
-
 post-install:
 	${INSTALL_DIR} ${IDIR_XZ}/usr/bin ${IDIR_XZ}/usr/lib
 	${CP} ${WRKINST}/usr/bin/* ${IDIR_XZ}/usr/bin
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 1d3b0489c..e031baf0a 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -24,9 +24,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,ZLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,ZLIB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	manual
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
+CONFIG_STYLE:=		manual
 
 ifeq ($(ADK_NATIVE),)
 COPTS:=                 $(TARGET_CONFIGURE_OPTS)
diff --git a/package/zsh/Makefile b/package/zsh/Makefile
index 7d44e0f85..cca1e71d9 100644
--- a/package/zsh/Makefile
+++ b/package/zsh/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		zsh
-PKG_VERSION:=		4.3.9
+PKG_VERSION:=		4.3.10
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		1b08c063f02d595709eaad1548c4e392
+PKG_MD5SUM:=		031efc8c8efb9778ffa8afbcd75f0152
 PKG_DESCR:=		Z Shell
 PKG_SECTION:=		shells
 PKG_URL:=		http://www.zsh.org/
@@ -14,11 +14,7 @@ PKG_SITES:=		ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,ZSH,zsh,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_STYLE:=	gnu
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
+$(eval $(call PKG_template,ZSH,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_ZSH)/bin
author	Waldemar Brodkorb <wbx@openadk.org>	2010-02-07 20:15:44 +0100
committer	Waldemar Brodkorb <wbx@openadk.org>	2010-02-07 20:15:44 +0100
commit	483e9fde0b3923169c3c70720ca94b032dd30ae8 (patch)
tree	bd4ea28db271093276fe295b2da2e000a28aa857 /package
parent	10997d993a55465525b026b9404f5809687e9e3c (diff)
parent	25448b89bc693d56b074cd7b2a9c60ddc12f7404 (diff)