From 258ab2b2e09e891a0e90389282afa721eecd9a5f Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 27 Dec 2012 12:37:02 +0100
Subject: [PATCH] gettext: update to 0.18.2.

---
 srcpkgs/gettext/gettext-devel.template | 12 ++--------
 srcpkgs/gettext/gettext-libs.template  | 11 ++-------
 srcpkgs/gettext/template               | 32 ++++++++------------------
 3 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/srcpkgs/gettext/gettext-devel.template b/srcpkgs/gettext/gettext-devel.template
index 34cdc617976..dd6e8f7d111 100644
--- a/srcpkgs/gettext/gettext-devel.template
+++ b/srcpkgs/gettext/gettext-devel.template
@@ -1,17 +1,9 @@
 # Template file for 'gettext-devel'.
 #
-depends="glibc-devel gettext-libs"
+depends="gettext-libs>=${version}"
 short_desc="${short_desc} (development files)"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mkdir -p ${DESTDIR}/usr/share/doc
 
+do_install() {
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/share/doc/gettext ${DESTDIR}/usr/share/doc
diff --git a/srcpkgs/gettext/gettext-libs.template b/srcpkgs/gettext/gettext-libs.template
index 07838dd1913..c951930c728 100644
--- a/srcpkgs/gettext/gettext-libs.template
+++ b/srcpkgs/gettext/gettext-libs.template
@@ -1,14 +1,7 @@
 # Template file for 'gettext-libs'.
 #
 short_desc="${short_desc} - shared libraries"
-long_desc="${long_desc}
 
- This package contains the ${sourcepkg} shared libraries."
-
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.so* ${DESTDIR}/usr/lib
+do_install() {
+	vmove "usr/lib/*.so*" usr/lib
 }
diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template
index 77e592a84ad..12580096708 100644
--- a/srcpkgs/gettext/template
+++ b/srcpkgs/gettext/template
@@ -1,28 +1,16 @@
 # Template build file for 'gettext'.
 pkgname=gettext
-version=0.18.1.1
-revision=4
-distfiles="http://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$version.tar.gz"
+version=0.18.2
+revision=1
+subpackages="${pkgname}-devel ${pkgname}-libs"
 build_style=gnu-configure
 configure_args="--disable-java --disable-native-java --disable-csharp
---disable-libasprintf --enable-threads=posix --disable-rpath
---disable-acl --with-included-glib --with-included-libcroco
---with-included-libxml --without-included-regex --without-emacs"
-makedepends="ncurses-devel libgomp-devel"
+ --disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs"
+makedepends="ncurses-devel libgomp-devel glib-devel libxml2-devel
+ libcroco-devel acl-devel"
 short_desc="Internationalized Message Handling Library and tools"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9
-long_desc="
- GNU gettext provides the necessary tools and libraries for handling
- messages in different languages, as one of the steps to
- internationalisation (or i18n) of a utility."
-
-subpackages="$pkgname-devel $pkgname-libs"
-
-post_configure() {
-	# Disable ACL.
-	sed -i 's@#define.*_ACL.*@/*&*/@g' ${wrksrc}/gettext-tools/config.h
-	for f in $(find ${wrksrc} -name Makefile); do
-		sed -i 's@-lacl@@g' ${f}
-	done
-}
+homepage="http://www.gnu.org/software/gettext/"
+license="GPL-3"
+distfiles="http://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=516a6370b3b3f46e2fc5a5e222ff5ecd76f3089bc956a7587a6e4f89de17714c