On 2020/02/29 16:02, Stuart Henderson wrote:
> We have a number of older ports for py3-only Python modules from before
> the simpler "FLAVOR=python3" setup that we're using now.
I should add: this is for ports producing packages with the py3- prefix
(i.e. modules used by other ports). For standalone applications that
happen to be written in python I think it makes sense to keep them
unFLAVORed and with MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}.
(Later we can flip things around and make it so the py2 ones are the
special case instead).
>
> Here's an example of a conversion:
>
> - change ../Makefile to add ,python3
>
> - bump REVISION
>
> - set FLAVOR/FLAVORS = python3, remove MODPY_VERSION =
> ${MODPY_DEFAULT_VERSION_3}
>
> - add @pkgpath so that the new package is considered as a candidate to replace
> the unflavoured version
>
> - bump REVISION and add ${MODPY_FLAVOR} to all ports depending on the one you
> are switching
>
> - ...and since I'm there anyway, use https for HOMEPAGE
>
> Index: databases/Makefile
> ===================================================================
> RCS file: /cvs/ports/databases/Makefile,v
> retrieving revision 1.390
> diff -u -p -r1.390 Makefile
> --- databases/Makefile 27 Feb 2020 18:10:24 -0000 1.390
> +++ databases/Makefile 29 Feb 2020 16:01:00 -0000
> @@ -163,7 +163,7 @@
> SUBDIR += py-ldap,python3
> SUBDIR += py-ldap3
> SUBDIR += py-ldap3,python3
> - SUBDIR += py-minidb
> + SUBDIR += py-minidb,python3
> SUBDIR += py-mongo
> SUBDIR += py-mongo,python3
> SUBDIR += py-mysql
> Index: databases/py-minidb/Makefile
> ===================================================================
> RCS file: /cvs/ports/databases/py-minidb/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- databases/py-minidb/Makefile 8 Nov 2019 14:48:10 -0000 1.8
> +++ databases/py-minidb/Makefile 29 Feb 2020 16:01:00 -0000
> @@ -5,11 +5,11 @@ COMMENT = simple SQLite3 store for Pyth
> MODPY_EGG_VERSION = 2.0.2
> DISTNAME = minidb-${MODPY_EGG_VERSION}
> PKGNAME = py-minidb-${MODPY_EGG_VERSION}
> -REVISION = 0
> +REVISION = 1
>
> CATEGORIES = databases
>
> -HOMEPAGE = http://thp.io/2010/minidb/
> +HOMEPAGE = https://thp.io/2010/minidb/
>
> # BSD
> PERMIT_PACKAGE = Yes
> @@ -18,6 +18,7 @@ MODULES = lang/python
> MODPY_PI = Yes
> MODPY_PYTEST = Yes
>
> -MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
> +FLAVORS = python3
> +FLAVOR = python3
>
> .include <bsd.port.mk>
> Index: databases/py-minidb/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/databases/py-minidb/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- databases/py-minidb/pkg/PLIST 1 Nov 2016 13:20:10 -0000 1.1.1.1
> +++ databases/py-minidb/pkg/PLIST 29 Feb 2020 16:01:00 -0000
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.1.1.1 2016/11/01 13:20:10 rpe Exp $
> +@pkgpath databases/py-minidb
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
>
> lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}minidb.${MODPY_PYC_MAGIC_TAG}pyc
>
> lib/python${MODPY_VERSION}/site-packages/minidb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
> Index: www/urlwatch/Makefile
> ===================================================================
> RCS file: /cvs/ports/www/urlwatch/Makefile,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile
> --- www/urlwatch/Makefile 3 Jun 2019 16:06:58 -0000 1.25
> +++ www/urlwatch/Makefile 29 Feb 2020 16:01:00 -0000
> @@ -4,7 +4,7 @@ COMMENT= monitor webpages for updates
>
> MODPY_EGG_VERSION= 2.17
> DISTNAME= urlwatch-${MODPY_EGG_VERSION}
> -REVISION= 0
> +REVISION= 1
>
> CATEGORIES= www
>
> @@ -23,7 +23,7 @@ MODPY_SETUPTOOLS= Yes
>
> BUILD_DEPENDS= ${RUN_DEPENDS}
> RUN_DEPENDS= converters/py-html2text${MODPY_FLAVOR} \
> - databases/py-minidb \
> + databases/py-minidb${MODPY_FLAVOR} \
> devel/py-appdirs${MODPY_FLAVOR} \
> security/py-keyring${MODPY_FLAVOR} \
> textproc/py-cssselect${MODPY_FLAVOR} \
>
