diff options
| author | jlam <jlam> | 2004-11-22 07:12:53 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-11-22 07:12:53 +0000 |
| commit | da69ca2375e07fc1a04d92064abc5a604da68584 (patch) | |
| tree | 9c856b678658fca884a64fd79b836b446e50195f /www/apache2 | |
| parent | fe1549b7af08de262cec71a4d99c8d431d584529 (diff) | |
| download | pkgsrc-da69ca2375e07fc1a04d92064abc5a604da68584.tar.gz | |
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 (limited to 'www/apache2')
| -rw-r--r-- | www/apache2/Makefile | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 1ca6b9e0bb5..d3bb001761e 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -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-port=80 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 @@ BUILD_DEFS+= APACHE_MODULES 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_SUEXEC_CONFIGURE_ARGS+= \ 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 |