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

12 files changed, 18 insertions, 30 deletions

diff --git a/package/mini_httpd/Makefile b/package/mini_httpd/Makefile
index b85a15589..17f8caced 100644
--- a/package/mini_httpd/Makefile
+++ b/package/mini_httpd/Makefile
@@ -9,15 +9,23 @@ PKG_NAME:=		mini-httpd
 PKG_VERSION:=		1.19
 PKG_RELEASE:=		10
 PKG_MD5SUM:=		7c68293ad265ecfe2edea917912f6f1f
-MASTER_SITES:=		http://www.acme.com/software/mini_httpd/
+PKG_DESCR:=		A small HTTP server
+PKG_SECTION:=		net
+PKG_URL:=		http://www.acme.com/software/mini_httpd
+PKG_SITES:=		http://www.acme.com/software/mini_httpd/
+
+PKG_DESCR_1:=		htpasswd utility
+PKG_DESCR_2:=		A small HTTP server with SSL support
+PKG_DEPENDS_2:=		libopenssl
+
 DISTFILES:=		mini_httpd-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/mini_httpd-${PKG_VERSION}
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,MINI_HTTPD,mini-httpd,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,MINI_HTTPD_HTPASSWD,mini-httpd-htpasswd,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,MINI_HTTPD_OPENSSL,mini-httpd-openssl,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,MINI_HTTPD,mini-httpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MINI_HTTPD_HTPASSWD,mini-httpd-htpasswd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
+$(eval $(call PKG_template,MINI_HTTPD_OPENSSL,mini-httpd-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_2},${PKG_DESCR_2},${PKG_SECTION}))
 
 do-build:
 	# with OpenSSL
@@ -41,21 +49,18 @@ endif
 do-install:
 	# without SSL
 ifneq (${ADK_PACKAGE_MINI_HTTPD},)
-	${INSTALL_DIR} ${IDIR_MINI_HTTPD}/etc/init.d
+	${INSTALL_DIR} ${IDIR_MINI_HTTPD}/etc
 	${INSTALL_DATA} ./files/mini_httpd.conf ${IDIR_MINI_HTTPD}/etc/mini_httpd.conf
-	${INSTALL_BIN} ./files/mini_httpd.init ${IDIR_MINI_HTTPD}/etc/init.d/mini_httpd
 	${INSTALL_DIR} ${IDIR_MINI_HTTPD}/usr/sbin
 	${INSTALL_BIN} ${WRKBUILD}/mini_httpd ${IDIR_MINI_HTTPD}/usr/sbin/
 	${INSTALL_DIR} ${IDIR_MINI_HTTPD_HTPASSWD}/usr/sbin
-	install -m0755 ${WRKBUILD}/htpasswd ${IDIR_MINI_HTTPD_HTPASSWD}/usr/sbin/
+	${INSTALL_BIN} ${WRKBUILD}/htpasswd ${IDIR_MINI_HTTPD_HTPASSWD}/usr/sbin/
 endif
 	# with OpenSSL
 ifneq (${ADK_PACKAGE_MINI_HTTPD_OPENSSL},)
-	${INSTALL_DIR} ${IDIR_MINI_HTTPD_OPENSSL}/etc/init.d
+	${INSTALL_DIR} ${IDIR_MINI_HTTPD_OPENSSL}/etc
 	${INSTALL_DATA} ./files/mini_httpd-ssl.conf ${IDIR_MINI_HTTPD_OPENSSL}/etc/mini_httpd.conf
 	install -m0600 ./files/mini_httpd.pem ${IDIR_MINI_HTTPD_OPENSSL}/etc/
-	${INSTALL_BIN} ./files/mini_httpd.init \
-		${IDIR_MINI_HTTPD_OPENSSL}/etc/init.d/mini_httpd
 	${INSTALL_DIR} ${IDIR_MINI_HTTPD_OPENSSL}/usr/sbin
 	${INSTALL_BIN} ${WRKBUILD}/mini_httpd-openssl ${IDIR_MINI_HTTPD_OPENSSL}/usr/sbin/mini_httpd
 endif
