On Sat, Oct 01, 2016 at 08:41:34PM +0200, Dmitrij D. Czarkoff wrote: > Hi! > > I needed a python3 flavor of pygit2, so I updated devel/libgit2/libgit2 and > devel/libgit2/py-git2. > > Comments? OKs? > > -- > Dmitrij D. Czarkoff >
ok shadchin@ I think you should remove do-test in py-git2. > Index: Makefile.inc > =================================================================== > RCS file: /var/cvs/ports/devel/libgit2/Makefile.inc,v > retrieving revision 1.10 > diff -u -p -r1.10 Makefile.inc > --- Makefile.inc 19 Mar 2016 15:47:04 -0000 1.10 > +++ Makefile.inc 1 Oct 2016 18:28:00 -0000 > @@ -8,4 +8,3 @@ HOMEPAGE= http://libgit2.github.com/ > PERMIT_PACKAGE_CDROM?= Yes > > DIST_SUBDIR= libgit > -DISTNAME?= ${PROJECT}-${V} > Index: libgit2/Makefile > =================================================================== > RCS file: /var/cvs/ports/devel/libgit2/libgit2/Makefile,v > retrieving revision 1.26 > diff -u -p -r1.26 Makefile > --- libgit2/Makefile 21 Mar 2016 15:24:20 -0000 1.26 > +++ libgit2/Makefile 1 Oct 2016 18:27:58 -0000 > @@ -4,13 +4,10 @@ BROKEN-arm = no atomic ops > BROKEN-hppa = no atomic ops > COMMENT= the Git library, take 2 > > -GH_VER= v0.24.0 > -V= ${GH_VER:S/v//} > -PROJECT= libgit2 > +GH_ACCOUNT = libgit2 > +GH_PROJECT = libgit2 > +GH_TAGNAME = v0.24.1 > SHARED_LIBS += git2 8.0 # 0.24 > - > -MASTER_SITES= https://github.com/libgit2/${PROJECT}/archive/ > -DISTFILES= ${DISTNAME}{${GH_VER}}${EXTRACT_SUFX} > > MODULES= devel/cmake \ > lang/python > Index: libgit2/distinfo > =================================================================== > RCS file: /var/cvs/ports/devel/libgit2/libgit2/distinfo,v > retrieving revision 1.13 > diff -u -p -r1.13 distinfo > --- libgit2/distinfo 21 Mar 2016 15:24:20 -0000 1.13 > +++ libgit2/distinfo 1 Oct 2016 10:18:04 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (libgit/libgit2-0.24.0.tar.gz) = > HGaT+UO+4/Y0uQlDdvk+fgO5ync1SjP06QP9yy7osrA= > -SIZE (libgit/libgit2-0.24.0.tar.gz) = 4169652 > +SHA256 (libgit/libgit2-0.24.1.tar.gz) = > YBmMuzQGa5tcFhPRXAR59s0l9K70L37FFc0cwTp3/t4= > +SIZE (libgit/libgit2-0.24.1.tar.gz) = 4173317 > Index: libgit2-glib/Makefile > =================================================================== > RCS file: /var/cvs/ports/devel/libgit2/libgit2-glib/Makefile,v > retrieving revision 1.29 > diff -u -p -r1.29 Makefile > --- libgit2-glib/Makefile 7 Sep 2016 06:42:15 -0000 1.29 > +++ libgit2-glib/Makefile 1 Oct 2016 11:00:25 -0000 > @@ -3,11 +3,12 @@ > COMMENT= GLib library wrapping libgit2 > > V= 0.24.4 > -PROJECT= libgit2-glib > +DISTNAME= libgit2-glib-$V > > SHARED_LIBS += git2-glib-1.0 3.0 # 0.0 > > -MASTER_SITES= > ${MASTER_SITE_GNOME:=sources/${PROJECT}/${V:C/^([0-9]+\.[0-9]+).*/\1/}/} > +SUBDIR= > sources/libgit2-glib/${V:C/^([0-9]+\.[0-9]+).*/\1/}/ > +MASTER_SITES= ${MASTER_SITE_GNOME:=${SUBDIR}} > EXTRACT_SUFX= .tar.xz > > MODULES= lang/python \ > Index: py-git2/Makefile > =================================================================== > RCS file: /var/cvs/ports/devel/libgit2/py-git2/Makefile,v > retrieving revision 1.19 > diff -u -p -r1.19 Makefile > --- py-git2/Makefile 21 Mar 2016 15:24:35 -0000 1.19 > +++ py-git2/Makefile 1 Oct 2016 13:18:54 -0000 > @@ -2,25 +2,25 @@ > > COMMENT= libgit2 bindings in Python > > -MODPY_EGG_VERSION= 0.24.0 > -GH_VER= v${MODPY_EGG_VERSION} > -V= ${GH_VER:S/v//} > -PROJECT= pygit2 > -PKGNAME= py-git2-$V > - > -MASTER_SITES= https://github.com/libgit2/${PROJECT}/archive/ > -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}{${GH_VER}${EXTRACT_SUFX}} > +DISTNAME= pygit2-${MODPY_EGG_VERSION} > +PKGNAME= ${MODPY_PY_PREFIX}git2-${MODPY_EGG_VERSION} > > MODULES= lang/python > +MODPY_EGG_VERSION= 0.24.1 > +MODPY_PI= Yes > MODPY_SETUPTOOLS= Yes > > WANTLIB += git2 pthread ${MODPY_WANTLIB} > > LIB_DEPENDS= devel/libgit2/libgit2>=0.24.0 > BUILD_DEPENDS= ${RUN_DEPENDS} > -RUN_DEPENDS= devel/py-cffi>=1.2.1 > +RUN_DEPENDS= devel/py-cffi${MODPY_FLAVOR}>=1.2.1 \ > + devel/py-six${MODPY_FLAVOR} > > -do-test: > - cd ${WRKSRC} && ${MODPY_BIN} setup.py test > +FLAVORS = python3 > +FLAVOR ?= > > +#do-test: > +# cd ${WRKSRC} && ${MODPY_BIN} setup.py test > +# > .include <bsd.port.mk> > Index: py-git2/distinfo > =================================================================== > RCS file: /var/cvs/ports/devel/libgit2/py-git2/distinfo,v > retrieving revision 1.13 > diff -u -p -r1.13 distinfo > --- py-git2/distinfo 21 Mar 2016 15:24:35 -0000 1.13 > +++ py-git2/distinfo 1 Oct 2016 13:10:31 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (libgit/pygit2-0.24.0.tar.gz) = > NkjFnGK73mg+7GXvP7HT21jhC13uFVF0YXeOzyBZcfs= > -SIZE (libgit/pygit2-0.24.0.tar.gz) = 466857 > +SHA256 (libgit/pygit2-0.24.1.tar.gz) = > TR0BlrONYBL68KfEXiNcIIMVZytgNdpQRWbGBbpJQGQ= > +SIZE (libgit/pygit2-0.24.1.tar.gz) = 468951 > Index: py-git2/pkg/PLIST > =================================================================== > RCS file: /var/cvs/ports/devel/libgit2/py-git2/pkg/PLIST,v > retrieving revision 1.13 > diff -u -p -r1.13 PLIST > --- py-git2/pkg/PLIST 21 Mar 2016 15:24:35 -0000 1.13 > +++ py-git2/pkg/PLIST 1 Oct 2016 13:12:56 -0000 > @@ -9,38 +9,39 @@ lib/python${MODPY_VERSION}/site-packages > > lib/python${MODPY_VERSION}/site-packages/pygit2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt > > lib/python${MODPY_VERSION}/site-packages/pygit2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt > lib/python${MODPY_VERSION}/site-packages/pygit2/__init__.py > -lib/python${MODPY_VERSION}/site-packages/pygit2/__init__.pyc > +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pygit2/${MODPY_PYCACHE}/ > +lib/python${MODPY_VERSION}/site-packages/pygit2/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pygit2/${MODPY_PYCACHE}_build.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pygit2/${MODPY_PYCACHE}_run.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pygit2/${MODPY_PYCACHE}blame.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pygit2/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pygit2/${MODPY_PYCACHE}credentials.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pygit2/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pygit2/${MODPY_PYCACHE}ffi.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pygit2/${MODPY_PYCACHE}index.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pygit2/${MODPY_PYCACHE}py2.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pygit2/${MODPY_PYCACHE}py3.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pygit2/${MODPY_PYCACHE}refspec.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pygit2/${MODPY_PYCACHE}remote.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pygit2/${MODPY_PYCACHE}repository.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pygit2/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pygit2/${MODPY_PYCACHE}submodule.${MODPY_PYC_MAGIC_TAG}pyc > +lib/python${MODPY_VERSION}/site-packages/pygit2/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc > lib/python${MODPY_VERSION}/site-packages/pygit2/_build.py > -lib/python${MODPY_VERSION}/site-packages/pygit2/_build.pyc > lib/python${MODPY_VERSION}/site-packages/pygit2/_libgit2.so > lib/python${MODPY_VERSION}/site-packages/pygit2/_run.py > -lib/python${MODPY_VERSION}/site-packages/pygit2/_run.pyc > lib/python${MODPY_VERSION}/site-packages/pygit2/blame.py > -lib/python${MODPY_VERSION}/site-packages/pygit2/blame.pyc > lib/python${MODPY_VERSION}/site-packages/pygit2/config.py > -lib/python${MODPY_VERSION}/site-packages/pygit2/config.pyc > lib/python${MODPY_VERSION}/site-packages/pygit2/credentials.py > -lib/python${MODPY_VERSION}/site-packages/pygit2/credentials.pyc > lib/python${MODPY_VERSION}/site-packages/pygit2/decl.h > lib/python${MODPY_VERSION}/site-packages/pygit2/errors.py > -lib/python${MODPY_VERSION}/site-packages/pygit2/errors.pyc > lib/python${MODPY_VERSION}/site-packages/pygit2/ffi.py > -lib/python${MODPY_VERSION}/site-packages/pygit2/ffi.pyc > lib/python${MODPY_VERSION}/site-packages/pygit2/index.py > -lib/python${MODPY_VERSION}/site-packages/pygit2/index.pyc > lib/python${MODPY_VERSION}/site-packages/pygit2/py2.py > -lib/python${MODPY_VERSION}/site-packages/pygit2/py2.pyc > lib/python${MODPY_VERSION}/site-packages/pygit2/py3.py > -lib/python${MODPY_VERSION}/site-packages/pygit2/py3.pyc > lib/python${MODPY_VERSION}/site-packages/pygit2/refspec.py > -lib/python${MODPY_VERSION}/site-packages/pygit2/refspec.pyc > lib/python${MODPY_VERSION}/site-packages/pygit2/remote.py > -lib/python${MODPY_VERSION}/site-packages/pygit2/remote.pyc > lib/python${MODPY_VERSION}/site-packages/pygit2/repository.py > -lib/python${MODPY_VERSION}/site-packages/pygit2/repository.pyc > lib/python${MODPY_VERSION}/site-packages/pygit2/settings.py > -lib/python${MODPY_VERSION}/site-packages/pygit2/settings.pyc > lib/python${MODPY_VERSION}/site-packages/pygit2/submodule.py > -lib/python${MODPY_VERSION}/site-packages/pygit2/submodule.pyc > lib/python${MODPY_VERSION}/site-packages/pygit2/utils.py > -lib/python${MODPY_VERSION}/site-packages/pygit2/utils.pyc > -- Alexandr Shadchin
