Update 0.48.

Host distfile locally.

8 files changed, 69 insertions, 101 deletions

diff --git a/misc/iso-codes/Makefile b/misc/iso-codes/Makefile
index 99558bb6dbd8..0177954e832f 100644
--- a/misc/iso-codes/Makefile
+++ b/misc/iso-codes/Makefile
@@ -5,23 +5,18 @@
 # $FreeBSD$
 #
 
-PORTNAME=	codes
-PORTVERSION=	0.46
-PORTREVISION=	2
+PORTNAME=	iso-codes
+PORTVERSION=	0.48
 CATEGORIES=	misc
-#MASTER_SITES=	${MASTER_SITE_DEBIAN}
-#MASTER_SITE_SUBDIR=	pool/main/i/${PKGNAMEPREFIX}${PORTNAME}
 MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	adamw
-PKGNAMEPREFIX=	iso-
-DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}_${PORTVERSION}.orig
+MASTER_SITE_SUBDIR=	kwm
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Lists of the country, language and currency iso names
 
 BUILD_DEPENDS=	xmlproc_parse:${PORTSDIR}/textproc/py-xml
 
-WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
+USE_BZIP2=	yes
 USE_PYTHON_BUILD=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
@@ -29,98 +24,17 @@ USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
-
-CATALOGS_iso639=\
-		aa.mo af.mo am.mo ar.mo az.mo be.mo bg.mo bn.mo br.mo bs.mo \
-		byn.mo ca.mo cs.mo cy.mo da.mo de.mo dv.mo el.mo eo.mo es.mo \
-		et.mo eu.mo fa.mo fi.mo fo.mo fr.mo ga.mo gez.mo gl.mo gu.mo \
-		gv.mo haw.mo he.mo hi.mo hr.mo hu.mo hy.mo id.mo is.mo it.mo \
-		iu.mo ja.mo ka.mo kk.mo kl.mo kn.mo ko.mo kok.mo kw.mo ky.mo \
-		lt.mo lv.mo mi.mo mk.mo mn.mo mr.mo ms.mo mt.mo nb.mo nl.mo \
-		nn.mo no.mo nso.mo oc.mo om.mo pa.mo pl.mo ps.mo pt.mo \
-		pt_BR.mo ro.mo ru.mo rw.mo sa.mo sid.mo sk.mo sl.mo so.mo \
-		sq.mo sr.mo sv.mo sw.mo syr.mo ta.mo te.mo th.mo ti.mo tig.mo \
-		tr.mo tt.mo uk.mo ur.mo uz.mo ve.mo vi.mo wa.mo wal.mo xh.mo \
-		zh_CN.mo zh_TW.mo zu.mo
-CATALOGS_iso3166=\
-		aa.mo af.mo am.mo ar.mo az.mo be.mo bg.mo bn.mo br.mo bs.mo \
-		byn.mo ca.mo cs.mo cy.mo da.mo de.mo dv.mo el.mo eo.mo es.mo \
-		et.mo eu.mo fa.mo fi.mo fo.mo fr.mo ga.mo gez.mo gl.mo gu.mo \
-		gv.mo haw.mo he.mo hi.mo hr.mo hu.mo hy.mo id.mo is.mo it.mo \
-		ja.mo ka.mo kk.mo kl.mo kn.mo ko.mo kok.mo kw.mo ky.mo lt.mo \
-		lv.mo mi.mo mk.mo mn.mo mr.mo ms.mo mt.mo nb.mo nl.mo nn.mo \
-		no.mo nso.mo oc.mo om.mo pa.mo pl.mo ps.mo pt.mo pt_BR.mo \
-		ro.mo ru.mo rw.mo sa.mo sk.mo sl.mo so.mo sq.mo sr.mo sv.mo \
-		sw.mo ta.mo te.mo th.mo ti.mo tig.mo tk.mo tl.mo tr.mo uk.mo \
-		ur.mo uz.mo ve.mo vi.mo wa.mo wal.mo xh.mo zh_CN.mo zh_TW.mo \
-		zu.mo
-CATALOGS_iso3166_2=\
-		af.mo ar.mo az.mo bg.mo br.mo bs.mo ca.mo cs.mo da.mo el.mo \
-		eo.mo es.mo et.mo eu.mo fa.mo fi.mo fr.mo ga.mo gl.mo he.mo \
-		hr.mo hu.mo id.mo is.mo it.mo ja.mo ko.mo lt.mo lv.mo mi.mo \
-		mk.mo mn.mo mt.mo nb.mo nl.mo no.mo nso.mo oc.mo pl.mo pt.mo \
-		pt_BR.mo ro.mo ru.mo sk.mo sl.mo sr.mo sv.mo ta.mo th.mo tr.mo \
-		uk.mo ve.mo vi.mo wa.mo xh.mo zh_CN.mo zh_TW.mo zu.mo
-CATALOGS_iso4217=\
-		af.mo ca.mo cs.mo da.mo de.mo el.mo es.mo et.mo fi.mo fr.mo \
-		ga.mo gl.mo hr.mo hu.mo it.mo ja.mo ko.mo lt.mo mn.mo ms.mo \
-		mt.mo nl.mo nn.mo no.mo pa.mo pl.mo pt.mo pt_BR.mo ru.mo rw.mo \
-		sk.mo sl.mo sr.mo sv.mo th.mo tr.mo uk.mo zh_CN.mo zh_TW.mo
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|!/usr/bin/python|!${LOCALBASE}/bin/python|g' \
 		${WRKSRC}/iso2pot.py ${WRKSRC}/iso2tab.py \
 		${WRKSRC}/iso_3166/iso3166tab.py ${WRKSRC}/iso_639/iso639tab.py
