diff options
author | Rene Ladan <rene@FreeBSD.org> | 2021-01-11 19:36:17 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2021-01-11 19:36:17 +0000 |
commit | 75d659b385e30935a659f6c63b86195f2b975175 (patch) | |
tree | 91ba938db95d41ba75ac2883a0f16259e0ecaa4a /x11-fonts | |
parent | 3aaf6bb5547bf9e4cb3bfc37dab67b12e7323222 (diff) | |
download | ports-75d659b385e30935a659f6c63b86195f2b975175.tar.gz ports-75d659b385e30935a659f6c63b86195f2b975175.zip |
Remove logic for Python < 3.6 for ports using Python 3.6+
Notes
Notes:
svn path=/head/; revision=561252
Diffstat (limited to 'x11-fonts')
-rw-r--r-- | x11-fonts/py-booleanOperations/Makefile | 13 | ||||
-rw-r--r-- | x11-fonts/py-compreffor/Makefile | 12 | ||||
-rw-r--r-- | x11-fonts/py-cu2qu/Makefile | 13 | ||||
-rw-r--r-- | x11-fonts/py-defcon/Makefile | 12 | ||||
-rw-r--r-- | x11-fonts/py-fontMath/Makefile | 12 | ||||
-rw-r--r-- | x11-fonts/py-fontmake/Makefile | 13 | ||||
-rw-r--r-- | x11-fonts/py-glyphsLib/Makefile | 13 | ||||
-rw-r--r-- | x11-fonts/py-ufo2ft/Makefile | 13 |
8 files changed, 24 insertions, 77 deletions
diff --git a/x11-fonts/py-booleanOperations/Makefile b/x11-fonts/py-booleanOperations/Makefile index 2b01b0f6563b..e17da9f24f51 100644 --- a/x11-fonts/py-booleanOperations/Makefile +++ b/x11-fonts/py-booleanOperations/Makefile @@ -14,19 +14,12 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.11:devel/py-setuptools_scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyclipper>=1.0.5:math/py-pyclipper@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyclipper>=1.0.5:math/py-pyclipper@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} USES= python:3.6+ zip USE_PYTHON= autoplist distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools3>=3.32.0:print/py-fonttools3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/py-compreffor/Makefile b/x11-fonts/py-compreffor/Makefile index 6cfad668a53b..6851554053db 100644 --- a/x11-fonts/py-compreffor/Makefile +++ b/x11-fonts/py-compreffor/Makefile @@ -13,15 +13,9 @@ COMMENT= CFF subroutinizer for fontTools LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.1:print/py-fonttools@${PY_FLAVOR} + USES= compiler:c++11-lang python:3.6+ zip USE_PYTHON= autoplist concurrent distutils -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools3>=3.1:print/py-fonttools3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.1:print/py-fonttools@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/py-cu2qu/Makefile b/x11-fonts/py-cu2qu/Makefile index fe72b28b376a..c30a8c1c34ff 100644 --- a/x11-fonts/py-cu2qu/Makefile +++ b/x11-fonts/py-cu2qu/Makefile @@ -14,17 +14,10 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defcon>=0.6.0:x11-fonts/py-defcon@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defcon>=0.6.0:x11-fonts/py-defcon@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} USES= python:3.6+ zip USE_PYTHON= autoplist concurrent distutils -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools3>=3.32.0:print/py-fonttools3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/py-defcon/Makefile b/x11-fonts/py-defcon/Makefile index 810483143b9e..96b11f61c0ed 100644 --- a/x11-fonts/py-defcon/Makefile +++ b/x11-fonts/py-defcon/Makefile @@ -13,18 +13,12 @@ COMMENT= Set of flexible objects for representing UFO data LICENSE= MIT LICENSE_FILE= ${WRKSRC}/License.txt +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.31.0:print/py-fonttools@${PY_FLAVOR} + USES= python:3.6+ zip USE_PYTHON= autoplist distutils USE_LOCALE= en_US.UTF-8 NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools3>=3.31.0:print/py-fonttools3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.31.0:print/py-fonttools@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/py-fontMath/Makefile b/x11-fonts/py-fontMath/Makefile index 5cc448eee62b..613a3c5d17a8 100644 --- a/x11-fonts/py-fontMath/Makefile +++ b/x11-fonts/py-fontMath/Makefile @@ -13,17 +13,11 @@ COMMENT= Set of objects for performing math operations on font data LICENSE= MIT LICENSE_FILE= ${WRKSRC}/License.txt +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} + USES= python:3.6+ zip USE_PYTHON= autoplist distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools3>=3.32.0:print/py-fonttools3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/py-fontmake/Makefile b/x11-fonts/py-fontmake/Makefile index 5973271eeb81..664140cf4375 100644 --- a/x11-fonts/py-fontmake/Makefile +++ b/x11-fonts/py-fontmake/Makefile @@ -19,19 +19,12 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cu2qu>=1.6.5:x11-fonts/py-cu2qu@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}ufo2ft>=2.5.0:x11-fonts/py-ufo2ft@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}MutatorMath>=2.1.2:math/py-MutatorMath@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}defcon>=0.6.0:x11-fonts/py-defcon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}booleanOperations>=0.8.1:x11-fonts/py-booleanOperations@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}booleanOperations>=0.8.1:x11-fonts/py-booleanOperations@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} USES= python:3.6+ zip USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools3>=3.32.0:print/py-fonttools3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/py-glyphsLib/Makefile b/x11-fonts/py-glyphsLib/Makefile index 109baa5823be..65fda2dcba32 100644 --- a/x11-fonts/py-glyphsLib/Makefile +++ b/x11-fonts/py-glyphsLib/Makefile @@ -14,19 +14,12 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defcon>=0.3.0:x11-fonts/py-defcon@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defcon>=0.3.0:x11-fonts/py-defcon@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fonttools>=3.24.0:print/py-fonttools@${PY_FLAVOR} USES= python:3.6+ zip USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools3>=3.24.0:print/py-fonttools3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.24.0:print/py-fonttools@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fonts/py-ufo2ft/Makefile b/x11-fonts/py-ufo2ft/Makefile index 456bc7353be6..0270dbe9910d 100644 --- a/x11-fonts/py-ufo2ft/Makefile +++ b/x11-fonts/py-ufo2ft/Makefile @@ -17,19 +17,12 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@$ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defcon>=0.6.0:x11-fonts/py-defcon@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cu2qu>=1.6.4:x11-fonts/py-cu2qu@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}compreffor>=0.4.5:x11-fonts/py-compreffor@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}booleanOperations>=0.8.0:x11-fonts/py-booleanOperations@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}booleanOperations>=0.8.0:x11-fonts/py-booleanOperations@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} USES= python:3.6+ zip USE_PYTHON= autoplist distutils NO_ARCH= yes -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} < 3600 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools3>=3.32.0:print/py-fonttools3@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> |