Bump PKGREVISION.

* Add some modules like apache22
* Fix lua option build

3 files changed, 21 insertions, 19 deletions

diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index ce3d3f34184..6a56c941a62 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2012/04/14 20:44:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2012/04/15 12:23:49 ryoon Exp $
 
 DISTNAME=	httpd-2.4.1
 PKGNAME=	${DISTNAME:S/httpd/apache/}
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE:=httpd/} \
 		http://archive.apache.org/dist/httpd/ \
@@ -41,21 +42,6 @@ CONFIGURE_ENV+=		CFLAGS=${APACHE_CUSTOM_CFLAGS:M*:Q}
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
-CONFIGURE_ARGS+=	--disable-actions
-CONFIGURE_ARGS+=	--disable-alias
-CONFIGURE_ARGS+=	--disable-autoindex
-CONFIGURE_ARGS+=	--disable-asis
-CONFIGURE_ARGS+=	--disable-cgi
-CONFIGURE_ARGS+=	--disable-dir
-CONFIGURE_ARGS+=	--disable-env
-CONFIGURE_ARGS+=	--disable-include
-CONFIGURE_ARGS+=	--disable-log-config
-CONFIGURE_ARGS+=	--disable-mime
-CONFIGURE_ARGS+=	--disable-negotiation
-CONFIGURE_ARGS+=	--disable-proxy-html
-CONFIGURE_ARGS+=	--disable-setenvif
-CONFIGURE_ARGS+=	--disable-status
-CONFIGURE_ARGS+=	--disable-userdir
 CONFIGURE_ARGS+=	--disable-xml2enc
 
 DFLT_APACHE_MODULES+=	all
diff --git a/www/apache24/PLIST b/www/apache24/PLIST
index d898e20bc0e..a42f0bcd86a 100644
--- a/www/apache24/PLIST
+++ b/www/apache24/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/04/14 20:44:44 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/04/15 12:23:49 ryoon Exp $
 bin/ab
 bin/apxs
 bin/dbmmanage
@@ -69,7 +69,10 @@ include/httpd/util_varbuf.h
 include/httpd/util_xml.h
 lib/httpd/httpd.exp
 lib/httpd/mod_access_compat.so
+lib/httpd/mod_actions.so
+lib/httpd/mod_alias.so
 lib/httpd/mod_allowmethods.so
+lib/httpd/mod_asis.so
 lib/httpd/mod_auth_basic.so
 lib/httpd/mod_auth_digest.so
 lib/httpd/mod_auth_form.so
@@ -87,9 +90,11 @@ lib/httpd/mod_authz_groupfile.so
 lib/httpd/mod_authz_host.so
 lib/httpd/mod_authz_owner.so
 lib/httpd/mod_authz_user.so
+lib/httpd/mod_autoindex.so
 lib/httpd/mod_buffer.so
 lib/httpd/mod_cache.so
 lib/httpd/mod_cache_disk.so
+${PLIST.prefork}lib/httpd/mod_cgi.so
 ${PLIST.worker}lib/httpd/mod_cgid.so
 lib/httpd/mod_charset_lite.so
 lib/httpd/mod_data.so
@@ -99,8 +104,10 @@ lib/httpd/mod_dav_lock.so
 lib/httpd/mod_dbd.so
 lib/httpd/mod_deflate.so
 lib/httpd/mod_dialup.so
+lib/httpd/mod_dir.so
 lib/httpd/mod_dumpio.so
 lib/httpd/mod_echo.so
+lib/httpd/mod_env.so
 lib/httpd/mod_expires.so
 lib/httpd/mod_ext_filter.so
 lib/httpd/mod_file_cache.so
@@ -108,17 +115,21 @@ lib/httpd/mod_filter.so
 lib/httpd/mod_headers.so
 lib/httpd/mod_heartbeat.so
 lib/httpd/mod_heartmonitor.so
+lib/httpd/mod_include.so
 lib/httpd/mod_info.so
 lib/httpd/mod_lbmethod_bybusyness.so
 lib/httpd/mod_lbmethod_byrequests.so
 lib/httpd/mod_lbmethod_bytraffic.so
 lib/httpd/mod_lbmethod_heartbeat.so
 ${PLIST.ldap}lib/httpd/mod_ldap.so
+lib/httpd/mod_log_config.so
 lib/httpd/mod_log_debug.so
 lib/httpd/mod_log_forensic.so
 lib/httpd/mod_logio.so
 ${PLIST.lua}lib/httpd/mod_lua.so
+lib/httpd/mod_mime.so
 lib/httpd/mod_mime_magic.so
+lib/httpd/mod_negotiation.so
 lib/httpd/mod_proxy.so
 lib/httpd/mod_proxy_ajp.so
 lib/httpd/mod_proxy_balancer.so
@@ -139,6 +150,7 @@ lib/httpd/mod_sed.so
 lib/httpd/mod_session.so
 lib/httpd/mod_session_cookie.so
 lib/httpd/mod_session_dbd.so
+lib/httpd/mod_setenvif.so
 lib/httpd/mod_slotmem_plain.so
 lib/httpd/mod_slotmem_shm.so
 lib/httpd/mod_socache_dbm.so
@@ -146,9 +158,11 @@ lib/httpd/mod_socache_memcache.so
 lib/httpd/mod_socache_shmcb.so
 lib/httpd/mod_speling.so
 lib/httpd/mod_ssl.so
+lib/httpd/mod_status.so
 lib/httpd/mod_substitute.so
 lib/httpd/mod_unique_id.so
 lib/httpd/mod_unixd.so
+lib/httpd/mod_userdir.so
 lib/httpd/mod_usertrack.so
 lib/httpd/mod_version.so
 lib/httpd/mod_vhost_alias.so
diff --git a/www/apache24/options.mk b/www/apache24/options.mk
index 6e3f61b5dc3..c66d317aa8b 100644
--- a/www/apache24/options.mk
+++ b/www/apache24/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2012/04/14 20:44:44 ryoon Exp $
+# $NetBSD: options.mk,v 1.3 2012/04/15 12:23:49 ryoon Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.apache
 PKG_OPTIONS_REQUIRED_GROUPS=	mpm
@@ -18,7 +18,7 @@ PKG_SUGGESTED_OPTIONS=		apache-mpm-prefork
 #	prefork		non-threaded, pre-forking web server
 #	worker		hybrid multi-threaded multi-process web server
 #
-PLIST_VARS+=		worker
+PLIST_VARS+=		worker prefork
 .if !empty(PKG_OPTIONS:Mapache-mpm-event)
 CONFIGURE_ARGS+=	--with-mpm=event
 PLIST.worker=		yes
@@ -27,6 +27,7 @@ CONFIGURE_ARGS+=	--with-mpm=worker
 PLIST.worker=		yes
 .else
 CONFIGURE_ARGS+=	--with-mpm=prefork
+PLIST.prefork=		yes
 .endif
 
 BUILD_DEFS+=		APACHE_MODULES
@@ -62,6 +63,7 @@ PLIST_VARS+=		lua
 .if !empty(PKG_OPTIONS:Mlua)
 CONFIGURE_ARGS+=	--enable-lua
 .include "../../lang/lua/buildlink3.mk"
+PLIST.lua=		yes
 .else
 CONFIGURE_ARGS+=	--disable-lua
 .endif