6 files changed, 68 insertions, 87 deletions

diff --git a/x11-fonts/gentium-basic/Makefile b/x11-fonts/gentium-basic/Makefile
index e95c7b027ccb..02cb2e18e1e0 100644
--- a/x11-fonts/gentium-basic/Makefile
+++ b/x11-fonts/gentium-basic/Makefile
@@ -6,25 +6,12 @@
 #
 # This port is shamelessly copied from Joe Marcus Clarke's bitstream-vera
 # port.
-#
-# A note about MASTER_SITES.  The bsd.port.mk system, expects (not
-# unreasonably) that the name of the distfile being fetched should be
-# the last component of the URL it passes to fetch(1).  Unfortunately,
-# in this case the master site uses some sort of fancy content
-# management system and the URL required to download the distfile is
-# strictly:
-#
-# http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=Gentium_101_LT&_sc=1
-#
-# No mention of the distfile there.  Hack around the problem by adding
-# a dummy argument to the CGI arg list, which the site ignores, but
-# that serves to placate bsd.ports.mk
 
 PORTNAME=	gentium
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	x11-fonts
-MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=Gentium_101_LT&_sc=1&dummy=/
-DISTNAME=	fonts-ttf-${PORTNAME}-${PORTVERSION}
+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}
 
 MAINTAINER=	m.seaman@infracaninophile.co.uk
 COMMENT=	Gentium TrueType font collection
@@ -32,16 +19,15 @@ COMMENT=	Gentium TrueType font collection
 BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-NO_CDROM=	License forbids commercial distribution without permission
 NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/ttf-sil-${PORTNAME}-${PORTVERSION:C@\.([[:digit:]]+)$@\1@}
 
 PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" \
 		FONTNAME=${FONTNAME}
 
-MSG_FILE=	${PKGDIR}/pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_LIST=	"FONTSDIR=${FONTSDIR}"
+SUB_FILES=	pkg-message
 
 #
 # Local variables
@@ -50,15 +36,12 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 FONTNAME=	${PORTNAME}
 FONTSDIR?=	${PREFIX}/lib/X11/fonts/${FONTNAME}
 
-DOCSLIST=	CHANGELOG FAQ Gentium-Greek-Specimen.pdf \
+DOCSLIST=	FONTLOG GENTIUM-FAQ Gentium-Greek-Specimen.pdf \
 		Gentium-RU-A3Proofs.pdf Gentium-RU-Specimen.pdf \
-		HISTORY INSTALL ISSUES QUOTES README THANKS
+		OFL-FAQ QUOTES README
 
 .SILENT:
 
-post-patch:
-	${SED} 's|%%FONTSDIR%%|${FONTSDIR}|g' ${MSG_FILE} > ${PKGMESSAGE}
-
 #
 # Install
 #
