diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-25 21:50:52 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-25 21:50:52 +0000 |
| commit | a020ed9056d4d74e13cd2a99898f3dec09c162b7 (patch) | |
| tree | f54fdc39f5381d6b58a06e7e3ed458f63f0e9df2 /www/apache2/Makefile | |
| parent | 287b5c5601b23446d25c27bbf0140c8dc4b4391e (diff) | |
| download | pkgsrc-a020ed9056d4d74e13cd2a99898f3dec09c162b7.tar.gz | |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'www/apache2/Makefile')
| -rw-r--r-- | www/apache2/Makefile | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 48174c447a3..90916d9a928 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/07/30 18:40:15 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2002/08/25 21:51:53 jlam Exp $ DISTNAME= httpd-${APACHE_VERSION} PKGNAME= apache-${APACHE_VERSION} @@ -19,10 +19,7 @@ CONFLICTS+= ap-*-[0-9]* # Apache-1.x DSOs BUILD_DEFS+= USE_INET6 -USE_BUILDLINK_ONLY= YES -REPLACE_BUILDLINK= config_vars.mk -REPLACE_BUILDLINK_SED= -e "s|${BUILDLINK_DIR}|${LOCALBASE}|g" - +USE_BUILDLINK2= YES USE_GMAKE= YES USE_LIBTOOL= YES @@ -39,7 +36,7 @@ CONFIGURE_ARGS+= --with-mpm=prefork --with-devrandom=/dev/urandom # Apache Portable Runtime Utility library configure options CONFIGURE_ARGS+= --with-dbm=sdbm -CONFIGURE_ARGS+= --with-expat=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-expat=${BUILDLINK_PREFIX.expat} .include "../../mk/bsd.prefs.mk" @@ -94,15 +91,15 @@ OWN_DIRS_PERMS+= /var/db/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755 # 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 buildlink.mk files needed to build +# separated list of dependencies or buildlink2.mk files needed to build # ap_mod, and _AP_CFG_ARGS.ap_mod is a whitespace separated list of # configure script options for ap_mod. # -_AP_DEPENDS.ssl= ../../security/openssl/buildlink.mk -_AP_DEPENDS.deflate= ../../devel/zlib/buildlink.mk +_AP_DEPENDS.ssl= ../../security/openssl/buildlink2.mk +_AP_DEPENDS.deflate= ../../devel/zlib/buildlink2.mk -_AP_CFG_ARGS.ssl= --with-ssl=${BUILDLINK_DIR} -_AP_CFG_ARGS.deflate= --with-z=${BUILDLINK_DIR} +_AP_CFG_ARGS.ssl= --with-ssl=${BUILDLINK_PREFIX.openssl} +_AP_CFG_ARGS.deflate= --with-z=${BUILDLINK_PREFIX.zlib} .for _ap_mod in ${APACHE_MODULES} . if defined(_AP_DEPENDS.${_ap_mod}) && !empty(_AP_DEPENDS.${_ap_mod}) @@ -158,7 +155,8 @@ post-install: done ${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache -.include "../../lang/perl5/buildlink.mk" -.include "../../textproc/expat/buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" +.include "../../textproc/expat/buildlink2.mk" + .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" |