diff options
| author | epg <epg@pkgsrc.org> | 2007-01-25 07:35:30 +0000 |
|---|---|---|
| committer | epg <epg@pkgsrc.org> | 2007-01-25 07:35:30 +0000 |
| commit | b8ebd68d2f2ab0c06c867715b3b3e30a65e70ff4 (patch) | |
| tree | d4b711ff4b7089a266f6ccc714701a48c5e1c52c /devel/subversion | |
| parent | b8fe72b48b485d1b4e2c5b62518d0d4c974d88b3 (diff) | |
| download | pkgsrc-b8ebd68d2f2ab0c06c867715b3b3e30a65e70ff4.tar.gz | |
Allow subversion to be built with either apr0 or apr & apr-util.
devel/apr0/buildlink3.mk:
Add apr<1.0 to BUILDLINK_API_DEPENDS.apr .
devel/subversion/Makefile.common:
Drop --with-apr and --with-apr-util from CONFIGURE_ARGS; these
have not been needed since the buildlink framework started
ensuring the PATH is correct. Drop --with-ssl from
CONFIGURE_ARGS; this has not been necessary since this stopped
using the built-in neon. Include new options.mk .
devel/subversion-base/Makefile:
devel/subversion-base/buildlink3.mk:
Use devel/apr0 or devel/apr & devel/apr-util if
PKG_OPTIONS.subversion has the apr1 option.
devel/subversion-base/options.mk:
Provide apache22 and apr1 options; currently these must be set
together, so enforce that.
www/ap2-subversion/Makefile:
Use apache22 if PKG_OPTIONS.subversion has the apache22 option,
else use apache2.
Diffstat (limited to 'devel/subversion')
| -rw-r--r-- | devel/subversion/Makefile.common | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index 31678425b87..df658ca4733 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.25 2006/11/08 11:29:14 adam Exp $ +# $NetBSD: Makefile.common,v 1.26 2007/01/25 07:35:30 epg Exp $ DISTNAME= subversion-${SVNVER} CATEGORIES= devel @@ -20,10 +20,11 @@ PATCHDIR= ${.CURDIR}/../../devel/subversion/patches USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr} -CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr} + +.include "../../mk/bsd.prefs.mk" +.include "../../devel/subversion-base/options.mk" + CONFIGURE_ARGS+= --with-neon=${BUILDLINK_PREFIX.neon} -CONFIGURE_ARGS+= --with-ssl # workaround: does not install info file, but does create directory CONFIGURE_ARGS+= --infodir=${PREFIX}/${PKGINFODIR} |