remove comments and finetune packages.

pdnsd, rngd and proftpd need a init script...
do not install anything to /var, because this is on /tmp aka
tmpfs. Use init scripts to create missing directories or files.

7 files changed, 15 insertions, 55 deletions

diff --git a/package/libnetfilter_queue/Makefile b/package/libnetfilter_queue/Makefile
index cacac4887..a5769a212 100644
--- a/package/libnetfilter_queue/Makefile
+++ b/package/libnetfilter_queue/Makefile
@@ -21,16 +21,12 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,LIBNETFILTER_QUEUE,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 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_LIBNETFILTER_QUEUE)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libnetfilter_queue* $(IDIR_LIBNETFILTER_QUEUE)/usr/lib/
+	$(CP) $(WRKINST)/usr/lib/libnetfilter_queue*so* \
+		$(IDIR_LIBNETFILTER_QUEUE)/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libnfnetlink/Makefile b/package/libnfnetlink/Makefile
index a6faace09..e73fe97ba 100644
--- a/package/libnfnetlink/Makefile
+++ b/package/libnfnetlink/Makefile
@@ -7,9 +7,8 @@ PKG_NAME:=		libnfnetlink
 PKG_VERSION:=		0.0.41
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		5d844ea1f557bad0364d5b85cd10c796
-PKG_DESCR:=		the low-level library for netfilter related kernel/userspace communication
+PKG_DESCR:=		low-level library for netfilter related kernel/userspace communication
 PKG_SECTION:=		libs
-PKG_DEPENDS:=
 PKG_URL:=		http://www.netfilter.org/projects/libnfnetlink/
 PKG_SITES:=		http://www.netfilter.org/projects/libnfnetlink/files/
 
@@ -25,6 +24,6 @@ INSTALL_STYLE:=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_LIBNFNETLINK)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libnfnetlink.* $(IDIR_LIBNFNETLINK)/usr/lib/
+	$(CP) $(WRKINST)/usr/lib/libnfnetlink.so* $(IDIR_LIBNFNETLINK)/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/pdnsd/Makefile b/package/pdnsd/Makefile
index e8805ad79..1c6d5694d 100644
--- a/package/pdnsd/Makefile
+++ b/package/pdnsd/Makefile
@@ -13,7 +13,6 @@ PKG_DEPENDS:=
 PKG_URL:=		http://www.phys.uu.nl/~rombouts/pdnsd.html
 PKG_SITES:=		http://www.phys.uu.nl/~rombouts/pdnsd/releases/
 
-# if downloaded package is not ending with .tar.gz use following
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}-par.tar.gz
 
 include $(TOPDIR)/mk/package.mk
