4 files changed, 14 insertions, 27 deletions

diff --git a/misc/iso-codes/Makefile b/misc/iso-codes/Makefile
index d625c1bd4c52..21ef19d55dfd 100644
--- a/misc/iso-codes/Makefile
+++ b/misc/iso-codes/Makefile
@@ -6,25 +6,24 @@
 #
 
 PORTNAME=	iso-codes
-DISTVERSION=	0.58
-PORTREVISION=	2
+DISTVERSION=	1.3
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL} \
+MASTER_SITES=	ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/ \
 		http://freebsd.powered.net/distfiles/
-DISTNAME=	${PORTNAME}_${PORTVERSION}-1
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	thomas@goodking.ca
 COMMENT=	Lists of the country, language and currency iso names
 
 BUILD_DEPENDS=	xmlproc_parse:${PORTSDIR}/textproc/py-xml
 
+USE_BZIP2=	yes
 USE_PYTHON_BUILD=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	aclocal:19 autoconf:259 automake:19
-AUTOMAKE_ARGS+=	--add-missing --foreign --copy
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C/-.*$//}
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+
+post-patch:
+	@${REINPLACE_CMD} -e '/^pkgconfigdir =/s|=.*|=${PREFIX}/libdata/pkgconfig|'\
+		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/misc/iso-codes/distinfo b/misc/iso-codes/distinfo
index 7e05eb47f470..8bf539925fb3 100644
--- a/misc/iso-codes/distinfo
+++ b/misc/iso-codes/distinfo
@@ -1,3 +1,3 @@
-MD5 (iso-codes_0.58-1.tar.gz) = 05f90ad07a5169dd0faadf5ba0530497
-SHA256 (iso-codes_0.58-1.tar.gz) = dd85b987061c6ca73fb775d5106bb056f1e32297569d7492a19a6e9563c354c6
-SIZE (iso-codes_0.58-1.tar.gz) = 8867041
+MD5 (iso-codes-1.3.tar.bz2) = 0da84a6b7642f082c8f6b319fd402760
+SHA256 (iso-codes-1.3.tar.bz2) = 97f53fff7b9ba1af726f8e2c65f5bd5be2a8c708c9f89d4e2a41dc172ec75439
+SIZE (iso-codes-1.3.tar.bz2) = 6168396
diff --git a/misc/iso-codes/files/patch-Makefile.am b/misc/iso-codes/files/patch-Makefile.am
deleted file mode 100644
index c67cfaa8b7e9..000000000000
--- a/misc/iso-codes/files/patch-Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.am.orig	Sat Apr 15 06:27:10 2006
-+++ Makefile.am	Sat Apr 15 06:28:17 2006
-@@ -1,6 +1,6 @@
- SUBDIRS = iso_639 iso_3166 iso_4217 notes
- 
--pkgconfigdir = $(datadir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = iso-codes.pc
- 
- EXTRA_DIST = \
diff --git a/misc/iso-codes/pkg-plist b/misc/iso-codes/pkg-plist
index 848e4f293bb6..ad7896976763 100644
--- a/misc/iso-codes/pkg-plist
+++ b/misc/iso-codes/pkg-plist
@@ -72,6 +72,7 @@ share/locale/el/LC_MESSAGES/iso_3166_2.mo
 share/locale/el/LC_MESSAGES/iso_4217.mo
 share/locale/el/LC_MESSAGES/iso_639.mo
 share/locale/el/LC_MESSAGES/iso_639_3.mo
+share/locale/en/LC_MESSAGES/iso_3166_2.mo
 share/locale/eo/LC_MESSAGES/iso_3166.mo
 share/locale/eo/LC_MESSAGES/iso_3166_2.mo
 share/locale/eo/LC_MESSAGES/iso_639.mo
@@ -214,6 +215,7 @@ share/locale/mk/LC_MESSAGES/iso_3166.mo
 share/locale/mk/LC_MESSAGES/iso_3166_2.mo
 share/locale/mk/LC_MESSAGES/iso_639.mo
 share/locale/mk/LC_MESSAGES/iso_639_3.mo
+share/locale/ml/LC_MESSAGES/iso_3166.mo
 share/locale/mn/LC_MESSAGES/iso_3166.mo
 share/locale/mn/LC_MESSAGES/iso_3166_2.mo
 share/locale/mn/LC_MESSAGES/iso_4217.mo
@@ -412,11 +414,10 @@ share/xml/iso-codes/iso_3166_2.xml
 share/xml/iso-codes/iso_4217.xml
 share/xml/iso-codes/iso_639.xml
 share/xml/iso-codes/iso_639_3.xml
+@dirrm %%DATADIR%%
 @dirrm share/xml/iso-codes
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/wo/LC_MESSAGES
@@ -447,8 +448,6 @@ share/xml/iso-codes/iso_639_3.xml
 @dirrmtry share/locale/sid
 @dirrmtry share/locale/sa/LC_MESSAGES
 @dirrmtry share/locale/sa
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
 @dirrmtry share/locale/ps/LC_MESSAGES
 @dirrmtry share/locale/ps
 @dirrmtry share/locale/om/LC_MESSAGES
@@ -495,4 +494,3 @@ share/xml/iso-codes/iso_639_3.xml
 @dirrmtry share/locale/byn
 @dirrmtry share/locale/aa/LC_MESSAGES
 @dirrmtry share/locale/aa
-@dirrm %%DATADIR%%