Date: Tue, 3 Aug 2010 17:40:08 GMT From: Anonymous <swell.k@gmail.com> 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: <201008031740.o73He8Sw069371@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: Anonymous <swell.k@gmail.com>
To: bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/133146: [patch] x11-fonts/dejavu: install fontconfig configuration files to conf.avail and optionally links to conf.d
Date: Tue, 03 Aug 2010 21:35:25 +0400
- catch up with changes in Makefile@r1.50
- make install target verbose, like most ports do
--- dejavu.diff begins here ---
Index: x11-fonts/dejavu/Makefile
===================================================================
RCS file: /a/.cvsup/ports/x11-fonts/dejavu/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- x11-fonts/dejavu/Makefile 28 Jul 2010 18:49:50 -0000 1.50
+++ x11-fonts/dejavu/Makefile 3 Aug 2010 17:28:51 -0000
@@ -23,17 +23,33 @@ USE_BZIP2= yes
FONTSDIR= ${PREFIX}/${FONTSDIR_REL}
FONTSDIR_REL?= lib/X11/fonts/${PORTNAME}
-PLIST_SUB= FONTSDIR_REL=${FONTSDIR_REL}
+FCDIR?= ${PREFIX}/${FCDIR_REL}
+FCDIR_REL?= etc/fonts/conf.avail
+PLIST_SUB= FONTSDIR_REL=${FONTSDIR_REL} FCDIR=${FCDIR_REL}
PORTDOCS= README langcover.txt status.txt unicover.txt
SUB_FILES= pkg-message
SUB_LIST= FONTSDIR=${FONTSDIR}
+OPTIONS= LINKS "Install links of configuration files in conf.d" off
+
+.include <bsd.port.options.mk>
+
+.if !defined(WITHOUT_LINKS)
+PLIST_SUB+= LINKS="${FCDIR_REL:S|.avail|.d|}"
+.else
+PLIST_SUB+= LINKS="@comment "
+.endif
+
do-install:
- @${MKDIR} ${FONTSDIR}
- @${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${FONTSDIR}
+ ${MKDIR} ${FONTSDIR}
+ ${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
+ ${INSTALL_DATA} ${WRKSRC}/fontconfig/*.conf ${FCDIR}
+.if !defined(WITHOUT_LINKS)
+ cd ${FCDIR:S|.avail|.d|} && ${LN} -sf ../conf.avail/*dejavu*.conf .
.endif
post-install:
Index: x11-fonts/dejavu/pkg-plist
===================================================================
RCS file: /a/.cvsup/ports/x11-fonts/dejavu/pkg-plist,v
retrieving revision 1.12
diff -u -p -r1.12 pkg-plist
--- x11-fonts/dejavu/pkg-plist 28 Jul 2010 18:49:50 -0000 1.12
+++ x11-fonts/dejavu/pkg-plist 3 Aug 2010 17:07:00 -0000
@@ -1,4 +1,16 @@
@comment $FreeBSD: ports/x11-fonts/dejavu/pkg-plist,v 1.12 2010/07/28 18:49:50 sylvio Exp $
+%%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_REL%%/DejaVuSans-Bold.ttf
%%FONTSDIR_REL%%/DejaVuSans-BoldOblique.ttf
%%FONTSDIR_REL%%/DejaVuSans-ExtraLight.ttf
--- dejavu.diff ends here ---
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008031740.o73He8Sw069371>