4 files changed, 20 insertions, 8 deletions

diff --git a/japanese/alias-fonts/Makefile b/japanese/alias-fonts/Makefile
index 2a23287ad515..202388768a8e 100644
--- a/japanese/alias-fonts/Makefile
+++ b/japanese/alias-fonts/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 Jun 1998
 # Whom:                 sada
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/10/09 04:09:45 asami Exp $
 #
 
 DISTNAME=	ja-netscape-fonts-1.0
@@ -13,14 +13,16 @@ DISTFILES=	# empty
 MAINTAINER=	sada@e-mail.ne.jp
 
 RUN_DEPENDS= \
+	${PREFIX}/lib/X11/fonts/local/jpnhn4-iso.pcf.gz:${PORTSDIR}/japanese/elisa8x8 \
+	${PREFIX}/lib/X11/fonts/local/5x10B.pcf.Z:${PORTSDIR}/japanese/k10 \
 	${PREFIX}/lib/X11/k12:${PORTSDIR}/japanese/k12 \
-	${PREFIX}/lib/X11/fonts/misc/5x10B.pcf.Z:${PORTSDIR}/japanese/k10
+	${PREFIX}/lib/X11/fonts/local/k20b.pcf.Z:${PORTSDIR}/japanese/kappa20
 
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
 
 do-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
-		/usr/bin/perl ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+		${PERL} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/japanese/alias-fonts/pkg-install b/japanese/alias-fonts/pkg-install
index e1bc680f1ecf..d4f01581b149 100644
--- a/japanese/alias-fonts/pkg-install
+++ b/japanese/alias-fonts/pkg-install
@@ -23,14 +23,19 @@ while (<IN>) {
 }
 for (split(/\n/, <<"END"))
 -netscape-fixed-medium-r-normal--24-234-75-75-c-120-jisx0201.1976-0 -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0
+-netscape-fixed-medium-r-normal--20-190-75-75-c-200-jisx0201.1976-0 -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0
 -netscape-fixed-medium-r-normal--16-156-75-75-c-80-jisx0201.1976-0 -sony-fixed-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0
 -netscape-fixed-medium-r-normal--14-130-75-75-c-70-jisx0201.1976-0 -misc-fixed-medium-r-normal--14-130-75-75-c-70-jisx0201.1976-0
 -netscape-fixed-medium-r-normal--12-104-75-75-c-60-jisx0201.1976-0 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-jisx0201.1976-0
+-netscape-fixed-medium-r-normal--10-78-75-75-c-100-jisx0201.1976-0 -misc-fixed-medium-r-normal--10-90-75-75-c-50-jisx0201.1976-0
+-netscape-fixed-medium-r-normal--8-70-75-75-c-120-jisx0201.1976-0 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-jisx0201.1976-0
 -netscape-fixed-medium-r-normal--24-234-75-75-c-240-jisx0208.1983-0 -jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0
+-netscape-fixed-medium-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
 -netscape-fixed-medium-r-normal--16-156-75-75-c-160-jisx0208.1983-0 -jis-fixed-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0
 -netscape-fixed-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-0 -misc-fixed-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-0
 -netscape-fixed-medium-r-normal--12-104-75-75-c-120-jisx0208.1983-0 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-120-jisx0208.1983-0
 -netscape-fixed-medium-r-normal--10-78-75-75-c-100-jisx0208.1983-0 -misc-fixed-medium-r-normal--10-90-75-75-c-100-jisx0208.1983-0
+-netscape-fixed-medium-r-normal--8-70-75-75-c-120-jisx0208.1983-0 -elisa100-fixed-medium-r-normal--8-70-75-75-c-80-jisx0208.1983-0
 -netscape-fixed-medium-r-normal--24-234-75-75-c-240-jisx0212.1990-0 -wadalab-mincho-medium-r-normal--24-231-75-75-c-240-jisx0212.1990-30
 -netscape-fixed-medium-r-normal--16-156-75-75-c-160-jisx0212.1990-0 -misc-fixed-medium-r-normal--16-150-75-75-c-160-jisx0212.1990-0
 -netscape-fixed-medium-r-normal--14-130-75-75-c-140-jisx0212.1990-0 -misc-fixed-medium-r-normal--14-132-75-75-c-140-jisx0212.1990-0
@@ -38,4 +43,3 @@ END
 {
 	print OUT "$_\n";
 }
-#system("$prefix/bin/xset fp rehash");
diff --git a/japanese/netscape-fonts/Makefile b/japanese/netscape-fonts/Makefile
index 2a23287ad515..202388768a8e 100644
--- a/japanese/netscape-fonts/Makefile
+++ b/japanese/netscape-fonts/Makefile
@@ -3,7 +3,7 @@
 # Date created:		22 Jun 1998
 # Whom:                 sada
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/10/09 04:09:45 asami Exp $
 #
 
 DISTNAME=	ja-netscape-fonts-1.0
