Upgrade to version 2.04. The adds UTF-8 and MIME support.

4 files changed, 16 insertions, 45 deletions

diff --git a/converters/nkf/DESCR b/converters/nkf/DESCR
index 3eb4a732c22..3eb27901141 100644
--- a/converters/nkf/DESCR
+++ b/converters/nkf/DESCR
@@ -1,8 +1,6 @@
-Nkf is a yet another kanji code converter between the different types
-of kanji codes out there.  It can convert between 7-bit JIS, MS-kanji
-(shifted-JIS) or EUC.
-
-One of the most unique facilities of nkf is that it guesses the input
-kanji code. It currently recognizes 7-bit JIS, MS-kanji (shifted-JIS)
-and EUC.  So users don't need to specify (or even know) the input
-kanji code type.
+nkf stands for "Network Kanji Filter," and it's a program used to
+convert between various encodings used for Japanese character sets. It
+handles ISO-2022-JP, Shift_JIS, EUC-JP, UTF-8, and some variants of the
+above (such as the Microsoft version of Shift_JIS). As well, it can do
+a limited amount of MIME decoding. It also can try to guess the input
+encoding so that you don't have to specify it.
diff --git a/converters/nkf/Makefile b/converters/nkf/Makefile
index 683c6ea8236..7ae9f9e133f 100644
--- a/converters/nkf/Makefile
+++ b/converters/nkf/Makefile
@@ -1,21 +1,15 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/31 13:00:35 seb Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/26 05:08:13 cjs Exp $
 
-DISTNAME=	nkf-1.7
+DISTNAME=	nkf204
+PKGNAME=	nkf-2.04
 CATEGORIES=	japanese converters
-MASTER_SITES=	ftp://ftp.sra.co.jp/pub/cmd/nkf/
+MASTER_SITES=	http://www01.tcp-ip.or.jp/~furukawa/nkf_utf8/
 
-PATCH_SITES=	http://www.rs.civil.tohoku.ac.jp/~ito/ws/
-PATCHFILES=	nkf.patch.txt
-
-MAINTAINER=	kay@kaynet.or.jp
-COMMENT=	Network Kanji code conversion Filter
+MAINTAINER=	cjs@NetBSD.org
+HOMEPAGE=	http://www.jazzdisco.org/bsdi/software/nkf/
+COMMENT=	Convert between various Japanese character encodings
 
 ALL_TARGET=	nkf
-PATCH_DIST_ARGS+= -R -d ${WRKSRC}
-
-post-extract:
-	@cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/nkf.post-extract
-	@${RM} -rf ${WRKSRC}/NKF
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nkf ${PREFIX}/bin
diff --git a/converters/nkf/distinfo b/converters/nkf/distinfo
index 7b4d20b6ffe..ba60d0135ce 100644
--- a/converters/nkf/distinfo
+++ b/converters/nkf/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/31 13:00:35 seb Exp $
+$NetBSD: distinfo,v 1.2 2004/01/26 05:08:13 cjs Exp $
 
-SHA1 (nkf-1.7.tar.gz) = 2116864c1acc8e6f80d4c59dc63c73eb37c9e80c
-Size (nkf-1.7.tar.gz) = 28222 bytes
-SHA1 (nkf.patch.txt) = f7b0a640be331a707584ba34d083f5e2361c3969
-Size (nkf.patch.txt) = 3558 bytes
+SHA1 (nkf204.tar.gz) = fec166bdb30ac6d9b7272776b56648ed14fb6eac
+Size (nkf204.tar.gz) = 107085 bytes
diff --git a/converters/nkf/files/nkf.post-extract b/converters/nkf/files/nkf.post-extract
deleted file mode 100644
index 61df30147cb..00000000000
--- a/converters/nkf/files/nkf.post-extract
+++ /dev/null
@@ -1,19 +0,0 @@
-*** nkf.c.bak	Sun May  9 17:20:37 1999
---- nkf.c	Sun May  9 17:21:32 1999
-***************
-*** 1483,1489 ****
-  
-  
-  #ifdef STRICT_MIME
-! /* This converts  ^\^\*/
-  
-  unsigned char *mime_pattern[] = {
-     (unsigned char *)"\075?ISO-8859-1?Q?",
---- 1483,1489 ----
-  
-  
-  #ifdef STRICT_MIME
-! /* This converts  */
-  
-  unsigned char *mime_pattern[] = {
-     (unsigned char *)"\075?ISO-8859-1?Q?",