-	@${REINPLACE_CMD} -e 's|-D|-d|g' \
-		${WRKSRC}/iso_3166/Makefile.in ${WRKSRC}/iso_4217/Makefile.in \
-		${WRKSRC}/iso_639/Makefile.in
+	@${REINPLACE_CMD} -e 's|(datadir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
+		${WRKSRC}/Makefile.in
 
-do-install:
-.for catalog in ${CATALOGS_iso639}
-	@${MKDIR} ${PREFIX}/share/locale/${catalog:S|.mo||}/LC_MESSAGES
-	@${INSTALL_SCRIPT} \
-		${WRKSRC}/iso_639/${catalog} \
-		${PREFIX}/share/locale/${catalog:S|.mo||}/LC_MESSAGES/iso_639.mo
-.endfor
-.for catalog in ${CATALOGS_iso3166}
-	@${MKDIR} ${PREFIX}/share/locale/${catalog:S|.mo||}/LC_MESSAGES
-	@${INSTALL_SCRIPT} \
-		${WRKSRC}/iso_3166/${catalog} \
-		${PREFIX}/share/locale/${catalog:S|.mo||}/LC_MESSAGES/iso_3166.mo
-.endfor
-.for catalog in ${CATALOGS_iso3166_2}
-	@${MKDIR} ${PREFIX}/share/locale/${catalog:S|.mo||}/LC_MESSAGES
-	@${INSTALL_SCRIPT} \
-		${WRKSRC}/iso_3166/iso_3166_2/${catalog} \
-		${PREFIX}/share/locale/${catalog:S|.mo||}/LC_MESSAGES/iso_3166_2.mo
-.endfor
-.for catalog in ${CATALOGS_iso4217}
-	@${MKDIR} ${PREFIX}/share/locale/${catalog:S|.mo||}/LC_MESSAGES
-	@${INSTALL_SCRIPT} \
-		${WRKSRC}/iso_4217/${catalog} \
-		${PREFIX}/share/locale/${catalog:S|.mo||}/LC_MESSAGES/iso_4217.mo
-.endfor
-	@${MKDIR} ${PREFIX}/share/xml/iso-codes
-	@${MKDIR} ${PREFIX}/libdata/pkgconfig
-	@${INSTALL_SCRIPT} ${WRKSRC}/iso_3166/iso_3166.xml \
-		${PREFIX}/share/xml/iso-codes/iso_3166.xml
-	@${INSTALL_SCRIPT} ${WRKSRC}/iso_3166/iso_3166_2/iso_3166_2.xml \
-		${PREFIX}/share/xml/iso-codes/iso_3166_2.xml
-	@${INSTALL_SCRIPT} ${WRKSRC}/iso_4217/iso_4217.xml \
-		${PREFIX}/share/xml/iso-codes/iso_4217.xml
-	@${INSTALL_SCRIPT} ${WRKSRC}/iso_639/iso_639.xml \
-		${PREFIX}/share/xml/iso-codes/iso_639.xml
-	@${INSTALL_SCRIPT} ${WRKSRC}/iso-codes.pc \
-		${PREFIX}/libdata/pkgconfig/iso-codes.pc
-	@${MKDIR} ${PREFIX}/share/iso-codes
-	@${INSTALL_SCRIPT} ${WRKSRC}/iso_3166/iso_3166.tab \
-		${PREFIX}/share/iso-codes
+post-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/iso_3166/iso_3166_2/iso_3166_2.tab \
-		${PREFIX}/share/iso-codes
+		${PREFIX}/share/iso-codes/iso_3166_2.tab
 	@${INSTALL_SCRIPT} ${WRKSRC}/iso_4217/iso_4217.tab \
