Index: head/japanese/nkf/Makefile
===================================================================
--- head/japanese/nkf/Makefile	(revision 317158)
+++ head/japanese/nkf/Makefile	(revision 317159)
@@ -1,25 +1,22 @@
 # Created by: asami
 # $FreeBSD$
 
 PORTNAME=	nkf
 PORTVERSION=	2.1.2
 PORTEPOCH=	1
 CATEGORIES?=	japanese
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	${PORTNAME}/53171
-PKGNAMEPREFIX?=	ja-
+MASTER_SITES=	SFJP/${PORTNAME}/53171
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT?=	Network Kanji code conversion Filter
+MAINTAINER=	hrs@FreeBSD.org
+COMMENT=	Network Kanji code conversion Filter
 
-LICENSE?=	ZLIB
-LICENSE_FILE?=	${WRKSRC}/nkf.c
+LICENSE=	ZLIB
+LICENSE_FILE=	${WRKSRC}/nkf.c
 
-.if ${PKGNAMEPREFIX} != "ja-p5-"
+ALL_TARGET=	nkf
+PLIST_FILES=	bin/nkf
+
 MAN1=		nkf.1
 MANLANG=	"" ja
-PLIST_FILES=	bin/nkf
-ALL_TARGET=	nkf
-.endif
 
 .include <bsd.port.mk>
Index: head/japanese/nkf/files/patch-aa
===================================================================
--- head/japanese/nkf/files/patch-aa	(revision 317158)
+++ head/japanese/nkf/files/patch-aa	(nonexistent)
@@ -1,53 +0,0 @@
---- Makefile.orig	2009-11-17 09:33:04.000000000 +0900
-+++ Makefile	2010-02-15 23:02:44.471546444 +0900
-@@ -1,18 +1,22 @@
--CC = cc
--CFLAGS = -g -O2 -Wall -pedantic
-+CC?= cc
-+CFLAGS?= -g -O2 -Wall -pedantic
- # CFLAGS = -O3
- SHAR = shar 
- # SHAR = shar -T
--PERL = perl
--RM = rm -rf
-+PERL?= perl
-+RM?= rm -rf
- VERSION = 2.1.2
- MKDIR = mkdir
--prefix = /usr/local
-+PREFIX?= /usr/local
-+INSTALL?= /usr/bin/install
-+BSD_INSTALL_PROGRAM?= ${INSTALL} -s -o root -g wheel -m 555
-+BSD_INSTALL_MAN?= ${INSTALL}    -o root -g wheel -m 444
- 
- .PHONY: clean install test tar shar
- 
- nkf : nkf.o utf8tbl.o
- 	$(CC) $(CFLAGS) -o nkf nkf.o utf8tbl.o
-+	./nkf -e nkf.1j > nkf.1j.euc
- 
- nkf.o : nkf.c nkf.h utf8tbl.h config.h
- 	$(CC) $(CFLAGS) -c nkf.c
-@@ -34,14 +38,14 @@
- 	make test )
- 
- install:
--	-$(MKDIR) $(prefix)/bin
--	-$(MKDIR) $(prefix)/man
--	-$(MKDIR) $(prefix)/man/man1
--	-$(MKDIR) $(prefix)/man/ja
--	-$(MKDIR) $(prefix)/man/ja/man1
--	cp -f nkf $(prefix)/bin/
--	cp -f nkf.1 $(prefix)/man/man1/
--	cp -f nkf.1j $(prefix)/man/ja/man1/nkf.1
-+	-$(MKDIR) -p $(PREFIX)/bin
-+	-$(MKDIR) -p $(PREFIX)/man
-+	-$(MKDIR) -p $(PREFIX)/man/man1
-+	-$(MKDIR) -p $(PREFIX)/man/ja
-+	-$(MKDIR) -p $(PREFIX)/man/ja/man1
-+	${BSD_INSTALL_PROGRAM} nkf ${PREFIX}/bin/
-+	${BSD_INSTALL_MAN} nkf.1 ${PREFIX}/man/man1/
-+	${BSD_INSTALL_MAN} nkf.1j.euc ${PREFIX}/man/ja/man1/nkf.1
- 
- shar:
- 	-mkdir nkf-$(VERSION)

