diff options
| author | jlam <jlam@pkgsrc.org> | 2004-11-23 00:37:04 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-11-23 00:37:04 +0000 |
| commit | 0597d2a1f0944a7bedc9ebee85a32e7583dced0e (patch) | |
| tree | 0d1797dc3cd3c5e58d05dc6e03797fa7a37b657d /devel | |
| parent | 0cc2bacb3a0663c99b2b6907ce527274bc6e9d77 (diff) | |
| download | pkgsrc-0597d2a1f0944a7bedc9ebee85a32e7583dced0e.tar.gz | |
We don't need to check for APR_USE_* or generate our own _APR_OPTIONS
variable since the apr/buildlink3.mk file does the right thing for us
already; we simply need to include it and check the value of
PKG_OPTIONS.apr.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/subversion-base/Makefile | 22 | ||||
| -rw-r--r-- | devel/subversion/buildlink3.mk | 8 |
2 files changed, 10 insertions, 20 deletions
diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile index f988f82fcc2..6ee11fc6489 100644 --- a/devel/subversion-base/Makefile +++ b/devel/subversion-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/11/19 04:01:59 epg Exp $ +# $NetBSD: Makefile,v 1.21 2004/11/23 00:37:04 jlam Exp $ PKGNAME= subversion-base-${SVNVER} COMMENT= Version control system, base programs and libraries @@ -7,13 +7,16 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews .include "../subversion/Makefile.common" -BUILD_DEFS+= APR_USE_DB4 - CONFIGURE_ARGS+= --without-apache CONFIGURE_ARGS+= --without-apxs -.include "../../mk/bsd.prefs.mk" -.if !empty(APR_USE_DB4:M[yY][eE][sS]) +BUILDLINK_DEPENDS.apr+= apr>=0.9.5 +BUILDLINK_DEPENDS.neon+= neon>=0.24.7 + +.include "../../devel/apr/buildlink3.mk" +.include "../../www/neon/buildlink3.mk" + +.if !empty(PKG_OPTIONS.apr:Mdb4) PLIST_SRC= ${PKGDIR}/PLIST ${PKGDIR}/PLIST.bdb .else CONFIGURE_ARGS+= --without-berkeley-db @@ -51,13 +54,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/svnperms* \ ${SVNEXAMPLES}/hook-scripts -BUILDLINK_DEPENDS.apr+= apr>=0.9.5 -BUILDLINK_DEPENDS.neon+= neon>=0.24.7 - -.if !empty(APR_USE_DB4:M[yY][eE][sS]) -. include "../../databases/db4/buildlink3.mk" -.endif - -.include "../../devel/apr/buildlink3.mk" -.include "../../www/neon/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/subversion/buildlink3.mk b/devel/subversion/buildlink3.mk index da7e3b2db6f..b99f056991b 100644 --- a/devel/subversion/buildlink3.mk +++ b/devel/subversion/buildlink3.mk @@ -1,8 +1,9 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/10/03 00:13:33 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/11/23 00:37:04 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ SUBVERSION_BASE_BUILDLINK3_MK:= ${SUBVERSION_BASE_BUILDLINK3_MK}+ +.include "../../mk/bsd.prefs.mk" .include "../../devel/subversion/Makefile.version" .if !empty(BUILDLINK_DEPTH:M+) @@ -20,11 +21,6 @@ BUILDLINK_PKGSRCDIR.subversion-base?= ../../devel/subversion-base BUILDLINK_FILES.subversion-base+= bin/svn-config .endif # SUBVERSION_BASE_BUILDLINK3_MK -.include "../../mk/bsd.prefs.mk" -.if !empty(APR_USE_DB4:M[yY][eE][sS]) -. include "../../databases/db4/buildlink3.mk" -.endif - .include "../../devel/apr/buildlink3.mk" .include "../../www/neon/buildlink3.mk" |