summaryrefslogtreecommitdiff
path: root/www/apache24
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2012-04-14 12:46:46 +0000
committeradam <adam@pkgsrc.org>2012-04-14 12:46:46 +0000
commit456b8a4b93b73266ffd1c7292486fd82c513a997 (patch)
tree35f66b7546f70ff48b504cdeb90f338413dbd5f5 /www/apache24
parentc9393280faadf3e132b7d3eaa844c89899ed6373 (diff)
downloadpkgsrc-456b8a4b93b73266ffd1c7292486fd82c513a997.tar.gz
Installation fix
Diffstat (limited to 'www/apache24')
-rw-r--r--www/apache24/Makefile37
-rw-r--r--www/apache24/PLIST3
2 files changed, 19 insertions, 21 deletions
diff --git a/www/apache24/Makefile b/www/apache24/Makefile
index 7f276b09c73..e95ad814afa 100644
--- a/www/apache24/Makefile
+++ b/www/apache24/Makefile
@@ -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,21 +19,18 @@ BUILD_DEFS+= IPV6_READY
BUILD_DEFS+= VARBASE
BUILD_DEFS+= APACHE_CUSTOM_CFLAGS
-GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pax perl pkg-config
-
-CONFIGURE_ENV+= perlbin=${PERL5:Q}
-CONFIGURE_ENV+= ac_cv_path_RSYNC=/nonexistent
-CONFIGURE_ENV+= CFLAGS=${APACHE_CUSTOM_CFLAGS:M*:Q}
-
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-layout=NetBSD
-CONFIGURE_ARGS+= --with-port=80
-CONFIGURE_ARGS+= --enable-so
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}
.include "../../mk/bsd.prefs.mk"
.include "../../devel/apr/buildlink3.mk"
@@ -45,20 +41,23 @@ CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr-util}
.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-env
+CONFIGURE_ARGS+= --disable-lua
CONFIGURE_ARGS+= --disable-mime
+CONFIGURE_ARGS+= --disable-negotiation
+CONFIGURE_ARGS+= --disable-proxy-html
CONFIGURE_ARGS+= --disable-setenvif
CONFIGURE_ARGS+= --disable-status
-CONFIGURE_ARGS+= --disable-autoindex
-CONFIGURE_ARGS+= --disable-asis
-CONFIGURE_ARGS+= --disable-cgi
-CONFIGURE_ARGS+= --disable-negotiation
-CONFIGURE_ARGS+= --disable-dir
-CONFIGURE_ARGS+= --disable-actions
CONFIGURE_ARGS+= --disable-userdir
-CONFIGURE_ARGS+= --disable-alias
+CONFIGURE_ARGS+= --disable-xml2enc
DFLT_APACHE_MODULES+= all
APACHE_MODULES?= ${DFLT_APACHE_MODULES}
diff --git a/www/apache24/PLIST b/www/apache24/PLIST
index 06e45fe3ef5..ca79e5790d4 100644
--- a/www/apache24/PLIST
+++ b/www/apache24/PLIST
@@ -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 @@ ${PLIST.ldap}lib/httpd/mod_ldap.so
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