ports/89930: [maintainer] x11-fonts/gentium -- upgrade to 1.0.2
Matthew Seaman
m.seaman at infracaninophile.co.uk
Sun Dec 4 13:10:04 UTC 2005
>Number: 89930
>Category: ports
>Synopsis: [maintainer] x11-fonts/gentium -- upgrade to 1.0.2
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 04 13:10:03 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Matthew Seaman
>Release: FreeBSD 4.11-STABLE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD happy-idiot-talk.infracaninophile.co.uk 4.11-STABLE FreeBSD 4.11-STABLE #91: Wed Nov 16 22:41:11 GMT 2005 root at happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386
>Description:
Gentium has been re-released under a new, more liberal license. The
Sil OFL (Open Font License) claims to be fully FLOSS compliant, and
means that the restriction against including this port on a CDROM can
be dropped.
http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=OFL
In addition, the authors of this font seem to have managed to change
just about everything it is possible to change about their download
tarball with the notable exception of the actual font glyphs...
Note to committer:
gentium/pkg-message has moved to gentium/files/pkg-message.in
Also no more need for an entry in /usr/ports/LEGAL for this port.
>How-To-Repeat:
>Fix:
--- gentium.diff begins here ---
diff -Nur /usr/ports/x11-fonts/gentium/Makefile gentium/Makefile
--- /usr/ports/x11-fonts/gentium/Makefile Sun Apr 4 16:08:07 2004
+++ gentium/Makefile Sun Dec 4 12:07:55 2005
@@ -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 at infracaninophile.co.uk
COMMENT= Gentium TrueType font collection
@@ -32,16 +19,15 @@
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 @@
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 @@
${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 -Nur /usr/ports/x11-fonts/gentium/distinfo gentium/distinfo
--- /usr/ports/x11-fonts/gentium/distinfo Sun Apr 4 16:08:07 2004
+++ gentium/distinfo Sun Dec 4 12:57:48 2005
@@ -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 -Nur /usr/ports/x11-fonts/gentium/files/fonts.dir gentium/files/fonts.dir
--- /usr/ports/x11-fonts/gentium/files/fonts.dir Sun Apr 4 16:08:07 2004
+++ gentium/files/fonts.dir Sun Dec 4 12:28:33 2005
@@ -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 -Nur /usr/ports/x11-fonts/gentium/files/pkg-message.in gentium/files/pkg-message.in
--- /usr/ports/x11-fonts/gentium/files/pkg-message.in Thu Jan 1 01:00:00 1970
+++ gentium/files/pkg-message.in Sun Dec 4 12:06:29 2005
@@ -0,0 +1,15 @@
+IMPORTANT - READ CAREFULLY: Please read the COPYRIGHT included with these fonts
+before using. The copyright can be found at
+
+ %%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 xorg.conf:
+
+ Load "freetype"
+
+Add the following line to the "Files" section of xorg.conf:
+
+ FontPath "%%FONTSDIR%%/"
diff -Nur /usr/ports/x11-fonts/gentium/pkg-descr gentium/pkg-descr
--- /usr/ports/x11-fonts/gentium/pkg-descr Sun Apr 4 16:08:07 2004
+++ gentium/pkg-descr Sun Dec 4 12:30:12 2005
@@ -4,4 +4,4 @@
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 -Nur /usr/ports/x11-fonts/gentium/pkg-message gentium/pkg-message
--- /usr/ports/x11-fonts/gentium/pkg-message Sun Apr 4 16:08:07 2004
+++ gentium/pkg-message Thu Jan 1 01:00:00 1970
@@ -1,15 +0,0 @@
-IMPORTANT - READ CAREFULLY: Please read the COPYRIGHT included with these fonts
-before using. The copyright can be found at
-
- %%FONTSDIR%%/COPYING.
-
-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:
-
- Load "freetype"
-
-Add the following line to the "Files" section of XF86Config:
-
- FontPath "%%FONTSDIR%%/"
diff -Nur /usr/ports/x11-fonts/gentium/pkg-plist gentium/pkg-plist
--- /usr/ports/x11-fonts/gentium/pkg-plist Sun Apr 4 16:08:07 2004
+++ gentium/pkg-plist Sun Dec 4 12:37:11 2005
@@ -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%%
--- gentium.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list