diff options
author | epg <epg@pkgsrc.org> | 2007-01-24 19:46:45 +0000 |
---|---|---|
committer | epg <epg@pkgsrc.org> | 2007-01-24 19:46:45 +0000 |
commit | 57cea0a4079bd2112dbb5816f664284fc8f8ced6 (patch) | |
tree | a131b63e2a062a545ef489d3a1e888298a8cc94d /www | |
parent | e01ab6e9c00929ab0488d82aa08c01bb2acfb290 (diff) | |
download | pkgsrc-57cea0a4079bd2112dbb5816f664284fc8f8ced6.tar.gz |
devel/apr:
Update to 1.2.8 (formerly in devel/apr1), no longer build from the
httpd distfile.
devel/rapidsvn:
devel/subversion-base:
parallel/ganglia-monitor-core:
security/hydra:
www/apache2:
Use devel/apr0.
www/apache22:
Use devel/apr and devel/apr-util.
Diffstat (limited to 'www')
-rw-r--r-- | www/apache2/Makefile | 4 | ||||
-rw-r--r-- | www/apache2/buildlink3.mk | 4 | ||||
-rw-r--r-- | www/apache22/Makefile | 9 | ||||
-rw-r--r-- | www/apache22/Makefile.common | 6 | ||||
-rw-r--r-- | www/apache22/buildlink3.mk | 5 |
5 files changed, 14 insertions, 14 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 0bf330f8b79..1a03a85818b 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.109 2007/01/23 15:45:44 ghen Exp $ +# $NetBSD: Makefile,v 1.110 2007/01/24 19:46:45 epg Exp $ .include "Makefile.common" @@ -35,7 +35,7 @@ BUILDLINK_API_DEPENDS.apr+= apr>=0.9.12.2.0.58 APACHE_MODULES?= ${DFLT_APACHE_MODULES} .include "../../mk/bsd.prefs.mk" -.include "../../devel/apr/buildlink3.mk" +.include "../../devel/apr0/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" diff --git a/www/apache2/buildlink3.mk b/www/apache2/buildlink3.mk index 539738004c9..8e353bf9ed8 100644 --- a/www/apache2/buildlink3.mk +++ b/www/apache2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2006/07/10 08:29:33 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2007/01/24 19:46:45 epg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+ @@ -28,6 +28,6 @@ CONFIGURE_ARGS+= --with-apxs2=${APXS:Q} . endif .endif # APACHE_BUILDLINK3_MK -.include "../../devel/apr/buildlink3.mk" +.include "../../devel/apr0/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 5239e997e3b..64a642791f5 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2007/01/23 15:45:44 ghen Exp $ +# $NetBSD: Makefile,v 1.8 2007/01/24 19:46:45 epg Exp $ .include "Makefile.common" @@ -24,7 +24,7 @@ CONFIGURE_ENV+= perlbin=${PERL5:Q} # Apache Portable Runtime library configure options CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr} -CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr} +CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr-util} CHECK_PORTABILITY_SKIP+= srclib/pcre/* \ srclib/apr-util/* \ @@ -37,7 +37,8 @@ CHECK_PORTABILITY_SKIP+= srclib/pcre/* \ APACHE_MODULES?= ${DFLT_APACHE_MODULES} .include "../../mk/bsd.prefs.mk" -.include "../../devel/apr1/buildlink3.mk" +.include "../../devel/apr/buildlink3.mk" +.include "../../devel/apr-util/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" @@ -90,7 +91,7 @@ DFLT_APACHE_MODULES+= charset_lite PLIST_SRC+= ${PKGDIR}/PLIST # LDAP support -.if !empty(PKG_BUILD_OPTIONS.apr:Mldap) +.if !empty(PKG_BUILD_OPTIONS.apr-util:Mldap) DFLT_APACHE_MODULES+= ldap authnz_ldap .endif diff --git a/www/apache22/Makefile.common b/www/apache22/Makefile.common index 58f68548628..0de1920f8d3 100644 --- a/www/apache22/Makefile.common +++ b/www/apache22/Makefile.common @@ -1,11 +1,9 @@ -# $NetBSD: Makefile.common,v 1.3 2007/01/21 17:11:53 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.4 2007/01/24 19:46:45 epg Exp $ DISTNAME= httpd-${APACHE_VERSION} EXTRACT_SUFX= .tar.bz2 -# When updating this version be sure to update the checksum and remove -# any PKGREVISION for devel/apr also. +# When updating this version be sure to update the checksum. APACHE_VERSION= 2.2.4 -APR_VERSION= 1.2.8.${APACHE_VERSION} MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ ${MASTER_SITE_APACHE:=httpd/old/} \ http://www.NetBSD.org/images/logos/ diff --git a/www/apache22/buildlink3.mk b/www/apache22/buildlink3.mk index 67604e47971..328c094c84d 100644 --- a/www/apache22/buildlink3.mk +++ b/www/apache22/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/12/08 23:31:52 xtraeme Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2007/01/24 19:46:45 epg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+ @@ -27,6 +27,7 @@ CONFIGURE_ARGS+= --with-apxs2=${APXS:Q} . endif .endif # APACHE_BUILDLINK3_MK -.include "../../devel/apr1/buildlink3.mk" +.include "../../devel/apr/buildlink3.mk" +.include "../../devel/apr-util/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |