Update to 2.05, and also, make ja-p5-nkf a slave port of ja-nkf.

6 files changed, 23 insertions, 24 deletions

diff --git a/japanese/nkf/Makefile b/japanese/nkf/Makefile
index a3302d39e094..b5cfe245b345 100644
--- a/japanese/nkf/Makefile
+++ b/japanese/nkf/Makefile
@@ -6,17 +6,20 @@
 #
 
 PORTNAME=	nkf
-PORTVERSION=	2.04
-CATEGORIES=	japanese
+PORTVERSION=	2.05
+CATEGORIES?=	japanese
 MASTER_SITES=	http://www01.tcp-ip.or.jp/~furukawa/nkf_utf8/
+PKGNAMEPREFIX?=	ja-
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//:S/./-/}
 
 MAINTAINER=	max@FreeBSD.org
-COMMENT=	Network Kanji code conversion Filter
+COMMENT?=	Network Kanji code conversion Filter
 
+.if ${PKGNAMEPREFIX} != "ja-p5-"
 MAN1=		nkf.1
 MANLANG=	"" ja
 PLIST_FILES=	bin/nkf
 ALL_TARGET=	nkf
+.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/nkf/distinfo b/japanese/nkf/distinfo
index bbbba31f1a04..1f69e027aad5 100644
--- a/japanese/nkf/distinfo
+++ b/japanese/nkf/distinfo
@@ -1,2 +1,2 @@
-MD5 (nkf204.tar.gz) = e1e0624a81dbc8a6f4516307704f5f8a
-SIZE (nkf204.tar.gz) = 107085
+MD5 (nkf205.tar.gz) = e34d936b20aaf581da5759fbaf0438f3
+SIZE (nkf205.tar.gz) = 149809
diff --git a/japanese/nkf/files/patch-aa b/japanese/nkf/files/patch-aa
index a62b393ad2f3..ef5ea8c669d3 100644
--- a/japanese/nkf/files/patch-aa
+++ b/japanese/nkf/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig	Sat Jan 25 09:09:12 2003
-+++ Makefile	Mon Feb  3 17:03:15 2003
-@@ -1,18 +1,26 @@
+--- Makefile.orig	Sun Apr 10 06:01:54 2005
++++ Makefile	Tue May 10 17:03:31 2005
+@@ -1,19 +1,27 @@
 -CC = cc
 -CFLAGS = -O
 +PREFIX?= /usr/local
@@ -11,10 +11,12 @@
  # SHAR = shar -T
 -PERL = perl
 -RM = rm -rf
-+PERL?= perl5
++PERL?= perl
 +RM?= rm -rf
 +INSTALL?= /usr/bin/install
- VERSION = 204
+ VERSION = 205
+ EXIST = test -f
+ #EXIST = exist #nmake
  
  nkf : nkf.c config.h utf8tbl.o
  	$(CC) $(CFLAGS) -o nkf nkf.c utf8tbl.o
@@ -22,12 +24,11 @@
  
  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 utf8tbl.o
- 	cd NKF.mod; make clean
diff --git a/japanese/p5-nkf/Makefile b/japanese/p5-nkf/Makefile
index eb270be39c64..3d9bb97074f7 100644
--- a/japanese/p5-nkf/Makefile
+++ b/japanese/p5-nkf/Makefile
@@ -5,18 +5,15 @@
 # $FreeBSD$
 #
 
-PORTNAME=	nkf
-PORTVERSION=	2.04
 CATEGORIES=	japanese perl5
-MASTER_SITES=	http://www01.tcp-ip.or.jp/~furukawa/nkf_utf8/
 PKGNAMEPREFIX=	ja-p5-
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.//:S/./-/}
-
-MAINTAINER=	max@FreeBSD.org
 COMMENT=	A perl extension module to use NKF
-
+DESCR=		${.CURDIR}/pkg-descr
+PLIST=		${.CURDIR}/pkg-plist
 PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/NKF.mod
+PATCHDIR=	${.CURDIR}/files
 MAN3=		NKF.3
+MASTERDIR=	${.CURDIR}/../nkf
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/../nkf/Makefile"
diff --git a/japanese/p5-nkf/distinfo b/japanese/p5-nkf/distinfo
deleted file mode 100644
index bbbba31f1a04..000000000000
--- a/japanese/p5-nkf/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (nkf204.tar.gz) = e1e0624a81dbc8a6f4516307704f5f8a
-SIZE (nkf204.tar.gz) = 107085
diff --git a/japanese/p5-nkf/pkg-descr b/japanese/p5-nkf/pkg-descr
index 9c0866894fd0..edcde7108fa0 100644
--- a/japanese/p5-nkf/pkg-descr
+++ b/japanese/p5-nkf/pkg-descr
@@ -1,6 +1,6 @@
 This is a Perl extension module to use NKF.
 
-Te syntax is as follows:
+The syntax is as follows:
 
 	use NKF;
 	$output = nkf ($flags, $input)