3 files changed, 20 insertions, 75 deletions
diff --git a/package/mini_httpd/Config.in b/package/mini_httpd/Config.in
deleted file mode 100644
index bd83fdb09..000000000
--- a/package/mini_httpd/Config.in
+++ /dev/null
@@ -1,66 +0,0 @@
-config ADK_COMPILE_MINI_HTTPD
-	tristate
-	default n
-	depends on ADK_PACKAGE_MINI_HTTPD || ADK_PACKAGE_MINI_HTTPD_OPENSSL
-
-config ADK_PACKAGE_MINI_HTTPD
-	prompt "mini-httpd........................ A small web server"
-	tristate
-	default n
-	select ADK_COMPILE_MINI_HTTPD
-	help
-	  mini_httpd is a small HTTP server. Its performance is not great, but for
-	  low or medium traffic sites it's quite adequate. It implements all the
-	  basic features of an HTTP server, including:
-	  
-	     * GET, HEAD, and POST methods.
-	     * CGI.
-	     * Basic authentication.
-	     * Security against ".." filename snooping.
-	     * The common MIME types.
-	     * Trailing-slash redirection.
-	     * index.html, index.htm, index.cgi
-	     * Directory listings.
-	     * Multihoming / virtual hosting.
-	     * Standard logging.
-	     * Custom error pages.
-	  
-	  It can also be configured to do IPv6.
-	  
-	  http://www.acme.com/software/mini_httpd/
-
-config ADK_PACKAGE_MINI_HTTPD_HTPASSWD
-	prompt "mini-httpd-htpasswd............... Utility to generate HTTP access files"
-	tristate
-	default n
-	select ADK_PACKAGE_MINI_HTTPD
-	help
-		This file generates .htaccess/.htpasswd files to use HTTP access		authentication
-
-
-config ADK_PACKAGE_MINI_HTTPD_OPENSSL
-	prompt "mini-httpd-openssl................ A small web server, built with SSL support using OpenSSL"
-	tristate
-	default n
-	select ADK_COMPILE_MINI_HTTPD
-	select ADK_PACKAGE_LIBOPENSSL
-	help
-	  mini_httpd is a small HTTP server. Its performance is not great, but for
-	  low or medium traffic sites it's quite adequate. It implements all the
-	  basic features of an HTTP server, including:
-	  
-	     * GET, HEAD, and POST methods.
-	     * CGI.
-	     * Basic authentication.
-	     * Security against ".." filename snooping.
-	     * The common MIME types.
-	     * Trailing-slash redirection.
-	     * index.html, index.htm, index.cgi
-	     * Directory listings.
-	     * Multihoming / virtual hosting.
-	     * Standard logging.
-	     * Custom error pages.
-	  
-	  It can also be configured to do SSL/HTTPS and IPv6.
-	  
-	  http://www.acme.com/software/mini_httpd/
diff --git a/package/mini_httpd/Makefile b/package/mini_httpd/Makefile
index e43e7f4bf..569fd98d7 100644
--- a/package/mini_httpd/Makefile
+++ b/package/mini_httpd/Makefile
@@ -9,21 +9,28 @@ PKG_RELEASE:=		10
 PKG_MD5SUM:=		7c68293ad265ecfe2edea917912f6f1f
 PKG_DESCR:=		A small HTTP server
 PKG_SECTION:=		net
+ifneq ($(ADK_PACKAGE_MINI_HTTPD_OPENSSL),)
+PKG_DEPENDS:=		libopenssl
+PKG_BUILDDEP+=		openssl
+endif
 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},${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}))
+$(eval $(call PKG_template,MINI_HTTPD,mini-httpd,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MINI_HTTPD_HTPASSWD,mini-httpd-htpasswd,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION}))
+$(eval $(call PKG_template,MINI_HTTPD_OPENSSL,mini-httpd-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_2},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
 
 do-build:
 	# with OpenSSL
@@ -48,19 +55,23 @@ do-install:
 	# without SSL
 ifneq (${ADK_PACKAGE_MINI_HTTPD},)
 	${INSTALL_DIR} ${IDIR_MINI_HTTPD}/etc
-	${INSTALL_DATA} ./files/mini_httpd.conf ${IDIR_MINI_HTTPD}/etc/mini_httpd.conf
+	${INSTALL_DATA} ./files/mini_httpd.conf \
+		${IDIR_MINI_HTTPD}/etc/mini_httpd.conf
 	${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_BIN} ${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
-	${INSTALL_DATA} ./files/mini_httpd-ssl.conf ${IDIR_MINI_HTTPD_OPENSSL}/etc/mini_httpd.conf
+	${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_DIR} ${IDIR_MINI_HTTPD_OPENSSL}/usr/sbin
-	${INSTALL_BIN} ${WRKBUILD}/mini_httpd-openssl ${IDIR_MINI_HTTPD_OPENSSL}/usr/sbin/mini_httpd
+	${INSTALL_BIN} ${WRKBUILD}/mini_httpd-openssl \
+		${IDIR_MINI_HTTPD_OPENSSL}/usr/sbin/mini_httpd
 endif
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mini_httpd/files/mini_httpd.init b/package/mini_httpd/files/mini_httpd.init
index 9cf60b3ee..53411d41c 100644
--- a/package/mini_httpd/files/mini_httpd.init
+++ b/package/mini_httpd/files/mini_httpd.init
@@ -14,7 +14,7 @@ start)
 	mini_httpd $mini_httpd_flags
 	;;
 stop)
-	killall mini_httpd
+	pkill mini_httpd
 	;;
 restart)
 	sh $0 stop