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@

19 files changed, 32 insertions, 229 deletions

diff --git a/print/Makefile b/print/Makefile
index 260a4fec174f..609de3196e2c 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -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
diff --git a/print/py-fonttools-graphite/Makefile b/print/py-fonttools-graphite/Makefile
deleted file mode 100644
index 5abd4324453c..000000000000
--- a/print/py-fonttools-graphite/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	fonttools
-PORTVERSION=	3.44.0
-CATEGORIES=	print python
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX=	-graphite
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Dependencies for graphite functionality of FontTools
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lz4>=1.7.4.2:archivers/py-lz4@${PY_FLAVOR}
-
-USES=		metaport python:env
-USE_PYTHON=	flavors
-
-.include <bsd.port.mk>
diff --git a/print/py-fonttools-graphite/pkg-descr b/print/py-fonttools-graphite/pkg-descr
deleted file mode 100644
index 28722be8ee3a..000000000000
--- a/print/py-fonttools-graphite/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This port is the extra dependencies for graphite functionality of FontTools.
-
-Add both print/py-fonttools and print/py-fonttools-graphite to RUN_DEPENDS if
-you need "fonttools[graphite]".
-
-WWW: https://github.com/fonttools/fonttools
diff --git a/print/py-fonttools-interpolatable/Makefile b/print/py-fonttools-interpolatable/Makefile
deleted file mode 100644
index eb2df9cfcede..000000000000
--- a/print/py-fonttools-interpolatable/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	fonttools
-PORTVERSION=	3.44.0
-CATEGORIES=	print python
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX=	-interpolatable
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Dependencies for interpolatable functionality of FontTools
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR}
-
-USES=		metaport python:env
-USE_PYTHON=	flavors
-
-.include <bsd.port.mk>
diff --git a/print/py-fonttools-interpolatable/pkg-descr b/print/py-fonttools-interpolatable/pkg-descr
deleted file mode 100644
index 08780fe4e1fa..000000000000
--- a/print/py-fonttools-interpolatable/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-This port is the extra dependencies for interpolatable functionality of
-FontTools.
-
-Add both print/py-fonttools and print/py-fonttools-interpolatable to RUN_DEPENDS
-if you need "fonttools[interpolatable]".
-
-WWW: https://github.com/fonttools/fonttools
diff --git a/print/py-fonttools-lxml/Makefile b/print/py-fonttools-lxml/Makefile
deleted file mode 100644
index 460172ddbc55..000000000000
--- a/print/py-fonttools-lxml/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	fonttools
-PORTVERSION=	3.44.0
-CATEGORIES=	print python
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX=	-lxml
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Dependencies for lxml functionality of FontTools
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=4.0<5:devel/py-lxml@${PY_FLAVOR} \
-		${PY_TYPING}
-
-USES=		metaport python:env
-USE_PYTHON=	flavors
-
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3400
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}singledispatch>=3.4.0.3:devel/py-singledispatch@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/print/py-fonttools-lxml/pkg-descr b/print/py-fonttools-lxml/pkg-descr
deleted file mode 100644
index 702df721381e..000000000000
--- a/print/py-fonttools-lxml/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This port is the extra dependencies for lxml functionality of FontTools.
-
-Add both print/py-fonttools and print/py-fonttools-lxml to RUN_DEPENDS if you
-need "fonttools[lxml]".
-
-WWW: https://github.com/fonttools/fonttools
diff --git a/print/py-fonttools-plot/Makefile b/print/py-fonttools-plot/Makefile
deleted file mode 100644
index ef4291b10100..000000000000
--- a/print/py-fonttools-plot/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	fonttools
-PORTVERSION=	3.44.0
-CATEGORIES=	print python
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX=	-plot
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Dependencies for plot functionality of FontTools
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>=0:math/py-matplotlib@${PY_FLAVOR}
-
-USES=		metaport python:env
-USE_PYTHON=	flavors
-
-.include <bsd.port.mk>
diff --git a/print/py-fonttools-plot/pkg-descr b/print/py-fonttools-plot/pkg-descr
deleted file mode 100644
index b519c08b2e29..000000000000
--- a/print/py-fonttools-plot/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This port is the extra dependencies for plot functionality of FontTools.
-
-Add both print/py-fonttools and print/py-fonttools-plot to RUN_DEPENDS if you
-need "fonttools[plot]".
-
-WWW: https://github.com/fonttools/fonttools
diff --git a/print/py-fonttools-symfont/Makefile b/print/py-fonttools-symfont/Makefile
deleted file mode 100644
index f1847c9847ee..000000000000
--- a/print/py-fonttools-symfont/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	fonttools
-PORTVERSION=	3.44.0
-CATEGORIES=	print python
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX=	-symfont
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Dependencies for symfont functionality of FontTools
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sympy>=0:math/py-sympy@${PY_FLAVOR}
-
-USES=		metaport python:env
-USE_PYTHON=	flavors
-
-.include <bsd.port.mk>
diff --git a/print/py-fonttools-symfont/pkg-descr b/print/py-fonttools-symfont/pkg-descr
deleted file mode 100644
index 1afdabb9d64c..000000000000
--- a/print/py-fonttools-symfont/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This port is the extra dependencies for symfont functionality of FontTools.
-
-Add both print/py-fonttools and print/py-fonttools-symfont to RUN_DEPENDS if you
-need "fonttools[symfont]".
-
-WWW: https://github.com/fonttools/fonttools
diff --git a/print/py-fonttools-ufo/Makefile b/print/py-fonttools-ufo/Makefile
deleted file mode 100644
index 47ddef2d2bc6..000000000000
--- a/print/py-fonttools-ufo/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	fonttools
-PORTVERSION=	3.44.0
-CATEGORIES=	print python
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX=	-ufo
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Dependencies for ufo functionality of FontTools
-
-RUN_DEPENDS=	${PY_ENUM34} \
-		${PYTHON_PKGNAMEPREFIX}fs2>=2.2.0<3:devel/py-fs2@${PY_FLAVOR}
-
-USES=		metaport python:env
-USE_PYTHON=	flavors
-
-.include <bsd.port.mk>
diff --git a/print/py-fonttools-ufo/pkg-descr b/print/py-fonttools-ufo/pkg-descr
deleted file mode 100644
index f070cd44c205..000000000000
--- a/print/py-fonttools-ufo/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This port is the extra dependencies for ufo functionality of FontTools.
-
-Add both print/py-fonttools and print/py-fonttools-ufo to RUN_DEPENDS if you
-need "fonttools[ufo]".
-
-WWW: https://github.com/fonttools/fonttools
diff --git a/print/py-fonttools-unicode/Makefile b/print/py-fonttools-unicode/Makefile
deleted file mode 100644
index ba51cead00d4..000000000000
--- a/print/py-fonttools-unicode/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	fonttools
-PORTVERSION=	3.44.0
-CATEGORIES=	print python
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX=	-unicode
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Dependencies for unicode functionality of FontTools
-
-USES=		metaport python:env
-USE_PYTHON=	flavors
-
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3800
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}unicodedata2>=12.0.0:devel/py-unicodedata2@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/print/py-fonttools-unicode/pkg-descr b/print/py-fonttools-unicode/pkg-descr
deleted file mode 100644
index 89514a069cf3..000000000000
--- a/print/py-fonttools-unicode/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This port is the extra dependencies for unicode functionality of FontTools.
-
-Add both print/py-fonttools and print/py-fonttools-unicode to RUN_DEPENDS if you
-need "fonttools[unicode]".
-
-WWW: https://github.com/fonttools/fonttools
diff --git a/print/py-fonttools-woff/Makefile b/print/py-fonttools-woff/Makefile
deleted file mode 100644
index be646992ffcb..000000000000
--- a/print/py-fonttools-woff/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	fonttools
-PORTVERSION=	3.44.0
-CATEGORIES=	print python
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX=	-woff
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Dependencies for woff functionality of FontTools
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}brotli>=1.0.1:archivers/py-brotli@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}zopfli>=0.1.4:archivers/py-zopfli@${PY_FLAVOR}
-
-USES=		metaport python:env
-USE_PYTHON=	flavors
-
-.include <bsd.port.mk>
diff --git a/print/py-fonttools-woff/pkg-descr b/print/py-fonttools-woff/pkg-descr
deleted file mode 100644
index 8b8571b7bca3..000000000000
--- a/print/py-fonttools-woff/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This port is the extra dependencies for woff functionality of FontTools.
-
-Add both print/py-fonttools and print/py-fonttools-woff to RUN_DEPENDS if you
-need "fonttools[woff]".
-
-WWW: https://github.com/fonttools/fonttools
diff --git a/print/py-fonttools/Makefile b/print/py-fonttools/Makefile
index 7d8532173ac9..b74ea5bacad8 100644
--- a/print/py-fonttools/Makefile
+++ b/print/py-fonttools/Makefile
@@ -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}
+
+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.mk>
+.include <bsd.port.post.mk>
diff --git a/print/py-psautohint/Makefile b/print/py-psautohint/Makefile
index 5121cb1a41bc..3cd0d1b65f98 100644
--- a/print/py-psautohint/Makefile
+++ b/print/py-psautohint/Makefile
@@ -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