diff options
author | SADA Kenji <sada@FreeBSD.org> | 1998-11-20 20:24:53 +0000 |
---|---|---|
committer | SADA Kenji <sada@FreeBSD.org> | 1998-11-20 20:24:53 +0000 |
commit | b8375289e0211135ad73e655379653c9b91a69eb (patch) | |
tree | 2d15a3ea6edecd43db1e53e9bf0e9714f2fafbf5 | |
parent | japanize patch location/filename changed. (diff) |
Reallocate the font directory (misc->local),
following the change in XFree86 3.3.3.
Submitted by: Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
Notes
Notes:
svn path=/head/; revision=14722
-rw-r--r-- | japanese/elisa10x8/Makefile | 11 | ||||
-rw-r--r-- | japanese/elisa10x8/files/patch-aa | 17 | ||||
-rw-r--r-- | japanese/elisa10x8/pkg-plist | 11 | ||||
-rw-r--r-- | japanese/elisa10x8/pkg-req | 45 | ||||
-rw-r--r-- | japanese/elisa8x8/Makefile | 37 | ||||
-rw-r--r-- | japanese/elisa8x8/pkg-plist | 19 | ||||
-rw-r--r-- | japanese/elisa8x8/pkg-req | 48 | ||||
-rw-r--r-- | japanese/k10/Makefile | 11 | ||||
-rw-r--r-- | japanese/k10/files/patch-aa | 27 | ||||
-rw-r--r-- | japanese/k10/pkg-descr | 2 | ||||
-rw-r--r-- | japanese/k10/pkg-plist | 17 | ||||
-rw-r--r-- | japanese/k10/pkg-req | 49 | ||||
-rw-r--r-- | japanese/k12/Makefile | 19 | ||||
-rw-r--r-- | japanese/k12/files/patch-aa | 14 | ||||
-rw-r--r-- | japanese/k12/pkg-descr | 9 | ||||
-rw-r--r-- | japanese/k12/pkg-plist | 19 | ||||
-rw-r--r-- | japanese/k12/pkg-req | 48 | ||||
-rw-r--r-- | japanese/kappa20/Makefile | 20 | ||||
-rw-r--r-- | japanese/kappa20/files/patch-aa | 96 | ||||
-rw-r--r-- | japanese/kappa20/files/patch-ab | 40 | ||||
-rw-r--r-- | japanese/kappa20/pkg-plist | 22 | ||||
-rw-r--r-- | japanese/kappa20/pkg-req | 64 |
22 files changed, 405 insertions, 240 deletions
diff --git a/japanese/elisa10x8/Makefile b/japanese/elisa10x8/Makefile index 151355ba2ffa..e0d55100917d 100644 --- a/japanese/elisa10x8/Makefile +++ b/japanese/elisa10x8/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Sep 1997 # Whom: Dai ISHIJIMA & ELISA Font Project <ishijima@tri.pref.osaka.jp> # -# $Id: Makefile,v 1.3 1998/08/07 22:43:05 asami Exp $ +# $Id: Makefile,v 1.4 1998/09/24 14:42:58 kuriyama Exp $ # DISTNAME= ja-elisa8-1.0 @@ -21,9 +21,16 @@ USE_X_PREFIX= yes NO_WRKSUBDIR= yes EXTRACT_ONLY= elisau10.tgz -MAKE_ENV+= DISTDIR=${DISTDIR} +FONTSDIR= lib/X11/fonts/local +MAKE_ENV= DISTDIR=${DISTDIR} FONTSDIR=${FONTSDIR} +PLIST_SUB= FONTSDIR=${FONTSDIR} + +pre-install: + @${SETENV} PKG_PREFIX=${PREFIX} \ + ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL post-install: + @(cd ${PREFIX}/${FONTSDIR} ; mkfontdir) .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/elisa8 @${CP} ${WRKSRC}/elisa100.doc ${PREFIX}/share/doc/elisa8/ diff --git a/japanese/elisa10x8/files/patch-aa b/japanese/elisa10x8/files/patch-aa index 15fabb990758..f43b75e711e0 100644 --- a/japanese/elisa10x8/files/patch-aa +++ b/japanese/elisa10x8/files/patch-aa @@ -2,19 +2,14 @@ --- Makefile Fri Sep 26 15:43:17 1997 *************** *** 0 **** ---- 1,15 ---- +--- 1,10 ---- + all: -+ bdftopcf elisau10.bdf | compress > elisau10.pcf.Z ++ bdftopcf elisau10.bdf | gzip -c > elisau10.pcf.gz + cp ${DISTDIR}/clR5x8.bdf . + patch --quiet < clR5x8-s5x8.diff -+ bdftopcf clR5x8.bdf | compress > clR5x8.pcf.Z ++ bdftopcf clR5x8.bdf | gzip -c > clR5x8.pcf.gz + + install: -+ mkdir -p ${PREFIX}/lib/X11/fonts/misc -+ cp elisau10.pcf.Z ${PREFIX}/lib/X11/fonts/misc/ -+ cp clR5x8.pcf.Z ${PREFIX}/lib/X11/fonts/misc/ -+ cd ${PREFIX}/lib/X11/fonts/misc/ ; mkfontdir ; \ -+ touch fonts.alias ; cp fonts.alias fonts.alias.orig ; \ -+ (cat fonts.alias.orig ; \ -+ echo "elisa -elisa-fixed-medium-r-normal--10-70-75-75-c-100-jisx0208.1983-0" ; echo "s5x8 -schumacher-descent2clean-medium-r-normal--8-80-75-75-c-50-iso646.1991-irv") > fonts.alias ; \ -+ rm fonts.alias.orig ++ [ -d ${PREFIX}/${FONTSDIR} ] || mkdir -p ${PREFIX}/${FONTSDIR} ++ cp elisau10.pcf.gz ${PREFIX}/${FONTSDIR} ++ cp clR5x8.pcf.gz ${PREFIX}/${FONTSDIR} diff --git a/japanese/elisa10x8/pkg-plist b/japanese/elisa10x8/pkg-plist index bdf949bc8404..3ee9e0aa71a3 100644 --- a/japanese/elisa10x8/pkg-plist +++ b/japanese/elisa10x8/pkg-plist @@ -1,11 +1,8 @@ -lib/X11/fonts/misc/elisau10.pcf.Z -lib/X11/fonts/misc/clR5x8.pcf.Z +%%FONTSDIR%%/elisau10.pcf.gz +%%FONTSDIR%%/clR5x8.pcf.gz share/doc/elisa8/elisa100.doc share/doc/elisa8/elisau10.doc share/doc/elisa8/hosoku.txt -@exec cd %D/lib/X11/fonts/misc ; mkfontdir -@exec echo "Updating misc/fonts.alias" -@exec cd %D/lib/X11/fonts/misc ; touch fonts.alias ; cp fonts.alias fonts.alias.orig ; (cat fonts.alias.orig ; echo "elisa -elisa-fixed-medium-r-normal--10-70-75-75-c-100-jisx0208.1983-0" ; echo "s5x8 -schumacher-descent2clean-medium-r-normal--8-80-75-75-c-50-iso646.1991-irv") > fonts.alias ; rm fonts.alias.orig -@unexec cd %D/lib/X11/fonts/misc ; mkfontdir -@unexec echo "updating fonts.alias" ; cd %D/lib/X11/fonts/misc; cp fonts.alias fonts.alias.orig; grep -v 'elisa\-fixed\-medium\-r\-normal' fonts.alias.orig | grep -v 'schumacher\-descent2clean\-medium\-r\-normal' > fonts.alias; rm fonts.alias.orig +@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir +@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir @dirrm share/doc/elisa8 diff --git a/japanese/elisa10x8/pkg-req b/japanese/elisa10x8/pkg-req new file mode 100644 index 000000000000..7d965af812dd --- /dev/null +++ b/japanese/elisa10x8/pkg-req @@ -0,0 +1,45 @@ +#!/bin/sh +if [ "x$1" = "x" ]; then + exit 1; +fi +if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then + exit 1; +fi + +export FONTDIR; FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local + +if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then + echo '**********************************************************************' + echo "****** ${FONTDIR}/ doesn't exist." + echo "****** Creating ${FONTDIR}/" + echo '****** Please upgrade your XFree86 to 3.3.3 or upper,' + echo "****** or add this directory to your /etc/XF86Config's FontPath entry." + echo '**********************************************************************' + mkdir ${FONTDIR} +fi + +# font alias entry here! +TMPFILE=/tmp/install-fonts-alias-$$ +cat << EOF > ${TMPFILE} +elisa -elisa-fixed-medium-r-normal--10-70-75-75-c-100-jisx0208.1983-0 +s5x8 -schumacher-descent2clean-medium-r-normal--8-80-75-75-c-50-iso646.1991-irv +EOF + +echo "Updating ${FONTDIR}/fonts.alias" +cd ${FONTDIR} +touch fonts.alias ${TMPFILE} +cp fonts.alias fonts.alias.orig +if [ "$2" = "INSTALL" ] ; then + (grep -v -e "`cat ${TMPFILE}`" fonts.alias.orig; \ + cat ${TMPFILE}) > fonts.alias +elif [ "$2" = "DEINSTALL" ] ; then + grep -v -e "`cat ${TMPFILE}`" fonts.alias.orig > fonts.alias +fi +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; diff --git a/japanese/elisa8x8/Makefile b/japanese/elisa8x8/Makefile index daf71c15bea5..4e0115b79f37 100644 --- a/japanese/elisa8x8/Makefile +++ b/japanese/elisa8x8/Makefile @@ -3,7 +3,7 @@ # Date created: 17 Aug. 1998 # Whom: Toshihiko SHIMOKAWA <toshi@tea.forus.or.jp> & ELISA Font Project # -# $Id$ +# $Id: Makefile,v 1.1.1.1 1998/09/18 22:49:25 kuriyama Exp $ # DISTNAME= elisat10 @@ -18,43 +18,38 @@ NO_WRKSUBDIR= yes BDFTOPCF_CMD= ${PREFIX}/bin/bdftopcf MKFONTDIR_CMD= ${PREFIX}/bin/mkfontdir -FONTSDIR= ${PREFIX}/lib/X11/fonts/misc +FONTSDIR= lib/X11/fonts/local +INSTALLDIR= ${PREFIX}/${FONTSDIR} DOCDIR= ${PREFIX}/share/doc/elisa PORTDOCS= elisa100.doc elisat10.doc elisat10.html +PLIST_SUB= FONTSDIR=${FONTSDIR} do-build: @(cd ${WRKDIR}; \ - ${BDFTOPCF_CMD} elisat10.bdf | ${GZIP_CMD} -9 > elisat10.pcf.gz ;\ - ${BDFTOPCF_CMD} jpnhn4-jis.bdf | ${GZIP_CMD} -9 > jpnhn4-jis.pcf.gz ;\ - ${BDFTOPCF_CMD} jpnhn4-iso.bdf | ${GZIP_CMD} -9 > jpnhn4-iso.pcf.gz ;\ + ${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-install: + @${SETENV} PKG_PREFIX=${PREFIX} \ + ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + do-install: - @${MKDIR} ${FONTSDIR} ${DOCDIR} + @${MKDIR} ${INSTALLDIR} ${DOCDIR} @(cd ${WRKSRC} ;\ - ${INSTALL_DATA} elisat10.pcf.gz ${FONTSDIR} ;\ - ${INSTALL_DATA} jpnhn4-jis.pcf.gz ${FONTSDIR} ;\ - ${INSTALL_DATA} jpnhn4-iso.pcf.gz ${FONTSDIR} ;\ - ${INSTALL_DATA} ${PORTDOCS} ${DOCDIR} ;\ - ${ECHO} "Updating fonts.dir" ;\ - ${MKFONTDIR_CMD} ${FONTSDIR} ;\ - ${ECHO} "Updating fonts.alias" ;\ - ${TOUCH} ${FONTSDIR}/fonts.alias ;\ - ${CAT} ${FONTSDIR}/fonts.alias fonts.alias > fonts.alias.tmp ;\ - ${INSTALL_DATA} fonts.alias.tmp ${FONTSDIR} ;\ - ${MV} -f ${FONTSDIR}/fonts.alias.tmp ${FONTSDIR}/fonts.alias ;\ + ${INSTALL_DATA} elisat10.pcf.gz ${INSTALLDIR} ;\ + ${INSTALL_DATA} jpnhn4-jis.pcf.gz ${INSTALLDIR} ;\ + ${INSTALL_DATA} jpnhn4-iso.pcf.gz ${INSTALLDIR} ;\ ) post-install: + @(cd ${PREFIX}/${FONTSDIR} ; mkfontdir) .if !defined(NOPORTDOCS) @${MKDIR} ${DOCDIR} @(cd ${WRKSRC} ;\ ${INSTALL_DATA} ${PORTDOCS} ${DOCDIR} ;\ ) .endif - @${ECHO} "**********************************************************" - @${ECHO} "You should restart X server or do 'xset fp rehash' command" - @${ECHO} "to use installed fonts." - @${ECHO} "**********************************************************" .include <bsd.port.mk> diff --git a/japanese/elisa8x8/pkg-plist b/japanese/elisa8x8/pkg-plist index cd4096aa5957..6ab9a5be9206 100644 --- a/japanese/elisa8x8/pkg-plist +++ b/japanese/elisa8x8/pkg-plist @@ -1,18 +1,9 @@ -lib/X11/fonts/misc/elisat10.pcf.gz -lib/X11/fonts/misc/jpnhn4-jis.pcf.gz -lib/X11/fonts/misc/jpnhn4-iso.pcf.gz +%%FONTSDIR%%/elisat10.pcf.gz +%%FONTSDIR%%/jpnhn4-jis.pcf.gz +%%FONTSDIR%%/jpnhn4-iso.pcf.gz share/doc/elisa/elisa100.doc share/doc/elisa/elisat10.doc share/doc/elisa/elisat10.html -@exec echo "Updating fonts.dir" -@exec mkfontdir %D/lib/X11/fonts/misc -@exec echo "Updating fonts.alias" -@exec cd %D/lib/X11/fonts/misc ; touch fonts.alias ; cp fonts.alias fonts.alias.orig ; (cat fonts.alias.orig ; echo "k8 -elisa100-fixed-medium-r-normal--8-70-75-75-c-80-jisx0208.1983-0" ; echo "r8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-jisx0201.1976-0"; echo "a8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1"; echo "4x8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1" ) > fonts.alias ; rm fonts.alias.orig -@unexec echo "Updating fonts.dir" -@unexec mkfontdir %D/lib/X11/fonts/misc -@unexec echo "updating fonts.alias" ; cd %D/lib/X11/fonts/misc; cp fonts.alias fonts.alias.orig; grep -v 'elisa100\-fixed\-medium\-r\-normal' fonts.alias.orig | grep -v 'hiro\-fixed\-medium\-r\-normal' > fonts.alias; rm fonts.alias.orig -@exec echo "**********************************************************" -@exec echo "You should restart X server or do 'xset fp rehash' command" -@exec echo "to use installed fonts." -@exec echo "**********************************************************" +@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir +@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir @dirrm share/doc/elisa diff --git a/japanese/elisa8x8/pkg-req b/japanese/elisa8x8/pkg-req new file mode 100644 index 000000000000..9c2d05cb9f7b --- /dev/null +++ b/japanese/elisa8x8/pkg-req @@ -0,0 +1,48 @@ +#!/bin/sh + +if [ "x$1" = "x" ]; then + exit 1; +fi +if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then + exit 1; +fi + +export FONTDIR; FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local + +if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then + echo '**********************************************************************' + echo "****** ${FONTDIR}/ doesn't exist." + echo "****** Creating ${FONTDIR}/" + echo '****** Please upgrade your XFree86 to 3.3.3 or upper,' + echo "****** or add this directory to your /etc/XF86Config's FontPath entry." + echo '**********************************************************************' + mkdir ${FONTDIR} +fi + +# 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 +if [ "$2" = "INSTALL" ] ; then + (grep -v -e "`cat ${TMPFILE}`" fonts.alias.orig ; \ + cat ${TMPFILE}) > fonts.alias +elif [ "$2" = "DEINSTALL" ] ; then + grep -v -e "`cat ${TMPFILE}`" fonts.alias.orig > fonts.alias +fi +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; diff --git a/japanese/k10/Makefile b/japanese/k10/Makefile index 76ab81e0b969..4def7870534e 100644 --- a/japanese/k10/Makefile +++ b/japanese/k10/Makefile @@ -3,7 +3,7 @@ # Date created: 25 Feb 1998 # Whom: Eiji-usagi-MATSUmoto <usagi@ruby.club.or.jp> # -# $Id: Makefile,v 1.3 1998/08/05 09:31:17 asami Exp $ +# $Id: Makefile,v 1.4 1998/08/07 22:43:07 asami Exp $ # DISTNAME= knj10-1.00 @@ -16,7 +16,16 @@ MAINTAINER= usagi@clave.gr.jp USE_X_PREFIX= yes WRKSRC= ${WRKDIR}/knj10-1.00 +FONTSDIR= lib/X11/fonts/local +MAKE_ENV= FONTSDIR=${FONTSDIR} +PLIST_SUB= FONTSDIR=${FONTSDIR} + +pre-install: + @${SETENV} PKG_PREFIX=${PREFIX} \ + ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + post-install: + @(cd ${PREFIX}/${FONTSDIR} ; mkfontdir) .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/naga10 @${CP} ${WRKSRC}/README ${PREFIX}/share/doc/naga10/ diff --git a/japanese/k10/files/patch-aa b/japanese/k10/files/patch-aa index d40eabc6f799..18a1604efdb3 100644 --- a/japanese/k10/files/patch-aa +++ b/japanese/k10/files/patch-aa @@ -1,22 +1,17 @@ --- /dev/null Wed Feb 25 11:48:19 1998 +++ Makefile Wed Feb 25 11:46:18 1998 -@@ -0,0 +1,19 @@ +@@ -0,0 +1,14 @@ +all: -+ bdftopcf 5x10B.bdf | compress > 5x10B.pcf.Z -+ bdftopcf 5x10a.bdf | compress > 5x10a.pcf.Z -+ bdftopcf 5x10rk.bdf | compress > 5x10rk.pcf.Z -+ bdftopcf knj10.bdf | compress > knj10.pcf.Z -+ bdftopcf knj10B.bdf | compress > knj10B.pcf.Z ++ bdftopcf 5x10B.bdf | gzip -c > 5x10B.pcf.gz ++ bdftopcf 5x10a.bdf | gzip -c > 5x10a.pcf.gz ++ bdftopcf 5x10rk.bdf | gzip -c > 5x10rk.pcf.gz ++ bdftopcf knj10.bdf | gzip -c > knj10.pcf.gz ++ bdftopcf knj10B.bdf | gzip -c > knj10B.pcf.gz + +install: + mkdir -p ${PREFIX}/lib/X11/fonts/misc -+ cp 5x10B.pcf.Z ${PREFIX}/lib/X11/fonts/misc/ -+ cp 5x10a.pcf.Z ${PREFIX}/lib/X11/fonts/misc/ -+ cp 5x10rk.pcf.Z ${PREFIX}/lib/X11/fonts/misc/ -+ cp knj10.pcf.Z ${PREFIX}/lib/X11/fonts/misc/ -+ cp knj10B.pcf.Z ${PREFIX}/lib/X11/fonts/misc/ -+ cp fonts.alias.naga10 ${PREFIX}/lib/X11/fonts/misc/ -+ cd ${PREFIX}/lib/X11/fonts/misc/ ; mkfontdir ; \ -+ touch fonts.alias ; cp fonts.alias fonts.alias.orig ; \ -+ cat fonts.alias.orig fonts.alias.naga10 > fonts.alias; \ -+ rm fonts.alias.orig fonts.alias.naga10 ++ cp 5x10B.pcf.gz ${PREFIX}/${FONTSDIR} ++ cp 5x10a.pcf.gz ${PREFIX}/${FONTSDIR} ++ cp 5x10rk.pcf.gz ${PREFIX}/${FONTSDIR} ++ cp knj10.pcf.gz ${PREFIX}/${FONTSDIR} ++ cp knj10B.pcf.gz ${PREFIX}/${FONTSDIR} diff --git a/japanese/k10/pkg-descr b/japanese/k10/pkg-descr index df89b1684009..01703602e71a 100644 --- a/japanese/k10/pkg-descr +++ b/japanese/k10/pkg-descr @@ -1,6 +1,6 @@ Japanese 10 dot font named `naga10'. -You can use 'k10' as an alias for knj10.pcf.Z, and 'a10' for 5x10a.pcf.Z. +You can use 'k10' as an alias for knj10.pcf.gz, and 'a10' for 5x10a.pcf.gz. For detail description, please read the 'README' A simple usage: diff --git a/japanese/k10/pkg-plist b/japanese/k10/pkg-plist index 90be55f9ac99..c6eeff8c1142 100644 --- a/japanese/k10/pkg-plist +++ b/japanese/k10/pkg-plist @@ -1,12 +1,9 @@ -lib/X11/fonts/misc/5x10B.pcf.Z -lib/X11/fonts/misc/5x10a.pcf.Z -lib/X11/fonts/misc/5x10rk.pcf.Z -lib/X11/fonts/misc/knj10.pcf.Z -lib/X11/fonts/misc/knj10B.pcf.Z +%%FONTSDIR%%/5x10B.pcf.gz +%%FONTSDIR%%/5x10a.pcf.gz +%%FONTSDIR%%/5x10rk.pcf.gz +%%FONTSDIR%%/knj10.pcf.gz +%%FONTSDIR%%/knj10B.pcf.gz share/doc/naga10/README -@exec cd %D/lib/X11/fonts/misc ; mkfontdir -@exec echo "Updating misc/fonts.alias" -@exec cd %D/lib/X11/fonts/misc ; touch fonts.alias ; cp fonts.alias fonts.alias.orig ; (cat fonts.alias.orig ; echo "k10 -misc-fixed-medium-r-normal--10-90-75-75-c-100-jisx0208.1983-0" ; echo "k10b -misc-fixed-bold-r-normal--10-90-75-75-c-100-jisx0208.1983-0" ; echo "a10 -misc-fixed-medium-r-normal--10-90-75-75-c-50-iso8859-1" ; echo "a10b -misc-fixed-bold-r-normal--10-90-75-75-c-50-iso8859-1" ; echo "r10 -misc-fixed-medium-r-normal--10-90-75-75-c-50-jisx0201.1976-0") > fonts.alias ; rm fonts.alias.orig -@unexec cd %D/lib/X11/fonts/misc ; mkfontdir -@unexec echo "updating fonts.alias" ; cd %D/lib/X11/fonts/misc; cp fonts.alias fonts.alias.orig; grep -v 'misc\-fixed\-medium\-r\-normal\-\-10' fonts.alias.orig | grep -v 'misc\-fixed\-bold\-r\-normal\-\-10' > fonts.alias; rm fonts.alias.orig +@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir +@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir @dirrm share/doc/naga10 diff --git a/japanese/k10/pkg-req b/japanese/k10/pkg-req new file mode 100644 index 000000000000..74130b3ca77e --- /dev/null +++ b/japanese/k10/pkg-req @@ -0,0 +1,49 @@ +#!/bin/sh + +if [ "x$1" = "x" ]; then + exit 1; +fi +if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then + exit 1; +fi + +export FONTDIR; FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local + +if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then + echo '**********************************************************************' + echo "****** ${FONTDIR}/ doesn't exist." + echo "****** Creating ${FONTDIR}/" + echo '****** Please upgrade your XFree86 to 3.3.3 or upper,' + echo "****** or add this directory to your /etc/XF86Config's FontPath entry." + echo '**********************************************************************' + mkdir ${FONTDIR} +fi + +# font alias entry here! +TMPFILE=/tmp/install-fonts-alias-$$ +cat << EOF > ${TMPFILE} +k10 -misc-fixed-medium-r-normal--10-90-75-75-c-100-jisx0208.1983-0 +k10b -misc-fixed-bold-r-normal--10-90-75-75-c-100-jisx0208.1983-0 +a10 -misc-fixed-medium-r-normal--10-90-75-75-c-50-iso8859-1 +a10b -misc-fixed-bold-r-normal--10-90-75-75-c-50-iso8859-1 +r10 -misc-fixed-medium-r-normal--10-90-75-75-c-50-jisx0201.1976-0 +EOF + +echo "Updating ${FONTDIR}/fonts.alias" +cd ${FONTDIR} +touch fonts.alias +cp fonts.alias fonts.alias.orig +if [ "$2" = "INSTALL" ] ; then + (grep -v -e "`cat ${TMPFILE}`" fonts.alias.orig ; \ + cat ${TMPFILE}) > fonts.alias +elif [ "$2" = "DEINSTALL" ] ; then + grep -v -e "`cat ${TMPFILE}`" fonts.alias.orig > fonts.alias +fi +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; diff --git a/japanese/k12/Makefile b/japanese/k12/Makefile index 91dc6ef92cc7..d703bcc95d43 100644 --- a/japanese/k12/Makefile +++ b/japanese/k12/Makefile @@ -3,11 +3,11 @@ # Date created: 24 June 1996 # Whom: Mita Yoshio <mita@jp.FreeBSD.org> # -# $Id: Makefile,v 1.5 1998/08/05 09:31:18 asami Exp $ +# $Id: Makefile,v 1.6 1998/08/07 22:43:07 asami Exp $ # DISTNAME= kaname_k12_bdf -PKGNAME= ja-k12font-1.0 +PKGNAME= ja-kaname12-1.0 CATEGORIES= japanese x11-fonts MASTER_SITES= ftp://ftp.noc.titech.ac.jp/pub/tmp/aki/FreeBSD/etc/ @@ -16,7 +16,20 @@ MAINTAINER= mita@jp.FreeBSD.org USE_X_PREFIX= yes NO_WRKSUBDIR= yes +FONTSDIR= lib/X11/fonts/local +MAKE_ENV= FONTSDIR=${FONTSDIR} +PLIST_SUB= FONTSDIR=${FONTSDIR} + +pre-install: + @${SETENV} PKG_PREFIX=${PREFIX} \ + ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + post-install: - @${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL + @(cd ${PREFIX}/${FONTSDIR} ; mkfontdir) +.if !defined(NOPORTDOCS) + @${MKDIR} ${PREFIX}/share/doc/k12 + @${CP} ${WRKSRC}/readme.kaname_bdf ${PREFIX}/share/doc/k12 + @${CP} ${WRKSRC}/doc.orig/* ${PREFIX}/share/doc/k12 +.endif .include <bsd.port.mk> diff --git a/japanese/k12/files/patch-aa b/japanese/k12/files/patch-aa index 2774dd9ee3cd..4bad7d503322 100644 --- a/japanese/k12/files/patch-aa +++ b/japanese/k12/files/patch-aa @@ -2,16 +2,12 @@ --- Makefile Sat Jul 6 12:25:35 1996 *************** *** 0 **** ---- 1,12 ---- +--- 1,8 ---- + all: + bdftopcf knmhn12x.bdf > knmhn12x.pcf + bdftopcf knmzn12x.bdf > knmzn12x.pcf -+ compress *.pcf ++ gzip *.pcf + install: -+ if [ ! -d /usr/X11R6/lib/X11/k12 ] ; then \ -+ mkdir -p /usr/X11R6/lib/X11/k12 ; fi -+ if [ ! -d /usr/X11R6/lib/X11/fonts/misc ] ; then \ -+ mkdir -p /usr/X11R6/lib/X11/fonts/misc ; fi -+ cp knmhn12x.pcf.Z knmzn12x.pcf.Z /usr/X11R6/lib/X11/fonts/misc/ -+ cp readme.kaname_bdf doc.orig/* /usr/X11R6/lib/X11/k12 -+ cd /usr/X11R6/lib/X11/fonts/misc ; mkfontdir ++ if [ ! -d ${PREFIX}/${FONTSDIR} ] ; then \ ++ mkdir -p ${PREFIX}/X11R6/${FONTSDIR} ; fi ++ cp knmhn12x.pcf.gz knmzn12x.pcf.gz ${PREFIX}/${FONTSDIR} diff --git a/japanese/k12/pkg-descr b/japanese/k12/pkg-descr index b19be8760d9d..97b07d24b206 100644 --- a/japanese/k12/pkg-descr +++ b/japanese/k12/pkg-descr @@ -1,8 +1,11 @@ Japanese 12 dot font named `kanamecho'. -knmhn12x.pcf:-MNKANAME-Fixed-Medium-R-Normal--12-110-75-75-C-60-JISX0201.1976-0 -knmzn12x.pcf:-MNKANAME-Fixed-Medium-R-Normal--12-110-75-75-C-120-JISX0208.1983-0 +knmhn12x.pcf:-MNKANAME-Fixed-Medium-R-Normal--12-110-75-75-C-60-\ +JISX0201.1976-0 +knmzn12x.pcf:-MNKANAME-Fixed-Medium-R-Normal--12-110-75-75-C-120-\ +JISX0208.1983-0 -You can also use 'k12' as an alias for knmzn12x.pcf, and 'r12' for knmhn12x.pcf. +You can also use 'k12' as an alias for knmzn12x.pcf, +and 'r12' for knmhn12x.pcf. Simple usage: % kterm -fn r12 -fk k12 -fl r12 diff --git a/japanese/k12/pkg-plist b/japanese/k12/pkg-plist index c152a895a44e..020b873808ad 100644 --- a/japanese/k12/pkg-plist +++ b/japanese/k12/pkg-plist @@ -1,10 +1,9 @@ -lib/X11/fonts/misc/knmhn12x.pcf.Z -lib/X11/fonts/misc/knmzn12x.pcf.Z -lib/X11/k12/gijutsu-siryou.doc -lib/X11/k12/kaname.doc -lib/X11/k12/readme.kaname_bdf -lib/X11/k12/readme.knm -@exec cd %D/lib/X11/fonts/misc ; mkfontdir -@unexec cd %D/lib/X11/fonts/misc ; mkfontdir -@unexec echo "updating fonts.alias" ; cd %D/lib/X11/fonts/misc; cp fonts.alias fonts.alias.orig; grep -v '\-mnkaname\-fixed\-medium\-r\-normal' fonts.alias.orig > fonts.alias; rm fonts.alias.orig -@dirrm lib/X11/k12 +%%FONTSDIR%%/knmhn12x.pcf.gz +%%FONTSDIR%%/knmzn12x.pcf.gz +share/doc/k12/gijutsu-siryou.doc +share/doc/k12/kaname.doc +share/doc/k12/readme.kaname_bdf +share/doc/k12/readme.knm +@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir +@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir +@dirrm share/doc/k12 diff --git a/japanese/k12/pkg-req b/japanese/k12/pkg-req index 382e9dffeef0..00cfab56d1b9 100644 --- a/japanese/k12/pkg-req +++ b/japanese/k12/pkg-req @@ -1,10 +1,46 @@ #!/bin/sh -if [ "$2" != "INSTALL" ] ; then - exit 0 + +if [ "x$1" = "x" ]; then + exit 1; fi -echo "Updating misc/fonts.alias" -cd /usr/X11R6/lib/X11/fonts/misc +if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then + exit 1; +fi + +export FONTDIR; FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local + +if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then + echo '**********************************************************************' + echo "****** ${FONTDIR}/ doesn't exist." + echo "****** Creating ${FONTDIR}/" + echo '****** Please upgrade your XFree86 to 3.3.3 or upper,' + echo "****** or add this directory to your /etc/XF86Config's FontPath entry." + echo '**********************************************************************' + mkdir ${FONTDIR} +fi + +# font alias entry here! +TMPFILE=/tmp/install-fonts-alias-$$ +cat << EOF > ${TMPFILE} +k12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-120-jisx0208.1983-0 +r12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-jisx0201.1976-0 +EOF + +echo "Updating ${FONTDIR}/fonts.alias" +cd ${FONTDIR} touch fonts.alias cp fonts.alias fonts.alias.orig -(cat fonts.alias.orig ; echo "k12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-120-jisx0208.1983-0" ; echo "r12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-jisx0201.1976-0") > fonts.alias -rm fonts.alias.orig +if [ "$2" = "INSTALL" ] ; then + (grep -v -e "`cat ${TMPFILE}`" fonts.alias.orig ; \ + cat ${TMPFILE}) > fonts.alias +elif [ "$2" = "DEINSTALL" ] ; then + grep -v -e "`cat ${TMPFILE}`" fonts.alias.orig > fonts.alias +fi +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; diff --git a/japanese/kappa20/Makefile b/japanese/kappa20/Makefile index 6bc0def7bad9..3aea6923d58d 100644 --- a/japanese/kappa20/Makefile +++ b/japanese/kappa20/Makefile @@ -1,9 +1,9 @@ # New ports collection makefile for: kappafont # Version required: 0.3 -# Date created: 12 Nov 1998 +# Date created: 8 Oct 1998 # Whom: Kawaguti Ginga <ginga@athena.club.or.jp> # -# $Id: Makefile,v 1.4 1998/08/07 22:43:07 asami Exp $ +# $Id$ # DISTNAME= Kappa20-0.3 @@ -15,21 +15,17 @@ MAINTAINER= ginga@athena.club.or.jp ALL_TARGET= default USE_X_PREFIX= yes +FONTSDIR= lib/X11/fonts/local MAKE_ENV= INSTALL_DATA="${INSTALL_DATA}" -PLIST_SUB= PERL=${PERL} +MAKE_ARGS= TARGETDIR="${PREFIX}/${FONTSDIR}" +PLIST_SUB= FONTSDIR=${FONTSDIR} pre-install: - @if [ ! -d ${PREFIX}/lib/X11/fonts/local ]; then \ - ${ECHO} '**********************************************************************'; \ - ${ECHO} "****** ${PREFIX}/lib/X11/fonts/local/ doesn't exist."; \ - ${ECHO} "****** Creating ${PREFIX}/lib/X11/fonts/local/"; \ - ${MKDIR} ${PREFIX}/lib/X11/fonts/local/; \ - ${ECHO} '****** Please upgrade your XFree86 to 3.3.3 or upper,'; \ - ${ECHO} "****** or add this directory to your /etc/XF86Config's FontPath entry."; \ - ${ECHO} '**********************************************************************'; \ - fi + @${SETENV} PKG_PREFIX=${PREFIX} \ + ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL post-install: + @(cd ${PREFIX}/${FONTSDIR} ; mkfontdir) .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/kappa20 @${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/README ${PREFIX}/share/doc/kappa20/ diff --git a/japanese/kappa20/files/patch-aa b/japanese/kappa20/files/patch-aa index 6bb283f32c03..d0ccfb34df47 100644 --- a/japanese/kappa20/files/patch-aa +++ b/japanese/kappa20/files/patch-aa @@ -1,87 +1,23 @@ ---- Makefile.dist Sun Oct 4 05:46:39 1998 -+++ Makefile Wed Nov 11 23:55:53 1998 -@@ -1,4 +1,4 @@ --TARGETDIR = /usr/X11R6/lib/X11/fonts/misc -+TARGETDIR = ${PREFIX}/lib/X11/fonts/local - - COMPRESSCMD = gzip -9 - COMPRESSEXT = .gz -@@ -59,43 +59,43 @@ +--- Makefile.orig Sun Oct 4 05:46:39 1998 ++++ Makefile Sat Oct 10 02:53:35 1998 +@@ -59,7 +59,7 @@ rm vk20m.bdf.orig fonts.alias.standard:: - grep -v '^-kappa\*--20-\*' ${TARGETDIR}/fonts.alias > pcf/fonts.alias -- echo -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo -kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo -kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo -kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo -kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo k20b -kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo -kappa-minchou-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo -kappa-minchou-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo -kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo -kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo k20m -kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo 10x20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1 >> pcf/fonts.alias -- echo a20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1 >> pcf/fonts.alias -- echo 10x20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1 >> pcf/fonts.alias -- echo a20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1 >> pcf/fonts.alias -- echo 10x20rkb -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0 >> pcf/fonts.alias -- echo r20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0 >> pcf/fonts.alias -- echo 10x20rkm -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0 >> pcf/fonts.alias -- echo r20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0 >> pcf/fonts.alias -+ perl -ne 'if ( /^!/ || ( !/[ \t]-kappa-.+--20-/i ) ){ print; }' ${TARGETDIR}/fonts.alias > pcf/fonts.alias -+ echo '-kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo '-kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo '-kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo '-kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo '-kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo 'k20b -kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo '-kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo '-kappa-minchou-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo '-kappa-minchou-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo '-kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo '-kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo 'k20m -kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo '10x20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1' >> pcf/fonts.alias -+ echo 'a20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1' >> pcf/fonts.alias -+ echo '10x20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1' >> pcf/fonts.alias -+ echo 'a20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1' >> pcf/fonts.alias -+ echo '10x20rkb -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0' >> pcf/fonts.alias -+ echo 'r20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0' >> pcf/fonts.alias -+ echo '10x20rkm -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0' >> pcf/fonts.alias -+ echo 'r20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0' >> pcf/fonts.alias - - fonts.alias.all:: fonts.alias.standard -- echo -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo -kappa-minchou-bold-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo -kappa-minchou-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo -kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo -kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo vk20b -kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo -kappa-minchou-medium-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo -kappa-minchou-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo -kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo -kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo vk20m -kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 >> pcf/fonts.alias -- echo ipa-10x20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-muleipa-1 -- echo ipa-10x20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-muleipa-1 -+ echo '-kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo '-kappa-minchou-bold-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo '-kappa-minchou-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo '-kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo '-kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo 'vk20b -kappa-fixed-bold-r-normal--20-190-75-75-vc-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo '-kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo '-kappa-minchou-medium-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo '-kappa-minchou-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo '-kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo '-kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo 'vk20m -kappa-fixed-medium-r-normal--20-190-75-75-vc-200-jisx0208.1990-0' >> pcf/fonts.alias -+ echo 'ipa-10x20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-muleipa-1' >> pcf/fonts.alias -+ echo 'ipa-10x20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-muleipa-1' >> pcf/fonts.alias ++# egrep -iv '[ ]-kappa.+--20-.+' ${TARGETDIR}/fonts.alias > pcf/fonts.alias + echo -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 >> pcf/fonts.alias + echo -kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 >> pcf/fonts.alias + echo -kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 >> pcf/fonts.alias +@@ -99,8 +99,9 @@ install:: +- install -m 644 -c pcf/*.pcf* pcf/fonts.alias ${TARGETDIR} +- cd ${TARGETDIR} ; mkfontdir ++ install -m 644 -c pcf/*.pcf* ${TARGETDIR} ++# install -m 644 -c pcf/*.pcf* pcf/fonts.alias ${TARGETDIR} ++# cd ${TARGETDIR} ; mkfontdir + + clean:: + rm -f *~ pcf/*.pcf* pcf/fonts.dir pcf/fonts.alias vk20?.bdf* diff --git a/japanese/kappa20/files/patch-ab b/japanese/kappa20/files/patch-ab index d8ddc303f045..95d48aea8982 100644 --- a/japanese/kappa20/files/patch-ab +++ b/japanese/kappa20/files/patch-ab @@ -1,23 +1,23 @@ --- pcf/fonts.alias.kappa.old Thu Oct 8 00:18:23 1998 +++ pcf/fonts.alias.kappa Wed Oct 7 15:26:19 1998 @@ -0,0 +1,20 @@ -+-kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -+-kappa-minchou-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -+-kappa-minchou-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -+-kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -+-kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -+-kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -+-kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -+-kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -+-kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -+-kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -+k20m -kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -+k20b -kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -+a20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1 -+a20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1 -+10x20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1 -+10x20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1 -+r20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0 -+r20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0 -+10x20rkb -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0 -+10x20rkm -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0 ++-kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 ++-kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 ++-kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 ++-kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 ++-kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 ++k20b -kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 ++-kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 ++-kappa-minchou-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 ++-kappa-minchou-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 ++-kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 ++-kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 ++k20m -kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 ++10x20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1 ++a20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1 ++10x20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1 ++a20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1 ++10x20rkb -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0 ++r20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0 ++10x20rkm -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0 ++r20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0 diff --git a/japanese/kappa20/pkg-plist b/japanese/kappa20/pkg-plist index 1ac593359f90..b5f7efc4e8b8 100644 --- a/japanese/kappa20/pkg-plist +++ b/japanese/kappa20/pkg-plist @@ -1,17 +1,11 @@ -lib/X11/fonts/local/10x20b.pcf.gz -lib/X11/fonts/local/10x20m.pcf.gz -lib/X11/fonts/local/10x20rkb.pcf.gz -lib/X11/fonts/local/10x20rkm.pcf.gz -lib/X11/fonts/local/k20b.pcf.gz -lib/X11/fonts/local/k20m.pcf.gz +%%FONTSDIR%%/10x20b.pcf.gz +%%FONTSDIR%%/10x20m.pcf.gz +%%FONTSDIR%%/10x20rkb.pcf.gz +%%FONTSDIR%%/10x20rkm.pcf.gz +%%FONTSDIR%%/k20b.pcf.gz +%%FONTSDIR%%/k20m.pcf.gz share/doc/kappa20/README share/doc/kappa20/fonts.alias.kappa -@exec if [ ! -d %D/lib/X11/fonts/local ]; then echo '**********************************************************************'; echo '****** '%D"/lib/X11/fonts/local/ doesn't exist."; echo '****** ''Creating '%D'/lib/X11/fonts/local/'; mkdir -p %D/lib/X11/fonts/local/; echo '****** ''Please upgrade your XFree86 to 3.3.3 or upper,'; echo '****** '"or add this directory to your /etc/XF86Config's FontPath entry."; echo '**********************************************************************'; fi -@exec cd %D/lib/X11/fonts/local ; mkfontdir -@exec echo "Updating local/fonts.alias" -@exec touch %D/lib/X11/fonts/local/fonts.alias -@exec cd %D/lib/X11/fonts/local ; cp fonts.alias fonts.alias.orig ; cat fonts.alias.orig | %%PERL%% -ne 'if ( /^!/ || ( !/[ \t]-kappa-.+--20-/i ) ){ print; }' > fonts.alias ; cat %D/share/doc/kappa20/fonts.alias.kappa >> fonts.alias ; rm fonts.alias.orig -@unexec cd %D/lib/X11/fonts/local ; mkfontdir -@unexec echo "updating fonts.alias" -@unexec cd %D/lib/X11/fonts/local ; cp fonts.alias fonts.alias.orig ; cat fonts.alias.orig | %%PERL%% -ne 'if ( /^!/ || ( !/[ \t]-kappa-.+--20-/i ) ){ print; }' > fonts.alias ; rm fonts.alias.orig +@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir +@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir @dirrm share/doc/kappa20 diff --git a/japanese/kappa20/pkg-req b/japanese/kappa20/pkg-req new file mode 100644 index 000000000000..d6f31cd01480 --- /dev/null +++ b/japanese/kappa20/pkg-req @@ -0,0 +1,64 @@ +#!/bin/sh + +if [ "x$1" = "x" ]; then + exit 1; +fi +if [ "x$2" != "xINSTALL" -a "x$2" != "xDEINSTALL" ]; then + exit 1; +fi + +export FONTDIR; FONTDIR=${PKG_PREFIX}/lib/X11/fonts/local + +if [ "$2x" = "INSTALLx" -a ! -d ${FONTDIR} ]; then + echo '**********************************************************************' + echo "****** ${FONTDIR}/ doesn't exist." + echo "****** Creating ${FONTDIR}/" + echo '****** Please upgrade your XFree86 to 3.3.3 or upper,' + echo "****** or add this directory to your /etc/XF86Config's FontPath entry." + echo '**********************************************************************' + mkdir ${FONTDIR} +fi + +# font alias entry here! +TMPFILE=/tmp/install-fonts-alias-$$ +cat << EOF > ${TMPFILE} +-kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 +-kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 +-kappa-minchou-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 +-kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 +-kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 +k20b -kappa-fixed-bold-r-normal--20-190-75-75-c-200-jisx0208.1990-0 +-kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 +-kappa-minchou-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 +-kappa-minchou-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 +-kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1983-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 +-kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 -kappa-mincho-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 +k20m -kappa-fixed-medium-r-normal--20-190-75-75-c-200-jisx0208.1990-0 +10x20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1 +a20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-iso8859-1 +10x20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1 +a20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-iso8859-1 +10x20rkb -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0 +r20b -kappa-fixed-bold-r-normal--20-190-75-75-c-100-jisx0201.1976-0 +10x20rkm -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0 +r20m -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0 +EOF + +echo "Updating ${FONTDIR}/fonts.alias" +cd ${FONTDIR} +touch fonts.alias +cp fonts.alias fonts.alias.orig +if [ "$2" = "INSTALL" ] ; then + (grep -v -e "`cat ${TMPFILE}`" fonts.alias.orig ; \ + cat ${TMPFILE}) > fonts.alias +elif [ "$2" = "DEINSTALL" ] ; then + grep -v -- "`cat ${TMPFILE}`" fonts.alias.orig > fonts.alias +fi +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; |