- Fix build with dtrace enabled [1]

- Cleanup some old leftovers

PR:		207231 [1]

2 files changed, 80 insertions, 5 deletions

diff --git a/lang/php70/Makefile b/lang/php70/Makefile
index 8150f4449b7e..aaef2f857808 100644
--- a/lang/php70/Makefile
+++ b/lang/php70/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	php70
 PORTVERSION=	7.0.3
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	lang devel www
 MASTER_SITES=	PHP/distributions
 DISTNAME=	php-${PORTVERSION}
@@ -60,10 +60,6 @@ DESTDIRNAME=	INSTALL_ROOT
 
 .include <bsd.port.pre.mk>
 
-PATCH_DIST_STRIP=	-p1
-
-PATCH_SITES+=	LOCAL/ale
-
 .if ${PORT_OPTIONS:MCLI}
 PHP_SAPI+=	cli
 .else
diff --git a/lang/php70/files/patch-acinclude.m4 b/lang/php70/files/patch-acinclude.m4
new file mode 100644
index 000000000000..f6b369fa56c7
--- /dev/null
+++ b/lang/php70/files/patch-acinclude.m4
@@ -0,0 +1,79 @@
+--- acinclude.m4.orig	2016-02-03 00:32:19.000000000 +0800
++++ acinclude.m4	2016-02-16 15:05:51.416291000 +0800
+@@ -985,15 +985,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
+-    case "$PHP_SAPI" in
+-      cgi|embed[)]
+-        PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,)
+-        EXT_STATIC="$EXT_STATIC $1;$ext_dir"
+-        ;;
+-      *[)]
+-        PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,cli)
+-        ;;
+-    esac
++
++	PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
++	PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,fpm)
+     EXT_CLI_STATIC="$EXT_CLI_STATIC $1;$ext_dir"
+   fi
+   PHP_ADD_BUILD_DIR($ext_builddir)
+@@ -1043,12 +1037,6 @@
+ build to be successful.
+ ])
+   fi
+-  if test "x$is_it_enabled" = "xno" && test "x$3" != "xtrue"; then
+-    AC_MSG_ERROR([
+-You've configured extension $1, which depends on extension $2,
+-but you've either not enabled $2, or have disabled it.
+-])
+-  fi
+   dnl Some systems require that we link $2 to $1 when building
+ ])
+ 
+@@ -2321,9 +2309,9 @@
+   test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no
+ 
+   dnl Fallbacks for different configure options
+-  if test "$PHP_OPENSSL" != "no"; then
++  if test -n  "$PHP_OPENSSL" != "no"; then
+     PHP_OPENSSL_DIR=$PHP_OPENSSL
+-  elif test "$PHP_IMAP_SSL" != "no"; then
++  elif test -n "$PHP_IMAP_SSL" != "no"; then
+     PHP_OPENSSL_DIR=$PHP_IMAP_SSL
+   fi
+ 
+@@ -2970,7 +2958,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
+ 
+@@ -2990,12 +2978,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'" >> \$[]@ [;\\]
+@@ -3007,7 +2995,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
+     ;;