On Fri, Jan 10, 2020 at 12:19:03AM +0000, Stuart Henderson wrote:
> Can you switch it to python3 please. (MODPY_VERSION=${MODPY_DEFAULT_VERSION_3}
> and sprinkle ${MODPY_FLAVOR} in the deps).
Done. Since I was at it I also took maintainership, in the end it will
just be easier to keep an eye on it from portroach.
Please find attached a new diff including these changes.
> Would have preferred not to have wholesale whitespace changes mixed in with an
> update (unless it's an update where essentially the whole thing is a new
> Makefile), might as well keep it now, but it's really in the interests of
> diff submitters to make it as quick and easy to review as possible and
> the extra noise from whitespace diffs doesn't help this :)
Understood, sorry about that, I should have at least mentioned it.
I should probably resubmit a new devel/py-crayons making it py3 by default as
well.
Comments? OK?
--
clematis (0x7e96fd2400fe7b59)
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/legit/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 12 Jul 2019 20:44:37 -0000 1.6
+++ Makefile 10 Jan 2020 13:43:06 -0000
@@ -1,27 +1,33 @@
# $OpenBSD: Makefile,v 1.6 2019/07/12 20:44:37 sthen Exp $
-COMMENT= complementary command-line interface for Git
+COMMENT = complementary command-line interface for Git
-MODPY_EGG_VERSION= 0.2.0
-DISTNAME= legit-${MODPY_EGG_VERSION}
-CATEGORIES= devel
-EXTRACT_SUFX= .zip
+MODPY_EGG_VERSION = 1.2.0
+DISTNAME = legit-${MODPY_EGG_VERSION}
+CATEGORIES = devel
-HOMEPAGE= http://www.git-legit.org/
+HOMEPAGE = https://github.com/frostming/legit
+
+MAINTAINER = Clem Atis <[email protected]>
# BSD
-PERMIT_PACKAGE= Yes
+PERMIT_PACKAGE = Yes
+
+MODULES = lang/python
-MODULES= lang/python
+MODPY_PI = Yes
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
+MODPY_SETUPTOOLS = Yes
-MODPY_PI= Yes
-MODPY_SETUPTOOLS= Yes
+RUN_DEPENDS = devel/py-clint${MODPY_FLAVOR} \
+ devel/py-gitpython${MODPY_FLAVOR} \
+ devel/py-six${MODPY_FLAVOR} \
+ devel/py-click${MODPY_FLAVOR} \
+ devel/py-crayons${MODPY_FLAVOR}
-RUN_DEPENDS= devel/py-clint>=0.5.1 \
- devel/py-gitpython>=1.0.2 \
- devel/py-six
-NO_TEST= Yes
+# tests aren't available
+NO_TEST = Yes
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/legit/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 25 Apr 2016 09:36:39 -0000 1.2
+++ distinfo 10 Jan 2020 13:43:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (legit-0.2.0.zip) = myoAjU7gJtgmkO38lwAoxf242ymrsPxefWJ1UQMGFzU=
-SIZE (legit-0.2.0.zip) = 18856
+SHA256 (legit-1.2.0.tar.gz) = LHi5e1lH0D1VFgs2JV2v08PzsZlBSFGcCaWEbbIa8Fk=
+SIZE (legit-1.2.0.tar.gz) = 16302
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/legit/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 21 Jan 2013 14:31:53 -0000 1.1.1.1
+++ pkg/PLIST 10 Jan 2020 13:43:06 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2013/01/21 14:31:53 jasper Exp $
+@comment $OpenBSD: PLIST,v$
bin/legit
lib/python${MODPY_VERSION}/site-packages/legit/
lib/python${MODPY_VERSION}/site-packages/legit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
@@ -9,16 +9,17 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/legit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/legit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/legit/__init__.py
-lib/python${MODPY_VERSION}/site-packages/legit/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}bootstrap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}scm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/legit/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/legit/bootstrap.py
-lib/python${MODPY_VERSION}/site-packages/legit/bootstrap.pyc
lib/python${MODPY_VERSION}/site-packages/legit/cli.py
-lib/python${MODPY_VERSION}/site-packages/legit/cli.pyc
lib/python${MODPY_VERSION}/site-packages/legit/core.py
-lib/python${MODPY_VERSION}/site-packages/legit/core.pyc
-lib/python${MODPY_VERSION}/site-packages/legit/helpers.py
-lib/python${MODPY_VERSION}/site-packages/legit/helpers.pyc
lib/python${MODPY_VERSION}/site-packages/legit/scm.py
-lib/python${MODPY_VERSION}/site-packages/legit/scm.pyc
lib/python${MODPY_VERSION}/site-packages/legit/settings.py
-lib/python${MODPY_VERSION}/site-packages/legit/settings.pyc
+lib/python${MODPY_VERSION}/site-packages/legit/utils.py
