pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/cvs2svn Update to version 0.927 (cvs2svn trunk r...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/61214556fdfc
branches:  trunk
changeset: 473590:61214556fdfc
user:      seb <seb%pkgsrc.org@localhost>
date:      Wed Apr 21 12:47:22 2004 +0000

description:
Update to version 0.927 (cvs2svn trunk revision 927).

Package changes:
        - install verify-cvs2svn script
        - add test target support
        - follows included dist.sh script distribution numbering scheme

XXX patch file patch-aa reverts cvs2svn trunk changeset revision 922
otherwise bsddb3's usage fails.

Changes since last packaged version:

------------------------------------------------------------------------
r927 | kfogel | 2004-04-21 00:40:48 +0200 (Wed, 21 Apr 2004) | 4 lines

* dist.sh: Tweak ordering of cleanup.

* ./: Add "*.tar.gz" to svn:ignore.

------------------------------------------------------------------------
r926 | kfogel | 2004-04-21 00:35:29 +0200 (Wed, 21 Apr 2004) | 3 lines

* dist.sh: New script, for packaging cvs2svn.


------------------------------------------------------------------------
r925 | maxb | 2004-04-19 22:03:26 +0200 (Mon, 19 Apr 2004) | 5 lines

Fix a copy/paste-o that was causing "No origin records" errors.
Debugged by Bill Soudan.

* cvs2svn.py (get_symbol_closing_revs): Fix copy/paste-o.

------------------------------------------------------------------------
r924 | maxb | 2004-04-19 18:30:24 +0200 (Mon, 19 Apr 2004) | 3 lines

Remove dry-run mode entirely. It has bitrotted into unusability, and would need
to be re-written entirely to get it working.

------------------------------------------------------------------------
r922 | cmpilato | 2004-04-16 19:14:18 +0200 (Fri, 16 Apr 2004) | 3 lines

* cvs2svn.py
  Don't import anydbm until after the bsddb3 check has been made.

------------------------------------------------------------------------
r921 | fitz | 2004-04-15 05:05:15 +0200 (Thu, 15 Apr 2004) | 6 lines

Merge fitzsymbolicnametracker to trunk (r903:920).

* cvs2svn.py: Merged from branch.

* runtests.py: Merged from branch.

diffstat:

 devel/cvs2svn/Makefile         |  17 +++++++++++------
 devel/cvs2svn/PLIST            |   3 ++-
 devel/cvs2svn/distinfo         |   7 ++++---
 devel/cvs2svn/patches/patch-aa |  20 ++++++++++++++++++++
 4 files changed, 37 insertions(+), 10 deletions(-)

diffs (96 lines):

diff -r c6deef6088fc -r 61214556fdfc devel/cvs2svn/Makefile
--- a/devel/cvs2svn/Makefile    Wed Apr 21 12:09:49 2004 +0000
+++ b/devel/cvs2svn/Makefile    Wed Apr 21 12:47:22 2004 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/12 22:23:47 seb Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/21 12:47:22 seb Exp $
 
-DISTNAME=      cvs2svn-0.0.0.${CVS2SVN_REVISION}
+DISTNAME=      cvs2svn-0.${CVS2SVN_REVISION}
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_LOCAL}
 
@@ -12,10 +12,10 @@
 
 CONFLICTS+=    py*-subversion<1.0.1
 
-CVS2SVN_REVISION=              916
+CVS2SVN_REVISION=              927
 NO_BUILD=                      # defined
 PY_PATCHPLIST=                 # defined
-PYTHON_PATCH_SCRIPTS=          cvs2svn.py
+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
@@ -23,16 +23,21 @@
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cvs2svn
        ${INSTALL_SCRIPT} ${WRKSRC}/cvs2svn.py ${PREFIX}/bin/cvs2svn
+       ${INSTALL_SCRIPT} ${WRKSRC}/verify-cvs2svn.py                   \
+         ${PREFIX}/bin/verify-cvs2svn
        for f in ${WRKSRC}/rcsparse/*.py; do                            \
                ${INSTALL_DATA} $$f ${PREFIX}/${PYSITELIB}/rcsparse;    \
        done
 
+do-test:
+       cd ${WRKSRC}; ${PYTHONPATH.} PYTHONPATH=${WRKSRC} ./run-tests.py
+
 # Generate the distfile out of cvs2svn repository as
 # cvs2svn is yet packaged by its authors.
 gen-distfile:
        ${MKDIR} ${WRKDIR}
-       svn export -r${CVS2SVN_REVISION} http://svn.collab.net/repos/cvs2svn/trunk/ ${WRKDIR}/cvs2svn-0.0.0.${CVS2SVN_REVISION}
-       cd ${WRKDIR} && ${PAX} -w cvs2svn-0.0.0.${CVS2SVN_REVISION} | ${GZIP_CMD} > ${DISTDIR}/cvs2svn-0.0.0.${CVS2SVN_REVISION}.tar.gz
+       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 "../../lang/python/application.mk"
diff -r c6deef6088fc -r 61214556fdfc devel/cvs2svn/PLIST
--- a/devel/cvs2svn/PLIST       Wed Apr 21 12:09:49 2004 +0000
+++ b/devel/cvs2svn/PLIST       Wed Apr 21 12:47:22 2004 +0000
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/12 22:23:47 seb Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/04/21 12:47:22 seb Exp $
 bin/cvs2svn
+bin/verify-cvs2svn
 ${PYSITELIB}/rcsparse/__init__.py
 ${PYSITELIB}/rcsparse/common.py
 ${PYSITELIB}/rcsparse/compat.py
diff -r c6deef6088fc -r 61214556fdfc devel/cvs2svn/distinfo
--- a/devel/cvs2svn/distinfo    Wed Apr 21 12:09:49 2004 +0000
+++ b/devel/cvs2svn/distinfo    Wed Apr 21 12:47:22 2004 +0000
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/04/12 22:23:47 seb Exp $
+$NetBSD: distinfo,v 1.2 2004/04/21 12:47:22 seb Exp $
 
-SHA1 (cvs2svn-0.0.0.916.tar.gz) = abf431b0dc3e4aa8feb279cb16cdd9457f573c20
-Size (cvs2svn-0.0.0.916.tar.gz) = 157081 bytes
+SHA1 (cvs2svn-0.927.tar.gz) = 9b1285f1456f99aef75c07667ff979eb3740d0f7
+Size (cvs2svn-0.927.tar.gz) = 158992 bytes
+SHA1 (patch-aa) = 58750f2c09233158bbae100c9fe72f4eb4facce8
diff -r c6deef6088fc -r 61214556fdfc devel/cvs2svn/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cvs2svn/patches/patch-aa    Wed Apr 21 12:47:22 2004 +0000
@@ -0,0 +1,20 @@
+$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'



Home | Main Index | Thread Index | Old Index