[pkgsrc/trunk]: pkgsrc/www/apache2 Convert to use bsd.options.mk: APACHE_SUEX...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cdb32420cc25
branches:  trunk
changeset: 483947:cdb32420cc25
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Nov 22 20:25:26 2004 +0000

description:
Convert to use bsd.options.mk: APACHE_SUEXEC is now the "suexec" option.

diffstat:

 www/apache2/Makefile   |  26 +++++---------------------
 www/apache2/options.mk |  33 +++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 21 deletions(-)

diffs (84 lines):

diff -r d0a0b92ccc39 -r cdb32420cc25 www/apache2/Makefile
--- a/www/apache2/Makefile      Mon Nov 22 20:16:17 2004 +0000
+++ b/www/apache2/Makefile      Mon Nov 22 20:25:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2004/11/22 19:56:23 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2004/11/22 20:25:26 jlam Exp $
 
 PKGNAME=               apache-${APACHE_VERSION}
 PKGREVISION=           2
@@ -51,26 +51,8 @@
 CONFIGURE_ARGS+=       --enable-modules="${APACHE_MODULES}"
 BUILD_DEFS+=           APACHE_MODULES
 
-APACHE_USER?=  www
-APACHE_GROUP?= www
-
-.if defined(APACHE_SUEXEC) && !empty(APACHE_SUEXEC:M[yY][eE][sS])
-APACHE_SUEXEC_DOCROOT?= ${PREFIX}/share/httpd/htdocs
-APACHE_SUEXEC_PATH=     /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin
-APACHE_SUEXEC_CONFIGURE_ARGS+=                                         \
-                       --with-suexec-bin=${PREFIX}/sbin/suexec         \
-                       --with-suexec-caller=${APACHE_USER}             \
-                       --with-suexec-safepath='${APACHE_SUEXEC_PATH}'  \
-                       --with-suexec-docroot=${APACHE_SUEXEC_DOCROOT}  \
-                       --with-suexec-logfile=${VARBASE}/log/httpd/suexec.log
-APACHE_MODULES+=       suexec
-CONFIGURE_ARGS+=       ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*}
-BUILD_DEFS+=           APACHE_SUEXEC APACHE_SUEXEC_CONFIGURE_ARGS
-PLIST_SUBST+=          SUEXEC_COMMENT=
-.else
-PLIST_SUBST+=          SUEXEC_COMMENT="@comment "
-.endif
-
+APACHE_USER?=          www
+APACHE_GROUP?=         www
 PKG_GROUPS=            ${APACHE_GROUP}
 PKG_USERS=             ${APACHE_USER}:${APACHE_GROUP}::Apache\\ user
 
@@ -112,6 +94,8 @@
                        -e "s|^\(Group[  ]\).*|\1${APACHE_GROUP}|g"
 SUBST_MESSAGE.confs=   "Fixing configuration files."
 
+.include "options.mk"
+
 # Add dependencies for the modules that will be built.  For each module
 # ap_mod listed in ${APACHE_MODULES}, _AP_DEPENDS.ap_mod is a whitespace
 # separated list of dependencies or buildlink3.mk files needed to build
diff -r d0a0b92ccc39 -r cdb32420cc25 www/apache2/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/apache2/options.mk    Mon Nov 22 20:25:26 2004 +0000
@@ -0,0 +1,33 @@
+# $NetBSD: options.mk,v 1.1 2004/11/22 20:25:26 jlam Exp $
+#
+# XXX Support for the following variables will be removed after the
+# XXX pkgsrc-2004Q4 branch is released:
+# XXX
+# XXX APACHE_SUEXEC
+
+.if defined(APACHE_SUEXEC) && !empty(APACHE_SUEXEC:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+=  suexec
+.endif
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.apache
+PKG_SUPPORTED_OPTIONS= suexec
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Msuexec)
+APACHE_SUEXEC_DOCROOT?=        ${PREFIX}/share/httpd/htdocs
+APACHE_SUEXEC_PATH=    /bin:/usr/bin:${PREFIX}/bin:/usr/local/bin
+APACHE_SUEXEC_CONFIGURE_ARGS+=                                         \
+       --with-suexec-bin=${PREFIX}/sbin/suexec                         \
+       --with-suexec-caller=${APACHE_USER}                             \
+       --with-suexec-safepath='${APACHE_SUEXEC_PATH}'                  \
+       --with-suexec-docroot=${APACHE_SUEXEC_DOCROOT}                  \
+       --with-suexec-logfile=${VARBASE}/log/httpd/suexec.log
+
+APACHE_MODULES+=        suexec
+CONFIGURE_ARGS+=        ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*}
+BUILD_DEFS+=            APACHE_SUEXEC_CONFIGURE_ARGS
+PLIST_SUBST+=           SUEXEC_COMMENT=
+.else
+PLIST_SUBST+=           SUEXEC_COMMENT="@comment "
+.endif