Property changes on: head/japanese/nkf/files/patch-aa
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/japanese/nkf/files/patch-Makefile
===================================================================
--- head/japanese/nkf/files/patch-Makefile	(nonexistent)
+++ head/japanese/nkf/files/patch-Makefile	(revision 317159)
@@ -0,0 +1,53 @@
+--- Makefile.orig	2009-11-17 09:33:04.000000000 +0900
++++ Makefile	2010-02-15 23:02:44.471546444 +0900
+@@ -1,18 +1,22 @@
+-CC = cc
+-CFLAGS = -g -O2 -Wall -pedantic
++CC?= cc
++CFLAGS?= -g -O2 -Wall -pedantic
+ # CFLAGS = -O3
+ SHAR = shar 
+ # SHAR = shar -T
+-PERL = perl
+-RM = rm -rf
++PERL?= perl
++RM?= rm -rf
+ VERSION = 2.1.2
+ MKDIR = mkdir
+-prefix = /usr/local
++PREFIX?= /usr/local
++INSTALL?= /usr/bin/install
++BSD_INSTALL_PROGRAM?= ${INSTALL} -s -o root -g wheel -m 555
++BSD_INSTALL_MAN?= ${INSTALL}    -o root -g wheel -m 444
+ 
+ .PHONY: clean install test tar shar
+ 
+ nkf : nkf.o utf8tbl.o
+ 	$(CC) $(CFLAGS) -o nkf nkf.o utf8tbl.o
++	./nkf -e nkf.1j > nkf.1j.euc
+ 
+ nkf.o : nkf.c nkf.h utf8tbl.h config.h
+ 	$(CC) $(CFLAGS) -c nkf.c
+@@ -34,14 +38,14 @@
+ 	make test )
+ 
+ install:
+-	-$(MKDIR) $(prefix)/bin
+-	-$(MKDIR) $(prefix)/man
+-	-$(MKDIR) $(prefix)/man/man1
+-	-$(MKDIR) $(prefix)/man/ja
+-	-$(MKDIR) $(prefix)/man/ja/man1
+-	cp -f nkf $(prefix)/bin/
+-	cp -f nkf.1 $(prefix)/man/man1/
+-	cp -f nkf.1j $(prefix)/man/ja/man1/nkf.1
++	-$(MKDIR) -p $(PREFIX)/bin
++	-$(MKDIR) -p $(PREFIX)/man
++	-$(MKDIR) -p $(PREFIX)/man/man1
++	-$(MKDIR) -p $(PREFIX)/man/ja
++	-$(MKDIR) -p $(PREFIX)/man/ja/man1
++	${BSD_INSTALL_PROGRAM} nkf ${PREFIX}/bin/
++	${BSD_INSTALL_MAN} nkf.1 ${PREFIX}/man/man1/
++	${BSD_INSTALL_MAN} nkf.1j.euc ${PREFIX}/man/ja/man1/nkf.1
+ 
+ shar:
+ 	-mkdir nkf-$(VERSION)

Property changes on: head/japanese/nkf/files/patch-Makefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/japanese/p5-nkf/Makefile
===================================================================
--- head/japanese/p5-nkf/Makefile	(revision 317158)
+++ head/japanese/p5-nkf/Makefile	(revision 317159)
@@ -1,25 +1,26 @@
 # Created by: max
 # $FreeBSD$
 
+PORTNAME=	nkf
+PORTVERSION=	2.1.2
+PORTEPOCH=	1
 CATEGORIES=	japanese perl5
+MASTER_SITES=	SFJP/${PORTNAME}/53171
 PKGNAMEPREFIX=	ja-p5-
 
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A perl extension module to use NKF
 
 LICENSE=	ZLIB NKF
 LICENSE_COMB=	multi
 LICENSE_NAME_NKF=	NKF License
 LICENSE_FILE_ZLIB=	${WRKSRC}/NKF.pm
 LICENSE_FILE_NKF=	${WRKSRC}/NKF.xs
 LICENSE_PERMS_NKF=	${_LICENSE_PERMS_DEFAULT}
 
-DESCR=		${.CURDIR}/pkg-descr
-PLIST=		${.CURDIR}/pkg-plist
 PERL_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/NKF.mod
-PATCHDIR=	${.CURDIR}/files
+
 MAN3=		NKF.3
 
-MASTERDIR=	${.CURDIR}/../nkf
-
-.include "${MASTERDIR}/Makefile"
+.include <bsd.port.mk>
Index: head/japanese/p5-nkf/distinfo
===================================================================
--- head/japanese/p5-nkf/distinfo	(nonexistent)
+++ head/japanese/p5-nkf/distinfo	(revision 317159)
@@ -0,0 +1,2 @@
+SHA256 (nkf-2.1.2.tar.gz) = 034e8b676160fa7cfaf023ad130ce2d7a7309e917c8f41b308e9dc2f6218a0a6
+SIZE (nkf-2.1.2.tar.gz) = 158127

Property changes on: head/japanese/p5-nkf/distinfo
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property