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

 * fix *.pc / *-config file handling.

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:
+##