@@ -13,14 +13,16 @@ DISTFILES=	# empty
 MAINTAINER=	sada@e-mail.ne.jp
 
 RUN_DEPENDS= \
+	${PREFIX}/lib/X11/fonts/local/jpnhn4-iso.pcf.gz:${PORTSDIR}/japanese/elisa8x8 \
+	${PREFIX}/lib/X11/fonts/local/5x10B.pcf.Z:${PORTSDIR}/japanese/k10 \
 	${PREFIX}/lib/X11/k12:${PORTSDIR}/japanese/k12 \
-	${PREFIX}/lib/X11/fonts/misc/5x10B.pcf.Z:${PORTSDIR}/japanese/k10
+	${PREFIX}/lib/X11/fonts/local/k20b.pcf.Z:${PORTSDIR}/japanese/kappa20
 
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
 
 do-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
-		/usr/bin/perl ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+		${PERL} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/japanese/netscape-fonts/pkg-install b/japanese/netscape-fonts/pkg-install
index e1bc680f1ecf..d4f01581b149 100644
--- a/japanese/netscape-fonts/pkg-install
+++ b/japanese/netscape-fonts/pkg-install
@@ -23,14 +23,19 @@ while (<IN>) {
 }
 for (split(/\n/, <<"END"))
 -netscape-fixed-medium-r-normal--24-234-75-75-c-120-jisx0201.1976-0 -sony-fixed-medium-r-normal--24-170-100-100-c-120-jisx0201.1976-0
+-netscape-fixed-medium-r-normal--20-190-75-75-c-200-jisx0201.1976-0 -kappa-fixed-medium-r-normal--20-190-75-75-c-100-jisx0201.1976-0
 -netscape-fixed-medium-r-normal--16-156-75-75-c-80-jisx0201.1976-0 -sony-fixed-medium-r-normal--16-120-100-100-c-80-jisx0201.1976-0
 -netscape-fixed-medium-r-normal--14-130-75-75-c-70-jisx0201.1976-0 -misc-fixed-medium-r-normal--14-130-75-75-c-70-jisx0201.1976-0
 -netscape-fixed-medium-r-normal--12-104-75-75-c-60-jisx0201.1976-0 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-jisx0201.1976-0
+-netscape-fixed-medium-r-normal--10-78-75-75-c-100-jisx0201.1976-0 -misc-fixed-medium-r-normal--10-90-75-75-c-50-jisx0201.1976-0
+-netscape-fixed-medium-r-normal--8-70-75-75-c-120-jisx0201.1976-0 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-jisx0201.1976-0
 -netscape-fixed-medium-r-normal--24-234-75-75-c-240-jisx0208.1983-0 -jis-fixed-medium-r-normal--24-230-75-75-c-240-jisx0208.1983-0
+-netscape-fixed-medium-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
 -netscape-fixed-medium-r-normal--16-156-75-75-c-160-jisx0208.1983-0 -jis-fixed-medium-r-normal--16-150-75-75-c-160-jisx0208.1983-0
 -netscape-fixed-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-0 -misc-fixed-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-0
 -netscape-fixed-medium-r-normal--12-104-75-75-c-120-jisx0208.1983-0 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-120-jisx0208.1983-0
 -netscape-fixed-medium-r-normal--10-78-75-75-c-100-jisx0208.1983-0 -misc-fixed-medium-r-normal--10-90-75-75-c-100-jisx0208.1983-0
+-netscape-fixed-medium-r-normal--8-70-75-75-c-120-jisx0208.1983-0 -elisa100-fixed-medium-r-normal--8-70-75-75-c-80-jisx0208.1983-0
 -netscape-fixed-medium-r-normal--24-234-75-75-c-240-jisx0212.1990-0 -wadalab-mincho-medium-r-normal--24-231-75-75-c-240-jisx0212.1990-30
 -netscape-fixed-medium-r-normal--16-156-75-75-c-160-jisx0212.1990-0 -misc-fixed-medium-r-normal--16-150-75-75-c-160-jisx0212.1990-0
 -netscape-fixed-medium-r-normal--14-130-75-75-c-140-jisx0212.1990-0 -misc-fixed-medium-r-normal--14-132-75-75-c-140-jisx0212.1990-0
@@ -38,4 +43,3 @@ END
 {
 	print OUT "$_\n";
 }
-#system("$prefix/bin/xset fp rehash");