Rework the gentium and gentium-basic font ports

  - Rename gentium to gentium-plus tracking upstream changes
  - Use the generic facilities provided in bsd.xorg.mk for handling
    font installation, rather than rolling our own.  This allows
    removing files/fonts.dir from both ports.
  - Add LICENSE, and so modify pkg-message not to mention licensing
  - Use PLIST_FILES and PORTDOCS rather than a separate pkg-plist file

11 files changed, 140 insertions, 107 deletions

diff --git a/x11-fonts/Makefile b/x11-fonts/Makefile
index 8015fc22bd9b..c8c1ff35f2d4 100644
--- a/x11-fonts/Makefile
+++ b/x11-fonts/Makefile
@@ -82,8 +82,8 @@
     SUBDIR += fslsfonts
     SUBDIR += gbdfed
     SUBDIR += geminifonts
-    SUBDIR += gentium
     SUBDIR += gentium-basic
+    SUBDIR += gentium-plus
     SUBDIR += gfe
     SUBDIR += gnu-unifont
     SUBDIR += gnu-unifont-ttf
diff --git a/x11-fonts/gentium-basic/Makefile b/x11-fonts/gentium-basic/Makefile
index 924a1448428b..c3079b574bb6 100644
--- a/x11-fonts/gentium-basic/Makefile
+++ b/x11-fonts/gentium-basic/Makefile
@@ -1,66 +1,65 @@
 # Created by: Matthew Seaman
 # $FreeBSD$
 
-PORTNAME=	gentium-basic
-PORTVERSION=	1.1.0
+PORTNAME=	GentiumBasic
+PORTVERSION=	110
 CATEGORIES=	x11-fonts
-MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=GentiumBasic_${PORTVERSION:C@\.@@g}_tar&filename=/
-DISTNAME=	ttf-sil-${PORTNAME}_${PORTVERSION:C@\.[[:digit:]]+$@@}.orig
+MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=${MEDIA_ID}&filename=/
+DISTNAME=	ttf-sil-gentium-basic_1.1.orig
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Gentium Basic and Gentium Book Basic TrueType fonts
 
-BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+LICENSE=	OFL
+LICENSE_NAME=	SIL Open Font License (OFL)
+LICENSE_FILE=	${WRKSRC}/OFL.txt
+LICENSE_PERMS=	auto-accept
 
-NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/ttf-sil-${PORTNAME}-${PORTVERSION:C@\.[[:digit:]]+$@@}
-
-PLIST_SUB=	FONTSDIR="${FONTSDIR}" \
-		FONTNAME="${FONTNAME}"
+USE_TGZ=	yes
+XORG_CAT=	font
 
-SUB_LIST=	"FONTSDIR=${FONTSDIR}"
+FONTLIBPATH=	lib/X11/fonts
+FONTROOTDIR=	${PREFIX}/${FONTLIBPATH}
+INSTALLS_TTF=	yes
+MEDIA_ID=	${PORTNAME}_${PORTVERSION}_tar
+NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME:S,.orig,,:S,_,-,}
+
+PLIST_FILES=	${FONTLIBPATH}/${FONTDIR}/GenBasB.ttf \
+		${FONTLIBPATH}/${FONTDIR}/GenBasBI.ttf \
+		${FONTLIBPATH}/${FONTDIR}/GenBasI.ttf \
+		${FONTLIBPATH}/${FONTDIR}/GenBasR.ttf \
+		${FONTLIBPATH}/${FONTDIR}/GenBkBasB.ttf \
+		${FONTLIBPATH}/${FONTDIR}/GenBkBasBI.ttf \
+		${FONTLIBPATH}/${FONTDIR}/GenBkBasI.ttf \
+		${FONTLIBPATH}/${FONTDIR}/GenBkBasR.ttf
+
+SUB_LIST=	"FONTPATH=${FONTROOTDIR}/${FONTDIR}"
 SUB_FILES=	pkg-message
 
