summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/p5-subversion/Makefile3
-rw-r--r--devel/py-subversion/Makefile13
-rw-r--r--devel/py-subversion/PLIST12
-rw-r--r--devel/subversion-base/Makefile7
-rw-r--r--devel/subversion/Makefile11
-rw-r--r--devel/subversion/Makefile.version4
-rw-r--r--devel/subversion/distinfo6
-rw-r--r--www/ap2-subversion/Makefile3
8 files changed, 20 insertions, 39 deletions
diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile
index e23fe13b4de..61bfd47e4f6 100644
--- a/devel/p5-subversion/Makefile
+++ b/devel/p5-subversion/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2004/03/26 02:27:38 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2004/03/29 18:08:33 epg Exp $
PKGNAME= p5-subversion-${SVNVER}
-PKGREVISION= 1
COMMENT= Perl bindings for Subversion
.include "../../devel/subversion/Makefile.common"
diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile
index 0744e42b76a..bc312baccd6 100644
--- a/devel/py-subversion/Makefile
+++ b/devel/py-subversion/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2004/03/26 02:27:39 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/29 18:08:33 epg Exp $
PKGNAME= ${PYPKGPREFIX}-subversion-${SVNVER}
-PKGREVISION= 1
COMMENT= Python bindings and tools for Subversion
.include "../../devel/subversion/Makefile.common"
@@ -10,8 +9,7 @@ CONFIGURE_ENV+= PYTHON2=${PYTHONBIN}
PY_PATCHPLIST= YES
PYBINMODULE= YES
-PYTHON_PATCH_SCRIPTS= tools/cvs2svn/cvs2svn.py \
- tools/hook-scripts/mailer/mailer.py
+PYTHON_PATCH_SCRIPTS= tools/hook-scripts/mailer/mailer.py
ALL_TARGET= swig-py-lib swig-py
INSTALL_TARGET= install-swig-py-lib install-swig-py
@@ -32,13 +30,6 @@ post-install:
${INSTALL_DATA} \
${WRKSRC}/tools/hook-scripts/mailer/mailer.conf.example \
${SVNEXAMPLES}/hook-scripts
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/subversion/cvs2svn
- ${INSTALL_DATA} ${WRKSRC}/tools/cvs2svn/README ${SVNDOC}/cvs2svn
- ${INSTALL_SCRIPT} ${WRKSRC}/tools/cvs2svn/cvs2svn.py \
- ${PREFIX}/bin/cvs2svn
- ${INSTALL_SCRIPT_DIR} ${LOCALBASE}/${PYSITELIB}/rcsparse
- ${INSTALL_SCRIPT} ${WRKSRC}/tools/cvs2svn/rcsparse/*.py \
- ${LOCALBASE}/${PYSITELIB}/rcsparse
.include "../../devel/subversion/buildlink3.mk"
.include "../../devel/swig-build/buildlink3.mk"
diff --git a/devel/py-subversion/PLIST b/devel/py-subversion/PLIST
index f0f9092075e..99b39a1eb25 100644
--- a/devel/py-subversion/PLIST
+++ b/devel/py-subversion/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/04 16:41:22 recht Exp $
-bin/cvs2svn
+@comment $NetBSD: PLIST,v 1.2 2004/03/29 18:08:33 epg Exp $
lib/libsvn_swig_py-1.a
lib/libsvn_swig_py-1.la
lib/libsvn_swig_py-1.so
@@ -28,12 +27,6 @@ ${PYSITELIB}/libsvn/repos.py
${PYSITELIB}/libsvn/repos.pyc
${PYSITELIB}/libsvn/wc.py
${PYSITELIB}/libsvn/wc.pyc
-${PYSITELIB}/rcsparse/__init__.py
-${PYSITELIB}/rcsparse/common.py
-${PYSITELIB}/rcsparse/compat.py
-${PYSITELIB}/rcsparse/debug.py
-${PYSITELIB}/rcsparse/default.py
-${PYSITELIB}/rcsparse/texttools.py
${PYSITELIB}/svn/__init__.py
${PYSITELIB}/svn/__init__.pyc
${PYSITELIB}/svn/client.py
@@ -52,7 +45,6 @@ ${PYSITELIB}/svn/util.py
${PYSITELIB}/svn/util.pyc
${PYSITELIB}/svn/wc.py
${PYSITELIB}/svn/wc.pyc
-share/doc/subversion/cvs2svn/README
share/examples/subversion/hook-scripts/mailer.conf.example
share/examples/subversion/hook-scripts/mailer.py
share/examples/subversion/python/blame.py
@@ -65,7 +57,5 @@ share/examples/subversion/python/revplist.py
share/examples/subversion/python/svnlook.py
share/examples/subversion/python/svnshell.py
@dirrm share/examples/subversion/python
-@dirrm share/doc/subversion/cvs2svn
@dirrm ${PYSITELIB}/svn
-@dirrm ${PYSITELIB}/rcsparse
@dirrm ${PYSITELIB}/libsvn
diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index 9d4877c8b7f..b08e7719c98 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2004/03/26 02:27:39 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2004/03/29 18:08:33 epg Exp $
PKGNAME= subversion-base-${SVNVER}
-PKGREVISION= 1
COMMENT= Version control system, base programs and libraries
PLIST_SUBST+= INSTALL_INFO=${INSTALL_INFO}
@@ -11,6 +10,10 @@ PLIST_SUBST+= INSTALL_INFO=${INSTALL_INFO}
CONFIGURE_ARGS+= --without-apache
CONFIGURE_ARGS+= --without-apxs
+# XXX Timestamps are broken in 1.0.1 tar file; should go away in 1.0.2.
+post-build:
+ ${TOUCH} ${WRKSRC}/doc/programmer/design/svn-design.info
+
post-patch:
${SED} -e 's|@BUILDLINK_PREFIX.db4@|${BUILDLINK_PREFIX.db4}|g' \
< ${WRKSRC}/tools/backup/hot-backup.py.in \
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 4ce28936973..eb77732dca7 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.20 2004/03/26 02:27:39 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2004/03/29 18:08:33 epg Exp $
PKGNAME= subversion-${SVNVER}
-PKGREVISION= 1
COMMENT= Version control system, meta-package
-DEPENDS+= subversion-base-${SVNVER}nb1:../../devel/subversion-base
-DEPENDS+= p5-subversion-${SVNVER}nb1:../../devel/p5-subversion
-DEPENDS+= ap2-subversion-${SVNVER}nb1:../../www/ap2-subversion
-DEPENDS+= ${PYPKGPREFIX}-subversion-${SVNVER}nb1:../../devel/py-subversion
+DEPENDS+= subversion-base-${SVNVER}:../../devel/subversion-base
+DEPENDS+= p5-subversion-${SVNVER}:../../devel/p5-subversion
+DEPENDS+= ap2-subversion-${SVNVER}:../../www/ap2-subversion
+DEPENDS+= ${PYPKGPREFIX}-subversion-${SVNVER}:../../devel/py-subversion
.include "Makefile.common"
diff --git a/devel/subversion/Makefile.version b/devel/subversion/Makefile.version
index 2adccfd0fbb..00a1842b7a0 100644
--- a/devel/subversion/Makefile.version
+++ b/devel/subversion/Makefile.version
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.version,v 1.15 2004/02/23 18:18:59 epg Exp $
+# $NetBSD: Makefile.version,v 1.16 2004/03/29 18:08:33 epg Exp $
.if !defined(SVNVER)
-SVNVER= 1.0.0
+SVNVER= 1.0.1
.endif
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 7f163ca168b..3af3bd99ad5 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.25 2004/02/23 18:18:59 epg Exp $
+$NetBSD: distinfo,v 1.26 2004/03/29 18:08:33 epg Exp $
-SHA1 (subversion-1.0.0.tar.gz) = 8540b382c750d91787ba26c4444673a026785b7b
-Size (subversion-1.0.0.tar.gz) = 7462659 bytes
+SHA1 (subversion-1.0.1.tar.gz) = de7c09e18eb97aa8ac42798d887f64336f12375e
+Size (subversion-1.0.1.tar.gz) = 7245193 bytes
SHA1 (patch-aa) = 00bd9a667459a704c6454e581c2cc5b1cfc197a9
SHA1 (patch-ac) = 7f0669a6f684583ff0ca4a443be356ae2fca06db
SHA1 (patch-ae) = 1c6a20139d24dcbd8ee519613bc24403e0b3ce24
diff --git a/www/ap2-subversion/Makefile b/www/ap2-subversion/Makefile
index ca506abe049..32711ef1d8f 100644
--- a/www/ap2-subversion/Makefile
+++ b/www/ap2-subversion/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2004/03/26 02:27:56 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2004/03/29 18:08:33 epg Exp $
PKGNAME= ap2-subversion-${SVNVER}
-PKGREVISION= 1
COMMENT= WebDAV server (Apache module) for Subversion
.include "../../devel/subversion/Makefile.common"