Catch up with name change (py-subversion) and bump PKGREVISION, because

of the BUILDLINK_DEPENDS.neon bump.
p5-subersion depends on perl 5.8.

ok'ed by epg.

4 files changed, 10 insertions, 6 deletions

diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile
index 5a023b990e9..8e10fdd91c6 100644
--- a/devel/p5-subversion/Makefile
+++ b/devel/p5-subversion/Makefile
@@ -1,10 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/03 15:13:58 epg Exp $
+# $NetBSD: Makefile,v 1.2 2003/12/04 17:04:01 recht Exp $
 
 PKGNAME=	p5-subversion-${SVNVER}
 COMMENT=	Perl bindings for Subversion
 
 .include "../../devel/subversion/Makefile.common"
 
+BUILDLINK_PKGSRCDIR.perl=      ../../lang/perl58
+
+PERL5_REQD=		5.8.0
 PERL_DIR=		${WRKSRC}/subversion/bindings/swig/perl
 ALL_TARGET=		swig-pl-lib
 INSTALL_TARGET=		install-swig-pl-lib
diff --git a/devel/subversion-base/DESCR b/devel/subversion-base/DESCR
index c32de51ec1c..efcfc09c5bc 100644
--- a/devel/subversion-base/DESCR
+++ b/devel/subversion-base/DESCR
@@ -5,7 +5,7 @@ is released under an Apache/BSD-style open source license.
 This package contains all the Subversion programs and libraries except
 the Apache module mod_dav_svn (for which see the ap2-subversion
 package) and the Python bindings and some programs which use them (for
-which see the subversion-python package).  Installing this package
+which see the py-subversion package).  Installing this package
 alone will satisfy most people's needs, providing all three repository
 access layers (local, svn, and dav) and the server for the svn access
 layer.
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 6fb355109cf..c394c017754 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/12/03 15:42:10 epg Exp $
+# $NetBSD: Makefile,v 1.16 2003/12/04 17:04:01 recht Exp $
 
 PKGNAME=	subversion-${SVNVER}
 COMMENT=	Version control system, meta-package
@@ -6,7 +6,7 @@ COMMENT=	Version control system, meta-package
 DEPENDS+=	subversion-base-${SVNVER}:../../devel/subversion-base
 DEPENDS+=	p5-subversion-${SVNVER}:../../devel/p5-subversion
 DEPENDS+=	ap2-subversion-${SVNVER}nb1:../../www/ap2-subversion
-# We depend on subversion-python via its buildlink2.mk so we don't
+# We depend on py-subversion via its buildlink2.mk so we don't
 # have to worry about which Python version it uses.
 
 .include "Makefile.common"
@@ -22,5 +22,5 @@ do-patch:
 
 do-install:
 
-.include "../../devel/subversion-python/buildlink2.mk"
+.include "../../devel/py-subversion/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 4697370131a..fd56724138b 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile.common,v 1.6 2003/12/03 15:20:44 epg Exp $
+# $NetBSD: Makefile.common,v 1.7 2003/12/04 17:04:01 recht Exp $
 
 DISTNAME=		subversion-${SVNVER}
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=   	http://svn.collab.net/tarballs/