From 4ed3db726a70202bf46ac26c9f92459d5256cdf9 Mon Sep 17 00:00:00 2001 From: Jimmy Olgeni Date: Tue, 10 Jun 2014 19:12:29 +0000 Subject: [PATCH] Add staging support. - Use @fontsdir in pkg-plist. --- x11-fonts/lfpfonts-fix/Makefile | 19 ++-- x11-fonts/lfpfonts-fix/pkg-plist | 149 +++++++++++++++---------------- 2 files changed, 82 insertions(+), 86 deletions(-) diff --git a/x11-fonts/lfpfonts-fix/Makefile b/x11-fonts/lfpfonts-fix/Makefile index a84b162b9fa0..34e2b43d8246 100644 --- a/x11-fonts/lfpfonts-fix/Makefile +++ b/x11-fonts/lfpfonts-fix/Makefile @@ -2,29 +2,26 @@ PORTNAME= lfpfonts-fix PORTVERSION= 0.82 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fonts MASTER_SITES= SF/xfonts/${PORTNAME}/${PORTVERSION} MAINTAINER= olgeni@FreeBSD.org COMMENT= Fixed width fonts from the Linux Font Project -BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ - mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ +RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale WRKSRC= ${WRKDIR}/lfpfonts-fix NO_BUILD= yes -USE_BZIP2= yes +USES= tar:bzip2 + +FONTDIR= ${PREFIX}/lib/X11/fonts/${PORTNAME} +PLIST_SUB= FONTDIR="${FONTDIR:S|${PREFIX}/||}" -NO_STAGE= yes do-install: - @${MKDIR} ${PREFIX}/lib/X11/fonts/lfpfonts-fix - @${INSTALL_DATA} ${WRKSRC}/lfp-fix/*.pcf.gz ${PREFIX}/lib/X11/fonts/lfpfonts-fix - @${INSTALL_DATA} ${WRKSRC}/lfp-fix/fonts.dir ${PREFIX}/lib/X11/fonts/lfpfonts-fix - -post-install: - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${FONTDIR} + ${INSTALL_DATA} ${WRKSRC}/lfp-fix/*.pcf.gz ${STAGEDIR}${FONTDIR} .include diff --git a/x11-fonts/lfpfonts-fix/pkg-plist b/x11-fonts/lfpfonts-fix/pkg-plist index b8d288a5ae5b..9ba378df2eb0 100644 --- a/x11-fonts/lfpfonts-fix/pkg-plist +++ b/x11-fonts/lfpfonts-fix/pkg-plist @@ -1,75 +1,74 @@ -lib/X11/fonts/lfpfonts-fix/antique-10-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/artist-10-m-r-alt.pcf.gz -lib/X11/fonts/lfpfonts-fix/artist-10-m-r-serif.pcf.gz -lib/X11/fonts/lfpfonts-fix/artist-10-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/artsie-09-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/asimov-09-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/bright-09-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/cantor-10-m-r-sc.pcf.gz -lib/X11/fonts/lfpfonts-fix/cantor-10-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/cntdown-09-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/computer-09-m-r-alt.pcf.gz -lib/X11/fonts/lfpfonts-fix/computer-09-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/computer-11-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/escher-10-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/eurotype-12-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/feynman-10-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/fonts.dir -lib/X11/fonts/lfpfonts-fix/gagarin-10-m-i.pcf.gz -lib/X11/fonts/lfpfonts-fix/gagarin-10-m-r-sc.pcf.gz -lib/X11/fonts/lfpfonts-fix/gagarin-10-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/gamow-05-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/gamow-06-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/gamow-07-b-i.pcf.gz -lib/X11/fonts/lfpfonts-fix/gamow-07-b-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/gamow-07-m-i.pcf.gz -lib/X11/fonts/lfpfonts-fix/gamow-07-m-r-sc.pcf.gz -lib/X11/fonts/lfpfonts-fix/gamow-07-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/gamow-08-b-i.pcf.gz -lib/X11/fonts/lfpfonts-fix/gamow-08-b-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/gamow-08-m-i.pcf.gz -lib/X11/fonts/lfpfonts-fix/gamow-08-m-r-iso10646-1.pcf.gz -lib/X11/fonts/lfpfonts-fix/gamow-08-m-r-sc.pcf.gz -lib/X11/fonts/lfpfonts-fix/gamow-08-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/gamow-09-b-i-sc.pcf.gz -lib/X11/fonts/lfpfonts-fix/gamow-09-b-i.pcf.gz -lib/X11/fonts/lfpfonts-fix/gamow-09-b-r-alt.pcf.gz -lib/X11/fonts/lfpfonts-fix/gamow-09-b-r-sc-alt.pcf.gz -lib/X11/fonts/lfpfonts-fix/gamow-09-b-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/gamow-09-m-i-sc.pcf.gz -lib/X11/fonts/lfpfonts-fix/gamow-09-m-i.pcf.gz -lib/X11/fonts/lfpfonts-fix/gamow-09-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/hollow-11-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/julie-10-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/kandinsky-08-m-r-alt.pcf.gz -lib/X11/fonts/lfpfonts-fix/kandinsky-09-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/lomonosov-08-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/lomonosov-10-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/lucidaterminal-10-b-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/lucidaterminal-10-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/nexus-08-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/noxis-08-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/ocr-10-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/shine-08-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/smooth-09-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/terminal-10-m-r-sc.pcf.gz -lib/X11/fonts/lfpfonts-fix/terminal-10-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/terminal-16-m-r-iso10646-1.pcf.gz -lib/X11/fonts/lfpfonts-fix/terminal-16-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/terminal-20-m-r-iso10646-1.pcf.gz -lib/X11/fonts/lfpfonts-fix/terminal-20-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/thin-09-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/tixus-08-m-r-alt.pcf.gz -lib/X11/fonts/lfpfonts-fix/tixus-08-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/trachtenberg-11-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/uniread-08-m-r-iso10646-1.pcf.gz -lib/X11/fonts/lfpfonts-fix/uniread-08-m-r-koi8-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/uniread-08-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/uniread-09-m-i-iso10646-1.pcf.gz -lib/X11/fonts/lfpfonts-fix/uniread-09-m-i.pcf.gz -lib/X11/fonts/lfpfonts-fix/uniread-09-m-r-iso10646-1.pcf.gz -lib/X11/fonts/lfpfonts-fix/uniread-09-m-r-koi8-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/uniread-09-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/zin-09-m-r.pcf.gz -lib/X11/fonts/lfpfonts-fix/zin-09-t-r.pcf.gz -@dirrm lib/X11/fonts/lfpfonts-fix +%%FONTDIR%%/antique-10-m-r.pcf.gz +%%FONTDIR%%/artist-10-m-r-alt.pcf.gz +%%FONTDIR%%/artist-10-m-r-serif.pcf.gz +%%FONTDIR%%/artist-10-m-r.pcf.gz +%%FONTDIR%%/artsie-09-m-r.pcf.gz +%%FONTDIR%%/asimov-09-m-r.pcf.gz +%%FONTDIR%%/bright-09-m-r.pcf.gz +%%FONTDIR%%/cantor-10-m-r-sc.pcf.gz +%%FONTDIR%%/cantor-10-m-r.pcf.gz +%%FONTDIR%%/cntdown-09-m-r.pcf.gz +%%FONTDIR%%/computer-09-m-r-alt.pcf.gz +%%FONTDIR%%/computer-09-m-r.pcf.gz +%%FONTDIR%%/computer-11-m-r.pcf.gz +%%FONTDIR%%/escher-10-m-r.pcf.gz +%%FONTDIR%%/eurotype-12-m-r.pcf.gz +%%FONTDIR%%/feynman-10-m-r.pcf.gz +%%FONTDIR%%/gagarin-10-m-i.pcf.gz +%%FONTDIR%%/gagarin-10-m-r-sc.pcf.gz +%%FONTDIR%%/gagarin-10-m-r.pcf.gz +%%FONTDIR%%/gamow-05-m-r.pcf.gz +%%FONTDIR%%/gamow-06-m-r.pcf.gz +%%FONTDIR%%/gamow-07-b-i.pcf.gz +%%FONTDIR%%/gamow-07-b-r.pcf.gz +%%FONTDIR%%/gamow-07-m-i.pcf.gz +%%FONTDIR%%/gamow-07-m-r-sc.pcf.gz +%%FONTDIR%%/gamow-07-m-r.pcf.gz +%%FONTDIR%%/gamow-08-b-i.pcf.gz +%%FONTDIR%%/gamow-08-b-r.pcf.gz +%%FONTDIR%%/gamow-08-m-i.pcf.gz +%%FONTDIR%%/gamow-08-m-r-iso10646-1.pcf.gz +%%FONTDIR%%/gamow-08-m-r-sc.pcf.gz +%%FONTDIR%%/gamow-08-m-r.pcf.gz +%%FONTDIR%%/gamow-09-b-i-sc.pcf.gz +%%FONTDIR%%/gamow-09-b-i.pcf.gz +%%FONTDIR%%/gamow-09-b-r-alt.pcf.gz +%%FONTDIR%%/gamow-09-b-r-sc-alt.pcf.gz +%%FONTDIR%%/gamow-09-b-r.pcf.gz +%%FONTDIR%%/gamow-09-m-i-sc.pcf.gz +%%FONTDIR%%/gamow-09-m-i.pcf.gz +%%FONTDIR%%/gamow-09-m-r.pcf.gz +%%FONTDIR%%/hollow-11-m-r.pcf.gz +%%FONTDIR%%/julie-10-m-r.pcf.gz +%%FONTDIR%%/kandinsky-08-m-r-alt.pcf.gz +%%FONTDIR%%/kandinsky-09-m-r.pcf.gz +%%FONTDIR%%/lomonosov-08-m-r.pcf.gz +%%FONTDIR%%/lomonosov-10-m-r.pcf.gz +%%FONTDIR%%/lucidaterminal-10-b-r.pcf.gz +%%FONTDIR%%/lucidaterminal-10-m-r.pcf.gz +%%FONTDIR%%/nexus-08-m-r.pcf.gz +%%FONTDIR%%/noxis-08-m-r.pcf.gz +%%FONTDIR%%/ocr-10-m-r.pcf.gz +%%FONTDIR%%/shine-08-m-r.pcf.gz +%%FONTDIR%%/smooth-09-m-r.pcf.gz +%%FONTDIR%%/terminal-10-m-r-sc.pcf.gz +%%FONTDIR%%/terminal-10-m-r.pcf.gz +%%FONTDIR%%/terminal-16-m-r-iso10646-1.pcf.gz +%%FONTDIR%%/terminal-16-m-r.pcf.gz +%%FONTDIR%%/terminal-20-m-r-iso10646-1.pcf.gz +%%FONTDIR%%/terminal-20-m-r.pcf.gz +%%FONTDIR%%/thin-09-m-r.pcf.gz +%%FONTDIR%%/tixus-08-m-r-alt.pcf.gz +%%FONTDIR%%/tixus-08-m-r.pcf.gz +%%FONTDIR%%/trachtenberg-11-m-r.pcf.gz +%%FONTDIR%%/uniread-08-m-r-iso10646-1.pcf.gz +%%FONTDIR%%/uniread-08-m-r-koi8-r.pcf.gz +%%FONTDIR%%/uniread-08-m-r.pcf.gz +%%FONTDIR%%/uniread-09-m-i-iso10646-1.pcf.gz +%%FONTDIR%%/uniread-09-m-i.pcf.gz +%%FONTDIR%%/uniread-09-m-r-iso10646-1.pcf.gz +%%FONTDIR%%/uniread-09-m-r-koi8-r.pcf.gz +%%FONTDIR%%/uniread-09-m-r.pcf.gz +%%FONTDIR%%/zin-09-m-r.pcf.gz +%%FONTDIR%%/zin-09-t-r.pcf.gz +@fontsdir %%FONTDIR%%