4 files changed, 30 insertions, 29 deletions

diff --git a/japanese/ajaxzip2-data/Makefile b/japanese/ajaxzip2-data/Makefile
index 75e9b9279d70..4b351ed40bcb 100644
--- a/japanese/ajaxzip2-data/Makefile
+++ b/japanese/ajaxzip2-data/Makefile
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
 PORTNAME=	ajaxzip2
-PORTVERSION=	20141226
+PORTVERSION=	20150227
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	kuriyama
 PKGNAMESUFFIX=	-data
-DISTFILES=	ken_all-${PORTVERSION_K}.lzh jigyosyo-${PORTVERSION_J}.lzh
+DISTFILES=	ken_all-${PORTVERSION_K}.zip jigyosyo-${PORTVERSION_J}.zip
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	ajaxzip2 (Japanese ZIP code utility) ZIP data
@@ -15,14 +15,14 @@ BUILD_DEPENDS=	ja-ajaxzip2-core>0:${PORTSDIR}/japanese/ajaxzip2-core \
 		p5-JSON>0:${PORTSDIR}/converters/p5-JSON
 
 NO_WRKSUBDIR=	yes
-USES=		perl5 lha
+USES=		perl5 zip
 USE_PERL5=	build
 PORTVERSION_K?=	${PORTVERSION}
 PORTVERSION_J?=	${PORTVERSION}
 
 do-build:
 	${MKDIR} ${WRKSRC}/data ${WRKSRC}/work
-	cd ${WRKSRC}/work && ${DATADIR}/csv2jsonzip.pl ../ken_all.csv ../jigyosyo.csv
+	cd ${WRKSRC}/work && ${DATADIR}/csv2jsonzip.pl ../KEN_ALL.CSV ../JIGYOSYO.CSV
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/data
@@ -30,14 +30,14 @@ do-install:
 
 # for maintenance.
 fetch1:
-	fetch http://www.post.japanpost.jp/zipcode/dl/kogaki/lzh/ken_all.lzh
-	fetch http://www.post.japanpost.jp/zipcode/dl/jigyosyo/lzh/jigyosyo.lzh
-	${CHMOD} og+r *.lzh
+	fetch http://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip
+	fetch http://www.post.japanpost.jp/zipcode/dl/jigyosyo/zip/jigyosyo.zip
+	${CHMOD} og+r *.zip
 
 fetch2:
-	m=`stat -f %m ken_all.lzh`; \
-	${MV} ken_all.lzh `date -r $${m} +ken_all-%Y%m%d.lzh`
-	m=`stat -f %m jigyosyo.lzh`; \
-	${MV} jigyosyo.lzh `date -r $${m} +jigyosyo-%Y%m%d.lzh`
+	m=`stat -f %m ken_all.zip`; \
+	${MV} ken_all.zip `date -r $${m} +ken_all-%Y%m%d.zip`
+	m=`stat -f %m jigyosyo.zip`; \
+	${MV} jigyosyo.zip `date -r $${m} +jigyosyo-%Y%m%d.zip`
 
 .include <bsd.port.mk>
diff --git a/japanese/ajaxzip2-data/distinfo b/japanese/ajaxzip2-data/distinfo
index edc11f86304e..d94586e3dcad 100644
--- a/japanese/ajaxzip2-data/distinfo
+++ b/japanese/ajaxzip2-data/distinfo
@@ -1,4 +1,4 @@
-SHA256 (ken_all-20141226.lzh) = 528cb4db34761c863cbbdb5224883fdef93be778a737f901b937e1da98d4d57a
-SIZE (ken_all-20141226.lzh) = 1739934
-SHA256 (jigyosyo-20141226.lzh) = eff4dcb4f62d0f34de569bf4a06005d14a9e458b46f045bee7283c268b78e4e7
-SIZE (jigyosyo-20141226.lzh) = 826050
+SHA256 (ken_all-20150227.zip) = 67119c8f6ab895054bd4f9f8ece39e192c2984e6fb6bdcc15d2976deb537bd38
+SIZE (ken_all-20150227.zip) = 1682095
+SHA256 (jigyosyo-20150227.zip) = bc7e7a211d381b57db54827840d2c518ea8818487ec6e5c2c4cd40e0e2c2400f
+SIZE (jigyosyo-20150227.zip) = 744880
diff --git a/japanese/zipcodes/Makefile b/japanese/zipcodes/Makefile
index 07eeace16eea..95fb8d6a6e45 100644
--- a/japanese/zipcodes/Makefile
+++ b/japanese/zipcodes/Makefile
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	zipcodes
-PORTVERSION=	20141226
+PORTVERSION=	20150227
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	kuriyama
-DISTFILES=	ken_all-${PORTVERSION_K}.lzh jigyosyo-${PORTVERSION_J}.lzh
+DISTFILES=	ken_all-${PORTVERSION_K}.zip jigyosyo-${PORTVERSION_J}.zip
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Japanese zipcode tables. includes both 3/5 and 7 digits form
@@ -14,7 +14,7 @@ BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 
 NO_WRKSUBDIR=	yes
 