-#
-# Local variables
-#
-
-FONTNAME=	${PORTNAME}
-FONTSDIR?=	lib/X11/fonts/${FONTNAME}
-FONTSTGT=	${PREFIX}/${FONTSDIR}
-
 DOCSLIST=	FONTLOG.txt GENTIUM-FAQ.txt OFL-FAQ.txt
-
-.SILENT:
+PORTDOCS=	${DOCSLIST:C,^.*/,,}
 
 .include <bsd.port.options.mk>
 
-#
-# Install
-#
+.SILENT:
+
+do-configure:
+	@${DO_NADA}
 
 do-install: install-fonts install-docs
+	${ECHO_MSG}
+	${CAT} ${PKGMESSAGE}
+	${ECHO_MSG}
 
 install-fonts:
-	${MKDIR} ${FONTSTGT}
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSTGT}
-	${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSTGT}
-	${INSTALL_DATA} ${WRKSRC}/OFL.txt ${FONTSTGT}
+	${MKDIR} ${FONTROOTDIR}/${FONTDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTROOTDIR}/${FONTDIR}
 
 install-docs:
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-	@for doc in ${DOCSLIST} ; do \
-	  ${INSTALL_DATA} ${WRKSRC}/$$doc ${DOCSDIR} ; \
-	done
+	${INSTALL_DATA} ${DOCSLIST:S,^,${WRKSRC}/,} ${DOCSDIR}
 .endif
 
-post-install:
-	${ECHO_MSG} "===> Running fc-cache"
-	-${LOCALBASE}/bin/fc-cache -f -v ${FONTSTGT}
-	${ECHO_MSG}
-	${CAT} ${PKGMESSAGE}
-	${ECHO_MSG}
-
 .include <bsd.port.mk>
