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.

WWW: http://scripts.sil.org/gentium

PR:		ports/139340
Submitted by:	Matthew Seaman <m.seaman@infracaninophile.co.uk>

6 files changed, 66 insertions, 85 deletions

diff --git a/x11-fonts/Makefile b/x11-fonts/Makefile
index b397abcb111..9b1c50a9727 100644
--- a/x11-fonts/Makefile
+++ b/x11-fonts/Makefile
@@ -74,6 +74,7 @@
     SUBDIR += fslsfonts
     SUBDIR += geminifonts
     SUBDIR += gentium
+    SUBDIR += gentium-basic
     SUBDIR += getbdf
     SUBDIR += gfe
     SUBDIR += gnome-font-sampler
diff --git a/x11-fonts/gentium-basic/Makefile b/x11-fonts/gentium-basic/Makefile
index fa858d7b086..ef849ec4b36 100644
--- a/x11-fonts/gentium-basic/Makefile
+++ b/x11-fonts/gentium-basic/Makefile
@@ -7,21 +7,20 @@
 # This port is shamelessly copied from Joe Marcus Clarke's bitstream-vera
 # port.
 
-PORTNAME=	gentium
-PORTVERSION=	1.0.2
-PORTREVISION=	3
+PORTNAME=	gentium-basic
+PORTVERSION=	1.1.0
 CATEGORIES=	x11-fonts
-MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=Gentium_102_L_tar&_sc=1&filename=/
-DISTNAME=	ttf-sil-${PORTNAME}_${PORTVERSION}
+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
 
 MAINTAINER=	m.seaman@infracaninophile.co.uk
-COMMENT=	Gentium TrueType font collection
+COMMENT=	Gentium Basic and Gentium Book Basic TrueType fonts
 
 BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/ttf-sil-${PORTNAME}-${PORTVERSION:C@\.([[:digit:]]+)$@\1@}
+WRKSRC=		${WRKDIR}/ttf-sil-${PORTNAME}-${PORTVERSION:C@\.[[:digit:]]+$@@}
 
 PLIST_SUB=	FONTSDIR="${FONTSDIR}" \
 		FONTNAME="${FONTNAME}"
@@ -37,9 +36,7 @@ FONTNAME=	${PORTNAME}
 FONTSDIR?=	lib/X11/fonts/${FONTNAME}
 FONTSTGT=	${PREFIX}/${FONTSDIR}
 
-DOCSLIST=	FONTLOG GENTIUM-FAQ Gentium-Greek-Specimen.pdf \
-		Gentium-RU-A3Proofs.pdf Gentium-RU-Specimen.pdf \
-		OFL-FAQ QUOTES README
+DOCSLIST=	FONTLOG.txt GENTIUM-FAQ.txt OFL-FAQ.txt
 
 .SILENT:
 
@@ -47,18 +44,13 @@ DOCSLIST=	FONTLOG GENTIUM-FAQ Gentium-Greek-Specimen.pdf \
 # Install
 #
 
-do-install: install-fonts install-conf install-docs
+do-install: install-fonts install-docs
 
 install-fonts:
 	${MKDIR} ${FONTSTGT}
 	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSTGT}
 	${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSTGT}
-	${INSTALL_DATA} ${WRKSRC}/OFL ${FONTSTGT}
-
-install-conf:
-	${MKDIR} ${PREFIX}/etc/fonts/conf.d
-	${INSTALL_DATA} ${WRKSRC}/local.conf \
-		${PREFIX}/etc/fonts/conf.d/${FONTNAME}.conf
+	${INSTALL_DATA} ${WRKSRC}/OFL.txt ${FONTSTGT}
 
 install-docs:
 .if !defined(NOPORTDOCS)
