CVS commit: pkgsrc/lang/php73

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Mar 11 13:46:12 UTC 2019

Modified Files:
        pkgsrc/lang/php73: Makefile distinfo
        pkgsrc/lang/php73/patches: patch-configure

Log Message:
php73: Do not autodetect (and get wrong) maintainer-zts.

This resulted in a mod_php that cannot be loaded, as reported in
joyent/pkgsrc#152.  Patch copied from php71.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php73/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php73/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php73/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/php73/Makefile
diff -u pkgsrc/lang/php73/Makefile:1.1 pkgsrc/lang/php73/Makefile:1.2
--- pkgsrc/lang/php73/Makefile:1.1      Sat Dec 15 17:12:44 2018
+++ pkgsrc/lang/php73/Makefile  Mon Mar 11 13:46:12 2019
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2018/12/15 17:12:44 taca Exp $
+# $NetBSD: Makefile,v 1.2 2019/03/11 13:46:12 jperkin Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               php-${PHP_VERSION:S/RC/rc/}
+PKGREVISION=           1
 
 HOMEPAGE=              http://www.php.net/
 COMMENT=               PHP Hypertext Preprocessor version 7.3

Index: pkgsrc/lang/php73/distinfo
diff -u pkgsrc/lang/php73/distinfo:1.3 pkgsrc/lang/php73/distinfo:1.4
--- pkgsrc/lang/php73/distinfo:1.3      Thu Feb  7 14:06:41 2019
+++ pkgsrc/lang/php73/distinfo  Mon Mar 11 13:46:12 2019
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2019/02/07 14:06:41 taca Exp $
+$NetBSD: distinfo,v 1.4 2019/03/11 13:46:12 jperkin Exp $
 
 SHA1 (php-7.3.2.tar.bz2) = cc5a9e43261d2e71bdffca8f150bf08c2ba0f4f2
 RMD160 (php-7.3.2.tar.bz2) = 4b9b4d0e70de8efc7abedaa72fd5abd7c16b44c5
 SHA512 (php-7.3.2.tar.bz2) = 9054c22387178d6755076d2cdd731597377223000ca81addca48ef8c98b77efd3882acf880a5f2fd53b4eccd934c7214b1ef0362b71e5736a79760bc9f26ce6d
 Size (php-7.3.2.tar.bz2) = 14802013 bytes
-SHA1 (patch-configure) = a47c9d3b6ace5fca7cde1cf2e149dc1dc3d8acd4
+SHA1 (patch-configure) = 08b80528ba90c705398e8841c232382663479a3b
 SHA1 (patch-disable-filter-url) = d7e450380b584e01e2f01e9c91c864d01991cdbf
 SHA1 (patch-ext_gd_config.m4) = eaecfb31b18700dd642c067ed82748d4f6be2335
 SHA1 (patch-ext_phar_Makefile.frag) = 558869b60f8ed6674a3ba1d595a65f010df4c426

Index: pkgsrc/lang/php73/patches/patch-configure
diff -u pkgsrc/lang/php73/patches/patch-configure:1.1 pkgsrc/lang/php73/patches/patch-configure:1.2
--- pkgsrc/lang/php73/patches/patch-configure:1.1       Sat Dec 15 17:12:44 2018
+++ pkgsrc/lang/php73/patches/patch-configure   Mon Mar 11 13:46:12 2019
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.1 2018/12/15 17:12:44 taca Exp $
+$NetBSD: patch-configure,v 1.2 2019/03/11 13:46:12 jperkin Exp $
 
 Don't automatically add libgcc on SunOS. Reported upstream as #75941.
-
+Don't autodetect maintainer-zts.
 The meta_ccld removal reported upstream as #75940.
 
---- configure.orig     2018-12-04 16:12:21.000000000 +0000
+--- configure.orig     2019-02-05 13:10:04.000000000 +0000
 +++ configure
 @@ -5453,9 +5453,6 @@ fi
  case $host_alias in
@@ -16,7 +16,35 @@ The meta_ccld removal reported upstream 
      ;;
    *dgux*)
      CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR"
-@@ -83290,7 +83287,7 @@ $as_echo "#define HAVE_TIDYBUFFIO_H 1" >
+@@ -6866,27 +6863,6 @@ EOF
+     ;;
+   esac
+ 
+-  if test "$APACHE_VERSION" -lt 2004001; then
+-    APXS_MPM=`$APXS -q MPM_NAME`
+-    if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
+-
+-  enable_maintainer_zts=yes
+-  if test "$pthreads_working" != "yes"; then
+-    as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
+-  fi
+-
+-    fi
+-  else
+-    APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
+-    if test -n "$APACHE_THREADED_MPM"; then
+-
+-  enable_maintainer_zts=yes
+-  if test "$pthreads_working" != "yes"; then
+-    as_fn_error $? "ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads." "$LINENO" 5
+-  fi
+-
+-    fi
+-  fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 
+@@ -83623,7 +83599,7 @@ $as_echo "#define HAVE_TIDYBUFFIO_H 1" >
    fi
  
    TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR