Import of pkgsrc-2016Q3

lang/php56/DESCR

@@ -4,4 +4,4 @@ C, Java and Perl with a couple of unique PHP-specific features
 thrown in.  The language is designed to allow web developers to
 write dynamically generated pages quickly.
 
-This package provides PHP version 5.5.x.
+This package provides PHP version 5.6.x.

lang/php56/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/09/07 12:02:05 jperkin Exp $
+# $NetBSD: Makefile,v 1.12 2016/06/24 15:25:21 taca Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
@@ -33,7 +33,7 @@ PLIST_SUBST+=		PHPEXTDIR="${PHP_EXTENSION_DIR}"
 SUBST_CLASSES+=		path
 SUBST_MESSAGE.path=	Fixing common paths.
 SUBST_STAGE.path=	pre-configure
-SUBST_FILES.path=	configure ext/phar/phar/phar.php
+SUBST_FILES.path=	ext/phar/phar/phar.php
 SUBST_FILES.path+=	php.ini-development php.ini-production run-tests.php
 SUBST_FILES.path+=	sapi/cgi/Makefile.frag
 SUBST_SED.path=		-e 's,@CGIDIR@,${CGIDIR},g'
@@ -47,6 +47,12 @@ INSTALLATION_DIRS+=	${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
 CFLAGS+=	-DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC
 .endif
 
+.include "../../mk/compiler.mk"
+
+.if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER} == "clang"
+CONFIGURE_ARGS+=	--disable-libgcc
+.endif
+
 post-extract:
 	cd ${WRKSRC} && \
 		${FIND} . -xdev -type f -name '*.orig' -exec ${RM} -f {} \;

lang/php56/distinfo

@@ -1,22 +1,23 @@
-$NetBSD: distinfo,v 1.15 2015/09/06 12:27:43 taca Exp $
+$NetBSD: distinfo,v 1.34 2016/09/16 16:09:24 taca Exp $
 
-SHA1 (php-5.6.13.tar.bz2) = 0fc2f582a6670efc512dc872da6638796ed64525
-RMD160 (php-5.6.13.tar.bz2) = a7f243e72b185f6da2a859bb80a59790c2c2aaba
-Size (php-5.6.13.tar.bz2) = 14077633 bytes
+SHA1 (php-5.6.26.tar.bz2) = d0e05dbc4d1be0e316cadee64f5bda83a16932a9
+RMD160 (php-5.6.26.tar.bz2) = eedd93ab6808d86055a7e5f41ca3b92ea7feee63
+SHA512 (php-5.6.26.tar.bz2) = fcac6ff1db2d3a897ce7253735216b3784568167d7e1c3738409c45f72bdce6708d42c6935c13c28f16da15218213b202e959fb68355b5c692fdc54a7393b553
+Size (php-5.6.26.tar.bz2) = 14927510 bytes
 SHA1 (patch-acinclude.m4) = b38fc34c3a3847dc317e8e286612b21ec8fd5ce8
-SHA1 (patch-aclocal.m4) = 49117c42e03bd3ed57d967d33ba543f936013b4f
-SHA1 (patch-build_libtool.m4) = f459cda09cbdad9780568d271091fb17bbc5d965
-SHA1 (patch-configure) = d3d44c814deb0264fd4fc41908c2ff31fde00b0d
-SHA1 (patch-ext_gd_config.m4) = 4b44853250eb4a638af4c663e618307ff25d2cbd
+SHA1 (patch-configure) = 5d76f71aa903efa3c3491b908ff76419aa4af27c
+SHA1 (patch-ext_gd_config.m4) = b92ab4c7fe8aceaef7787a607a7d2eac258fee19
 SHA1 (patch-ext_imap_config.m4) = 9c6ed6966366c4fe1b7cfd34b5910e2ff0e68577
 SHA1 (patch-ext_mssql_php__mssql.c) = c4fa9231dc539ffb027f1beb6f182f21ddb94a3c
-SHA1 (patch-ext_opcache_config.m4) = 031db201f68a120615561a5abd3e84aff58b523d
+SHA1 (patch-ext_pcre_pcrelib_config.h) = 26588e9932ee715e32c872a1c7e2f9c640bd9cf8
 SHA1 (patch-ext_pdo__mysql_config.m4) = 9d25c673fc151e1b8ae137f2a0fc540189ef5398
 SHA1 (patch-ext_pdo_config.m4) = f6deef3ac631769baa587dd7c27e55bd2e9ca6a5
 SHA1 (patch-ext_phar_Makefile.frag) = 1564c188e57d48f83de7c2420fdde183598539e2
 SHA1 (patch-ext_phar_phar_phar.php) = 5a82d55c7965027115065412f9b68defb278db64
+SHA1 (patch-ext_recode_recode.c) = a97a1815d6a41410f68c289debbb9396128a2159
 SHA1 (patch-ext_sqlite3_libsqlite_sqlite3.c) = 85cd8f3e115705aa2eeab0e7229f24422e322a7f
 SHA1 (patch-ext_standard_basic__functions.c) = 669fe55c975bf2d971f6fdcb5b3004f7e20304d2
+SHA1 (patch-ext_standard_php__dns.h) = 57c5d6d8ae60da58925abc2c51d66b56762fecda
 SHA1 (patch-makedist) = 8e8660b2e0a34f06f433e24dbb0a9c872963e419
 SHA1 (patch-php.ini-development) = 3c54a41310d28ecff4996c966934350368657c2f
 SHA1 (patch-php.ini-production) = 9b7ae64f3133139f0c3d42753ad5d8622873423d

lang/php56/patches/patch-aclocal.m4

@@ -1,22 +0,0 @@
-$NetBSD: patch-aclocal.m4,v 1.1 2014/11/24 15:37:08 taca Exp $
-
---- aclocal.m4.orig	2014-11-13 10:07:22.000000000 +0000
-+++ aclocal.m4
-@@ -4578,7 +4578,7 @@ freebsd* | dragonfly*)
-     objformat=`/usr/bin/objformat`
-   else
-     case $host_os in
--    freebsd[[123]]*) objformat=aout ;;
-+    freebsd[[123]]|freebsd[[123]].*) objformat=aout ;;
-     *) objformat=elf ;;
-     esac
-   fi
-@@ -6195,7 +6195,7 @@ case $host_os in
- 	;;
-     esac
-     ;;
--  freebsd[[12]]*)
-+  freebsd[[12]]|freebsd[[12]].*)
-     # C++ shared libraries reported to be fairly broken before switch to ELF
-     _LT_AC_TAGVAR(ld_shlibs, $1)=no
-     ;;

lang/php56/patches/patch-build_libtool.m4

@@ -1,22 +0,0 @@
-$NetBSD: patch-build_libtool.m4,v 1.1 2014/11/24 15:37:08 taca Exp $
-
---- build/libtool.m4.orig	2014-11-12 13:52:21.000000000 +0000
-+++ build/libtool.m4
-@@ -1545,7 +1545,7 @@ freebsd* | dragonfly*)
-     objformat=`/usr/bin/objformat`
-   else
-     case $host_os in
--    freebsd[[123]]*) objformat=aout ;;
-+    freebsd[[123]]|freebsd[[123]].*) objformat=aout ;;
-     *) objformat=elf ;;
-     esac
-   fi
-@@ -3162,7 +3162,7 @@ case $host_os in
- 	;;
-     esac
-     ;;
--  freebsd[[12]]*)
-+  freebsd[[12]]|freebsd[[12]].*)
-     # C++ shared libraries reported to be fairly broken before switch to ELF
-     _LT_AC_TAGVAR(ld_shlibs, $1)=no
-     ;;

lang/php56/patches/patch-configure

@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.1 2014/11/24 15:37:08 taca Exp $
+$NetBSD: patch-configure,v 1.3 2016/05/02 13:08:00 taca Exp $
 
---- configure.orig	2014-11-13 10:07:25.000000000 +0000
+--- configure.orig	2016-04-28 00:53:20.000000000 +0000
 +++ configure
-@@ -8310,27 +8310,6 @@ EOF
+@@ -8315,27 +8315,6 @@ EOF
      ;;
    esac
  
@@ -30,7 +30,7 @@ $NetBSD: patch-configure,v 1.1 2014/11/24 15:37:08 taca Exp $
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
-@@ -9134,27 +9113,6 @@ EOF
+@@ -9139,27 +9118,6 @@ EOF
      ;;
    esac
  
@@ -58,7 +58,7 @@ $NetBSD: patch-configure,v 1.1 2014/11/24 15:37:08 taca Exp $
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
  
-@@ -24596,7 +24554,7 @@ fi
+@@ -24712,7 +24670,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -67,7 +67,7 @@ $NetBSD: patch-configure,v 1.1 2014/11/24 15:37:08 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -26751,7 +26709,7 @@ $as_echo "yes" >&6; }
+@@ -26868,7 +26826,7 @@ $as_echo "yes" >&6; }
      PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
  
  