diff --git a/x11-fonts/gentium-basic/distinfo b/x11-fonts/gentium-basic/distinfo
index f79ba1e55af..eb04b49605f 100644
--- a/x11-fonts/gentium-basic/distinfo
+++ b/x11-fonts/gentium-basic/distinfo
@@ -1,3 +1,3 @@
-MD5 (ttf-sil-gentium_1.0.2.tar.gz) = 4c3e6ae586be277537ebb68f2a45b883
-SHA256 (ttf-sil-gentium_1.0.2.tar.gz) = 4746c04c9a4ad9e0788a38e0a2f81919a630d8070ceabc89f156b6d41d8ceb37
-SIZE (ttf-sil-gentium_1.0.2.tar.gz) = 2334185
+MD5 (ttf-sil-gentium-basic_1.1.orig.tar.gz) = 7b29b6ff59c2738ddfb4ee53b4b51ba9
+SHA256 (ttf-sil-gentium-basic_1.1.orig.tar.gz) = 2aa3611c620dceff546ea9784003abc1894c5bcb9894a35445a0f3584f243e5d
+SIZE (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
index df9ff03d6b0..db1e18f2496 100644
--- a/x11-fonts/gentium-basic/files/fonts.dir
+++ b/x11-fonts/gentium-basic/files/fonts.dir
@@ -1,45 +1,41 @@
-44
-GenAI102.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-ascii-0
-GenAI102.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-fcd8859-15
-GenAI102.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso10646-1
-GenAI102.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-1
-GenAI102.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-10
-GenAI102.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-15
-GenAI102.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-2
-GenAI102.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-3
-GenAI102.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-4
-GenAI102.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-7
-GenAI102.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-9
-GenAR102.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-ascii-0
-GenAR102.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-fcd8859-15
-GenAR102.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso10646-1
-GenAR102.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-1
-GenAR102.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-10
-GenAR102.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-15
-GenAR102.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-2
-GenAR102.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-3
-GenAR102.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-4
-GenAR102.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-7
-GenAR102.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-9
-GenI102.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-ascii-0
-GenI102.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-fcd8859-15
-GenI102.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso10646-1
-GenI102.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-1
-GenI102.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-10
-GenI102.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-15
-GenI102.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-2
-GenI102.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-3
-GenI102.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-4
-GenI102.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-7
-GenI102.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-9
-GenR102.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-ascii-0
-GenR102.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-fcd8859-15
-GenR102.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso10646-1
-GenR102.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-1
-GenR102.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-10
-GenR102.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-15
-GenR102.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-2
-GenR102.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-3
-GenR102.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-4
-GenR102.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-7
-GenR102.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-9
+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 39fcde85589..3c3f3173bdf 100644
--- a/x11-fonts/gentium-basic/files/pkg-message.in
+++ b/x11-fonts/gentium-basic/files/pkg-message.in
@@ -1,8 +1,3 @@
-IMPORTANT - READ CAREFULLY: Please read the COPYRIGHT included with these fonts
-before using.  The copyright can be found at
-
-	%%PREFIX%%/%%FONTSDIR%%/OFL
-
 To use these fonts, add the following line to the "Files" section of
 xorg.conf:
 
diff --git a/x11-fonts/gentium-basic/pkg-plist b/x11-fonts/gentium-basic/pkg-plist
index 70513d3a0b9..79024dd46b4 100644
--- a/x11-fonts/gentium-basic/pkg-plist
+++ b/x11-fonts/gentium-basic/pkg-plist
@@ -1,20 +1,17 @@
-etc/fonts/conf.d/%%FONTNAME%%.conf
-%%FONTSDIR%%/GenAI102.ttf
-%%FONTSDIR%%/GenAR102.ttf
-%%FONTSDIR%%/GenI102.ttf
-%%FONTSDIR%%/GenR102.ttf
-%%FONTSDIR%%/OFL
+%%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
-%%PORTDOCS%%%%DOCSDIR%%/GENTIUM-FAQ
-%%PORTDOCS%%%%DOCSDIR%%/Gentium-Greek-Specimen.pdf
-%%PORTDOCS%%%%DOCSDIR%%/Gentium-RU-A3Proofs.pdf
-%%PORTDOCS%%%%DOCSDIR%%/Gentium-RU-Specimen.pdf
-%%PORTDOCS%%%%DOCSDIR%%/OFL-FAQ
-%%PORTDOCS%%%%DOCSDIR%%/QUOTES
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%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
-@dirrmtry etc/fonts/conf.d