diff options
author | kei <kei> | 2001-04-19 16:09:29 +0000 |
---|---|---|
committer | kei <kei> | 2001-04-19 16:09:29 +0000 |
commit | 832460bd186c8268041363a40880b4986b2396da (patch) | |
tree | 91e36c40c49cfe9badfe0c7d897cd482b1e4691a /fonts | |
parent | 1bf3318d3449e606a3269d5a037a6b1434891954 (diff) | |
download | pkgsrc-832460bd186c8268041363a40880b4986b2396da.tar.gz |
fixed some installation/deinstallation problem.
- install rlR5x8.pcf.gz if only USE_NON_RECTANGULAR == YES.
- include "../../bsd.prefs.mk" to pull /etc/mk.conf in.
- mkfontdir is a part of standard X distribution, so it is in /usr/X11R6/bin
whether xpkgwedge is installed or not. Simply invoke it as mkfontdir.
s/RECTANGULAR/SQUARE/.
Diffstat (limited to 'fonts')
-rw-r--r-- | fonts/jisx0208fonts/Makefile | 11 | ||||
-rw-r--r-- | fonts/jisx0208fonts/pkg/PLIST.end | 6 |
2 files changed, 10 insertions, 7 deletions
diff --git a/fonts/jisx0208fonts/Makefile b/fonts/jisx0208fonts/Makefile index 0eb127b0de2..649ca9c80d6 100644 --- a/fonts/jisx0208fonts/Makefile +++ b/fonts/jisx0208fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2001/03/27 03:19:56 hubertf Exp $ +# $NetBSD: Makefile,v 1.16 2001/04/19 16:09:29 kei Exp $ # DISTNAME= jisx0208fonts-20010112 @@ -14,7 +14,8 @@ COMMENT= X11 fonts for JIS X0208 standard # not USE_GMAKE BUILD_DEPENDS+= gmake-3.79.1:../../devel/gmake -USE_NON_RECTANGULAR?= NO +.include "../../mk/bsd.prefs.mk" +USE_NON_SQUARE?= NO USE_SHINONOME?= YES USE_KANAME?= YES @@ -24,7 +25,7 @@ EXTRACT_ONLY= # empty MAKE_ENV+= FONTDIR=${FONTDIR} GZIP_CMD="${GZIP_CMD}" FONTDIR=${PREFIX}/lib/X11/fonts/local -.if ${USE_NON_RECTANGULAR} == YES +.if ${USE_NON_SQUARE} == YES MASTER_SITES+= http://hp.vector.co.jp/authors/VA004814/freesoft/ \ ftp://ftp.jp.netbsd.org/pub/NetBSD-jp/tut-jp/fonts/ ELISA10X8= elisau10.tgz clR5x8.bdf @@ -66,7 +67,7 @@ NAGA10= knj10-1.1.tar.gz 6x12.tar.gz EXTRACT_ONLY+= knj10-1.1.tar.gz 6x12.tar.gz PLIST_SRC+= ${PKGDIR}/PLIST.naga10 -.if ${USE_NON_RECTANGULAR} == YES +.if ${USE_NON_SQUARE} == YES MASTER_SITES+= http://www.softclub.co.jp/~zoro/k12x10/ K12X10= k12x10bdf.tar.gz EXTRACT_ONLY+= k12x10bdf.tar.gz @@ -77,7 +78,9 @@ PLIST_SRC+= ${PKGDIR}/PLIST.end post-extract: ${MKDIR} ${WRKSRC} +.if ${USE_NON_SQUARE} == YES ${CP} ${DISTDIR}/clR5x8.bdf ${WRKDIR} +.endif ${CP} ${FILESDIR}/Makefile ${WRKSRC} .if ${USE_SHINONOME} == YES @(cd ${WRKDIR}/shinonome12-1.0.8 ; \ diff --git a/fonts/jisx0208fonts/pkg/PLIST.end b/fonts/jisx0208fonts/pkg/PLIST.end index d23bf389f34..8abedd534fc 100644 --- a/fonts/jisx0208fonts/pkg/PLIST.end +++ b/fonts/jisx0208fonts/pkg/PLIST.end @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.end,v 1.1 2001/01/12 15:00:10 itojun Exp $ +@comment $NetBSD: PLIST.end,v 1.2 2001/04/19 16:09:30 kei Exp $ @dirrm share/doc/jisx0208fonts -@exec %D/bin/mkfontdir %D/lib/X11/fonts/local -@unexec %D/bin/mkfontdir %D/lib/X11/fonts/local +@exec mkfontdir %D/lib/X11/fonts/local +@unexec mkfontdir %D/lib/X11/fonts/local |