Update to 5.4.3 release:

- add support for embedded php library
- add support for dtrace

Re-organize bsd.php.mk:
 - add WANT_PHP_EMD
 - fix handling of WANT_PHP_*
 - remove php4 extensions

From UPDATING:
  Suhosin patch has been disabled until the
  new version will be released (soon). Suhosing extension will take more
  time. LINKTHR option is now enabled by default, be sure to flag it if
  you are updating using an old saved configuration. sqlite2 extension
  has been permanently removed.
  If you want to remain at PHP 5.3, a new port (lang/php53) will be
  committed soon.

1 files changed, 0 insertions, 42 deletions

diff --git a/lang/php5/files/patch-sapi_fpm_config.m4 b/lang/php5/files/patch-sapi_fpm_config.m4
index 859db721d66e..a9db5afbe0af 100644
--- a/lang/php5/files/patch-sapi_fpm_config.m4
+++ b/lang/php5/files/patch-sapi_fpm_config.m4
@@ -18,45 +18,3 @@
        AC_DEFINE([HAVE_LQ_SO_LISTENQ], 1, [do we have SO_LISTENQxxx?])
      fi
    fi
-@@ -423,7 +423,9 @@
-   
-   PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm"
-  
--  INSTALL_IT=":"
-+  if test "$PHP_SAPI" = "default"; then
-+    PHP_SAPI="fpm"
-+  fi 
-   PHP_FPM_FILES="fpm/fastcgi.c \
-     fpm/fpm.c \
-     fpm/fpm_children.c \
-@@ -449,7 +451,8 @@
-     fpm/zlog.c \
-   "
- 
--  PHP_SELECT_SAPI(fpm, program, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES, $PHP_FPM_CFLAGS, '$(SAPI_FPM_PATH)')
-+  PHP_ADD_SOURCES(sapi/fpm, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES, $PHP_FPM_CFLAGS, fpm)
-+  PHP_ADD_SOURCES(/main, internal_functions.c,,fpm)
- 
-   case $host_alias in
-       *aix*)
-@@ -459,11 +462,19 @@
-         BUILD_FPM="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
-       ;;
-       *)
--        BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
-+        BUILD_FPM="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_FPM_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
-       ;;
-   esac
- 
-+  PHP_FPM_TARGET="\$(SAPI_FPM_PATH)"
-+  PHP_INSTALL_FPM_TARGET="install-fpm"
-   PHP_SUBST(BUILD_FPM)
-+  PHP_SUBST(PHP_FPM_OBJS)
-+  PHP_SUBST(PHP_FPM_TARGET)
-+  PHP_SUBST(PHP_INSTALL_FPM_TARGET)
-+  if test "$PHP_SAPI" = "fpm" ; then
-+    PHP_BUILD_PROGRAM($SAPI_FPM_PATH)
-+  fi
- else
-   AC_MSG_RESULT(no)
- fi