3 files changed, 99 insertions, 9 deletions

diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 5531c1c7fb30..31c0583cdeed 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -6,23 +6,28 @@
 #
 
 PORTNAME=	popt
-PORTVERSION=	1.5.1
-PORTREVISION=	1
+PORTVERSION=	1.6.4
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/ \
-		ftp://ftp.mirror.ac.uk/sites/ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/
+MASTER_SITES=	ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/ \
+		ftp://ftp.mirror.ac.uk/sites/ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/
 
-MAINTAINER=	ycheng@sinica.edu.tw
+MAINTAINER=	lioux@FreeBSD.org
 
 LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-1.5
-
 USE_LIBTOOL=	yes
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 MAN3=		popt.3
 
+post-patch:
+# avoid installing both charset.alias and locale.alias which conflict
+# with libiconv
+	@${REINPLACE_CMD} -E -e 's|(SUBDIRS[[:space:]]+=.*)intl|\1|' \
+		${WRKSRC}/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/devel/popt/distinfo b/devel/popt/distinfo
index 166c541d0277..9ec095f82c7a 100644
--- a/devel/popt/distinfo
+++ b/devel/popt/distinfo
@@ -1 +1 @@
-MD5 (popt-1.5.1.tar.gz) = f3317634fb7a1f9ed1c0d48a43a3a4fa
+MD5 (popt-1.6.4.tar.gz) = 734b375abdcc6bf70541d0bef8147449
diff --git a/devel/popt/pkg-plist b/devel/popt/pkg-plist
index f521b53d7584..de3a4a1ee47e 100644
--- a/devel/popt/pkg-plist
+++ b/devel/popt/pkg-plist
@@ -2,5 +2,90 @@ include/popt.h
 lib/libpopt.a
 lib/libpopt.so
 lib/libpopt.so.0
-share/locale/sk/LC_MESSAGES/popt.mo
+share/locale/cs/LC_MESSAGES/popt.mo
+share/locale/da/LC_MESSAGES/popt.mo
+share/locale/de/LC_MESSAGES/popt.mo
+share/locale/es/LC_MESSAGES/popt.mo
+share/locale/eu_ES/LC_MESSAGES/popt.mo
+share/locale/fi/LC_MESSAGES/popt.mo
+share/locale/fr/LC_MESSAGES/popt.mo
+share/locale/gl/LC_MESSAGES/popt.mo
+share/locale/hu/LC_MESSAGES/popt.mo
+share/locale/id/LC_MESSAGES/popt.mo
+share/locale/is/LC_MESSAGES/popt.mo
+share/locale/it/LC_MESSAGES/popt.mo
+share/locale/ja/LC_MESSAGES/popt.mo
+share/locale/ko/LC_MESSAGES/popt.mo
+share/locale/no/LC_MESSAGES/popt.mo
+share/locale/pl/LC_MESSAGES/popt.mo
+share/locale/pt/LC_MESSAGES/popt.mo
+share/locale/pt_BR/LC_MESSAGES/popt.mo
 share/locale/ro/LC_MESSAGES/popt.mo
+share/locale/ru/LC_MESSAGES/popt.mo
+share/locale/sk/LC_MESSAGES/popt.mo
+share/locale/sl/LC_MESSAGES/popt.mo
+share/locale/sr/LC_MESSAGES/popt.mo
+share/locale/sv/LC_MESSAGES/popt.mo
+share/locale/tr/LC_MESSAGES/popt.mo
+share/locale/uk/LC_MESSAGES/popt.mo
+share/locale/wa/LC_MESSAGES/popt.mo
+share/locale/zh/LC_MESSAGES/popt.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/popt.mo
+@unexec rmdir %D/share/locale/zh_CN.GB2312/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/zh_CN.GB2312 2>/dev/null || true
+@unexec rmdir %D/share/locale/zh/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/zh 2>/dev/null || true
+@unexec rmdir %D/share/locale/wa/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/wa 2>/dev/null || true
+@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/uk 2>/dev/null || true
+@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/tr 2>/dev/null || true
+@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sv 2>/dev/null || true
+@unexec rmdir %D/share/locale/sr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sr 2>/dev/null || true
+@unexec rmdir %D/share/locale/sl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sl 2>/dev/null || true
+@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sk 2>/dev/null || true
+@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ru 2>/dev/null || true
+@unexec rmdir %D/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ro 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pl 2>/dev/null || true
+@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/no 2>/dev/null || true
+@unexec rmdir %D/share/locale/ko/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ko 2>/dev/null || true
+@unexec rmdir %D/share/locale/ja/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ja 2>/dev/null || true
+@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/it 2>/dev/null || true
+@unexec rmdir %D/share/locale/is/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/is 2>/dev/null || true
+@unexec rmdir %D/share/locale/id/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/id 2>/dev/null || true
+@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/hu 2>/dev/null || true
+@unexec rmdir %D/share/locale/gl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/gl 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr 2>/dev/null || true
+@unexec rmdir %D/share/locale/fi/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/fi 2>/dev/null || true
+@unexec rmdir %D/share/locale/eu_ES/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/eu_ES 2>/dev/null || true
+@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/es 2>/dev/null || true
+@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/de 2>/dev/null || true
+@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/da 2>/dev/null || true
+@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/cs 2>/dev/null || true