diff --git a/package/mini_httpd/ipkg/mini-httpd-matrixssl.conffiles b/package/mini_httpd/files/mini-httpd-matrixssl.conffiles
index 38239e4e3..38239e4e3 100644
--- a/package/mini_httpd/ipkg/mini-httpd-matrixssl.conffiles
+++ b/package/mini_httpd/files/mini-httpd-matrixssl.conffiles
diff --git a/package/mini_httpd/ipkg/mini-httpd-matrixssl.postinst b/package/mini_httpd/files/mini-httpd-matrixssl.postinst
index dfcafaa9e..dfcafaa9e 100644
--- a/package/mini_httpd/ipkg/mini-httpd-matrixssl.postinst
+++ b/package/mini_httpd/files/mini-httpd-matrixssl.postinst
diff --git a/package/mini_httpd/ipkg/mini-httpd-openssl.conffiles b/package/mini_httpd/files/mini-httpd-openssl.conffiles
index 38239e4e3..38239e4e3 100644
--- a/package/mini_httpd/ipkg/mini-httpd-openssl.conffiles
+++ b/package/mini_httpd/files/mini-httpd-openssl.conffiles
diff --git a/package/mini_httpd/ipkg/mini-httpd-openssl.postinst b/package/mini_httpd/files/mini-httpd-openssl.postinst
index dfcafaa9e..dfcafaa9e 100644
--- a/package/mini_httpd/ipkg/mini-httpd-openssl.postinst
+++ b/package/mini_httpd/files/mini-httpd-openssl.postinst
diff --git a/package/mini_httpd/ipkg/mini-httpd.conffiles b/package/mini_httpd/files/mini-httpd.conffiles
index 1bf5a5e26..1bf5a5e26 100644
--- a/package/mini_httpd/ipkg/mini-httpd.conffiles
+++ b/package/mini_httpd/files/mini-httpd.conffiles
diff --git a/package/mini_httpd/ipkg/mini-httpd.postinst b/package/mini_httpd/files/mini-httpd.postinst
index dfcafaa9e..dfcafaa9e 100644
--- a/package/mini_httpd/ipkg/mini-httpd.postinst
+++ b/package/mini_httpd/files/mini-httpd.postinst
diff --git a/package/mini_httpd/files/mini_httpd.init b/package/mini_httpd/files/mini_httpd.init
index 10479a22d..9cf60b3ee 100644
--- a/package/mini_httpd/files/mini_httpd.init
+++ b/package/mini_httpd/files/mini_httpd.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 60
+#PKG mini-httpd
+#INIT 60
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/mini_httpd/ipkg/mini-httpd-htpasswd.control b/package/mini_httpd/ipkg/mini-httpd-htpasswd.control
deleted file mode 100644
index 6b80aa6d9..000000000
--- a/package/mini_httpd/ipkg/mini-httpd-htpasswd.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: mini-httpd-htpasswd
-Priority: optional
-Section: net
-Description: utility to generate HTTP access authentication files
diff --git a/package/mini_httpd/ipkg/mini-httpd-matrixssl.control b/package/mini_httpd/ipkg/mini-httpd-matrixssl.control
deleted file mode 100644
index 5967ac7fb..000000000
--- a/package/mini_httpd/ipkg/mini-httpd-matrixssl.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: mini-httpd-matrixssl
-Priority: optional
-Section: net
-Description: A small HTTP server, built with SSL support using MatrixSSL.
-Depends: libmatrixssl
diff --git a/package/mini_httpd/ipkg/mini-httpd-openssl.control b/package/mini_httpd/ipkg/mini-httpd-openssl.control
deleted file mode 100644
index 09bfb6682..000000000
--- a/package/mini_httpd/ipkg/mini-httpd-openssl.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: mini-httpd-openssl
-Priority: optional
-Section: net
-Description: A small HTTP server, built with SSL support using OpenSSL.
-Depends: libopenssl
diff --git a/package/mini_httpd/ipkg/mini-httpd.control b/package/mini_httpd/ipkg/mini-httpd.control
deleted file mode 100644
index 6466feed2..000000000
--- a/package/mini_httpd/ipkg/mini-httpd.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: mini-httpd
-Priority: optional
-Section: net
-Description: A small HTTP server, built with SSL support using MatrixSSL.
-Depends: libmatrixssl