Import of pkgsrc-2016Q3

2016-11-18 22:39:22 +01:00
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949747 additions and 377081 deletions
@@ -1,10 +1,10 @@
-$NetBSD: patch-common_putil.cpp,v 1.1 2014/10/26 19:46:48 bsiegert Exp $
+$NetBSD: patch-common_putil.cpp,v 1.2 2015/10/09 23:15:34 ryoon Exp $

--- common/putil.cpp.orig	2014-10-25 17:54:47.000000000 +0000
+--- common/putil.cpp.orig	2015-10-08 03:53:44.000000000 +0000
 +++ common/putil.cpp
@@ -117,6 +117,14 @@
 #endif
-
+ 
 /*
 + * Mac OS X 10.4 doesn't use its localtime_r() declaration in <time.h> if either _ANSI_SOURCE or _POSIX_C_SOURCE is #defined.
 + */
@@ -1,17 +1,17 @@
-$NetBSD: patch-common_unicode_platform.h,v 1.6 2013/12/03 21:16:06 bsiegert Exp $
+$NetBSD: patch-common_unicode_platform.h,v 1.7 2015/10/09 23:15:34 ryoon Exp $

--- common/unicode/platform.h.orig	2013-10-04 20:49:10.000000000 +0000
+--- common/unicode/platform.h.orig	2015-10-08 03:53:34.000000000 +0000
 +++ common/unicode/platform.h
-@@ -151,7 +151,7 @@
+@@ -159,7 +159,7 @@
 #   else
 #       define U_PLATFORM U_PF_DARWIN
 #   endif
 -#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MirBSD__)
 +#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MirBSD__) || defined(__DragonFly__)
- #   define U_PLATFORM U_PF_BSD
- #elif defined(sun) || defined(__sun)
-     /* Check defined(__SVR4) || defined(__svr4__) to distinguish Solaris from SunOS? */
-@@ -379,6 +379,18 @@
+ #   if defined(__FreeBSD__)
+ #       include <sys/endian.h>
+ #   endif
+@@ -388,6 +388,18 @@
 #   define U_IS_BIG_ENDIAN 1
 #elif defined(__LITTLE_ENDIAN__) || defined(_LITTLE_ENDIAN)
 #   define U_IS_BIG_ENDIAN 0
@@ -0,0 +1,15 @@
+$NetBSD: patch-config_mh-solaris-gcc,v 1.3 2015/10/26 09:28:20 jperkin Exp $
+
+Pass -h correctly to linker for clang.
+
+--- config/mh-solaris-gcc.orig	2015-10-08 03:54:32.000000000 +0000
+++ config/mh-solaris-gcc
+@@ -23,7 +23,7 @@ LD_RPATH=       -R'$$'ORIGIN 
+ LD_RPATH_PRE=   -R
+ 
+ ## Compiler switch to embed a library name
+-LD_SONAME = -h $(notdir $(MIDDLE_SO_TARGET))
+LD_SONAME = -Wl,-h,$(notdir $(MIDDLE_SO_TARGET))
+ 
+ ## Shared library options
+ LD_SOOPTIONS= -Wl,-Bsymbolic
@@ -1,12 +1,12 @@
-$NetBSD: patch-configure,v 1.7 2015/08/31 15:26:19 sevan Exp $
+$NetBSD: patch-configure,v 1.8 2015/10/09 23:15:34 ryoon Exp $

 Portability fix.
 Solaris seems to need -std=c99 with recent pkgsrc so keep it.
 Add support for Bitrig.

--- configure.orig	Fri Mar 27 21:17:48 2015
+--- configure.orig	2015-10-08 04:00:24.000000000 +0000
 +++ configure
-@@ -5147,7 +5147,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
+@@ -5174,7 +5174,7 @@ rm -f core conftest.err conftest.$ac_obj
 		*-*-cygwin) icu_cv_host_frag=mh-cygwin-msvc ;;
 		esac
 	fi ;;
@@ -15,7 +15,7 @@ Add support for Bitrig.
 *-*-aix*)
 	if test "$GCC" = yes; then
 		icu_cv_host_frag=mh-aix-gcc
-@@ -5172,6 +5172,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$
+@@ -5199,6 +5199,7 @@ rm -f core conftest.err conftest.$ac_obj
 *-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;;
 *-*-nto*)	icu_cv_host_frag=mh-qnx ;;
 *-ncr-*)	icu_cv_host_frag=mh-mpras ;;
@@ -23,10 +23,10 @@ Add support for Bitrig.
 *) 		icu_cv_host_frag=mh-unknown ;;
 esac
 
-@@ -5682,6 +5683,29 @@ if test "x$ac_cv_header_elf_h" = "xyes"; then
-     CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_ELF_H=1";
+@@ -5736,6 +5737,29 @@ if test "x$plugins" = "xtrue"; then
 fi
 
+ 
 +# check if sys/atomic.h is present.
 +for ac_header in sys/atomic.h
 +do :
