diff options
author | uebayasi <uebayasi> | 2004-02-26 08:37:24 +0000 |
---|---|---|
committer | uebayasi <uebayasi> | 2004-02-26 08:37:24 +0000 |
commit | 0da8d0ef2b7f39bc1a62c48368e7628a06b09138 (patch) | |
tree | 8ffcef0c5e1c88271085826be817ff1b0a182374 /fonts | |
parent | c9e5111c440212a1f15e08ba0264b59297b12244 (diff) | |
download | pkgsrc-0da8d0ef2b7f39bc1a62c48368e7628a06b09138.tar.gz |
Use fonts.mk. Misc. clean-ups.
Diffstat (limited to 'fonts')
-rw-r--r-- | fonts/jisx0213fonts/Makefile | 40 | ||||
-rw-r--r-- | fonts/jisx0213fonts/PLIST | 4 |
2 files changed, 21 insertions, 23 deletions
diff --git a/fonts/jisx0213fonts/Makefile b/fonts/jisx0213fonts/Makefile index fe1939ac2cf..2ca2455857f 100644 --- a/fonts/jisx0213fonts/Makefile +++ b/fonts/jisx0213fonts/Makefile @@ -1,40 +1,40 @@ -# $NetBSD: Makefile,v 1.5 2001/02/25 04:17:48 hubertf Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/26 08:37:24 uebayasi Exp $ # DISTNAME= jisx0213fonts-0.0 CATEGORIES= fonts x11 japanese MASTER_SITES= ftp://ftp.m17n.org/pub/character/fonts/imamura/jisx0213/ -DISTFILES= ${BDF:C/bdf$/bdf.gz/} +DISTFILES= ${FONTS:C/$/.bdf.gz/} -MAINTAINER= itojun@itojun.org +MAINTAINER= itojun@itojun.org, uebayasi@NetBSD.org HOMEPAGE= ftp://ftp.m17n.org/pub/character/fonts/imamura/jisx0213/ -COMMENT= X11 fonts for JIS X0213 standard +COMMENT= X11 bitmap fonts for JIS X 0213 USE_X11BASE= yes -BDF= K14-1.bdf K14-2.bdf jiskan16-2000-1.bdf jiskan16-2000-2.bdf -PCF= ${BDF:C/bdf$/pcf/} -PCFGZ= ${BDF:C/bdf$/pcf.gz/} -FONTDIR=${PREFIX}/lib/X11/fonts/local +FONTS= K14-1 K14-2 jiskan16-2000-1 jiskan16-2000-2 +FONTDIR= ${PREFIX}/lib/X11/fonts/local +FONTS_X11_DIRS= ${FONTDIR} + +WRKSRC= ${WRKDIR} do-extract: - ${MKDIR} ${WRKSRC} - for i in ${BDF}; do \ - ${CP} ${DISTDIR}/$$i.gz ${WRKSRC}; \ - ${GUNZIP_CMD} ${WRKSRC}/$$i.gz; \ + @for f in ${FONTS}; do \ + ${GUNZIP_CMD} ${DISTDIR}/$${f}.bdf.gz >${WRKSRC}/$${f}.bdf; \ done do-build: - (cd ${WRKSRC}; for i in ${BDF}; do \ - bdftopcf -o `echo $$i | ${SED} -e 's/bdf$$/pcf/'` $$i; \ - ${GZIP_CMD} `echo $$i | ${SED} -e 's/bdf$$/pcf/'`; \ - done) + @cd ${WRKSRC}; \ + for f in ${FONTS}; do \ + ${X11BASE}/bin/bdftopcf $${f}.bdf | \ + ${GZIP_CMD} -c >$${f}.pcf.gz; \ + done do-install: - ${INSTALL_DATA_DIR} ${FONTDIR} - for i in ${PCFGZ}; do \ - ${INSTALL_DATA} ${WRKSRC}/$$i ${FONTDIR}; \ + @${INSTALL_DATA_DIR} ${FONTDIR} + @for f in ${FONTS}; do \ + ${INSTALL_DATA} ${WRKSRC}/$${f}.pcf.gz ${FONTDIR}; \ done - (cd ${FONTDIR}; mkfontdir) +.include "../../mk/fonts.mk" .include "../../mk/bsd.pkg.mk" diff --git a/fonts/jisx0213fonts/PLIST b/fonts/jisx0213fonts/PLIST index 0e5fa85e80d..44195ed51b8 100644 --- a/fonts/jisx0213fonts/PLIST +++ b/fonts/jisx0213fonts/PLIST @@ -1,7 +1,5 @@ -@comment $NetBSD: PLIST,v 1.3 2002/07/03 03:43:36 toshii Exp $ +@comment $NetBSD: PLIST,v 1.4 2004/02/26 08:37:24 uebayasi Exp $ lib/X11/fonts/local/K14-1.pcf.gz lib/X11/fonts/local/K14-2.pcf.gz lib/X11/fonts/local/jiskan16-2000-1.pcf.gz lib/X11/fonts/local/jiskan16-2000-2.pcf.gz -@exec ${X11BASE}/bin/mkfontdir %D/lib/X11/fonts/local -@unexec ${X11BASE}/bin/mkfontdir %D/lib/X11/fonts/local |