pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Move subversion/buildlink3.mk to subversion-base/build...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e59c9c575b43
branches:  trunk
changeset: 507744:e59c9c575b43
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Feb 07 19:58:06 2006 +0000

description:
Move subversion/buildlink3.mk to subversion-base/buildlink3.mk, to
make it more resilient to revbump.

Ok epg@

diffstat:

 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(-)

diffs (166 lines):

diff -r 7c188965cbfe -r e59c9c575b43 devel/kdesdk3/Makefile
--- a/devel/kdesdk3/Makefile    Tue Feb 07 19:55:56 2006 +0000
+++ b/devel/kdesdk3/Makefile    Tue Feb 07 19:58:06 2006 +0000
@@ -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 @@
 .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 -r 7c188965cbfe -r e59c9c575b43 devel/p5-subversion/Makefile
--- a/devel/p5-subversion/Makefile      Tue Feb 07 19:55:56 2006 +0000
+++ b/devel/p5-subversion/Makefile      Tue Feb 07 19:58:06 2006 +0000
@@ -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 @@
        ${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 -r 7c188965cbfe -r e59c9c575b43 devel/py-subversion/Makefile
--- a/devel/py-subversion/Makefile      Tue Feb 07 19:55:56 2006 +0000
+++ b/devel/py-subversion/Makefile      Tue Feb 07 19:58:06 2006 +0000
@@ -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 @@
                ${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 -r 7c188965cbfe -r e59c9c575b43 devel/rapidsvn/Makefile
--- a/devel/rapidsvn/Makefile   Tue Feb 07 19:55:56 2006 +0000
+++ b/devel/rapidsvn/Makefile   Tue Feb 07 19:58:06 2006 +0000
@@ -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 @@
 
 
 .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 -r 7c188965cbfe -r e59c9c575b43 devel/ruby-subversion/Makefile
--- a/devel/ruby-subversion/Makefile    Tue Feb 07 19:55:56 2006 +0000
+++ b/devel/ruby-subversion/Makefile    Tue Feb 07 19:58:06 2006 +0000
@@ -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 @@
        ${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 -r 7c188965cbfe -r e59c9c575b43 devel/subversion-base/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/subversion-base/buildlink3.mk       Tue Feb 07 19:58:06 2006 +0000
@@ -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 -r 7c188965cbfe -r e59c9c575b43 devel/subversion/buildlink3.mk
--- a/devel/subversion/buildlink3.mk    Tue Feb 07 19:55:56 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 7c188965cbfe -r e59c9c575b43 www/ap2-subversion/Makefile
--- a/www/ap2-subversion/Makefile       Tue Feb 07 19:55:56 2006 +0000
+++ b/www/ap2-subversion/Makefile       Tue Feb 07 19:58:06 2006 +0000
@@ -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 @@
        ${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"



Home | Main Index | Thread Index | Old Index