diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
commit | d87262dd706fec50cd150aab3e93883b6337466d (patch) | |
tree | 246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-misc/getopt/files | |
parent | 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-misc/getopt/files')
-rw-r--r-- | app-misc/getopt/files/getopt-1.1.4-irix.patch | 17 | ||||
-rw-r--r-- | app-misc/getopt/files/getopt-1.1.5-libintl.patch | 11 | ||||
-rw-r--r-- | app-misc/getopt/files/getopt-1.1.5-setlocale.patch | 12 | ||||
-rw-r--r-- | app-misc/getopt/files/getopt-1.1.6-longrename.patch | 70 |
4 files changed, 0 insertions, 110 deletions
diff --git a/app-misc/getopt/files/getopt-1.1.4-irix.patch b/app-misc/getopt/files/getopt-1.1.4-irix.patch deleted file mode 100644 index 0c344a80131a..000000000000 --- a/app-misc/getopt/files/getopt-1.1.4-irix.patch +++ /dev/null @@ -1,17 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=211499 - ---- gnu/getopt.c.dist -+++ gnu/getopt.c -@@ -69,12 +69,7 @@ - #include <unistd.h> - #endif /* GNU C library. */ - --#ifdef VMS --#include <unixlib.h> --#if HAVE_STRING_H - 0 - #include <string.h> --#endif --#endif - - #if defined (WIN32) && !defined (__CYGWIN32__) - /* It's not Unix, really. See? Capital letters. */ diff --git a/app-misc/getopt/files/getopt-1.1.5-libintl.patch b/app-misc/getopt/files/getopt-1.1.5-libintl.patch deleted file mode 100644 index b40367105ed0..000000000000 --- a/app-misc/getopt/files/getopt-1.1.5-libintl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2012-12-28 11:40:09.524686698 +0100 -+++ Makefile 2012-12-28 11:41:20.646157275 +0100 -@@ -61,7 +61,7 @@ - -$(RM) $(objects) $(binaries) - - getopt: $(objects) -- $(CC) $(LDFLAGS) -o $@ $(objects) -+ $(CC) $(LDFLAGS) -o $@ $(objects) $(LIBINTL) - - install: getopt install_po - $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir) diff --git a/app-misc/getopt/files/getopt-1.1.5-setlocale.patch b/app-misc/getopt/files/getopt-1.1.5-setlocale.patch deleted file mode 100644 index 2d302d9c6a67..000000000000 --- a/app-misc/getopt/files/getopt-1.1.5-setlocale.patch +++ /dev/null @@ -1,12 +0,0 @@ -setlocale: we need locale.h for LC_ALL on OpenIndiana - ---- getopt-1.1.5/nls.h -+++ getopt-1.1.5/nls.h -@@ -40,6 +40,7 @@ - #undef setlocale - #define setlocale(Category,Locale) /* empty */ - #else /* not WITHOUT_GETTEXT */ -+#include <locale.h> - #include <libintl.h> - #define _(Text) gettext (Text) - #endif /* WITHOUT_GETTEXT */ diff --git a/app-misc/getopt/files/getopt-1.1.6-longrename.patch b/app-misc/getopt/files/getopt-1.1.6-longrename.patch deleted file mode 100644 index f2b4ba79a090..000000000000 --- a/app-misc/getopt/files/getopt-1.1.6-longrename.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -32,7 +32,7 @@ MSGFMT=msgfmt - LANGUAGES = ca cs da de es et eu fi fr gl hr hu id it ja nl pl pt_BR ru sl sv tr uk vi zh_CN zh_TW - MOFILES:=$(patsubst %,po/%.mo,$(LANGUAGES)) - --CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITHOUT_GETTEXT=$(WITHOUT_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -Dprogram_invocation_short_name=\"$(PACKAGE)\" -Dprogram_version=\"$(VERSION)\" -+CPPFLAGS=-DLIBCGETOPT=$(LIBCGETOPT) -DWITHOUT_GETTEXT=$(WITHOUT_GETTEXT) -DLOCALEDIR=\"$(localedir)\" -DNOT_UTIL_LINUX -Dprogram_invocation_short_name=\"$(PACKAGE)-long\" -Dprogram_version=\"$(VERSION)\" - ifeq ($(LIBCGETOPT),0) - CPPFLAGS+=-I./gnu - endif -@@ -81,7 +81,7 @@ install_po: all_po - for lang in $(LANGUAGES) ; do \ - dir=$(localedir)/$$lang/LC_MESSAGES; \ - $(INSTALL) -m 755 -d $(DESTDIR)$$dir ;\ -- $(INSTALL) -m 644 po/$$lang.mo $(DESTDIR)$$dir/getopt.mo ;\ -+ $(INSTALL) -m 644 po/$$lang.mo $(DESTDIR)$$dir/getopt-long.mo ;\ - done - clean_po: - $(RM) $(MOFILES) ---- a/getopt-parse.bash -+++ b/getopt-parse.bash -@@ -19,7 +19,7 @@ - # Note that we use `"$@"' to let each command-line parameter expand to a - # separate word. The quotes around `$@' are essential! - # We need TEMP as the `eval set --' would nuke the return value of getopt. --TEMP=`getopt -o ab:c:: --long a-long,b-long:,c-long:: \ -+TEMP=`getopt-long -o ab:c:: --long a-long,b-long:,c-long:: \ - -n 'example.bash' -- "$@"` - - if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi ---- a/getopt-parse.tcsh -+++ b/getopt-parse.tcsh -@@ -26,7 +26,7 @@ - # as a list. The ':q` copies that list without doing any substitutions: - # each element of argv becomes a separate argument for getopt. The braces - # are needed because the result is also a list. --set temp=(`getopt -s tcsh -o ab:c:: --long a-long,b-long:,c-long:: -- $argv:q`) -+set temp=(`getopt-long -s tcsh -o ab:c:: --long a-long,b-long:,c-long:: -- $argv:q`) - if ($? != 0) then - echo "Terminating..." >/dev/stderr - exit 1 ---- a/getopt.c -+++ b/getopt.c -@@ -344,12 +344,12 @@ static void __attribute__ ((__noreturn__)) print_help(void) - fputs(_(" -q, --quiet Disable error reporting by getopt(3)\n"), stderr); - fputs(_(" -Q, --quiet-output No normal output\n"), stderr); - fputs(_(" -s, --shell <shell> Set shell quoting conventions\n"), stderr); -- fputs(_(" -T, --test Test for getopt(1) version\n"), stderr); -+ fputs(_(" -T, --test Test for getopt-long(1) version\n"), stderr); - fputs(_(" -u, --unquoted Do not quote the output\n"), stderr); - fputs(USAGE_SEPARATOR, stderr); - fputs(USAGE_HELP, stderr); - fputs(USAGE_VERSION, stderr); -- fprintf(stderr, USAGE_MAN_TAIL("getopt(1)")); -+ fprintf(stderr, USAGE_MAN_TAIL("getopt-long(1)")); - exit(PARAMETER_EXIT_CODE); - } - ---- a/nls.h -+++ b/nls.h -@@ -29,7 +29,7 @@ - #ifndef GETOPT_NLS - #define GETOPT_NLS - --#define PACKAGE "getopt" -+#define PACKAGE "getopt-long" - - #if WITHOUT_GETTEXT - #define _(Text) (Text) |