@@ -52,8 +52,8 @@ Add support for Bitrig.
 +
 U_ENABLE_DYLOAD=1
 enable=yes
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dynamic loading of plugins" >&5
-@@ -7655,7 +7679,7 @@ ICUDATA_CHAR=$U_ENDIAN_CHAR
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dynamic loading of plugins. Ignored if plugins disabled." >&5
+@@ -7729,7 +7753,7 @@ ICUDATA_CHAR=$U_ENDIAN_CHAR
 case "${host}" in
 	*-*-solaris*) 	platform=U_SOLARIS ;;
 	*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu)        platform=U_LINUX ;;
@@ -62,7 +62,7 @@ Add support for Bitrig.
 	*-*-aix*) 	platform=U_AIX ;;
 	*-*-hpux*) 	platform=U_HPUX ;;
 	*-apple-darwin*|*-apple-rhapsody*)	platform=U_DARWIN ;;
-@@ -7691,13 +7715,13 @@ fi
+@@ -7765,13 +7789,13 @@ fi
 # Now that we're done using CPPFLAGS etc. for tests, we can change it
 # for build.
 
@@ -1,15 +1,15 @@
-$NetBSD: patch-configure.ac,v 1.4 2015/08/31 15:26:19 sevan Exp $
+$NetBSD: patch-configure.ac,v 1.5 2015/10/09 23:15:34 ryoon Exp $

 * Detect NetBSD libatomic
 * test(1) portability fix
 * Add support for Bitrig

--- configure.ac.orig	Fri Mar 27 21:17:48 2015
+--- configure.ac.orig	2015-10-08 04:00:26.000000000 +0000
 +++ configure.ac
-@@ -409,6 +409,18 @@ if test "x$ac_cv_header_elf_h" = "xyes"; then
-     CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_ELF_H=1";
+@@ -427,6 +427,18 @@ if test "x$plugins" = "xtrue"; then
 fi
 
+ 
 +# check if sys/atomic.h is present.
 +AC_CHECK_HEADERS([sys/atomic.h])
 +case "${host}" in
@@ -24,8 +24,8 @@ $NetBSD: patch-configure.ac,v 1.4 2015/08/31 15:26:19 sevan Exp $
 +
 U_ENABLE_DYLOAD=1
 enable=yes
- AC_MSG_CHECKING([whether to enable dynamic loading of plugins])
-@@ -1234,7 +1246,7 @@ ICUDATA_CHAR=$U_ENDIAN_CHAR
+ AC_MSG_CHECKING([whether to enable dynamic loading of plugins. Ignored if plugins disabled.])
+@@ -1251,7 +1263,7 @@ ICUDATA_CHAR=$U_ENDIAN_CHAR
 case "${host}" in
 	*-*-solaris*) 	platform=U_SOLARIS ;;
 	*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu)        platform=U_LINUX ;;
@@ -34,7 +34,7 @@ $NetBSD: patch-configure.ac,v 1.4 2015/08/31 15:26:19 sevan Exp $
 	*-*-aix*) 	platform=U_AIX ;;
 	*-*-hpux*) 	platform=U_HPUX ;;
 	*-apple-darwin*|*-apple-rhapsody*)	platform=U_DARWIN ;;
-@@ -1253,6 +1265,7 @@ case "${host}" in
+@@ -1270,6 +1282,7 @@ case "${host}" in
 	*-*-beos)		platform=U_BEOS ;;
 	*-*-irix*)		platform=U_IRIX ;;
 	*-ncr-*)		platform=U_MPRAS ;;
@@ -42,7 +42,7 @@ $NetBSD: patch-configure.ac,v 1.4 2015/08/31 15:26:19 sevan Exp $
 	*) 		platform=U_UNKNOWN_PLATFORM ;;
 esac
 AC_SUBST(ICUDATA_CHAR)
-@@ -1270,13 +1283,13 @@ fi
+@@ -1287,13 +1300,13 @@ fi
 # Now that we're done using CPPFLAGS etc. for tests, we can change it
 # for build.
 
@@ -0,0 +1,15 @@
+$NetBSD: patch-tools_pkgdata_pkgdata.cpp,v 1.1 2015/10/26 09:48:14 jperkin Exp $
+
+Fix preprocessor logic bug.
+
+--- tools/pkgdata/pkgdata.cpp.orig	2015-10-08 03:54:02.000000000 +0000
+++ tools/pkgdata/pkgdata.cpp
+@@ -24,7 +24,7 @@
+ #include "putilimp.h"
+ 
+ #if U_HAVE_POPEN
+-#if (U_PF_MINGW <= U_PLATFORM || U_PLATFORM <= U_PF_CYGWIN) && defined(__STRICT_ANSI__)
+#if (U_PLATFORM <= U_PF_MINGW || U_PLATFORM <= U_PF_CYGWIN) && defined(__STRICT_ANSI__)
+ /* popen/pclose aren't defined in strict ANSI on Cygwin and MinGW */
+ #undef __STRICT_ANSI__
+ #endif