From f96952f0c2bd55b5e79d0f0789e6909bd2cd56b6 Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 7 Feb 2006 19:58:06 +0000 Subject: Move subversion/buildlink3.mk to subversion-base/buildlink3.mk, to make it more resilient to revbump. Ok epg@ --- devel/kdesdk3/Makefile | 4 ++-- devel/p5-subversion/Makefile | 4 ++-- devel/py-subversion/Makefile | 4 ++-- devel/rapidsvn/Makefile | 4 ++-- devel/ruby-subversion/Makefile | 4 ++-- devel/subversion-base/buildlink3.mk | 27 +++++++++++++++++++++++++++ devel/subversion/buildlink3.mk | 27 --------------------------- www/ap2-subversion/Makefile | 4 ++-- 8 files changed, 39 insertions(+), 39 deletions(-) create mode 100644 devel/subversion-base/buildlink3.mk delete mode 100644 devel/subversion/buildlink3.mk diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile index 25451349f71..fabec30c0ed 100644 --- a/devel/kdesdk3/Makefile +++ b/devel/kdesdk3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2006/02/05 23:08:44 joerg Exp $ +# $NetBSD: Makefile,v 1.45 2006/02/07 19:58:06 wiz Exp $ DISTNAME= kdesdk-${_KDE_VERSION} PKGREVISION= 1 @@ -67,7 +67,7 @@ PKG_SUPPORTED_OPTIONS= svn .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Msvn) -.include "../../devel/subversion/buildlink3.mk" +.include "../../devel/subversion-base/buildlink3.mk" CONFIGURE_ARGS+= --with-svn-include="${BUILDLINK_PREFIX.subversion-base}/include" CONFIGURE_ARGS+= --with-svn-lib="${BUILDLINK_PREFIX.subversion-base}/lib" PLIST_SUBST+= HAVE_SVN="" diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile index 633c38f4ac1..380c492858f 100644 --- a/devel/p5-subversion/Makefile +++ b/devel/p5-subversion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2006/02/05 23:08:50 joerg Exp $ +# $NetBSD: Makefile,v 1.30 2006/02/07 19:58:06 wiz Exp $ PKGNAME= p5-subversion-${SVNVER} PKGREVISION= 2 @@ -22,6 +22,6 @@ post-patch: ${RM} ${WRKSRC}/build-outputs.mk ${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}/build-outputs.mk -.include "../../devel/subversion/buildlink3.mk" +.include "../../devel/subversion-base/buildlink3.mk" .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile index 70b79b821c5..49780cb4bae 100644 --- a/devel/py-subversion/Makefile +++ b/devel/py-subversion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/02/05 23:08:51 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2006/02/07 19:58:06 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-subversion-${SVNVER} PKGREVISION= 2 @@ -36,7 +36,7 @@ post-install: ${WRKSRC}/tools/hook-scripts/mailer/mailer.conf.example \ ${SVNEXAMPLES}/hook-scripts -.include "../../devel/subversion/buildlink3.mk" +.include "../../devel/subversion-base/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile index af636b9ea60..b3d37586cb1 100644 --- a/devel/rapidsvn/Makefile +++ b/devel/rapidsvn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/02/05 23:08:52 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2006/02/07 19:58:06 wiz Exp $ DISTNAME= rapidsvn-0.9.0 PKGREVISION= 2 @@ -28,6 +28,6 @@ post-install: .include "../../devel/apr/buildlink3.mk" -.include "../../devel/subversion/buildlink3.mk" +.include "../../devel/subversion-base/buildlink3.mk" .include "../../x11/wxGTK/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ruby-subversion/Makefile b/devel/ruby-subversion/Makefile index 4feaa490f77..079a7aefc5c 100644 --- a/devel/ruby-subversion/Makefile +++ b/devel/ruby-subversion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/02/05 23:08:53 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2006/02/07 19:58:06 wiz Exp $ PKGNAME= ${RUBY_PKGPREFIX}-subversion-${SVNVER} PKGREVISION= 3 @@ -26,6 +26,6 @@ post-install: ${INSTALL_DATA_DIR} ${SVNEXAMPLES}/ruby ${INSTALL_DATA} ${WRKSRC}/tools/*/*.rb ${SVNEXAMPLES}/ruby -.include "../../devel/subversion/buildlink3.mk" +.include "../../devel/subversion-base/buildlink3.mk" .include "../../lang/ruby/modules.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/subversion-base/buildlink3.mk b/devel/subversion-base/buildlink3.mk new file mode 100644 index 00000000000..d8ee57a3edf --- /dev/null +++ b/devel/subversion-base/buildlink3.mk @@ -0,0 +1,27 @@ +# $NetBSD: buildlink3.mk,v 1.1 2006/02/07 19:58:06 wiz 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+) +BUILDLINK_DEPENDS+= subversion-base +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsubversion-base} +BUILDLINK_PACKAGES+= subversion-base + +.if !empty(SUBVERSION_BASE_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.subversion-base+= subversion-base>=1.0.0 +BUILDLINK_RECOMMENDED.subversion-base?= subversion-base>=1.3.0nb2 +BUILDLINK_PKGSRCDIR.subversion-base?= ../../devel/subversion-base + +BUILDLINK_FILES.subversion-base+= bin/svn-config +.endif # SUBVERSION_BASE_BUILDLINK3_MK + +.include "../../devel/apr/buildlink3.mk" +.include "../../www/neon/buildlink3.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/devel/subversion/buildlink3.mk b/devel/subversion/buildlink3.mk deleted file mode 100644 index 167d39c7a27..00000000000 --- a/devel/subversion/buildlink3.mk +++ /dev/null @@ -1,27 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.15 2006/02/07 06:50:32 xtraeme 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+) -BUILDLINK_DEPENDS+= subversion-base -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nsubversion-base} -BUILDLINK_PACKAGES+= subversion-base - -.if !empty(SUBVERSION_BASE_BUILDLINK3_MK:M+) -BUILDLINK_DEPENDS.subversion-base+= subversion-base>=1.0.0 -BUILDLINK_RECOMMENDED.subversion-base?= subversion-base>=1.3.0nb2 -BUILDLINK_PKGSRCDIR.subversion-base?= ../../devel/subversion-base - -BUILDLINK_FILES.subversion-base+= bin/svn-config -.endif # SUBVERSION_BASE_BUILDLINK3_MK - -.include "../../devel/apr/buildlink3.mk" -.include "../../www/neon/buildlink3.mk" - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/www/ap2-subversion/Makefile b/www/ap2-subversion/Makefile index 849861f0e72..eb768f3c3b3 100644 --- a/www/ap2-subversion/Makefile +++ b/www/ap2-subversion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/02/05 23:11:18 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2006/02/07 19:58:07 wiz Exp $ PKGNAME= ap2-subversion-${SVNVER} PKGREVISION= 2 @@ -20,6 +20,6 @@ post-patch: ${RM} ${WRKSRC}/build-outputs.mk ${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC}/build-outputs.mk -.include "../../devel/subversion/buildlink3.mk" +.include "../../devel/subversion-base/buildlink3.mk" .include "../../www/apache2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3