@@ -21,18 +20,11 @@ include $(TOPDIR)/mk/package.mk
 $(eval $(call PKG_template,PDNSD,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 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_PDNSD)/usr/sbin
 	$(INSTALL_BIN) $(WRKINST)/usr/sbin/pdnsd{,-ctl} $(IDIR_PDNSD)/usr/sbin/
-	$(INSTALL_DIR) $(IDIR_PDNSD)/var/cache/pdnsd
-	$(INSTALL_BIN) $(WRKINST)/var/cache/pdnsd/pdnsd.cache $(IDIR_PDNSD)/var/cache/pdnsd/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/proftpd/Makefile b/package/proftpd/Makefile
index e4662c8da..c15b649a2 100644
--- a/package/proftpd/Makefile
+++ b/package/proftpd/Makefile
@@ -9,35 +9,28 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		4918908fcae9e591ba84c66edff73410
 PKG_DESCR:=		An advanced and very configurable FTP server
 PKG_SECTION:=		utils
-PKG_DEPENDS:=
 PKG_URL:=		http://www.proftpd.org/
 PKG_SITES:=		ftp://ftp.proftpd.org/distrib/source/
 
-# if downloaded package is not ending with .tar.gz use following
-#DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,PROFTPD,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
-# use following to add ./configure options
-#CONFIGURE_ARGS+=	--disable-foo
-# overwrite any configure variables
+CONFIGURE_ARGS+=	--disable-cap
 CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes \
 			ac_cv_func_setgrent_void=yes
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
-# please install all files and directories to the package dir
 post-install:
 	$(INSTALL_DIR) $(IDIR_PROFTPD)/etc
 	$(INSTALL_DATA) $(WRKINST)/etc/proftpd.conf $(IDIR_PROFTPD)/etc/
 	$(INSTALL_DIR) $(IDIR_PROFTPD)/usr/{s,}bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/ftp{count,dctl,top,who} $(IDIR_PROFTPD)/usr/bin/
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/ftp{count,dctl,top,who} \
+		$(IDIR_PROFTPD)/usr/bin/
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/prxs $(IDIR_PROFTPD)/usr/bin/
-	$(INSTALL_BIN) $(WRKINST)/usr/sbin/{ftpshut,proftpd} $(IDIR_PROFTPD)/usr/sbin/
-	# XXX: maybe this should be a symlink to /tmp or so
-	$(INSTALL_DIR) $(IDIR_PROFTPD)/var/proftpd
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/{ftpshut,proftpd} \
+		$(IDIR_PROFTPD)/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/rng-tools/Makefile b/package/rng-tools/Makefile
index 40ca2f603..522668e6d 100644
--- a/package/rng-tools/Makefile
+++ b/package/rng-tools/Makefile
@@ -9,29 +9,21 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		63d503191eabed630324c104cc024475
 PKG_DESCR:=		Daemon to use hardware random number generators.
 PKG_SECTION:=		utils
-PKG_DEPENDS:=
 PKG_URL:=		http://gkernel.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=gkernel/}
 
-# if downloaded package is not ending with .tar.gz use following
-#DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+CFLINE_RNG_TOOLS:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,RNG_TOOLS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 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_RNG_TOOLS)/usr/{s,}bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/rngtest $(IDIR_RNG_TOOLS)/usr/bin
+	$(INSTALL_DIR) $(IDIR_RNG_TOOLS)/usr/sbin
 	$(INSTALL_BIN) $(WRKINST)/usr/sbin/rngd $(IDIR_RNG_TOOLS)/usr/sbin
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/tptest/Makefile b/package/tptest/Makefile
index af9e000e7..3f6c0fc3c 100644
--- a/package/tptest/Makefile
+++ b/package/tptest/Makefile
@@ -9,31 +9,20 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		46f941bdab738a2a11ecc2a5f757ec77
 PKG_DESCR:=		Internet bandwidth tester
 PKG_SECTION:=		utils
-PKG_DEPENDS:=
 PKG_URL:=		http://tptest.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=tptest/}
 
-# if downloaded package is not ending with .tar.gz use following
-#DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,TPTEST,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-# 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
-
 do-build:
 	(cd ${WRKSRC}/apps/unix/server && ${MAKE} && ${MAKE} install DESTDIR="${WRKINST}")
 	(cd ${WRKSRC}/apps/unix/client && ${MAKE} && ${MAKE} install DESTDIR="${WRKINST}")
 
-# please install all files and directories to the package dir
 do-install:
 	$(INSTALL_DIR) $(IDIR_TPTEST)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/tptest{client,server} $(IDIR_TPTEST)/usr/bin/
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/tptest{client,server} \
+		$(IDIR_TPTEST)/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/traceroute/Makefile b/package/traceroute/Makefile
index e0d8fa2e5..4db926568 100644
--- a/package/traceroute/Makefile
+++ b/package/traceroute/Makefile
@@ -9,7 +9,6 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		d400573042d41559fc3e5260275300d8
 PKG_DESCR:=		Utility to trace the route of IP packets
 PKG_SECTION:=		utils
-PKG_DEPENDS:=
 PKG_URL:=		http://traceroute.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=traceroute/}
 
@@ -24,9 +23,9 @@ MAKE_FLAGS+=		CC="${TARGET_CC}" \
 			LDFLAGS="-L${WRKSRC}/libsupp"
 INSTALL_STYLE:=		auto
 
-# please install all files and directories to the package dir
 post-install:
 	$(INSTALL_DIR) $(IDIR_TRACEROUTE)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/local/bin/traceroute $(IDIR_TRACEROUTE)/usr/bin/
+	$(INSTALL_BIN) $(WRKINST)/usr/local/bin/traceroute \
+		$(IDIR_TRACEROUTE)/usr/bin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk