[pkgsrc/trunk]: pkgsrc/www/apache2 Use BUILDLINK_PREFIX.apr to refer to the i...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6f093128ba1c
branches:  trunk
changeset: 483902:6f093128ba1c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Nov 22 07:12:53 2004 +0000

description:
Use BUILDLINK_PREFIX.apr to refer to the installed location of the apr
package.  Also, remove the need for a separate SUEXEC_COMMENT variable.

diffstat:

 www/apache2/Makefile |  16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diffs (49 lines):

diff -r 92f9cac907ba -r 6f093128ba1c www/apache2/Makefile
--- a/www/apache2/Makefile      Mon Nov 22 02:21:13 2004 +0000
+++ b/www/apache2/Makefile      Mon Nov 22 07:12:53 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2004/11/10 01:09:10 epg Exp $
+# $NetBSD: Makefile,v 1.51 2004/11/22 07:12:53 jlam Exp $
 
 PKGNAME=               apache-${APACHE_VERSION}
 PKGREVISION=           2
@@ -25,8 +25,8 @@
 CONFIGURE_ARGS+=       --with-mpm=prefork
 
 # Apache Portable Runtime library configure options
-CONFIGURE_ARGS+=       --with-apr=${LOCALBASE}
-CONFIGURE_ARGS+=       --with-apr-util=${LOCALBASE}
+CONFIGURE_ARGS+=       --with-apr=${BUILDLINK_PREFIX.apr}
+CONFIGURE_ARGS+=       --with-apr-util=${BUILDLINK_PREFIX.apr}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -48,8 +48,7 @@
 APACHE_USER?=  www
 APACHE_GROUP?= www
 
-SUEXEC_COMMENT?=       "@comment "
-.if defined(APACHE_SUEXEC) && ${APACHE_SUEXEC} == YES
+.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+=                                         \
@@ -61,15 +60,14 @@
 APACHE_MODULES+=       suexec
 CONFIGURE_ARGS+=       ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*}
 BUILD_DEFS+=           APACHE_SUEXEC APACHE_SUEXEC_CONFIGURE_ARGS
-SUEXEC_COMMENT=                # empty
-
+PLIST_SUBST+=          SUEXEC_COMMENT=
+.else
+PLIST_SUBST+=          SUEXEC_COMMENT="@comment "
 .endif
 
 PKG_GROUPS=            ${APACHE_GROUP}
 PKG_USERS=             ${APACHE_USER}:${APACHE_GROUP}::Apache\\ user
 
-PLIST_SUBST+=          SUEXEC_COMMENT=${SUEXEC_COMMENT}
-
 PKG_SYSCONFVAR=                apache
 PKG_SYSCONFSUBDIR?=    httpd
 EGDIR=                 ${PREFIX}/share/examples/httpd