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

resolve conflicts

Conflicts:

	mk/pkg-bottom.mk
	package/ctorrent/Makefile
	package/gcc/Makefile
	package/gmp/Makefile
	package/id3lib/Makefile
	package/libelf/Makefile
	package/libnl/patches/patch-include_netlink-local_h
	package/mpd/Makefile
	package/nmap/Makefile
	package/rrs/Makefile
	package/weechat/Makefile
	scripts/rstrip.sh
	target/Config.in

6 files changed, 9 insertions, 22 deletions

diff --git a/package/rrdcollect/Makefile b/package/rrdcollect/Makefile
index 49ca85db6..ee6228092 100644
--- a/package/rrdcollect/Makefile
+++ b/package/rrdcollect/Makefile
@@ -9,7 +9,10 @@ PKG_NAME:=		rrdcollect
 PKG_VERSION:=		0.2.3
 PKG_RELEASE:=		8
 PKG_MD5SUM:=		5e4305c612bc3cccbaf802c275c81a11
-MASTER_SITES:=		${MASTER_SITE_SOURCEFORGE:=rrdcollect/}
+PKG_DESCR:=		Round-Robin Database (RRD) collecting daemon
+PKG_SECTION:=		admin
+PKG_DEPENDS:=		librrd
+PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=rrdcollect/}
 
 ifneq (${ADK_PACKAGE_LIBRRD},)
 RRDTOOL_LIBS:=-lart_lgpl_2 -lfreetype -lpng
@@ -17,8 +20,8 @@ endif
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,RRDCOLLECT,rrdcollect,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,RRDCOLLECT_EXAMPLE,rrdcollect-example,${PKG_VERSION}-${PKG_RELEASE}))
+$(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
@@ -37,9 +40,6 @@ post-install:
 	${INSTALL_DIR} ${IDIR_RRDCOLLECT_EXAMPLE}/etc
 	${INSTALL_DATA} ./files/rrd.conf ./files/rrdcollect.conf \
 		${IDIR_RRDCOLLECT_EXAMPLE}/etc/
-	${INSTALL_DIR} ${IDIR_RRDCOLLECT_EXAMPLE}/etc/init.d
-	${INSTALL_BIN} ./files/rrdcollect.init \
-		${IDIR_RRDCOLLECT_EXAMPLE}/etc/init.d/${PKG_NAME}
 	${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
diff --git a/package/rrdcollect/ipkg/rrdcollect-example.conffiles b/package/rrdcollect/files/rrdcollect-example.conffiles
index 9e9a33a22..9e9a33a22 100644
--- a/package/rrdcollect/ipkg/rrdcollect-example.conffiles
+++ b/package/rrdcollect/files/rrdcollect-example.conffiles
diff --git a/package/rrdcollect/files/rrdcollect.init b/package/rrdcollect/files/rrdcollect.init
index 300f954c4..0f9d00ab1 100644
--- a/package/rrdcollect/files/rrdcollect.init
+++ b/package/rrdcollect/files/rrdcollect.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 90
+#PKG rrdcollect
+#INIT 90
+
 . /etc/rc.conf
 
 LIB_D=/var/lib/rrdcollect
diff --git a/package/rrdcollect/ipkg/rrdcollect.postinst b/package/rrdcollect/files/rrdcollect.postinst
index 760d20811..760d20811 100644
--- a/package/rrdcollect/ipkg/rrdcollect.postinst
+++ b/package/rrdcollect/files/rrdcollect.postinst
diff --git a/package/rrdcollect/ipkg/rrdcollect-example.control b/package/rrdcollect/ipkg/rrdcollect-example.control
deleted file mode 100644
index ab4c68e5a..000000000
--- a/package/rrdcollect/ipkg/rrdcollect-example.control
+++ /dev/null
@@ -1,10 +0,0 @@
-Package: rrdcollect-example
-Priority: optional
-Section: admin
-Depends: rrdcgi, rrdtool, rrdcollect
-Description: Example setup for Round-Robin Database (RRD) collecting daemon
- RRDcollect is a daemon which polls certain files in /proc/
- directory, gathering data and storing it inside RRDtool's
- database files.  Being written in C should be both fast
- and resources-friendly.  Supports both scanf(3)-style
- pattern matches and perl compatible regular expressions.
diff --git a/package/rrdcollect/ipkg/rrdcollect.control b/package/rrdcollect/ipkg/rrdcollect.control
deleted file mode 100644
index 7ac79731d..000000000
--- a/package/rrdcollect/ipkg/rrdcollect.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: rrdcollect
-Priority: optional
-Section: admin
-Depends: librrd
-Description: Round-Robin Database (RRD) collecting daemon