From 520d99bc1d9521cc33ec5ad060bf12d22afc245e Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Mon, 10 Jun 2013 22:03:04 +0200
Subject: [PATCH] gettext: update recipe

Build a separate gettext_libintl package, which only contains libintl,
the runtime dependency of gettext'ified ports.
---
 sys-devel/gettext/gettext-0.18.1.1.recipe | 39 +++++++++++++++++------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/sys-devel/gettext/gettext-0.18.1.1.recipe b/sys-devel/gettext/gettext-0.18.1.1.recipe
index 5305a6aeb..e16d0fcf5 100644
--- a/sys-devel/gettext/gettext-0.18.1.1.recipe
+++ b/sys-devel/gettext/gettext-0.18.1.1.recipe
@@ -5,12 +5,11 @@ LICENSE="GNU GPL v3"
 COPYRIGHT="1998, 2010 Free Software Foundation, Inc."
 SRC_URI="http://ftp.gnu.org/pub/gnu/gettext/gettext-0.18.1.1.tar.gz"
 CHECKSUM_MD5="3dd55b952826d2b32f51308f2f91aa89"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="x86_gcc2 ?x86"
 
 PATCHES="gettext-0.18.1.1.patch"
 
-# TODO: Check command versions!
 PROVIDES="
 	gettext = $portVersion compat >= 0.18.1
 	cmd:autopoint = $portVersion compat >= 0
@@ -35,18 +34,25 @@ PROVIDES="
 	cmd:ngettext = $portVersion compat >= 0
 	cmd:recode_sr_latin = $portVersion compat >= 0
 	cmd:xgettext = $portVersion compat >= 0
+	devel:libasprintf = 0.0.0 compat >= 0
+	devel:libgettextlib = $portVersion
+	devel:libgettextlib_0.18.1 = $portVersion
+	devel:libgettextpo = 0.5.1 compat >= 0
+	devel:libgettextsrc = $portVersion
+	devel:libgettextsrc_0.18.1 = $portVersion
+	devel:libintl = 8.1.1 compat >= 8
 	lib:libasprintf = 0.0.0 compat >= 0
-	lib:libgettextlib = $portVersion
+	lib:libgettextlib_0.18.1 = $portVersion
 	lib:libgettextpo = 0.5.1 compat >= 0
-	lib:libgettextsrc = $portVersion
-	lib:libintl = 8.1.1 compat >= 8
+	lib:libgettextsrc_0.18.1 = $portVersion
 	"
 REQUIRES="
 	haiku >= $haikuVersion
+	gettext_libintl == $portVersion base
 	lib:libiconv
+	lib:libncurses
 	"
 BUILD_REQUIRES="
-	$REQUIRES
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -55,6 +61,8 @@ BUILD_REQUIRES="
 	cmd:libtoolize
 	cmd:make
 	cmd:makeinfo
+	devel:libiconv
+	devel:libncurses
 	"
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
@@ -81,10 +89,9 @@ INSTALL()
 	prepareInstalledDevelLib libgettextlib '*.so' '*'
 	prepareInstalledDevelLib libgettextsrc '*.so' '*'
 
-	# TODO: Several programs are installed in $libDir/gettext ($(pkglibdir) in
-	# the respective Makefile.am files). A better place would be
-	# $libExecDir/gettext. Since the programs are probably invoked by other
-	# programs, that might require some additional changes to the sources.
+	# libintl package
+	packageEntries libintl \
+		$libDir/libintl*
 }
 
 TEST()
@@ -92,3 +99,15 @@ TEST()
 	cd gettext-runtime/tests
 	make check
 }
+
+# ----- libintl package -------------------------------------------------------
+
+SUMMARY_libintl="The gettext internationalization library"
+PROVIDES_libintl="
+	gettext_libintl = $portVersion compat >= 1
+	lib:libintl = 8.1.1 compat >= 8
+	"
+REQUIRES_libintl="
+	haiku >= $haikuVersion
+	lib:libiconv
+	"