misc patches needed for allmodconfig for ibm-x40-eglibc on Darwin OS

* fix *.pc / *-config file handling.
author: Waldemar Brodkorb <wbx@openadk.org> 2011-03-01 19:51:32 +0100
committer: Waldemar Brodkorb <wbx@openadk.org> 2011-03-01 19:51:32 +0100
commit: b56c73c95f08099803c60d9e2f2584f231220d47 (patch)
tree: 704b5c66e0d233af904afdfa00e1dd9c2205d02d /package
parent: 09381f08db60bd52ab7135bd084fa2bb197a98c2 (diff)
37 files changed, 634 insertions, 309 deletions
diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile
index c1a191784..5c5a81100 100644
--- a/package/ImageMagick/Makefile
+++ b/package/ImageMagick/Makefile
@@ -37,9 +37,17 @@ $(eval $(call PKG_template,CONVERT,convert,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS
 $(eval $(call PKG_template,DISPLAY,display,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_DISPLAY},${PKGSD_DISPLAY},${PKGSC_DISPLAY}))
 
 CONFIGURE_ARGS+=	--with-magick-plus-plus=no \
+			--without-bzip2 \
+			--without-gslib \
+			--without-dps \
+			--without-perl \
+			--without-djvu \
+			--without-lcms \
+			--without-lcms2 \
+			--without-wmf \
 			--enable-fast-install
 
-post-install:
+libimagemagick-install:
 	$(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib
 	$(INSTALL_DIR) $(IDIR_LIBIMAGEMAGICK)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config
 	$(INSTALL_DATA) $(WRKINST)/usr/lib/${PKG_NAME}-${PKG_VERSION}/config/* \
@@ -54,12 +62,10 @@ post-install:
 
 convert-install:
 	$(INSTALL_DIR) $(IDIR_CONVERT)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/convert \
-		$(IDIR_CONVERT)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/convert $(IDIR_CONVERT)/usr/bin
 
 display-install:
 	$(INSTALL_DIR) $(IDIR_DISPLAY)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/display \
-		$(IDIR_DISPLAY)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/display $(IDIR_DISPLAY)/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/cgilib/patches/autotool.patch b/package/cgilib/patches/autotool.patch
index 66af00c9a..12a74c93b 100644
--- a/package/cgilib/patches/autotool.patch
+++ b/package/cgilib/patches/autotool.patch
@@ -41081,7 +41081,7 @@ diff -Nur cgilib-0.7.orig/ltmain.sh cgilib-0.7/ltmain.sh
 -      # -F/path gives path to uninstalled frameworks, gcc on darwin
 -      # @file GCC response files
 -      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto*)
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
 +      uninstall)
 +        $ECHO \
 +"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
@@ -47385,7 +47385,7 @@ diff -Nur cgilib-0.7.orig/ltmain.sh cgilib-0.7/ltmain.sh
 +      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
 +      # @file GCC response files
 +      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto*)
 +        func_quote_for_eval "$arg"
 +	arg="$func_quote_for_eval_result"
 +        func_append compile_command " $arg"
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index 934c4f0e7..81d8751c5 100644
--- a/package/dillo/Makefile
+++ b/package/dillo/Makefile
@@ -25,7 +25,7 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DILLO,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_LDLFAGS+=	-liconv
+TARGET_LDFLAGS+=	-liconv
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_DILLO)/usr/bin
diff --git a/package/esound/patches/autotool.patch b/package/esound/patches/autotool.patch
index 162430c30..104d068cc 100644
--- a/package/esound/patches/autotool.patch
+++ b/package/esound/patches/autotool.patch
@@ -50885,7 +50885,7 @@ diff -Nur esound-0.2.41.orig/ltmain.sh esound-0.2.41/ltmain.sh
 -      # -F/path gives path to uninstalled frameworks, gcc on darwin
 -      # @file GCC response files
 -      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto*)
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
 +      uninstall)
 +        $ECHO \
 +"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
@@ -57187,7 +57187,7 @@ diff -Nur esound-0.2.41.orig/ltmain.sh esound-0.2.41/ltmain.sh
 +      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
 +      # @file GCC response files
 +      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto*)
 +        func_quote_for_eval "$arg"
 +	arg="$func_quote_for_eval_result"
 +        func_append compile_command " $arg"
diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile
index 0aa2e0552..691d12369 100644
--- a/package/fontconfig/Makefile
+++ b/package/fontconfig/Makefile
@@ -9,8 +9,8 @@ PKG_RELEASE:=		2
 PKG_MD5SUM:=		77e15a92006ddc2adbb06f840d591c0e
 PKG_DESCR:=		library for configuring and customizing font access
 PKG_SECTION:=		libs
-PKG_DEPENDS:=		libxml2
-PKG_BUILDDEP:=		freetype libxml2
+PKG_DEPENDS:=		libxml2 libiconv
+PKG_BUILDDEP:=		freetype libxml2 libiconv
 PKG_URL:=		http://fontconfig.org/
 PKG_SITES:=		http://fontconfig.org/release/
 
@@ -27,6 +27,7 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 $(eval $(call PKG_template,FONTCONFIG_DEV,fontconfig-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FONTCONFIG_DEV},${PKGSC_FONTCONFIG_DEV},${PKG_OPTS}))
 
+TARGET_LDFLAGS+=	-liconv
 CONFIGURE_ARGS+=	--with-arch=${ARCH} \
 			--disable-docs
 
diff --git a/package/freetype/patches/patch-builds_unix_ltmain_sh b/package/freetype/patches/patch-builds_unix_ltmain_sh
index 0d7344b45..89bf461e4 100644
--- a/package/freetype/patches/patch-builds_unix_ltmain_sh
+++ b/package/freetype/patches/patch-builds_unix_ltmain_sh
@@ -5,7 +5,7 @@
        # @file GCC response files
        -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
 -      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto*)
          func_quote_for_eval "$arg"
  	arg="$func_quote_for_eval_result"
          func_append compile_command " $arg"
diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile
index ac51120f5..49660d151 100644
--- a/package/gpsd/Makefile
+++ b/package/gpsd/Makefile
@@ -43,7 +43,7 @@ TARGET_CXXFLAGS+=	-fno-rtti -nostdinc++ \
 			-I${STAGING_TARGET_DIR}/usr/include/uClibc++
 TARGET_LDFLAGS+=	$(LIBRARIES)
 else
-TARGET_LDFLAGS+=	-shared -pthread
+TARGET_LDFLAGS+=	-shared -pthread -lstdc++
 endif
 
 ifeq (${ADK_COMPILE_GPSD_WITH_UCLIBCXX},y)
diff --git a/package/libdaemon/patches/autotool.patch b/package/libdaemon/patches/autotool.patch
index 447ad3412..42772af3c 100644
--- a/package/libdaemon/patches/autotool.patch
+++ b/package/libdaemon/patches/autotool.patch
@@ -51091,7 +51091,7 @@ diff -Nur libdaemon-0.13.orig/ltmain.sh libdaemon-0.13/ltmain.sh
 -      # -F/path gives path to uninstalled frameworks, gcc on darwin
 -      # @file GCC response files
 -      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto*)
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
 +      uninstall)
 +        $ECHO \
 +"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
@@ -57393,7 +57393,7 @@ diff -Nur libdaemon-0.13.orig/ltmain.sh libdaemon-0.13/ltmain.sh
 +      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
 +      # @file GCC response files
 +      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto*)
 +        func_quote_for_eval "$arg"
 +	arg="$func_quote_for_eval_result"
 +        func_append compile_command " $arg"
diff --git a/package/libhugetlbfs/patches/patch-Makefile b/package/libhugetlbfs/patches/patch-Makefile
index b0b919940..42ae93bc2 100644
--- a/package/libhugetlbfs/patches/patch-Makefile
+++ b/package/libhugetlbfs/patches/patch-Makefile
@@ -1,7 +1,7 @@
 	- do not call uname -m, use passed ${ADK_ARCH} variable
 	- use ${CC} instead of hard-coded gcc
 --- libhugetlbfs-2.11.orig/Makefile	2010-12-16 18:38:22.000000000 +0100
-+++ libhugetlbfs-2.11/Makefile	2011-01-22 21:09:48.008659615 +0100
++++ libhugetlbfs-2.11/Makefile	2011-02-27 18:58:07.000000000 +0100
 @@ -31,51 +31,51 @@ CFLAGS ?= -O2 -g
  CFLAGS += -Wall -fPIC
  CPPFLAGS += -D__LIBHUGETLBFS__
@@ -65,3 +65,12 @@
  TMPLIB64 = lib64
  TMPLIB32 = lib
  CFLAGS += -DNO_ELFLINK
+@@ -370,7 +370,7 @@ install-libs: libs $(OBJDIRS:%=%/install
+ 	$(INSTALL) -d $(DESTDIR)$(HEADERDIR)
+ 	$(INSTALL) -d $(DESTDIR)$(LDSCRIPTDIR)
+ 	$(INSTALL) -d $(DESTDIR)$(BINDIR)
+-	$(INSTALL) -m 644 -t $(DESTDIR)$(HEADERDIR) $(INSTALL_HEADERS)
++	$(INSTALL) -m 644 $(INSTALL_HEADERS) $(DESTDIR)$(HEADERDIR)
+ 	$(INSTALL) -m 644 $(INSTALL_LDSCRIPTS:%=ldscripts/%) $(DESTDIR)$(LDSCRIPTDIR)
+ 	for x in $(INSTALL_OBJSCRIPT); do \
+ 		$(INSTALL) -m 755 objscript.$$x $(DESTDIR)$(BINDIR)/$$x; done
diff --git a/package/libhugetlbfs/patches/patch-morecore_c b/package/libhugetlbfs/patches/patch-morecore_c
deleted file mode 100644
index 61651fbe0..000000000
--- a/package/libhugetlbfs/patches/patch-morecore_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libhugetlbfs-2.11.orig/morecore.c	2010-12-16 18:38:22.000000000 +0100
-+++ libhugetlbfs-2.11/morecore.c	2011-01-22 21:18:44.018658436 +0100
-@@ -268,7 +268,7 @@ void hugetlbfs_setup_morecore(void)
- 	INFO("setup_morecore(): heapaddr = 0x%lx\n", heapaddr);
- 
- 	heaptop = heapbase = (void *)heapaddr;
--	__morecore = &hugetlbfs_morecore;
-+	morecore = &hugetlbfs_morecore;
- 
- 	/* Set some allocator options more appropriate for hugepages */
- 
diff --git a/package/libhugetlbfs/patches/patch-version b/package/libhugetlbfs/patches/patch-version
index 08c11d193..c10c9d4f4 100644
--- a/package/libhugetlbfs/patches/patch-version
+++ b/package/libhugetlbfs/patches/patch-version
@@ -1,5 +1,5 @@
 --- libhugetlbfs-2.11.orig/version	2010-12-16 19:14:12.000000000 +0100
-+++ libhugetlbfs-2.11/version	2011-01-22 21:09:48.624905626 +0100
++++ libhugetlbfs-2.11/version	2011-02-27 18:53:06.000000000 +0100
 @@ -1 +1 @@
 -2.11
-+commit<f475340970f58d3643bdd7e3cec809dc1fa3e908>
++commit<83deab600c0eb6c022ebb82052f621d5c4be2b1c>
diff --git a/package/libnet/patches/autotool.patch b/package/libnet/patches/autotool.patch
index dc6547b1f..4d9a5dbb1 100644
--- a/package/libnet/patches/autotool.patch
+++ b/package/libnet/patches/autotool.patch
@@ -52457,7 +52457,7 @@ diff -Nur libnet-1.1.5.orig/ltmain.sh libnet-1.1.5/ltmain.sh
 -      # -F/path gives path to uninstalled frameworks, gcc on darwin
 -      # @file GCC response files
 -      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto*)
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
 +If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
 +using \`ar' and \`ranlib', or on Windows using \`lib'.
  
@@ -58765,7 +58765,7 @@ diff -Nur libnet-1.1.5.orig/ltmain.sh libnet-1.1.5/ltmain.sh
 +      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
 +      # @file GCC response files
 +      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto*)
 +        func_quote_for_eval "$arg"
 +	arg="$func_quote_for_eval_result"
 +        func_append compile_command " $arg"
diff --git a/package/libnfnetlink/patches/autotool.patch b/package/libnfnetlink/patches/autotool.patch
index d650a7b98..ad762d420 100644
--- a/package/libnfnetlink/patches/autotool.patch
+++ b/package/libnfnetlink/patches/autotool.patch
@@ -43568,7 +43568,7 @@ diff -Nur libnfnetlink-1.0.0.orig/ltmain.sh libnfnetlink-1.0.0/ltmain.sh
 -      # -F/path gives path to uninstalled frameworks, gcc on darwin
 -      # @file GCC response files
 -      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto*)
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
 +      uninstall)
 +        $ECHO \
 +"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
@@ -49872,7 +49872,7 @@ diff -Nur libnfnetlink-1.0.0.orig/ltmain.sh libnfnetlink-1.0.0/ltmain.sh
 +      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
 +      # @file GCC response files
 +      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto*)
 +        func_quote_for_eval "$arg"
 +	arg="$func_quote_for_eval_result"
 +        func_append compile_command " $arg"
diff --git a/package/libxkbfile/patches/autotool.patch b/package/libxkbfile/patches/autotool.patch
index 53bef0c18..e07aa9701 100644
--- a/package/libxkbfile/patches/autotool.patch
+++ b/package/libxkbfile/patches/autotool.patch
@@ -49727,7 +49727,7 @@ diff -Nur libxkbfile-1.0.6.orig/ltmain.sh libxkbfile-1.0.6/ltmain.sh
 -      # -F/path gives path to uninstalled frameworks, gcc on darwin
 -      # @file GCC response files
 -      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto*)
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
 +      uninstall)
 +        $ECHO \
 +"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
@@ -56029,7 +56029,7 @@ diff -Nur libxkbfile-1.0.6.orig/ltmain.sh libxkbfile-1.0.6/ltmain.sh
 +      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
 +      # @file GCC response files
 +      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto*)
 +        func_quote_for_eval "$arg"
 +	arg="$func_quote_for_eval_result"
 +        func_append compile_command " $arg"
diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile
index 922297112..351797045 100644
--- a/package/lighttpd/Makefile
+++ b/package/lighttpd/Makefile
@@ -4,12 +4,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		lighttpd
-PKG_VERSION:=		1.4.25
+PKG_VERSION:=		1.4.28
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		87e936ec272ddaba8a2fdfecd8c6b704
+PKG_MD5SUM:=		202d36efc6324adb95a3600d2826ec6a
 PKG_DESCR:=		a lightweight web server
 PKG_SECTION:=		www
-PKG_DEPENDS:=		libxml2 libsqlite libpcre libopenssl
+PKG_DEPENDS:=		libpcre libxml2 libsqlite libopenssl
 PKG_BUILDDEP:=		pcre libxml2 sqlite openssl
 PKG_URL:=		http://www.lighttpd.net/
 PKG_SITES:=		http://download.lighttpd.net/lighttpd/releases-1.4.x/
@@ -70,8 +70,7 @@ $(eval $(call PKG_mod_template,LIGHTTPD_MOD_WEBDAV,webdav))
 
 TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/usr/include/libxml2
 CONFIGURE_ENV+=		PCRE_LIB="-lpcre"
-CONFIGURE_ARGS+=	\
-			--libdir=/usr/lib/lighttpd \
+CONFIGURE_ARGS+=	--libdir=/usr/lib/lighttpd \
 			--sysconfdir=/etc/lighttpd \
 			--without-attr \
 			--without-bzip2 \
@@ -81,19 +80,21 @@ CONFIGURE_ARGS+=	\
 			--without-lua \
 			--without-memcache \
 			--without-mysql \
-			--with-pcre \
 			--without-valgrind \
+			--with-pcre \
 			--with-webdav-props \
 			--with-openssl='${STAGING_TARGET_DIR}/usr'
 
 post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
-	install -m0755 -d $(IDIR_LIGHTTPD)/etc
-	install -m0644 ./files/lighttpd.conf $(IDIR_LIGHTTPD)/etc/
-	install -m0755 -d $(IDIR_LIGHTTPD)/usr/lib/lighttpd
+	${INSTALL_DIR} $(IDIR_LIGHTTPD)/etc/lighttpd/conf.d
+	${INSTALL_DATA} ./files/lighttpd.conf $(IDIR_LIGHTTPD)/etc/lighttpd
+	${CP} ${WRKBUILD}/doc/config/conf.d/*.conf \
+		$(IDIR_LIGHTTPD)/etc/lighttpd/conf.d
+	${INSTALL_DIR} $(IDIR_LIGHTTPD)/usr/lib/lighttpd
 	for m in dirlisting indexfile staticfile; do \
 		$(CP) $(WRKINST)/usr/lib/lighttpd/mod_$$m.so $(IDIR_LIGHTTPD)/usr/lib/lighttpd/ ; \
 	done
-	install -m0755 -d $(IDIR_LIGHTTPD)/usr/sbin
-	$(CP) $(WRKINST)/usr/sbin/lighttpd $(IDIR_LIGHTTPD)/usr/sbin/
+	${INSTALL_DIR} $(IDIR_LIGHTTPD)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/lighttpd $(IDIR_LIGHTTPD)/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lighttpd/files/lighttpd.conf b/package/lighttpd/files/lighttpd.conf
index b97b39120..efe96be4f 100644
--- a/package/lighttpd/files/lighttpd.conf
+++ b/package/lighttpd/files/lighttpd.conf
@@ -1,217 +1,426 @@
-# lighttpd configuration file
-# 
-## modules to load
-# all other module should only be loaded if really neccesary
-# - saves some time
-# - saves memory
-#server.modules = ( 
-#	"mod_rewrite", 
-#	"mod_redirect", 
-#	"mod_alias", 
-#	"mod_auth", 
-#	"mod_status", 
-#	"mod_setenv",
-#	"mod_fastcgi",
-#	"mod_proxy",
-#	"mod_simple_vhost",
-#	"mod_cgi",
-#	"mod_ssi",
-#	"mod_usertrack",
-#	"mod_expire"
-#)
-
-## a static document-root, for virtual-hosting take look at the 
-## server.virtual-* options
-server.document-root = "/tmp/"
-
-## where to send error-messages to
-#server.errorlog = "/var/log/lighttpd/error.log"
+#######################################################################
+##
+## /etc/lighttpd/lighttpd.conf
+##
+## check /etc/lighttpd/conf.d/*.conf for the configuration of modules.
+##
+#######################################################################
 
-## files to check for if .../ is requested
-index-file.names = ( "index.html", "default.html", "index.htm", "default.htm" )
+#######################################################################
+##
+## Some Variable definition which will make chrooting easier.
+##
+## if you add a variable here. Add the corresponding variable in the
+## chroot example aswell.
+##
+var.log_root    = "/var/log/lighttpd"
+var.server_root = "/srv/www"
+var.state_dir   = "/var/run"
+var.home_dir    = "/var/lib/lighttpd"
+var.conf_dir    = "/etc/lighttpd"
 
-## mimetype mapping
-mimetype.assign = (  
-	".pdf"   => "application/pdf",
-	".class" => "application/octet-stream",
-	".pac"   => "application/x-ns-proxy-autoconfig",
-	".swf"   => "application/x-shockwave-flash",
-	".wav"   => "audio/x-wav",
-	".gif"   => "image/gif",
-	".jpg"   => "image/jpeg",
-	".jpeg"  => "image/jpeg",
-	".png"   => "image/png",
-	".css"   => "text/css",
-	".html"  => "text/html",
-	".htm"   => "text/html",
-	".js"    => "text/javascript",
-	".txt"   => "text/plain",
-	".dtd"   => "text/xml",
-	".xml"   => "text/xml"
- )
-
-## Use the "Content-Type" extended attribute to obtain mime type if possible
-#mimetypes.use-xattr = "enable"
-
-## send a different Server: header
-## be nice and keep it at lighttpd
-#server.tag = "lighttpd"
+## 
+## run the server chrooted.
+## 
+## This requires root permissions during startup.
+##
+## If you run Chrooted set the the variables to directories relative to
+## the chroot dir.
+##
+## example chroot configuration:
+## 
+#var.log_root    = "/logs"
+#var.server_root = "/"
+#var.state_dir   = "/run"
+#var.home_dir    = "/lib/lighttpd"
+#var.vhosts_dir  = "/vhosts"
+#var.conf_dir    = "/etc"
+#
+#server.chroot   = "/srv/www"
 
-$HTTP["url"] =~ "\.pdf$" {
-	server.range-requests = "disable"
-}
+##
+## Some additional variables to make the configuration easier
+##
 
 ##
-# which extensions should not be handle via static-file transfer
-#
-# .php, .pl, .fcgi are most often handled by mod_fastcgi or mod_cgi
-static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
+## Base directory for all virtual hosts
+##
+## used in:
+## conf.d/evhost.conf
+## conf.d/simple_vhost.conf
+## vhosts.d/vhosts.template
+##
+var.vhosts_dir  = server_root + "/vhosts"
 
-######### Options that are good to be but not neccesary to be changed #######
+##
+## Cache for mod_compress
+##
+## used in:
+## conf.d/compress.conf
+##
+var.cache_dir   = "/var/cache/lighttpd"
 
-## bind to port (default: 80)
-#server.port = 81
+##
+## Base directory for sockets.
+##
+## used in:
+## conf.d/fastcgi.conf
+## conf.d/scgi.conf
+##
+var.socket_dir  = home_dir + "/sockets"
+
+##
+#######################################################################
+
+#######################################################################
+##
+## Load the modules.
+include "modules.conf"
+
+##
+#######################################################################
+
+#######################################################################
+##
+##  Basic Configuration
+## ---------------------
+##
+server.port = 80
 
-## bind to localhost (default: all interfaces)
+##
+## Use IPv6?
+##
+server.use-ipv6 = "enable"
+
+##
+## bind to a specific IP
+##
 #server.bind = "localhost"
 
-## error-handler for status 404
-#server.error-handler-404 = "/error-handler.html"
-#server.error-handler-404 = "/error-handler.php"
+##
+## Run as a different username/groupname.
+## This requires root permissions during startup. 
+##
+server.username  = "lighttpd"
+server.groupname = "lighttpd"
+
+## 
+## enable core files.
+##
+#server.core-files = "disable"
+
+##
+## Document root
+##
+server.document-root = server_root + "/htdocs"
 
-## to help the rc.scripts
-server.pid-file = "/var/run/lighttpd.pid"
+##
+## The value for the "Server:" response field.
+##
+## It would be nice to keep it at "lighttpd".
+##
+#server.tag = "lighttpd"
 
+##
+## store a pid file
+##
+server.pid-file = state_dir + "/lighttpd.pid"
+
+##
+#######################################################################
 
-###### virtual hosts
+#######################################################################
 ##
-##   If you want name-based virtual hosting add the next three settings and load
-##   mod_simple_vhost
+##  Logging Options
+## ------------------
 ##
-## document-root =
-##   virtual-server-root + virtual-server-default-host + virtual-server-docroot or
-##   virtual-server-root + http-host + virtual-server-docroot
+## all logging options can be overwritten per vhost.
 ##
-#simple-vhost.server-root = "/home/weigon/wwwroot/servers/"
-#simple-vhost.default-host = "grisu.home.kneschke.de"
-#simple-vhost.document-root = "/pages/"
+## Path to the error log file
+##
+server.errorlog             = log_root + "/error.log"
 
+##
+## If you want to log to syslog you have to unset the 
+## server.errorlog setting and uncomment the next line.
+##
+#server.errorlog-use-syslog = "enable"
 
+##
+## Access log config
 ## 
-## Format: <errorfile-prefix><status>.html
-## -> ..../status-404.html for 'File not found'
-#server.errorfile-prefix = "/www/error-"
+include "conf.d/access_log.conf"
 
-## virtual directory listings
-#server.dir-listing = "enable"
+##
+## The debug options are moved into their own file.
+## see conf.d/debug.conf for various options for request debugging.
+##
+include "conf.d/debug.conf"
 
-## send unhandled HTTP-header headers to error-log
-#debug.dump-unknown-headers = "enable"
+##
+#######################################################################
 
-### only root can use these options
-#
-# chroot() to directory (default: no chroot() )
-#server.chroot = "/"
-
-## change uid to <uid> (default: don't care)
-#server.username = "nobody"
-
-## change uid to <uid> (default: don't care)
-#server.groupname = "nobody"
-
-#### compress module
-#compress.cache-dir          = "/dev/null/"
-#compress.filetype           = ("text/plain", "text/html")
-
-#### proxy module
-## read proxy.txt for more info
-#proxy.server = (
-#	".php" => (
-#		"localhost" => (
-#			"host" => "192.168.0.101",
-#			"port" => 80
-#		)
-#	)
-#)
-
-#### fastcgi module
-## read fastcgi.txt for more info
-#fastcgi.server = (
-#	".php" => (
-#		"localhost" => (
-#			"socket" => "/tmp/php-fastcgi.socket",
-#			"bin-path" => "/usr/local/bin/php"
-#		)
-#	)
-#)
-
-#### CGI module
-#cgi.assign = ( ".pl"  => "/usr/bin/perl", ".cgi" => "/usr/bin/perl" )
-
-#### SSL engine
-#ssl.engine = "enable"
-#ssl.pemfile = "server.pem"
-
-#### status module
-#status.status-url = "/server-status"
-#status.config-url = "/server-config"
-
-#### auth module
-## read authentification.txt for more info
-#auth.backend = "plain"
-#auth.backend.plain.userfile = "lighttpd.user"
-#auth.backend.plain.groupfile = "lighttpd.group"
-#auth.require = (
-#	"/server-status" => ( 
-#		"method"  => "digest",
-#		"realm"   => "download archiv",
-#		"require" => "group=www|user=jan|host=192.168.2.10"
-#	),
-#	"/server-info" => ( 
-#		"method"  => "digest",
-#		"realm"   => "download archiv",
-#		"require" => "group=www|user=jan|host=192.168.2.10"
-#	)
-#)
-
-#### url handling modules (rewrite, redirect, access)
-#url.rewrite = ( "^/$" => "/server-status" )
-#url.redirect = ( "^/wishlist/(.+)" => "http://www.123.org/$1" )
-
-#### both rewrite/redirect support back reference to regex conditional using %n
+#######################################################################
+##
+##  Tuning/Performance
+## --------------------
+##
+## corresponding documentation:
+## http://www.lighttpd.net/documentation/performance.html
+##
+## set the event-handler (read the performance section in the manual)
+##
+## possible options on linux are:
+##
+## select
+## poll
+## linux-sysepoll
+##
+## linux-sysepoll is recommended on kernel 2.6.
+##
+server.event-handler = "linux-sysepoll"
+
+##
+## The basic network interface for all platforms at the syscalls read()
+## and write(). Every modern OS provides its own syscall to help network
+## servers transfer files as fast as possible 
+##
+## linux-sendfile - is recommended for small files.
+## writev         - is recommended for sending many large files
+##
+server.network-backend = "linux-sendfile"
+
+##
+## As lighttpd is a single-threaded server, its main resource limit is
+## the number of file descriptors, which is set to 1024 by default (on
+## most systems).
+##
+## If you are running a high-traffic site you might want to increase this
+## limit by setting server.max-fds.
+##
+## Changing this setting requires root permissions on startup. see
+## server.username/server.groupname.
+##
+## By default lighttpd would not change the operation system default.
+## But setting it to 2048 is a better default for busy servers.
+##
+server.max-fds = 2048
+
+##
+## Stat() call caching.
+##
+## lighttpd can utilize FAM/Gamin to cache stat call.
+##
+## possible values are:
+## disable, simple or fam.
+##
+server.stat-cache-engine = "simple"
+
+##
+## Fine tuning for the request handling
+##
+## max-connections == max-fds/2 (maybe /3)
+## means the other file handles are used for fastcgi/files
+##
+server.max-connections = 1024
+
+##
+## How many seconds to keep a keep-alive connection open,
+## until we consider it idle. 
+##
+## Default: 5
+##
+#server.max-keep-alive-idle = 5
+
+##
+## How many keep-alive requests until closing the connection.
+##
+## Default: 16
+##
+#server.max-keep-alive-requests = 16
+
+##
+## Maximum size of a request in kilobytes.
+## By default it is unlimited (0).
+##
+## Uploads to your server cant be larger than this value.
+##
+#server.max-request-size = 0
+
+##
+## Time to read from a socket before we consider it idle.
+##
+## Default: 60
+##
+#server.max-read-idle = 60
+
+##
+## Time to write to a socket before we consider it idle.
+##
+## Default: 360
+##
+#server.max-write-idle = 360
+
+##
+##  Traffic Shaping 
+## -----------------
+##
+## see /usr/share/doc/lighttpd/traffic-shaping.txt
+##
+## Values are in kilobyte per second.
+##
+## Keep in mind that a limit below 32kB/s might actually limit the
+## traffic to 32kB/s. This is caused by the size of the TCP send
+## buffer. 
+##
+## per server:
+##
+#server.kbytes-per-second = 128
+
+##
+## per connection:
+##
+#connection.kbytes-per-second = 32
+
+##
+#######################################################################
+
+#######################################################################
+##
+##  Filename/File handling
+## ------------------------
+
+##
+## files to check for if .../ is requested
+## index-file.names            = ( "index.php", "index.rb", "index.html",
+##                                 "index.htm", "default.htm" )
+##
+index-file.names += (
+  "index.xhtml", "index.html", "index.htm", "default.htm", "index.php"
+)
+
+##
+## deny access the file-extensions
+##
+## ~    is for backupfiles from vi, emacs, joe, ...
+## .inc is often used for code includes which should in general not be part
+##      of the document-root
+url.access-deny             = ( "~", ".inc" )
+
+##
+## disable range requests for pdf files
+## workaround for a bug in the Acrobat Reader plugin.
+##
+$HTTP["url"] =~ "\.pdf$" {
+  server.range-requests = "disable"
+}
+
+##
+## url handling modules (rewrite, redirect)
+##
+#url.rewrite                = ( "^/$"             => "/server-status" )
+#url.redirect               = ( "^/wishlist/(.+)" => "http://www.example.com/$1" )
+
+##
+## both rewrite/redirect support back reference to regex conditional using %n
+##
 #$HTTP["host"] =~ "^www\.(.*)" {
-#	url.redirect = ( "^/(.*)" => "http://%1/$1" )
+#  url.redirect            = ( "^/(.*)" => "http://%1/$1" )
 #}
 
-#### expire module
-#expire.url = ( "/buggy/" => "access 2 hours", "/asdhas/" => "access plus 1 seconds 2 minutes")
-
-#### ssi
-#ssi.extension = ( ".shtml" )
-
-#### setenv
-#setenv.add-request-header  = ( "TRAV_ENV" => "mysql://user@host/db" )
-#setenv.add-response-header = ( "X-Secret-Message" => "42" )
-
-#### variable usage:
-## variable name without "." is auto prefixed by "var." and becomes "var.bar"
-#bar = 1
-#var.mystring = "foo"
-
-## integer add
-#bar += 1
-## string concat, with integer cast as string, result: "www.foo1.com"
-#server.name = "www." + mystring + var.bar + ".com"
-## array merge
-#index-file.names = (foo + ".php") + index-file.names
-#index-file.names += (foo + ".php")
-
-#### include
-#include /etc/lighttpd/lighttpd-inc.conf
-## same as above if you run: "lighttpd -f /etc/lighttpd/lighttpd.conf"
-#include "lighttpd-inc.conf"
-
-#### include_shell
-#include_shell "echo var.a=1"
-## the above is same as:
-#var.a=1
+##
+## which extensions should not be handle via static-file transfer
+##
+## .php, .pl, .fcgi are most often handled by mod_fastcgi or mod_cgi
+##
+static-file.exclude-extensions = ( ".php", ".pl", ".fcgi", ".scgi" )
+
+##
+## error-handler for status 404
+##
+#server.error-handler-404   = "/error-handler.html"
+#server.error-handler-404   = "/error-handler.php"
+
+##
+## Format: <errorfile-prefix><status-code>.html
+## -> ..../status-404.html for 'File not found'
+##
+#server.errorfile-prefix    = "/srv/www/htdocs/errors/status-"
+
+##
+## mimetype mapping
+##
+include "conf.d/mime.conf"
+
+##
+## directory listing configuration
+##
+include "conf.d/dirlisting.conf"
+
+##
+## Should lighttpd follow symlinks?
+## 
+server.follow-symlink = "enable"
+
+##
+## force all filenames to be lowercase?
+##
+#server.force-lowercase-filenames = "disable"
+
+##
+## defaults to /var/tmp as we assume it is a local harddisk
+##
+server.upload-dirs = ( "/var/tmp" )
+
+##
+#######################################################################
+
+
+#######################################################################
+##
+##  SSL Support
+## ------------- 
+##
+## To enable SSL for the whole server you have to provide a valid
+## certificate and have to enable the SSL engine.::
+##
+##   ssl.engine = "enable"
+##   ssl.pemfile = "/path/to/server.pem"
+##
+## The HTTPS protocol does not allow you to use name-based virtual
+## hosting with SSL. If you want to run multiple SSL servers with
+## one lighttpd instance you must use IP-based virtual hosting: ::
+##
+##   $SERVER["socket"] == "10.0.0.1:443" {
+##     ssl.engine                  = "enable"
+##     ssl.pemfile                 = "/etc/ssl/private/www.example.com.pem"
+##     server.name                 = "www.example.com"
+##
+##     server.document-root        = "/srv/www/vhosts/example.com/www/"
+##   }
+##
+
+## If you have a .crt and a .key file, cat them together into a
+## single PEM file:
+## $ cat /etc/ssl/private/lighttpd.key /etc/ssl/certs/lighttpd.crt \
+##   > /etc/ssl/private/lighttpd.pem
+##
+#ssl.pemfile = "/etc/ssl/private/lighttpd.pem"
+
+##
+## optionally pass the CA certificate here.
+##
+##
+#ssl.ca-file = ""
+
+##
+#######################################################################
+
+#######################################################################
+##
+## custom includes like vhosts.
+##
+#include "conf.d/config.conf"
+#include_shell "cat /etc/lighttpd/vhosts.d/*.conf"
+##
+#######################################################################
diff --git a/package/lighttpd/files/lighttpd.conffiles b/package/lighttpd/files/lighttpd.conffiles
index e90f8e19d..29b503c6c 100644
--- a/package/lighttpd/files/lighttpd.conffiles
+++ b/package/lighttpd/files/lighttpd.conffiles
@@ -1 +1 @@
-/etc/lighttpd.conf
+/etc/lighttpd/lighttpd.conf
diff --git a/package/lighttpd/files/lighttpd.postinst b/package/lighttpd/files/lighttpd.postinst
index dbf355c4b..e77dadeee 100644
--- a/package/lighttpd/files/lighttpd.postinst
+++ b/package/lighttpd/files/lighttpd.postinst
@@ -1,4 +1,4 @@
 #!/bin/sh
 . $IPKG_INSTROOT/etc/functions.sh
 add_rcconf lighttpd lighttpd NO
-add_rcconf lighttpd_flags lighttpd_flags "-f /etc/lighttpd.conf"
+add_rcconf lighttpd_flags lighttpd_flags "-f /etc/lighttpd/lighttpd.conf"
diff --git a/package/maradns/Makefile b/package/maradns/Makefile
index 097435650..b6bdfe666 100644
--- a/package/maradns/Makefile
+++ b/package/maradns/Makefile
@@ -23,7 +23,7 @@ FAKE_FLAGS+=		PREFIX="${WRKINST}/usr" \
 			RPM_BUILD_ROOT="${WRKINST}"
 
 pre-install:
-	@mkdir -p ${WRKINST}/usr/man/man{1,5,8}
+	@mkdir -p ${WRKINST}/usr/{sbin,bin,man/man{1,5,8}}
 
 do-configure:
 	(cd ${WRKBUILD} && ./configure);
diff --git a/package/mgetty/patches/patch-Makefile b/package/mgetty/patches/patch-Makefile
index 9741f0f29..41f1203f0 100644
--- a/package/mgetty/patches/patch-Makefile
+++ b/package/mgetty/patches/patch-Makefile
@@ -1,5 +1,5 @@
 --- mgetty-1.1.36.orig/Makefile	2007-06-15 13:15:56.000000000 +0200
-+++ mgetty-1.1.36/Makefile	2011-01-21 17:07:06.158658312 +0100
++++ mgetty-1.1.36/Makefile	2011-02-28 21:22:07.000000000 +0100
 @@ -4,7 +4,7 @@
  #
  # this is the C compiler to use (on SunOS, the standard "cc" does not
@@ -18,6 +18,15 @@
  #CFLAGS=-O -DSVR4
  #CFLAGS=-O -DSVR4 -DSVR42
  #CFLAGS=-O -DUSE_POLL
+@@ -143,7 +143,7 @@ CFLAGS=-O2 -Wall -pipe
+ # 	"utmp.o: unresolved symbol _login"
+ # For Linux, add "-lutil" if the linker complains about "updwtmp".
+ #
+-LDFLAGS=
++LDFLAGS?=
+ LIBS=
+ #LIBS=-lprot -lsocket				# SCO Unix
+ #LIBS=-lsocket
 @@ -164,7 +164,9 @@ LIBS=
  #
  # if your systems doesn't have one, use the shell script that I provide
diff --git a/package/php/Makefile b/package/php/Makefile
index e407ae1ba..ade1203b3 100644
--- a/package/php/Makefile
+++ b/package/php/Makefile
@@ -19,21 +19,37 @@ PKG_SUBPKGS:=		PHP PHP_CLI PHP_FASTCGI
 PKGSD_PHP_FASTCGI:=	PHP for FastCGI usage
 PKGSD_PHP_CLI:=		PHP CLI
 
-PKGSB_MOD_CURL:=	curl
-PKGSB_MOD_GD:=		libgd libpng
-PKGSB_MOD_GMP:=		gmp
-PKGSB_MOD_LDAP:=	openldap
-PKGSB_MOD_MYSQL:=	mysql
-PKGSB_MOD_PGSQL:=	postgresql
-PKGSB_MOD_PCRE:=	pcre
-PKGSB_MOD_SQLITE:=	sqlite
-PKGSB_MOD_XML:=		expat
+PKG_FLAVOURS_PHP:=	MOD_CURL MOD_GD MOD_GMP MOD_LDAP MOD_MYSQL
+PKG_FLAVOURS_PHP+=	MOD_PGSQL MOD_SQLITE MOD_XML
+
+PKGFD_MOD_CURL:=	Curl support
+PKGFB_MOD_CURL:=	curl
+PKGFS_MOD_CURL:=	libcurl
+PKGFD_MOD_GD:=		Gd support
+PKGFB_MOD_GD:=		libgd libpng
+PKGFS_MOD_GD:=		libgd libpng
+PKGFD_MOD_GMP:=		GMP support
+PKGFB_MOD_GMP:=		gmp
+PKGFS_MOD_GMP:=		libgmp
+PKGFD_MOD_LDAP:=	LDAP support
+PKGFB_MOD_LDAP:=	openldap
+PKGFS_MOD_LDAP:=	libopenldap
+PKGFD_MOD_MYSQL:=	MySQL support
+PKGFS_MOD_MYSQL:=	libmysqlclient
+PKGFB_MOD_MYSQL:=	mysql
+PKGFD_MOD_PGSQL:=	PGSQL support
+PKGFB_MOD_PGSQL:=	postgresql
+PKGFS_MOD_PGSQL:=	libpq
+PKGFD_MOD_SQLITE:=	SQlite support
+PKGFB_MOD_SQLITE:=	sqlite
+PKGFS_MOD_SQLITE:=	libsqlite
+PKGFD_MOD_XML:=		XML support
+PKGFB_MOD_XML:=		expat
+PKGFS_MOD_XML:=		libexpat
 
 PKG_ARCH_DEPENDS:=	!cris
 PKG_HOST_DEPENDS:=	!cygwin
 
-# FIX PKG_DEPENDS
-
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,PHP,php,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -47,44 +63,43 @@ INSTALL_MODS_$${ADK_PACKAGE_${1}}+=    ${2}-install
 ${2}-install:
 	${INSTALL_DIR} $$(IDIR_$(1))/usr/lib/php
 	${INSTALL_DATA} $(WRKBUILD)/modules/$(2).so $$(IDIR_$(1))/usr/lib/php
-
 endef
 
 PKG_CONFIGURE_OPTS:=	\
-	--without-pear \
-	--disable-spl \
 	--with-config-file-path=/etc \
 	--enable-magic-quotes \
-	--disable-short-tags \
-	--disable-ctype \
-	--disable-dom \
 	--enable-ftp=shared \
-	--without-gettext \
-	--without-iconv \
-	--disable-libxml \
-	--without-libxml-dir \
+	--enable-session=shared \
+	--enable-sockets=shared \
+	--enable-cli \
+	--enable-cgi \
+	--enable-fastcgi \
+	--enable-force-cgi-redirect \
+	--enable-discard-path \
 	--disable-mbstring \
 	--disable-mbregex \
 	--disable-phar \
-	--with-openssl=shared,"$(STAGING_TARGET_DIR)/usr" \
-	--with-kerberos=no \
-	--with-openssl-dir="$(STAGING_TARGET_DIR)/usr" \
-	--enable-session=shared \
+	--disable-libxml \
+	--disable-spl \
+	--disable-short-tags \
+	--disable-ctype \
 	--disable-simplexml \
 	--disable-soap \
 	--disable-fileinfo \
-	--enable-sockets=shared \
 	--disable-tokenizer \
 	--disable-filter \
 	--disable-xmlreader \
 	--disable-xmlwriter \
+	--disable-dom \
+	--without-pear \
+	--without-gettext \
+	--without-iconv \
+	--without-libxml-dir \
+	--with-kerberos=no \
+	--with-openssl=shared,"$(STAGING_TARGET_DIR)/usr" \
+	--with-openssl-dir="$(STAGING_TARGET_DIR)/usr" \
 	--with-zlib="$(STAGING_TARGET_DIR)/usr" \
 	--with-zlib-dir="$(STAGING_TARGET_DIR)/usr" \
-	--enable-cli \
-	--enable-cgi \
-	--enable-fastcgi \
-	--enable-force-cgi-redirect \
-	--enable-discard-path \
 
 ifneq ($(ADK_PACKAGE_PHP_MOD_CURL),)
 PKG_CONFIGURE_OPTS+=	--with-curl=shared,"$(STAGING_TARGET_DIR)/usr"
@@ -93,14 +108,14 @@ PKG_CONFIGURE_OPTS+=	--without-curl
 endif
 ifneq ($(ADK_PACKAGE_PHP_MOD_GD),)
 PKG_CONFIGURE_OPTS+=	--with-gd=shared,"$(STAGING_TARGET_DIR)/usr" \
-	--without-freetype-dir \
-	--with-jpeg-dir="$(STAGING_TARGET_DIR)/usr" \
-	--with-png-dir="$(STAGING_TARGET_DIR)/usr" \
-	--without-xpm-dir \
-	--without-ttf \
-	--without-t1lib	\
-	--enable-gd-native-ttf \
-	--disable-gd-jis-conv
+			--with-jpeg-dir="$(STAGING_TARGET_DIR)/usr" \
+			--with-png-dir="$(STAGING_TARGET_DIR)/usr" \
+			--without-freetype-dir \
+			--without-xpm-dir \
+			--without-ttf \
+			--without-t1lib	\
+			--enable-gd-native-ttf \
+			--disable-gd-jis-conv
 else
 PKG_CONFIGURE_OPTS+=	--without-gd
 endif
@@ -111,7 +126,7 @@ PKG_CONFIGURE_OPTS+=	--without-gmp
 endif
 ifneq ($(ADK_PACKAGE_PHP_MOD_LDAP),)
 PKG_CONFIGURE_OPTS+=	--with-ldap=shared,"$(STAGING_TARGET_DIR)/usr" \
-	--with-ldap-sasl="$(STAGING_TARGET_DIR)/usr"
+			--with-ldap-sasl="$(STAGING_TARGET_DIR)/usr"
 else
 PKG_CONFIGURE_OPTS+=	--without-ldap
 endif
@@ -120,11 +135,6 @@ PKG_CONFIGURE_OPTS+=	--with-mysql=shared,"$(STAGING_TARGET_DIR)/usr"
 else
 PKG_CONFIGURE_OPTS+=	--without-mysql
 endif
-ifneq ($(ADK_PACKAGE_PHP_MOD_PCRE),)
-PKG_CONFIGURE_OPTS+=	--with-pcre-dir=shared,"$(STAGING_TARGET_DIR)/usr"
-else
-PKG_CONFIGURE_OPTS+=	--without-pcre-dir
-endif
 ifneq ($(ADK_PACKAGE_PHP_MOD_PGSQL),)
 PKG_CONFIGURE_OPTS+=	--with-pgsql=shared,"$(STAGING_TARGET_DIR)/usr"
 else
@@ -139,7 +149,7 @@ PKG_CONFIGURE_OPTS+=	--without-sqlite
 endif
 ifneq ($(ADK_PACKAGE_PHP_MOD_XML),)
 PKG_CONFIGURE_OPTS+=	--enable-xml=shared,"$(STAGING_TARGET_DIR)/usr" \
-	--with-libexpat-dir="$(STAGING_TARGET_DIR)/usr"
+			--with-libexpat-dir="$(STAGING_TARGET_DIR)/usr"
 else
 PKG_CONFIGURE_OPTS+=	--disable-xml
 endif
@@ -151,7 +161,6 @@ $(eval $(call PKG_template,PHP_MOD_GMP,php-mod-gmp,$(PKG_VERSION)-${PKG_RELEASE}
 $(eval $(call PKG_template,PHP_MOD_LDAP,php-mod-ldap,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_MYSQL,php-mod-mysql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_OPENSSL,php-mod-openssl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-#$(eval $(call PKG_template,PHP_MOD_PCRE,php-mod-pcre,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_PGSQL,php-mod-pgsql,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_SESSION,php-mod-session,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,PHP_MOD_SOCKETS,php-mod-sockets,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -172,20 +181,19 @@ $(eval $(call PKG_mod_template,PHP_MOD_SQLITE,pdo))
 $(eval $(call PKG_mod_template,PHP_MOD_XML,xml))
 
 INSTALL_STYLE:=		manual
-
 TARGET_LDFLAGS+=	-L$(STAGING_TARGET_DIR)/usr/lib/mysql
 CONFIGURE_ENV+=		LIBS="-ldl"
 CONFIGURE_ARGS+=	$(PKG_CONFIGURE_OPTS)
 
 do-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
 	${INSTALL_DIR} $(IDIR_PHP)/etc
-	${INSTALL_DATA} ./files/php.ini $(IDIR_PHP)/etc/
+	${INSTALL_DATA} ./files/php.ini $(IDIR_PHP)/etc
 	${INSTALL_DIR} $(IDIR_PHP_CLI)/usr/bin
 	${INSTALL_DIR} $(IDIR_PHP_CLI)/etc
-	${INSTALL_DATA} ./files/php.ini $(IDIR_PHP_CLI)/etc/
+	${INSTALL_DATA} ./files/php.ini $(IDIR_PHP_CLI)/etc
 	${INSTALL_BIN} $(WRKBUILD)/sapi/cli/php $(IDIR_PHP_CLI)/usr/bin/php
 	${INSTALL_DIR} $(IDIR_PHP_FASTCGI)/etc
-	${INSTALL_DATA} ./files/php.ini $(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
diff --git a/package/python2/Makefile b/package/python2/Makefile
index 60cb0c705..0af3abe5c 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -64,6 +64,5 @@ post-install:
 	-find ${IDIR_PYTHON2} -name "\*.pyc" -o -name "*\.pyo" -exec rm {} \;
 	# workaround, copy host python-config to target scripts directory
 	${CP} ${STAGING_HOST_DIR}/usr/bin/python*-config ${STAGING_TARGET_DIR}/scripts
-	${CP} ${STAGING_HOST_DIR}/usr/bin/python*-config ${STAGING_TARGET_DIR}/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/rdate/Makefile b/package/rdate/Makefile
index 0997d3db9..e4c428b58 100644
--- a/package/rdate/Makefile
+++ b/package/rdate/Makefile
@@ -23,6 +23,6 @@ MAKE_FILE=		GNUmakefile
 
 post-install:
 	${INSTALL_DIR} ${IDIR_RDATE}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/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
index 2cea98ffa..519d66f76 100644
--- a/package/rdate/patches/patch-GNUmakefile
+++ b/package/rdate/patches/patch-GNUmakefile
@@ -1,11 +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
++++ rdate/GNUmakefile	2011-02-28 22:42:06.000000000 +0100
+@@ -15,8 +15,8 @@ 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 -d ${DESTDIR}${BINDIR}/
 +	install -c -m 755 rdate ${DESTDIR}${BINDIR}/
  
  clean:
diff --git a/package/rpcbind/patches/autotool.patch b/package/rpcbind/patches/autotool.patch
index 4f71f8330..e29e7c6d8 100644
--- a/package/rpcbind/patches/autotool.patch
+++ b/package/rpcbind/patches/autotool.patch
@@ -44468,7 +44468,7 @@ diff -Nur rpcbind-0.2.0.orig/ltmain.sh rpcbind-0.2.0/ltmain.sh
 -      # -F/path gives path to uninstalled frameworks, gcc on darwin
 -      # @file GCC response files
 -      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto*)
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
 +      uninstall)
 +        $ECHO \
 +"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
@@ -50770,7 +50770,7 @@ diff -Nur rpcbind-0.2.0.orig/ltmain.sh rpcbind-0.2.0/ltmain.sh
 +      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
 +      # @file GCC response files
 +      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto*)
 +        func_quote_for_eval "$arg"
 +	arg="$func_quote_for_eval_result"
 +        func_append compile_command " $arg"
diff --git a/package/samba/Makefile b/package/samba/Makefile
index 273d84609..f083e0ac4 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		7c8d2a34b649380d5df838c3e030dbec
 PKG_DESCR:=		NetBIOS/SMB file and print server
 PKG_SECTION:=		net/fs
+PKG_BUILDDEP:=		gettext
+PKG_DEPENDS:=		libintl
 PKG_URL:=		http://www.samba.org/
 PKG_SITES:=		http://samba.org/samba/ftp/stable/
 
@@ -49,16 +51,16 @@ post-install:
 	${INSTALL_DIR} ${IDIR_SAMBA}/usr/lib/samba/{charset,vfs}
 	${INSTALL_DATA} ${WRKINST}/usr/lib/samba/charset/CP850.so \
 			${IDIR_SAMBA}/usr/lib/samba/charset
-	${INSTALL_DATA} ./files/smb.conf ${IDIR_SAMBA}/etc/samba/
+	${INSTALL_DATA} ./files/smb.conf ${IDIR_SAMBA}/etc/samba
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/{nmbd,smbd} ${IDIR_SAMBA}/usr/sbin
 	${CP} ${WRKINST}/usr/lib/samba/*.so* ${IDIR_SAMBA}/usr/lib/samba
 	${CP} ${WRKINST}/usr/lib/samba/vfs/*.so* ${IDIR_SAMBA}/usr/lib/samba/vfs
 	${INSTALL_DATA} ${WRKINST}/usr/lib/samba/*.dat ${IDIR_SAMBA}/usr/lib/samba
 	${INSTALL_DIR} ${IDIR_SAMBA_PASSWD}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/smbpasswd \
-		${IDIR_SAMBA_PASSWD}/usr/bin/
+		${IDIR_SAMBA_PASSWD}/usr/bin
 	${INSTALL_DIR} ${IDIR_SAMBA_CLIENT}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/smbclient \
-		${IDIR_SAMBA_CLIENT}/usr/bin/
+		${IDIR_SAMBA_CLIENT}/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/sox/Makefile b/package/sox/Makefile
new file mode 100644
index 000000000..012468e24
--- /dev/null
+++ b/package/sox/Makefile
@@ -0,0 +1,30 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		sox
+PKG_VERSION:=		14.3.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		b99871c7bbae84feac9d0d1f010331ba
+PKG_DESCR:=		Swiss Army knife of sound processing programs
+PKG_SECTION:=		multimedia
+PKG_BUILDDEP:=		zlib libmad lame alsa-lib libid3tag
+PKG_DEPENDS:=		zlib libmad liblame alsa-lib libid3tag
+PKG_URL:=		http://sox.sourceforge.net/
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=sox/}
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,SOX,sox,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+post-install:
+	$(INSTALL_DIR) $(IDIR_SOX)/usr/lib
+	${CP} ${WRKINST}/usr/lib/libsox.so* $(IDIR_SOX)/usr/lib
+	$(INSTALL_DIR) $(IDIR_SOX)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/sox $(IDIR_SOX)/usr/bin
+	cd ${IDIR_SOX}/usr/bin; for tgt in rec play; do \
+		ln sox $$tgt; \
+	done
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/sox/patches/patch-ltmain_sh b/package/sox/patches/patch-ltmain_sh
new file mode 100644
index 000000000..9abd0e2f4
--- /dev/null
+++ b/package/sox/patches/patch-ltmain_sh
@@ -0,0 +1,11 @@
+--- sox-14.3.1.orig/ltmain.sh	2009-04-04 05:44:19.000000000 +0200
++++ sox-14.3.1/ltmain.sh	2011-03-01 14:00:10.000000000 +0100
+@@ -4765,7 +4765,7 @@ func_mode_link ()
+       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+       # @file GCC response files
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto*)
+         func_quote_for_eval "$arg"
+ 	arg="$func_quote_for_eval_result"
+         func_append compile_command " $arg"
diff --git a/package/sox/patches/patch-src_soxconfig_h_in b/package/sox/patches/patch-src_soxconfig_h_in
new file mode 100644
index 000000000..8faa99164
--- /dev/null
+++ b/package/sox/patches/patch-src_soxconfig_h_in
@@ -0,0 +1,12 @@
+--- sox-14.3.1.orig/src/soxconfig.h.in	2010-04-05 02:11:39.000000000 +0200
++++ sox-14.3.1/src/soxconfig.h.in	2011-02-28 23:27:38.000000000 +0100
+@@ -283,6 +283,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/totd/Makefile b/package/totd/Makefile
index 938439e9b..207b2d2cc 100644
--- a/package/totd/Makefile
+++ b/package/totd/Makefile
@@ -18,7 +18,7 @@ $(eval $(call PKG_template,TOTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_TOTD)/{usr/sbin,etc}
-	${INSTALL_DATA} ./files/totd.conf ${IDIR_TOTD}/etc/
-	$(INSTALL_BIN) $(WRKINST)/usr/sbin/totd $(IDIR_TOTD)/usr/sbin/
+	${INSTALL_DATA} ./files/totd.conf ${IDIR_TOTD}/etc
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/totd $(IDIR_TOTD)/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/totd/patches/patch-configure b/package/totd/patches/patch-configure
new file mode 100644
index 000000000..3e0a7a585
--- /dev/null
+++ b/package/totd/patches/patch-configure
@@ -0,0 +1,11 @@
+--- totd-1.5.1.orig/configure	2005-02-02 12:01:02.000000000 +0100
++++ totd-1.5.1/configure	2011-03-01 17:57:18.000000000 +0100
+@@ -2514,7 +2514,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ echo "$as_me:$LINENO: checking operating system specific definitions..." >&5
+ echo $ECHO_N "checking operating system specific definitions...... $ECHO_C" >&6
+-case `uname -s` in
++case Linux in
+   NetBSD)
+     ostype=NetBSD
+     OPTFLAGS="$OPTFLAGS"
diff --git a/package/tslib/Makefile b/package/tslib/Makefile
index 17301acf5..e32eb3099 100644
--- a/package/tslib/Makefile
+++ b/package/tslib/Makefile
@@ -30,6 +30,9 @@ CONFIGURE_ARGS+=	--disable-ucb1x00 \
 pre-build:
 	@chmod u+x ${WRKBUILD}/install-sh
 
+pre-install:
+	$(INSTALL_DIR) $(WRKINST)/etc
+
 post-install:
 	$(INSTALL_DIR) $(IDIR_TSLIB)/etc
 	$(INSTALL_DIR) $(IDIR_TSLIB)/usr/lib/ts
diff --git a/package/wdfs/patches/patch-configure b/package/wdfs/patches/patch-configure
new file mode 100644
index 000000000..436361d85
--- /dev/null
+++ b/package/wdfs/patches/patch-configure
@@ -0,0 +1,11 @@
+--- wdfs-1.4.2.orig/configure	2007-04-17 22:43:31.000000000 +0200
++++ wdfs-1.4.2/configure	2011-03-01 19:14:24.000000000 +0100
+@@ -4953,8 +4953,6 @@ else
+ fi
+ 
+ 
+-export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH
+-
+ 
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ 	if test -n "$ac_tool_prefix"; then
diff --git a/package/wdfs/patches/patch-src_config_h_in b/package/wdfs/patches/patch-src_config_h_in
new file mode 100644
index 000000000..8aa15c552
--- /dev/null
+++ b/package/wdfs/patches/patch-src_config_h_in
@@ -0,0 +1,12 @@
+--- wdfs-1.4.2.orig/src/config.h.in	2007-04-17 22:43:37.000000000 +0200
++++ wdfs-1.4.2/src/config.h.in	2011-03-01 18:57:10.000000000 +0100
+@@ -48,6 +48,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/wput/Makefile b/package/wput/Makefile
index 74fdb1677..052817782 100644
--- a/package/wput/Makefile
+++ b/package/wput/Makefile
@@ -22,6 +22,6 @@ CONFIGURE_ARGS+=	--disable-g-switch \
 
 post-install:
 	${INSTALL_DIR} ${IDIR_WPUT}/usr/bin
-	${INSTALL_BIN} ${WRKBUILD}/wput ${IDIR_WPUT}/usr/bin/
+	${INSTALL_BIN} ${WRKBUILD}/wput ${IDIR_WPUT}/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/wput/patches/patch-Makefile_in b/package/wput/patches/patch-Makefile_in
index da30515f6..2939cca93 100644
--- a/package/wput/patches/patch-Makefile_in
+++ b/package/wput/patches/patch-Makefile_in
@@ -1,11 +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:
++++ wput-0.6.1/Makefile.in	2011-03-01 19:19:54.000000000 +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 -d -m0755 $(DESTDIR)$(bindir)
 +	install -m0755 wput $(DESTDIR)$(bindir)
  	@echo "----------------"
  	@echo "Wput installed. See 'wput -h' or 'man wput' for usage information."
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 6270eaf37..24b7d3b11 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -49,7 +49,7 @@ do-configure:
 		$(CONFIGURE_OPTS) \
 	);
 
-post-install:
+zlib-install:
 	${INSTALL_DIR} ${IDIR_ZLIB}/usr/lib
 	${CP} ${WRKBUILD}/libz.so* ${IDIR_ZLIB}/usr/lib
author	Waldemar Brodkorb <wbx@openadk.org>	2011-03-01 19:51:32 +0100
committer	Waldemar Brodkorb <wbx@openadk.org>	2011-03-01 19:51:32 +0100
commit	b56c73c95f08099803c60d9e2f2584f231220d47 (patch)
tree	704b5c66e0d233af904afdfa00e1dd9c2205d02d /package
parent	09381f08db60bd52ab7135bd084fa2bb197a98c2 (diff)