ports/148953: [PATCH] x11-fonts/dejavu: simplify Makefile, take maintainership
Sunpoet Po-Chuan Hsieh
sunpoet at sunpoet.net
Mon Jul 26 09:30:05 UTC 2010
>Number: 148953
>Category: ports
>Synopsis: [PATCH] x11-fonts/dejavu: simplify Makefile, take maintainership
>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: Mon Jul 26 09:30:04 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:
- Respect PORTVERSION
- Use built-in apply-slist:
- Take maintainership
Added file(s):
- files/pkg-message.in
Removed file(s):
- pkg-message
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- dejavu-2.31.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-26 09:45:45.000000000 +0800
+++ /usr/ports/sunpoet/dejavu/Makefile 2010-07-26 17:01:19.000000000 +0800
@@ -7,37 +7,33 @@
#
PORTNAME= dejavu
-DISTVERSION= 2.31
+PORTVERSION= 2.31
CATEGORIES= x11-fonts
MASTER_SITES= SF
-DISTNAME= ${PORTNAME}-fonts-ttf-${DISTVERSION}
+DISTNAME= ${PORTNAME}-fonts-ttf-${PORTVERSION}
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= sunpoet at sunpoet.net
COMMENT= Bitstream Vera Fonts clone with a wider range of characters
BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-USE_BZIP2= yes
NO_BUILD= yes
-PORTDOCS= README status.txt unicover.txt langcover.txt
-PLIST_SUB= FONTSDIR="${FONTSDIR:S|${PREFIX}/||}/"
-MSG_FILE= ${PKGDIR}/pkg-message
-PKGMESSAGE= ${WRKDIR}/pkg-message
-FONTNAME= ${PORTNAME}
-FONTSDIR?= ${PREFIX}/lib/X11/fonts/${FONTNAME}
+USE_BZIP2= yes
-post-patch:
- ${SED} 's|%%FONTSDIR%%|${FONTSDIR}|g' ${MSG_FILE} > ${PKGMESSAGE}
+FONTSDIR= ${PREFIX}/${FONTSDIR_REL}
+FONTSDIR_REL?= lib/X11/fonts/${PORTNAME}
+PLIST_SUB= FONTSDIR_REL=${FONTSDIR_REL}
+PORTDOCS= README langcover.txt status.txt unicover.txt
+SUB_FILES= pkg-message
+SUB_LIST= FONTSDIR=${FONTSDIR}
do-install:
- ${MKDIR} ${FONTSDIR}
- ${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${FONTSDIR}
+ @${MKDIR} ${FONTSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/ttf/*.ttf ${FONTSDIR}
.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
-.for f in ${PORTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
+ @${MKDIR} ${DOCSDIR}
+ @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
.endif
post-install:
diff -ruN --exclude=CVS /usr/ports/x11-fonts/dejavu/files/pkg-message.in /usr/ports/sunpoet/dejavu/files/pkg-message.in
--- /usr/ports/x11-fonts/dejavu/files/pkg-message.in 1970-01-01 08:00:00.000000000 +0800
+++ /usr/ports/sunpoet/dejavu/files/pkg-message.in 2005-03-14 10:04:34.000000000 +0800
@@ -0,0 +1,11 @@
+Make sure that the freetype module is loaded. If it is not, add the following
+line to the "Modules" section of your X Windows configuration file:
+
+ Load "freetype"
+
+Add the following line to the "Files" section of X Windows configuration file:
+
+ FontPath "%%FONTSDIR%%/"
+
+Note: your X Windows configuration file is typically /etc/X11/XF86Config
+if you are using XFree86, and /etc/X11/xorg.conf if you are using X.Org.
diff -ruN --exclude=CVS /usr/ports/x11-fonts/dejavu/pkg-message /usr/ports/sunpoet/dejavu/pkg-message
--- /usr/ports/x11-fonts/dejavu/pkg-message 2005-03-14 10:04:34.000000000 +0800
+++ /usr/ports/sunpoet/dejavu/pkg-message 1970-01-01 08:00:00.000000000 +0800
@@ -1,11 +0,0 @@
-Make sure that the freetype module is loaded. If it is not, add the following
-line to the "Modules" section of your X Windows configuration file:
-
- Load "freetype"
-
-Add the following line to the "Files" section of X Windows configuration file:
-
- FontPath "%%FONTSDIR%%/"
-
-Note: your X Windows configuration file is typically /etc/X11/XF86Config
-if you are using XFree86, and /etc/X11/xorg.conf if you are using X.Org.
diff -ruN --exclude=CVS /usr/ports/x11-fonts/dejavu/pkg-plist /usr/ports/sunpoet/dejavu/pkg-plist
--- /usr/ports/x11-fonts/dejavu/pkg-plist 2008-01-01 22:47:42.000000000 +0800
+++ /usr/ports/sunpoet/dejavu/pkg-plist 2010-07-26 17:04:53.000000000 +0800
@@ -1,22 +1,23 @@
-%%FONTSDIR%%/DejaVuSans-Bold.ttf
-%%FONTSDIR%%/DejaVuSans-BoldOblique.ttf
-%%FONTSDIR%%/DejaVuSans-ExtraLight.ttf
-%%FONTSDIR%%/DejaVuSans-Oblique.ttf
-%%FONTSDIR%%/DejaVuSans.ttf
-%%FONTSDIR%%/DejaVuSansCondensed-Bold.ttf
-%%FONTSDIR%%/DejaVuSansCondensed-BoldOblique.ttf
-%%FONTSDIR%%/DejaVuSansCondensed-Oblique.ttf
-%%FONTSDIR%%/DejaVuSansCondensed.ttf
-%%FONTSDIR%%/DejaVuSansMono-Bold.ttf
-%%FONTSDIR%%/DejaVuSansMono-BoldOblique.ttf
-%%FONTSDIR%%/DejaVuSansMono-Oblique.ttf
-%%FONTSDIR%%/DejaVuSansMono.ttf
-%%FONTSDIR%%/DejaVuSerif-Bold.ttf
-%%FONTSDIR%%/DejaVuSerif-BoldItalic.ttf
-%%FONTSDIR%%/DejaVuSerif-Italic.ttf
-%%FONTSDIR%%/DejaVuSerif.ttf
-%%FONTSDIR%%/DejaVuSerifCondensed-Bold.ttf
-%%FONTSDIR%%/DejaVuSerifCondensed-BoldItalic.ttf
-%%FONTSDIR%%/DejaVuSerifCondensed-Italic.ttf
-%%FONTSDIR%%/DejaVuSerifCondensed.ttf
- at dirrm %%FONTSDIR%%
+ at comment $FreeBSD$
+%%FONTSDIR_REL%%/DejaVuSans-Bold.ttf
+%%FONTSDIR_REL%%/DejaVuSans-BoldOblique.ttf
+%%FONTSDIR_REL%%/DejaVuSans-ExtraLight.ttf
+%%FONTSDIR_REL%%/DejaVuSans-Oblique.ttf
+%%FONTSDIR_REL%%/DejaVuSans.ttf
+%%FONTSDIR_REL%%/DejaVuSansCondensed-Bold.ttf
+%%FONTSDIR_REL%%/DejaVuSansCondensed-BoldOblique.ttf
+%%FONTSDIR_REL%%/DejaVuSansCondensed-Oblique.ttf
+%%FONTSDIR_REL%%/DejaVuSansCondensed.ttf
+%%FONTSDIR_REL%%/DejaVuSansMono-Bold.ttf
+%%FONTSDIR_REL%%/DejaVuSansMono-BoldOblique.ttf
+%%FONTSDIR_REL%%/DejaVuSansMono-Oblique.ttf
+%%FONTSDIR_REL%%/DejaVuSansMono.ttf
+%%FONTSDIR_REL%%/DejaVuSerif-Bold.ttf
+%%FONTSDIR_REL%%/DejaVuSerif-BoldItalic.ttf
+%%FONTSDIR_REL%%/DejaVuSerif-Italic.ttf
+%%FONTSDIR_REL%%/DejaVuSerif.ttf
+%%FONTSDIR_REL%%/DejaVuSerifCondensed-Bold.ttf
+%%FONTSDIR_REL%%/DejaVuSerifCondensed-BoldItalic.ttf
+%%FONTSDIR_REL%%/DejaVuSerifCondensed-Italic.ttf
+%%FONTSDIR_REL%%/DejaVuSerifCondensed.ttf
+ at dirrm %%FONTSDIR_REL%%
--- dejavu-2.31.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list