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

10 files changed, 26 insertions, 17 deletions

diff --git a/package/.template/Makefile b/package/.template/Makefile
index 66064ce81..67d1cc183 100644
--- a/package/.template/Makefile
+++ b/package/.template/Makefile
@@ -23,12 +23,14 @@ $(eval $(call PKG_template,@UPKG@,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PK
 CONFIGURE_STYLE:=	gnu
 # 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
 
 # please install all files and directories to the package dir
 post-install:
-	$(INSTALL_DIR) $(IDIR_@UPKG@)/bin
+	$(INSTALL_DIR) $(IDIR_@UPKG@)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/@PKG@ $(IDIR_@UPKG@)/usr/bin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/apr/Makefile b/package/apr/Makefile
index 5a481234f..53048e334 100644
--- a/package/apr/Makefile
+++ b/package/apr/Makefile
@@ -28,7 +28,8 @@ endif
 $(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
-CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=no
+# uClibc setpgrp does not take arguments
+CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes
 CONFIGURE_ENV+=		ac_cv_sizeof_size_t=4
 CONFIGURE_ENV+=		ac_cv_sizeof_ssize_t=4
 CONFIGURE_ENV+=		ac_cv_file__dev_zero=yes
diff --git a/package/digitemp/Makefile b/package/digitemp/Makefile
index a03d7e1f1..a291c127c 100644
--- a/package/digitemp/Makefile
+++ b/package/digitemp/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		digitemp
 PKG_VERSION:=		3.6.0
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		libusb libusb-compat
 PKG_MD5SUM:=		9be2e48db37920f21925ae6e88f83b84
-PKG_DESCR:=		simple to use program for reading values from 1-wire devices
+PKG_DESCR:=		program for reading values from 1-wire devices
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		libusb
+PKG_BUILDDEP+=		libusb libusb-compat
 PKG_URL:=		http://www.digitemp.com/software/linux
 PKG_SITES:=		http://www.digitemp.com/software/linux/
 
@@ -20,7 +20,7 @@ $(eval $(call PKG_template,DIGITEMP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${
 
 TCFLAGS+=		-I./src -I./userial
 ALL_TARGET=		ds2490
-BUILD_STYLE=		auto
+BUILD_STYLE:=		auto
 
 do-install:
 	${INSTALL_DIR} ${IDIR_DIGITEMP}/usr/sbin
diff --git a/package/igmpproxy/Makefile b/package/igmpproxy/Makefile
index 90a61257a..cfa09f93e 100644
--- a/package/igmpproxy/Makefile
+++ b/package/igmpproxy/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:=		net
 PKG_URL:=		http://sourceforge.net/projects/igmpproxy/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=igmpproxy/}
 
+CFLINE_IGMPPROXY=	select ADK_KERNEL_IP_MULTICAST\n\tselect ADK_KERNEL_IP_MROUTE
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IGMPPROXY,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
diff --git a/package/libdaemon/Makefile b/package/libdaemon/Makefile
index 587a76ef4..1e5eaeae5 100644
--- a/package/libdaemon/Makefile
+++ b/package/libdaemon/Makefile
@@ -14,16 +14,17 @@ PKG_SITES:=		http://0pointer.de/lennart/projects/libdaemon/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,LIBDAEMON,libdaemon,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBDAEMON,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
+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 confprog
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBDAEMON}/usr/lib
-	${CP} ${WRKINST}/usr/lib/libdaemon.so.* ${IDIR_LIBDAEMON}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/libdaemon.so* ${IDIR_LIBDAEMON}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile
index 213dcee68..531b93311 100644
--- a/package/mt-daapd/Makefile
+++ b/package/mt-daapd/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		mt-daapd
 PKG_VERSION:=		0.2.4
 PKG_RELEASE:=		10
-PKG_BUILDDEP+=		gdbm libid3tag
 PKG_MD5SUM:=		2e1cdbe6b94ef153e915806f80a28dca
 PKG_DESCR:=		a multi-threaded DAAP (Digital Audio Access Protocol) daemon
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libgdbm libid3tag libpthread
+PKG_BUILDDEP+=		gdbm libid3tag
 PKG_URL:=		http://www.fireflymediaserver.org
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=mt-daapd/}
 
@@ -19,6 +19,7 @@ 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 \
 			--disable-howl \
diff --git a/package/netperf/Makefile b/package/netperf/Makefile
index fbec25d18..9dac7fbd4 100644
--- a/package/netperf/Makefile
+++ b/package/netperf/Makefile
@@ -17,7 +17,8 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,NETPERF,${PKG_NAME},${PKG_VERSION}${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=no
+# uClibc setpgrp does not take arguments
+CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes
 CONFIGURE_STYLE:=	gnu
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
diff --git a/package/privoxy/Makefile b/package/privoxy/Makefile
index aa6fa2b2f..985ac546e 100644
--- a/package/privoxy/Makefile
+++ b/package/privoxy/Makefile
@@ -6,12 +6,12 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		privoxy
 PKG_VERSION:=		3.0.15
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		pcre
 PKG_VARIANT:=		beta
 PKG_MD5SUM:=		6571dc9524e945e79c2af62fefe7b107
 PKG_DESCR:=		web proxy with advanced filtering capabilities
 PKG_SECTION:=		net
-PKG_DEPENDS:=		libpthread
+PKG_DEPENDS:=		libpthread libpcre
+PKG_BUILDDEP+=		pcre
 PKG_URL:=		http://www.privoxy.org
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=ijbswa/}
 
@@ -27,7 +27,8 @@ CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-editor \
 			--disable-jar-files \
 			--sysconfdir=/etc/privoxy
-CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=no \
+# 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}'
diff --git a/package/ruby/Makefile b/package/ruby/Makefile
index 349d86c15..4bda5691e 100644
--- a/package/ruby/Makefile
+++ b/package/ruby/Makefile
@@ -20,6 +20,7 @@ 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
diff --git a/package/wccpd/Makefile b/package/wccpd/Makefile
index 3997829ee..b55011567 100644
--- a/package/wccpd/Makefile
+++ b/package/wccpd/Makefile
@@ -16,9 +16,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
-CONFIGURE_ARGS+=	--enable-static \
-			--with-gnu-ld
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto