Date: Fri, 25 Sep 2015 21:48:10 +0000 (UTC) From: Hiroki Sato <hrs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397892 - in head: . japanese japanese/alias-fonts japanese/alias-fonts/files japanese/elisa8x8 japanese/font-ayu18 japanese/font-ayu18/files japanese/font-ayu20 japanese/font-ayu20/fil... Message-ID: <201509252148.t8PLmA2W064951@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hrs Date: Fri Sep 25 21:48:09 2015 New Revision: 397892 URL: https://svnweb.freebsd.org/changeset/ports/397892 Log: Fix inconsistent installation directories of Japanese fonts and reorganize the package names: (new) -> font-ayu18 (new) -> font-ayu20 k10 -> font-naga10 (also builds "marunaga" variant now) k12 -> font-kaname12 (new) -> font-elisa10 (resurrected) elisa8x8 -> font-elisa8 kanji18 -> font-kanji18 (also builds 16-dot variant now) kanji26 -> font-kanji26 (also builds 24-dot variant now) kappa20 -> font-kappa20 (Ayu fonts is separated into font-ayu20) mikachan-ttfonts -> font-mikachan monafonts-ttf -> font-mona-ttf monafonts -> font-mona All of bitmap fonts are now installed into misc/, and the TrueType fonts go into TTF/. No objection from: maintainers Added: head/japanese/font-ayu18/ head/japanese/font-ayu18/Makefile (contents, props changed) head/japanese/font-ayu18/distinfo (contents, props changed) head/japanese/font-ayu18/files/ head/japanese/font-ayu18/files/Makefile.in (contents, props changed) head/japanese/font-ayu18/pkg-descr (contents, props changed) head/japanese/font-ayu18/pkg-plist (contents, props changed) head/japanese/font-ayu20/ head/japanese/font-ayu20/Makefile (contents, props changed) head/japanese/font-ayu20/distinfo (contents, props changed) head/japanese/font-ayu20/files/ head/japanese/font-ayu20/files/Makefile.in (contents, props changed) head/japanese/font-ayu20/files/fonts.alias (contents, props changed) head/japanese/font-ayu20/files/pkg-install.in (contents, props changed) head/japanese/font-ayu20/pkg-descr (contents, props changed) head/japanese/font-ayu20/pkg-plist (contents, props changed) head/japanese/font-elisa10/ - copied from r395030, head/japanese/elisa8x8/ head/japanese/font-elisa10/files/Makefile.in (contents, props changed) head/japanese/font-elisa8/ - copied from r397867, head/japanese/elisa8x8/ head/japanese/font-elisa8/files/Makefile.in (contents, props changed) head/japanese/font-elisa8/files/fonts.alias - copied, changed from r395030, head/japanese/elisa8x8/files/pkg-install.in head/japanese/font-kaname12/ - copied from r397867, head/japanese/k12/ head/japanese/font-kaname12/files/Makefile.in - copied, changed from r397867, head/japanese/k12/files/patch-aa head/japanese/font-kaname12/files/patch-readme.kaname_bdf - copied, changed from r395030, head/japanese/k12/files/patch-ab head/japanese/font-kaname12/files/pkg-install.in - copied, changed from r395030, head/japanese/elisa8x8/files/pkg-install.in head/japanese/font-kanji18/ - copied from r397867, head/japanese/kanji18/ head/japanese/font-kanji18/files/fonts.alias.18 - copied, changed from r395030, head/japanese/kanji18/files/INSTALL.tmpl head/japanese/font-kanji18/files/fonts.alias.26 - copied, changed from r397867, head/japanese/kanji26/files/INSTALL.tmpl head/japanese/font-kanji18/files/pkg-install.in - copied, changed from r397867, head/japanese/kanji18/files/INSTALL.tmpl head/japanese/font-kanji26/ - copied from r397867, head/japanese/kanji26/ head/japanese/font-kappa20/ - copied from r397867, head/japanese/kappa20/ head/japanese/font-kappa20/files/pkg-install.in - copied, changed from r397867, head/japanese/kappa20/pkg-install head/japanese/font-mikachan/ - copied from r397867, head/japanese/mikachan-ttfonts/ head/japanese/font-mikachan/files/fonts.dir - copied, changed from r397867, head/japanese/mikachan-ttfonts/files/fonts.dir.mika head/japanese/font-mikachan/files/pkg-install.in - copied, changed from r395030, head/japanese/mikachan-ttfonts/pkg-install head/japanese/font-mona/ - copied from r397867, head/japanese/monafonts/ head/japanese/font-mona-ttf/ - copied from r397867, head/japanese/monafonts-ttf/ head/japanese/font-mona-ttf/files/fonts.dir - copied unchanged from r397867, head/japanese/monafonts-ttf/files/fonts.dir.mona head/japanese/font-mona-ttf/files/pkg-install.in - copied, changed from r395030, head/japanese/monafonts-ttf/pkg-install head/japanese/font-mona/files/fonts.alias - copied, changed from r395030, head/japanese/monafonts/pkg-install head/japanese/font-mona/files/pkg-install.in - copied, changed from r397867, head/japanese/monafonts/pkg-install head/japanese/font-naga10/ - copied from r397867, head/japanese/k10/ head/japanese/font-naga10/files/pkg-install.in (contents, props changed) Deleted: head/japanese/elisa8x8/ head/japanese/font-elisa10/files/pkg-deinstall.in head/japanese/font-elisa10/pkg-plist head/japanese/font-elisa8/files/pkg-deinstall.in head/japanese/font-kaname12/files/patch-aa head/japanese/font-kaname12/files/patch-ab head/japanese/font-kaname12/files/pkg-message.in head/japanese/font-kanji18/files/DEINSTALL.tmpl head/japanese/font-kanji18/files/INSTALL.tmpl head/japanese/font-kanji26/files/ head/japanese/font-kappa20/files/fonts.alias.ayu head/japanese/font-kappa20/pkg-deinstall head/japanese/font-kappa20/pkg-install head/japanese/font-mikachan/files/fonts.dir.mika head/japanese/font-mikachan/pkg-deinstall head/japanese/font-mikachan/pkg-install head/japanese/font-mikachan/pkg-plist head/japanese/font-mona-ttf/files/fonts.dir.mona head/japanese/font-mona-ttf/pkg-deinstall head/japanese/font-mona-ttf/pkg-install head/japanese/font-mona-ttf/pkg-plist head/japanese/font-mona/pkg-deinstall head/japanese/font-mona/pkg-install head/japanese/font-naga10/files/pkg-message.in head/japanese/k10/ head/japanese/k12/ head/japanese/kanji18/ head/japanese/kanji26/ head/japanese/kappa20/ head/japanese/mikachan-ttfonts/ head/japanese/monafonts/ head/japanese/monafonts-ttf/ Modified: head/MOVED head/japanese/Makefile head/japanese/alias-fonts/Makefile head/japanese/alias-fonts/files/pkg-message.in head/japanese/font-elisa10/Makefile head/japanese/font-elisa10/distinfo head/japanese/font-elisa10/files/pkg-install.in head/japanese/font-elisa10/pkg-descr head/japanese/font-elisa8/Makefile head/japanese/font-elisa8/files/pkg-install.in head/japanese/font-elisa8/pkg-descr head/japanese/font-elisa8/pkg-plist head/japanese/font-kaname12/Makefile head/japanese/font-kaname12/pkg-plist head/japanese/font-kanji18/Makefile head/japanese/font-kanji18/files/Makefile.in head/japanese/font-kanji18/pkg-descr head/japanese/font-kanji18/pkg-plist head/japanese/font-kanji26/Makefile head/japanese/font-kanji26/pkg-descr head/japanese/font-kanji26/pkg-plist head/japanese/font-kappa20/Makefile head/japanese/font-kappa20/files/Makefile.in head/japanese/font-kappa20/pkg-descr head/japanese/font-kappa20/pkg-plist head/japanese/font-mikachan/Makefile head/japanese/font-mikachan/distinfo head/japanese/font-mona-ttf/Makefile head/japanese/font-mona-ttf/pkg-descr head/japanese/font-mona/Makefile head/japanese/font-mona/files/patch-Makefile head/japanese/font-mona/pkg-descr head/japanese/font-mona/pkg-plist head/japanese/font-naga10/Makefile head/japanese/font-naga10/files/Makefile.in head/japanese/font-naga10/pkg-plist Modified: head/MOVED ============================================================================== --- head/MOVED Fri Sep 25 21:46:57 2015 (r397891) +++ head/MOVED Fri Sep 25 21:48:09 2015 (r397892) @@ -7875,3 +7875,12 @@ x11-toolkits/wxgtk28-unicode-contrib|x11 x11-toolkits/py-wxPython28-unicode|x11-toolkits/py-wxPython28|2015-09-16|Make wxGTK now only unicode japanese/font-mplus|japanese/font-mplus-outline|2015-09-21|Renamed www/iojs|www/node|2015-09-23|io.js has been merged back to Node.js +japanese/k10|japanese/font-naga10|2015-09-25|Renamed +japanese/k12|japanese/font-kaname12|2015-09-25|Renamed +japanese/elisa8x8|japanese/font-elisa8|2015-09-25|Renamed +japanese/kanji18|japanese/font-kanji18|2015-09-25|Renamed +japanese/kanji26|japanese/font-kanji26|2015-09-25|Renamed +japanese/kappa20|japanese/font-kappa20|2015-09-25|Renamed +japanese/mikachan-ttfonts|japanese/font-mikachan|2015-09-25|Renamed +japanese/monafonts-ttf|japanese/font-mona-ttf|2015-09-25|Renamed +japanese/monafonts|japanese/font-mona|2015-09-25|Renamed Modified: head/japanese/Makefile ============================================================================== --- head/japanese/Makefile Fri Sep 25 21:46:57 2015 (r397891) +++ head/japanese/Makefile Fri Sep 25 21:48:09 2015 (r397892) @@ -49,7 +49,6 @@ SUBDIR += edyvalue SUBDIR += egg-canna SUBDIR += eijiro-fpw - SUBDIR += elisa8x8 SUBDIR += epwutil SUBDIR += esecanna SUBDIR += esecanna-module-vje25 @@ -61,21 +60,33 @@ SUBDIR += fcitx-skk SUBDIR += flower-fpw SUBDIR += foldoc-fpw + SUBDIR += font-ayu18 + SUBDIR += font-ayu20 + SUBDIR += font-elisa10 + SUBDIR += font-elisa8 SUBDIR += font-ipa SUBDIR += font-ipa-uigothic SUBDIR += font-ipaex SUBDIR += font-ipamjm SUBDIR += font-jisx0213 + SUBDIR += font-kaname12 + SUBDIR += font-kanji18 + SUBDIR += font-kanji26 + SUBDIR += font-kappa20 SUBDIR += font-kochi SUBDIR += font-koruri SUBDIR += font-marumoji SUBDIR += font-migmix SUBDIR += font-migu + SUBDIR += font-mikachan + SUBDIR += font-mona SUBDIR += font-mona-ipa + SUBDIR += font-mona-ttf SUBDIR += font-motoya-al SUBDIR += font-mplus-bitmap SUBDIR += font-mplus-ipa SUBDIR += font-mplus-outline + SUBDIR += font-naga10 SUBDIR += font-ricty SUBDIR += font-ricty-discord SUBDIR += font-sazanami @@ -117,14 +128,9 @@ SUBDIR += jstrings SUBDIR += jvim3 SUBDIR += jyuroku - SUBDIR += k10 - SUBDIR += k12 SUBDIR += kakasi SUBDIR += kana-no-quiz - SUBDIR += kanji18 - SUBDIR += kanji26 SUBDIR += kanjipad - SUBDIR += kappa20 SUBDIR += kasumi SUBDIR += kbanner SUBDIR += kcc @@ -159,11 +165,8 @@ SUBDIR += migemo SUBDIR += migemo-emacs23 SUBDIR += migemo.el - SUBDIR += mikachan-ttfonts SUBDIR += mime_pls SUBDIR += ming - SUBDIR += monafonts - SUBDIR += monafonts-ttf SUBDIR += mozc-el SUBDIR += mozc-server SUBDIR += mozc-tool Modified: head/japanese/alias-fonts/Makefile ============================================================================== --- head/japanese/alias-fonts/Makefile Fri Sep 25 21:46:57 2015 (r397891) +++ head/japanese/alias-fonts/Makefile Fri Sep 25 21:48:09 2015 (r397892) @@ -3,7 +3,7 @@ PORTNAME= alias-fonts PORTVERSION= 1.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= japanese x11-fonts MASTER_SITES= # empty DISTFILES= # empty @@ -11,12 +11,12 @@ DISTFILES= # empty MAINTAINER= CQG00620@nifty.ne.jp COMMENT= Meta-port which setups Japanese fonts -RUN_DEPENDS= ja-elisa8x8>0:${PORTSDIR}/japanese/elisa8x8 \ - ja-naga10>0:${PORTSDIR}/japanese/k10 \ +RUN_DEPENDS= ja-font-elisa8>0:${PORTSDIR}/japanese/font-elisa8 \ + ja-font-naga10>0:${PORTSDIR}/japanese/font-naga10 \ ja-font-shinonome>0:${PORTSDIR}/japanese/font-shinonome \ - ja-kanji18>0:${PORTSDIR}/japanese/kanji18 \ - ja-k20fonts>0:${PORTSDIR}/japanese/kappa20 \ - ja-kanji26>0:${PORTSDIR}/japanese/kanji26 \ + ja-font-kanji18>0:${PORTSDIR}/japanese/font-kanji18 \ + ja-font-kappa20>0:${PORTSDIR}/japanese/font-kappa20 \ + ja-font-kanji26>0:${PORTSDIR}/japanese/font-kanji26 \ ja-font-jisx0213>0:${PORTSDIR}/japanese/font-jisx0213 NO_BUILD= yes Modified: head/japanese/alias-fonts/files/pkg-message.in ============================================================================== --- head/japanese/alias-fonts/files/pkg-message.in Fri Sep 25 21:46:57 2015 (r397891) +++ head/japanese/alias-fonts/files/pkg-message.in Fri Sep 25 21:48:09 2015 (r397892) @@ -20,11 +20,4 @@ Font Path setting: whether the following directories are listed: %%PREFIX%%/share/fonts/alias-fonts/ (This port) - %%PREFIX%%/share/fonts/elisa8x8/ (8 dot fonts) - %%PREFIX%%/share/fonts/naga10/ (10 dot fonts) - %%PREFIX%%/share/fonts/shinonome/ (12, 14 and 16 dots) - %%PREFIX%%/share/fonts/kanji/ (18 and 24 dot fonts) - %%PREFIX%%/share/fonts/k20fonts/ (20 dot fonts) - %%PREFIX%%/share/fonts/jisx0213/ (12, 14, 16 and 24 dots - JISX0213 fonts) ******************************************************************** Added: head/japanese/font-ayu18/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/font-ayu18/Makefile Fri Sep 25 21:48:09 2015 (r397892) @@ -0,0 +1,38 @@ +# $FreeBSD$ + +PORTNAME= ayu18 +PORTVERSION= 1.3.1.1 +CATEGORIES= japanese x11-fonts +MASTER_SITES= SFJP/x-tt/8535/:goth \ + SFJP/x-tt/8494/:min +PKGNAMEPREFIX= ja-font- +DISTFILES= ayu18gothic-1.3a${EXTRACT_SUFX}:goth \ + ayu18mincho-1.1${EXTRACT_SUFX}:min + +MAINTAINER= hrs@FreeBSD.org +COMMENT= Ayu 18-dot Kanji font + +BUILD_DEPENDS= mkitalic:${PORTSDIR}/x11-fonts/mkbold-mkitalic \ + bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf + +USES= fonts +FONTNAME= misc +NO_ARCH= yes +NO_WRKSUBDIR= yes +SUB_FILES= Makefile +PORTDOCS= README.txt + +OPTIONS_DEFINE= DOCS + +pre-build: apply-slist + +post-install: + @${MKDIR} ${STAGEDIR}${FONTSDIR} + cd ${STAGEDIR}${FONTSDIR} && \ + ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz . + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} + +.include <bsd.port.mk> Added: head/japanese/font-ayu18/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/font-ayu18/distinfo Fri Sep 25 21:48:09 2015 (r397892) @@ -0,0 +1,4 @@ +SHA256 (ayu18gothic-1.3a.tar.gz) = 116063516bb0758c0369ca3035d65e394ab6c1bad4cf258309adbc9e3e50d11c +SIZE (ayu18gothic-1.3a.tar.gz) = 288546 +SHA256 (ayu18mincho-1.1.tar.gz) = 5ebbde4193d5cdca94e3d67513dc4da98fa3d62eb96f9834900ef7219051ecbe +SIZE (ayu18mincho-1.1.tar.gz) = 290092 Added: head/japanese/font-ayu18/files/Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/font-ayu18/files/Makefile.in Fri Sep 25 21:48:09 2015 (r397892) @@ -0,0 +1,35 @@ +# $FreeBSD$ + +GZIP_CMD?= gzip +MKBOLD_CMD?= mkbold +MKITALIC_CMD?= mkitalic + +DIST_ALL= 9x18gm.bdf 9x18grkm.bdf 9x18m.bdf 9x18rkm.bdf \ + k18gm.bdf k18m.bdf + +DIST_NOBOLD= # empty +MADE_BOLD= ${DIST_NOBOLD:S/.bdf/b.bdf/g} + +DIST_NOITALIC= ${DIST_ALL} ${MADE_BDF} ${MADE_BOLD} +MADE_ITALIC= ${DIST_NOITALIC:S/m/mi/g:S/b./bi./g:S/b-/bi-/g} + +BDF_ALL= ${DIST_ALL} ${MADE_BDF} ${MADE_BOLD} ${MADE_ITALIC} +PCF_ALL= ${BDF_ALL:S/.bdf/.pcf.gz/g} + +all: ${PCF_ALL} + +${MADE_BOLD}: ${.TARGET:S/b.bdf/.bdf/} + ${MKBOLD_CMD} $> > $@ + +${MADE_ITALIC}: ${.TARGET:S/mi/m/:S/bi./b./:S/bi-/b-/} + ${MKITALIC_CMD} $> > $@ + +${PCF_ALL}: ${.TARGET:S/.pcf.gz/.bdf/} + bdftopcf $> | ${GZIP_CMD} -c > $@ + +install: + mkdir -p ${DESTDIR}%%DATADIR%% + ${BSD_INSTALL_DATA} ${PCF_ALL} ${DESTDIR}%%DATADIR%% + +clean:: + rm ${MADE_BOLD} ${MADE_ITALIC} ${PCF_ALL} Added: head/japanese/font-ayu18/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/font-ayu18/pkg-descr Fri Sep 25 21:48:09 2015 (r397892) @@ -0,0 +1,3 @@ +Ayu Bitmap Japanese font, 18-dot version. + +WWW: http://x-tt.osdn.jp/ayu.html Added: head/japanese/font-ayu18/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/font-ayu18/pkg-plist Fri Sep 25 21:48:09 2015 (r397892) @@ -0,0 +1,24 @@ +%%DATADIR%%/9x18gm.pcf.gz +%%DATADIR%%/9x18gmi.pcf.gz +%%DATADIR%%/9x18grkm.pcf.gz +%%DATADIR%%/9x18grkmi.pcf.gz +%%DATADIR%%/9x18m.pcf.gz +%%DATADIR%%/9x18mi.pcf.gz +%%DATADIR%%/9x18rkm.pcf.gz +%%DATADIR%%/9x18rkmi.pcf.gz +%%DATADIR%%/k18gm.pcf.gz +%%DATADIR%%/k18gmi.pcf.gz +%%DATADIR%%/k18m.pcf.gz +%%DATADIR%%/k18mi.pcf.gz +%%FONTSDIR%%/9x18gm.pcf.gz +%%FONTSDIR%%/9x18gmi.pcf.gz +%%FONTSDIR%%/9x18grkm.pcf.gz +%%FONTSDIR%%/9x18grkmi.pcf.gz +%%FONTSDIR%%/9x18m.pcf.gz +%%FONTSDIR%%/9x18mi.pcf.gz +%%FONTSDIR%%/9x18rkm.pcf.gz +%%FONTSDIR%%/9x18rkmi.pcf.gz +%%FONTSDIR%%/k18gm.pcf.gz +%%FONTSDIR%%/k18gmi.pcf.gz +%%FONTSDIR%%/k18m.pcf.gz +%%FONTSDIR%%/k18mi.pcf.gz Added: head/japanese/font-ayu20/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/font-ayu20/Makefile Fri Sep 25 21:48:09 2015 (r397892) @@ -0,0 +1,43 @@ +# $FreeBSD$ + +PORTNAME= ayu20 +PORTVERSION= 1.7.a +CATEGORIES= japanese x11-fonts +MASTER_SITES= SFJP/x-tt/8536/ +PKGNAMEPREFIX= ja-font- +DISTNAME= ayu20gothic-1.7a + +MAINTAINER= hrs@FreeBSD.org +COMMENT= Ayu 20-dot Kanji font + +BUILD_DEPENDS= mkitalic:${PORTSDIR}/x11-fonts/mkbold-mkitalic \ + bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf + +CONFLICS= ja-kappa20-[0-9]* + +USES= fonts +FONTNAME= misc +NO_ARCH= yes +NO_WRKSUBDIR= yes +SUB_FILES= Makefile pkg-install +SUB_LIST= FONTSALIAS="${DATADIR}/fonts.alias" +PKGINSTALL= ${WRKDIR}/pkg-install +PKGDEINSTALL= ${WRKDIR}/pkg-install +PORTDOCS= README.txt + +OPTIONS_DEFINE= DOCS + +pre-build: apply-slist + +post-install: + @${MKDIR} ${STAGEDIR}${FONTSDIR} + cd ${STAGEDIR}${FONTSDIR} && \ + ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz . + ${INSTALL_DATA} ${FILESDIR}/fonts.alias \ + ${STAGEDIR}${DATADIR} + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} + +.include <bsd.port.mk> Added: head/japanese/font-ayu20/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/font-ayu20/distinfo Fri Sep 25 21:48:09 2015 (r397892) @@ -0,0 +1,2 @@ +SHA256 (ayu20gothic-1.7a.tar.gz) = b1747196de69ef45ab37f1a40a0fc32bccc7b3acc229a21c932ab38874436833 +SIZE (ayu20gothic-1.7a.tar.gz) = 319226 Added: head/japanese/font-ayu20/files/Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/font-ayu20/files/Makefile.in Fri Sep 25 21:48:09 2015 (r397892) @@ -0,0 +1,34 @@ +# $FreeBSD$ + +GZIP_CMD?= gzip +MKBOLD_CMD?= mkbold +MKITALIC_CMD?= mkitalic + +DIST_ALL= 10x20gm.bdf 10x20grkm.bdf k20gm.bdf + +DIST_NOBOLD= # empty +MADE_BOLD= ${DIST_NOBOLD:S/.bdf/b.bdf/g} + +DIST_NOITALIC= ${DIST_ALL} ${MADE_BDF} ${MADE_BOLD} +MADE_ITALIC= ${DIST_NOITALIC:S/m/mi/g:S/b./bi./g:S/b-/bi-/g} + +BDF_ALL= ${DIST_ALL} ${MADE_BDF} ${MADE_BOLD} ${MADE_ITALIC} +PCF_ALL= ${BDF_ALL:S/.bdf/.pcf.gz/g} + +all: ${PCF_ALL} + +${MADE_BOLD}: ${.TARGET:S/b.bdf/.bdf/} + ${MKBOLD_CMD} $> > $@ + +${MADE_ITALIC}: ${.TARGET:S/mi/m/:S/bi./b./:S/bi-/b-/} + ${MKITALIC_CMD} $> > $@ + +${PCF_ALL}: ${.TARGET:S/.pcf.gz/.bdf/} + bdftopcf $> | ${GZIP_CMD} -c > $@ + +install: + mkdir -p ${DESTDIR}%%DATADIR%% + ${BSD_INSTALL_DATA} ${PCF_ALL} ${DESTDIR}%%DATADIR%% + +clean:: + rm ${MADE_BOLD} ${MADE_ITALIC} ${PCF_ALL} Added: head/japanese/font-ayu20/files/fonts.alias ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/font-ayu20/files/fonts.alias Fri Sep 25 21:48:09 2015 (r397892) @@ -0,0 +1,6 @@ +10x20gm -ayu-gothic-medium-r-normal--20-190-75-75-c-100-iso8859-1 +10x20gmi -ayu-gothic-medium-i-normal--20-190-75-75-c-100-iso8859-1 +10x20grkm -ayu-gothic-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0 +10x20grkmi -ayu-gothic-medium-i-normal--20-190-75-75-c-100-jisx0201.1976-0 +k20gm -ayu-gothic-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 +k20gmi -ayu-gothic-medium-i-normal--20-190-75-75-c-200-jisx0208.1990-0 Added: head/japanese/font-ayu20/files/pkg-install.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/font-ayu20/files/pkg-install.in Fri Sep 25 21:48:09 2015 (r397892) @@ -0,0 +1,26 @@ +#!/bin/sh + +grepv() { + awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2 +} + +case $2 in +POST-INSTALL) + cd %%FONTSDIR%% + touch fonts.alias + cp fonts.alias fonts.alias.orig + (grepv %%FONTSALIAS%% fonts.alias.orig; cat %%FONTSALIAS%%) \ + > fonts.alias + rm -f fonts.alias.orig +;; +DEINSTALL) + cd %%FONTSDIR%% + touch fonts.alias + cp fonts.alias fonts.alias.orig + grepv %%FONTSALIAS%% fonts.alias.orig > fonts.alias + rm -f fonts.alias.orig + if [ ! -s fonts.alias ]; then + rm -f fonts.alias + fi +;; +esac Added: head/japanese/font-ayu20/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/font-ayu20/pkg-descr Fri Sep 25 21:48:09 2015 (r397892) @@ -0,0 +1,3 @@ +Ayu Bitmap Japanese font, 20-dot version. + +WWW: http://x-tt.osdn.jp/ayu.html Added: head/japanese/font-ayu20/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/font-ayu20/pkg-plist Fri Sep 25 21:48:09 2015 (r397892) @@ -0,0 +1,13 @@ +%%DATADIR%%/10x20gm.pcf.gz +%%DATADIR%%/10x20gmi.pcf.gz +%%DATADIR%%/10x20grkm.pcf.gz +%%DATADIR%%/10x20grkmi.pcf.gz +%%DATADIR%%/k20gm.pcf.gz +%%DATADIR%%/k20gmi.pcf.gz +%%DATADIR%%/fonts.alias +%%FONTSDIR%%/10x20gm.pcf.gz +%%FONTSDIR%%/10x20gmi.pcf.gz +%%FONTSDIR%%/10x20grkm.pcf.gz +%%FONTSDIR%%/10x20grkmi.pcf.gz +%%FONTSDIR%%/k20gm.pcf.gz +%%FONTSDIR%%/k20gmi.pcf.gz Modified: head/japanese/font-elisa10/Makefile ============================================================================== --- head/japanese/elisa8x8/Makefile Sat Aug 22 13:27:34 2015 (r395030) +++ head/japanese/font-elisa10/Makefile Fri Sep 25 21:48:09 2015 (r397892) @@ -1,43 +1,44 @@ -# Created by: Toshihiko SHIMOKAWA <toshi@tea.forus.or.jp> & ELISA Font Project # $FreeBSD$ -PORTNAME= elisa8x8 +PORTNAME= elisa10 PORTVERSION= 1.0 -PORTREVISION= 5 CATEGORIES= japanese x11-fonts -MASTER_SITES= http://www.bsdbbq.org/~toshi/distfiles/ -DISTNAME= elisat10 +MASTER_SITES= http://www.wheel.gr.jp/~dai/software/ +PKGNAMEPREFIX= ja-font- +DISTNAME= elisau10 -MAINTAINER= toshi@tea.forus.or.jp -COMMENT= X11 8-dot Kanji font 'elisa font' +MAINTAINER= hrs@FreeBSD.org +COMMENT= Elisa 10-dot Kanji font BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf -USES= fonts +USES= fonts tar:tgz +FONTNAME= misc +NO_ARCH= yes NO_WRKSUBDIR= yes - -BDFTOPCF_CMD= ${PREFIX}/bin/bdftopcf -MYPORTDOCS= elisa100.doc elisat10.doc elisat10.html +SUB_FILES= Makefile pkg-install +SUB_LIST= BDFTOPCF_CMD="${LOCALBASE}/bin/bdftopcf" \ + GZIP_CMD="${GZIP_CMD}" \ + FONTSALIAS="${DATADIR}/fonts.alias" +PKGINSTALL= ${WRKDIR}/pkg-install +PKGDEINSTALL= ${WRKDIR}/pkg-install +PORTDOCS= elisau10.doc hosoku.txt +PLIST_FILES= %%DATADIR%%/elisau10.pcf.gz \ + %%DATADIR%%/fonts.alias \ + %%FONTSDIR%%/elisau10.pcf.gz OPTIONS_DEFINE= DOCS -do-build: - @(cd ${WRKDIR}; \ - ${BDFTOPCF_CMD} elisat10.bdf | ${GZIP_CMD} -c > elisat10.pcf.gz ;\ - ${BDFTOPCF_CMD} jpnhn4-jis.bdf | ${GZIP_CMD} -c > jpnhn4-jis.pcf.gz ;\ - ${BDFTOPCF_CMD} jpnhn4-iso.bdf | ${GZIP_CMD} -c > jpnhn4-iso.pcf.gz ;\ - ) +pre-build: apply-slist -do-install: +post-install: @${MKDIR} ${STAGEDIR}${FONTSDIR} - (cd ${WRKSRC} ;\ - ${INSTALL_DATA} elisat10.pcf.gz ${STAGEDIR}${FONTSDIR} ; \ - ${INSTALL_DATA} jpnhn4-jis.pcf.gz ${STAGEDIR}${FONTSDIR} ; \ - ${INSTALL_DATA} jpnhn4-iso.pcf.gz ${STAGEDIR}${FONTSDIR} ; \ - ) + cd ${STAGEDIR}${FONTSDIR} && \ + ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz . + ${INSTALL_DATA} ${WRKDIR}/fonts.alias ${STAGEDIR}${DATADIR} -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${MYPORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/japanese/font-elisa10/distinfo ============================================================================== --- head/japanese/elisa8x8/distinfo Sat Aug 22 13:27:34 2015 (r395030) +++ head/japanese/font-elisa10/distinfo Fri Sep 25 21:48:09 2015 (r397892) @@ -1,2 +1,2 @@ -SHA256 (elisat10.tar.gz) = 2d95c2b36d28ffede4b9dc7807bbb3ef1c56e8f31d8a98315f73a39088b691ef -SIZE (elisat10.tar.gz) = 125435 +SHA256 (elisau10.tgz) = bb62d48db7a26339313947b623376bb18d92196424ee1545ef54ed8b0200dfba +SIZE (elisau10.tgz) = 125292 Added: head/japanese/font-elisa10/files/Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/font-elisa10/files/Makefile.in Fri Sep 25 21:48:09 2015 (r397892) @@ -0,0 +1,24 @@ +# $FreeBSD$ + +BDFTOPCF_CMD= %%BDFTOPCF_CMD%% +GZIP_CMD= %%GZIP_CMD%% + +SRCS= elisau10.bdf + +.for F in ${SRCS:R} +${F}.pcf.gz: ${F}.bdf + ${BDFTOPCF_CMD} ${.ALLSRC} | ${GZIP_CMD} -c > ${.TARGET} + +all: ${F}.pcf.gz +.endfor + +.for F in ${SRCS:R} +${DESTDIR}%%DATADIR%%/${F}.pcf.gz: ${F}.bdf + mkdir -p ${DESTDIR}%%DATADIR%% + ${BSD_INSTALL_DATA} ${.ALLSRC} ${.TARGET} + +install: ${DESTDIR}%%DATADIR%%/${F}.pcf.gz +.endfor + +all install: + @true Modified: head/japanese/font-elisa10/files/pkg-install.in ============================================================================== --- head/japanese/elisa8x8/files/pkg-install.in Sat Aug 22 13:27:34 2015 (r395030) +++ head/japanese/font-elisa10/files/pkg-install.in Fri Sep 25 21:48:09 2015 (r397892) @@ -1,34 +1,23 @@ #!/bin/sh -if [ "$2" != "POST-INSTALL" ]; then - exit 0 -fi - -FONTDIR=%%FONTSDIR%% - grepv() { awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2 } -# font alias entry here! -TMPFILE=/tmp/install-fonts-alias-$$ -cat << EOF > ${TMPFILE} -k8 -elisa100-fixed-medium-r-normal--8-70-75-75-c-80-jisx0208.1983-0 -r8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-jisx0201.1976-0 -a8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1 -4x8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1 -EOF - -echo "Updating ${FONTDIR}/fonts.alias" -cd ${FONTDIR} -touch fonts.alias -cp fonts.alias fonts.alias.orig -(grepv ${TMPFILE} fonts.alias.orig ; cat ${TMPFILE}) > fonts.alias -rm -f fonts.alias.orig ${TMPFILE} - -echo "**********************************************************" -echo "You should restart X server or do 'xset fp rehash' command" -echo "to enable this update." -echo "**********************************************************" - -exit 0 +case $2 in +POST-INSTALL) + cd %%FONTSDIR%% + touch fonts.alias + cp fonts.alias fonts.alias.orig + (grepv %%FONTSALIAS%% fonts.alias.orig; cat %%FONTSALIAS%%) \ + > fonts.alias + rm -f fonts.alias.orig +;; +DEINSTALL) + cd %%FONTSDIR%% + touch fonts.alias + cp fonts.alias fonts.alias.orig + grepv %%FONTSALIAS%% fonts.alias.orig > fonts.alias + rm -f fonts.alias.orig +;; +esac Modified: head/japanese/font-elisa10/pkg-descr ============================================================================== --- head/japanese/elisa8x8/pkg-descr Sat Aug 22 13:27:34 2015 (r395030) +++ head/japanese/font-elisa10/pkg-descr Fri Sep 25 21:48:09 2015 (r397892) @@ -1,7 +1,3 @@ -Japanese 8 dot font named `elisa font'. +Elisa10 is Japanese 10 dot font based on Elisa 8-dot font. -You can use 'k8', 'r8', 'a8' as an alias for elisa font, 4x8 dots -jis.x0201 font, 4x8 dots iso8859-1 font. - -A simple usage: - % kterm -fn a8 -fr r8 -fk k8 +WWW: http://www.wheel.gr.jp/~dai/software/elisau10-doc.html Modified: head/japanese/font-elisa8/Makefile ============================================================================== --- head/japanese/elisa8x8/Makefile Fri Sep 25 19:29:48 2015 (r397867) +++ head/japanese/font-elisa8/Makefile Fri Sep 25 21:48:09 2015 (r397892) @@ -1,43 +1,42 @@ # Created by: Toshihiko SHIMOKAWA <toshi@tea.forus.or.jp> & ELISA Font Project # $FreeBSD$ -PORTNAME= elisa8x8 +PORTNAME= elisa8 PORTVERSION= 1.0 -PORTREVISION= 5 CATEGORIES= japanese x11-fonts MASTER_SITES= http://www.bsdbbq.org/~toshi/distfiles/ +PKGNAMEPREFIX= ja-font- DISTNAME= elisat10 MAINTAINER= toshi@tea.forus.or.jp -COMMENT= X11 8-dot Kanji font 'elisa font' +COMMENT= 8-dot Kanji font 'elisa' BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf USES= fonts +FONTNAME= misc +NO_ARCH= yes NO_WRKSUBDIR= yes - -BDFTOPCF_CMD= ${PREFIX}/bin/bdftopcf -MYPORTDOCS= elisa100.doc elisat10.doc elisat10.html +SUB_FILES= Makefile pkg-install +SUB_LIST= BDFTOPCF_CMD="${LOCALBASE}/bin/bdftopcf" \ + GZIP_CMD="${GZIP_CMD}" \ + FONTSALIAS="${DATADIR}/fonts.alias" +PKGINSTALL= ${WRKDIR}/pkg-install +PKGDEINSTALL= ${WRKDIR}/pkg-install +PORTDOCS= elisa100.doc elisat10.doc elisat10.html OPTIONS_DEFINE= DOCS -do-build: - @(cd ${WRKDIR}; \ - ${BDFTOPCF_CMD} elisat10.bdf | ${GZIP_CMD} -c > elisat10.pcf.gz ;\ - ${BDFTOPCF_CMD} jpnhn4-jis.bdf | ${GZIP_CMD} -c > jpnhn4-jis.pcf.gz ;\ - ${BDFTOPCF_CMD} jpnhn4-iso.bdf | ${GZIP_CMD} -c > jpnhn4-iso.pcf.gz ;\ - ) +pre-build: apply-slist -do-install: +post-install: @${MKDIR} ${STAGEDIR}${FONTSDIR} - (cd ${WRKSRC} ;\ - ${INSTALL_DATA} elisat10.pcf.gz ${STAGEDIR}${FONTSDIR} ; \ - ${INSTALL_DATA} jpnhn4-jis.pcf.gz ${STAGEDIR}${FONTSDIR} ; \ - ${INSTALL_DATA} jpnhn4-iso.pcf.gz ${STAGEDIR}${FONTSDIR} ; \ - ) + cd ${STAGEDIR}${FONTSDIR} && \ + ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz . + ${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${DATADIR} -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${MYPORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Added: head/japanese/font-elisa8/files/Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/japanese/font-elisa8/files/Makefile.in Fri Sep 25 21:48:09 2015 (r397892) @@ -0,0 +1,24 @@ +# $FreeBSD$ + +BDFTOPCF_CMD= %%BDFTOPCF_CMD%% +GZIP_CMD= %%GZIP_CMD%% + +SRCS= elisat10.bdf jpnhn4-jis.bdf jpnhn4-iso.bdf + +.for F in ${SRCS:R} +${F}.pcf.gz: ${F}.bdf + ${BDFTOPCF_CMD} ${.ALLSRC} | ${GZIP_CMD} -c > ${.TARGET} + +all: ${F}.pcf.gz +.endfor + +.for F in ${SRCS:R} +${DESTDIR}%%DATADIR%%/${F}.pcf.gz: ${F}.bdf + mkdir -p ${DESTDIR}%%DATADIR%% + ${BSD_INSTALL_DATA} ${.ALLSRC} ${.TARGET} + +install: ${DESTDIR}%%DATADIR%%/${F}.pcf.gz +.endfor + +all install: + @true Copied and modified: head/japanese/font-elisa8/files/fonts.alias (from r395030, head/japanese/elisa8x8/files/pkg-install.in) ============================================================================== --- head/japanese/elisa8x8/files/pkg-install.in Sat Aug 22 13:27:34 2015 (r395030, copy source) +++ head/japanese/font-elisa8/files/fonts.alias Fri Sep 25 21:48:09 2015 (r397892) @@ -1,34 +1,4 @@ -#!/bin/sh - -if [ "$2" != "POST-INSTALL" ]; then - exit 0 -fi - -FONTDIR=%%FONTSDIR%% - -grepv() { - awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2 -} - -# font alias entry here! -TMPFILE=/tmp/install-fonts-alias-$$ -cat << EOF > ${TMPFILE} k8 -elisa100-fixed-medium-r-normal--8-70-75-75-c-80-jisx0208.1983-0 r8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-jisx0201.1976-0 a8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1 4x8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1 -EOF - -echo "Updating ${FONTDIR}/fonts.alias" -cd ${FONTDIR} -touch fonts.alias -cp fonts.alias fonts.alias.orig -(grepv ${TMPFILE} fonts.alias.orig ; cat ${TMPFILE}) > fonts.alias -rm -f fonts.alias.orig ${TMPFILE} - -echo "**********************************************************" -echo "You should restart X server or do 'xset fp rehash' command" -echo "to enable this update." -echo "**********************************************************" - -exit 0 Modified: head/japanese/font-elisa8/files/pkg-install.in ============================================================================== --- head/japanese/elisa8x8/files/pkg-install.in Fri Sep 25 19:29:48 2015 (r397867) +++ head/japanese/font-elisa8/files/pkg-install.in Fri Sep 25 21:48:09 2015 (r397892) @@ -1,34 +1,23 @@ #!/bin/sh -if [ "$2" != "POST-INSTALL" ]; then - exit 0 -fi - -FONTDIR=%%FONTSDIR%% - grepv() { awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2 } -# font alias entry here! -TMPFILE=/tmp/install-fonts-alias-$$ -cat << EOF > ${TMPFILE} -k8 -elisa100-fixed-medium-r-normal--8-70-75-75-c-80-jisx0208.1983-0 -r8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-jisx0201.1976-0 -a8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1 -4x8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1 -EOF - -echo "Updating ${FONTDIR}/fonts.alias" -cd ${FONTDIR} -touch fonts.alias -cp fonts.alias fonts.alias.orig -(grepv ${TMPFILE} fonts.alias.orig ; cat ${TMPFILE}) > fonts.alias -rm -f fonts.alias.orig ${TMPFILE} - -echo "**********************************************************" -echo "You should restart X server or do 'xset fp rehash' command" -echo "to enable this update." -echo "**********************************************************" - -exit 0 +case $2 in +POST-INSTALL) + cd %%FONTSDIR%% + touch fonts.alias + cp fonts.alias fonts.alias.orig + (grepv %%FONTSALIAS%% fonts.alias.orig; cat %%FONTSALIAS%%) \ + > fonts.alias + rm -f fonts.alias.orig +;; +DEINSTALL) + cd %%FONTSDIR%% + touch fonts.alias + cp fonts.alias fonts.alias.orig + grepv %%FONTSALIAS%% fonts.alias.orig > fonts.alias + rm -f fonts.alias.orig +;; +esac Modified: head/japanese/font-elisa8/pkg-descr ============================================================================== --- head/japanese/elisa8x8/pkg-descr Fri Sep 25 19:29:48 2015 (r397867) +++ head/japanese/font-elisa8/pkg-descr Fri Sep 25 21:48:09 2015 (r397892) @@ -5,3 +5,5 @@ jis.x0201 font, 4x8 dots iso8859-1 font. A simple usage: % kterm -fn a8 -fr r8 -fk k8 + +WWW: http://hp.vector.co.jp/authors/VA002310/family.htm Modified: head/japanese/font-elisa8/pkg-plist ============================================================================== --- head/japanese/elisa8x8/pkg-plist Fri Sep 25 19:29:48 2015 (r397867) +++ head/japanese/font-elisa8/pkg-plist Fri Sep 25 21:48:09 2015 (r397892) @@ -1,6 +1,7 @@ +%%DATADIR%%/elisat10.pcf.gz +%%DATADIR%%/jpnhn4-jis.pcf.gz +%%DATADIR%%/jpnhn4-iso.pcf.gz +%%DATADIR%%/fonts.alias %%FONTSDIR%%/elisat10.pcf.gz %%FONTSDIR%%/jpnhn4-jis.pcf.gz %%FONTSDIR%%/jpnhn4-iso.pcf.gz -%%PORTDOCS%%%%DOCSDIR%%/elisa100.doc -%%PORTDOCS%%%%DOCSDIR%%/elisat10.doc -%%PORTDOCS%%%%DOCSDIR%%/elisat10.html Modified: head/japanese/font-kaname12/Makefile ============================================================================== --- head/japanese/k12/Makefile Fri Sep 25 19:29:48 2015 (r397867) +++ head/japanese/font-kaname12/Makefile Fri Sep 25 21:48:09 2015 (r397892) @@ -3,39 +3,42 @@ PORTNAME= kaname12 PORTVERSION= 1.1 -PORTREVISION= 5 CATEGORIES= japanese x11-fonts -MASTER_SITES= PORTS_JP +MASTER_SITES= LOCAL/hrs +PKGNAMEPREFIX= ja-font- DISTNAME= kaname_k12_bdf DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - knm_new_linux.tar.gz -EXTRACT_ONLY= knm_new_linux.tar.gz + knm_new_linux${EXTRACT_SUFX} MAINTAINER= CQG00620@nifty.ne.jp -COMMENT= X11 12-dot Kanji font +COMMENT= 12-dot Kanji font -USES= fonts BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf -WRKSRC= ${WRKDIR}/fonts - -MAKE_ENV= FONTSDIR=${FONTSDIR:S,${PREFIX},,g} MKDIR="${MKDIR}" -PLIST_SUB= FONTSDIR=${FONTSDIR} -DOCSDIR= ${PREFIX}/share/doc/k12 - -SUB_FILES= pkg-message +USES= fonts +FONTNAME= misc +NO_ARCH= yes +NO_WRKSUBDIR= yes +SUB_FILES= Makefile pkg-install +SUB_LIST= FONTSALIAS="${DATADIR}/fonts.alias" +MAKEFILE= ${WRKDIR}/Makefile +PORTDOCS= readme readme.kaname_bdf kaname.doc \ + readme.knm gijutsu-siryou.doc +PKGINSTALL= ${WRKDIR}/pkg-install +PKGDEINSTALL= ${WRKDIR}/pkg-install OPTIONS_DEFINE= DOCS -post-extract: - @${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} +pre-build: apply-slist post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${FILESDIR}/fonts.alias \ - ${STAGEDIR}${FONTSDIR} - ${INSTALL_DATA} ${WRKSRC}/readme ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/readme.kaname_bdf ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc.orig/* ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${FONTSDIR} + cd ${STAGEDIR}${FONTSDIR} && \ + ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz . + +post-install-DOCS-on: + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install-doc .include <bsd.port.mk> Copied and modified: head/japanese/font-kaname12/files/Makefile.in (from r397867, head/japanese/k12/files/patch-aa) ============================================================================== --- head/japanese/k12/files/patch-aa Fri Sep 25 19:29:48 2015 (r397867, copy source) +++ head/japanese/font-kaname12/files/Makefile.in Fri Sep 25 21:48:09 2015 (r397892) @@ -1,15 +1,30 @@ ---- Makefile.orig 2014-05-08 22:08:32.000000000 +0900 -+++ Makefile 2014-05-08 22:10:13.000000000 +0900 -@@ -0,0 +1,12 @@ -+all: -+ bdftopcf knmhn12x.bdf > knmhn12x.pcf -+ gzip -9 -nf knmhn12x.pcf -+install: -+ if [ ! -d ${DESTDIR}${PREFIX}/${FONTSDIR} ] ; then \ -+ ${MKDIR} ${DESTDIR}${PREFIX}/${FONTSDIR} ; fi -+ ${BSD_INSTALL_DATA} kaname-latin1.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR} -+ ${BSD_INSTALL_DATA} knm12p.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR} -+ ${BSD_INSTALL_DATA} knm12pb.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR} -+ ${BSD_INSTALL_DATA} knmhn12x.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR} -+ ${BSD_INSTALL_DATA} knmzn12x.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR} -+ ${BSD_INSTALL_DATA} knmzn12xb.pcf.gz ${DESTDIR}${PREFIX}/${FONTSDIR} +PCF= kaname-latin1.pcf.gz knm12p.pcf.gz knm12pb.pcf.gz \ + knmhn12x.pcf.gz knmzn12x.pcf.gz knmzn12xb.pcf.gz + +DOCS= readme readme.kaname_bdf kaname.doc readme.knm \ + gijutsu-siryou.doc + +.PATH: fonts doc.orig + +knmhn12x.pcf.gz: knmhn12x.bdf + bdftopcf ${.ALLSRC} | gzip -9 > ${.TARGET} + +.for F in ${PCF} +${DESTDIR}%%DATADIR%%/$F: $F + mkdir -p ${DESTDIR}%%DATADIR%% + ${BSD_INSTALL_DATA} ${.ALLSRC} ${.TARGET} + +install: ${DESTDIR}%%DATADIR%%/$F +all: ${F} +.endfor + +.for F in ${DOCS} +${DESTDIR}%%DOCSDIR%%/$F: $F + mkdir -p ${DESTDIR}%%DOCSDIR%% + ${BSD_INSTALL_DATA} ${.ALLSRC} ${.TARGET} + +install-doc: ${DESTDIR}%%DOCSDIR%%/$F +.endfor + +all install install-doc: + @true Copied and modified: head/japanese/font-kaname12/files/patch-readme.kaname_bdf (from r395030, head/japanese/k12/files/patch-ab) ============================================================================== --- head/japanese/k12/files/patch-ab Sat Aug 22 13:27:34 2015 (r395030, copy source) +++ head/japanese/font-kaname12/files/patch-readme.kaname_bdf Fri Sep 25 21:48:09 2015 (r397892) @@ -1,19 +1,11 @@ -*** readme.kaname_bdf.orig Sat Jul 6 12:02:19 1996 ---- readme.kaname_bdf Sat Jul 6 12:02:25 1996 -*************** -*** 2,8 **** - - readme.kaname_bdf $@$3$N%U%!%$%k(J - knmhn12x.bdf X11$@MQ$N(J6x12$@%I%C%H$N(JJISX0201.1976$@%U%)%s%H(J -! knmhz12x.bdf X11$@MQ$N(J12x12$@%I%C%H$N(JJISX0208.1983$@%U%)%s%H(J - doc.orig/* $@85$N%"!<%+%$%V$K4^$^$l$F$$$?%I%-%e%a%s%H(J - $@$3$N(J12$@%I%C%H4A;z%U%)%s%H$O!"K~3+@=:n=j(J($@"((J)$@$N3$O786M&;N;a$K(J - $@$h$C$F:n$i$l$?(J X68000 SX-Windows $@MQ$N%U%j!<$N%U%)%s%H$r(J ---- 2,8 ---- - - readme.kaname_bdf $@$3$N%U%!%$%k(J - knmhn12x.bdf X11$@MQ$N(J6x12$@%I%C%H$N(JJISX0201.1976$@%U%)%s%H(J -! knmzn12x.bdf X11$@MQ$N(J12x12$@%I%C%H$N(JJISX0208.1983$@%U%)%s%H(J - doc.orig/* $@85$N%"!<%+%$%V$K4^$^$l$F$$$?%I%-%e%a%s%H(J - $@$3$N(J12$@%I%C%H4A;z%U%)%s%H$O!"K~3+@=:n=j(J($@"((J)$@$N3$O786M&;N;a$K(J - $@$h$C$F:n$i$l$?(J X68000 SX-Windows $@MQ$N%U%j!<$N%U%)%s%H$r(J +--- readme.kaname_bdf.orig 1994-01-25 03:44:09 UTC ++++ readme.kaname_bdf +@@ -2,7 +2,7 @@ + + readme.kaname_bdf $@$3$N%U%!%$%k(J + knmhn12x.bdf X11$@MQ$N(J6x12$@%I%C%H$N(JJISX0201.1976$@%U%)%s%H(J +-knmhz12x.bdf X11$@MQ$N(J12x12$@%I%C%H$N(JJISX0208.1983$@%U%)%s%H(J ++knmzn12x.bdf X11$@MQ$N(J12x12$@%I%C%H$N(JJISX0208.1983$@%U%)%s%H(J + doc.orig/* $@85$N%"!<%+%$%V$K4^$^$l$F$$$?%I%-%e%a%s%H(J + $@$3$N(J12$@%I%C%H4A;z%U%)%s%H$O!"K~3+@=:n=j(J($@"((J)$@$N3$O786M&;N;a$K(J + $@$h$C$F:n$i$l$?(J X68000 SX-Windows $@MQ$N%U%j!<$N%U%)%s%H$r(J Copied and modified: head/japanese/font-kaname12/files/pkg-install.in (from r395030, head/japanese/elisa8x8/files/pkg-install.in) ============================================================================== --- head/japanese/elisa8x8/files/pkg-install.in Sat Aug 22 13:27:34 2015 (r395030, copy source) +++ head/japanese/font-kaname12/files/pkg-install.in Fri Sep 25 21:48:09 2015 (r397892) @@ -1,34 +1,23 @@ #!/bin/sh -if [ "$2" != "POST-INSTALL" ]; then - exit 0 -fi - -FONTDIR=%%FONTSDIR%% - grepv() { awk -v SRC=$1 'BEGIN{while (getline < SRC) {ENTRY[$0]=1}} (ENTRY[$0] != 1) {print}' $2 } -# font alias entry here! -TMPFILE=/tmp/install-fonts-alias-$$ -cat << EOF > ${TMPFILE} -k8 -elisa100-fixed-medium-r-normal--8-70-75-75-c-80-jisx0208.1983-0 -r8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-jisx0201.1976-0 -a8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1 -4x8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1 -EOF - -echo "Updating ${FONTDIR}/fonts.alias" -cd ${FONTDIR} -touch fonts.alias -cp fonts.alias fonts.alias.orig -(grepv ${TMPFILE} fonts.alias.orig ; cat ${TMPFILE}) > fonts.alias -rm -f fonts.alias.orig ${TMPFILE} - -echo "**********************************************************" -echo "You should restart X server or do 'xset fp rehash' command" -echo "to enable this update." -echo "**********************************************************" - -exit 0 +case $2 in +POST-INSTALL) + cd %%FONTSDIR%% + touch fonts.alias + cp fonts.alias fonts.alias.orig + (grepv %%FONTSALIAS%% fonts.alias.orig; cat %%FONTSALIAS%%) \ + > fonts.alias + rm -f fonts.alias.orig +;; +DEINSTALL) + cd %%FONTSDIR%% + touch fonts.alias + cp fonts.alias fonts.alias.orig + grepv %%FONTSALIAS%% fonts.alias.orig > fonts.alias + rm -f fonts.alias.orig +;; +esac Modified: head/japanese/font-kaname12/pkg-plist ============================================================================== --- head/japanese/k12/pkg-plist Fri Sep 25 19:29:48 2015 (r397867) +++ head/japanese/font-kaname12/pkg-plist Fri Sep 25 21:48:09 2015 (r397892) @@ -1,12 +1,13 @@ -%%FONTSDIR%%/fonts.alias +%%DATADIR%%/fonts.alias %%FONTSDIR%%/kaname-latin1.pcf.gz %%FONTSDIR%%/knm12p.pcf.gz %%FONTSDIR%%/knm12pb.pcf.gz %%FONTSDIR%%/knmhn12x.pcf.gz %%FONTSDIR%%/knmzn12x.pcf.gz %%FONTSDIR%%/knmzn12xb.pcf.gz -%%PORTDOCS%%%%DOCSDIR%%/gijutsu-siryou.doc -%%PORTDOCS%%%%DOCSDIR%%/kaname.doc -%%PORTDOCS%%%%DOCSDIR%%/readme -%%PORTDOCS%%%%DOCSDIR%%/readme.kaname_bdf -%%PORTDOCS%%%%DOCSDIR%%/readme.knm +%%DATADIR%%/kaname-latin1.pcf.gz +%%DATADIR%%/knm12p.pcf.gz +%%DATADIR%%/knm12pb.pcf.gz +%%DATADIR%%/knmhn12x.pcf.gz +%%DATADIR%%/knmzn12x.pcf.gz +%%DATADIR%%/knmzn12xb.pcf.gz Modified: head/japanese/font-kanji18/Makefile ============================================================================== --- head/japanese/kanji18/Makefile Fri Sep 25 19:29:48 2015 (r397867) +++ head/japanese/font-kanji18/Makefile Fri Sep 25 21:48:09 2015 (r397892) @@ -2,60 +2,64 @@ # $FreeBSD$ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509252148.t8PLmA2W064951>