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

12 files changed, 42 insertions, 94 deletions

diff --git a/mk/build.mk b/mk/build.mk
index b7d4d08d5..d81485cf2 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -274,7 +274,7 @@ ifeq ($(filter-out distclean,${MAKECMDGOALS}),)
 include ${TOPDIR}/mk/vars.mk
 else
 include $(TOPDIR)/prereq.mk
-export BASH MAKE LANGUAGE LC_ALL OStype PATH CC_FOR_BUILD QEMU
+export BASH MAKE LANGUAGE LC_ALL OStype PATH CC_FOR_BUILD QEMU SHELL
 endif
 
 all: menuconfig
diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index 33b5b4519..942e88942 100644
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		collectd
-PKG_VERSION:=		4.10.0
+PKG_VERSION:=		5.0.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		c473cf8e9f22f5a9f7ef4c5be1b0c436
+PKG_MD5SUM:=		a405d6cca021748fea43b60348b72b0c
 PKG_DESCR:=		System statistics collection daemon
 PKG_SECTION:=		misc
 PKG_DEPENDS:=		libpthread
@@ -101,14 +101,14 @@ CONFIGURE_ARGS+=	--disable-apache \
 			--with-nan-emulation
 
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
-XAKE_FLAGS+=		LIBS='-lm'
+XAKE_FLAGS+=		LIBS='-lm -lltdl'
 
 post-install:
 	${INSTALL_DIR} ${IDIR_COLLECTD}/usr/lib/collectd \
-		${IDIR_COLLECTD}/usr/sbin/ ${IDIR_COLLECTD}/etc
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/collectd ${IDIR_COLLECTD}/usr/sbin/
+		${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/
+		${IDIR_COLLECTD}/usr/lib/collectd
 	${INSTALL_DATA} ./files/collectd.conf \
 		${IDIR_COLLECTD}/etc
 
diff --git a/package/collectd/patches/patch-configure b/package/collectd/patches/patch-configure
deleted file mode 100644
index 24d0c04b5..000000000
--- a/package/collectd/patches/patch-configure
+++ /dev/null
@@ -1,56 +0,0 @@
---- collectd-4.10.0.orig/configure	2010-05-01 11:16:01.000000000 +0200
-+++ collectd-4.10.0/configure	2010-06-14 15:51:32.263465769 +0200
-@@ -16636,53 +16636,6 @@ $as_echo "#define HAVE_GEN_GETMNTENT 1" 
- 
- fi
- 
--# Check for htonll
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if have htonll defined" >&5
--$as_echo_n "checking if have htonll defined... " >&6; }
--
--    have_htonll="no"
--    if test "$cross_compiling" = yes; then :
--  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--
--#include <sys/types.h>
--#include <netinet/in.h>
--#if HAVE_INTTYPES_H
--# include <inttypes.h>
--#endif
--
--int
--main ()
--{
--
--          return htonll(0);
--
--  ;
--  return 0;
--}
--
--_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--
--      have_htonll="yes"
--
--$as_echo "#define HAVE_HTONLL 1" >>confdefs.h
--
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
--
--
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_htonll" >&5
--$as_echo "$have_htonll" >&6; }
- 
- # Check for structures
- ac_fn_c_check_member "$LINENO" "struct if_data" "ifi_ibytes" "ac_cv_member_struct_if_data_ifi_ibytes" "
diff --git a/package/collectd/patches/patch-ltmain_sh b/package/collectd/patches/patch-ltmain_sh
deleted file mode 100644
index d53645853..000000000
--- a/package/collectd/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- collectd-4.10.0.orig/ltmain.sh	2010-05-01 11:15:57.000000000 +0200
-+++ collectd-4.10.0/ltmain.sh	2011-01-14 20:29:06.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/collectd/patches/patch-src_Makefile_in b/package/collectd/patches/patch-src_Makefile_in
new file mode 100644
index 000000000..d1580516a
--- /dev/null
+++ b/package/collectd/patches/patch-src_Makefile_in
@@ -0,0 +1,13 @@
+--- collectd-5.0.1.orig/src/Makefile.in	2011-10-14 22:54:14.000000000 +0200
++++ collectd-5.0.1/src/Makefile.in	2011-10-22 18:57:51.000000000 +0200
+@@ -56,8 +56,8 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT) 
+ # too. -octo
+ @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_13 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
+ @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_14 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
+-@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_15 = $(LIBLTDL) liboconfig/liboconfig.la
+-@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = $(LIBLTDL) liboconfig/liboconfig.la
++@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_15 = liboconfig/liboconfig.la
++@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = liboconfig/liboconfig.la
+ @BUILD_WITH_OWN_LIBOCONFIG_FALSE@am__append_17 = -loconfig
+ @BUILD_WITH_LIBSOCKET_TRUE@am__append_18 = -lsocket
+ @BUILD_AIX_TRUE@am__append_19 = -lm
diff --git a/package/collectd/patches/patch-src_libcollectdclient_Makefile_in b/package/collectd/patches/patch-src_libcollectdclient_Makefile_in
deleted file mode 100644
index a51a010ea..000000000
--- a/package/collectd/patches/patch-src_libcollectdclient_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- collectd-4.10.0.orig/src/libcollectdclient/Makefile.in	2010-05-01 11:16:00.000000000 +0200
-+++ collectd-4.10.0/src/libcollectdclient/Makefile.in	2010-06-14 15:49:28.563473998 +0200
-@@ -327,7 +327,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = foreign no-dependencies
--@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror
-+@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall
- pkginclude_HEADERS = client.h lcc_features.h
- lib_LTLIBRARIES = libcollectdclient.la
- nodist_pkgconfig_DATA = libcollectdclient.pc
diff --git a/package/drbd/patches/patch-Makefile_in b/package/drbd/patches/patch-Makefile_in
index 71ece3f6f..ad87d221d 100644
--- a/package/drbd/patches/patch-Makefile_in
+++ b/package/drbd/patches/patch-Makefile_in
@@ -1,9 +1,11 @@
 --- drbd-8.3.10.orig/Makefile.in	2011-01-26 14:57:59.000000000 +0100
