Hi,
here's a rather large but mechanical diff (with updates in it..) to move
those python ports to py3 only.
- updated py-planet to 1.4.5, all tests (fetched manually from github) pass
- updated pyproj to 2.4.2.post1, 2.5.0 isnt yet on pypi, and a future
version will require proj 7 which is due next week
- for the others, dropped the py2 specific bits, added the
@conflict/@pkgpath markers, bumped REVISIONs, etc.
- to my knowledge there are no py2 consumers for all of those but more
eyes could triplecheck ..
cc'ed maintainers for py-rasterio & py-proj :)
i *think* i got the upgrade paths right, because with the following
quirks diff :
+ 'py-cligj' => 'py3-cligj',
+ 'py-fiona' => 'py3-fiona',
+ 'py-laspy' => 'py3-laspy',
'py-owslib' => 'py3-owslib',
+ 'py-proj' => 'py3-proj',
+ 'py-planet' => 'py3-planet',
+ 'py-rasterio' => 'py3-rasterio',
+ 'py-rio-cogeo' => 'py3-rio-cogeo',
+ 'py-shapely' => 'py3-shapely',
i got this:
$doas env TRUSTED_PKG_PATH=/tmp/pkg pkg_add -u
py-cligj+py3-cligj-0.5.0p0->py3-cligj-0.5.0p1: ok
py-proj-2.1.3->py3-proj-2.4.2pl1: ok
py-rasterio+py3-rasterio-1.1.2->py3-rasterio-1.1.2p0: ok
py-shapely+py3-shapely-1.6.4p1->py3-shapely-1.6.4p2: ok
py-fiona-1.8.11p1->py3-fiona-1.8.11p2: ok
py-laspy-1.6.0->py3-laspy-1.6.0p0: ok
py-planet-1.2.2p0->py3-planet-1.4.5: ok
py-rio-cogeo-1.0pre8p0+py3-rio-cogeo-1.1.8->py3-rio-cogeo-1.0pre8p1: ok
looking for scrutinizing eyes .. and oks :)
Landry
? py-rio-cogeo/1.1.8.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/geo/Makefile,v
retrieving revision 1.71
diff -u -r1.71 Makefile
--- Makefile 21 Feb 2020 12:36:59 -0000 1.71
+++ Makefile 21 Feb 2020 19:18:39 -0000
@@ -51,22 +51,14 @@
SUBDIR += pgpointcloud
SUBDIR += pgrouting
SUBDIR += postgis
- SUBDIR += py-cligj
SUBDIR += py-cligj,python3
- SUBDIR += py-fiona
SUBDIR += py-fiona,python3
- SUBDIR += py-laspy
SUBDIR += py-laspy,python3
SUBDIR += py-owslib,python3
- SUBDIR += py-planet
SUBDIR += py-planet,python3
- SUBDIR += py-proj
SUBDIR += py-proj,python3
- SUBDIR += py-rasterio
SUBDIR += py-rasterio,python3
- SUBDIR += py-rio-cogeo
SUBDIR += py-rio-cogeo,python3
- SUBDIR += py-shapely
SUBDIR += py-shapely,python3
SUBDIR += pygeoapi
SUBDIR += qgis
Index: py-cligj/Makefile
===================================================================
RCS file: /cvs/ports/geo/py-cligj/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- py-cligj/Makefile 12 Jul 2019 20:46:55 -0000 1.4
+++ py-cligj/Makefile 21 Feb 2020 19:18:39 -0000
@@ -5,7 +5,7 @@
MODPY_EGG_VERSION = 0.5.0
DISTNAME = cligj-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 0
+REVISION = 1
CATEGORIES = geo
@@ -17,7 +17,7 @@
MODULES = lang/python
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
RUN_DEPENDS = devel/py-click${MODPY_FLAVOR}
Index: py-cligj/pkg/PLIST
===================================================================
RCS file: /cvs/ports/geo/py-cligj/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- py-cligj/pkg/PLIST 22 Jan 2019 20:19:37 -0000 1.2
+++ py-cligj/pkg/PLIST 21 Feb 2020 19:18:39 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2019/01/22 20:19:37 landry Exp $
+@conflict py-cligj-*
+@pkgpath geo/py-cligj
lib/python${MODPY_VERSION}/site-packages/cligj/
lib/python${MODPY_VERSION}/site-packages/cligj-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/cligj-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: py-fiona/Makefile
===================================================================
RCS file: /cvs/ports/geo/py-fiona/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- py-fiona/Makefile 21 Jan 2020 10:22:24 -0000 1.17
+++ py-fiona/Makefile 21 Feb 2020 19:18:39 -0000
@@ -5,7 +5,7 @@
MODPY_EGG_VERSION = 1.8.11
DISTNAME = Fiona-${MODPY_EGG_VERSION:S/post/pl/}
PKGNAME = ${MODPY_PY_PREFIX}${DISTNAME:L}
-REVISION = 1
+REVISION = 2
CATEGORIES = geo
@@ -17,7 +17,7 @@
MODULES = lang/python
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
COMPILER = base-clang ports-gcc
@@ -43,23 +43,7 @@
WANTLIB += ${COMPILER_LIBCXX} gdal m ${MODPY_WANTLIB}
-.if !${FLAVOR:Mpython3}
-RUN_DEPENDS += devel/py-enum34
-TEST_DEPENDS += devel/py-mock
-.endif
-
-# @conflict markers only for py2 flavour
-SUBST_VARS += MODPY_2ONLY
-.if ${FLAVOR} == python3
-MODPY_2ONLY = "@comment "
-.else
-MODPY_2ONLY =
-.endif
-
TESTLIBDIR = ${WRKSRC}/lib.openbsd-${OSREV}-${ARCH}-${MODPY_VERSION}
-
-post-install:
- mv ${PREFIX}/bin/fio{,${MODPY_BIN_SUFFIX}}
pre-test:
cp ${TESTLIBDIR}/fiona/*.so ${WRKSRC}/fiona/
Index: py-fiona/pkg/PLIST
===================================================================
RCS file: /cvs/ports/geo/py-fiona/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- py-fiona/pkg/PLIST 21 Jan 2020 10:22:24 -0000 1.4
+++ py-fiona/pkg/PLIST 21 Feb 2020 19:18:39 -0000
@@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST,v 1.4 2020/01/21 10:22:24 sthen Exp $
-${MODPY_2ONLY}@conflict fio-*
-bin/fio${MODPY_BIN_SUFFIX}
+@conflict fio-*
+@conflict py-fiona-*
+@pkgpath geo/py-fiona
+bin/fio
lib/python${MODPY_VERSION}/site-packages/Fiona-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/Fiona-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/Fiona-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
Index: py-laspy/Makefile
===================================================================
RCS file: /cvs/ports/geo/py-laspy/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- py-laspy/Makefile 21 Sep 2019 16:23:26 -0000 1.5
+++ py-laspy/Makefile 21 Feb 2020 19:18:39 -0000
@@ -5,6 +5,7 @@
MODPY_EGG_VERSION= 1.6.0
DISTNAME= laspy-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
+REVISION= 0
CATEGORIES= geo devel textproc
@@ -14,7 +15,7 @@
MODULES= lang/python
FLAVORS= python3
-FLAVOR?=
+FLAVOR= python3
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
@@ -22,10 +23,5 @@
BUILD_DEPENDS = math/py-numpy,${FLAVOR}
RUN_DEPENDS = math/py-numpy,${FLAVOR} \
graphics/py-opengl,${FLAVOR}
-
-post-install:
-.for b in lascopy lasexplorer lasnoise lasvalidate lasverify lasviewer
- mv ${PREFIX}/bin/${b}{,${MODPY_BIN_SUFFIX}}
-.endfor
.include <bsd.port.mk>
Index: py-laspy/pkg/PLIST
===================================================================
RCS file: /cvs/ports/geo/py-laspy/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- py-laspy/pkg/PLIST 20 Jun 2017 17:14:47 -0000 1.1.1.1
+++ py-laspy/pkg/PLIST 21 Feb 2020 19:18:39 -0000
@@ -1,10 +1,12 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2017/06/20 17:14:47 landry Exp $
-bin/lascopy${MODPY_BIN_SUFFIX}
-bin/lasexplorer${MODPY_BIN_SUFFIX}
-bin/lasnoise${MODPY_BIN_SUFFIX}
-bin/lasvalidate${MODPY_BIN_SUFFIX}
-bin/lasverify${MODPY_BIN_SUFFIX}
-bin/lasviewer${MODPY_BIN_SUFFIX}
+@conflict py-laspy-*
+@pkgpath geo/py-laspy
+bin/lascopy
+bin/lasexplorer
+bin/lasnoise
+bin/lasvalidate
+bin/lasverify
+bin/lasviewer
lib/python${MODPY_VERSION}/site-packages/laspy/
lib/python${MODPY_VERSION}/site-packages/laspy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/laspy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: py-planet/Makefile
===================================================================
RCS file: /cvs/ports/geo/py-planet/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- py-planet/Makefile 12 Jul 2019 20:46:55 -0000 1.6
+++ py-planet/Makefile 21 Feb 2020 19:18:39 -0000
@@ -2,10 +2,9 @@
COMMENT = client library and CLI for Planet's public API
#'
-MODPY_EGG_VERSION = 1.2.2
+MODPY_EGG_VERSION = 1.4.5
DISTNAME = planet-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 0
CATEGORIES = geo
@@ -18,7 +17,7 @@
MODPY_SETUPTOOLS = Yes
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
# tests not bundled; test infrastructure left here for manual fetches
#NO_TEST = Yes
@@ -31,7 +30,6 @@
www/py-requests-mock${MODPY_FLAVOR}
post-install:
- mv ${PREFIX}/bin/planet ${PREFIX}/bin/planet${MODPY_BIN_SUFFIX}
rm ${PREFIX}/LICENSE
.include <bsd.port.mk>
Index: py-planet/distinfo
===================================================================
RCS file: /cvs/ports/geo/py-planet/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- py-planet/distinfo 25 Apr 2019 16:20:24 -0000 1.3
+++ py-planet/distinfo 21 Feb 2020 19:18:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (planet-1.2.2.tar.gz) = Rrftjhd9E07H+GP1Pcai9d+0a3OQreszPOyhLXPnR64=
-SIZE (planet-1.2.2.tar.gz) = 34590
+SHA256 (planet-1.4.5.tar.gz) = qlnhTuzXH0pgas3AWyDCTKSZHoQHTY4qAZ1DODHCL+4=
+SIZE (planet-1.4.5.tar.gz) = 39155
Index: py-planet/pkg/PLIST
===================================================================
RCS file: /cvs/ports/geo/py-planet/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- py-planet/pkg/PLIST 21 Sep 2017 21:00:33 -0000 1.2
+++ py-planet/pkg/PLIST 21 Feb 2020 19:18:39 -0000
@@ -1,5 +1,7 @@
@comment $OpenBSD: PLIST,v 1.2 2017/09/21 21:00:33 sebastia Exp $
-bin/planet${MODPY_BIN_SUFFIX}
+@conflict py-planet-*
+@pkgpath geo/py-planet
+bin/planet
lib/python${MODPY_VERSION}/site-packages/planet/
lib/python${MODPY_VERSION}/site-packages/planet-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/planet-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: py-proj/Makefile
===================================================================
RCS file: /cvs/ports/geo/py-proj/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- py-proj/Makefile 12 Jul 2019 20:46:55 -0000 1.24
+++ py-proj/Makefile 21 Feb 2020 19:18:39 -0000
@@ -2,9 +2,9 @@
COMMENT = Pyrex generated python interface to PROJ.4 library
-MODPY_EGG_VERSION = 2.1.3
+MODPY_EGG_VERSION = 2.4.2.post1
DISTNAME = pyproj-${MODPY_EGG_VERSION}
-PKGNAME = ${DISTNAME:S/py/py-/}
+PKGNAME = ${DISTNAME:S/py/py-/:S/.post/pl/}
CATEGORIES = geo
@@ -24,7 +24,7 @@
MODPY_TEST_DIR = ${WRKSRC}/test
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
MODPY_SETUPTOOLS = Yes
Index: py-proj/distinfo
===================================================================
RCS file: /cvs/ports/geo/py-proj/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- py-proj/distinfo 12 May 2019 08:03:50 -0000 1.10
+++ py-proj/distinfo 21 Feb 2020 19:18:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (pyproj-2.1.3.tar.gz) = mcUniLAae7mogCS/TUCWXApmqT1lRgC13qz2RHdfQk0=
-SIZE (pyproj-2.1.3.tar.gz) = 521154
+SHA256 (pyproj-2.4.2.post1.tar.gz) =
Haf4bTtegLo9q/0skEpBu2mXrZtVtHqTQDVJLqoPMx4=
+SIZE (pyproj-2.4.2.post1.tar.gz) = 463579
Index: py-proj/pkg/PLIST
===================================================================
RCS file: /cvs/ports/geo/py-proj/pkg/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- py-proj/pkg/PLIST 12 May 2019 08:03:50 -0000 1.8
+++ py-proj/pkg/PLIST 21 Feb 2020 19:18:39 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.8 2019/05/12 08:03:50 landry Exp $
+@conflict py-proj-*
+@pkgpath geo/py-proj
lib/python${MODPY_VERSION}/site-packages/pyproj/
lib/python${MODPY_VERSION}/site-packages/pyproj-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/pyproj-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -6,24 +8,33 @@
lib/python${MODPY_VERSION}/site-packages/pyproj-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/pyproj-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/pyproj/__init__.py
+lib/python${MODPY_VERSION}/site-packages/pyproj/__main__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}_show_versions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}cf1x8.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}crs.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}datadir.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}enums.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}geod.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}proj.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}transformer.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyproj/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pyproj/_crs.so
-lib/python${MODPY_VERSION}/site-packages/pyproj/_datadir.so
-lib/python${MODPY_VERSION}/site-packages/pyproj/_geod.so
-lib/python${MODPY_VERSION}/site-packages/pyproj/_proj.so
-lib/python${MODPY_VERSION}/site-packages/pyproj/_transformer.so
+@so lib/python${MODPY_VERSION}/site-packages/pyproj/_crs.so
+@so lib/python${MODPY_VERSION}/site-packages/pyproj/_datadir.so
+@so lib/python${MODPY_VERSION}/site-packages/pyproj/_geod.so
+@so lib/python${MODPY_VERSION}/site-packages/pyproj/_list.so
+@so lib/python${MODPY_VERSION}/site-packages/pyproj/_proj.so
+lib/python${MODPY_VERSION}/site-packages/pyproj/_show_versions.py
+@so lib/python${MODPY_VERSION}/site-packages/pyproj/_transformer.so
+lib/python${MODPY_VERSION}/site-packages/pyproj/cf1x8.py
lib/python${MODPY_VERSION}/site-packages/pyproj/compat.py
lib/python${MODPY_VERSION}/site-packages/pyproj/crs.py
lib/python${MODPY_VERSION}/site-packages/pyproj/datadir.py
+lib/python${MODPY_VERSION}/site-packages/pyproj/enums.py
lib/python${MODPY_VERSION}/site-packages/pyproj/exceptions.py
lib/python${MODPY_VERSION}/site-packages/pyproj/geod.py
lib/python${MODPY_VERSION}/site-packages/pyproj/proj.py
Index: py-rasterio/Makefile
===================================================================
RCS file: /cvs/ports/geo/py-rasterio/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- py-rasterio/Makefile 7 Jan 2020 08:27:50 -0000 1.6
+++ py-rasterio/Makefile 21 Feb 2020 19:18:39 -0000
@@ -5,6 +5,7 @@
MODPY_EGG_VERSION = 1.1.2
DISTNAME = rasterio-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
+REVISION = 0
CATEGORIES = geo
@@ -18,7 +19,7 @@
MODULES = lang/python
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
COMPILER = base-clang ports-gcc
@@ -38,10 +39,6 @@
math/py-snuggs${MODPY_FLAVOR} \
math/py-affine${MODPY_FLAVOR}
-.if !${FLAVOR:Mpython3}
-RUN_DEPENDS += devel/py-enum34
-.endif
-
# test_read_no_band requires hdf5 support in GDAL
# requires datafiles only on github...
NO_TEST = Yes
@@ -49,8 +46,5 @@
devel/py-test-cov${MODPY_FLAVOR} \
devel/py-hypothesis${MODPY_FLAVOR} \
devel/py-mock${MODPY_FLAVOR}
-
-post-install:
- mv ${PREFIX}/bin/rio{,${MODPY_BIN_SUFFIX}}
.include <bsd.port.mk>
Index: py-rasterio/pkg/PLIST
===================================================================
RCS file: /cvs/ports/geo/py-rasterio/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- py-rasterio/pkg/PLIST 7 Jan 2020 08:27:50 -0000 1.3
+++ py-rasterio/pkg/PLIST 21 Feb 2020 19:18:39 -0000
@@ -1,5 +1,7 @@
@comment $OpenBSD: PLIST,v 1.3 2020/01/07 08:27:50 martin Exp $
-bin/rio${MODPY_BIN_SUFFIX}
+@conflict py-rasterio-*
+@pkgpath geo/py-rasterio
+bin/rio
lib/python${MODPY_VERSION}/site-packages/rasterio/
lib/python${MODPY_VERSION}/site-packages/rasterio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/rasterio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: py-rio-cogeo/Makefile
===================================================================
RCS file: /cvs/ports/geo/py-rio-cogeo/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- py-rio-cogeo/Makefile 12 Jul 2019 20:46:55 -0000 1.3
+++ py-rio-cogeo/Makefile 21 Feb 2020 19:18:39 -0000
@@ -6,7 +6,7 @@
MODPY_EGG_VERSION = 1.0.dev8
DISTNAME = rio-cogeo-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME:S/.dev/pre/}
-REVISION = 0
+REVISION = 1
CATEGORIES = geo
@@ -16,7 +16,7 @@
MODULES = lang/python
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
MODPY_SETUPTOOLS = Yes
MODPY_PI = Yes
Index: py-rio-cogeo/pkg/PLIST
===================================================================
RCS file: /cvs/ports/geo/py-rio-cogeo/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- py-rio-cogeo/pkg/PLIST 24 Feb 2019 20:51:18 -0000 1.1.1.1
+++ py-rio-cogeo/pkg/PLIST 21 Feb 2020 19:18:39 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2019/02/24 20:51:18 landry Exp $
+@conflict py-rio-cogeo-*
+@pkgpath geo/py-rio-cogeo
lib/python${MODPY_VERSION}/site-packages/rio_cogeo/
lib/python${MODPY_VERSION}/site-packages/rio_cogeo-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/rio_cogeo-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: py-shapely/Makefile
===================================================================
RCS file: /cvs/ports/geo/py-shapely/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- py-shapely/Makefile 26 Nov 2019 16:11:34 -0000 1.10
+++ py-shapely/Makefile 21 Feb 2020 19:18:39 -0000
@@ -7,7 +7,7 @@
GH_ACCOUNT = Toblerity
GH_PROJECT = Shapely
DISTNAME = py-shapely-${MODPY_EGG_VERSION}
-REVISION = 1
+REVISION = 2
CATEGORIES = geo
@@ -17,7 +17,7 @@
PERMIT_PACKAGE = Yes
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
MODULES = lang/python
Index: py-shapely/pkg/PLIST
===================================================================
RCS file: /cvs/ports/geo/py-shapely/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- py-shapely/pkg/PLIST 27 Nov 2018 18:03:37 -0000 1.3
+++ py-shapely/pkg/PLIST 21 Feb 2020 19:18:39 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.3 2018/11/27 18:03:37 landry Exp $
+@conflict py-shapely-*
+@pkgpath geo/py-shapely
lib/python${MODPY_VERSION}/site-packages/Shapely-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/Shapely-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/Shapely-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
