Date: Wed, 7 Sep 2016 20:56:58 +0900 From: Tomoaki AOKI <junchoon@dec.sakura.ne.jp> To: svn-ports-head@freebsd.org Cc: kuriyama@FreeBSD.org Subject: Re: svn commit: r421476 - in head/japanese: ajaxzip2-data zipcodes Message-ID: <20160907205658.ea6393b65327bed2aa814110@dec.sakura.ne.jp>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --Multipart=_Wed__7_Sep_2016_20_56_58_+0900_hjsXF4x.HGQypD+o Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit japanese/zipcodes failes to generate zipcodes.5digits and zipcodes.7digits. *Already existing problem. Attached patch would fix it. (Would need confirmation, though.) Applicable on /usr/ports. If any questions, please feel free to directly mail me, or discuss at freebsd-users-jp ML in Japanese. These are Japanese ports and you too is a Japanese. ;-) > Author: kuriyama > Date: Wed Sep 7 05:58:26 2016 > New Revision: 421476 > URL: https://svnweb.freebsd.org/changeset/ports/421476 > > Log: > - Update to 20160831. > > Modified: > head/japanese/ajaxzip2-data/Makefile > head/japanese/ajaxzip2-data/distinfo > head/japanese/zipcodes/Makefile > head/japanese/zipcodes/distinfo > > Modified: head/japanese/ajaxzip2-data/Makefile > ============================================================================== --- head/japanese/ajaxzip2-data/Makefile Wed Sep 7 01:57:44 2016 (r421475) > +++ head/japanese/ajaxzip2-data/Makefile Wed Sep 7 05:58:26 2016 (r421476) > @@ -1,7 +1,7 @@ > # $FreeBSD$ > > PORTNAME= ajaxzip2 > -PORTVERSION= 20160630 > +PORTVERSION= 20160831 > CATEGORIES= japanese > MASTER_SITES= LOCAL/kuriyama > PKGNAMESUFFIX= -data > > Modified: head/japanese/ajaxzip2-data/distinfo > ============================================================================== > --- head/japanese/ajaxzip2-data/distinfo Wed Sep 7 01:57:44 2016 (r421475) > +++ head/japanese/ajaxzip2-data/distinfo Wed Sep 7 05:58:26 2016 (r421476) > @@ -1,5 +1,5 @@ > -TIMESTAMP = 1467685102 > -SHA256 (ken_all-20160630.zip) = 637056234b551d6521afff6889a0fb0b42375851b0f86529f2238a03ff10bdd6 > -SIZE (ken_all-20160630.zip) = 1684377 > -SHA256 (jigyosyo-20160630.zip) = 1d42251d51c5760fb5bb0c3a0f57cbc42df322e6266dd03c6837310a62c44a3d > -SIZE (jigyosyo-20160630.zip) = 753484 > +TIMESTAMP = 1473164944 > +SHA256 (ken_all-20160831.zip) = e7316d10b59412b86e70484086a43cb6b6b80da29067bfa7a214435c185ad48b > +SIZE (ken_all-20160831.zip) = 1684704 > +SHA256 (jigyosyo-20160831.zip) = 733a423e7613bb770dfb9d5c4538159cb3ed9d936a7ef05d15fab831fe664287 > +SIZE (jigyosyo-20160831.zip) = 753934 > > Modified: head/japanese/zipcodes/Makefile > ============================================================================== > --- head/japanese/zipcodes/Makefile Wed Sep 7 01:57:44 2016 (r421475) > +++ head/japanese/zipcodes/Makefile Wed Sep 7 05:58:26 2016 (r421476) > @@ -1,7 +1,7 @@ > # $FreeBSD$ > > PORTNAME= zipcodes > -PORTVERSION= 20160630 > +PORTVERSION= 20160831 > CATEGORIES= japanese > MASTER_SITES= LOCAL/kuriyama > DISTFILES= ken_all-${PORTVERSION_K}.zip jigyosyo-${PORTVERSION_J}.zip > > Modified: head/japanese/zipcodes/distinfo > ============================================================================== > --- head/japanese/zipcodes/distinfo Wed Sep 7 01:57:44 2016 (r421475) > +++ head/japanese/zipcodes/distinfo Wed Sep 7 05:58:26 2016 (r421476) > @@ -1,5 +1,5 @@ > -TIMESTAMP = 1467684287 > -SHA256 (ken_all-20160630.zip) = 637056234b551d6521afff6889a0fb0b42375851b0f86529f2238a03ff10bdd6 > -SIZE (ken_all-20160630.zip) = 1684377 > -SHA256 (jigyosyo-20160630.zip) = 1d42251d51c5760fb5bb0c3a0f57cbc42df322e6266dd03c6837310a62c44a3d > -SIZE (jigyosyo-20160630.zip) = 753484 > +TIMESTAMP = 1473164959 > +SHA256 (ken_all-20160831.zip) = e7316d10b59412b86e70484086a43cb6b6b80da29067bfa7a214435c185ad48b > +SIZE (ken_all-20160831.zip) = 1684704 > +SHA256 (jigyosyo-20160831.zip) = 733a423e7613bb770dfb9d5c4538159cb3ed9d936a7ef05d15fab831fe664287 > +SIZE (jigyosyo-20160831.zip) = 753934 -- Tomoaki AOKI <junchoon@dec.sakura.ne.jp> --Multipart=_Wed__7_Sep_2016_20_56_58_+0900_hjsXF4x.HGQypD+o Content-Type: text/x-diff; name="ja-zipcodes.diff" Content-Disposition: attachment; filename="ja-zipcodes.diff" Content-Transfer-Encoding: quoted-printable Modified: japanese/zipcodes/files/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- japanese/zipcodes/files/Makefile.orig 2014-01-23 08:36:56.170299257 +09= 00 +++ japanese/zipcodes/files/Makefile 2016-09-07 19:43:31.862564000 +0900 @@ -15,7 +15,7 @@ CSV=3D ken_all.csv # 41saga.csv 42nagasa.csv 43kumamo.csv 44oita.csv \ # 45miyaza.csv 46kagosh.csv 47okinaw.csv EUCCSV=3D ${CSV:%.csv=3D%.euc-csv} -PERL?=3D /usr/bin/perl +PERL?=3D ${LOCALBASE}/bin/perl NKF?=3D ${LOCALBASE}/bin/nkf _DESTDIR=3D${STAGEDIR}${PREFIX}/share/misc/jp-zipcodes =20 Modified: japanese/zipcodes/scripts/genold.pl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- japanese/zipcodes/scripts/genold.pl.orig 2014-01-24 19:21:41.929974905 = +0900 +++ japanese/zipcodes/scripts/genold.pl 2016-09-07 20:15:23.885823000 +0900 @@ -1,11 +1,11 @@ while (<>) { s/"//g; - split(/,/, $_); - $_[1] =3D~ s/[ \t]//g; - $_[8] =3D '' if ($_[8] eq '=B0=CA=B2=BC=A4=CB=B7=C7=BA=DC=A4=AC=A4=CA=A4= =A4=BE=EC=B9=E7'); - $zipstr =3D $_[6] . ' ' . $_[7] . ' ' . $_[8]; # uniq + @zipline =3D split(/,/, $_); + @zipline[1] =3D~ s/[ \t]//g; + $zipline[8] =3D '' if ($_[8] eq '=B0=CA=B2=BC=A4=CB=B7=C7=BA=DC=A4=AC=A4= =CA=A4=A4=BE=EC=B9=E7'); + $zipstr =3D $zipline[6] . ' ' . $zipline[7] . ' ' . $zipline[8]; # uniq $zipstr =3D~ s/[ \t]+$//; - $zip{$zipstr} =3D $_[1]; + $zip{$zipstr} =3D $zipline[1]; } =20 print "# Zip code:location\n"; Modified: japanese/zipcodes/scripts/gennew.pl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- japanese/zipcodes/scripts/gennew.pl.orig 2014-01-24 19:21:41.923309462 = +0900 +++ japanese/zipcodes/scripts/gennew.pl 2016-09-07 20:16:33.831393000 +0900 @@ -1,11 +1,11 @@ while (<>) { s/"//g; - split(/,/, $_); - $_[2] =3D~ s/[ \t]//g; - $_[8] =3D '' if ($_[8] eq '=B0=CA=B2=BC=A4=CB=B7=C7=BA=DC=A4=AC=A4=CA=A4= =A4=BE=EC=B9=E7'); - $zipstr =3D $_[6] . ' ' . $_[7] . ' ' . $_[8]; # uniq + @zipline =3D split(/,/, $_); + $zipline[2] =3D~ s/[ \t]//g; + $zipline[8] =3D '' if ($_[8] eq '=B0=CA=B2=BC=A4=CB=B7=C7=BA=DC=A4=AC=A4= =CA=A4=A4=BE=EC=B9=E7'); + $zipstr =3D $zipline[6] . ' ' . $zipline[7] . ' ' . $zipline[8]; # uniq $zipstr =3D~ s/[ \t]+$//; - $zip{$zipstr} =3D $_[2]; + $zip{$zipstr} =3D $zipline[2]; } =20 print "# Zip code:location\n"; --Multipart=_Wed__7_Sep_2016_20_56_58_+0900_hjsXF4x.HGQypD+o--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20160907205658.ea6393b65327bed2aa814110>