remove PKG_MULTI var, add a more flexible method

1 files changed, 27 insertions, 14 deletions

diff --git a/package/lighttpd/Makefile b/package/lighttpd/Makefile
index 1b360ab47..6b639ed0c 100644
--- a/package/lighttpd/Makefile
+++ b/package/lighttpd/Makefile
@@ -12,7 +12,6 @@ PKG_SECTION:=		www
 PKG_DEPENDS:=		libgcc
 PKG_URL:=		http://www.lighttpd.net/
 PKG_SITES:=		http://download.lighttpd.net/lighttpd/releases-1.4.x/
-PKG_MULTI:=		1
 
 PKG_FLAVOURS_LIGHTTPD:=	WITH_IPV6 WITH_SSL
 PKGFD_WITH_IPV6:=	enable IPv6 support
@@ -21,30 +20,46 @@ PKGFB_WITH_SSL:=	openssl
 PKGFS_WITH_SSL:=	libopenssl
 
 PKG_SUBPKGS:=		LIGHTTPD LIGHTTPD_MOD_ALIAS LIGHTTPD_MOD_AUTH
-PKG_SUBPKGS+=		LIGHTTPD_MOD_CGI LIGHTTPD_MOD_DIRLISTING LIGHTTPD_MOD_EVASIVE LIGHTTPD_MOD_EXPIRE LIGHTTPD_MOD_FASTCGI
+PKG_SUBPKGS+=		LIGHTTPD_MOD_CGI LIGHTTPD_MOD_DIRLIST LIGHTTPD_MOD_EVASIVE LIGHTTPD_MOD_EXPIRE LIGHTTPD_MOD_FASTCGI
 PKG_SUBPKGS+=		LIGHTTPD_MOD_PROXY LIGHTTPD_MOD_REDIRECT LIGHTTPD_MOD_REWRITE LIGHTTPD_MOD_SETENV
-PKG_SUBPKGS+=		LIGHTTPD_MOD_SIMPLE_VHOST LIGHTTPD_MOD_SSI LIGHTTPD_MOD_STATUS LIGHTTPD_MOD_USERTRACK
+PKG_SUBPKGS+=		LIGHTTPD_MOD_VHOST LIGHTTPD_MOD_SSI LIGHTTPD_MOD_STATUS LIGHTTPD_MOD_USERTRACK
 PKG_SUBPKGS+=		LIGHTTPD_MOD_WEBDAV
 PKGSD_LIGHTTPD_MOD_ALIAS:=	alias support
+PKGSN_LIGHTTPD_MOD_ALIAS:=	lighttpd
 PKGSD_LIGHTTPD_MOD_AUTH:=	authentication support
+PKGSN_LIGHTTPD_MOD_AUTH:=	lighttpd
 PKGSD_LIGHTTPD_MOD_CGI:=	CGI support
-PKGSD_LIGHTTPD_MOD_DIRLISTING:=	Dirlisting support
-PKGSB_LIGHTTPD_MOD_DIRLISTING:=	pcre
-PKGSS_LIGHTTPD_MOD_DIRLISTING:= libpcre
+PKGSN_LIGHTTPD_MOD_CGI:=	lighttpd
+PKGSD_LIGHTTPD_MOD_DIRLIST:=	Dirlisting support
+PKGSB_LIGHTTPD_MOD_DIRLIST:=	pcre
+PKGSS_LIGHTTPD_MOD_DIRLIST:=	libpcre
+PKGSN_LIGHTTPD_MOD_DIRLIST:=	lighttpd
 PKGSD_LIGHTTPD_MOD_EVASIVE:=	Evasive support
+PKGSN_LIGHTTPD_MOD_EVASIVE:=	lighttpd
 PKGSD_LIGHTTPD_MOD_EXPIRE:=	Expire support
+PKGSN_LIGHTTPD_MOD_EXPIRE:=	lighttpd
 PKGSD_LIGHTTPD_MOD_FASTCGI:=	FastCGI support