-		${PREFIX}/share/iso-codes
-	@${INSTALL_SCRIPT} ${WRKSRC}/iso_639/iso_639.tab \
-		${PREFIX}/share/iso-codes
+		${PREFIX}/share/iso-codes/iso_4217.tab
 
 .include <bsd.port.mk>
diff --git a/misc/iso-codes/distinfo b/misc/iso-codes/distinfo
index 3f0cf7dd16c9..8310e3de0935 100644
--- a/misc/iso-codes/distinfo
+++ b/misc/iso-codes/distinfo
@@ -1,2 +1,2 @@
-MD5 (iso-codes_0.46.orig.tar.gz) = bd84ecbff8a07b067dc344bf870a6fba
-SIZE (iso-codes_0.46.orig.tar.gz) = 3680042
+MD5 (iso-codes-0.48.tar.bz2) = 01c3ad65035771daefe31fe34c6033ce
+SIZE (iso-codes-0.48.tar.bz2) = 1674221
diff --git a/misc/iso-codes/files/patch-iso_3166__Makefile.in b/misc/iso-codes/files/patch-iso_3166__Makefile.in
new file mode 100644
index 000000000000..0508e6dd37b8
--- /dev/null
+++ b/misc/iso-codes/files/patch-iso_3166__Makefile.in
@@ -0,0 +1,12 @@
+--- iso_3166/Makefile.in.orig	Mon Oct  3 16:51:05 2005
++++ iso_3166/Makefile.in	Thu Oct 13 09:53:50 2005
+@@ -507,7 +507,8 @@ install-data-hook: $(mofiles)
+ 		cat=`basename $$cat`; \
+ 		lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 		dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
+-		$(INSTALL_DATA) -D $$cat $$dir/$(DOMAIN).mo; \
++		mkdir -p $$dir; \
++		$(INSTALL_DATA) $$cat $$dir/$(DOMAIN).mo; \
+ 	done
+ 
+ uninstall-hook:
diff --git a/misc/iso-codes/files/patch-iso_3166__iso_3166_2__Makefile.in b/misc/iso-codes/files/patch-iso_3166__iso_3166_2__Makefile.in
new file mode 100644
index 000000000000..9051b00e3ef8
--- /dev/null
+++ b/misc/iso-codes/files/patch-iso_3166__iso_3166_2__Makefile.in
@@ -0,0 +1,12 @@
+--- iso_3166/iso_3166_2/Makefile.in.orig	Thu Oct 13 09:46:42 2005
++++ iso_3166/iso_3166_2/Makefile.in	Thu Oct 13 09:47:00 2005
+@@ -322,7 +322,8 @@ install-data-hook: $(mofiles)
+ 		cat=`basename $$cat`; \
+ 		lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 		dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
+-		$(INSTALL_DATA) -D $$cat $$dir/$(DOMAIN).mo; \
++		mkdir -p $$dir; \
++		$(INSTALL_DATA) $$cat $$dir/$(DOMAIN).mo; \
+ 	done
+ 
+ uninstall-hook:
diff --git a/misc/iso-codes/files/patch-iso_4217__Makefile.in b/misc/iso-codes/files/patch-iso_4217__Makefile.in
new file mode 100644
index 000000000000..2ee574895f96
--- /dev/null
+++ b/misc/iso-codes/files/patch-iso_4217__Makefile.in
@@ -0,0 +1,12 @@
+--- iso_4217/Makefile.in.orig	Thu Oct 13 09:47:07 2005
++++ iso_4217/Makefile.in	Thu Oct 13 09:47:24 2005
+@@ -322,7 +322,8 @@ install-data-hook: $(mofiles)
+ 		cat=`basename $$cat`; \
+ 		lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 		dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
+-		$(INSTALL_DATA) -D $$cat $$dir/$(DOMAIN).mo; \
++		mkdir -p $$dir; \
++		$(INSTALL_DATA) $$cat $$dir/$(DOMAIN).mo; \
+ 	done
+ 
+ uninstall-hook:
diff --git a/misc/iso-codes/files/patch-iso_639__Makefile.in b/misc/iso-codes/files/patch-iso_639__Makefile.in
new file mode 100644
index 000000000000..ef7075060edd
--- /dev/null
+++ b/misc/iso-codes/files/patch-iso_639__Makefile.in
@@ -0,0 +1,12 @@
+--- iso_639/Makefile.in.orig	Thu Oct 13 09:47:29 2005
++++ iso_639/Makefile.in	Thu Oct 13 09:47:51 2005
+@@ -350,7 +350,8 @@ install-data-hook: $(mofiles)
+ 		cat=`basename $$cat`; \
+ 		lang=`echo $$cat | sed 's/\.mo$$//'`; \
+ 		dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
+-		$(INSTALL_DATA) -D $$cat $$dir/$(DOMAIN).mo; \
++		mkdir -p $$dir; \
++		$(INSTALL_DATA) $$cat $$dir/$(DOMAIN).mo; \
+ 	done
+ 
+ uninstall-hook:
diff --git a/misc/iso-codes/pkg-descr b/misc/iso-codes/pkg-descr
index 9965d2f5f5a6..a8429b0dc438 100644
--- a/misc/iso-codes/pkg-descr
+++ b/misc/iso-codes/pkg-descr
@@ -1,7 +1,7 @@
 This package aims to provide a central list of the country, language,
 and currency names and their translations.  The data comes from
-ISO standards 639 (language names), 3166 (country names), and 4217 and 
-the translations are from the Translation Project. The data is provided 
+ISO standards 639 (language names), 3166 (country names), and 4217 (currency).
+The translations are from the Translation Project. The data is provided 
 in tabular files as well as XML.
 
 WWW: http://alioth.debian.org/projects/pkg-isocodes/
diff --git a/misc/iso-codes/pkg-plist b/misc/iso-codes/pkg-plist
index cdbd81daa255..5e7e6a1cad3b 100644
--- a/misc/iso-codes/pkg-plist
+++ b/misc/iso-codes/pkg-plist
@@ -280,12 +280,14 @@ share/locale/ve/LC_MESSAGES/iso_3166_2.mo
 share/locale/ve/LC_MESSAGES/iso_639.mo
 share/locale/vi/LC_MESSAGES/iso_3166.mo
 share/locale/vi/LC_MESSAGES/iso_3166_2.mo
+share/locale/vi/LC_MESSAGES/iso_4217.mo
 share/locale/vi/LC_MESSAGES/iso_639.mo
 share/locale/wa/LC_MESSAGES/iso_3166.mo
 share/locale/wa/LC_MESSAGES/iso_3166_2.mo
 share/locale/wa/LC_MESSAGES/iso_639.mo
 share/locale/wal/LC_MESSAGES/iso_3166.mo
 share/locale/wal/LC_MESSAGES/iso_639.mo
+share/locale/wo/LC_MESSAGES/iso_3166.mo
 share/locale/xh/LC_MESSAGES/iso_3166.mo
 share/locale/xh/LC_MESSAGES/iso_3166_2.mo
 share/locale/xh/LC_MESSAGES/iso_639.mo
@@ -313,6 +315,8 @@ share/xml/iso-codes/iso_639.xml
 @unexec rmdir %D/share/locale/zh_CN 2>/dev/null ||/usr/bin/true
 @unexec rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null ||/usr/bin/true
 @unexec rmdir %D/share/locale/xh 2>/dev/null ||/usr/bin/true
+@unexec rmdir %D/share/locale/wo/LC_MESSAGES 2>/dev/null ||/usr/bin/true
+@unexec rmdir %D/share/locale/wo 2>/dev/null ||/usr/bin/true
 @unexec rmdir %D/share/locale/wal/LC_MESSAGES 2>/dev/null ||/usr/bin/true
 @unexec rmdir %D/share/locale/wal 2>/dev/null ||/usr/bin/true
 @unexec rmdir %D/share/locale/ve/LC_MESSAGES 2>/dev/null ||/usr/bin/true
@@ -359,6 +363,8 @@ share/xml/iso-codes/iso_639.xml
 @unexec rmdir %D/share/locale/pt 2>/dev/null ||/usr/bin/true
 @unexec rmdir %D/share/locale/ps/LC_MESSAGES 2>/dev/null ||/usr/bin/true
 @unexec rmdir %D/share/locale/ps 2>/dev/null ||/usr/bin/true
+@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null ||/usr/bin/true
+@unexec rmdir %D/share/locale/pl 2>/dev/null ||/usr/bin/true
 @unexec rmdir %D/share/locale/om/LC_MESSAGES 2>/dev/null ||/usr/bin/true
 @unexec rmdir %D/share/locale/om 2>/dev/null ||/usr/bin/true
 @unexec rmdir %D/share/locale/oc/LC_MESSAGES 2>/dev/null ||/usr/bin/true
@@ -381,14 +387,14 @@ share/xml/iso-codes/iso_639.xml
 @unexec rmdir %D/share/locale/kok 2>/dev/null ||/usr/bin/true
 @unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null ||/usr/bin/true
 @unexec rmdir %D/share/locale/ko 2>/dev/null ||/usr/bin/true
+@unexec rmdir %D/share/locale/kn/LC_MESSAGES 2>/dev/null ||/usr/bin/true
+@unexec rmdir %D/share/locale/kn 2>/dev/null ||/usr/bin/true
 @unexec rmdir %D/share/locale/kl/LC_MESSAGES 2>/dev/null ||/usr/bin/true
 @unexec rmdir %D/share/locale/kl 2>/dev/null ||/usr/bin/true
 @unexec rmdir %D/share/locale/kk/LC_MESSAGES 2>/dev/null ||/usr/bin/true
 @unexec rmdir %D/share/locale/kk 2>/dev/null ||/usr/bin/true
 @unexec rmdir %D/share/locale/iu/LC_MESSAGES 2>/dev/null ||/usr/bin/true
 @unexec rmdir %D/share/locale/iu 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/id/LC_MESSAGES 2>/dev/null ||/usr/bin/true
-@unexec rmdir %D/share/locale/id 2>/dev/null ||/usr/bin/true
 @unexec rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null ||/usr/bin/true
 @unexec rmdir %D/share/locale/hy 2>/dev/null ||/usr/bin/true
 @unexec rmdir %D/share/locale/haw/LC_MESSAGES 2>/dev/null ||/usr/bin/true