5 files changed, 18 insertions, 20 deletions

diff --git a/japanese/ajaxzip2-data/Makefile b/japanese/ajaxzip2-data/Makefile
index dd9deb921abd..a4893b63075a 100644
--- a/japanese/ajaxzip2-data/Makefile
+++ b/japanese/ajaxzip2-data/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	ajaxzip2
-PORTVERSION=	20130830
+PORTVERSION=	20131031
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	kuriyama
@@ -21,14 +21,13 @@ USE_PERL5=	build
 PORTVERSION_K?=	${PORTVERSION}
 PORTVERSION_J?=	${PORTVERSION}
 
-NO_STAGE=	yes
 do-build:
 	${MKDIR} ${WRKSRC}/data ${WRKSRC}/work
 	cd ${WRKSRC}/work && ${DATADIR}/csv2jsonzip.pl ../ken_all.csv ../jigyosyo.csv
 
 do-install:
-	${MKDIR} ${DATADIR}/data
-	cd ${WRKSRC}/data && ${INSTALL_DATA} zip-???.json ${DATADIR}/data/
+	${MKDIR} ${STAGEDIR}${DATADIR}/data
+	cd ${WRKSRC}/data && ${INSTALL_DATA} zip-???.json ${STAGEDIR}${DATADIR}/data/
 
 # for maintenance.
 fetch1:
diff --git a/japanese/ajaxzip2-data/distinfo b/japanese/ajaxzip2-data/distinfo
index 535177bdc4be..4e974d362a9e 100644
--- a/japanese/ajaxzip2-data/distinfo
+++ b/japanese/ajaxzip2-data/distinfo
@@ -1,4 +1,4 @@
-SHA256 (ken_all-20130830.lzh) = 1b31a90e390d11e21193fbf294aa787b97a29f61c07a2b2ac3c8666b712832d7
-SIZE (ken_all-20130830.lzh) = 1736273
-SHA256 (jigyosyo-20130830.lzh) = 15e679ccec10851a0938d96b7aba13d2d02e3130053a979fada445a17efd4882
-SIZE (jigyosyo-20130830.lzh) = 819152
+SHA256 (ken_all-20131031.lzh) = 89cc4ec3b42073f5724080260fbb8d213c65bf44a82f0fe30cfe8c9d9565fe66
+SIZE (ken_all-20131031.lzh) = 1736408
+SHA256 (jigyosyo-20131031.lzh) = 2a2b0b24e552e13c66ad0e00b5d17f1e5fbf9f9ff8ce64b740851388d1ed682d
+SIZE (jigyosyo-20131031.lzh) = 817873
diff --git a/japanese/zipcodes/Makefile b/japanese/zipcodes/Makefile
index 4d94abc6a737..4e21c99d3262 100644
--- a/japanese/zipcodes/Makefile
+++ b/japanese/zipcodes/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	zipcodes
-PORTVERSION=	20130830
+PORTVERSION=	20131031
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	kuriyama
@@ -17,11 +17,10 @@ USE_LHA=	yes
 
 USES=		perl5
 USE_PERL5=	build
-MAKE_ENV=	INSTALL_DATA="${INSTALL_DATA}" SCRIPTDIR=${SCRIPTDIR} PERL=${PERL}
+MAKE_ENV=	INSTALL_DATA="${INSTALL_DATA}" SCRIPTDIR=${SCRIPTDIR} PERL=${PERL} STAGEDIR=${STAGEDIR}
 PORTVERSION_K?=	${PORTVERSION}
 PORTVERSION_J?=	${PORTVERSION}
 
-NO_STAGE=	yes
 post-extract:
 	@${CP} ${FILESDIR}/Makefile ${WRKDIR}
 
diff --git a/japanese/zipcodes/distinfo b/japanese/zipcodes/distinfo
index 535177bdc4be..4e974d362a9e 100644
--- a/japanese/zipcodes/distinfo
+++ b/japanese/zipcodes/distinfo
@@ -1,4 +1,4 @@
-SHA256 (ken_all-20130830.lzh) = 1b31a90e390d11e21193fbf294aa787b97a29f61c07a2b2ac3c8666b712832d7
-SIZE (ken_all-20130830.lzh) = 1736273
-SHA256 (jigyosyo-20130830.lzh) = 15e679ccec10851a0938d96b7aba13d2d02e3130053a979fada445a17efd4882
-SIZE (jigyosyo-20130830.lzh) = 819152
+SHA256 (ken_all-20131031.lzh) = 89cc4ec3b42073f5724080260fbb8d213c65bf44a82f0fe30cfe8c9d9565fe66
+SIZE (ken_all-20131031.lzh) = 1736408
+SHA256 (jigyosyo-20131031.lzh) = 2a2b0b24e552e13c66ad0e00b5d17f1e5fbf9f9ff8ce64b740851388d1ed682d
+SIZE (jigyosyo-20131031.lzh) = 817873
diff --git a/japanese/zipcodes/files/Makefile b/japanese/zipcodes/files/Makefile
index ab799c6a4a66..daa157c417e7 100644
--- a/japanese/zipcodes/files/Makefile
+++ b/japanese/zipcodes/files/Makefile
@@ -17,17 +17,17 @@ CSV=	ken_all.csv
 EUCCSV=	${CSV:%.csv=%.euc-csv}
 PERL?=	/usr/bin/perl
 NKF?=	${LOCALBASE}/bin/nkf
-DESTDIR=${PREFIX}/share/misc/jp-zipcodes
+_DESTDIR=${STAGEDIR}${PREFIX}/share/misc/jp-zipcodes
 
 all:	zipcodes.5digits zipcodes.7digits
 
 install: zipcodes.5digits zipcodes.7digits jigyosyo.euc-csv
-	mkdir -p ${PREFIX}/share/misc/jp-zipcodes
+	mkdir -p ${_DESTDIR}
 	for i in zipcodes.5digits zipcodes.7digits; do \
-		${INSTALL_DATA} $$i ${DESTDIR}; \
+		${INSTALL_DATA} $$i ${_DESTDIR}; \
 	done
-	${INSTALL_DATA} ken_all.euc-csv ${DESTDIR}/ken_all-euc.csv
-	${INSTALL_DATA} jigyosyo.euc-csv ${DESTDIR}/jigyosyo-euc.csv
+	${INSTALL_DATA} ken_all.euc-csv ${_DESTDIR}/ken_all-euc.csv
+	${INSTALL_DATA} jigyosyo.euc-csv ${_DESTDIR}/jigyosyo-euc.csv
 
 zipcodes.5digits: ${EUCCSV}
 	cat ${EUCCSV} | ${PERL} ${SCRIPTDIR}/genold.pl > zipcodes.5digits