-USES=		perl5 lha
+USES=		perl5 zip
 USE_PERL5=	build
 MAKE_ENV=	INSTALL_DATA="${INSTALL_DATA}" SCRIPTDIR=${SCRIPTDIR} PERL=${PERL} STAGEDIR=${STAGEDIR}
 PORTVERSION_K?=	${PORTVERSION}
@@ -22,17 +22,18 @@ PORTVERSION_J?=	${PORTVERSION}
 
 post-extract:
 	@${CP} ${FILESDIR}/Makefile ${WRKDIR}
+	cd ${WRKDIR}; ${MV} KEN_ALL.CSV ken_all.csv; ${MV} JIGYOSYO.CSV jigyosyo.csv
 
 # for maintenance.
 fetch1:
-	fetch http://www.post.japanpost.jp/zipcode/dl/kogaki/lzh/ken_all.lzh
-	fetch http://www.post.japanpost.jp/zipcode/dl/jigyosyo/lzh/jigyosyo.lzh
-	${CHMOD} og+r *.lzh
+	fetch http://www.post.japanpost.jp/zipcode/dl/kogaki/zip/ken_all.zip
+	fetch http://www.post.japanpost.jp/zipcode/dl/jigyosyo/zip/jigyosyo.zip
+	${CHMOD} og+r *.zip
 
 fetch2:
-	m=`stat -f %m ken_all.lzh`; \
-	${MV} ken_all.lzh `date -r $${m} +ken_all-%Y%m%d.lzh`
-	m=`stat -f %m jigyosyo.lzh`; \
-	${MV} jigyosyo.lzh `date -r $${m} +jigyosyo-%Y%m%d.lzh`
+	m=`stat -f %m ken_all.zip`; \
+	${MV} ken_all.zip `date -r $${m} +ken_all-%Y%m%d.zip`
+	m=`stat -f %m jigyosyo.zip`; \
+	${MV} jigyosyo.zip `date -r $${m} +jigyosyo-%Y%m%d.zip`
 
 .include <bsd.port.mk>
diff --git a/japanese/zipcodes/distinfo b/japanese/zipcodes/distinfo
index edc11f86304e..d94586e3dcad 100644
--- a/japanese/zipcodes/distinfo
+++ b/japanese/zipcodes/distinfo
@@ -1,4 +1,4 @@
-SHA256 (ken_all-20141226.lzh) = 528cb4db34761c863cbbdb5224883fdef93be778a737f901b937e1da98d4d57a
-SIZE (ken_all-20141226.lzh) = 1739934
-SHA256 (jigyosyo-20141226.lzh) = eff4dcb4f62d0f34de569bf4a06005d14a9e458b46f045bee7283c268b78e4e7
-SIZE (jigyosyo-20141226.lzh) = 826050
+SHA256 (ken_all-20150227.zip) = 67119c8f6ab895054bd4f9f8ece39e192c2984e6fb6bdcc15d2976deb537bd38
+SIZE (ken_all-20150227.zip) = 1682095
+SHA256 (jigyosyo-20150227.zip) = bc7e7a211d381b57db54827840d2c518ea8818487ec6e5c2c4cd40e0e2c2400f
+SIZE (jigyosyo-20150227.zip) = 744880