-+++ drbd-8.3.10/Makefile.in	2011-05-23 17:11:50.000000000 +0200
-@@ -56,7 +56,7 @@ KDIR ?= /lib/modules/$(KVER)/build
- # and not in e.g. dash. I'm too lazy to fix it to be compatible.
- SHELL=/bin/bash
++++ drbd-8.3.10/Makefile.in	2011-10-23 10:20:12.000000000 +0200
+@@ -54,9 +54,7 @@ KDIR ?= /lib/modules/$(KVER)/build
  
+ # for some reason some of the commands below only work correctly in bash,
+ # and not in e.g. dash. I'm too lazy to fix it to be compatible.
+-SHELL=/bin/bash
+-
 -SUBDIRS     = user scripts documentation drbd
 +SUBDIRS     = user scripts drbd
  
diff --git a/package/drbd/patches/patch-drbd_Makefile b/package/drbd/patches/patch-drbd_Makefile
index dffd1e258..62f61cab4 100644
--- a/package/drbd/patches/patch-drbd_Makefile
+++ b/package/drbd/patches/patch-drbd_Makefile
@@ -1,6 +1,14 @@
 --- drbd-8.3.10.orig/drbd/Makefile	2011-01-26 14:57:59.000000000 +0100
-+++ drbd-8.3.10/drbd/Makefile	2011-05-23 17:11:50.000000000 +0200
-@@ -133,7 +133,7 @@ else
++++ drbd-8.3.10/drbd/Makefile	2011-10-23 10:22:50.000000000 +0200
+@@ -65,7 +65,6 @@ else
+ 
+   # for some reason some of the commands below only work correctly in bash,
+   # and not in e.g. dash. I'm too lazy to fix it to be compatible.
+-  SHELL=/bin/bash
+ 
+   DRBDSRC := $(shell pwd)
+ 
+@@ -133,7 +132,7 @@ else
  		grep return $@ ;						\
  	fi ;									\
  	echo -e "\t\t\" build by $$USER@$$HOSTNAME, `date "+%F %T"`\";\n}";	\
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index aabe94394..0bf164017 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -112,6 +112,7 @@ CONFIGURE_ARGS:=	--prefix=/usr \
 			--host-cc=$(CC_FOR_BUILD) \
 			--disable-doc \
 			--disable-debug \
+			--disable-yasm \
 			--disable-optimizations \
 			--disable-stripping \
 			--enable-shared \
diff --git a/package/forked-daapd/Makefile b/package/forked-daapd/Makefile
index 824d05636..49583bb11 100644
--- a/package/forked-daapd/Makefile
+++ b/package/forked-daapd/Makefile
@@ -18,6 +18,8 @@ PKG_SITES:=		http://alioth.debian.org/~jblache/forked-daapd/
 
 PKG_CFLINE_FORKED_DAAPD:=	select ADK_KERNEL_INOTIFY_USER
 PKG_ARCH_DEPENDS:=	!ppc
+# gperf problem
+PKG_HOST_DEPENDS:=	!freebsd
 
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/libXt/Makefile b/package/libXt/Makefile
index 87e593339..84d467951 100644
--- a/package/libXt/Makefile
+++ b/package/libXt/Makefile
@@ -21,6 +21,7 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBXT,libxt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,LIBXT_DEV,libxt-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBXT_DEV},${PKGSC_LIBXT_DEV}))
 
+CFLAGS_FOR_BUILD+=      -I/usr/local/include
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ARGS+=	--disable-malloc0returnsnull
 
diff --git a/package/libXt/patches/patch-util_Makefile_in b/package/libXt/patches/patch-util_Makefile_in
index 8b2d3079c..856fa8e79 100644
--- a/package/libXt/patches/patch-util_Makefile_in
+++ b/package/libXt/patches/patch-util_Makefile_in
@@ -1,5 +1,5 @@
 --- libXt-1.0.9.orig/util/Makefile.in	2010-10-28 21:04:12.000000000 +0200
-+++ libXt-1.0.9/util/Makefile.in	2011-01-24 17:53:22.000000000 +0100
++++ libXt-1.0.9/util/Makefile.in	2011-11-05 16:05:13.000000000 +0100
 @@ -108,7 +108,7 @@ CFLAGS = @CFLAGS_FOR_BUILD@
  CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
  CHANGELOG_CMD = @CHANGELOG_CMD@
@@ -14,7 +14,7 @@
  top_srcdir = @top_srcdir@
  EXTRA_DIST = Shell.ht StrDefs.ct StrDefs.ht string.list $(appman_PRE)
 -makestrs_CFLAGS = $(XT_CFLAGS)
-+makestrs_CFLAGS = 
++makestrs_CFLAGS = $(CFLAGS_FOR_BUILD)
  makestrs_SOURCES = makestrs.c
  
  # Man page