Date: Sat, 28 Mar 2009 03:23:12 +0300 From: Anonymous <swell.k@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/133146: [patch] x11-fonts/dejavu: install fontconfig configuration files to conf.avail and optionally links to conf.d Message-ID: <867i2aijgv.fsf@gmail.com> Resent-Message-ID: <200903280030.n2S0U29S077232@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 133146
>Category: ports
>Synopsis: [patch] x11-fonts/dejavu: install fontconfig configuration files to conf.avail and optionally links to conf.d
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Mar 28 00:30:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Anonymous
>Release: FreeBSD 8.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD luffy 8.0-CURRENT FreeBSD 8.0-CURRENT #1 r190439M: Fri Mar 27 01:04:37 UTC 2009 root@luffy:/usr/obj/usr/src/sys/PHOENIX amd64
$ pkg_info -aoq | fgrep x11-fonts
x11-fonts/bdftopcf
x11-fonts/bitstream-vera
x11-fonts/dejavu
x11-fonts/encodings
x11-fonts/font-alias
x11-fonts/font-bh-ttf
x11-fonts/font-cursor-misc
x11-fonts/font-misc-ethiopic
x11-fonts/font-misc-meltho
x11-fonts/font-misc-misc
x11-fonts/font-util
x11-fonts/fontcacheproto
x11-fonts/fontconfig
x11-fonts/fontsproto
x11-fonts/indic-ttf
x11-fonts/libFS
x11-fonts/libXfont
x11-fonts/libXfontcache
x11-fonts/libXft
x11-fonts/libfontenc
x11-fonts/mkfontdir
x11-fonts/mkfontscale
x11-fonts/xf86bigfontproto
x11-fonts/xlsfonts
x11-fonts/xorg-fonts-truetype
>Description:
>How-To-Repeat:
- with LINKS set
$ fc-match
DejaVuSans.ttf: "DejaVu Sans" "Book"
- without LINKS set
$ fc-match
Vera.ttf: "Bitstream Vera Sans" "Roman"
>Fix:
--- dejavu.diff begins here ---
Index: x11-fonts/dejavu/Makefile
===================================================================
RCS file: /home/csup/ports/x11-fonts/dejavu/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- x11-fonts/dejavu/Makefile 25 Jan 2009 17:06:27 -0000 1.43
+++ x11-fonts/dejavu/Makefile 27 Mar 2009 23:03:07 -0000
@@ -21,16 +21,32 @@ USE_BZIP2= yes
USE_XORG= x11
NO_BUILD= yes
PORTDOCS= README status.txt unicover.txt langcover.txt
-PLIST_SUB= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}/"
+PLIST_SUB= FCDIR="${FCDIR:S|${PREFIX}/||}" \
+ FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
MSG_FILE= ${PKGDIR}/pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
+FCDIR= ${PREFIX}/etc/fonts/conf.avail
FONTNAME= ${PORTNAME}
FONTSDIR?= ${PREFIX}/lib/X11/fonts/${FONTNAME}
+OPTIONS= LINKS "Install links of configuration files in conf.d" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_LINKS)
+PLIST_SUB+= LINKS="${FCDIR:S|${PREFIX}/||:S|.avail|.d|}"
+.else
+PLIST_SUB+= LINKS="@comment "
+.endif
+
post-patch:
${SED} 's|%%FONTSDIR%%|${FONTSDIR}|g' ${MSG_FILE} > ${PKGMESSAGE}
do-install:
+ ${INSTALL_DATA} ${WRKSRC}/fontconfig/*.conf ${FCDIR}
+.if defined(WITH_LINKS)
+ ( cd ${FCDIR:S|.avail|.d|}; ${LN} -s ../conf.avail/*dejavu*.conf . )
+.endif
${MKDIR} ${FONTSDIR}
${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${FONTSDIR}
.if !defined(NOPORTDOCS)
@@ -47,4 +63,4 @@ post-install:
${CAT} ${PKGMESSAGE}
@${ECHO_MSG}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: x11-fonts/dejavu/pkg-plist
===================================================================
RCS file: /home/csup/ports/x11-fonts/dejavu/pkg-plist,v
retrieving revision 1.11
diff -u -p -r1.11 pkg-plist
--- x11-fonts/dejavu/pkg-plist 1 Jan 2008 14:47:42 -0000 1.11
+++ x11-fonts/dejavu/pkg-plist 27 Mar 2009 06:52:33 -0000
@@ -1,3 +1,15 @@
+%%FCDIR%%/20-unhint-small-dejavu-sans-mono.conf
+%%FCDIR%%/20-unhint-small-dejavu-sans.conf
+%%FCDIR%%/20-unhint-small-dejavu-serif.conf
+%%FCDIR%%/57-dejavu-sans-mono.conf
+%%FCDIR%%/57-dejavu-sans.conf
+%%FCDIR%%/57-dejavu-serif.conf
+%%LINKS%%/20-unhint-small-dejavu-sans-mono.conf
+%%LINKS%%/20-unhint-small-dejavu-sans.conf
+%%LINKS%%/20-unhint-small-dejavu-serif.conf
+%%LINKS%%/57-dejavu-sans-mono.conf
+%%LINKS%%/57-dejavu-sans.conf
+%%LINKS%%/57-dejavu-serif.conf
%%FONTSDIR%%/DejaVuSans-Bold.ttf
%%FONTSDIR%%/DejaVuSans-BoldOblique.ttf
%%FONTSDIR%%/DejaVuSans-ExtraLight.ttf
--- dejavu.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?867i2aijgv.fsf>