+PKGSN_LIGHTTPD_MOD_FASTCGI:=	lighttpd
 PKGSD_LIGHTTPD_MOD_PROXY:=	Proxy support
+PKGSN_LIGHTTPD_MOD_PROXY:=	lighttpd
 PKGSD_LIGHTTPD_MOD_REDIRECT:=	Redirect support
+PKGSN_LIGHTTPD_MOD_REDIRECT:=	lighttpd
 PKGSD_LIGHTTPD_MOD_REWRITE:=	Rewrite support
+PKGSN_LIGHTTPD_MOD_REWRITE:=	lighttpd
 PKGSD_LIGHTTPD_MOD_SETENV:=	Setenv support
-PKGSD_LIGHTTPD_MOD_SIMPLE_VHOST:= 	Simple Vhost support
+PKGSN_LIGHTTPD_MOD_SETENV:=	lighttpd
+PKGSD_LIGHTTPD_MOD_VHOST:=	Simple Vhost support
+PKGSN_LIGHTTPD_MOD_VHOST:=	lighttpd
 PKGSD_LIGHTTPD_MOD_SSI:=	SSI support
+PKGSN_LIGHTTPD_MOD_SSI:=	lighttpd
 PKGSD_LIGHTTPD_MOD_STATUS:=	Status support
+PKGSN_LIGHTTPD_MOD_STATUS:=	lighttpd
 PKGSD_LIGHTTPD_MOD_USERTRACK:=	Usertracking support
+PKGSN_LIGHTTPD_MOD_USERTRACK:=	lighttpd
 PKGSD_LIGHTTPD_MOD_WEBDAV:=	Webdav support
 PKGSB_LIGHTTPD_MOD_WEBDAV:=	libxml2 sqlite
 PKGSS_LIGHTTPD_MOD_WEBDAV:=	libxml2 libsqlite
+PKGSN_LIGHTTPD_MOD_WEBDAV:=	lighttpd
 
 include $(TOPDIR)/mk/package.mk
 
@@ -62,7 +77,7 @@ $(eval $(call PKG_template,LIGHTTPD,lighttpd,$(PKG_VERSION)-${PKG_RELEASE},${PKG
 $(eval $(call PKG_template,LIGHTTPD_MOD_ALIAS,lighttpd-mod-alias,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_ALIAS},${PKG_SECTION}))
 $(eval $(call PKG_template,LIGHTTPD_MOD_AUTH,lighttpd-mod-auth,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_AUTH},${PKG_SECTION}))
 $(eval $(call PKG_template,LIGHTTPD_MOD_CGI,lighttpd-mod-cgi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_CGI},${PKG_SECTION}))
-$(eval $(call PKG_template,LIGHTTPD_MOD_DIRLISTING,lighttpd-mod-dirlisting,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_DIRLISTING},${PKG_SECTION}))
+$(eval $(call PKG_template,LIGHTTPD_MOD_DIRLIST,lighttpd-mod-dirlist,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_DIRLIST},${PKG_SECTION}))
 $(eval $(call PKG_template,LIGHTTPD_MOD_EVASIVE,lighttpd-mod-evasive,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_EVASIVE},${PKG_SECTION}))
 $(eval $(call PKG_template,LIGHTTPD_MOD_EXPIRE,lighttpd-mod-expire,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_EXPIRE},${PKG_SECTION}))
 $(eval $(call PKG_template,LIGHTTPD_MOD_FASTCGI,lighttpd-mod-fastcgi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_FASTCGI},${PKG_SECTION}))
@@ -70,7 +85,7 @@ $(eval $(call PKG_template,LIGHTTPD_MOD_PROXY,lighttpd-mod-proxy,$(PKG_VERSION)-
 $(eval $(call PKG_template,LIGHTTPD_MOD_REDIRECT,lighttpd-mod-redirect,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_REDIRECT},${PKG_SECTION}))
 $(eval $(call PKG_template,LIGHTTPD_MOD_REWRITE,lighttpd-mod-rewrite,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_REWRITE},${PKG_SECTION}))
 $(eval $(call PKG_template,LIGHTTPD_MOD_SETENV,lighttpd-mod-setenv,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_SETENV},${PKG_SECTION}))
