svn commit: r308966 - in head: . x11-fonts x11-fonts/gentium-basic x11-fonts/gentium-basic/files x11-fonts/gentium-plus x11-fonts/gentium-plus/files
Matthew Seaman
matthew at FreeBSD.org
Sat Dec 15 22:05:38 UTC 2012
Author: matthew
Date: Sat Dec 15 22:05:36 2012
New Revision: 308966
URL: http://svnweb.freebsd.org/changeset/ports/308966
Log:
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
Added:
head/x11-fonts/gentium-plus/
- copied from r308934, head/x11-fonts/gentium/
Deleted:
head/x11-fonts/gentium-basic/files/fonts.dir
head/x11-fonts/gentium-basic/pkg-plist
head/x11-fonts/gentium-plus/files/fonts.dir
head/x11-fonts/gentium-plus/pkg-plist
Modified:
head/MOVED
head/x11-fonts/Makefile (contents, props changed)
head/x11-fonts/gentium-basic/Makefile
head/x11-fonts/gentium-basic/distinfo (contents, props changed)
head/x11-fonts/gentium-basic/files/pkg-message.in (contents, props changed)
head/x11-fonts/gentium-basic/pkg-descr (contents, props changed)
head/x11-fonts/gentium-plus/Makefile (contents, props changed)
head/x11-fonts/gentium-plus/distinfo (contents, props changed)
head/x11-fonts/gentium-plus/files/pkg-message.in (contents, props changed)
head/x11-fonts/gentium-plus/pkg-descr (contents, props changed)
Modified: head/MOVED
==============================================================================
--- head/MOVED Sat Dec 15 21:27:08 2012 (r308965)
+++ head/MOVED Sat Dec 15 22:05:36 2012 (r308966)
@@ -3976,3 +3976,4 @@ www/horde-passwd|www/horde3-passwd|2012-
www/horde-trean|www/horde3-trean|2012-12-12|Rename of old horde apps
www/horde-wicked|www/horde3-wicked|2012-12-12|Rename of old horde apps
x11-toolkits/fltk-threads|x11-toolkits/fltk|2012-12-12|Threads are on by default
+x11-fonts/gentium|x11-fonts/gentium-plus|2012-12-15|Track upstream name changes
Modified: head/x11-fonts/Makefile
==============================================================================
--- head/x11-fonts/Makefile Sat Dec 15 21:27:08 2012 (r308965)
+++ head/x11-fonts/Makefile Sat Dec 15 22:05:36 2012 (r308966)
@@ -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
Modified: head/x11-fonts/gentium-basic/Makefile
==============================================================================
--- head/x11-fonts/gentium-basic/Makefile Sat Dec 15 21:27:08 2012 (r308965)
+++ head/x11-fonts/gentium-basic/Makefile Sat Dec 15 22:05:36 2012 (r308966)
@@ -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 at 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
+
+USE_TGZ= yes
+XORG_CAT= font
+
+FONTLIBPATH= lib/X11/fonts
+FONTROOTDIR= ${PREFIX}/${FONTLIBPATH}
+INSTALLS_TTF= yes
+MEDIA_ID= ${PORTNAME}_${PORTVERSION}_tar
NO_BUILD= yes
-WRKSRC= ${WRKDIR}/ttf-sil-${PORTNAME}-${PORTVERSION:C@\.[[:digit:]]+$@@}
+WRKSRC= ${WRKDIR}/${DISTNAME:S,.orig,,:S,_,-,}
-PLIST_SUB= FONTSDIR="${FONTSDIR}" \
- FONTNAME="${FONTNAME}"
+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= "FONTSDIR=${FONTSDIR}"
+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>
Modified: head/x11-fonts/gentium-basic/distinfo
==============================================================================
--- head/x11-fonts/gentium-basic/distinfo Sat Dec 15 21:27:08 2012 (r308965)
+++ head/x11-fonts/gentium-basic/distinfo Sat Dec 15 22:05:36 2012 (r308966)
@@ -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
Modified: head/x11-fonts/gentium-basic/files/pkg-message.in
==============================================================================
--- head/x11-fonts/gentium-basic/files/pkg-message.in Sat Dec 15 21:27:08 2012 (r308965)
+++ head/x11-fonts/gentium-basic/files/pkg-message.in Sat Dec 15 22:05:36 2012 (r308966)
@@ -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
Load "freetype"
-
Modified: head/x11-fonts/gentium-basic/pkg-descr
==============================================================================
--- head/x11-fonts/gentium-basic/pkg-descr Sat Dec 15 21:27:08 2012 (r308965)
+++ head/x11-fonts/gentium-basic/pkg-descr Sat Dec 15 22:05:36 2012 (r308966)
@@ -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
Modified: head/x11-fonts/gentium-plus/Makefile
==============================================================================
--- head/x11-fonts/gentium/Makefile Sat Dec 15 07:59:00 2012 (r308934)
+++ head/x11-fonts/gentium-plus/Makefile Sat Dec 15 22:05:36 2012 (r308966)
@@ -1,80 +1,60 @@
-# New ports collection makefile for: Gentium Font Family
-# Date created: March 31 2004
-# Whom: Matthew Seaman <m.seaman at infracaninophile.co.uk>
-#
+# Created by: Matthew Seaman
# $FreeBSD$
-#
-# This port is shamelessly copied from Joe Marcus Clarke's bitstream-vera
-# port.
-
-PORTNAME= gentium
-PORTVERSION= 1.0.2
-PORTREVISION= 3
+
+PORTNAME= GentiumPlus
+PORTVERSION= 1.510
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?format=file&media_id=${MEDIA_ID}&filename=/
MAINTAINER= matthew at FreeBSD.org
-COMMENT= Gentium TrueType font collection
-
-BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+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
-WRKSRC= ${WRKDIR}/ttf-sil-${PORTNAME}-${PORTVERSION:C@\.([[:digit:]]+)$@\1@}
+USE_TGZ= yes #prevent bsd.xorg.mk from setting USE_BZIP
-PLIST_SUB= FONTSDIR="${FONTSDIR}" \
- FONTNAME="${FONTNAME}"
+PLIST_FILES= ${FONTLIBPATH}/${FONTDIR}/${PORTNAME}-I.ttf \
+ ${FONTLIBPATH}/${FONTDIR}/${PORTNAME}-R.ttf
-SUB_LIST= "FONTSDIR=${FONTSDIR}"
+SUB_LIST= "FONTPATH=${FONTROOTDIR}/${FONTDIR}"
SUB_FILES= pkg-message
-#
-# Local variables
-#
-
-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 OFL.txt README.txt \
+ documentation/GentiumPlus-features.pdf
+PORTDOCS= ${DOCSLIST:C,^.*/,,}
+
.include <bsd.port.options.mk>
.SILENT:
-#
-# Install
-#
+do-configure:
+ @${DO_NADA}
-do-install: install-fonts install-conf install-docs
+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 ${FONTSTGT}
-
-install-conf:
- ${MKDIR} ${PREFIX}/etc/fonts/conf.d
- ${INSTALL_DATA} ${WRKSRC}/local.conf \
- ${PREFIX}/etc/fonts/conf.d/${FONTNAME}.conf
+ ${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>
Modified: head/x11-fonts/gentium-plus/distinfo
==============================================================================
--- head/x11-fonts/gentium/distinfo Sat Dec 15 07:59:00 2012 (r308934)
+++ head/x11-fonts/gentium-plus/distinfo Sat Dec 15 22:05:36 2012 (r308966)
@@ -1,2 +1,2 @@
-SHA256 (ttf-sil-gentium_1.0.2.tar.gz) = 4746c04c9a4ad9e0788a38e0a2f81919a630d8070ceabc89f156b6d41d8ceb37
-SIZE (ttf-sil-gentium_1.0.2.tar.gz) = 2334185
+SHA256 (xorg/font/GentiumPlus-1.510.zip) = f13622cf85a46c094e671b10152ab2d24913661966f370d340253d7c24c42ccd
+SIZE (xorg/font/GentiumPlus-1.510.zip) = 1992184
Modified: head/x11-fonts/gentium-plus/files/pkg-message.in
==============================================================================
--- head/x11-fonts/gentium/files/pkg-message.in Sat Dec 15 07:59:00 2012 (r308934)
+++ head/x11-fonts/gentium-plus/files/pkg-message.in Sat Dec 15 22:05:36 2012 (r308966)
@@ -1,12 +1,7 @@
-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:
- 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
Modified: head/x11-fonts/gentium-plus/pkg-descr
==============================================================================
--- head/x11-fonts/gentium/pkg-descr Sat Dec 15 07:59:00 2012 (r308934)
+++ head/x11-fonts/gentium-plus/pkg-descr Sat Dec 15 22:05:36 2012 (r308966)
@@ -1,7 +1,14 @@
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.
+
+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
More information about the svn-ports-all
mailing list