omnibus-software 22.11.239

data/config/patches/libxslt/libxslt-solaris-configure.patch

@@ -0,0 +1,19 @@
+--- libxslt-1.1.28/configure.in	2016-01-19 13:45:52.000000000 -0800
++++ libxslt-1.1.28/configure	2016-01-19 13:46:11.000000000 -0800
+@@ -12849,11 +12849,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to pass version script to the linker ($LD)" >&5
+ $as_echo_n "checking how to pass version script to the linker ($LD)... " >&6; }
+ VERSION_SCRIPT_FLAGS=none
+-if $LD --help 2>&1 | grep "version-script" >/dev/null 2>/dev/null; then
+-    VERSION_SCRIPT_FLAGS=-Wl,--version-script=
+-elif $LD --help 2>&1 | grep "M mapfile" >/dev/null 2>/dev/null; then
+-    VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
+-fi
++#if $LD --help 2>&1 | grep "version-script" >/dev/null 2>/dev/null; then
++#    VERSION_SCRIPT_FLAGS=-Wl,--version-script=
++#elif $LD --help 2>&1 | grep "M mapfile" >/dev/null 2>/dev/null; then
++#    VERSION_SCRIPT_FLAGS="-Wl,-M -Wl,"
++#fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VERSION_SCRIPT_FLAGS" >&5
+ $as_echo "$VERSION_SCRIPT_FLAGS" >&6; }
+ 

data/config/patches/libxslt/libxslt-windows-relocate.patch

@@ -0,0 +1,12 @@
+--- libxslt-1.1.30/libxslt/Makefile.in.orig	2017-10-25 14:23:01.000000000 +0100
++++ libxslt-1.1.30/libxslt/Makefile.in	2017-10-25 14:29:06.000000000 +0100
+@@ -457,7 +457,8 @@
+ libxslt_la_LDFLAGS = \
+ 		$(WIN32_EXTRA_LDFLAGS)			\
+ 		$(LIBXSLT_VERSION_SCRIPT)		\
+-		-version-info $(LIBXSLT_VERSION_INFO)
++		-version-info $(LIBXSLT_VERSION_INFO) \
++		-Wl,--image-base,0x6d780000
+
+ man_MANS = libxslt.3
+ EXTRA_DIST = $(man_MANS) trio.h triodef.h libxslt.syms

data/config/patches/libyaml/windows-configure.patch

