5 files changed, 34 insertions, 51 deletions

diff --git a/japanese/nkf/Makefile b/japanese/nkf/Makefile
index d6bcdffed67f..3a2cce3ae198 100644
--- a/japanese/nkf/Makefile
+++ b/japanese/nkf/Makefile
@@ -6,32 +6,15 @@
 #
 
 PORTNAME=	nkf
-PORTVERSION=	1.92
-PORTREVISION=	1
+PORTVERSION=	2.02
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://ftp.ie.u-ryukyu.ac.jp/pub/software/kono/
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
-EXTRACT_SUFX=	.shar
+MASTER_SITES=	http://www01.tcp-ip.or.jp/~furukawa/nkf_utf8/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//:S/./-/}
 
 MAINTAINER=	max@FreeBSD.org
 
-EXTRACT_CMD=	${SH}
-EXTRACT_BEFORE_ARGS=	# Empty
-EXTRACT_AFTER_ARGS=	> /dev/null
-
-NO_WRKSUBDIR=	yes
 MAN1=		nkf.1
 MANLANG=	"" ja
 ALL_TARGET=	nkf
 
-do-extract:
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}/NKF
-	@for file in ${EXTRACT_ONLY}; do \
-		if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\
-		then \
-			exit 1; \
-		fi \
-	done
-
 .include <bsd.port.mk>
diff --git a/japanese/nkf/distinfo b/japanese/nkf/distinfo
index a8f51407ae98..676cdc18f36f 100644
--- a/japanese/nkf/distinfo
+++ b/japanese/nkf/distinfo
@@ -1 +1 @@
-MD5 (nkf192.shar) = 2e560387657d5d7c725875e548394b0f
+MD5 (nkf202.tar.gz) = 5157b91879471b450997f4eec5af62e6
diff --git a/japanese/nkf/files/patch-aa b/japanese/nkf/files/patch-aa
index 8aa357694f57..2d2e23683984 100644
--- a/japanese/nkf/files/patch-aa
+++ b/japanese/nkf/files/patch-aa
@@ -1,33 +1,41 @@
---- Makefile.orig	Sun Oct 28 07:30:22 2001
-+++ Makefile	Sun Oct 28 07:34:31 2001
-@@ -1,13 +1,21 @@
+--- Makefile.orig	Sat Jan 25 09:09:12 2003
++++ Makefile	Mon Feb  3 17:03:15 2003
+@@ -1,18 +1,26 @@
 -CC = cc
 -CFLAGS = -O
 +PREFIX?= /usr/local
 +CC?= cc
 +CFLAGS?= -O
- SHAR = shar -T
- # SHAR = shar 
--PERL = perl5
+ # CFLAGS = -O3
+ SHAR = shar 
+ # SHAR = shar -T
+-PERL = perl
 -RM = rm -rf
 +PERL?= perl5
 +RM?= rm -rf
 +INSTALL?= /usr/bin/install
- VERSION = 19
+ VERSION = 202
  
- nkf : nkf.c
- 	$(CC) $(CFLAGS) -o nkf nkf.c
+ nkf : nkf.c config.h utf8tbl.o
+ 	$(CC) $(CFLAGS) -o nkf nkf.c utf8tbl.o
 +	./nkf -e nkf.1j > nkf.1j.euc
-+
+ 
+ utf8tbl.o : utf8tbl.c config.h
+ 	$(CC) $(CFLAGS) -c utf8tbl.c
+ 
 +install:
 +	${INSTALL} -c -o root -g wheel -m 555 nkf ${PREFIX}/bin
 +	${INSTALL} -c -o root -g wheel -m 444 nkf.1 ${PREFIX}/man/man1/nkf.1
 +	${INSTALL} -c -o root -g wheel -m 444 nkf.1j.euc ${PREFIX}/man/ja/man1/nkf.1
- 
++
  clean:
- 	-$(RM) nkf.o nkf nkf.in nkf.out nkf$(VERSION) *~ *.bad
-@@ -30,3 +38,4 @@
- 	done 
- 	( cd nkf$(VERSION) ; $(SHAR)  `cat ../MANIFEST` ) > nkf$(VERSION).shar
- 	-$(RM) nkf$(VERSION)
+ 	-$(RM) nkf.o nkf nkf.in nkf.out nkf$(VERSION) *~ *.bad utf8tbl.o
+ 	cd NKF.mod; make clean
+@@ -30,6 +38,7 @@
+ 	-mkdir nkf$(VERSION)/NKF.mod
+ 	for file in  `cat MANIFEST`;  \
+ 	do  \
 +
+ 	    nkf -j -m0 $$file > nkf$(VERSION)/$$file ; \
+ 	done 
+ 	echo "#!/bin/sh" >nkf$(VERSION).shar
diff --git a/japanese/nkf/files/patch-ab b/japanese/nkf/files/patch-ab
deleted file mode 100644
index a20fa199fe2b..000000000000
--- a/japanese/nkf/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- nkf.c.orig	Tue Nov 13 19:31:36 2001
-+++ nkf.c	Tue Nov 13 19:34:02 2001
-@@ -1670,6 +1670,7 @@
-        if (0x21==c1) {
-            if (alpha_f&0x2) {
-                c1 = ' ';
-+               c2 = 0;
-            } else if (alpha_f&0x4) {
-                 (*o_zconv)(0,' ');
-                 (*o_zconv)(0,' ');
diff --git a/japanese/nkf/pkg-descr b/japanese/nkf/pkg-descr
index 5b53c04dcea1..da5857758cb6 100644
--- a/japanese/nkf/pkg-descr
+++ b/japanese/nkf/pkg-descr
@@ -1,9 +1,11 @@
 Nkf is a yet another kanji code converter among networks, hosts and
 terminals.  It converts input kanji code to designated kanji code such
-as 7-bit JIS, MS-kanji (shifted-JIS) or EUC.
+as 7-bit JIS, MS-kanji (shifted-JIS), EUC, or UTF-8.
 
 One of the most unique facicility of nkf is the guess of the input
-kanji code.  It currently recognizes 7-bit JIS, MS-kanji (shifted-JIS)
-and EUC.  So users needn't the input kanji code specification.
+kanji code.  It currently recognizes 7-bit JIS, MS-kanji (shifted-JIS),
+EUC, and UTF-8.  So users needn't the input kanji code specification.
 
-- Masafumi
+WWW:	http://sourceforge.jp/projects/nkf/
+
+- Max