optimize ipkg package management

- generate ipkg control file from PKG_* variables
- automatically install init scripts from ./files/*.init
  set #PKG pkgname to set the binary package
- rename FWINIT -> INIT
- move postinst and conffiles meta data to ./files
- update the packages to the latest upstream version
- remove some unready or unused package (strongswan,..)

more cleanups needed after allmodconfig

9 files changed, 12 insertions, 27 deletions

diff --git a/package/samba/Makefile b/package/samba/Makefile
index 7e9fcb47c..0b2897e31 100644
--- a/package/samba/Makefile
+++ b/package/samba/Makefile
@@ -9,15 +9,19 @@ PKG_NAME:=		samba
 PKG_VERSION:=		3.3.4
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		1443165edb7cb3f56f1e77aec1ee3266
-MASTER_SITES:=		ftp://se.samba.org/pub/samba/stable/ \
+PKG_DESCR:=		NetBIOS/SMB file and print server
+PKG_SECTION:=		net
+PKG_URL:=		http://www.samba.org
+PKG_SITES:=		ftp://se.samba.org/pub/samba/stable/ \
 			ftp://ftp.easynet.be/samba/stable/
+
 WRKSRC=			${WRKDIST}/source
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,SAMBA,samba,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,SAMBA_CLIENT,samba-client,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,SAMBA_PASSWD,samba-passwd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SAMBA,samba,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SAMBA_CLIENT,samba-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,SAMBA_PASSWD,samba-passwd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 TLDFLAGS+=		-Wl,-rpath -Wl,/usr/lib/samba
@@ -47,13 +51,10 @@ BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 
 post-install:
-	${INSTALL_DIR} ${IDIR_SAMBA}/etc/{init.d,samba}
-	${INSTALL_DIR} ${IDIR_SAMBA}/usr/sbin
-	${INSTALL_DIR} ${IDIR_SAMBA}/usr/lib/samba
+	${INSTALL_DIR} ${IDIR_SAMBA}/etc/samba ${IDIR_SAMBA}/usr/sbin
 	${INSTALL_DIR} ${IDIR_SAMBA}/usr/lib/samba/{charset,vfs}
 	${INSTALL_DATA} ${WRKINST}/usr/lib/samba/charset/CP850.so \
 			${IDIR_SAMBA}/usr/lib/samba/charset
-	${INSTALL_DATA} ./files/samba.init ${IDIR_SAMBA}/etc/init.d/samba
 	${INSTALL_DATA} ./files/smb.conf ${IDIR_SAMBA}/etc/samba/
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/{nmbd,smbd} ${IDIR_SAMBA}/usr/sbin
 	${CP} ${WRKINST}/usr/lib/samba/*.so* ${IDIR_SAMBA}/usr/lib/samba
diff --git a/package/samba/ipkg/samba.conffiles b/package/samba/files/samba.conffiles
index 5c10c50ad..5c10c50ad 100644
--- a/package/samba/ipkg/samba.conffiles
+++ b/package/samba/files/samba.conffiles
diff --git a/package/samba/files/samba.init b/package/samba/files/samba.init
index 94080f31a..862a63515 100644
--- a/package/samba/files/samba.init
+++ b/package/samba/files/samba.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 80
+#PKG samba
+#INIT 80
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/samba/ipkg/samba.postinst b/package/samba/files/samba.postinst
index b9f99e86b..b9f99e86b 100644
--- a/package/samba/ipkg/samba.postinst
+++ b/package/samba/files/samba.postinst
diff --git a/package/samba/ipkg/swat.postinst b/package/samba/files/swat.postinst
index 85c2d226e..85c2d226e 100644
--- a/package/samba/ipkg/swat.postinst
+++ b/package/samba/files/swat.postinst
diff --git a/package/samba/ipkg/samba-client.control b/package/samba/ipkg/samba-client.control
deleted file mode 100644
index dcfe292b3..000000000
--- a/package/samba/ipkg/samba-client.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: samba-client
-Priority: optional
-Section: net
-Description: NetBIOS/SMB client
diff --git a/package/samba/ipkg/samba-passwd.control b/package/samba/ipkg/samba-passwd.control
deleted file mode 100644
index 2cba0a83e..000000000
--- a/package/samba/ipkg/samba-passwd.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: samba-passwd
-Priority: optional
-Section: net
-Description: samba password utility
diff --git a/package/samba/ipkg/samba.control b/package/samba/ipkg/samba.control
deleted file mode 100644
index c1cf603c4..000000000
--- a/package/samba/ipkg/samba.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: samba
-Priority: optional
-Section: net
-Depends: libgcc
-Description: NetBIOS/SMB file and print server
diff --git a/package/samba/ipkg/swat.control b/package/samba/ipkg/swat.control
deleted file mode 100644
index 318941467..000000000
--- a/package/samba/ipkg/swat.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: swat
-Priority: optional
-Section: net
-Depends: samba
-Description: NetBIOS/SMB file and print server