@@ -0,0 +1,26 @@
+diff --git a/include/yaml.h b/include/yaml.h
+index 5a04d36..70d839e 100644
+--- a/include/yaml.h
++++ b/include/yaml.h
+@@ -29,7 +29,7 @@ extern "C" {
+ #ifdef _WIN32
+ #   if defined(YAML_DECLARE_STATIC)
+ #       define  YAML_DECLARE(type)  type
+-#   elif defined(YAML_DECLARE_EXPORT)
++#   elif defined(YAML_DECLARE_EXPORT) || defined(DLL_EXPORT)
+ #       define  YAML_DECLARE(type)  __declspec(dllexport) type
+ #   else
+ #       define  YAML_DECLARE(type)  __declspec(dllimport) type
+diff --git a/src/Makefile b/src/Makefile
+index b72224d..a413ce0 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -219,7 +219,7 @@ top_srcdir = ..
+ AM_CPPFLAGS = -I$(top_srcdir)/include
+ lib_LTLIBRARIES = libyaml.la
+ libyaml_la_SOURCES = yaml_private.h api.c reader.c scanner.c parser.c loader.c writer.c emitter.c dumper.c
+-libyaml_la_LDFLAGS = -release $(YAML_LT_RELEASE) -version-info $(YAML_LT_CURRENT):$(YAML_LT_REVISION):$(YAML_LT_AGE)
++libyaml_la_LDFLAGS = -release $(YAML_LT_RELEASE) -version-info $(YAML_LT_CURRENT):$(YAML_LT_REVISION):$(YAML_LT_AGE) -no-undefined
+ all: all-am
+ 
+ .SUFFIXES:

data/config/patches/libzmq/zeromq-4.0.11_mingw_inet_pton.patch

@@ -0,0 +1,37 @@
+--- a/tests/test_security_curve.cpp
++++ b/tests/test_security_curve.cpp
+@@ -235,7 +235,7 @@ int main (void)
+
+     ip4addr.sin_family = AF_INET;
+     ip4addr.sin_port = htons (9998);
+-    inet_pton (AF_INET, "127.0.0.1", &ip4addr.sin_addr);
++    ip4addr.sin_addr.s_addr = inet_addr ("127.0.0.1");
+
+     s = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
+     rc = connect (s, (struct sockaddr*) &ip4addr, sizeof (ip4addr));
+diff --git a/tests/test_security_null.cpp b/tests/test_security_null.cpp
+index 6b74e8c..9b87aa3 100644
+--- a/tests/test_security_null.cpp
++++ b/tests/test_security_null.cpp
+@@ -148,7 +148,7 @@ int main (void)
+
+     ip4addr.sin_family = AF_INET;
+     ip4addr.sin_port = htons(9003);
+-    inet_pton(AF_INET, "127.0.0.1", &ip4addr.sin_addr);
++    ip4addr.sin_addr.s_addr = inet_addr ("127.0.0.1");
+
+     s = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
+     rc = connect (s, (struct sockaddr*) &ip4addr, sizeof ip4addr);
+diff --git a/tests/test_security_plain.cpp b/tests/test_security_plain.cpp
+index c257840..cd66790 100644
+--- a/tests/test_security_plain.cpp
++++ b/tests/test_security_plain.cpp
+@@ -154,7 +154,7 @@ int main (void)
+
+     ip4addr.sin_family = AF_INET;
+     ip4addr.sin_port = htons (9998);
+-    inet_pton (AF_INET, "127.0.0.1", &ip4addr.sin_addr);
++    ip4addr.sin_addr.s_addr = inet_addr ("127.0.0.1");
+
+     s = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
+     rc = connect (s, (struct sockaddr*) &ip4addr, sizeof (ip4addr));

data/config/patches/libzmq/zeromq-aix-4.2.2-LARGE_FILES.patch

@@ -0,0 +1,56 @@
+*** src/tcp_connecter.cpp       Sat Feb 18 18:05:37 2017
+--- src/tcp_connecter.cpp       Thu Dec 14 20:51:26 2017
+***************
+*** 183,189 ****
+  void zmq::tcp_connecter_t::start_connecting ()
+  {
+      //  Open the connecting socket.
+!     const int rc = open ();
+
+      //  Connect may succeed in synchronous manner.
+      if (rc == 0) {
+--- 183,189 ----
+  void zmq::tcp_connecter_t::start_connecting ()
+  {
+      //  Open the connecting socket.
+!     const int rc = openn ();
+
+      //  Connect may succeed in synchronous manner.
+      if (rc == 0) {
+***************
+*** 244,250 ****
+      return interval;
+  }
+
+! int zmq::tcp_connecter_t::open ()
+  {
+      zmq_assert (s == retired_fd);
+
+--- 244,250 ----
+      return interval;
+  }
+
+! int zmq::tcp_connecter_t::openn ()
+  {
+      zmq_assert (s == retired_fd);
+
+*** src/tcp_connecter.hpp       Sat Feb 18 18:05:37 2017
+--- src/tcp_connecter.hpp       Thu Dec 14 20:50:40 2017
+***************
+*** 84,90 ****
+          //  Open TCP connecting socket. Returns -1 in case of error,
+          //  0 if connect was successful immediately. Returns -1 with
+          //  EAGAIN errno if async connect was launched.
+!         int open ();
+
+          //  Close the connecting socket.
+          void close ();
+--- 84,90 ----
+          //  Open TCP connecting socket. Returns -1 in case of error,
+          //  0 if connect was successful immediately. Returns -1 with
+          //  EAGAIN errno if async connect was launched.
+!         int openn ();
+
+          //  Close the connecting socket.
+          void close ();
+

data/config/patches/libzmq/zeromq-aix-4.2.2-atomic-counter-fetch_and_add.patch

@@ -0,0 +1,59 @@
+*** src/atomic_counter.hpp      Sat Feb 18 18:05:37 2017
+--- src/atomic_counter.hpp      Thu Dec 14 20:54:51 2017
+***************
+*** 46,51 ****
+--- 46,53 ----
+  #define ZMQ_ATOMIC_COUNTER_WINDOWS
+  #elif (defined ZMQ_HAVE_SOLARIS || defined ZMQ_HAVE_NETBSD || defined ZMQ_HAVE_GNU)
+  #define ZMQ_ATOMIC_COUNTER_ATOMIC_H
++ #elif defined ZMQ_HAVE_AIX
++ #define ZMQ_ATOMIC_COUNTER_AIX
+  #elif defined __tile__
+  #define ZMQ_ATOMIC_COUNTER_TILE
+  #else
+***************
+*** 60,65 ****
+--- 62,69 ----
+  #include "windows.hpp"
+  #elif defined ZMQ_ATOMIC_COUNTER_ATOMIC_H
+  #include <atomic.h>
++ #elif defined ZMQ_ATOMIC_COUNTER_AIX
++ #include <sys/atomic_op.h>
+  #elif defined ZMQ_ATOMIC_COUNTER_TILE
+  #include <arch/atomic.h>
+  #endif
+***************
+*** 105,110 ****
+--- 109,116 ----
+  #elif defined ZMQ_ATOMIC_COUNTER_ATOMIC_H
+              integer_t new_value = atomic_add_32_nv (&value, increment_);
+              old_value = new_value - increment_;
++ #elif defined ZMQ_ATOMIC_COUNTER_AIX
++             old_value = fetch_and_add ((atomic_p) &value, increment_);
+  #elif defined ZMQ_ATOMIC_COUNTER_TILE
+              old_value = arch_atomic_add (&value, increment_);
+  #elif defined ZMQ_ATOMIC_COUNTER_X86
+***************
+*** 154,159 ****
+--- 160,169 ----
+              int32_t delta = - ((int32_t) decrement);
+              integer_t nv = atomic_add_32_nv (&value, delta);
+              return nv != 0;
++ #elif defined ZMQ_ATOMIC_COUNTER_AIX
++             int32_t delta = - ((int32_t) decrement);
++             integer_t old = fetch_and_add((atomic_p) &value, delta);
++             return old - decrement != 0;
+  #elif defined ZMQ_ATOMIC_COUNTER_TILE
+              int32_t delta = - ((int32_t) decrement);
+              integer_t nv = arch_atomic_add (&value, delta);
+***************
+*** 224,229 ****
+--- 234,240 ----
+  #undef ZMQ_ATOMIC_COUNTER_ARM
+  #undef ZMQ_ATOMIC_COUNTER_WINDOWS
+  #undef ZMQ_ATOMIC_COUNTER_ATOMIC_H
++ #undef ZMQ_ATOMIC_COUNTER_AIX
+  #undef ZMQ_ATOMIC_COUNTER_TILE
+
+  #endif
+

data/config/patches/logrotate/logrotate_basedir_override.patch

@@ -0,0 +1,17 @@
+--- Makefile	2014-05-05 17:45:06.000000000 -0400
++++ Makefile	2014-05-05 17:47:03.000000000 -0400
+@@ -1,3 +1,5 @@
++BASEDIR ?=
++
+ VERSION = $(shell awk '/Version:/ { print $$2 }' logrotate.spec)
+ OS_NAME = $(shell uname -s)
+ LFS = $(shell echo `getconf LFS_CFLAGS 2>/dev/null`)
+@@ -64,7 +66,7 @@
+ # Red Hat Linux
+ ifeq ($(OS_NAME),Linux)
+     INSTALL = install
+-    BASEDIR = /usr
++    BASEDIR ?= /usr
+ endif
+
+ # FreeBSD

data/config/patches/m4/m4-1.4.18-glibc-change-work-around.patch

@@ -0,0 +1,115 @@
+diff -up m4-1.4.18/lib/fflush.c.orig m4-1.4.18/lib/fflush.c
+--- m4-1.4.18/lib/fflush.c.orig	2018-05-02 12:35:59.536851666 +0200
++++ m4-1.4.18/lib/fflush.c	2018-05-02 12:37:02.768958606 +0200
+@@ -33,7 +33,7 @@
+ #undef fflush
+ 
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ 
+ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).  */
+ static void
+@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
+ 
+ #endif
+ 
+-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
+ 
+ # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
+   if (stream == NULL || ! freading (stream))
+     return fflush (stream);
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ 
+   clear_ungetc_buffer_preserving_position (stream);
+ 
+diff -up m4-1.4.18/lib/fpending.c.orig m4-1.4.18/lib/fpending.c
+--- m4-1.4.18/lib/fpending.c.orig	2018-05-02 12:35:32.305806774 +0200
++++ m4-1.4.18/lib/fpending.c	2018-05-02 12:35:44.944827347 +0200
+@@ -32,7 +32,7 @@ __fpending (FILE *fp)
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+      <stdio.h>, because they need it for implementing getc() and putc() as
+      fast macros.  */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   return fp->_IO_write_ptr - fp->_IO_write_base;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+diff -up m4-1.4.18/lib/fpurge.c.orig m4-1.4.18/lib/fpurge.c
+--- m4-1.4.18/lib/fpurge.c.orig	2018-05-02 12:38:13.586078669 +0200
++++ m4-1.4.18/lib/fpurge.c	2018-05-02 12:38:38.785121867 +0200
+@@ -62,7 +62,7 @@ fpurge (FILE *fp)
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+      <stdio.h>, because they need it for implementing getc() and putc() as
+      fast macros.  */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   fp->_IO_read_end = fp->_IO_read_ptr;
+   fp->_IO_write_ptr = fp->_IO_write_base;
+   /* Avoid memory leak when there is an active ungetc buffer.  */
+diff -up m4-1.4.18/lib/freadahead.c.orig m4-1.4.18/lib/freadahead.c
+--- m4-1.4.18/lib/freadahead.c.orig	2016-12-31 14:54:41.000000000 +0100
++++ m4-1.4.18/lib/freadahead.c	2018-05-02 11:43:19.570336724 +0200
+@@ -25,7 +25,7 @@
+ size_t
+ freadahead (FILE *fp)
+ {
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   if (fp->_IO_write_ptr > fp->_IO_write_base)
+     return 0;
+   return (fp->_IO_read_end - fp->_IO_read_ptr)
+diff -up m4-1.4.18/lib/freading.c.orig m4-1.4.18/lib/freading.c
+--- m4-1.4.18/lib/freading.c.orig	2018-05-02 12:37:33.970011368 +0200
++++ m4-1.4.18/lib/freading.c	2018-05-02 12:37:59.393054359 +0200
+@@ -31,7 +31,7 @@ freading (FILE *fp)
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+      <stdio.h>, because they need it for implementing getc() and putc() as
+      fast macros.  */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   return ((fp->_flags & _IO_NO_WRITES) != 0
+           || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
+               && fp->_IO_read_base != NULL));
+diff -up m4-1.4.18/lib/fseeko.c.orig m4-1.4.18/lib/fseeko.c
+--- m4-1.4.18/lib/fseeko.c.orig	2018-05-02 11:44:17.947460233 +0200
++++ m4-1.4.18/lib/fseeko.c	2018-05-02 12:39:49.537216897 +0200
+@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int when
+ #endif
+ 
+   /* These tests are based on fpurge.c.  */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   if (fp->_IO_read_end == fp->_IO_read_ptr
+       && fp->_IO_write_ptr == fp->_IO_write_base
+       && fp->_IO_save_base == NULL)
+@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int when
+           return -1;
+         }
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+       fp->_flags &= ~_IO_EOF_SEEN;
+       fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+diff -up m4-1.4.18/lib/stdio-impl.h.orig m4-1.4.18/lib/stdio-impl.h
+--- m4-1.4.18/lib/stdio-impl.h.orig	2016-12-31 14:54:42.000000000 +0100
++++ m4-1.4.18/lib/stdio-impl.h	2018-05-02 11:43:19.570336724 +0200
+@@ -18,6 +18,12 @@
+    the same implementation of stdio extension API, except that some fields
+    have different naming conventions, or their access requires some casts.  */
+ 
++/* Glibc 2.28 made _IO_IN_BACKUP private.  For now, work around this
++   problem by defining it ourselves.  FIXME: Do not rely on glibc
++   internals.  */
++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
++# define _IO_IN_BACKUP 0x100
++#endif
+ 
+ /* BSD stdio derived implementations.  */
+ 

data/config/patches/make/deb-make-glob.patch

@@ -0,0 +1,31 @@
+--- make-4.2.1/glob/glob.c.ori	2019-10-17 23:06:07.841511314 +1100
++++ make-4.2.1/glob/glob.c	2019-10-17 23:06:21.249541600 +1100
+@@ -208,28 +208,9 @@
+ #endif /* __GNU_LIBRARY__ || __DJGPP__ */
+
+
+-#if !defined __alloca && !defined __GNU_LIBRARY__
+-
+-# ifdef	__GNUC__
+-#  undef alloca
+-#  define alloca(n)	__builtin_alloca (n)
+-# else	/* Not GCC.  */
+-#  ifdef HAVE_ALLOCA_H
+ #   include <alloca.h>
+-#  else	/* Not HAVE_ALLOCA_H.  */
+-#   ifndef _AIX
+-#    ifdef WINDOWS32
+-#     include <malloc.h>
+-#    else
+-extern char *alloca ();
+-#    endif /* WINDOWS32 */
+-#   endif /* Not _AIX.  */
+-#  endif /* sparc or HAVE_ALLOCA_H.  */
+-# endif	/* GCC.  */
+-
+ # define __alloca	alloca
+
+-#endif
+
+ #ifndef __GNU_LIBRARY__
+ # define __stat stat

data/config/patches/ncurses/ncurses-5.9-gcc-5.patch

@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/545114
+
+extracted from the upstream change (which had many unrelated commits in one)
+
+From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001
+From: "Thomas E. Dickey" <dickey@invisible-island.net>
+Date: Sun, 7 Dec 2014 03:10:09 +0000
+Subject: [PATCH] ncurses 5.9 - patch 20141206
+
++ modify MKlib_gen.sh to work around change in development version of
+  gcc introduced here:
+	  https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
+	  https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html
+  (reports by Marcus Shawcroft, Maohui Lei).
+
+diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
+index d8cc3c9..b91398c 100755
+--- a/ncurses/base/MKlib_gen.sh
++++ b/ncurses/base/MKlib_gen.sh
+@@ -474,11 +474,22 @@ sed -n -f $ED1 \
+ 	-e 's/gen_$//' \
+ 	-e 's/  / /g' >>$TMP
+ 
++cat >$ED1 <<EOF
++s/  / /g
++s/^ //
++s/ $//
++s/P_NCURSES_BOOL/NCURSES_BOOL/g
++EOF
++
++# A patch discussed here:
++#	https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
++# introduces spurious #line markers.  Work around that by ignoring the system's
++# attempt to define "bool" and using our own symbol here.
++sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
++cat $ED2 >$TMP
++
+ $preprocessor $TMP 2>/dev/null \
+-| sed \
+-	-e 's/  / /g' \
+-	-e 's/^ //' \
+-	-e 's/_Bool/NCURSES_BOOL/g' \
++| sed -f $ED1 \
+ | $AWK -f $AW2 \
+ | sed -f $ED3 \
+ | sed \

data/config/patches/ncurses/ncurses-5.9-solaris-xopen_source_extended-detection.patch

@@ -0,0 +1,11 @@
+--- configure.after.pkgin.patches	2012-12-17 01:06:16.964187316 +0000
++++ configure	2012-12-17 01:07:17.046932230 +0000
+@@ -7864,7 +7864,7 @@
+ else
+   echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+-cf_result=yes
++cf_result=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ echo "$as_me:7863: result: $cf_result" >&5

data/config/patches/ncurses/ncurses-clang.patch

@@ -0,0 +1,43 @@
+diff -ruNp ncurses-5.9.orig/c++/cursesf.h ncurses-5.9/c++/cursesf.h
+--- ncurses-5.9.orig/c++/cursesf.h	2005-08-13 21:08:24.000000000 +0300
++++ ncurses-5.9/c++/cursesf.h	2011-04-03 18:29:29.000000000 +0300
+@@ -681,7 +681,7 @@ public:
+ 		   const T* p_UserData = STATIC_CAST(T*)(0),
+ 		   bool with_frame=FALSE,
+ 		   bool autoDelete_Fields=FALSE)
+-    : NCursesForm (Fields, with_frame, autoDelete_Fields) {
++    : NCursesForm (&Fields, with_frame, autoDelete_Fields) {
+       if (form)
+ 	set_user (const_cast<void *>(p_UserData));
+   };
+@@ -694,7 +694,7 @@ public:
+ 		   const T* p_UserData = STATIC_CAST(T*)(0),
+ 		   bool with_frame=FALSE,
+ 		   bool autoDelete_Fields=FALSE)
+-    : NCursesForm (Fields, nlines, ncols, begin_y, begin_x,
++    : NCursesForm (&Fields, nlines, ncols, begin_y, begin_x,
+ 		   with_frame, autoDelete_Fields) {
+       if (form)
+ 	set_user (const_cast<void *>(p_UserData));
+diff -ruNp ncurses-5.9.orig/c++/cursesm.h ncurses-5.9/c++/cursesm.h
+--- ncurses-5.9.orig/c++/cursesm.h	2005-08-13 21:10:36.000000000 +0300
++++ ncurses-5.9/c++/cursesm.h	2011-04-03 18:31:42.000000000 +0300
+@@ -639,7 +639,7 @@ public:
+ 		   const T* p_UserData = STATIC_CAST(T*)(0),
+ 		   bool with_frame=FALSE,
+ 		   bool autoDelete_Items=FALSE)
+-    : NCursesMenu (Items, with_frame, autoDelete_Items) {
++    : NCursesMenu (&Items, with_frame, autoDelete_Items) {
+       if (menu)
+ 	set_user (const_cast<void *>(p_UserData));
+   };
+@@ -651,7 +651,7 @@ public:
+ 		   int begin_x = 0,
+ 		   const T* p_UserData = STATIC_CAST(T*)(0),
+ 		   bool with_frame=FALSE)
+-    : NCursesMenu (Items, nlines, ncols, begin_y, begin_x, with_frame) {
++    : NCursesMenu (&Items, nlines, ncols, begin_y, begin_x, with_frame) {
+       if (menu)
+ 	set_user (const_cast<void *>(p_UserData));
+   };
+

data/config/patches/ncurses/patch-aa

@@ -0,0 +1,23 @@
+$NetBSD: patch-aa,v 1.16 2011/02/28 11:02:46 adam Exp $
+
+--- misc/run_tic.in.orig	2006-10-28 21:43:30.000000000 +0200
++++ misc/run_tic.in
+@@ -122,7 +122,7 @@ TICDIR=`echo $TERMINFO | sed -e 's%/shar
+ # would generate a lot of confusing error messages if we tried to overwrite it.
+ # We explicitly remove its contents rather than the directory itself, in case
+ # the directory is actually a symbolic link.
+-( test -d "$TERMINFO" && cd $TERMINFO && rm -fr ? 2>/dev/null )
++#( test -d "$TERMINFO" && cd $TERMINFO && rm -fr ? 2>/dev/null )
+ 
+ if test "$ext_funcs" = 1 ; then
+ cat <<EOF
+@@ -164,6 +164,9 @@ else
+ fi
+ fi
+ 
++# For NetBSD pkgsrc, don't bother with setting a symbolic link.
++exit 0
++
+ # Make a symbolic link to provide compatibility with applications that expect
+ # to find terminfo under /usr/lib.  That is, we'll _try_ to do that.  Not
+ # all systems support symbolic links, and those that do provide a variety

data/config/patches/ncurses/patch-ab

@@ -0,0 +1,44 @@
+$NetBSD: patch-ab,v 1.16 2011/02/28 11:02:46 adam Exp $
+
+--- mk-1st.awk.orig	2010-08-07 20:42:30.000000000 +0000
++++ mk-1st.awk
+@@ -396,11 +396,11 @@ END	{
+ 				end_name = lib_name;
+ 				printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
+ 				if ( is_ticlib() ) {
+-					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TICS_LIST)\n", compile, lib_name, OBJS, libtool_version
++					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:.o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TICS_LIST)\n", compile, lib_name, OBJS, libtool_version
+ 				} else if ( is_termlib() ) {
+-					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TINFO_LIST)\n", compile, lib_name, OBJS, libtool_version
++					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:.o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TINFO_LIST)\n", compile, lib_name, OBJS, libtool_version
+ 				} else {
+-					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)\n", compile, lib_name, OBJS, libtool_version
++					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:.o=.lo) -rpath $(DESTDIR)$(libdir) %s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)\n", compile, lib_name, OBJS, libtool_version
+ 				}
+ 				print  ""
+ 				print  "install \\"
+@@ -469,7 +469,7 @@ END	{
+ 			print "mostlyclean::"
+ 			printf "\t-rm -f $(%s_OBJS)\n", OBJS
+ 			if ( MODEL == "LIBTOOL" ) {
+-				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:$o=.lo)\n", OBJS
++				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:.o=.lo)\n", OBJS
+ 			}
+ 		}
+ 		else if ( found == 2 )
+@@ -478,13 +478,13 @@ END	{
+ 			print "mostlyclean::"
+ 			printf "\t-rm -f $(%s_OBJS)\n", OBJS
+ 			if ( MODEL == "LIBTOOL" ) {
+-				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:$o=.lo)\n", OBJS
++				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:.o=.lo)\n", OBJS
+ 			}
+ 			print ""
+ 			print "clean ::"
+ 			printf "\t-rm -f $(%s_OBJS)\n", OBJS
+ 			if ( MODEL == "LIBTOOL" ) {
+-				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:$o=.lo)\n", OBJS
++				printf "\t-$(LIBTOOL_CLEAN) rm -f $(%s_OBJS:.o=.lo)\n", OBJS
+ 			}
+ 		}
+ 	}

data/config/patches/ncurses/patch-ac

@@ -0,0 +1,40 @@
+$NetBSD: patch-ac,v 1.18 2011/11/01 14:47:46 hans Exp $
+
+--- configure.orig	2011-02-21 01:40:36.000000000 +0000
++++ configure
+@@ -7096,6 +7096,13 @@ sco*) #(vi
+ 	# setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer
+ 	;;
+ solaris2.1[0-9]) #(vi
++	case "$GCC_VERSION" in 
++		4.[67].*)
++			cf_XOPEN_SOURCE=600
++			cf_add_cflags=-std=c99
++			CPPFLAGS="$CPPFLAGS -std=c99"
++			;;
++	esac
+ 	cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
+ 	;;
+ solaris2.[1-9]) #(vi
+@@ -9640,12 +9647,7 @@ case ".$MANPAGE_RENAMES" in #(vi
+ .no) #(vi
+   ;;
+ .|.yes)
+-  # Debian 'man' program?
+-  if test -f /etc/debian_version ; then
+-    MANPAGE_RENAMES=`cd $srcdir && pwd`/man/man_db.renames
+-  else
+     MANPAGE_RENAMES=no
+-  fi
+   ;;
+ esac
+ 
+@@ -18449,7 +18444,7 @@ echo "${ECHO_T}$LIB_SUBSETS" >&6
+ 
+ ### Construct the list of include-directories to be generated
+ 
+-CPPFLAGS="$CPPFLAGS -I. -I../include"
++CPPFLAGS="-I. -I../include $CPPFLAGS"
+ if test "$srcdir" != "."; then
+ 	CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
+ fi

data/config/patches/ncurses/patch-ad

@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.11 2011/02/28 11:02:46 adam Exp $
+
+--- c++/Makefile.in.orig	2010-11-27 21:45:27.000000000 +0000
++++ c++/Makefile.in
+@@ -167,7 +167,7 @@ LIB_OBJS = \
+ 
+ ../lib/$(LIBNAME_LIBTOOL) : $(LIB_OBJS)
+ 	cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \
+-		-o $(LIBNAME) $(LIB_OBJS:$o=.lo) \
++		-o $(LIBNAME) $(LIB_OBJS:.o=.lo) \
+ 		-rpath $(INSTALL_PREFIX)$(libdir) \
+ 		$(LIBTOOL_VERSION) $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)
+ 

data/config/patches/ncurses/patch-cxx_cursesf.h

@@ -0,0 +1,22 @@
+$NetBSD: patch-cxx_cursesf.h,v 1.1 2011/02/28 11:02:46 adam Exp $
+
+--- c++/cursesf.h.orig	2011-02-28 09:23:33.000000000 +0000
++++ c++/cursesf.h
+@@ -677,7 +677,7 @@ protected:
+   }
+ 
+ public:
+-  NCursesUserForm (NCursesFormField Fields[],
++  NCursesUserForm (NCursesFormField *Fields[],
+ 		   const T* p_UserData = STATIC_CAST(T*)(0),
+ 		   bool with_frame=FALSE,
+ 		   bool autoDelete_Fields=FALSE)
+@@ -686,7 +686,7 @@ public:
+ 	set_user (const_cast<void *>(p_UserData));
+   };
+ 
+-  NCursesUserForm (NCursesFormField Fields[],
++  NCursesUserForm (NCursesFormField *Fields[],
+ 		   int nlines,
+ 		   int ncols,
+ 		   int begin_y = 0,

data/config/patches/ncurses/patch-cxx_cursesm.h

@@ -0,0 +1,22 @@
+$NetBSD: patch-cxx_cursesm.h,v 1.1 2011/02/28 11:02:46 adam Exp $
+
+--- c++/cursesm.h.orig	2011-02-28 09:25:22.000000000 +0000
++++ c++/cursesm.h
+@@ -635,7 +635,7 @@ protected:
+   }
+ 
+ public:
+-  NCursesUserMenu (NCursesMenuItem Items[],
++  NCursesUserMenu (NCursesMenuItem *Items[],
+ 		   const T* p_UserData = STATIC_CAST(T*)(0),
+ 		   bool with_frame=FALSE,
+ 		   bool autoDelete_Items=FALSE)
+@@ -644,7 +644,7 @@ public:
+ 	set_user (const_cast<void *>(p_UserData));
+   };
+ 
+-  NCursesUserMenu (NCursesMenuItem Items[],
++  NCursesUserMenu (NCursesMenuItem *Items[],
+ 		   int nlines,
+ 		   int ncols,
+ 		   int begin_y = 0,