# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1375269159 -10800
# Node ID c40da21aa3a1852645f1c02bb8cdc8982b5eddf8
# Parent  aef7f09945857f960aec51976b935d9f26acaa60
gettext: up 0.18.3, tiny edits

diff -r aef7f0994585 -r c40da21aa3a1 gettext-base/receipt
--- a/gettext-base/receipt	Wed Jul 31 14:01:55 2013 +0300
+++ b/gettext-base/receipt	Wed Jul 31 14:12:39 2013 +0300
@@ -1,14 +1,16 @@
 # SliTaz package receipt.
 
 PACKAGE="gettext-base"
-VERSION="0.18.1.1"
+VERSION="0.18.3"
 CATEGORY="base-system"
 SHORT_DESC="Base tools from the GNU Translation Project."
 MAINTAINER="pankso@slitaz.org"
+LICENSE="GPL3"
+WEB_SITE="http://www.gnu.org/software/gettext/"
+HOST_ARCH="i486 arm"
+
 DEPENDS="glibc-base"
 WANTED="gettext"
-WEB_SITE="http://www.gnu.org/software/gettext/"
-HOST_ARCH="i486 arm"
 
 # Just to be sure when cross compiling, gettext is part of base system.
 testsuite()
@@ -20,9 +22,9 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/bin
-	cp -a $install/usr/bin/gettext $fs/usr/bin
-	cp -a $install/usr/bin/gettext.sh $fs/usr/bin
-	# These are used in gettext.sh so there needed
-	cp -a $install/usr/bin/envsubst $fs/usr/bin
-	cp -a $install/usr/bin/ngettext $fs/usr/bin
+	install -m755 $install/usr/bin/gettext \
+		$stuff/gettext.sh \
+		$install/usr/bin/envsubst \
+		$install/usr/bin/ngettext \
+		$fs/usr/bin
 }
diff -r aef7f0994585 -r c40da21aa3a1 gettext-base/stuff/gettext.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gettext-base/stuff/gettext.sh	Wed Jul 31 14:12:39 2013 +0300
@@ -0,0 +1,7 @@
+#!/bin/sh
+eval_gettext() {
+  gettext "$1" | (export PATH $(envsubst --variables "$1"); envsubst "$1")
+}
+eval_ngettext() {
+  ngettext "$1" "$2" "$3" | (export PATH $(envsubst --variables "$1 $2"); envsubst "$1 $2")
+}
diff -r aef7f0994585 -r c40da21aa3a1 gettext/receipt
--- a/gettext/receipt	Wed Jul 31 14:01:55 2013 +0300
+++ b/gettext/receipt	Wed Jul 31 14:12:39 2013 +0300
@@ -1,18 +1,19 @@
 # SliTaz package receipt.
 
 PACKAGE="gettext"
-VERSION="0.18.1.1"
+VERSION="0.18.3"
 CATEGORY="development"
 SHORT_DESC="Utilities for the GNU Translation Project."
 MAINTAINER="pankso@slitaz.org"
+LICENSE="GPL3"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.gnu.org/software/gettext/"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
 HOST_ARCH="i486 arm"
 
 # Why deps on glib-dev ??? And glib build depends on gettext anyway...
-DEPENDS="gettext-base libgomp ncurses gcc-lib-base glib libxml2"
-BUILD_DEPENDS="glibc-locale ncurses-dev glib-dev libxml2-tools libxml2-dev"
+DEPENDS="gettext-base libgomp acl-dev gcc-lib-base glib-dev libxml2-dev m4"
+BUILD_DEPENDS="acl attr-dev glib-dev libxml2-dev ncurses-dev"
 
 # Handle cross compilation. Glibc-locale are installed in cross chroot.
 case "$ARCH" in
diff -r aef7f0994585 -r c40da21aa3a1 slitaz-i18n/stuff/locale-pack.conf
--- a/slitaz-i18n/stuff/locale-pack.conf	Wed Jul 31 14:01:55 2013 +0300
+++ b/slitaz-i18n/stuff/locale-pack.conf	Wed Jul 31 14:12:39 2013 +0300
@@ -1,7 +1,7 @@
 
 # Packages LC_MESSAGES included in the locale pack.
 CORE_PKGS="acl alsaplayer alsa-utils asunder atk attr dialog e2fsprogs epdfview \
-galculator gcc-lib-base gcolor2 gdk-pixbuf gettext-base glib glibc-base gparted \
+galculator gcc-lib-base gcolor2 gdk-pixbuf glib glibc-base gparted \
 gtk+ isomaster kbd-base leafpad libwebkit lostirc lxappearance lxpanel lxrandr \
 lxtask mhwaveedit midori mtpaint nano obconf openbox parcellite parted pcmanfm \
 popt retawq sakura transmission viewnior yad"