-$(eval $(call PKG_template,LIGHTTPD_MOD_SIMPLE_VHOST,lighttpd-mod-simple-vhost,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_SIMPLE_VHOST},${PKG_SECTION}))
+$(eval $(call PKG_template,LIGHTTPD_MOD_VHOST,lighttpd-mod-vhost,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_VHOST},${PKG_SECTION}))
 $(eval $(call PKG_template,LIGHTTPD_MOD_SSI,lighttpd-mod-ssi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_SSI},${PKG_SECTION}))
 $(eval $(call PKG_template,LIGHTTPD_MOD_STATUS,lighttpd-mod-status,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_STATUS},${PKG_SECTION}))
 $(eval $(call PKG_template,LIGHTTPD_MOD_USERTRACK,lighttpd-mod-usertrack,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIGHTTPD_MOD_USERTRACK},${PKG_SECTION}))
@@ -79,7 +94,7 @@ $(eval $(call PKG_template,LIGHTTPD_MOD_WEBDAV,lighttpd-mod-webdav,$(PKG_VERSION
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_ALIAS,alias))
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_AUTH,auth))
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_CGI,cgi))
-$(eval $(call PKG_mod_template,LIGHTTPD_MOD_DIRLISTING,dirlisting))
+$(eval $(call PKG_mod_template,LIGHTTPD_MOD_DIRLIST,dirlisting))
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_EVASIVE,evasive))
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_EXPIRE,expire))
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_FASTCGI,fastcgi))
@@ -87,13 +102,12 @@ $(eval $(call PKG_mod_template,LIGHTTPD_MOD_PROXY,proxy))
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_REDIRECT,redirect))
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_REWRITE,rewrite))
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_SETENV,setenv))
-$(eval $(call PKG_mod_template,LIGHTTPD_MOD_SIMPLE_VHOST,simple_vhost))
+$(eval $(call PKG_mod_template,LIGHTTPD_MOD_VHOST,simple_vhost))
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_SSI,ssi))
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_STATUS,status))
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_USERTRACK,usertrack))
 $(eval $(call PKG_mod_template,LIGHTTPD_MOD_WEBDAV,webdav))
 
-#TARGET_CPPFLAGS+=	-I$(STAGING_TARGET_DIR)/usr/include/libxml2
 CONFIGURE_ARGS+=	--libdir=/usr/lib/lighttpd \
 			--sysconfdir=/etc/lighttpd \
 			--without-attr \
@@ -115,7 +129,7 @@ CONFIGURE_ARGS+=	--without-webdav-props \
 			--without-webdav-locks
 endif
 
-ifneq ($(ADK_PACKAGE_LIGHTTPD_MOD_SSI)$(ADK_PACKAGE_LIGHTTPD_MOD_DIRLISTING)$(ADK_PACKAGE_LIGHTTPD_MOD_REWRITE)$(ADK_PACKAGE_LIGHTTPD_MOD_REDIRECT),)
+ifneq ($(ADK_PACKAGE_LIGHTTPD_MOD_SSI)$(ADK_PACKAGE_LIGHTTPD_MOD_DIRLIST)$(ADK_PACKAGE_LIGHTTPD_MOD_REWRITE)$(ADK_PACKAGE_LIGHTTPD_MOD_REDIRECT),)
 CONFIGURE_ARGS+=	--with-pcre
 CONFIGURE_ENV+=		PCRE_LIB="-lpcre"
 else
@@ -133,7 +147,6 @@ else
 CONFIGURE_ARGS+=	--without-openssl
 endif
 
-
 post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m}
 	${INSTALL_DIR} $(IDIR_LIGHTTPD)/etc/lighttpd/conf.d
 	${INSTALL_DATA} ./files/lighttpd.conf $(IDIR_LIGHTTPD)/etc/lighttpd