[csw-devel] SF.net SVN: gar:[12527] csw/mgar/pkg/getopt/trunk

[dmichelsen at users.sourceforge.net]

Revision: 12527
          http://gar.svn.sourceforge.net/gar/?rev=12527&view=rev
Author:   dmichelsen
Date:     2011-01-13 20:09:01 +0000 (Thu, 13 Jan 2011)

Log Message:
-----------
getopt: Some more patches, libintl support still missing

Modified Paths:
--------------
    csw/mgar/pkg/getopt/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/getopt/trunk/files/0002-Do-not-make-standalone-version.patch
    csw/mgar/pkg/getopt/trunk/files/0003-Makefile-settings.patch

Modified: csw/mgar/pkg/getopt/trunk/Makefile
===================================================================
--- csw/mgar/pkg/getopt/trunk/Makefile	2011-01-13 18:14:00 UTC (rev 12526)
+++ csw/mgar/pkg/getopt/trunk/Makefile	2011-01-13 20:09:01 UTC (rev 12527)
@@ -14,7 +14,9 @@
 MASTER_SITES = http://software.frodo.looijaard.name/getopt/files/
 DISTFILES  = $(DISTNAME).tar.gz
 
-PATCHFILES = 0001-Include-locale.h-when-using-gettext.patch
+PATCHFILES += 0001-Include-locale.h-when-using-gettext.patch
+PATCHFILES += 0002-Do-not-make-standalone-version.patch
+PATCHFILES += 0003-Makefile-settings.patch
 
 # File name regex to get notifications about upstream software releases
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
@@ -27,11 +29,12 @@
 # No scipt there...
 CONFIGURE_SCRIPTS =
 
-BUILD_OVERRIDE_VARS = prefix CC CFLAGS LIBCGETOPT
+BUILD_OVERRIDE_VARS = prefix CC CFLAGS LIBCGETOPT PACKAGE
 BUILD_OVERRIDE_VAR_prefix = $(prefix)
 BUILD_OVERRIDE_VAR_CC = $(CC)
 BUILD_OVERRIDE_VAR_CFLAGS = $(CFLAGS)
 BUILD_OVERRIDE_VAR_LIBCGETOPT = 0
+BUILD_OVERRIDE_VAR_PACKAGE = ggetopt
 
 TEST_TARGET =
 

Added: csw/mgar/pkg/getopt/trunk/files/0002-Do-not-make-standalone-version.patch
===================================================================
--- csw/mgar/pkg/getopt/trunk/files/0002-Do-not-make-standalone-version.patch	                        (rev 0)
+++ csw/mgar/pkg/getopt/trunk/files/0002-Do-not-make-standalone-version.patch	2011-01-13 20:09:01 UTC (rev 12527)
@@ -0,0 +1,25 @@
+From ba945f1f552d5ef7f1a0305fb78eb6116c8c3aec Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 11 Jan 2011 13:38:58 +0100
+Subject: [PATCH] Do not make standalone version
+
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f930a28..1dbeae8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -33,7 +33,7 @@ MSGFMT=msgfmt
+ LANGUAGES = cs de es fr it ja nl pt_BR
+ MOFILES:=$(patsubst %,po/%.mo,$(LANGUAGES))
+ 
+-CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITH_GETTEXT=$(WITH_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX
++CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITH_GETTEXT=$(WITH_GETTEXT) -DLOCALEDIR=\"$(localedir)\"
+ ifeq ($(LIBCGETOPT),0)
+ CPPFLAGS+=-I./gnu 
+ endif
+-- 
+1.7.3.2
+

Added: csw/mgar/pkg/getopt/trunk/files/0003-Makefile-settings.patch
===================================================================
--- csw/mgar/pkg/getopt/trunk/files/0003-Makefile-settings.patch	                        (rev 0)
+++ csw/mgar/pkg/getopt/trunk/files/0003-Makefile-settings.patch	2011-01-13 20:09:01 UTC (rev 12527)
@@ -0,0 +1,35 @@
+From 8ffe7e11c63794acc19bc64a724de5ed03a12b86 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 13 Jan 2011 20:43:13 +0100
+Subject: [PATCH] Makefile settings
+
+---
+ Makefile |    5 +++--
+ 1 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1dbeae8..1bc401c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,7 +14,8 @@ localedir=$(sharedir)/locale
+ LIBCGETOPT=1
+ 
+ # Define this to 1 if you do not have the gettext routines
+-WITHOUT_GETTEXT=0
++#WITHOUT_GETTEXT=0
++WITH_GETTEXT=1
+ 
+ # For creating the archive
+ PACKAGE=getopt
+@@ -33,7 +34,7 @@ MSGFMT=msgfmt
+ LANGUAGES = cs de es fr it ja nl pt_BR
+ MOFILES:=$(patsubst %,po/%.mo,$(LANGUAGES))
+ 
+-CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITH_GETTEXT=$(WITH_GETTEXT) -DLOCALEDIR=\"$(localedir)\"
++CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX=1
+ ifeq ($(LIBCGETOPT),0)
+ CPPFLAGS+=-I./gnu 
+ endif
+-- 
+1.7.3.2
+


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