@@ -76,7 +76,7 @@ $NetBSD: patch-configure,v 1.1 2014/11/24 15:37:08 taca Exp $
  
  
    unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -37864,7 +37822,7 @@ fi
+@@ -37985,7 +37943,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -85,7 +85,7 @@ $NetBSD: patch-configure,v 1.1 2014/11/24 15:37:08 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -49266,7 +49224,7 @@ fi
+@@ -49597,7 +49555,7 @@ fi
      if test "$found_openssl" = "no"; then
  
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -94,16 +94,7 @@ $NetBSD: patch-configure,v 1.1 2014/11/24 15:37:08 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -66188,7 +66146,7 @@ rm -f core *.core core.conftest.* gmon.o
- fi
- 
- 
--if test "$flock_type" == "unknown"; then
-+if test "$flock_type" = "unknown"; then
- 	as_fn_error $? "Don't know how to define struct flock on this system, set --enable-opcache=no" "$LINENO" 5
- fi
- 
-@@ -106720,12 +106678,7 @@ old_CC=$CC
+@@ -107117,12 +107075,7 @@ old_CC=$CC
  if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
    CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
    INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
@@ -117,30 +108,3 @@ $NetBSD: patch-configure,v 1.1 2014/11/24 15:37:08 taca Exp $
  fi
  
  if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
-@@ -110497,7 +110450,7 @@ freebsd* | dragonfly*)
-     objformat=`/usr/bin/objformat`
-   else
-     case $host_os in
--    freebsd[123]*) objformat=aout ;;
-+    freebsd[123]|freebsd[123].*) objformat=aout ;;
-     *) objformat=elf ;;
-     esac
-   fi
-@@ -112577,7 +112530,7 @@ if test -z "$aix_libpath"; then aix_libp
- 	;;
-     esac
-     ;;
--  freebsd[12]*)
-+  freebsd[12]|freebsd[12].*)
-     # C++ shared libraries reported to be fairly broken before switch to ELF
-     ld_shlibs_CXX=no
-     ;;
-@@ -114130,7 +114083,7 @@ freebsd* | dragonfly*)
-     objformat=`/usr/bin/objformat`
-   else
-     case $host_os in
--    freebsd[123]*) objformat=aout ;;
-+    freebsd[123]|freebsd[123].*) objformat=aout ;;
-     *) objformat=elf ;;
-     esac
-   fi

lang/php56/patches/patch-ext_gd_config.m4

@@ -1,6 +1,6 @@
-$NetBSD: patch-ext_gd_config.m4,v 1.1 2014/11/24 15:37:08 taca Exp $
+$NetBSD: patch-ext_gd_config.m4,v 1.2 2016/08/13 17:34:41 taca Exp $
 
---- ext/gd/config.m4.orig	2014-11-12 13:52:21.000000000 +0000
+--- ext/gd/config.m4.orig	2016-07-21 00:23:03.000000000 +0000
 +++ ext/gd/config.m4
 @@ -49,18 +49,7 @@ dnl Checks for the configure options
  dnl
@@ -47,3 +47,14 @@ $NetBSD: patch-ext_gd_config.m4,v 1.1 2014/11/24 15:37:08 taca Exp $
      ],[
        -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR
      ])
