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/rrdcollect/Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'package/rrdcollect')

diff --git a/package/rrdcollect/Makefile b/package/rrdcollect/Makefile
index 78c67ebab..8a73aa105 100644
--- a/package/rrdcollect/Makefile
+++ b/package/rrdcollect/Makefile
@@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		rrdcollect
 PKG_VERSION:=		0.2.3
 PKG_RELEASE:=		8
-PKG_BUILDDEP+=		rrdtool
 PKG_MD5SUM:=		5e4305c612bc3cccbaf802c275c81a11
 PKG_DESCR:=		Round-Robin Database (RRD) collecting daemon
 PKG_SECTION:=		admin
 PKG_DEPENDS:=		librrd
+PKG_BUILDDEP+=		rrdtool
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=rrdcollect/}
 
 ifneq (${ADK_PACKAGE_LIBRRD},)
@@ -22,27 +22,27 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,RRDCOLLECT,rrdcollect,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 $(eval $(call PKG_template,RRDCOLLECT_EXAMPLE,rrdcollect-example,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
-CONFIGURE_ENV+=		LIBS="${RRDTOOL_LIBS} -lz" ac_cv_func_malloc_0_nonnull=yes
+CONFIGURE_ENV+=		LIBS="${RRDTOOL_LIBS} -lz" \
+			ac_cv_func_malloc_0_nonnull=yes
 CONFIGURE_ARGS+=	--enable-exec \
 			--without-rrdtool \
 			--with-librrd \
 			--without-libpcre \
 			--without-libpcap
 TCFLAGS+=		-DSOCKET_COMM
-BUILD_STYLE:=		auto
-INSTALL_STYLE:=		auto
 
 post-install:
 	${INSTALL_DIR} ${IDIR_RRDCOLLECT}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/rrdcollect ${IDIR_RRDCOLLECT}/usr/sbin/
+	${INSTALL_BIN} ${WRKINST}/usr/sbin/rrdcollect \
+		${IDIR_RRDCOLLECT}/usr/sbin/
 	${INSTALL_DIR} ${IDIR_RRDCOLLECT_EXAMPLE}/etc
 	${INSTALL_DATA} ./files/rrd.conf ./files/rrdcollect.conf \
 		${IDIR_RRDCOLLECT_EXAMPLE}/etc/
 	${INSTALL_DIR} ${IDIR_RRDCOLLECT_EXAMPLE}/usr/bin
 	${INSTALL_BIN} ./files/rrd.sh ${IDIR_RRDCOLLECT_EXAMPLE}/usr/bin/
 	${INSTALL_DIR} ${IDIR_RRDCOLLECT_EXAMPLE}/www/cgi-bin
-	ln -sf /var/lib/rrdcollect/rrd.cgi ${IDIR_RRDCOLLECT_EXAMPLE}/www/cgi-bin/rrd.cgi
+	ln -sf /var/lib/rrdcollect/rrd.cgi \
+		${IDIR_RRDCOLLECT_EXAMPLE}/www/cgi-bin/rrd.cgi
 	ln -sf /var/lib/rrdcollect/img ${IDIR_RRDCOLLECT_EXAMPLE}/www/img
 
 include ${TOPDIR}/mk/pkg-bottom.mk
-- 
cgit v1.2.3