diff --git a/x11-fonts/gentium-basic/distinfo b/x11-fonts/gentium-basic/distinfo
index 8d26d72017c8..93468ee6a39a 100644
--- a/x11-fonts/gentium-basic/distinfo
+++ b/x11-fonts/gentium-basic/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ttf-sil-gentium-basic_1.1.orig.tar.gz) = 2aa3611c620dceff546ea9784003abc1894c5bcb9894a35445a0f3584f243e5d
-SIZE (ttf-sil-gentium-basic_1.1.orig.tar.gz) = 1451826
+SHA256 (xorg/font/ttf-sil-gentium-basic_1.1.orig.tar.gz) = 2aa3611c620dceff546ea9784003abc1894c5bcb9894a35445a0f3584f243e5d
+SIZE (xorg/font/ttf-sil-gentium-basic_1.1.orig.tar.gz) = 1451826
diff --git a/x11-fonts/gentium-basic/files/fonts.dir b/x11-fonts/gentium-basic/files/fonts.dir
deleted file mode 100644
index db1e18f24966..000000000000
--- a/x11-fonts/gentium-basic/files/fonts.dir
+++ /dev/null
@@ -1,41 +0,0 @@
-40
-GenBasBI.ttf -sil-Gentium Basic-bold-i-normal--0-0-0-0-p-0-ascii-0
-GenBasBI.ttf -sil-Gentium Basic-bold-i-normal--0-0-0-0-p-0-iso10646-1
-GenBasBI.ttf -sil-Gentium Basic-bold-i-normal--0-0-0-0-p-0-iso8859-1
-GenBasBI.ttf -sil-Gentium Basic-bold-i-normal--0-0-0-0-p-0-iso8859-15
-GenBasBI.ttf -sil-Gentium Basic-bold-i-normal--0-0-0-0-p-0-iso8859-9
-GenBkBasBI.ttf -sil-Gentium Book Basic-bold-i-normal--0-0-0-0-p-0-ascii-0
-GenBkBasBI.ttf -sil-Gentium Book Basic-bold-i-normal--0-0-0-0-p-0-iso10646-1
-GenBkBasBI.ttf -sil-Gentium Book Basic-bold-i-normal--0-0-0-0-p-0-iso8859-1
-GenBkBasBI.ttf -sil-Gentium Book Basic-bold-i-normal--0-0-0-0-p-0-iso8859-15
-GenBkBasBI.ttf -sil-Gentium Book Basic-bold-i-normal--0-0-0-0-p-0-iso8859-9
-GenBkBasR.ttf -sil-Gentium Book Basic-medium-r-normal--0-0-0-0-p-0-ascii-0
-GenBkBasR.ttf -sil-Gentium Book Basic-medium-r-normal--0-0-0-0-p-0-iso10646-1
-GenBkBasR.ttf -sil-Gentium Book Basic-medium-r-normal--0-0-0-0-p-0-iso8859-1
-GenBkBasR.ttf -sil-Gentium Book Basic-medium-r-normal--0-0-0-0-p-0-iso8859-15
-GenBkBasR.ttf -sil-Gentium Book Basic-medium-r-normal--0-0-0-0-p-0-iso8859-9
-GenBkBasB.ttf -sil-Gentium Book Basic-bold-r-normal--0-0-0-0-p-0-ascii-0
-GenBkBasB.ttf -sil-Gentium Book Basic-bold-r-normal--0-0-0-0-p-0-iso10646-1
-GenBkBasB.ttf -sil-Gentium Book Basic-bold-r-normal--0-0-0-0-p-0-iso8859-1
-GenBkBasB.ttf -sil-Gentium Book Basic-bold-r-normal--0-0-0-0-p-0-iso8859-15
-GenBkBasB.ttf -sil-Gentium Book Basic-bold-r-normal--0-0-0-0-p-0-iso8859-9
-GenBasI.ttf -sil-Gentium Basic-medium-i-normal--0-0-0-0-p-0-ascii-0
-GenBasI.ttf -sil-Gentium Basic-medium-i-normal--0-0-0-0-p-0-iso10646-1
-GenBasI.ttf -sil-Gentium Basic-medium-i-normal--0-0-0-0-p-0-iso8859-1
-GenBasI.ttf -sil-Gentium Basic-medium-i-normal--0-0-0-0-p-0-iso8859-15
-GenBasI.ttf -sil-Gentium Basic-medium-i-normal--0-0-0-0-p-0-iso8859-9
-GenBasB.ttf -sil-Gentium Basic-bold-r-normal--0-0-0-0-p-0-ascii-0
-GenBasB.ttf -sil-Gentium Basic-bold-r-normal--0-0-0-0-p-0-iso10646-1
-GenBasB.ttf -sil-Gentium Basic-bold-r-normal--0-0-0-0-p-0-iso8859-1
-GenBasB.ttf -sil-Gentium Basic-bold-r-normal--0-0-0-0-p-0-iso8859-15
-GenBasB.ttf -sil-Gentium Basic-bold-r-normal--0-0-0-0-p-0-iso8859-9
-GenBkBasI.ttf -sil-Gentium Book Basic-medium-i-normal--0-0-0-0-p-0-ascii-0
-GenBkBasI.ttf -sil-Gentium Book Basic-medium-i-normal--0-0-0-0-p-0-iso10646-1
-GenBkBasI.ttf -sil-Gentium Book Basic-medium-i-normal--0-0-0-0-p-0-iso8859-1
-GenBkBasI.ttf -sil-Gentium Book Basic-medium-i-normal--0-0-0-0-p-0-iso8859-15
-GenBkBasI.ttf -sil-Gentium Book Basic-medium-i-normal--0-0-0-0-p-0-iso8859-9
-GenBasR.ttf -sil-Gentium Basic-medium-r-normal--0-0-0-0-p-0-ascii-0
-GenBasR.ttf -sil-Gentium Basic-medium-r-normal--0-0-0-0-p-0-iso10646-1
-GenBasR.ttf -sil-Gentium Basic-medium-r-normal--0-0-0-0-p-0-iso8859-1
-GenBasR.ttf -sil-Gentium Basic-medium-r-normal--0-0-0-0-p-0-iso8859-15
-GenBasR.ttf -sil-Gentium Basic-medium-r-normal--0-0-0-0-p-0-iso8859-9
diff --git a/x11-fonts/gentium-basic/files/pkg-message.in b/x11-fonts/gentium-basic/files/pkg-message.in
index 3c3f3173bdfa..7117adce42d0 100644
--- a/x11-fonts/gentium-basic/files/pkg-message.in
+++ b/x11-fonts/gentium-basic/files/pkg-message.in
@@ -1,7 +1,7 @@
 To use these fonts, add the following line to the "Files" section of
 xorg.conf:
 
