Date: Thu, 26 Aug 2010 20:38:11 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/149986: [MAINTAINER] x11-fonts/dejavu: update to 2.32 Message-ID: <20100826123811.9B86A2AEC4EC@sunpoet.net> Resent-Message-ID: <201008261240.o7QCe5E1021768@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 149986
>Category: ports
>Synopsis: [MAINTAINER] x11-fonts/dejavu: update to 2.32
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Aug 26 12:40:05 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Sunpoet Po-Chuan Hsieh
>Release: FreeBSD 8.1-STABLE amd64
>Organization:
SUNPOET.net
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.1-STABLE FreeBSD 8.1-STABLE #0: Sun Jul 25 00:09:24 CST 2010
>Description:
- Update to 2.32
- Include PR/133146
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- dejavu-2.32.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-26 16:56:40.000000000 +0800
@@ -7,7 +7,7 @@
#
PORTNAME= dejavu
-PORTVERSION= 2.31
+PORTVERSION= 2.32
CATEGORIES= x11-fonts
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-fonts-ttf-${PORTVERSION}
@@ -18,22 +18,39 @@
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} ${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/distinfo /usr/ports/sunpoet/dejavu/distinfo
--- /usr/ports/x11-fonts/dejavu/distinfo 2010-07-26 03:53:31.000000000 +0800
+++ /usr/ports/sunpoet/dejavu/distinfo 2010-08-25 20:50:51.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (dejavu-fonts-ttf-2.31.tar.bz2) = a794a75d8c43c83f0226207cd3aaf666
-SHA256 (dejavu-fonts-ttf-2.31.tar.bz2) = 1add6782060780d77eabf3d09bb5db1e8cb3a2451fbb0655a4c2cec44649ae03
-SIZE (dejavu-fonts-ttf-2.31.tar.bz2) = 4441882
+MD5 (dejavu-fonts-ttf-2.32.tar.bz2) = 63b1bf644cd54188a2ec43aff1846104
+SHA256 (dejavu-fonts-ttf-2.32.tar.bz2) = 3b79e2cd3838112e896751337142fb7328e095710763128434c89c3d221c3266
+SIZE (dejavu-fonts-ttf-2.32.tar.bz2) = 4394279
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-26 16:56:24.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-2.32.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100826123811.9B86A2AEC4EC>