[pkgsrc/trunk]: pkgsrc/fonts/jisx0212fonts * Use fonts.mk

[uebayasi <uebayasi%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d982a39e3eb4
branches:  trunk
changeset: 469646:d982a39e3eb4
user:      uebayasi <uebayasi%pkgsrc.org@localhost>
date:      Thu Feb 26 08:15:27 2004 +0000

description:
* Use fonts.mk
* Install files as *.pcf.gz.
* Misc. clean-ups.

File names and INSTALL/DEINSTALL scripts change.  Bump revision to 1.

diffstat:

 fonts/jisx0212fonts/Makefile |  45 +++++++++++++++++++++++++++----------------
 fonts/jisx0212fonts/PLIST    |  12 ++++------
 2 files changed, 33 insertions(+), 24 deletions(-)

diffs (83 lines):

diff -r 31aec88c9d0f -r d982a39e3eb4 fonts/jisx0212fonts/Makefile
--- a/fonts/jisx0212fonts/Makefile      Thu Feb 26 07:47:48 2004 +0000
+++ b/fonts/jisx0212fonts/Makefile      Thu Feb 26 08:15:27 2004 +0000
@@ -1,35 +1,46 @@
-# $NetBSD: Makefile,v 1.8 2004/01/20 12:15:17 agc Exp $
+# $NetBSD: Makefile,v 1.9 2004/02/26 08:15:27 uebayasi Exp $
 # Based on FreeBSD Id: Makefile,v 1.6 1999/02/12 17:23:40 motoyuki Exp
 #
 
 DISTNAME=      jisx0212fonts-0.0
+PKGREVISION=   1
 CATEGORIES=    fonts x11 japanese
 MASTER_SITES=  ftp://ginkaku.kudpc.kyoto-u.ac.jp/fonts/ \
                ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/ \
                http://www.freebsd.org/~itojun/distfiles/
-DISTFILES=     ${BDF14} ${BDF16} ${BDF24} ${BDF40}
+DISTFILES=     jisksp14.bdf.gz jisksp16-1990.bdf.Z min-1-24.bdf.gz \
+               jisksp40.bdf.Z
 
 MAINTAINER=    itojun%itojun.org@localhost
-COMMENT=       X11 X0212-1990 font.  14, 16, 24 and 40 dots availble
+COMMENT=       X11 bitmap fonts for JIS X 0212
+
+USE_X11BASE=   yes
 
 WRKSRC=                ${WRKDIR}
-USE_X11BASE=   yes
 EXTRACT_ONLY=  ${DISTFILES}
-MAKE_ENV+=     DISTDIR=${DISTDIR} DISTFILES="${DISTFILES}"
-
-BDF14=         jisksp14.bdf.gz
-BDF16=         jisksp16-1990.bdf.Z
-BDF24=         min-1-24.bdf.gz
-BDF40=         jisksp40.bdf.Z
 
+FONTS=         ${DISTFILES:C/\.bdf.*$//}
+FONTDIR=       ${PREFIX}/lib/X11/fonts/local
+FONTS_X11_DIRS=        ${FONTDIR}
+
+# XXX Can we assume that ${GUNZIP_CMD} can extract .Z files?
 do-extract:
-       @${RM} -rf ${WRKDIR}
-       @${MKDIR} ${WRKDIR}
-       @for file in ${EXTRACT_ONLY}; do \
-               if ! (cd ${WRKDIR} && \
-                       ${GUNZIP_CMD} -c < ${_DISTDIR}/$$file > `echo $$file | ${SED} -e 's/\.Z//' -e 's/\.gz//'`); then \
-                       exit 1; \
-               fi; \
+       @for f in ${DISTFILES}; do \
+               ${GUNZIP_CMD} -c ${DISTDIR}/$${f} >${WRKSRC}/$${f%.*}; \
        done
 
+do-build:
+       @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 f in ${FONTS}; do \
+               ${INSTALL_DATA} ${WRKSRC}/$${f}.pcf.gz ${FONTDIR}; \
+       done
+
+.include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 31aec88c9d0f -r d982a39e3eb4 fonts/jisx0212fonts/PLIST
--- a/fonts/jisx0212fonts/PLIST Thu Feb 26 07:47:48 2004 +0000
+++ b/fonts/jisx0212fonts/PLIST Thu Feb 26 08:15:27 2004 +0000
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:49:03 zuntum Exp $
-lib/X11/fonts/local/jisksp14.pcf.Z
-lib/X11/fonts/local/jisksp16-1990.pcf.Z
-lib/X11/fonts/local/jisksp40.pcf.Z
-lib/X11/fonts/local/min-1-24.pcf.Z
-@exec cd %D/lib/X11/fonts/local; mkfontdir
-@unexec cd %D/lib/X11/fonts/local; mkfontdir
+@comment $NetBSD: PLIST,v 1.2 2004/02/26 08:15:27 uebayasi Exp $
+lib/X11/fonts/local/jisksp14.pcf.gz
+lib/X11/fonts/local/jisksp16-1990.pcf.gz
+lib/X11/fonts/local/jisksp40.pcf.gz
+lib/X11/fonts/local/min-1-24.pcf.gz