| 1 |
grobian 12/12/28 09:10:26 |
| 2 |
|
| 3 |
Added: getopt-1.1.5-setlocale.patch |
| 4 |
getopt-1.1.5-longrename.patch |
| 5 |
Log: |
| 6 |
Version bump, fix for build problem on OpenIndiana |
| 7 |
|
| 8 |
(Portage version: 2.2.01.21418-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 app-misc/getopt/files/getopt-1.1.5-setlocale.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/getopt/files/getopt-1.1.5-setlocale.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/getopt/files/getopt-1.1.5-setlocale.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: getopt-1.1.5-setlocale.patch |
| 17 |
=================================================================== |
| 18 |
setlocale: we need locale.h for LC_ALL on OpenIndiana |
| 19 |
|
| 20 |
--- getopt-1.1.5/nls.h |
| 21 |
+++ getopt-1.1.5/nls.h |
| 22 |
@@ -40,6 +40,7 @@ |
| 23 |
#undef setlocale |
| 24 |
#define setlocale(Category,Locale) /* empty */ |
| 25 |
#else /* not WITHOUT_GETTEXT */ |
| 26 |
+#include <locale.h> |
| 27 |
#include <libintl.h> |
| 28 |
#define _(Text) gettext (Text) |
| 29 |
#endif /* WITHOUT_GETTEXT */ |
| 30 |
|
| 31 |
|
| 32 |
|
| 33 |
1.1 app-misc/getopt/files/getopt-1.1.5-longrename.patch |
| 34 |
|
| 35 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/getopt/files/getopt-1.1.5-longrename.patch?rev=1.1&view=markup |
| 36 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/getopt/files/getopt-1.1.5-longrename.patch?rev=1.1&content-type=text/plain |
| 37 |
|
| 38 |
Index: getopt-1.1.5-longrename.patch |
| 39 |
=================================================================== |
| 40 |
--- getopt-1.1.5/getopt-parse.bash |
| 41 |
+++ getopt-1.1.5/getopt-parse.bash |
| 42 |
@@ -19,7 +19,7 @@ |
| 43 |
# Note that we use `"$@"' to let each command-line parameter expand to a |
| 44 |
# separate word. The quotes around `$@' are essential! |
| 45 |
# We need TEMP as the `eval set --' would nuke the return value of getopt. |
| 46 |
-TEMP=`getopt -o ab:c:: --long a-long,b-long:,c-long:: \ |
| 47 |
+TEMP=`getopt-long -o ab:c:: --long a-long,b-long:,c-long:: \ |
| 48 |
-n 'example.bash' -- "$@"` |
| 49 |
|
| 50 |
if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi |
| 51 |
--- getopt-1.1.5/getopt-parse.tcsh |
| 52 |
+++ getopt-1.1.5/getopt-parse.tcsh |
| 53 |
@@ -26,7 +26,7 @@ |
| 54 |
# as a list. The ':q` copies that list without doing any substitutions: |
| 55 |
# each element of argv becomes a separate argument for getopt. The braces |
| 56 |
# are needed because the result is also a list. |
| 57 |
-set temp=(`getopt -s tcsh -o ab:c:: --long a-long,b-long:,c-long:: -- $argv:q`) |
| 58 |
+set temp=(`getopt-long -s tcsh -o ab:c:: --long a-long,b-long:,c-long:: -- $argv:q`) |
| 59 |
if ($? != 0) then |
| 60 |
echo "Terminating..." >/dev/stderr |
| 61 |
exit 1 |
| 62 |
--- getopt-1.1.5/getopt.c |
| 63 |
+++ getopt-1.1.5/getopt.c |
| 64 |
@@ -320,10 +320,10 @@ |
| 65 |
|
| 66 |
static void __attribute__ ((__noreturn__)) print_help(void) |
| 67 |
{ |
| 68 |
- fputs(_("Usage: getopt optstring parameters\n"), stderr); |
| 69 |
- fputs(_(" getopt [options] [--] optstring parameters\n"), stderr); |
| 70 |
- fputs(_(" getopt [options] -o|--options optstring [options] [--]\n"), stderr); |
| 71 |
- fputs(_(" parameters\n"), stderr); |
| 72 |
+ fputs(_("Usage: getopt-long optstring parameters\n"), stderr); |
| 73 |
+ fputs(_(" getopt-long [options] [--] optstring parameters\n"), stderr); |
| 74 |
+ fputs(_(" getopt-long [options] -o|--options optstring [options] [--]\n"), stderr); |
| 75 |
+ fputs(_(" parameters\n"), stderr); |
| 76 |
fputs(_("\nOptions:\n"), stderr); |
| 77 |
fputs(_(" -a, --alternative Allow long options starting with single -\n"), stderr); |
| 78 |
fputs(_(" -h, --help This small usage guide\n"), stderr); |
| 79 |
@@ -333,7 +333,7 @@ |
| 80 |
fputs(_(" -q, --quiet Disable error reporting by getopt(3)\n"), stderr); |
| 81 |
fputs(_(" -Q, --quiet-output No normal output\n"), stderr); |
| 82 |
fputs(_(" -s, --shell <shell> Set shell quoting conventions\n"), stderr); |
| 83 |
- fputs(_(" -T, --test Test for getopt(1) version\n"), stderr); |
| 84 |
+ fputs(_(" -T, --test Test for getopt-long(1) version\n"), stderr); |
| 85 |
fputs(_(" -u, --unquote Do not quote the output\n"), stderr); |
| 86 |
fputs(_(" -V, --version Output version information\n"), stderr); |
| 87 |
fputc('\n', stderr); |
| 88 |
--- getopt-1.1.5/Makefile |
| 89 |
+++ getopt-1.1.5/Makefile |
| 90 |
@@ -32,7 +32,7 @@ |
| 91 |
LANGUAGES = ca cs da de es et eu fi fr gl hu id it ja nl pl pt_BR ru sl sv tr uk vi zh_CN zh_TW |
| 92 |
MOFILES:=$(patsubst %,po/%.mo,$(LANGUAGES)) |
| 93 |
|
| 94 |
-CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITHOUT_GETTEXT=$(WITHOUT_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -Dprogram_invocation_short_name=\"$(PACKAGE)\" -Dprogram_version=\"$(VERSION)\" |
| 95 |
+CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITHOUT_GETTEXT=$(WITHOUT_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -Dprogram_invocation_short_name=\"$(PACKAGE)-long\" -Dprogram_version=\"$(VERSION)\" |
| 96 |
ifeq ($(LIBCGETOPT),0) |
| 97 |
CPPFLAGS+=-I./gnu |
| 98 |
endif |
| 99 |
@@ -81,7 +81,7 @@ |
| 100 |
for lang in $(LANGUAGES) ; do \ |
| 101 |
dir=$(localedir)/$$lang/LC_MESSAGES; \ |
| 102 |
$(INSTALL) -m 755 -d $(DESTDIR)$$dir ;\ |
| 103 |
- $(INSTALL) -m 644 po/$$lang.mo $(DESTDIR)$$dir/getopt.mo ;\ |
| 104 |
+ $(INSTALL) -m 644 po/$$lang.mo $(DESTDIR)$$dir/getopt-long.mo ;\ |
| 105 |
done |
| 106 |
clean_po: |
| 107 |
$(RM) $(MOFILES) |
| 108 |
--- getopt-1.1.5/nls.h |
| 109 |
+++ getopt-1.1.5/nls.h |
| 110 |
@@ -29,7 +29,7 @@ |
| 111 |
#ifndef GETOPT_NLS |
| 112 |
#define GETOPT_NLS |
| 113 |
|
| 114 |
-#define PACKAGE "getopt" |
| 115 |
+#define PACKAGE "getopt-long" |
| 116 |
|
| 117 |
#if WITHOUT_GETTEXT |
| 118 |
#define _(Text) (Text) |
Archives