Update to 20040425 version

 - include jisx0213.2004-1 font files
 - change PORTVERSION numbering to be based on release date
Use pre-su-install instead of pre-install
Add SHA256 checksum

4 files changed, 43 insertions, 18 deletions

diff --git a/japanese/jisx0213-fonts/Makefile b/japanese/jisx0213-fonts/Makefile
index 3b50db34aba3..b82185701581 100644
--- a/japanese/jisx0213-fonts/Makefile
+++ b/japanese/jisx0213-fonts/Makefile
@@ -6,12 +6,14 @@
 #
 
 PORTNAME=	jisx0213-fonts
-PORTVERSION=	1.06
+PORTVERSION=	20040425
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://www12.ocn.ne.jp/~imamura/ \
 		http://gitatsu.hp.infoseek.co.jp/bdf/:yagi
-DISTFILES=	jiskan16-2000-1.bdf.gz jiskan16-2000-2.bdf.gz \
-		K14-1.bdf.gz K14-2.bdf.gz K12-1.bdf.gz K12-2.bdf.gz \
+DISTFILES=	jiskan16-2004-1.bdf.gz jiskan16-2000-1.bdf.gz \
+		jiskan16-2000-2.bdf.gz K14-2004-1.bdf.gz \
+		K14-2000-1.bdf.gz K14-2000-2.bdf.gz \
+		K12-1.bdf.gz K12-2.bdf.gz \
 		jiskan24-2000-1.bdf.gz:yagi jiskan24-2000-2.bdf.gz:yagi
 
 MAINTAINER=	yoichi@FreeBSD.org
@@ -36,7 +38,7 @@ post-extract:
 	@${CP} ${FILESDIR}/Makefile.in ${WRKDIR}/Makefile
 	@(cd ${WRKDIR}; ${GUNZIP_CMD} *.gz)
 
-pre-install:
+pre-su-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} \
 		${SH} ${PKGREQ} ${PKGNAME} INSTALL
 
diff --git a/japanese/jisx0213-fonts/distinfo b/japanese/jisx0213-fonts/distinfo
index 51968dd3c048..2abeb591d636 100644
--- a/japanese/jisx0213-fonts/distinfo
+++ b/japanese/jisx0213-fonts/distinfo
@@ -1,16 +1,30 @@
+MD5 (jiskan16-2004-1.bdf.gz) = d6e24b7d690fdc10c286c294cd754554
+SHA256 (jiskan16-2004-1.bdf.gz) = d79a57b81d3626414cb207eafec8d7b94fc2e7efabb5dce9d3ae58416e82ea3d
+SIZE (jiskan16-2004-1.bdf.gz) = 303930
 MD5 (jiskan16-2000-1.bdf.gz) = f7d2e1c722646f05633c4165cf593440
+SHA256 (jiskan16-2000-1.bdf.gz) = 34e05cb59ae562d53b4b8fa5620454e9a060208f76da915c7da844f581e94830
 SIZE (jiskan16-2000-1.bdf.gz) = 303401
 MD5 (jiskan16-2000-2.bdf.gz) = 524f4ce924b4737ce680c14d3b597532
+SHA256 (jiskan16-2000-2.bdf.gz) = 14d5db8001d4f289df98ce1371f782e81add21281bf4b7f8cd7041cb1c6306cd
 SIZE (jiskan16-2000-2.bdf.gz) = 92122
-MD5 (K14-1.bdf.gz) = a18fc852ea574ea961bb69a635cb842a
-SIZE (K14-1.bdf.gz) = 255587
-MD5 (K14-2.bdf.gz) = 83eb501104640a702c5ec87e0f701273
-SIZE (K14-2.bdf.gz) = 75135
+MD5 (K14-2004-1.bdf.gz) = 4255b9b99d15fa9a7d3545f35d79e7cf
+SHA256 (K14-2004-1.bdf.gz) = 3b5a49ebc3673d672cef3353110c8ee7ba277173c967c69b2b6e406aeae5309f
+SIZE (K14-2004-1.bdf.gz) = 256459
+MD5 (K14-2000-1.bdf.gz) = fbcd4bbf687793084358f473b6771cb9
+SHA256 (K14-2000-1.bdf.gz) = ceaa15568961fba5b86734b1aa86ebfeee641e2f43c55bde4a419e373bb5bdf9
+SIZE (K14-2000-1.bdf.gz) = 255684
+MD5 (K14-2000-2.bdf.gz) = bb5cb7cccc2abc926a747b0caf1492ed
+SHA256 (K14-2000-2.bdf.gz) = 05f1f7729a167b01e9d28d704fdf5cb83a20e69a659acae69e1f08e45eb036a9
+SIZE (K14-2000-2.bdf.gz) = 75139
 MD5 (K12-1.bdf.gz) = feb213c597d6c2367be75b9952c6d092
+SHA256 (K12-1.bdf.gz) = 6095fcca99d24dd0dd749a83f99663f24c2a6972e7848844185ba52afbbdab00
 SIZE (K12-1.bdf.gz) = 212803
 MD5 (K12-2.bdf.gz) = a3d2e49d360cf0b583f6e0fbef899863
