OK.

There are also some py3 py-* ports which don't have FLAVOR at all
which would be nice to get converted too but it's slightly more work
(bump, @pkgpath, ,python3 in ../Makefie, and bump + ${MODPY_FLAVOR}
in dependent ports) - I keep meaning to do that but haven't got round
to it yet.


On 2022/02/19 23:25, Bjorn Ketelaars wrote:
> 
> Fox python3 only ports, use proper construct for FLAVOR and forcibly
> assign variable:
> 
> FLAVOR=python3, not FLAVOR?=python3.
> 
> OK?
> 
> 
> diff --git databases/py-alembic/Makefile databases/py-alembic/Makefile
> index 7dd9820b8f5..e4d16d7c2f2 100644
> --- databases/py-alembic/Makefile
> +++ databases/py-alembic/Makefile
> @@ -20,7 +20,7 @@ MODPY_SETUPTOOLS =  Yes
>  MODPY_PYTEST =               Yes
>  
>  FLAVORS =            python3
> -FLAVOR ?=            python3
> +FLAVOR =             python3
>  
>  RUN_DEPENDS =                databases/py-sqlalchemy${MODPY_FLAVOR}>=1.3.0 \
>                       devel/py-importlib_resources${MODPY_FLAVOR} \
> diff --git databases/py-puppetdb/Makefile databases/py-puppetdb/Makefile
> index 9b42436c6f9..afa67d0ebfb 100644
> --- databases/py-puppetdb/Makefile
> +++ databases/py-puppetdb/Makefile
> @@ -18,7 +18,7 @@ MODPY_SETUPTOOLS=   Yes
>  MODPY_PI =           Yes
>  
>  FLAVORS =            python3
> -FLAVOR?=             python3
> +FLAVOR=              python3
>  
>  RUN_DEPENDS=         www/py-requests${MODPY_FLAVOR}>=2.22.0
>  BUILD_DEPENDS=               ${RUN_DEPENDS}
> diff --git devel/py-pyinotify/Makefile devel/py-pyinotify/Makefile
> index a7430316bc7..e6ebdd310c6 100644
> --- devel/py-pyinotify/Makefile
> +++ devel/py-pyinotify/Makefile
> @@ -26,7 +26,7 @@ MODPY_PI =          Yes
>  MODPY_SETUPTOOLS =   Yes
>  
>  FLAVORS =            python3
> -FLAVOR ?=            python3
> +FLAVOR =             python3
>  
>  pre-configure:
>       ${SUBST_CMD} ${WRKSRC}/setup.py ${WRKSRC}/python*/pyinotify.py
> diff --git devel/py-resolvelib/Makefile devel/py-resolvelib/Makefile
> index c0a892cf273..b1c819b6a04 100644
> --- devel/py-resolvelib/Makefile
> +++ devel/py-resolvelib/Makefile
> @@ -21,7 +21,7 @@ MODPY_PI =          Yes
>  MODPY_SETUPTOOLS =   Yes
>  
>  FLAVORS =            python3
> -FLAVOR ?=            python3
> +FLAVOR =             python3
>  
>  NO_TEST =            Yes
>  
> diff --git devel/py-setuptools-rust/Makefile devel/py-setuptools-rust/Makefile
> index 7a83f96285a..0dc30c4f3fd 100644
> --- devel/py-setuptools-rust/Makefile
> +++ devel/py-setuptools-rust/Makefile
> @@ -20,7 +20,7 @@ MODPY_PI=           Yes
>  MODPY_SETUPTOOLS=    Yes
>  
>  FLAVORS=             python3
> -FLAVOR ?=            python3
> +FLAVOR =             python3
>  
>  BUILD_DEPENDS=               devel/py-setuptools_scm${MODPY_FLAVOR}
>  
> diff --git security/py-hkdf/Makefile security/py-hkdf/Makefile
> index 4c3de2aebb4..75902aff45b 100644
> --- security/py-hkdf/Makefile
> +++ security/py-hkdf/Makefile
> @@ -19,6 +19,6 @@ MODPY_PI =          Yes
>  MODPY_SETUPTOOLS =   Yes
>  
>  FLAVORS =            python3
> -FLAVOR ?=            python3
> +FLAVOR =             python3
>  
>  .include <bsd.port.mk>
> diff --git security/py-spake2/Makefile security/py-spake2/Makefile
> index 36f71129e8a..f182a00f161 100644
> --- security/py-spake2/Makefile
> +++ security/py-spake2/Makefile
> @@ -21,6 +21,6 @@ MODPY_SETUPTOOLS =  Yes
>  RUN_DEPENDS =                security/py-hkdf${MODPY_FLAVOR}
>  
>  FLAVORS =            python3
> -FLAVOR ?=            python3
> +FLAVOR =             python3
>  
>  .include <bsd.port.mk>
> diff --git sysutils/py-pyperclip/Makefile sysutils/py-pyperclip/Makefile
> index 50d1d752f25..95d0272a698 100644
> --- sysutils/py-pyperclip/Makefile
> +++ sysutils/py-pyperclip/Makefile
> @@ -23,6 +23,6 @@ MODPY_SETUPTOOLS =  Yes
>  RUN_DEPENDS =                x11/xclip
>  
>  FLAVORS =            python3
> -FLAVOR ?=            python3
> +FLAVOR =             python3
>  
>  .include <bsd.port.mk>
> diff --git textproc/py-pypandoc/Makefile textproc/py-pypandoc/Makefile
> index 32d4aa67811..8268b7d1977 100644
> --- textproc/py-pypandoc/Makefile
> +++ textproc/py-pypandoc/Makefile
> @@ -23,7 +23,7 @@ MODPY_PI =          Yes
>  MODPY_SETUPTOOLS =   Yes
>  
>  FLAVORS =            python3
> -FLAVOR ?=            python3
> +FLAVOR =             python3
>  
>  RUN_DEPENDS =                textproc/pandoc
>  
> 

Reply via email to