Hi all-
On Thu, Jul 29, 2010 at 10:27:10AM -0400, Todd C. Miller wrote:
> In message <20100729134100.gb9...@cl0311500093650>
> so spake David Coppa (dcoppa):
>
> > This MASTER_SITES does not work.
>
> This seems to work better.
A few nit-picks in line; otherwise, ok wcma...@.
> - 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 29 Jul 2010 14:22:38 -0000
> @@ -0,0 +1,24 @@
> +# $OpenBSD$
> +
> +COMMENT= Push/pull from a Git server repository using Mercurial.
Lowercase 'Push' here and drop the trailing period.
> +
> +V= 0.2.3
Please use MODPY_EGG_VERSION instead of V; this will reduce churn in pkg/PLIST
on upgrades.
> +PKGNAME= py-hg-git-${V}p0
> +DISTNAME= schacon-hg-git-${V}
> +CATEGORIES= devel
> +
> +# Python
> +PERMIT_PACKAGE_CDROM= Yes
> +PERMIT_PACKAGE_FTP= Yes
> +PERMIT_DISTFILES_CDROM= Yes
> +PERMIT_DISTFILES_FTP= Yes
> +
> +HOMEPAGE= http://hg-git.github.com/
> +MASTER_SITES= http://github.com/schacon/hg-git/tarball/${V}/
> +
> +MODULES= lang/python
> +RUN_DEPENDS= ::devel/py-dulwich
> +WRKDIST= ${WRKDIR}/${DISTNAME:S/-${V}/-4097609/}
> +NO_REGRESS= Yes
> +
> +.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-hgrepo.py
> ===================================================================
> RCS file: devel/py-hg-git/patches/patch-hgrepo.py
> diff -N devel/py-hg-git/patches/patch-hgrepo.py
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ devel/py-hg-git/patches/patch-hgrepo.py 29 Jul 2010 14:03:11 -0000
> @@ -0,0 +1,13 @@
> +# $OpenBSD#
Might be good to add a note here describing the reason for the patch. If I'm not
mistaken, this is fixed in hg-git's HEAD and can therefore go away next release.
> +--- hggit/hgrepo.py
> ++++ hggit/hgrepo.py
> +@@ -19,8 +19,7 @@
> + 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 29 Jul 2010 12:00:28 -0000
> @@ -0,0 +1,18 @@
> +...@comment $OpenBSD$
> +lib/python${MODPY_VERSION}/site-packages/hg_git-0.2.3-py${MODPY_VERSION}.egg-info/
> +lib/python${MODPY_VERSION}/site-packages/hg_git-0.2.3-py${MODPY_VERSION}.egg-info/PKG-INFO
> +lib/python${MODPY_VERSION}/site-packages/hg_git-0.2.3-py${MODPY_VERSION}.egg-info/SOURCES.txt
> +lib/python${MODPY_VERSION}/site-packages/hg_git-0.2.3-py${MODPY_VERSION}.egg-info/dependency_links.txt
> +lib/python${MODPY_VERSION}/site-packages/hg_git-0.2.3-py${MODPY_VERSION}.egg-info/requires.txt
> +lib/python${MODPY_VERSION}/site-packages/hg_git-0.2.3-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
>
--
Will Maier
http://www.lfod.us/~will/