+@@ -249,7 +237,9 @@ AC_DEFUN([PHP_GD_CHECK_VERSION],[
+   PHP_CHECK_LIBRARY(gd, gdImageCreateFromPng,   [AC_DEFINE(HAVE_GD_PNG,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
+   PHP_CHECK_LIBRARY(gd, gdImageCreateFromWebp,  [AC_DEFINE(HAVE_GD_WEBP,             1, [ ])], [], [ $GD_SHARED_LIBADD ])
+   PHP_CHECK_LIBRARY(gd, gdImageCreateFromJpeg,  [AC_DEFINE(HAVE_GD_JPG,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
+-  PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm,   [AC_DEFINE(HAVE_GD_XPM,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
++  if test "$PHP_XPM_DIR" != "no"; then
++     PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm,   [AC_DEFINE(HAVE_GD_XPM,              1, [ ])], [], [ $GD_SHARED_LIBADD ])
++  fi
+   PHP_CHECK_LIBRARY(gd, gdImageStringFT,        [AC_DEFINE(HAVE_GD_FREETYPE,         1, [ ])], [], [ $GD_SHARED_LIBADD ])
+   PHP_CHECK_LIBRARY(gd, gdVersionString,        [AC_DEFINE(HAVE_GD_LIBVERSION,       1, [ ])], [], [ $GD_SHARED_LIBADD ])
+ ])

lang/php56/patches/patch-ext_opcache_config.m4

@@ -1,15 +0,0 @@
-$NetBSD: patch-ext_opcache_config.m4,v 1.1 2014/11/24 15:37:08 taca Exp $
-
-Avoid use "==" in test(1).
-
---- ext/opcache/config.m4.orig	2014-11-12 13:52:21.000000000 +0000
-+++ ext/opcache/config.m4
-@@ -359,7 +359,7 @@ AC_TRY_RUN([
-     AC_MSG_RESULT("yes")
- ], AC_MSG_RESULT("no") )
- 
--if test "$flock_type" == "unknown"; then
-+if test "$flock_type" = "unknown"; then
- 	AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no])
- fi
- 

lang/php56/patches/patch-ext_pcre_pcrelib_config.h

@@ -0,0 +1,26 @@
+$NetBSD: patch-ext_pcre_pcrelib_config.h,v 1.1 2016/02/17 01:17:16 jklos Exp $
+
+--- ext/pcre/pcrelib/config.h.orig	2016-02-03 08:38:08.000000000 +0000
++++ ext/pcre/pcrelib/config.h
+@@ -397,7 +397,20 @@ them both to 0; an emulation function wi
+ #undef SUPPORT_GCOV
+ 
+ /* Define to any value to enable support for Just-In-Time compiling. */
+-#define SUPPORT_JIT
++#if defined(__i386__) || defined(__i386) \
++|| defined(__x86_64__) \
++|| defined(__arm__) || defined(__ARM__) \
++|| defined (__aarch64__) \
++|| defined(__ppc64__) || defined(__powerpc64__) || defined(_ARCH_PPC64) \
++|| (defined(_POWER) && defined(__64BIT__)) \
++|| defined(__ppc__) || defined(__powerpc__) || defined(_ARCH_PPC) \
++|| defined(_ARCH_PWR) || defined(_ARCH_PWR2) || defined(_POWER) \
++|| (defined(__mips__) && !defined(_LP64)) \
++|| defined(__mips64) \
++|| defined(__sparc__) || defined(__sparc) \
++|| defined(__tilegx__)
++ #define SUPPORT_JIT
++#endif
+ 
+ /* Define to any value to allow pcregrep to be linked with libbz2, so that it
+    is able to handle .bz2 files. */

lang/php56/patches/patch-ext_recode_recode.c

@@ -0,0 +1,22 @@
+$NetBSD: patch-ext_recode_recode.c,v 1.1 2016/07/24 13:27:23 jdolecek Exp $
+
+program_name is expected variable, is required by recode 3.5 and recode 3.6 to actually work.
+
+The config.m4 test for it is broken at least for some platforms -  it only tests if program without it compiles, but on Solaris and MacOS/Darwin at least it only fails when run.
+
+--- ext/recode/recode.c.orig	2016-07-24 13:07:47.000000000 +0000
++++ ext/recode/recode.c
+@@ -29,11 +29,8 @@
+ 
+ #if HAVE_LIBRECODE
+ 
+-/* For recode 3.5 */
+-#if HAVE_BROKEN_RECODE
+-extern char *program_name;
+-char *program_name = "php";
+-#endif
++extern const char *program_name;
++const char *program_name = "php";
+ 
+ #ifdef HAVE_STDBOOL_H
+ # include <stdbool.h>

lang/php56/patches/patch-ext_standard_php__dns.h

@@ -0,0 +1,23 @@
+$NetBSD: patch-ext_standard_php__dns.h,v 1.2 2016/05/02 13:08:00 taca Exp $
+
+Fix memory leak.
+
+--- ext/standard/php_dns.h.orig	2016-04-28 00:33:49.000000000 +0000
++++ ext/standard/php_dns.h
+@@ -32,9 +32,15 @@
+ #elif defined(HAVE_RES_NSEARCH)
+ #define php_dns_search(res, dname, class, type, answer, anslen) \
+ 			res_nsearch(res, dname, class, type, answer, anslen);
++#ifdef __GLIBC__
+ #define php_dns_free_handle(res) \
+-			res_nclose(res); \
++                        res_nclose(res); \
++                        php_dns_free_res(*res)
++#else
++#define php_dns_free_handle(res) \
++			res_ndestroy(res); \
+ 			php_dns_free_res(*res)
++#endif
+ 
+ #elif defined(HAVE_RES_SEARCH)
+ #define php_dns_search(res, dname, class, type, answer, anslen) \