Updated with feedback from jcs@ and martynas@

 - todd

Index: devel/py-hg-git/Makefile
===================================================================
RCS file: devel/py-hg-git/Makefile
diff -N devel/py-hg-git/Makefile
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ devel/py-hg-git/Makefile    3 Sep 2010 00:22:25 -0000
@@ -0,0 +1,33 @@
+# $OpenBSD$
+
+COMMENT =      push/pull from a Git server repository using Mercurial
+
+MODPY_EGG_VERSION =    0.2.3
+DISTNAME =             schacon-hg-git-${MODPY_EGG_VERSION}
+PKGNAME =              py-hg-git-${MODPY_EGG_VERSION}
+
+CATEGORIES =           devel
+
+HOMEPAGE =             http://hg-git.github.com/
+
+# GPLv2
+PERMIT_PACKAGE_CDROM =         Yes
+PERMIT_PACKAGE_FTP =           Yes
+PERMIT_DISTFILES_CDROM =       Yes
+PERMIT_DISTFILES_FTP =         Yes
+
+MASTER_SITES = http://github.com/schacon/hg-git/tarball/${MODPY_EGG_VERSION}/
+
+MODULES =      lang/python
+RUN_DEPENDS =  ::devel/py-dulwich ::devel/mercurial
+WRKDIST =      ${WRKDIR}/${DISTNAME:S/-${MODPY_EGG_VERSION}/-4097609/}
+
+REGRESS_DEPENDS = ${RUN_DEPENDS} ::archivers/bzip2 ::archivers/unzip
+
+pre-regress:
+       perl -pi -e 's|python -c|python${MODPY_VERSION} -c|g' ${WRKSRC}/tests/*
+
+do-regress:
+       cd ${WRKSRC}/tests && ${MODPY_BIN} run-tests.py 
--with-hg=${LOCALBASE}/hg
+
+.include <bsd.port.mk>
Index: devel/py-hg-git/distinfo
===================================================================
RCS file: devel/py-hg-git/distinfo
diff -N devel/py-hg-git/distinfo
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ devel/py-hg-git/distinfo    29 Jul 2010 14:22:49 -0000
@@ -0,0 +1,5 @@
+MD5 (schacon-hg-git-0.2.3.tar.gz) = e1m4FTyZ9IxvDQtPPHIM7Q==
+RMD160 (schacon-hg-git-0.2.3.tar.gz) = R4cI5zczgpX7YXitkxFtYQjUx7Y=
+SHA1 (schacon-hg-git-0.2.3.tar.gz) = 7ByqVo+abcTSNVTV/ni3zanmIp8=
+SHA256 (schacon-hg-git-0.2.3.tar.gz) = 
fkGOIL5mql6lpx7+NqZbjMVycPdavEgTG7yERVOKva4=
+SIZE (schacon-hg-git-0.2.3.tar.gz) = 38245
Index: devel/py-hg-git/patches/patch-hggit_hgrepo_py
===================================================================
RCS file: devel/py-hg-git/patches/patch-hggit_hgrepo_py
diff -N devel/py-hg-git/patches/patch-hggit_hgrepo_py
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ devel/py-hg-git/patches/patch-hggit_hgrepo_py       2 Sep 2010 22:06:37 
-0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- hggit/hgrepo.py.orig       Mon Jul  5 12:56:04 2010
++++ hggit/hgrepo.py    Thu Sep  2 11:28:58 2010
+@@ -19,8 +19,7 @@ def generate_repo_subclass(baseclass):
+                 git = GitHandler(self, self.ui)
+                 git.push(remote.path, revs, force)
+             else: #pragma: no cover
+-                return super(hgrepo, self).push(remote, force, revs,
+-                                                newbranch=newbranch)
++                return super(hgrepo, self).push(remote, force, revs)
+ 
+         def findoutgoing(self, remote, base=None, heads=None, force=False):
+             if isinstance(remote, gitrepo):
Index: devel/py-hg-git/pkg/DESCR
===================================================================
RCS file: devel/py-hg-git/pkg/DESCR
diff -N devel/py-hg-git/pkg/DESCR
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ devel/py-hg-git/pkg/DESCR   29 Jul 2010 11:53:48 -0000
@@ -0,0 +1,4 @@
+The Hg-Git plugin for Mercurial adds the ability to push to and pull from a
+Git server repository from Mercurial. This means you can collaborate on Git
+based projects from Mercurial, or use a Git server as a collaboration point
+for a team with developers using both Git and Mercurial.
Index: devel/py-hg-git/pkg/PLIST
===================================================================
RCS file: devel/py-hg-git/pkg/PLIST
diff -N devel/py-hg-git/pkg/PLIST
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ devel/py-hg-git/pkg/PLIST   2 Sep 2010 15:15:17 -0000
@@ -0,0 +1,18 @@
+...@comment $OpenBSD$
+lib/python${MODPY_VERSION}/site-packages/hg_git-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/hg_git-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/hg_git-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/hg_git-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/hg_git-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/hg_git-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/hggit/
+lib/python${MODPY_VERSION}/site-packages/hggit/__init__.py
+lib/python${MODPY_VERSION}/site-packages/hggit/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/hggit/git_handler.py
+lib/python${MODPY_VERSION}/site-packages/hggit/git_handler.pyc
+lib/python${MODPY_VERSION}/site-packages/hggit/gitrepo.py
+lib/python${MODPY_VERSION}/site-packages/hggit/gitrepo.pyc
+lib/python${MODPY_VERSION}/site-packages/hggit/hgrepo.py
+lib/python${MODPY_VERSION}/site-packages/hggit/hgrepo.pyc
+lib/python${MODPY_VERSION}/site-packages/hggit/util.py
+lib/python${MODPY_VERSION}/site-packages/hggit/util.pyc

Reply via email to