diff options
| -rw-r--r-- | devel/cvs2svn/Makefile | 14 | ||||
| -rw-r--r-- | devel/cvs2svn/distinfo | 7 | ||||
| -rw-r--r-- | devel/cvs2svn/patches/patch-aa | 20 |
3 files changed, 10 insertions, 31 deletions
diff --git a/devel/cvs2svn/Makefile b/devel/cvs2svn/Makefile index 87c652ac575..f48ef010ea3 100644 --- a/devel/cvs2svn/Makefile +++ b/devel/cvs2svn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/04/21 12:47:22 seb Exp $ +# $NetBSD: Makefile,v 1.3 2004/05/12 19:24:18 seb Exp $ DISTNAME= cvs2svn-0.${CVS2SVN_REVISION} CATEGORIES= devel @@ -8,15 +8,15 @@ MAINTAINER= seb@NetBSD.org HOMEPAGE= http://cvs2svn.tigris.org/ COMMENT= Converts a CVS repository to a Subversion repository -DEPENDS+= ${PYPKGPREFIX}-bsddb3-[0-9]*:../../databases/py-bsddb3 +DEPENDS+= subversion-base-[0-9]*:../../devel/subversion-base CONFLICTS+= py*-subversion<1.0.1 -CVS2SVN_REVISION= 927 +CVS2SVN_REVISION= 947 NO_BUILD= # defined PY_PATCHPLIST= # defined +USE_BUILDLINK3= YES PYTHON_PATCH_SCRIPTS= cvs2svn.py verify-cvs2svn.py run-tests.py -PYTHON_VERSIONS_ACCEPTED= 22 22pth 23 23pth INSTALLATION_DIRS+= bin share/doc/cvs2svn ${PYSITELIB}/rcsparse @@ -30,16 +30,16 @@ do-install: done do-test: - cd ${WRKSRC}; ${PYTHONPATH.} PYTHONPATH=${WRKSRC} ./run-tests.py + cd ${WRKSRC}; ./run-tests.py # Generate the distfile out of cvs2svn repository as -# cvs2svn is yet packaged by its authors. +# cvs2svn is not yet packaged by its authors. gen-distfile: ${MKDIR} ${WRKDIR} svn export -r${CVS2SVN_REVISION} http://svn.collab.net/repos/cvs2svn/trunk/ ${WRKDIR}/cvs2svn-0.${CVS2SVN_REVISION} cd ${WRKDIR} && ${PAX} -w cvs2svn-0.${CVS2SVN_REVISION} | ${GZIP_CMD} > ${DISTDIR}/cvs2svn-0.${CVS2SVN_REVISION}.tar.gz -.include "../../devel/subversion/buildlink3.mk" +.include "../../databases/py-bsddb3/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/cvs2svn/distinfo b/devel/cvs2svn/distinfo index abda1da1151..b7c88ffe1f9 100644 --- a/devel/cvs2svn/distinfo +++ b/devel/cvs2svn/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.2 2004/04/21 12:47:22 seb Exp $ +$NetBSD: distinfo,v 1.3 2004/05/12 19:24:18 seb Exp $ -SHA1 (cvs2svn-0.927.tar.gz) = 9b1285f1456f99aef75c07667ff979eb3740d0f7 -Size (cvs2svn-0.927.tar.gz) = 158992 bytes -SHA1 (patch-aa) = 58750f2c09233158bbae100c9fe72f4eb4facce8 +SHA1 (cvs2svn-0.947.tar.gz) = 83af4cd0b467fb12f15322b6c437ecbe4b6b2112 +Size (cvs2svn-0.947.tar.gz) = 159282 bytes diff --git a/devel/cvs2svn/patches/patch-aa b/devel/cvs2svn/patches/patch-aa deleted file mode 100644 index 8b57df6d716..00000000000 --- a/devel/cvs2svn/patches/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2004/04/21 12:47:22 seb Exp $ - ---- cvs2svn.py.orig 2004-04-19 20:03:26.000000000 +0000 -+++ cvs2svn.py -@@ -30,6 +30,7 @@ import getopt - import stat - import string - import md5 -+import anydbm - import marshal - - # Warnings and errors start with these strings. They are typically -@@ -54,7 +55,6 @@ except ImportError: - pass - - # 2. These DBM modules are not good for cvs2svn. --import anydbm - if (anydbm._defaultmod.__name__ == 'dumbdbm' - or anydbm._defaultmod.__name__ == 'dbm'): - print 'ERROR: your installation of Python does not contain a suitable' |