@@ -69,7 +52,7 @@ install-fonts:
 	${MKDIR} ${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSDIR}
 	${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/OFL ${FONTSDIR}
 
 install-conf:
 	${MKDIR} ${PREFIX}/etc/fonts
diff --git a/x11-fonts/gentium-basic/distinfo b/x11-fonts/gentium-basic/distinfo
index f38259c4549e..f79ba1e55aff 100644
--- a/x11-fonts/gentium-basic/distinfo
+++ b/x11-fonts/gentium-basic/distinfo
@@ -1,2 +1,3 @@
-MD5 (fonts-ttf-gentium-1.0.1.tar.bz2) = 78eea9e9831768bdb8aae7ee9a2e7782
-SIZE (fonts-ttf-gentium-1.0.1.tar.bz2) = 1789522
+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
diff --git a/x11-fonts/gentium-basic/files/fonts.dir b/x11-fonts/gentium-basic/files/fonts.dir
index 77e808e5e851..df9ff03d6b0e 100644
--- a/x11-fonts/gentium-basic/files/fonts.dir
+++ b/x11-fonts/gentium-basic/files/fonts.dir
@@ -1,45 +1,45 @@
 44
-GentiumI.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-ascii-0
-GentiumI.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-fcd8859-15
-GentiumI.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso10646-1
-GentiumI.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-1
-GentiumI.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-10
-GentiumI.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-15
-GentiumI.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-2
-GentiumI.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-3
-GentiumI.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-4
-GentiumI.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-7
-GentiumI.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-9
-GentiumAlt.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-ascii-0
-GentiumAlt.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-fcd8859-15
-GentiumAlt.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso10646-1
-GentiumAlt.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-1
-GentiumAlt.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-10
-GentiumAlt.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-15
-GentiumAlt.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-2
-GentiumAlt.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-3
-GentiumAlt.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-4
-GentiumAlt.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-7
-GentiumAlt.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-9
-GentiumAItI.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-ascii-0
-GentiumAItI.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-fcd8859-15
-GentiumAItI.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso10646-1
-GentiumAItI.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-1
-GentiumAItI.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-10
-GentiumAItI.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-15
-GentiumAItI.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-2
-GentiumAItI.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-3
-GentiumAItI.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-4
-GentiumAItI.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-7
-GentiumAItI.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-9
-Gentium.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-ascii-0
-Gentium.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-fcd8859-15
-Gentium.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso10646-1
-Gentium.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-1
-Gentium.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-10
-Gentium.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-15
-Gentium.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-2
-Gentium.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-3
-Gentium.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-4
-Gentium.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-7
-Gentium.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-9
+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
diff --git a/x11-fonts/gentium-basic/pkg-message b/x11-fonts/gentium-basic/files/pkg-message.in
index f2cc5d30720f..308325f876ff 100644
--- a/x11-fonts/gentium-basic/pkg-message
+++ b/x11-fonts/gentium-basic/files/pkg-message.in
@@ -1,15 +1,15 @@
 IMPORTANT - READ CAREFULLY: Please read the COPYRIGHT included with these fonts
 before using.  The copyright can be found at
 
-	%%FONTSDIR%%/COPYING.
+	%%FONTSDIR%%/OFL
 
 To use these fonts, follow the instructions below.
 
 Make sure that the freetype module is loaded.  If it is not, add the following
-line to the "Modules" section of XF86Config:
+line to the "Modules" section of xorg.conf:
 
 	Load "freetype"
 
-Add the following line to the "Files" section of XF86Config:
+Add the following line to the "Files" section of xorg.conf:
 
 	FontPath "%%FONTSDIR%%/"
diff --git a/x11-fonts/gentium-basic/pkg-descr b/x11-fonts/gentium-basic/pkg-descr
index fc9526740b42..5b5f526453df 100644
--- a/x11-fonts/gentium-basic/pkg-descr
+++ b/x11-fonts/gentium-basic/pkg-descr
@@ -4,4 +4,4 @@ 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/cms/scripts/page.php?site_id=nrsi&item_id=Gentium
+WWW: http://scripts.sil.org/gentium
diff --git a/x11-fonts/gentium-basic/pkg-plist b/x11-fonts/gentium-basic/pkg-plist
index 33f6e4053e15..1ca2311c0287 100644
--- a/x11-fonts/gentium-basic/pkg-plist
+++ b/x11-fonts/gentium-basic/pkg-plist
@@ -1,23 +1,20 @@
 @unexec if cmp -s %D/etc/fonts/local.conf %D/etc/fonts/local.conf-%%FONTNAME%%; then rm -f %D/etc/fonts/local.conf; fi
 etc/fonts/local.conf-%%FONTNAME%%
 @exec [ ! -f %B/local.conf ] && cp %B/%f %B/local.conf
-%%FONTSDIR%%/COPYING
+%%FONTSDIR%%/GenAI102.ttf
+%%FONTSDIR%%/GenAR102.ttf
+%%FONTSDIR%%/GenI102.ttf
+%%FONTSDIR%%/GenR102.ttf
+%%FONTSDIR%%/OFL
 %%FONTSDIR%%/fonts.dir
-%%FONTSDIR%%/Gentium.ttf
-%%FONTSDIR%%/GentiumAItI.ttf
-%%FONTSDIR%%/GentiumAlt.ttf
-%%FONTSDIR%%/GentiumI.ttf
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%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%%/HISTORY
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/ISSUES
+%%PORTDOCS%%%%DOCSDIR%%/OFL-FAQ
 %%PORTDOCS%%%%DOCSDIR%%/QUOTES
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
 @dirrm %%FONTSDIR%%