[Midnightbsd-cvs] mports [17979] trunk/lang/php5: php 5.4.35

[laffer1 at midnightbsd.org]

Revision: 17979
          http://svnweb.midnightbsd.org/mports/?rev=17979
Author:   laffer1
Date:     2015-01-02 17:45:25 -0500 (Fri, 02 Jan 2015)
Log Message:
-----------
php 5.4.35

Modified Paths:
--------------
    trunk/lang/php5/Makefile
    trunk/lang/php5/distinfo
    trunk/lang/php5/files/patch-acinclude.m4

Modified: trunk/lang/php5/Makefile
===================================================================
--- trunk/lang/php5/Makefile	2015-01-02 22:44:22 UTC (rev 17978)
+++ trunk/lang/php5/Makefile	2015-01-02 22:45:25 UTC (rev 17979)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	php5
-PORTVERSION=	5.4.34
+PORTVERSION=	5.4.35
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}

Modified: trunk/lang/php5/distinfo
===================================================================
--- trunk/lang/php5/distinfo	2015-01-02 22:44:22 UTC (rev 17978)
+++ trunk/lang/php5/distinfo	2015-01-02 22:45:25 UTC (rev 17979)
@@ -1,4 +1,4 @@
-SHA256 (php-5.4.34.tar.bz2) = 57d4ea10f0c18b096a7c8fd0a98dcbe40c8f4dc94453fd3ca0a10e35fb2f8234
-SIZE (php-5.4.34.tar.bz2) = 12277163
+SHA256 (php-5.4.35.tar.bz2) = 8cdb4265cd0f778befacd1e6b5939ec23315fff38400e17e77a36e4c55b9746b
+SIZE (php-5.4.35.tar.bz2) = 12279065
 SHA256 (php-5.4.x-mail-header.patch) = 005ae1cd8ed17c72d7b09dee9c4466e8b16d4ecba7fe11276731ed6ff9fbb344
 SIZE (php-5.4.x-mail-header.patch) = 3379

Modified: trunk/lang/php5/files/patch-acinclude.m4
===================================================================
--- trunk/lang/php5/files/patch-acinclude.m4	2015-01-02 22:44:22 UTC (rev 17978)
+++ trunk/lang/php5/files/patch-acinclude.m4	2015-01-02 22:45:25 UTC (rev 17979)
@@ -1,6 +1,6 @@
---- acinclude.m4.orig	2013-12-10 19:32:43.000000000 +0000
-+++ acinclude.m4	2013-12-13 21:55:53.955235854 +0000
-@@ -984,15 +984,9 @@ dnl ------------------------------------
+--- acinclude.m4.orig	2014-11-12 00:29:14.000000000 +0000
++++ acinclude.m4	2014-11-27 09:29:43.821181323 +0000
+@@ -984,15 +984,9 @@
    if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
  dnl ---------------------------------------------- CLI static module
      [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
@@ -18,7 +18,7 @@
      EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
    fi
    PHP_ADD_BUILD_DIR($ext_builddir)
-@@ -1042,12 +1036,6 @@ You either need to build $1 shared or bu
+@@ -1042,12 +1036,6 @@
  build to be successful.
  ])
    fi
@@ -31,7 +31,7 @@
    dnl Some systems require that we link $2 to $1 when building
  ])
  
-@@ -2320,9 +2308,9 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
+@@ -2320,9 +2308,9 @@
    test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no
  
    dnl Fallbacks for different configure options
@@ -43,3 +43,36 @@
      PHP_OPENSSL_DIR=$PHP_IMAP_SSL
    fi
  
+@@ -2969,7 +2957,7 @@
+ $abs_srcdir/$ac_provsrc:;
+ 
+ $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc
+-	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
++	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@.bak && \$(SED) -e 's,PHP_,DTRACE_,g' \$[]@.bak > \$[]@
+ 
+ \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj
+ 
+@@ -2989,12 +2977,12 @@
+ $ac_bdir[$]ac_provsrc.lo: \$(PHP_DTRACE_OBJS)
+ 	echo "[#] Generated by Makefile for libtool" > \$[]@
+ 	@test -d "$dtrace_lib_dir" || mkdir $dtrace_lib_dir
+-	if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\]
++	if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o $dtrace_d_obj -s $abs_srcdir/$ac_provsrc $dtrace_lib_objs 2> /dev/null && test -f "$dtrace_d_obj"; then [\\]
+ 	  echo "pic_object=['].libs/$dtrace_prov_name[']" >> \$[]@ [;\\]
+ 	else [\\]
+ 	  echo "pic_object='none'" >> \$[]@ [;\\]
+ 	fi
+-	if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\]
++	if CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o $ac_bdir[$]ac_provsrc.o -s $abs_srcdir/$ac_provsrc $dtrace_nolib_objs 2> /dev/null && test -f "$ac_bdir[$]ac_provsrc.o"; then [\\]
+ 	  echo "non_pic_object=[']$dtrace_prov_name[']" >> \$[]@ [;\\]
+ 	else [\\]
+ 	  echo "non_pic_object='none'" >> \$[]@ [;\\]
+@@ -3006,7 +2994,7 @@
+   *)
+ cat>>Makefile.objects<<EOF
+ $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS)
+-	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
++	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -xnolibs -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs
+ 
+ EOF
+     ;;