Date: Wed, 9 Apr 2014 07:58:44 +0000 (UTC) From: Alex Dupre <ale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350670 - in head/lang: php5/files php55/files Message-ID: <201404090758.s397wi01008009@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ale Date: Wed Apr 9 07:58:43 2014 New Revision: 350670 URL: http://svnweb.freebsd.org/changeset/ports/350670 QAT: https://qat.redports.org/buildarchive/r350670/ Log: Now that mod_php is a separate port, allow to deselect all SAPIs. PR: ports/188386 Submitted by: Joel Parker <rootrider@shellfront.org> Modified: head/lang/php5/files/patch-configure.in head/lang/php55/files/patch-configure.in Modified: head/lang/php5/files/patch-configure.in ============================================================================== --- head/lang/php5/files/patch-configure.in Wed Apr 9 07:47:01 2014 (r350669) +++ head/lang/php5/files/patch-configure.in Wed Apr 9 07:58:43 2014 (r350670) @@ -1,6 +1,6 @@ ---- configure.in.orig 2013-12-10 19:32:43.000000000 +0000 -+++ configure.in 2013-12-13 21:55:53.986235686 +0000 -@@ -370,7 +370,6 @@ sinclude(TSRM/tsrm.m4) +--- configure.in.orig 2014-04-02 05:43:49.000000000 +0000 ++++ configure.in 2014-04-09 07:55:06.042404378 +0000 +@@ -370,7 +370,6 @@ dnl . dnl ------------------------------------------------------------------------- @@ -8,7 +8,15 @@ PHP_HELP_SEPARATOR([SAPI modules:]) PHP_SHLIB_SUFFIX_NAMES PHP_BUILD_PROGRAM -@@ -409,7 +408,6 @@ fi +@@ -401,15 +400,9 @@ + AC_MSG_RESULT([none]) + fi + +-dnl Exit early +-if test -z "$PHP_INSTALLED_SAPIS"; then +- AC_MSG_ERROR([Nothing to build.]) +-fi +- dnl force ZTS if test "$enable_maintainer_zts" = "yes"; then PTHREADS_ASSIGN_VARS @@ -16,7 +24,7 @@ fi dnl Starting system checks. -@@ -688,7 +686,7 @@ nanosleep \ +@@ -688,7 +681,7 @@ ) dnl Some systems (like OpenSolaris) do not have nanosleep in libc @@ -25,7 +33,7 @@ dnl Check for getaddrinfo, should be a better way, but... dnl Also check for working getaddrinfo -@@ -1225,7 +1223,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd +@@ -1225,7 +1218,7 @@ 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"` @@ -34,7 +42,7 @@ exec_prefix=$old_exec_prefix libdir=$old_libdir -@@ -1435,7 +1433,7 @@ PHP_SUBST(all_targets) +@@ -1435,7 +1428,7 @@ PHP_SUBST(install_targets) PHP_SUBST(install_binary_targets) Modified: head/lang/php55/files/patch-configure.in ============================================================================== --- head/lang/php55/files/patch-configure.in Wed Apr 9 07:47:01 2014 (r350669) +++ head/lang/php55/files/patch-configure.in Wed Apr 9 07:58:43 2014 (r350670) @@ -1,6 +1,6 @@ ---- configure.in.orig 2013-12-10 23:31:06.000000000 +0000 -+++ configure.in 2013-12-13 21:50:25.183258334 +0000 -@@ -370,7 +370,6 @@ sinclude(TSRM/tsrm.m4) +--- 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 @@ dnl . dnl ------------------------------------------------------------------------- @@ -8,7 +8,15 @@ PHP_HELP_SEPARATOR([SAPI modules:]) PHP_SHLIB_SUFFIX_NAMES PHP_BUILD_PROGRAM -@@ -409,7 +408,6 @@ fi +@@ -401,15 +400,9 @@ + AC_MSG_RESULT([none]) + fi + +-dnl Exit early +-if test -z "$PHP_INSTALLED_SAPIS"; then +- AC_MSG_ERROR([Nothing to build.]) +-fi +- dnl force ZTS if test "$enable_maintainer_zts" = "yes"; then PTHREADS_ASSIGN_VARS @@ -16,7 +24,7 @@ fi dnl Starting system checks. -@@ -688,7 +686,7 @@ nanosleep \ +@@ -688,7 +681,7 @@ ) dnl Some systems (like OpenSolaris) do not have nanosleep in libc @@ -25,7 +33,7 @@ dnl Check for getaddrinfo, should be a better way, but... dnl Also check for working getaddrinfo -@@ -1225,7 +1223,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd +@@ -1225,7 +1218,7 @@ 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"` @@ -34,7 +42,7 @@ exec_prefix=$old_exec_prefix libdir=$old_libdir -@@ -1435,7 +1433,7 @@ PHP_SUBST(all_targets) +@@ -1435,7 +1428,7 @@ PHP_SUBST(install_targets) PHP_SUBST(install_binary_targets)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404090758.s397wi01008009>