[Midnightbsd-cvs] mports [21577] trunk/lang/php70: update to php 7.0.9

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Aug 12 13:49:12 EDT 2016 

Revision: 21577
          http://svnweb.midnightbsd.org/mports/?rev=21577
Author:   laffer1
Date:     2016-08-12 13:49:11 -0400 (Fri, 12 Aug 2016)
Log Message:
-----------
update to php 7.0.9

Modified Paths:
--------------
    trunk/lang/php70/Makefile
    trunk/lang/php70/distinfo
    trunk/lang/php70/files/patch-acinclude.m4
    trunk/lang/php70/files/patch-configure.in
    trunk/lang/php70/files/patch-main__php_config.h.in
    trunk/lang/php70/files/patch-sapi_apache2handler_config.m4
    trunk/lang/php70/files/patch-sapi_fpm_config.m4
    trunk/lang/php70/files/php-fpm.in

Modified: trunk/lang/php70/Makefile
===================================================================
--- trunk/lang/php70/Makefile	2016-08-12 17:41:55 UTC (rev 21576)
+++ trunk/lang/php70/Makefile	2016-08-12 17:49:11 UTC (rev 21577)
@@ -3,7 +3,7 @@
 # $MidnightBSD$
 
 PORTNAME=	php70
-PORTVERSION=	7.0.6
+PORTVERSION=	7.0.9
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
@@ -14,7 +14,7 @@
 
 LICENSE=	php
 
-USES=		tar:bzip2 cpe
+USES=		tar:xz cpe
 CPE_PRODUCT=	php
 NO_OPTIONS_SORT=yes
 .if !defined(PKGNAMESUFFIX)

Modified: trunk/lang/php70/distinfo
===================================================================
--- trunk/lang/php70/distinfo	2016-08-12 17:41:55 UTC (rev 21576)
+++ trunk/lang/php70/distinfo	2016-08-12 17:49:11 UTC (rev 21577)
@@ -1,2 +1,3 @@
-SHA256 (php-7.0.6.tar.bz2) = 14ddf192a9965c858c1e742a61456be2f34a4db87556172c0d76f08de96329b7
-SIZE (php-7.0.6.tar.bz2) = 14102594
+TIMESTAMP = 1470389700
+SHA256 (php-7.0.9.tar.xz) = 970c322ba3e472cb0264b8ba9d4d92e87918da5d0cca53c4aba2a70545b8626d
+SIZE (php-7.0.9.tar.xz) = 12240712

Modified: trunk/lang/php70/files/patch-acinclude.m4
===================================================================
--- trunk/lang/php70/files/patch-acinclude.m4	2016-08-12 17:41:55 UTC (rev 21576)
+++ trunk/lang/php70/files/patch-acinclude.m4	2016-08-12 17:49:11 UTC (rev 21577)
@@ -1,6 +1,6 @@
---- acinclude.m4.orig	2016-02-16 19:01:10.026983000 +0800
-+++ acinclude.m4	2016-02-16 19:05:00.294501000 +0800
-@@ -985,15 +985,9 @@
+--- acinclude.m4.orig	2016-07-20 13:11:26 UTC
++++ acinclude.m4
+@@ -985,15 +985,9 @@ dnl ------------------------------------
    if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
  dnl ---------------------------------------------- CLI static module
      [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
@@ -19,7 +19,7 @@
      EXT_CLI_STATIC="$EXT_CLI_STATIC $1;$ext_dir"
    fi
    PHP_ADD_BUILD_DIR($ext_builddir)
-@@ -1043,12 +1037,6 @@
+@@ -1043,12 +1037,6 @@ You either need to build $1 shared or bu
  build to be successful.
  ])
    fi
@@ -32,7 +32,7 @@
    dnl Some systems require that we link $2 to $1 when building
  ])
  
-@@ -2970,8 +2958,7 @@
+@@ -2975,8 +2963,7 @@ dnl in GNU Make which causes the .d file
  $abs_srcdir/$ac_provsrc:;
  
  $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
@@ -42,7 +42,7 @@
  \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
  
  EOF
-@@ -2990,12 +2977,12 @@
+@@ -2995,12 +2982,12 @@ dnl Always attempt to create both PIC an
  $ac_bdir[$]ac_provsrc.lo: \$(PHP_DTRACE_OBJS)
  	echo "[#] Generated by Makefile for libtool" > \$[]@
  	@test -d "$dtrace_lib_dir" || mkdir $dtrace_lib_dir
@@ -57,7 +57,7 @@
  	  echo "non_pic_object=[']$dtrace_prov_name[']" >> \$[]@ [;\\]
  	else [\\]
  	  echo "non_pic_object='none'" >> \$[]@ [;\\]
-@@ -3007,7 +2994,7 @@
+@@ -3012,7 +2999,7 @@ EOF
    *)
  cat>>Makefile.objects<<EOF
  $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS)

Modified: trunk/lang/php70/files/patch-configure.in
===================================================================
--- trunk/lang/php70/files/patch-configure.in	2016-08-12 17:41:55 UTC (rev 21576)
+++ trunk/lang/php70/files/patch-configure.in	2016-08-12 17:49:11 UTC (rev 21577)
@@ -1,6 +1,6 @@
---- configure.in.orig	2014-04-01 12:32:03.000000000 +0000
-+++ configure.in	2014-04-09 07:56:27.824397653 +0000
-@@ -370,7 +370,6 @@
+--- configure.in.orig	2016-07-20 13:11:23 UTC
++++ configure.in
+@@ -370,7 +370,6 @@ sinclude(TSRM/tsrm.m4)
  dnl .
  dnl -------------------------------------------------------------------------
  
