Date: Sun, 8 Aug 2010 15:00:19 GMT From: Sunpoet Hsieh <sunpoet@sunpoet.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/133146: [patch] x11-fonts/dejavu: install fontconfig configuration files to conf.avail and optionally links to conf.d Message-ID: <201008081500.o78F0J4J026391@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/133146; it has been noted by GNATS.
From: Sunpoet Hsieh <sunpoet@sunpoet.net>
To: Anonymous <swell.k@gmail.com>
Cc: bug-followup@freebsd.org
Subject: Re: ports/133146: [patch] x11-fonts/dejavu: install fontconfig
configuration files to conf.avail and optionally links to conf.d
Date: Sun, 8 Aug 2010 22:56:45 +0800
Hi,
Based on your patch, a fix with minor modification is attached.
Thanks.
Regards,
Sunpoet
--- dejavu.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11-fonts/dejavu/Makefile
/usr/ports/sunpoet/dejavu/Makefile
--- /usr/ports/x11-fonts/dejavu/Makefile 2010-07-29 08:45:59.000000000 +0800
+++ /usr/ports/sunpoet/dejavu/Makefile 2010-08-06 09:58:46.000000000 +0800
@@ -18,22 +18,40 @@
BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+OPTIONS= LINKS "Install links of configuration files in conf.d" off
+
NO_BUILD= yes
USE_BZIP2= yes
+FCDIR= ${PREFIX}/${FCDIR_REL}
+FCDIR_REL?= etc/fonts/conf.avail
FONTSDIR= ${PREFIX}/${FONTSDIR_REL}
FONTSDIR_REL?= lib/X11/fonts/${PORTNAME}
-PLIST_SUB= FONTSDIR_REL=${FONTSDIR_REL}
+PLIST_SUB= FCDIR_REL=${FCDIR_REL} FONTSDIR_REL=${FONTSDIR_REL}
PORTDOCS= README langcover.txt status.txt unicover.txt
SUB_FILES= pkg-message
SUB_LIST= FONTSDIR=${FONTSDIR}
+.include <bsd.port.options.mk>
+
+.if defined(WITH_LINKS)
+FCDIR_LINKS= ${FCDIR_REL:S|conf.avail|conf.d|}
+PLIST_SUB+= FCDIR_LINKS="${FCDIR_LINKS}"
+.else
+PLIST_SUB+= FCDIR_LINKS="@comment "
+.endif
+
do-install:
- @${MKDIR} ${FONTSDIR}
- @${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${FONTSDIR}
+ ${MKDIR} ${FCDIR} ${PREFIX}/${FCDIR_LINKS}
+ ${MKDIR} ${FONTSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/fontconfig/*.conf ${FCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${FONTSDIR}
.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+ ${MKDIR} ${DOCSDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+.endif
+.if defined(WITH_LINKS)
+ cd ${PREFIX}/${FCDIR_LINKS} && ${LN} -fs ../conf.avail/*dejavu*.conf .
.endif
post-install:
diff -ruN --exclude=CVS /usr/ports/x11-fonts/dejavu/pkg-plist
/usr/ports/sunpoet/dejavu/pkg-plist
--- /usr/ports/x11-fonts/dejavu/pkg-plist 2010-07-29 08:45:59.000000000 +0800
+++ /usr/ports/sunpoet/dejavu/pkg-plist 2010-08-05 18:57:49.000000000 +0800
@@ -1,4 +1,16 @@
@comment $FreeBSD: ports/x11-fonts/dejavu/pkg-plist,v 1.12 2010/07/28
18:49:50 sylvio Exp $
+%%FCDIR_REL%%/20-unhint-small-dejavu-sans-mono.conf
+%%FCDIR_REL%%/20-unhint-small-dejavu-sans.conf
+%%FCDIR_REL%%/20-unhint-small-dejavu-serif.conf
+%%FCDIR_REL%%/57-dejavu-sans-mono.conf
+%%FCDIR_REL%%/57-dejavu-sans.conf
+%%FCDIR_REL%%/57-dejavu-serif.conf
+%%FCDIR_LINKS%%/20-unhint-small-dejavu-sans-mono.conf
+%%FCDIR_LINKS%%/20-unhint-small-dejavu-sans.conf
+%%FCDIR_LINKS%%/20-unhint-small-dejavu-serif.conf
+%%FCDIR_LINKS%%/57-dejavu-sans-mono.conf
+%%FCDIR_LINKS%%/57-dejavu-sans.conf
+%%FCDIR_LINKS%%/57-dejavu-serif.conf
%%FONTSDIR_REL%%/DejaVuSans-Bold.ttf
%%FONTSDIR_REL%%/DejaVuSans-BoldOblique.ttf
%%FONTSDIR_REL%%/DejaVuSans-ExtraLight.ttf
--- dejavu.patch ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008081500.o78F0J4J026391>