Date: Mon, 7 Oct 2019 15:42:16 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513967 - in head: . print print/py-fonttools print/py-fonttools-graphite print/py-fonttools-interpolatable print/py-fonttools-lxml print/py-fonttools-plot print/py-fonttools-symfont pr... Message-ID: <201910071542.x97FgGma019292@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Oct 7 15:42:16 2019 New Revision: 513967 URL: https://svnweb.freebsd.org/changeset/ports/513967 Log: Simplify the dependencies for print/py-fonttools, and enable options that are needed by other ports in the tree. Discussed by: portmgr@ With hat: portmgr@ Deleted: head/print/py-fonttools-graphite/ head/print/py-fonttools-interpolatable/ head/print/py-fonttools-lxml/ head/print/py-fonttools-plot/ head/print/py-fonttools-symfont/ head/print/py-fonttools-ufo/ head/print/py-fonttools-unicode/ head/print/py-fonttools-woff/ Modified: head/MOVED head/print/Makefile (contents, props changed) head/print/py-fonttools/Makefile (contents, props changed) head/print/py-psautohint/Makefile (contents, props changed) head/x11-fonts/py-cu2qu/Makefile (contents, props changed) head/x11-fonts/py-defcon/Makefile (contents, props changed) head/x11-fonts/py-fontmake/Makefile (contents, props changed) head/x11-fonts/py-ufo2ft/Makefile (contents, props changed) Modified: head/MOVED ============================================================================== --- head/MOVED Mon Oct 7 15:42:10 2019 (r513966) +++ head/MOVED Mon Oct 7 15:42:16 2019 (r513967) @@ -13067,3 +13067,11 @@ lang/jakarta-commons-jelly|lang/apache-commons-jelly|2 net/jakarta-commons-net|net/apache-commons-net|2019-10-06|Renamed upstream textproc/jakarta-commons-digester|textproc/apache-commons-digester|2019-10-06|Renamed upstream devel/jakarta-commons-daemon|devel/apache-commons-daemon|2019-10-07|Renamed upstream +print/py-fonttools-graphite|print/py-fonttools|2019-10-07|Folded back into main port +print/py-fonttools-interpolatable|print/py-fonttools|2019-10-07|Folded back into main port +print/py-fonttools-lxml|print/py-fonttools|2019-10-07|Folded back into main port +print/py-fonttools-plot|print/py-fonttools|2019-10-07|Folded back into main port +print/py-fonttools-symfont|print/py-fonttools|2019-10-07|Folded back into main port +print/py-fonttools-ufo|print/py-fonttools|2019-10-07|Folded back into main port +print/py-fonttools-unicode|print/py-fonttools|2019-10-07|Folded back into main port +print/py-fonttools-woff|print/py-fonttools|2019-10-07|Folded back into main port Modified: head/print/Makefile ============================================================================== --- head/print/Makefile Mon Oct 7 15:42:10 2019 (r513966) +++ head/print/Makefile Mon Oct 7 15:42:16 2019 (r513967) @@ -183,14 +183,6 @@ SUBDIR += pstotext SUBDIR += psutils SUBDIR += py-fonttools - SUBDIR += py-fonttools-graphite - SUBDIR += py-fonttools-interpolatable - SUBDIR += py-fonttools-lxml - SUBDIR += py-fonttools-plot - SUBDIR += py-fonttools-symfont - SUBDIR += py-fonttools-ufo - SUBDIR += py-fonttools-unicode - SUBDIR += py-fonttools-woff SUBDIR += py-fpdf SUBDIR += py-pdf SUBDIR += py-pdf2 Modified: head/print/py-fonttools/Makefile ============================================================================== --- head/print/py-fonttools/Makefile Mon Oct 7 15:42:10 2019 (r513966) +++ head/print/py-fonttools/Makefile Mon Oct 7 15:42:16 2019 (r513967) @@ -3,7 +3,7 @@ PORTNAME= fonttools PORTVERSION= 3.44.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -20,9 +20,9 @@ USE_PYTHON= autoplist concurrent distutils MAKE_ENV= FONTTOOLS_MANPATH="man" NO_ARCH= yes -SLAVEDIRS= print/py-fonttools-graphite print/py-fonttools-interpolatable print/py-fonttools-lxml print/py-fonttools-plot print/py-fonttools-symfont print/py-fonttools-ufo print/py-fonttools-unicode print/py-fonttools-woff - OPTIONS_DEFINE= GRAPHITE INTERPOLATABLE LXML PLOT SYMFONT UFO UNICODE WOFF +OPTIONS_DEFAULT= LXML UFO UNICODE + GRAPHITE_DESC= Process graphite type tables in ttLib/tables INTERPOLATABLE_DESC= Interpolatability support LXML_DESC= Read/write XML files via lxml (faster/safer than built-in ElementTree) @@ -32,13 +32,31 @@ UFO_DESC= Read/write UFO fonts UNICODE_DESC= Use latest Unicode Character Database WOFF_DESC= Compress/uncompress WOFF webfonts -GRAPHITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools-graphite>=${PORTVERSION}:print/py-fonttools-graphite@${PY_FLAVOR} -INTERPOLATABLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools-interpolatable>=${PORTVERSION}:print/py-fonttools-interpolatable@${PY_FLAVOR} -LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools-lxml>=${PORTVERSION}:print/py-fonttools-lxml@${PY_FLAVOR} -PLOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools-plot>=${PORTVERSION}:print/py-fonttools-plot@${PY_FLAVOR} -SYMFONT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools-symfont>=${PORTVERSION}:print/py-fonttools-symfont@${PY_FLAVOR} -UFO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools-ufo>=${PORTVERSION}:print/py-fonttools-ufo@${PY_FLAVOR} -UNICODE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools-unicode>=${PORTVERSION}:print/py-fonttools-unicode@${PY_FLAVOR} -WOFF_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools-woff>=${PORTVERSION}:print/py-fonttools-woff@${PY_FLAVOR} +GRAPHITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lz4>=1.7.4.2:archivers/py-lz4@${PY_FLAVOR} -.include <bsd.port.mk> +INTERPOLATABLE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} + +LXML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>=4.0<5:devel/py-lxml@${PY_FLAVOR} \ + ${PY_TYPING} + +PLOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR} + +SYMFONT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sympy>=0:math/py-sympy@${PY_FLAVOR} + +UFO_RUN_DEPENDS= ${PY_ENUM34} \ + ${PYTHON_PKGNAMEPREFIX}fs2>=2.2.0<3:devel/py-fs2@${PY_FLAVOR} + +WOFF_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}brotli>=1.0.1:archivers/py-brotli@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zopfli>=0.1.4:archivers/py-zopfli@${PY_FLAVOR} + +.include <bsd.port.pre.mk> + +.if ${PYTHON_REL} < 3400 && ${PORT_OPTIONS:MLXML} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}singledispatch>=3.4.0.3:devel/py-singledispatch@${PY_FLAVOR} +.endif + +.if ${PYTHON_REL} < 3800 && ${PORT_OPTIONS:MUNICODE} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}unicodedata2>=12.0.0:devel/py-unicodedata2@${PY_FLAVOR} +.endif + +.include <bsd.port.post.mk> Modified: head/print/py-psautohint/Makefile ============================================================================== --- head/print/py-psautohint/Makefile Mon Oct 7 15:42:10 2019 (r513966) +++ head/print/py-psautohint/Makefile Mon Oct 7 15:42:16 2019 (r513967) @@ -2,7 +2,7 @@ PORTNAME= psautohint PORTVERSION= 1.9.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,8 +14,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}fonttools-ufo>0:print/py-fonttools-ufo@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} USES= python zip USE_PYTHON= autoplist concurrent distutils Modified: head/x11-fonts/py-cu2qu/Makefile ============================================================================== --- head/x11-fonts/py-cu2qu/Makefile Mon Oct 7 15:42:10 2019 (r513966) +++ head/x11-fonts/py-cu2qu/Makefile Mon Oct 7 15:42:16 2019 (r513967) @@ -2,7 +2,7 @@ PORTNAME= cu2qu PORTVERSION= 1.6.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}fonttools-ufo>0:print/py-fonttools-ufo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}defcon>=0.6.0:x11-fonts/py-defcon@${PY_FLAVOR} USES= python zip Modified: head/x11-fonts/py-defcon/Makefile ============================================================================== --- head/x11-fonts/py-defcon/Makefile Mon Oct 7 15:42:10 2019 (r513966) +++ head/x11-fonts/py-defcon/Makefile Mon Oct 7 15:42:16 2019 (r513967) @@ -2,7 +2,7 @@ PORTNAME= defcon PORTVERSION= 0.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,9 +13,7 @@ COMMENT= Set of flexible objects for representing UFO LICENSE= MIT LICENSE_FILE= ${WRKSRC}/License.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.31.0:print/py-fonttools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}fonttools-ufo>0:print/py-fonttools-ufo@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}fonttools-unicode>0:print/py-fonttools-unicode@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.31.0:print/py-fonttools@${PY_FLAVOR} USES= python zip USE_PYTHON= autoplist distutils Modified: head/x11-fonts/py-fontmake/Makefile ============================================================================== --- head/x11-fonts/py-fontmake/Makefile Mon Oct 7 15:42:10 2019 (r513966) +++ head/x11-fonts/py-fontmake/Makefile Mon Oct 7 15:42:16 2019 (r513967) @@ -2,7 +2,7 @@ PORTNAME= fontmake PORTVERSION= 1.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,9 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}fonttools-ufo>0:print/py-fonttools-ufo@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}fonttools-lxml>0:print/py-fonttools-lxml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}fonttools-unicode>0:print/py-fonttools-unicode@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cu2qu>=1.6.5:x11-fonts/py-cu2qu@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}glyphsLib>=3.1.3:x11-fonts/py-glyphsLib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ufo2ft>=2.5.0:x11-fonts/py-ufo2ft@${PY_FLAVOR} \ Modified: head/x11-fonts/py-ufo2ft/Makefile ============================================================================== --- head/x11-fonts/py-ufo2ft/Makefile Mon Oct 7 15:42:10 2019 (r513966) +++ head/x11-fonts/py-ufo2ft/Makefile Mon Oct 7 15:42:16 2019 (r513967) @@ -2,7 +2,7 @@ PORTNAME= ufo2ft PORTVERSION= 2.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools>=3.32.0:print/py-fonttools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}fonttools-ufo>0:print/py-fonttools-ufo@${PY_FLAVOR} \ ${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} \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910071542.x97FgGma019292>