Date: Mon, 14 Aug 2006 12:52:00 +0100 (BST) From: Matthew Seaman <m.seaman@infracaninophile.co.uk> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/102007: [maintainer] x11-fonts/gentium respect TARGETDIR etc. Message-ID: <200608141152.k7EBq0eX074855@happy-idiot-talk.infracaninophile.co.uk> Resent-Message-ID: <200608141200.k7EC0Usu067575@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 102007
>Category: ports
>Synopsis: [maintainer] x11-fonts/gentium respect TARGETDIR etc.
>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: Mon Aug 14 12:00:30 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Matthew Seaman
>Release: FreeBSD 6.1-STABLE i386
>Organization:
Infracaninophile
>Environment:
System: FreeBSD happy-idiot-talk.infracaninophile.co.uk 6.1-STABLE FreeBSD 6.1-STABLE #2: Mon Aug 7 21:20:41 BST 2006 root@happy-idiot-talk.infracaninophile.co.uk:/usr/obj/usr/src/sys/HAPPY-IDIOT-TALK i386
>Description:
* Respect TARGETDIR
* Use the .../etc/fonts/conf.d mechanism for font config
* General cleanup
>How-To-Repeat:
>Fix:
--- gentium.diff begins here ---
diff -Nur /usr/ports/x11-fonts/gentium/Makefile gentium/Makefile
--- /usr/ports/x11-fonts/gentium/Makefile Mon Dec 5 07:17:03 2005
+++ gentium/Makefile Mon Aug 14 12:40:02 2006
@@ -23,7 +23,7 @@
NO_BUILD= yes
WRKSRC= ${WRKDIR}/ttf-sil-${PORTNAME}-${PORTVERSION:C@\.([[:digit:]]+)$@\1@}
-PLIST_SUB= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" \
+PLIST_SUB= FONTSDIR="${FONTSDIR}" \
FONTNAME=${FONTNAME}
SUB_LIST= "FONTSDIR=${FONTSDIR}"
@@ -34,7 +34,8 @@
#
FONTNAME= ${PORTNAME}
-FONTSDIR?= ${PREFIX}/lib/X11/fonts/${FONTNAME}
+FONTSDIR?= lib/X11/fonts/${FONTNAME}
+FONTSTGT= ${TARGETDIR}/${FONTSDIR}
DOCSLIST= FONTLOG GENTIUM-FAQ Gentium-Greek-Specimen.pdf \
Gentium-RU-A3Proofs.pdf Gentium-RU-Specimen.pdf \
@@ -49,18 +50,15 @@
do-install: install-fonts install-conf install-docs
install-fonts:
- ${MKDIR} ${FONTSDIR}
- ${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSDIR}
- ${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSDIR}
- ${INSTALL_DATA} ${WRKSRC}/OFL ${FONTSDIR}
+ ${MKDIR} ${FONTSTGT}
+ ${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSTGT}
+ ${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSTGT}
+ ${INSTALL_DATA} ${WRKSRC}/OFL ${FONTSTGT}
install-conf:
- ${MKDIR} ${PREFIX}/etc/fonts
- if [ ! -f ${PREFIX}/etc/fonts/local.conf ]; then \
- ${INSTALL_DATA} ${WRKSRC}/local.conf ${PREFIX}/etc/fonts ; \
- fi
+ ${MKDIR} ${TARGETDIR}/etc/fonts/conf.d
${INSTALL_DATA} ${WRKSRC}/local.conf \
- ${PREFIX}/etc/fonts/local.conf-${FONTNAME}
+ ${TARGETDIR}/etc/fonts/conf.d/${FONTNAME}.conf
install-docs:
.if !defined(NOPORTDOCS)
@@ -72,7 +70,7 @@
post-install:
${ECHO_MSG} "===> Running fc-cache"
- -${X11BASE}/bin/fc-cache -f -v ${FONTSDIR}
+ -${X11BASE}/bin/fc-cache -f -v ${FONTSTGT}
${ECHO_MSG}
${CAT} ${PKGMESSAGE}
${ECHO_MSG}
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 Mon Dec 5 07:17:03 2005
+++ gentium/files/pkg-message.in Mon Aug 14 12:32:02 2006
@@ -1,7 +1,7 @@
IMPORTANT - READ CAREFULLY: Please read the COPYRIGHT included with these fonts
before using. The copyright can be found at
- %%FONTSDIR%%/OFL
+ %%PREFIX%%/%%FONTSDIR%%/OFL
To use these fonts, follow the instructions below.
@@ -12,4 +12,4 @@
Add the following line to the "Files" section of xorg.conf:
- FontPath "%%FONTSDIR%%/"
+ FontPath "%%PREFIX%%/%%FONTSDIR%%/"
diff -Nur /usr/ports/x11-fonts/gentium/pkg-plist gentium/pkg-plist
--- /usr/ports/x11-fonts/gentium/pkg-plist Mon Dec 5 07:17:03 2005
+++ gentium/pkg-plist Mon Aug 14 12:45:30 2006
@@ -1,6 +1,4 @@
-@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
+etc/fonts/conf.d/%%FONTNAME%%.conf
%%FONTSDIR%%/GenAI102.ttf
%%FONTSDIR%%/GenAR102.ttf
%%FONTSDIR%%/GenI102.ttf
@@ -19,3 +17,4 @@
@unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
@dirrm %%FONTSDIR%%
@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
+@dirrmtry etc/fonts/conf.d
--- gentium.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608141152.k7EBq0eX074855>