-	FontPath "%%PREFIX%%/%%FONTSDIR%%/"
+	FontPath "%%FONTPATH%%/"
 
 Users of older versions of X may additionally have to make sure that
 the freetype module is loaded.  Check /var/log/Xorg.0.log for error
@@ -10,4 +10,3 @@ messages.  If freetype is required, add the following line to the
 
 	Load "freetype"
 
-
diff --git a/x11-fonts/gentium-basic/pkg-descr b/x11-fonts/gentium-basic/pkg-descr
index 5b5f526453df..da69e32e559f 100644
--- a/x11-fonts/gentium-basic/pkg-descr
+++ b/x11-fonts/gentium-basic/pkg-descr
@@ -1,7 +1,11 @@
 Gentium is a typeface family designed to enable the diverse ethnic
-groups around the world who use the Latin script to produce readable,
-high-quality publications. It supports a wide range of Latin-based
-alphabets and includes glyphs that correspond to all the Latin ranges
-of Unicode.
+groups around the world who use the Latin, Cyrillic and Greek scripts
+to produce readable, high-quality publications. It supports a wide
+range of Latin- and Cyrillic-based alphabets.
 
-WWW: http://scripts.sil.org/gentium
+Gentium Basic and Gentium Book Basic are font families based on the
+original Gentium design, but with additional weights. The "Book"
+family is slightly heavier. Both families come with a complete
+regular, bold, italic and bold italic set of fonts.
+
+WWW: http://scripts.sil.org/Gentium_basic
diff --git a/x11-fonts/gentium-basic/pkg-plist b/x11-fonts/gentium-basic/pkg-plist
deleted file mode 100644
index 79024dd46b4c..000000000000
--- a/x11-fonts/gentium-basic/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-%%FONTSDIR%%/GenBasB.ttf
-%%FONTSDIR%%/GenBasBI.ttf
-%%FONTSDIR%%/GenBasI.ttf
-%%FONTSDIR%%/GenBasR.ttf
-%%FONTSDIR%%/GenBkBasB.ttf
-%%FONTSDIR%%/GenBkBasBI.ttf
-%%FONTSDIR%%/GenBkBasI.ttf
-%%FONTSDIR%%/GenBkBasR.ttf
-%%FONTSDIR%%/OFL.txt
-%%FONTSDIR%%/fonts.dir
-%%PORTDOCS%%%%DOCSDIR%%/FONTLOG.txt
-%%PORTDOCS%%%%DOCSDIR%%/GENTIUM-FAQ.txt
-%%PORTDOCS%%%%DOCSDIR%%/OFL-FAQ.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
-@dirrm %%FONTSDIR%%
-@exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
diff --git a/x11-fonts/gentium-plus/Makefile b/x11-fonts/gentium-plus/Makefile
new file mode 100644
index 000000000000..e171d2e6ad71
--- /dev/null
+++ b/x11-fonts/gentium-plus/Makefile
@@ -0,0 +1,60 @@
+# Created by: Matthew Seaman
+# $FreeBSD$
+
+PORTNAME=	GentiumPlus
+PORTVERSION=	1.510
+CATEGORIES=	x11-fonts
+MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=${MEDIA_ID}&filename=/
+
+MAINTAINER=	matthew@FreeBSD.org
+COMMENT=	Gentium Plus TrueType font collection
+
+LICENSE=	OFL
+LICENSE_NAME=	SIL Open Font License (OFL)
+LICENSE_FILE=	${WRKSRC}/OFL.txt
+LICENSE_PERMS=	auto-accept
+
+USE_ZIP=	yes
+XORG_CAT=	font
+
+FONTLIBPATH=	lib/X11/fonts
+FONTROOTDIR=	${PREFIX}/${FONTLIBPATH}
+INSTALLS_TTF=	yes
+MEDIA_ID=	${DISTNAME}${EXTRACT_SUFX}
+NO_BUILD=	yes
+USE_TGZ=	yes	#prevent bsd.xorg.mk from setting USE_BZIP
+
+PLIST_FILES=	${FONTLIBPATH}/${FONTDIR}/${PORTNAME}-I.ttf \
+		${FONTLIBPATH}/${FONTDIR}/${PORTNAME}-R.ttf
+
+SUB_LIST=	"FONTPATH=${FONTROOTDIR}/${FONTDIR}"
+SUB_FILES=	pkg-message
+
+DOCSLIST=	FONTLOG.txt GENTIUM-FAQ.txt OFL-FAQ.txt OFL.txt README.txt \
+		documentation/GentiumPlus-features.pdf
+PORTDOCS=	${DOCSLIST:C,^.*/,,}
+
+
+.include <bsd.port.options.mk>
+
+.SILENT:
+
+do-configure:
+	@${DO_NADA}
+
+do-install: install-fonts install-docs
+	${ECHO_MSG}
+	${CAT} ${PKGMESSAGE}
+	${ECHO_MSG}
+
+install-fonts:
+	${MKDIR} ${FONTROOTDIR}/${FONTDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTROOTDIR}/${FONTDIR}
+
+install-docs:
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${DOCSLIST:S,^,${WRKSRC}/,} ${DOCSDIR}
+.endif
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/gentium-plus/distinfo b/x11-fonts/gentium-plus/distinfo
new file mode 100644
index 000000000000..38af0c23ddfd
--- /dev/null
+++ b/x11-fonts/gentium-plus/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xorg/font/GentiumPlus-1.510.zip) = f13622cf85a46c094e671b10152ab2d24913661966f370d340253d7c24c42ccd
+SIZE (xorg/font/GentiumPlus-1.510.zip) = 1992184
diff --git a/x11-fonts/gentium-plus/files/pkg-message.in b/x11-fonts/gentium-plus/files/pkg-message.in
new file mode 100644
index 000000000000..a9dd2d482f32
--- /dev/null
+++ b/x11-fonts/gentium-plus/files/pkg-message.in
@@ -0,0 +1,13 @@
+To use these fonts, add the following line to the "Files" section of
+xorg.conf:
+
+	FontPath "%%FONTPATH%%/"
+
+Users of older versions of X may additionally have to make sure that
+the freetype module is loaded.  Check /var/log/Xorg.0.log for error
+messages.  If freetype is required, add the following line to the
+"Modules" section of xorg.conf:
+
+	Load "freetype"
+
+
diff --git a/x11-fonts/gentium-plus/pkg-descr b/x11-fonts/gentium-plus/pkg-descr
new file mode 100644
index 000000000000..58a703278f89
--- /dev/null
+++ b/x11-fonts/gentium-plus/pkg-descr
@@ -0,0 +1,14 @@
+Gentium is a typeface family designed to enable the diverse ethnic
+groups around the world who use the Latin, Cyrillic and Greek scripts
+to produce readable, high-quality publications. It supports a wide
+range of Latin- and Cyrillic-based alphabets.
+
+The design is intended to be highly readable, reasonably compact, and
+visually attractive. The Latin letters are designed to naturally
+harmonize with the traditional 26 ones. Diacritics are treated with
+careful thought and attention to their use. Gentium also supports both
+polytonic and monotonic Greek. Gentium Plus now includes more extended
+Latin glyphs (Unicode 5.1), archaic Greek symbols, and full extended
+Cyrillic script support
+
+WWW: http://scripts.sil.org/gentium