Hi,
Thank you for looking into this. How about now? Please see attached.
Asher
On Thu, 30 Jul 2020 at 05:10, Raymond E. Pasco <r...@ameretat.dev> wrote:
>
> On Thu Jul 30, 2020 at 4:51 AM EDT, Dimitri Karamazov wrote:
> > if it's a standalone application (couldn't possibly be another's
> > dependency)
> > then
> > >> MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
> > else
> > >> +FLAVORS = python3
> > >> +FLAVOR ?= python3
> > endif
>
> Makes sense to me.
>
> > Scour is an optional dependency for inkscape.
>
> Since graphics/inkscape uses python 3, enforcing the flavor seems like
> it should be fine.
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/scour/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile 3 Jul 2020 21:12:56 -0000 1.11
+++ Makefile 30 Jul 2020 16:18:53 -0000
@@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.11 2020/07/03 21:12:56 sthen Exp $
COMMENT = SVG scrubber
-MODPY_EGG_VERSION = 0.35
-REVISION = 4
+MODPY_EGG_VERSION = 0.37
CATEGORIES = graphics
HOMEPAGE = http://www.codedread.com/scour/
@@ -14,7 +13,10 @@ GH_TAGNAME = v${MODPY_EGG_VERSION}
MODULES = lang/python
MODPY_SETUPTOOLS = Yes
-MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
+
+FLAVORS = python3
+FLAVOR ?= python3
+
RUN_DEPENDS = devel/py-six${MODPY_FLAVOR}
do-test:
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/scour/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 14 Sep 2016 12:15:46 -0000 1.4
+++ distinfo 30 Jul 2020 16:18:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (scour-0.35.tar.gz) = kafdDXIaNWe4AsGzU+9FFiFZTmKP5yPO22XNRin7yW8=
-SIZE (scour-0.35.tar.gz) = 80981
+SHA256 (scour-0.37.tar.gz) = T8uWFYbYptmKyTQ8pWR0IbmP3Hm1HYGh09GFdreQiCM=
+SIZE (scour-0.37.tar.gz) = 95478
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/scour/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 16 Sep 2016 08:54:57 -0000 1.3
+++ pkg/PLIST 30 Jul 2020 16:18:53 -0000
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2016/09/16 08:54:57 czarkoff Exp $
+@comment $OpenBSD: PLIST,v$
bin/scour
lib/python${MODPY_VERSION}/site-packages/scour/
lib/python${MODPY_VERSION}/site-packages/scour-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
@@ -10,7 +10,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/scour-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/scour-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
lib/python${MODPY_VERSION}/site-packages/scour/__init__.py
-lib/python${MODPY_VERSION}/site-packages/scour/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scour/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/scour/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scour/${MODPY_PYCACHE}scour.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/scour/${MODPY_PYCACHE}svg_regex.${MODPY_PYC_MAGIC_TAG}pyc
