From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 7 Feb 2010 20:03:20 +0100
Subject: change defaults for CONFIG/BUILD/INSTALL styles

All packages need an update, so here is a very huge commit.
Most of the 460 source packages use automatic style for configuration,
building and installing. Make these styles default to "auto".
If you have a package, which does not conform to this, just use
manual style and add a do-$task make target.

I added a new style named AUTOTOOL style, which is needed for some
broken packages, which needs to be updated via autoconf or automake.

I renamed CONFIGURE_STYLE to CONFIG_STYLE.

Updates for some packages, which have newer upstream versions.

Renaming of all package/*/extra directories. Use the directory
src/ to provide overwrites of source files or to add the code, when
no upstream package is available or used. src directory will be automatically
used.
---
 package/mini_httpd/Makefile | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

(limited to 'package/mini_httpd/Makefile')

diff --git a/package/mini_httpd/Makefile b/package/mini_httpd/Makefile
index 3c86442a4..569fd98d7 100644
--- a/package/mini_httpd/Makefile
+++ b/package/mini_httpd/Makefile
@@ -6,27 +6,31 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		mini-httpd
 PKG_VERSION:=		1.19
 PKG_RELEASE:=		10
-ifneq ($(ADK_PACKAGE_MINI_HTTPD_OPENSSL),)
-PKG_BUILDDEP+=		openssl
-endif
 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
@@ -51,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
-- 
cgit v1.2.3