pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/apache22 Build all modules shared if APACHE_MODULE...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ee516ca22394
branches:  trunk
changeset: 546305:ee516ca22394
user:      epg <epg%pkgsrc.org@localhost>
date:      Tue Aug 26 20:42:38 2008 +0000

description:
Build all modules shared if APACHE_MODULES=all-shared.  Bump PKGREVISION.

approved by tron

diffstat:

 www/apache22/Makefile         |  15 +++++++++++++--
 www/apache22/PLIST.all-shared |  37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)

diffs (89 lines):

diff -r 76801c6033dd -r ee516ca22394 www/apache22/Makefile
--- a/www/apache22/Makefile     Tue Aug 26 20:26:25 2008 +0000
+++ b/www/apache22/Makefile     Tue Aug 26 20:42:38 2008 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2008/08/22 04:36:00 obache Exp $
+# $NetBSD: Makefile,v 1.30 2008/08/26 20:42:38 epg Exp $
 
 .include "Makefile.common"
 
 PKGNAME=       apache-${APACHE_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 
 HOMEPAGE=      http://httpd.apache.org/
@@ -102,7 +102,12 @@
 # APACHE_MODULES are the modules that are linked statically into the
 # apache httpd executable.
 #
+.if ${APACHE_MODULES} == "all-shared"
+CONFIGURE_ARGS+=       --enable-mods-shared=all
+PLIST_SRC+=            ${PKGDIR}/PLIST.all-shared
+.else
 CONFIGURE_ARGS+=       --enable-modules=${APACHE_MODULES:Q}
+.endif
 BUILD_DEFS+=           APACHE_MODULES
 
 APACHE_USER?=          www
@@ -200,6 +205,11 @@
 AP_CFG_ARGS.ssl=       --with-ssl=${BUILDLINK_PREFIX.openssl}
 AP_CFG_ARGS.deflate=   --with-z=${BUILDLINK_PREFIX.zlib}
 
+.if ${APACHE_MODULES} == "all-shared"
+.include "${AP_DEPENDS.ssl}"
+.include "${AP_DEPENDS.deflate}"
+CONFIGURE_ARGS+=       ${AP_CFG_ARGS.ssl} ${AP_CFG_ARGS.deflate}
+.else
 .for ap_mod in ${APACHE_MODULES}
 .  if defined(AP_DEPENDS.${ap_mod}) && !empty(AP_DEPENDS.${ap_mod})
 .    for ap_depend in ${AP_DEPENDS.${ap_mod}}
@@ -214,6 +224,7 @@
 CONFIGURE_ARGS+=       ${AP_CFG_ARGS.${ap_mod}}
 .  endif
 .endfor
+.endif
 
 post-extract:
        ${TOUCH} ${WRKSRC}/build/libtool
diff -r 76801c6033dd -r ee516ca22394 www/apache22/PLIST.all-shared
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/apache22/PLIST.all-shared     Tue Aug 26 20:42:38 2008 +0000
@@ -0,0 +1,37 @@
+@comment $NetBSD: PLIST.all-shared,v 1.1 2008/08/26 20:42:38 epg Exp $
+lib/httpd/mod_auth_basic.so
+lib/httpd/mod_auth_digest.so
+lib/httpd/mod_authn_anon.so
+lib/httpd/mod_authn_dbd.so
+lib/httpd/mod_authn_dbm.so
+lib/httpd/mod_authn_default.so
+lib/httpd/mod_authn_file.so
+lib/httpd/mod_authz_dbm.so
+lib/httpd/mod_authz_default.so
+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_cern_meta.so
+lib/httpd/mod_dav.so
+lib/httpd/mod_dav_fs.so
+lib/httpd/mod_dbd.so
+lib/httpd/mod_deflate.so
+lib/httpd/mod_dumpio.so
+lib/httpd/mod_expires.so
+lib/httpd/mod_ext_filter.so
+lib/httpd/mod_filter.so
+lib/httpd/mod_headers.so
+lib/httpd/mod_ident.so
+lib/httpd/mod_imagemap.so
+lib/httpd/mod_info.so
+lib/httpd/mod_log_forensic.so
+lib/httpd/mod_logio.so
+lib/httpd/mod_mime_magic.so
+lib/httpd/mod_rewrite.so
+lib/httpd/mod_speling.so
+lib/httpd/mod_substitute.so
+lib/httpd/mod_unique_id.so
+lib/httpd/mod_usertrack.so
+lib/httpd/mod_version.so
+lib/httpd/mod_vhost_alias.so



Home | Main Index | Thread Index | Old Index