+SHA256 (K12-2.bdf.gz) = 5cd4f41095a7c4c2d89bcf85a0a467066cd3824ed80ca4434e02a3968bde0376
 SIZE (K12-2.bdf.gz) = 64099
 MD5 (jiskan24-2000-1.bdf.gz) = 8bf9dd5217c81c8ab158cb422fae3270
+SHA256 (jiskan24-2000-1.bdf.gz) = 8de41ed35156ccd77d9930ee91322819bc568d468be99a8e59f905e4bdc5821b
 SIZE (jiskan24-2000-1.bdf.gz) = 516369
 MD5 (jiskan24-2000-2.bdf.gz) = 497d6296632f5e29475bbf7074912f6b
+SHA256 (jiskan24-2000-2.bdf.gz) = fe6412ffa9feb11eccad206417864c81bb880b477b9f5693d438d028958cdb1b
 SIZE (jiskan24-2000-2.bdf.gz) = 155750
diff --git a/japanese/jisx0213-fonts/files/Makefile.in b/japanese/jisx0213-fonts/files/Makefile.in
index efc9e7861db6..f3c5fcae22d1 100644
--- a/japanese/jisx0213-fonts/files/Makefile.in
+++ b/japanese/jisx0213-fonts/files/Makefile.in
@@ -4,8 +4,9 @@ GZIP_CMD?=	gzip
 MKBOLD_CMD?=	mkbold
 MKITALIC_CMD?=	mkitalic
 
-DIST_ALL=	K12-1.bdf K12-2.bdf K14-1.bdf K14-2.bdf \
-		jiskan16-2000-1.bdf jiskan16-2000-2.bdf \
+DIST_ALL=	K12-1.bdf K12-2.bdf \
+		K14-2004-1.bdf K14-2000-1.bdf K14-2000-2.bdf \
+		jiskan16-2004-1.bdf jiskan16-2000-1.bdf jiskan16-2000-2.bdf \
 		jiskan24-2000-1.bdf jiskan24-2000-2.bdf
 
 DIST_NOBOLD=	${DIST_ALL}
diff --git a/japanese/jisx0213-fonts/pkg-plist b/japanese/jisx0213-fonts/pkg-plist
index 3fda6cfa3228..68879909d252 100644
--- a/japanese/jisx0213-fonts/pkg-plist
+++ b/japanese/jisx0213-fonts/pkg-plist
@@ -6,14 +6,18 @@
 %%FONTSDIR%%/K12-2b.pcf.gz
 %%FONTSDIR%%/K12-2bi.pcf.gz
 %%FONTSDIR%%/K12-2i.pcf.gz
-%%FONTSDIR%%/K14-1.pcf.gz
-%%FONTSDIR%%/K14-1b.pcf.gz
-%%FONTSDIR%%/K14-1bi.pcf.gz
-%%FONTSDIR%%/K14-1i.pcf.gz
-%%FONTSDIR%%/K14-2.pcf.gz
-%%FONTSDIR%%/K14-2b.pcf.gz
-%%FONTSDIR%%/K14-2bi.pcf.gz
-%%FONTSDIR%%/K14-2i.pcf.gz
+%%FONTSDIR%%/K14-2000-1.pcf.gz
+%%FONTSDIR%%/K14-2000-1b.pcf.gz
+%%FONTSDIR%%/K14-2000-1bi.pcf.gz
+%%FONTSDIR%%/K14-2000-1i.pcf.gz
+%%FONTSDIR%%/K14-2000-2.pcf.gz
+%%FONTSDIR%%/K14-2000-2b.pcf.gz
+%%FONTSDIR%%/K14-2000-2bi.pcf.gz
+%%FONTSDIR%%/K14-2000-2i.pcf.gz
+%%FONTSDIR%%/K14-2004-1.pcf.gz
+%%FONTSDIR%%/K14-2004-1b.pcf.gz
+%%FONTSDIR%%/K14-2004-1bi.pcf.gz
+%%FONTSDIR%%/K14-2004-1i.pcf.gz
 %%FONTSDIR%%/jiskan16-2000-1.pcf.gz
 %%FONTSDIR%%/jiskan16-2000-1b.pcf.gz
 %%FONTSDIR%%/jiskan16-2000-1bi.pcf.gz
@@ -22,6 +26,10 @@
 %%FONTSDIR%%/jiskan16-2000-2b.pcf.gz
 %%FONTSDIR%%/jiskan16-2000-2bi.pcf.gz
 %%FONTSDIR%%/jiskan16-2000-2i.pcf.gz
+%%FONTSDIR%%/jiskan16-2004-1.pcf.gz
+%%FONTSDIR%%/jiskan16-2004-1b.pcf.gz
+%%FONTSDIR%%/jiskan16-2004-1bi.pcf.gz
+%%FONTSDIR%%/jiskan16-2004-1i.pcf.gz
 %%FONTSDIR%%/jiskan24-2000-1.pcf.gz
 %%FONTSDIR%%/jiskan24-2000-1b.pcf.gz
 %%FONTSDIR%%/jiskan24-2000-1bi.pcf.gz