diff options
author | seb <seb> | 2004-05-12 19:24:18 +0000 |
---|---|---|
committer | seb <seb> | 2004-05-12 19:24:18 +0000 |
commit | 003ca977b58434e66a6c794da2df640d503e1bcf (patch) | |
tree | cf6629f7241172782331edc1fe36b418f53244de /devel | |
parent | cc72a445abedb669ca66aa5ce827c9216a60b363 (diff) | |
download | pkgsrc-003ca977b58434e66a6c794da2df640d503e1bcf.tar.gz |
Update to revision 947.
Package changes:
- actually use bl3
- let py-bsddb3 package enforce the accepted python versions via
its buildlink3.mk
- fix test target
- no need to include subversion/buildlink3.mk (it had no effect
anyway because USE_BUILDLINK3 was not defined to YES) just
set a run dependency on subversion-base.
Changes since last packaged version:
------------------------------------------------------------------------
r947 | fitz | 2004-05-11 22:42:02 +0200 (Tue, 11 May 2004) | 7 lines
Fix OBOE and start_pass check.
* cvs2svn.py: (main) Set default value of end_pass to len(_passes),
*not* len(_passes) - 1. Also, check bottom bounds of start_pass.
------------------------------------------------------------------------
r946 | cmpilato | 2004-05-11 21:58:37 +0200 (Tue, 11 May 2004) | 4 lines
* cvs2svn.py
(usage): Fix the usage message to reflect new START:END syntax for
-p argument.
------------------------------------------------------------------------
r945 | cmpilato | 2004-05-11 21:50:21 +0200 (Tue, 11 May 2004) | 5 lines
* cvs2svn.py
(main): Fix the map(x) bug introduced by the last commit, and rework
the validation logic for -p values to be a little more concise and
informative. Also, use START:END instead of START-END syntax.
------------------------------------------------------------------------
r944 | cmpilato | 2004-05-11 21:36:35 +0200 (Tue, 11 May 2004) | 5 lines
* cvs2svn.py
(Database.__init__): Route around a pybsddb3 / BerkeleyDB 4.2
compatibility bug by manually enacting the semantic difference
between the 'n' and 'c' modes.
------------------------------------------------------------------------
r943 | fitz | 2004-05-11 21:05:43 +0200 (Tue, 11 May 2004) | 12 lines
Change the -p switch to accept a range of passes, or to just run a
single pass.
* cvs2svn.py:
(convert): Remove start_pass default arg value, add end_pass arg,
and perform only passes from START_PASS to END_PASS, inclusive.
(usage): Update doc.
(main): Add a suitable default for end_pass, processing for '-p
START-END' switch, and error checking for end_pass.
------------------------------------------------------------------------
r939 | maxb | 2004-05-02 14:55:18 +0200 (Sun, 02 May 2004) | 3 lines
* cvs2svn.py (MimeMapper.print_missing_mappings): Tweak to hopefully work with
older Python versions.
------------------------------------------------------------------------
r933 | fitz | 2004-04-28 17:59:29 +0200 (Wed, 28 Apr 2004) | 5 lines
Fix URL to Issue Tracker and a few examples that are incorrect. Based
on a patch from Jon Bendtsen <jbendtsen@laerdal.dk>.
* README: Corrections.
------------------------------------------------------------------------
r929 | cmpilato | 2004-04-22 18:43:23 +0200 (Thu, 22 Apr 2004) | 3 lines
* dist.sh
Use the cvs2svn-rXXXX.tar.gz format instead of cvs2svn-0.XXXX.tar.gz.
------------------------------------------------------------------------
r928 | cmpilato | 2004-04-22 18:40:01 +0200 (Thu, 22 Apr 2004) | 2 lines
* dist.sh
Use 'svn export' now instead of all that complicated mumbo jumbo. :-)
Diffstat (limited to 'devel')
-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' |