[pkgsrc/trunk]: pkgsrc/www/apache24 Installation fix

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ee5ec1d8a765
branches:  trunk
changeset: 602461:ee5ec1d8a765
user:      adam <adam%pkgsrc.org@localhost>
date:      Sat Apr 14 12:46:46 2012 +0000

description:
Installation fix

diffstat:

 www/apache24/Makefile |  41 ++++++++++++++++++++---------------------
 www/apache24/PLIST    |   3 +--
 2 files changed, 21 insertions(+), 23 deletions(-)

diffs (90 lines):

diff -r ad10994669f1 -r ee5ec1d8a765 www/apache24/Makefile
--- a/www/apache24/Makefile     Sat Apr 14 12:11:56 2012 +0000
+++ b/www/apache24/Makefile     Sat Apr 14 12:46:46 2012 +0000
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2012/04/13 18:50:48 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.2 2012/04/14 12:46:46 adam Exp $
 
 DISTNAME=      httpd-2.4.1
 PKGNAME=       ${DISTNAME:S/httpd/apache/}
@@ -20,22 +19,19 @@
 BUILD_DEFS+=   VARBASE
 BUILD_DEFS+=   APACHE_CUSTOM_CFLAGS
 
-GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes
 USE_TOOLS+=            pax perl pkg-config
-
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --enable-layout=NetBSD
+CONFIGURE_ARGS+=       --enable-mods-shared=all
+CONFIGURE_ARGS+=       --enable-so
+CONFIGURE_ARGS+=       --with-apr=${BUILDLINK_PREFIX.apr}
+CONFIGURE_ARGS+=       --with-apr-util=${BUILDLINK_PREFIX.apr-util}
+CONFIGURE_ARGS+=       --with-port=80
 CONFIGURE_ENV+=                perlbin=${PERL5:Q}
 CONFIGURE_ENV+=                ac_cv_path_RSYNC=/nonexistent
 CONFIGURE_ENV+=                CFLAGS=${APACHE_CUSTOM_CFLAGS:M*:Q}
 
-CONFIGURE_ARGS+=       --enable-layout=NetBSD
-CONFIGURE_ARGS+=       --with-port=80
-CONFIGURE_ARGS+=       --enable-so
-CONFIGURE_ARGS+=       --enable-mods-shared=all
-
-CONFIGURE_ARGS+=       --with-apr=${BUILDLINK_PREFIX.apr}
-CONFIGURE_ARGS+=       --with-apr-util=${BUILDLINK_PREFIX.apr-util}
-
 .include "../../mk/bsd.prefs.mk"
 .include "../../devel/apr/buildlink3.mk"
 .include "../../devel/apr-util/buildlink3.mk"
@@ -45,20 +41,23 @@
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
-CONFIGURE_ARGS+=       --disable-include
-CONFIGURE_ARGS+=       --disable-log-config
-CONFIGURE_ARGS+=       --disable-env
-CONFIGURE_ARGS+=       --disable-mime
-CONFIGURE_ARGS+=       --disable-setenvif
-CONFIGURE_ARGS+=       --disable-status
+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-lua
+CONFIGURE_ARGS+=       --disable-mime
 CONFIGURE_ARGS+=       --disable-negotiation
-CONFIGURE_ARGS+=       --disable-dir
-CONFIGURE_ARGS+=       --disable-actions
+CONFIGURE_ARGS+=       --disable-proxy-html
+CONFIGURE_ARGS+=       --disable-setenvif
+CONFIGURE_ARGS+=       --disable-status
 CONFIGURE_ARGS+=       --disable-userdir
-CONFIGURE_ARGS+=       --disable-alias
+CONFIGURE_ARGS+=       --disable-xml2enc
 
 DFLT_APACHE_MODULES+=  all
 APACHE_MODULES?=       ${DFLT_APACHE_MODULES}
diff -r ad10994669f1 -r ee5ec1d8a765 www/apache24/PLIST
--- a/www/apache24/PLIST        Sat Apr 14 12:11:56 2012 +0000
+++ b/www/apache24/PLIST        Sat Apr 14 12:46:46 2012 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/04/13 18:50:49 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/04/14 12:46:46 adam Exp $
 bin/ab
 bin/apxs
 bin/dbmmanage
@@ -117,7 +117,6 @@
 lib/httpd/mod_log_debug.so
 lib/httpd/mod_log_forensic.so
 lib/httpd/mod_logio.so
-lib/httpd/mod_lua.so
 lib/httpd/mod_mime_magic.so
 lib/httpd/mod_proxy.so
 lib/httpd/mod_proxy_ajp.so