[csw-devel] SF.net SVN: gar:[10818] csw/mgar/pkg/gettext/trunk

[bdwalton at users.sourceforge.net]

Revision: 10818
          http://gar.svn.sourceforge.net/gar/?rev=10818&view=rev
Author:   bdwalton
Date:     2010-08-26 22:45:40 +0000 (Thu, 26 Aug 2010)

Log Message:
-----------
gettext: update patches; drop extra ld_flags

Modified Paths:
--------------
    csw/mgar/pkg/gettext/trunk/Makefile
    csw/mgar/pkg/gettext/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/gettext/trunk/files/0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch

Modified: csw/mgar/pkg/gettext/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gettext/trunk/Makefile	2010-08-26 21:14:17 UTC (rev 10817)
+++ csw/mgar/pkg/gettext/trunk/Makefile	2010-08-26 22:45:40 UTC (rev 10818)
@@ -27,10 +27,7 @@
 DISTFILES += libintl.so.3.i
 DISTFILES += libintl.so.3.s
 
-#Apply two bug fixes from gnulib, retrieved from:
-#http://git.savannah.gnu.org/cgit/gnulib.git/tree/tests/test-wcwidth.c
-#blob: 582a8aa2e87a8235186aa3b1e402bbf03e6646a7
-PATCHFILES = test-wcwidth.patch
+PATCHFILES += 0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --program-prefix=g
@@ -40,9 +37,6 @@
 #No glibc
 CONFIGURE_ARGS += --with-included-gettext
 
-#Fix acl bug http://savannah.gnu.org/bugs/?21604
-EXTRA_LD_FLAGS = -lsec
-
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 BUILD64 = 1

Modified: csw/mgar/pkg/gettext/trunk/checksums
===================================================================
--- csw/mgar/pkg/gettext/trunk/checksums	2010-08-26 21:14:17 UTC (rev 10817)
+++ csw/mgar/pkg/gettext/trunk/checksums	2010-08-26 22:45:40 UTC (rev 10818)
@@ -1,3 +1,4 @@
+a772021542b5c511ea9542a06996ed64  0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch
 3dd55b952826d2b32f51308f2f91aa89  gettext-0.18.1.1.tar.gz
 d44a9a6ec0952bad7ad07026ccb42a10  libgettextlib-0.14.1.so.i
 ff0219d47dbc11034b55872172488e01  libgettextlib-0.14.1.so.s
@@ -5,4 +6,3 @@
 3ab768083f6ecc5cada151e49be21aa0  libintl.so.2.s
 ceb5de2326a4726d3710fe1512b84592  libintl.so.3.i
 88db7322e263a00f24269a7f364fdc2d  libintl.so.3.s
-710effbaef82fd7db1d807e5aa46154a  test-wcwidth.patch

Added: csw/mgar/pkg/gettext/trunk/files/0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch
===================================================================
--- csw/mgar/pkg/gettext/trunk/files/0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch	                        (rev 0)
+++ csw/mgar/pkg/gettext/trunk/files/0001-Use-the-auto-detected-SHELL-to-run-convert-archive.patch	2010-08-26 22:45:40 UTC (rev 10818)
@@ -0,0 +1,39 @@
+From 5ab8effba3fe58f3adf06190be6e27ada75f2658 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Thu, 26 Aug 2010 03:44:59 +0200
+Subject: [PATCH] Use the auto-detected SHELL to run convert-archive
+
+The convert-archive script was failing on Solaris due to a nested {}
+construct that it's broken /bin/sh couldn't handle.  We now force the
+use of the auto-detected POSIX-compliant SHELL to run that script.
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ gettext-tools/misc/Makefile.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gettext-tools/misc/Makefile.in b/gettext-tools/misc/Makefile.in
+index 8d2b112..bc42b35 100644
+--- a/gettext-tools/misc/Makefile.in
++++ b/gettext-tools/misc/Makefile.in
+@@ -1533,7 +1533,7 @@ archive.git.tar.gz: archive.dir.tar.gz
+ 	else \
+ 	  inputfile='$(srcdir)'/archive.dir.tar.gz; \
+ 	fi; \
+-	./convert-archive dir git "$$inputfile" $@
++	$(SHELL) ./convert-archive dir git "$$inputfile" $@
+ 
+ # The archive.cvs.tar.gz is generated from archive.dir.tar.gz.
+ archive.cvs.tar.gz: archive.dir.tar.gz
+@@ -1542,7 +1542,7 @@ archive.cvs.tar.gz: archive.dir.tar.gz
+ 	else \
+ 	  inputfile='$(srcdir)'/archive.dir.tar.gz; \
+ 	fi; \
+-	./convert-archive dir cvs "$$inputfile" $@
++	$(SHELL) ./convert-archive dir cvs "$$inputfile" $@
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+-- 
+1.7.1
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.