Update to version 1.1.

PR:		14404
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

6 files changed, 47 insertions, 17 deletions

diff --git a/japanese/k12/Makefile b/japanese/k12/Makefile
index acd6f778c890..ed34028e5ef8 100644
--- a/japanese/k12/Makefile
+++ b/japanese/k12/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:	k12font
-# Version required:	1.0
+# Version required:	1.1
 # Date created:		24 June 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
@@ -7,19 +7,26 @@
 #
 
 DISTNAME=	kaname_k12_bdf
-PKGNAME=	ja-kaname12-1.0
+PKGNAME=	ja-kaname12-1.1
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+MASTER_SITES=	${MASTER_SITE_PORTS_JP} \
+		http://www.din.or.jp/~storm/fonts/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} knm_new_linux.tar.gz
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
 USE_X_PREFIX=	yes
-NO_WRKSUBDIR=	yes
+
+WRKSRC=		${WRKDIR}/fonts
+EXTRACT_ONLY=	knm_new_linux.tar.gz
 
 FONTSDIR=	lib/X11/fonts/local
 MAKE_ENV=	FONTSDIR=${FONTSDIR}
 PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
+post-extract:
+	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
+
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
@@ -28,8 +35,9 @@ post-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
+	@${INSTALL_DATA} ${WRKSRC}/readme            ${PREFIX}/share/doc/k12
+	@${INSTALL_DATA} ${WRKSRC}/readme.kaname_bdf ${PREFIX}/share/doc/k12
+	@${INSTALL_DATA} ${WRKSRC}/doc.orig/*        ${PREFIX}/share/doc/k12
 .endif
 
 .include <bsd.port.mk>
diff --git a/japanese/k12/distinfo b/japanese/k12/distinfo
index bbc64d9124c5..8c14b7ee0f8b 100644
--- a/japanese/k12/distinfo
+++ b/japanese/k12/distinfo
@@ -1 +1,2 @@
 MD5 (kaname_k12_bdf.tar.gz) = e0a103ceeffe0aa1c5670458f47452b3
+MD5 (knm_new_linux.tar.gz) = bc07cc6e93046ae4f53c3da3b49f5971
diff --git a/japanese/k12/files/patch-aa b/japanese/k12/files/patch-aa
index 4bad7d503322..588588c22861 100644
--- a/japanese/k12/files/patch-aa
+++ b/japanese/k12/files/patch-aa
@@ -1,13 +1,17 @@
-*** /dev/null	Sat Jul  6 10:38:40 1996
---- Makefile	Sat Jul  6 12:25:35 1996
+*** /dev/null	Wed Oct 13 00:00:00 1999
+--- Makefile	Wed Oct 13 00:00:00 1999
 ***************
 *** 0 ****
---- 1,8 ----
+--- 1,12 ----
 + all:
 + 	bdftopcf knmhn12x.bdf > knmhn12x.pcf
-+ 	bdftopcf knmzn12x.bdf > knmzn12x.pcf
-+ 	gzip *.pcf
++ 	gzip -9 -nf knmhn12x.pcf
 + install:
 + 	if [ ! -d ${PREFIX}/${FONTSDIR} ] ; then \
-+ 	mkdir -p ${PREFIX}/X11R6/${FONTSDIR} ; fi
-+ 	cp knmhn12x.pcf.gz knmzn12x.pcf.gz ${PREFIX}/${FONTSDIR}
++ 	${MKDIR} ${PREFIX}/${FONTSDIR} ; fi
++ 	${BSD_INSTALL_DATA} kaname-latin1.pcf.gz ${PREFIX}/${FONTSDIR}
++ 	${BSD_INSTALL_DATA} knm12p.pcf.gz ${PREFIX}/${FONTSDIR}
++ 	${BSD_INSTALL_DATA} knm12pb.pcf.gz ${PREFIX}/${FONTSDIR}
++ 	${BSD_INSTALL_DATA} knmhn12x.pcf.gz ${PREFIX}/${FONTSDIR}
++ 	${BSD_INSTALL_DATA} knmzn12x.pcf.gz ${PREFIX}/${FONTSDIR}
++ 	${BSD_INSTALL_DATA} knmzn12xb.pcf.gz ${PREFIX}/${FONTSDIR}
diff --git a/japanese/k12/pkg-descr b/japanese/k12/pkg-descr
index 97b07d24b206..715234c29d96 100644
--- a/japanese/k12/pkg-descr
+++ b/japanese/k12/pkg-descr
@@ -1,12 +1,22 @@
 Japanese 12 dot font named `kanamecho'.
+kaname-latin1.pcf:-MNKANAME-Fixed-Medium-R-Normal--12-110-75-75-C-60-\
+ISO8859-1
 knmhn12x.pcf:-MNKANAME-Fixed-Medium-R-Normal--12-110-75-75-C-60-\
 JISX0201.1976-0
+knm12p.pcf:-MNKANAME-Fixed-Medium-R-Normal--12-110-75-75-P-120-\
+JISX0208.1983-0
+knm12pb.pcf:-MNKANAME-Fixed-Bold-R-Normal--12-110-75-75-P-120-\
+JISX0208.1983-0
 knmzn12x.pcf:-MNKANAME-Fixed-Medium-R-Normal--12-110-75-75-C-120-\
 JISX0208.1983-0
+knmzn12xb.pcf:-MNKANAME-Fixed-Bold-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, 'k12b' for knmzn12xb.pcf,
+'r12' for knmhn12x.pcf, and 'a12' for kaname-latin1.pcf.
 
 Simple usage:
-	% kterm -fn r12 -fk k12 -fl r12
-	% mule -fn r12 
+	% kterm -fn a12 -fk k12 -fl r12
+	% mule -fn r12
+
+WWW: http://www.din.or.jp/~storm/fonts/
diff --git a/japanese/k12/pkg-plist b/japanese/k12/pkg-plist
index 020b873808ad..4a15dfc85a93 100644
--- a/japanese/k12/pkg-plist
+++ b/japanese/k12/pkg-plist
@@ -1,7 +1,12 @@
+%%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
 share/doc/k12/gijutsu-siryou.doc
 share/doc/k12/kaname.doc
+share/doc/k12/readme
 share/doc/k12/readme.kaname_bdf
 share/doc/k12/readme.knm
 @exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
diff --git a/japanese/k12/pkg-req b/japanese/k12/pkg-req
index 00cfab56d1b9..41e2482fe755 100644
--- a/japanese/k12/pkg-req
+++ b/japanese/k12/pkg-req
@@ -23,7 +23,9 @@ fi
 TMPFILE=/tmp/install-fonts-alias-$$
 cat << EOF > ${TMPFILE}
 k12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-120-jisx0208.1983-0
+k12b -mnkaname-fixed-bold-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
+a12 -mnkaname-fixed-medium-r-normal--12-110-75-75-c-60-iso8859-1
 EOF
 
 echo "Updating ${FONTDIR}/fonts.alias"