@@ -8,7 +8,7 @@
  PHP_HELP_SEPARATOR([SAPI modules:])
  PHP_SHLIB_SUFFIX_NAMES
  PHP_BUILD_PROGRAM
-@@ -401,15 +400,9 @@
+@@ -401,15 +400,9 @@ else
    AC_MSG_RESULT([none])
  fi
  
@@ -24,7 +24,7 @@
  fi
  
  dnl Starting system checks.
-@@ -688,7 +681,7 @@
+@@ -700,7 +693,7 @@ nanosleep \
  )
  
  dnl Some systems (like OpenSolaris) do not have nanosleep in libc
@@ -33,7 +33,7 @@
  
  dnl Check for getaddrinfo, should be a better way, but...
  dnl Also check for working getaddrinfo
-@@ -1225,7 +1218,7 @@
+@@ -1251,7 +1244,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
  EXPANDED_DATADIR=$datadir
  EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
  EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
@@ -42,7 +42,7 @@
  
  exec_prefix=$old_exec_prefix
  libdir=$old_libdir
-@@ -1435,7 +1428,7 @@
+@@ -1460,7 +1453,7 @@ PHP_SUBST(all_targets)
  PHP_SUBST(install_targets)
  PHP_SUBST(install_binary_targets)
  
@@ -49,5 +49,5 @@
 -PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/])
 +PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/])
  
- PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c)
+ PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
  

Modified: trunk/lang/php70/files/patch-main__php_config.h.in
===================================================================
--- trunk/lang/php70/files/patch-main__php_config.h.in	2016-08-12 17:41:55 UTC (rev 21576)
+++ trunk/lang/php70/files/patch-main__php_config.h.in	2016-08-12 17:49:11 UTC (rev 21577)
@@ -1,6 +1,6 @@
---- main/php_config.h.in.orig	2015-12-01 16:36:43.000000000 +0300
-+++ main/php_config.h.in	2015-12-09 21:45:32.033676604 +0300
-@@ -2405,6 +2405,9 @@
+--- main/php_config.h.in.orig	2016-07-20 13:12:32 UTC
++++ main/php_config.h.in
+@@ -2426,6 +2426,9 @@
  /* Define if processor uses big-endian word */
  #undef WORDS_BIGENDIAN
  

Modified: trunk/lang/php70/files/patch-sapi_apache2handler_config.m4
===================================================================
--- trunk/lang/php70/files/patch-sapi_apache2handler_config.m4	2016-08-12 17:41:55 UTC (rev 21576)
+++ trunk/lang/php70/files/patch-sapi_apache2handler_config.m4	2016-08-12 17:49:11 UTC (rev 21577)
@@ -1,5 +1,5 @@
---- sapi/apache2handler/config.m4.orig	2013-12-10 23:31:06.000000000 +0000
-+++ sapi/apache2handler/config.m4	2013-12-13 21:50:25.488258534 +0000
+--- sapi/apache2handler/config.m4.orig	2016-07-20 13:11:37 UTC
++++ sapi/apache2handler/config.m4
 @@ -67,7 +67,7 @@ if test "$PHP_APXS2" != "no"; then
    fi
  

Modified: trunk/lang/php70/files/patch-sapi_fpm_config.m4
===================================================================
--- trunk/lang/php70/files/patch-sapi_fpm_config.m4	2016-08-12 17:41:55 UTC (rev 21576)
+++ trunk/lang/php70/files/patch-sapi_fpm_config.m4	2016-08-12 17:49:11 UTC (rev 21577)
@@ -1,6 +1,6 @@
---- sapi/fpm/config.m4.orig	2015-12-01 16:36:27.000000000 +0300
-+++ sapi/fpm/config.m4	2015-12-09 21:34:18.665722795 +0300
-@@ -317,14 +317,14 @@
+--- sapi/fpm/config.m4.orig	2016-07-20 13:11:36 UTC
++++ sapi/fpm/config.m4
+@@ -317,14 +317,14 @@ AC_DEFUN([AC_FPM_LQ],
  
    AC_MSG_CHECKING([for TCP_INFO])
  

Modified: trunk/lang/php70/files/php-fpm.in
===================================================================
--- trunk/lang/php70/files/php-fpm.in	2016-08-12 17:41:55 UTC (rev 21576)
+++ trunk/lang/php70/files/php-fpm.in	2016-08-12 17:49:11 UTC (rev 21577)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: head/lang/php70/files/php-fpm.in 340872 2014-01-24 00:14:07Z mat $
+# $FreeBSD: head/lang/php70/files/php-fpm.in 412802 2016-04-09 08:19:15Z ganbold $
 #
 
 # PROVIDE: php-fpm
@@ -17,11 +17,16 @@
 name="php_fpm"
 rcvar=php_fpm_enable
 
+start_precmd="php_fpm_checkconfig"
+restart_precmd="php_fpm_checkconfig"
+reload_precmd="php_fpm_checkconfig"
+configtest_cmd="php_fpm_checkconfig"
+
 load_rc_config "$name"
 
 : ${php_fpm_enable="NO"}
 
-extra_commands="reload logrotate"
+extra_commands="reload configtest logrotate"
 
 command="%%PREFIX%%/sbin/php-fpm"
 pidfile="/var/run/php-fpm.pid"
@@ -40,4 +45,10 @@
         kill -USR1 $rc_pid
 }
 
+php_fpm_checkconfig()
+{
+        echo "Performing sanity check on php-fpm configuration:"
+        eval ${command} -t
+}
+
 run_rc_command "$1"

More information about the Midnightbsd-cvs mailing list