From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 7 Feb 2010 20:03:20 +0100
Subject: change defaults for CONFIG/BUILD/INSTALL styles

All packages need an update, so here is a very huge commit.
Most of the 460 source packages use automatic style for configuration,
building and installing. Make these styles default to "auto".
If you have a package, which does not conform to this, just use
manual style and add a do-$task make target.

I added a new style named AUTOTOOL style, which is needed for some
broken packages, which needs to be updated via autoconf or automake.

I renamed CONFIGURE_STYLE to CONFIG_STYLE.

Updates for some packages, which have newer upstream versions.

Renaming of all package/*/extra directories. Use the directory
src/ to provide overwrites of source files or to add the code, when
no upstream package is available or used. src directory will be automatically
used.
---
 package/collectd/Makefile | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'package/collectd/Makefile')

diff --git a/package/collectd/Makefile b/package/collectd/Makefile
index 24d337b1d..1f8f003eb 100644
--- a/package/collectd/Makefile
+++ b/package/collectd/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		collectd
-PKG_VERSION:=		4.7.0
+PKG_VERSION:=		4.9.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b077e3398bd6fac0e53e9df4794db264
+PKG_MD5SUM:=		31a63d8e3a796dee247024f70426ed1c
 PKG_DESCR:=		System statistics collection daemon
 PKG_SECTION:=		console
 PKG_DEPENDS:=		libpthread
@@ -36,7 +36,6 @@ ifneq (${ADK_PACKAGE_COLLECTD_PING},y)
 DISABLE_PING:=--disable-ping
 endif
 
-CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--disable-apache \
 			--disable-apcups \
 			--disable-apple_sensors \
@@ -44,6 +43,7 @@ CONFIGURE_ARGS+=	--disable-apache \
 			--disable-battery \
 			${DISABLE_CPU} \
 			--disable-cpufreq \
+			--disable-contextswitch \
 			--disable-disk \
 			--enable-csv \
 			--disable-df \
@@ -59,6 +59,7 @@ CONFIGURE_ARGS+=	--disable-apache \
 			--disable-ipvs \
 			--disable-irq \
 			${DISABLE_LOAD} \
+			--disable-madwifi \
 			--disable-mbmon \
 			--disable-memcached \
 			${DISABLE_MEMORY} \
@@ -90,19 +91,22 @@ CONFIGURE_ARGS+=	--disable-apache \
 			--disable-unixsock \
 			--disable-users \
 			--disable-vserver \
-			--enable-wireless \
+			--disable-wireless \
+			--disable-write_http \
 			--with-fp-layout=nothing \
 			--without-java \
 			--without-libiptc \
 			--with-nan-emulation
 
 XAKE_FLAGS+=		LIBS='-lm'
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_COLLECTD}/usr/sbin ${IDIR_COLLECTD}/usr/lib/collectd
-	${CP} ${WRKINST}/usr/sbin/collectd ${IDIR_COLLECTD}/usr/sbin/
-	${CP} ${WRKINST}/usr/lib/collectd/*.so ${IDIR_COLLECTD}/usr/lib/collectd/
+	${INSTALL_DIR} ${IDIR_COLLECTD}/usr/lib/collectd \
+		${IDIR_COLLECTD}/usr/sbin/ ${IDIR_COLLECTD}/etc
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/collectd ${IDIR_COLLECTD}/usr/sbin/
+	${CP} ${WRKINST}/usr/lib/collectd/*.so \
+		${IDIR_COLLECTD}/usr/lib/collectd/
+	${INSTALL_DATA} ./files/collectd.conf \
+		${IDIR_COLLECTD}/etc
 
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3