Split devel/gettext in devel/gettext-runtime and devel/gettext-tools. The

first contains runtime libraries such as libintl and the latter contains
developer tools such as msgfmt.  Ports that use gettext will usually need
a LIB_DEPENDS on gettext-runtime and a BUILD_DEPENDS on gettext-tools.

USES=gettext-runtime can be used to set a LIB/BUILD/RUN_DEPENDS on
devel/gettext-runtime and USES=gettext-tools can be used to set a
BUILD/RUN_DEPENDS on devel/gettext-tools.  USES=gettext is now the same
as "USES=gettext-runtime gettext-tools" meaning a LIB_DEPENDS on
devel/gettext-runtime and a BUILD_DEPENDS on devel/gettext-tools.

Update gettext to 0.19.3.

Remove :oldver from converters/libiconv and devel/gettext-runtime.  Leave
symlinks with the old library versions to avoid the need to bump
PORTREVISION on a large number of dependent ports.  When most of the
dependent ports have had normal version updates, PORTREVISION can be
bumped on the remaining ones (low number) and the links can be removed.

Fix some ports that installed files in lib/locale instead of share/locale.

PR:		194038
Reviewed by:	bapt
Exp-run:	antoine
Approved by:	portmgr (antoine)

5 files changed, 7 insertions, 7 deletions

diff --git a/misc/gimp-help-en/Makefile b/misc/gimp-help-en/Makefile
index ee8f60f9e340..4ecb8abe06ca 100644
--- a/misc/gimp-help-en/Makefile
+++ b/misc/gimp-help-en/Makefile
@@ -22,7 +22,7 @@ LICENSE=	GFDL
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 \
 		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl
 
-USES=		gettext:build gmake perl5 pkgconfig python shebangfix tar:bzip2
+USES=		gettext-tools gmake perl5 pkgconfig python shebangfix tar:bzip2
 USE_GNOME=	libxslt:build
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
diff --git a/misc/gnome-devel-docs/Makefile b/misc/gnome-devel-docs/Makefile
index efbf9f713231..7ccf8cd6f540 100644
--- a/misc/gnome-devel-docs/Makefile
+++ b/misc/gnome-devel-docs/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Documents targeted for GNOME developers
 BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 #RUN_DEPENDS=	gnome-doc-prepare:${PORTSDIR}/textproc/gnome-doc-utils
 
-USES=		gmake pkgconfig tar:xz
+USES=		gettext-tools gmake pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile
index 8e621f6d374c..0616ca3657b2 100644
--- a/misc/gnome-icon-theme/Makefile
+++ b/misc/gnome-icon-theme/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicol
 		gnome-icon-theme-symbolic>=0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic
 
 GNU_CONFIGURE=	yes
-USES=		gmake pathfix pkgconfig tar:xz
+USES=		gettext-tools gmake pathfix pkgconfig tar:xz
 USE_GNOME=	intlhack
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--enable-icon-mapping
diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index d6eb3eaa7603..b06d5845e771 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -14,7 +14,7 @@ COMMENT=	GNOME 3 users guide
 BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 
 GNU_CONFIGURE=	yes
-USES=		gettext:build gmake pathfix tar:xz
+USES=		gettext-tools gmake pathfix tar:xz
 USE_GNOME=	gnomeprefix libxml2:build
 
 .include <bsd.port.mk>
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index daf7be05b739..e513fd250b9f 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pinfo
 PORTVERSION=	0.6.10
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	GENTOO/distfiles \
 		http://alioth.debian.org/frs/download.php/file/3351/
@@ -13,7 +14,7 @@ COMMENT=	Ncurses based, lynx style info documentation browser
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		autoreconf libtool makeinfo ncurses tar:bzip2
+USES=		autoreconf gettext-tools libtool makeinfo ncurses tar:bzip2
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
@@ -29,12 +30,11 @@ READLINE_CONFIGURE_WITH=	readline
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
+USES+=		gettext-runtime
 .for lang in cs de eu ja nl pl pt_BR ro ru sv vi
 PLIST_FILES+=	share/locale/${lang}/LC_MESSAGES/pinfo.mo
 .endfor
 .else
-USES+=		gettext:build
 CONFIGURE_ARGS+=--disable-nls
 .endif