Attachment #108129 for bug #148956




--- config.m4.orig	2010-07-26 12:36:14.131663932 +0200
+++ config.m4	2010-07-26 12:38:04.732886873 +0200
@@ -285,6 +285,42 @@
       THIS_PREFIX=$i
       THIS_INCLUDE=$i/db4/db.h
       break
+    elif test -f "$i/include/db50/db.h"; then
+      THIS_PREFIX=$i
+      THIS_INCLUDE=$i/include/db50/db.h
+      break
+    elif test -f "$i/include/db48/db.h"; then
+      THIS_PREFIX=$i
+      THIS_INCLUDE=$i/include/db48/db.h
+      break
+    elif test -f "$i/include/db47/db.h"; then
+      THIS_PREFIX=$i
+      THIS_INCLUDE=$i/include/db47/db.h

+      THIS_PREFIX=$i
+      THIS_INCLUDE=$i/include/db41/db.h
+      break
     elif test -f "$i/include/db5.0/db.h"; then
       THIS_PREFIX=$i
       THIS_INCLUDE=$i/include/db5.0/db.h
@@ -306,7 +334,7 @@
       break
     fi
   done
-  PHP_DBA_DB_CHECK(4, db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
+  PHP_DBA_DB_CHECK(4, db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
 fi
 PHP_DBA_STD_RESULT(db4,Berkeley DB4)
 

Lines 11-14 Link Here

(-)ports/databases/php5-mysqli/Makefile (+2 lines)
11		11
12	PKGNAMESUFFIX= -mysqli	12	PKGNAMESUFFIX= -mysqli
13		13
		14	CFLAGS+= -DHAVE_ULONG
		15
14	.include "${MASTERDIR}/Makefile"	16	.include "${MASTERDIR}/Makefile"

Removed Link Here

(-)ports/databases/php5-sybase_ct/files/patch-config.m4 (-11 lines)
1	--- config.m4.orig 2009-03-26 09:53:49.000000000 +0100
2	+++ config.m4 2009-03-26 09:55:35.000000000 +0100
3	@@ -31,7 +31,7 @@
4	fi
5
6	PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD)
7	- if test -f $SYBASE_CT_INCDIR/tds.h; then
8	+ if test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then
9	PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
10	SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
11	else




#

PORTNAME=	php5
PORTVERSION=	5.3.3
PORTREVISION?=	1
CATEGORIES?=	lang devel www
MASTER_SITES=	${MASTER_SITE_PHP}
MASTER_SITE_SUBDIR=	distributions

		--enable-libxml \
		--with-libxml-dir=${LOCALBASE} \
		--with-pcre-regex=${LOCALBASE} \
		--program-prefix="" \
		--localstatedir=/var

USE_GNOME=	libxml2

OPTIONS=	CLI "Build CLI version" on \
		CGI "Build CGI version" on \
		FPM "Build FastCGI process manager" on \
		APACHE "Build Apache module" off \
		DEBUG "Enable debug" off \
		SUHOSIN "Enable Suhosin protection system" on \


PATCH_DIST_STRIP=	-p1

.if !defined(WITHOUT_FPM)
LIB_DEPENDS+=	event-1.4:${PORTSDIR}/devel/libevent
MAN1+=		php-fpm.1
PHP_FPM_USER?=	www
PHP_FPM_GROUP?=	www
PHP_FPM_PID?=	/var/run/php-fpm.pid
PHP_FPM_LOG?=	/var/log/php-fpm.log
USE_RC_SUBR+=	php-fpm
SUB_LIST+=	PHP_FPM_PID=${PHP_FPM_PID}
PLIST_SUB+=	FPM="" \
		PHP_FPM_PID=${PHP_FPM_PID} \
		PHP_FPM_LOG=${PHP_FPM_LOG}

CONFIGURE_ARGS+=	--enable-fpm \
			--with-fpm-user=${PHP_FPM_USER} \
			--with-fpm-group=${PHP_FPM_GROUP} \
			--with-libevent-dir=${LOCALBASE}
.else
PLIST_SUB+=     FPM="@comment "
.endif

.if !defined(WITHOUT_SUHOSIN)
PATCHFILES+=	suhosin-patch-${PORTVERSION}-0.9.10.patch.gz:suhosin
PATCH_SITES+=	http://download.suhosin.org/:suhosin
PLIST_SUB+=	SUHOSIN=""
.else

.endif

.if defined(WITH_MAILHEAD)
PATCHFILES+=	php-5.3.2-mail-header.patch:mail
PATCH_SITES+=	http://choon.net/opensource/php/:mail
.endif


post-patch:
	@${TOUCH} ${WRKSRC}/ext/php_config.h
	@${REINPLACE_CMD} "s|^\(extension_dir\)|; \1|" ${WRKSRC}/php.ini-*
.if !defined(WITHOUT_FPM)
	@${REINPLACE_CMD} -e 's|;pid =.*|pid = ${PHP_FPM_PID}|g' \
		-e 's|;error_log =.*|error_log = ${PHP_FPM_LOG}|g' \
		${WRKSRC}/sapi/fpm/php-fpm.conf.in
.endif

pre-configure:
	@${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4

	@${INSTALL_DATA} ${WRKSRC}/php.ini-production ${PREFIX}/etc
	@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc
	@${TOUCH} ${PREFIX}/include/php/ext/php_config.h
.if !defined(WITHOUT_FPM)
	@cd ${PREFIX}/etc && ${CP} -n php-fpm.conf.default php-fpm.conf
.endif
.if defined(WITH_APACHE)
	@${CAT} ${PKGMESSAGE}
.endif

.include "${MASTERDIR}/Makefile.ext"
.endif
.include <bsd.port.post.mk>


Lines 1-9 Link Here

(-)ports/lang/php5/distinfo (-6 / +6 lines)
1	MD5 (php-5.3.2.tar.bz2) = 46f500816125202c48a458d0133254a4	1	MD5 (php-5.3.3.tar.bz2) = 21ceeeb232813c10283a5ca1b4c87b48
2	SHA256 (php-5.3.2.tar.bz2) = 9a380a574adcb3a9abe3226e7c3a9bae619e8a1b90842ec2a7edf0ad92afdeda	2	SHA256 (php-5.3.3.tar.bz2) = f2876750f3c54854a20e26a03ca229f2fbf89b8ee6176b9c0586cb9b2f0b3f9a
3	SIZE (php-5.3.2.tar.bz2) = 10477662	3	SIZE (php-5.3.3.tar.bz2) = 10662227
4	MD5 (suhosin-patch-5.3.2-0.9.9.1.patch.gz) = 4647b05330862d6a1fc4469245cc6ade	4	MD5 (suhosin-patch-5.3.3-0.9.10.patch.gz) = b66b27c43b1332400ef8982944c3b95b
5	SHA256 (suhosin-patch-5.3.2-0.9.9.1.patch.gz) = a61f081022888bf78997e434744d6c0604194c73a00e70c1165524a0a6329de2	5	SHA256 (suhosin-patch-5.3.3-0.9.10.patch.gz) = f48489ff7d3fd3fc30429f7349f181c84caf2e03e672eb2d2b55b46adf6f602c
6	SIZE (suhosin-patch-5.3.2-0.9.9.1.patch.gz) = 40847	6	SIZE (suhosin-patch-5.3.3-0.9.10.patch.gz) = 41298
7	MD5 (php-5.3.2-mail-header.patch) = 012d8c4637422e724d5559513fcaaacb	7	MD5 (php-5.3.2-mail-header.patch) = 012d8c4637422e724d5559513fcaaacb
8	SHA256 (php-5.3.2-mail-header.patch) = 3c9faeef9080330a23286f787efec8489587c619d8910d70926359f1a9306d6c	8	SHA256 (php-5.3.2-mail-header.patch) = 3c9faeef9080330a23286f787efec8489587c619d8910d70926359f1a9306d6c
9	SIZE (php-5.3.2-mail-header.patch) = 3350	9	SIZE (php-5.3.2-mail-header.patch) = 3350

Lines 1-7 Link Here

(-)ports/lang/php5/pkg-plist (+4 lines)
1	%%CLI%%bin/php	1	%%CLI%%bin/php
2	%%CGI%%bin/php-cgi	2	%%CGI%%bin/php-cgi
		3	%%FPM%%sbin/php-fpm
3	bin/php-config	4	bin/php-config
4	bin/phpize	5	bin/phpize
		6	%%FPM%%@unexec if cmp -s %D/etc/php-fpm.conf %D/etc/php-fpm.conf.default; then rm -f %D/etc/php-fpm.conf; fi
		7	%%FPM%%etc/php-fpm.conf.default
		8	%%FPM%%@exec cp -n %D/%F %B/php-fpm.conf
5	etc/php.conf	9	etc/php.conf
6	etc/php.ini-development	10	etc/php.ini-development
7	etc/php.ini-production	11	etc/php.ini-production




--- acinclude.m4.orig	2010-05-05 23:55:44.000000000 +0200
+++ acinclude.m4	2010-07-26 15:50:05.869428819 +0200
@@ -194,7 +194,7 @@
 dnl
 dnl which array to append to?
 AC_DEFUN([PHP_ADD_SOURCES],[
-  PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS)))
+  PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,ifelse($4,cgi,PHP_CGI_OBJS,ifelse($4,fpm,PHP_FPM_OBJS,PHP_GLOBAL_OBJS)))))
 ])
 
 dnl
@@ -968,15 +968,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

-        ;;
-    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"
   fi
   PHP_ADD_BUILD_DIR($ext_builddir)
@@ -1026,12 +1020,6 @@
 build to be successful.
 ])
   fi

   dnl Some systems require that we link $2 to $1 when building
 ])
 
@@ -2303,9 +2291,9 @@
   test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no
 
   dnl Fallbacks for different configure options




--- configure.in.orig	2010-07-26 16:21:16.128531188 +0200
+++ configure.in	2010-07-26 16:28:32.112173134 +0200
@@ -302,7 +302,6 @@
 dnl .
 dnl -------------------------------------------------------------------------
 

 PHP_HELP_SEPARATOR([SAPI modules:])
 PHP_SHLIB_SUFFIX_NAMES
 PHP_SAPI=default
@@ -327,7 +326,6 @@
 
 if test "$enable_maintainer_zts" = "yes"; then
   PTHREADS_ASSIGN_VARS

 fi
 
 divert(3)
@@ -1162,7 +1160,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"`

 
 exec_prefix=$old_exec_prefix
 libdir=$old_libdir
@@ -1373,22 +1371,19 @@
   pharcmd_install=
 fi;
 
-all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $pharcmd"
-install_targets="$install_modules install-build install-headers install-programs $install_pear $pharcmd_install"
+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET) \$(PHP_FPM_TARGET) $pharcmd"
+install_targets="$PHP_INSTALL_CLI_TARGET $PHP_INSTALL_CGI_TARGET $install_modules install-build install-headers install-programs $install_pear $pharcmd_install"
 
 case $PHP_SAPI in

Lines 1-5 Link Here

(-)ports/lang/php5/files/patch-sapi_cgi_config9.m4 (-7 / +14 lines)
1	--- sapi/cgi/config9.m4.orig 2007-10-01 14:40:54.000000000 +0200	1	--- sapi/cgi/config9.m4.orig 2007-10-01 14:40:54.000000000 +0200
2	+++ sapi/cgi/config9.m4 2008-09-25 23:07:13.000000000 +0200	2	+++ sapi/cgi/config9.m4 2010-07-26 17:15:20.000000000 +0200
3	@@ -8,7 +8,6 @@	3	@@ -8,7 +8,6 @@
4	dnl	4	dnl
5	dnl CGI setup	5	dnl CGI setup
Lines 20-26 Link Here
20		20
21	case $host_alias in	21	case $host_alias in
22	aix)	22	aix)
23	@@ -64,17 +64,29 @@	23	@@ -64,17 +64,32 @@
24	BUILD_CGI="\$(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) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"	24	BUILD_CGI="\$(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) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
25	;;	25	;;
26	*)	26	*)
Lines 35-40 Link Here
35	-	35	-
36	- elif test "$PHP_CLI" != "no"; then	36	- elif test "$PHP_CLI" != "no"; then
37	- AC_MSG_RESULT(no)	37	- AC_MSG_RESULT(no)
		38	- OVERALL_TARGET=
		39	- PHP_SAPI=cli
		40	- else
		41	- AC_MSG_ERROR([No SAPIs selected.])
38	+ PHP_SUBST(INSTALL_CGI)	42	+ PHP_SUBST(INSTALL_CGI)
39	+ PHP_SUBST(PHP_CGI_OBJS)	43	+ PHP_SUBST(PHP_CGI_OBJS)
40	+ PHP_SUBST(PHP_CGI_TARGET)	44	+ PHP_SUBST(PHP_CGI_TARGET)
Lines 47-56 Link Here
47	+ AC_MSG_RESULT(no)	51	+ AC_MSG_RESULT(no)
48	+ if test "$PHP_SAPI" = "default" ; then	52	+ if test "$PHP_SAPI" = "default" ; then
49	+ if test "$PHP_CLI" != "no" ; then	53	+ if test "$PHP_CLI" != "no" ; then
50	OVERALL_TARGET=	54	+ OVERALL_TARGET=
51	PHP_SAPI=cli	55	+ PHP_SAPI=cli
52	else	56	+ elif test "$PHP_FPM" != "no" ; then
53	AC_MSG_ERROR([No SAPIs selected.])	57	+ OVERALL_TARGET=
		58	+ PHP_SAPI=fpm
		59	+ else
		60	+ AC_MSG_ERROR([No SAPIs selected.])
		61	+ fi
54	fi	62	fi
55	+ fi
56	fi	63	fi

Added Link Here

(-)ports/lang/php5/files/patch-sapi_fpm_Makefile.frag (+11 lines)
1	--- sapi/fpm/Makefile.frag.orig 2010-05-30 00:00:43.000000000 +0200
2	+++ sapi/fpm/Makefile.frag 2010-07-26 15:40:28.353611607 +0200
3	@@ -3,7 +3,7 @@
4	$(builddir)/fpm:
5	@mkdir -p $(builddir)/fpm
6
7	-$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(SAPI_EXTRA_DEPS)
8	+$(SAPI_FPM_PATH): $(builddir)/fpm $(PHP_GLOBAL_OBJS) $(PHP_FPM_OBJS) $(SAPI_EXTRA_DEPS)
9	$(BUILD_FPM)
10
11	$(builddir)/fpm/fpm_conf.lo: $(builddir)/../../main/build-defs.h




--- sapi/fpm/config.m4.orig	2010-06-16 10:58:42.000000000 +0200
+++ sapi/fpm/config.m4	2010-07-26 17:18:04.000000000 +0200
@@ -565,7 +565,9 @@
   SAPI_EXTRA_LIBS="$LIBEVENT_LIBS"
   PHP_SUBST(SAPI_EXTRA_LIBS)
  
-  INSTALL_IT=":"
+  if test "$PHP_SAPI" = "default" -o "$PHP_SAPI" = "fpm" ; then
+    INSTALL_IT=":"
+  fi
   PHP_FPM_FILES="fpm/fastcgi.c \
     fpm/fpm.c \
     fpm/fpm_children.c \
@@ -590,7 +592,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*)
@@ -600,11 +603,21 @@
         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) \$(SAPI_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" = "default" -o "$PHP_SAPI" = "fpm" ; then
+    PHP_SUBST(INSTALL_IT)
+    PHP_BUILD_PROGRAM($SAPI_FPM_PATH)
+  fi
 else
   AC_MSG_RESULT(no)
 fi




#!/bin/sh
#
# $FreeBSD: ports/lang/php52/files/php-fpm.in,v 1.1 2010/06/16 10:12:36 mm Exp $
#

# PROVIDE: php-fpm
# REQUIRE: LOGIN
# BEFORE:  securelevel
# KEYWORD: shutdown

# Add the following lines to /etc/rc.conf to enable php-fpm:
#
# php_fpm_enable="YES"
# php_fpm_config=""
#

. /etc/rc.subr

name="php_fpm"
rcvar=`set_rcvar`

extra_commands="reload logrotate"

command="%%PREFIX%%/sbin/php-fpm"
pidfile="%%PHP_FPM_PID%%"
reload_cmd="php_fpm_reload_cmd"
logrotate_cmd="php_fpm_logrotate_cmd"

# read configuration and set defaults
load_rc_config "$name"
: ${php_fpm_enable="NO"}
: ${php_fpm_config=""}

if [ -n "${php_fpm_config}" ]; then
	required_files="${php_fpm_config}"
	command_args="--fpm-config ${php_fpm_config}"
else
	required_files="%%PREFIX%%/etc/php-fpm.conf"
fi

php_fpm_reload_cmd () {
	if [ -z "$rc_pid" ]; then
		_run_rc_notrunning
		return 1
	fi
	echo "Reloading $name."
	kill -USR2 $rc_pid
}

php_fpm_logrotate_cmd () {
	if [ -z "$rc_pid" ]; then
		_run_rc_notrunning
		return 1
	fi
	echo "Rotating logs $name."
	kill -USR1 $rc_pid
}

run_rc_command "$1"

Lines 5-11 Link Here

(-)ports/math/php5-gmp/Makefile (-1 lines)
5	# $FreeBSD: ports/math/php5-gmp/Makefile,v 1.4 2010/04/19 10:43:35 ale Exp $	5	# $FreeBSD: ports/math/php5-gmp/Makefile,v 1.4 2010/04/19 10:43:35 ale Exp $
6	#	6	#
7		7
8	PORTREVISION= 1
9	CATEGORIES= math	8	CATEGORIES= math
10		9
11	MASTERDIR= ${.CURDIR}/../../lang/php5	10	MASTERDIR= ${.CURDIR}/../../lang/php5

Return to bug 148956

Lines 1-9 Link Here

(-)ports/databases/php5-dba/files/patch-config.m4 (-14 / +13 lines)
1	--- config.m4.orig 2007-12-06 15:17:43.000000000 +0100	1	--- config.m4.orig 2010-07-26 12:36:14.131663932 +0200
2	+++ config.m4 2008-12-11 12:50:27.000000000 +0100	2	+++ config.m4 2010-07-26 12:38:04.732886873 +0200
3	@@ -280,6 +280,34 @@	3	@@ -285,6 +285,42 @@
4	THIS_PREFIX=$i	4	THIS_PREFIX=$i
5	THIS_INCLUDE=$i/db4/db.h	5	THIS_INCLUDE=$i/db4/db.h
6	break	6	break
		7	+ elif test -f "$i/include/db50/db.h"; then
		8	+ THIS_PREFIX=$i
		9	+ THIS_INCLUDE=$i/include/db50/db.h
		10	+ break
		11	+ elif test -f "$i/include/db48/db.h"; then
		12	+ THIS_PREFIX=$i
		13	+ THIS_INCLUDE=$i/include/db48/db.h
		14	+ break
7	+ elif test -f "$i/include/db47/db.h"; then	15	+ elif test -f "$i/include/db47/db.h"; then
8	+ THIS_PREFIX=$i	16	+ THIS_PREFIX=$i
9	+ THIS_INCLUDE=$i/include/db47/db.h	17	+ THIS_INCLUDE=$i/include/db47/db.h
Lines 32-46 Link Here
32	+ THIS_PREFIX=$i	40	+ THIS_PREFIX=$i
33	+ THIS_INCLUDE=$i/include/db41/db.h	41	+ THIS_INCLUDE=$i/include/db41/db.h
34	+ break	42	+ break
35	elif test -f "$i/include/db4.6/db.h"; then	43	elif test -f "$i/include/db5.0/db.h"; then
36	THIS_PREFIX=$i	44	THIS_PREFIX=$i
37	THIS_INCLUDE=$i/include/db4.6/db.h	45	THIS_INCLUDE=$i/include/db5.0/db.h
38	@@ -306,7 +334,7 @@
39	break
40	fi
41	done
42	- PHP_DBA_DB_CHECK(4, db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB*)0, (DB_ENV)0, 0)])
43	+ PHP_DBA_DB_CHECK(4, db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB*)0, (DB_ENV)0, 0)])
44	fi
45	PHP_DBA_STD_RESULT(db4,Berkeley DB4)
46

Lines 6-13 Link Here

(-)ports/lang/php5/Makefile (-5 / +36 lines)
6	#	6	#
7		7
8	PORTNAME= php5	8	PORTNAME= php5
9	PORTVERSION= 5.3.2	9	PORTVERSION= 5.3.3
10	PORTREVISION?= 1
11	CATEGORIES?= lang devel www	10	CATEGORIES?= lang devel www
12	MASTER_SITES= ${MASTER_SITE_PHP}	11	MASTER_SITES= ${MASTER_SITE_PHP}
13	MASTER_SITE_SUBDIR= distributions	12	MASTER_SITE_SUBDIR= distributions
Lines 32-43 Link Here
32	--enable-libxml \	31	--enable-libxml \
33	--with-libxml-dir=${LOCALBASE} \	32	--with-libxml-dir=${LOCALBASE} \
34	--with-pcre-regex=${LOCALBASE} \	33	--with-pcre-regex=${LOCALBASE} \
35	--program-prefix=""	34	--program-prefix="" \
		35	--localstatedir=/var
36		36
37	USE_GNOME= libxml2	37	USE_GNOME= libxml2
38		38
39	OPTIONS= CLI "Build CLI version" on \	39	OPTIONS= CLI "Build CLI version" on \
40	CGI "Build CGI version" on \	40	CGI "Build CGI version" on \
		41	FPM "Build FastCGI process manager" on \
41	APACHE "Build Apache module" off \	42	APACHE "Build Apache module" off \
42	DEBUG "Enable debug" off \	43	DEBUG "Enable debug" off \
43	SUHOSIN "Enable Suhosin protection system" on \	44	SUHOSIN "Enable Suhosin protection system" on \
Lines 54-61 Link Here
54		55
55	PATCH_DIST_STRIP= -p1	56	PATCH_DIST_STRIP= -p1
56		57
		58	.if !defined(WITHOUT_FPM)
		59	LIB_DEPENDS+= event-1.4:${PORTSDIR}/devel/libevent
		60	MAN1+= php-fpm.1
		61	PHP_FPM_USER?= www
		62	PHP_FPM_GROUP?= www
		63	PHP_FPM_PID?= /var/run/php-fpm.pid
		64	PHP_FPM_LOG?= /var/log/php-fpm.log
		65	USE_RC_SUBR+= php-fpm
		66	SUB_LIST+= PHP_FPM_PID=${PHP_FPM_PID}
		67	PLIST_SUB+= FPM="" \
		68	PHP_FPM_PID=${PHP_FPM_PID} \
		69	PHP_FPM_LOG=${PHP_FPM_LOG}
		70
		71	CONFIGURE_ARGS+= --enable-fpm \
		72	--with-fpm-user=${PHP_FPM_USER} \
		73	--with-fpm-group=${PHP_FPM_GROUP} \
		74	--with-libevent-dir=${LOCALBASE}
		75	.else
		76	PLIST_SUB+= FPM="@comment "
		77	.endif
		78
57	.if !defined(WITHOUT_SUHOSIN)	79	.if !defined(WITHOUT_SUHOSIN)
58	PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.9.1.patch.gz:suhosin	80	PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.10.patch.gz:suhosin
59	PATCH_SITES+= http://download.suhosin.org/:suhosin	81	PATCH_SITES+= http://download.suhosin.org/:suhosin
60	PLIST_SUB+= SUHOSIN=""	82	PLIST_SUB+= SUHOSIN=""
61	.else	83	.else
Lines 63-69 Link Here
63	.endif	85	.endif
64		86
65	.if defined(WITH_MAILHEAD)	87	.if defined(WITH_MAILHEAD)
66	PATCHFILES+= php-${PORTVERSION}-mail-header.patch:mail	88	PATCHFILES+= php-5.3.2-mail-header.patch:mail
67	PATCH_SITES+= http://choon.net/opensource/php/:mail	89	PATCH_SITES+= http://choon.net/opensource/php/:mail
68	.endif	90	.endif
69		91
Lines 139-144 Link Here
139	post-patch:	161	post-patch:
140	@${TOUCH} ${WRKSRC}/ext/php_config.h	162	@${TOUCH} ${WRKSRC}/ext/php_config.h
141	@${REINPLACE_CMD} "s\|^\(extension_dir\)\|; \1\|" ${WRKSRC}/php.ini-*	163	@${REINPLACE_CMD} "s\|^\(extension_dir\)\|; \1\|" ${WRKSRC}/php.ini-*
		164	.if !defined(WITHOUT_FPM)
		165	@${REINPLACE_CMD} -e 's\|;pid =.*\|pid = ${PHP_FPM_PID}\|g' \
		166	-e 's\|;error_log =.*\|error_log = ${PHP_FPM_LOG}\|g' \
		167	${WRKSRC}/sapi/fpm/php-fpm.conf.in
		168	.endif
142		169
143	pre-configure:	170	pre-configure:
144	@${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4	171	@${CAT} ${WRKSRC}/acinclude.m4 ${WRKSRC}/build/libtool.m4 > ${WRKSRC}/aclocal.m4
Lines 157-162 Link Here
157	@${INSTALL_DATA} ${WRKSRC}/php.ini-production ${PREFIX}/etc	184	@${INSTALL_DATA} ${WRKSRC}/php.ini-production ${PREFIX}/etc
158	@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc	185	@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc
159	@${TOUCH} ${PREFIX}/include/php/ext/php_config.h	186	@${TOUCH} ${PREFIX}/include/php/ext/php_config.h
		187	.if !defined(WITHOUT_FPM)
		188	@cd ${PREFIX}/etc && ${CP} -n php-fpm.conf.default php-fpm.conf
		189	.endif
160	.if defined(WITH_APACHE)	190	.if defined(WITH_APACHE)
161	@${CAT} ${PKGMESSAGE}	191	@${CAT} ${PKGMESSAGE}
162	.endif	192	.endif
Lines 165-167 Link Here
165	.include "${MASTERDIR}/Makefile.ext"	195	.include "${MASTERDIR}/Makefile.ext"
166	.endif	196	.endif
167	.include <bsd.port.post.mk>	197	.include <bsd.port.post.mk>
		198

Lines 1-15 Link Here

(-)ports/lang/php5/files/patch-acinclude.m4 (-6 / +7 lines)
1	--- acinclude.m4.orig 2009-05-09 22:28:02.000000000 +0200	1	--- acinclude.m4.orig 2010-05-05 23:55:44.000000000 +0200
2	+++ acinclude.m4 2009-06-25 08:08:05.000000000 +0200	2	+++ acinclude.m4 2010-07-26 15:50:05.869428819 +0200
3	@@ -194,7 +194,7 @@	3	@@ -194,7 +194,7 @@
4	dnl	4	dnl
5	dnl which array to append to?	5	dnl which array to append to?
6	AC_DEFUN([PHP_ADD_SOURCES],[	6	AC_DEFUN([PHP_ADD_SOURCES],[
7	- PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS)))	7	- PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS)))
8	+ PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,ifelse($4,cgi,PHP_CGI_OBJS,PHP_GLOBAL_OBJS))))	8	+ PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,ifelse($4,cgi,PHP_CGI_OBJS,ifelse($4,fpm,PHP_FPM_OBJS,PHP_GLOBAL_OBJS)))))
9	])	9	])
10		10
11	dnl	11	dnl
12	@@ -968,15 +968,8 @@	12	@@ -968,15 +968,9 @@
13	if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then	13	if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
14	dnl ---------------------------------------------- CLI static module	14	dnl ---------------------------------------------- CLI static module
15	[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no	15	[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
Lines 23-32 Link Here
23	- ;;	23	- ;;
24	- esac	24	- esac
25	+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)	25	+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
		26	+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,fpm)
26	EXT_CLI_STATIC="$EXT_CLI_STATIC $1"	27	EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
27	fi	28	fi
28	PHP_ADD_BUILD_DIR($ext_builddir)	29	PHP_ADD_BUILD_DIR($ext_builddir)
29	@@ -1026,12 +1019,6 @@	30	@@ -1026,12 +1020,6 @@
30	build to be successful.	31	build to be successful.
31	])	32	])
32	fi	33	fi
Lines 39-45 Link Here
39	dnl Some systems require that we link $2 to $1 when building	40	dnl Some systems require that we link $2 to $1 when building
40	])	41	])
41		42
42	@@ -2303,9 +2290,9 @@	43	@@ -2303,9 +2291,9 @@
43	test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no	44	test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no
44		45
45	dnl Fallbacks for different configure options	46	dnl Fallbacks for different configure options

Lines 1-6 Link Here

(-)ports/lang/php5/files/patch-configure.in (-8 / +8 lines)
1	--- configure.in.orig 2008-12-05 07:58:47.000000000 +0100	1	--- configure.in.orig 2010-07-26 16:21:16.128531188 +0200
2	+++ configure.in 2008-12-05 08:02:26.000000000 +0100	2	+++ configure.in 2010-07-26 16:28:32.112173134 +0200
3	@@ -270,7 +270,6 @@	3	@@ -302,7 +302,6 @@
4	dnl .	4	dnl .
5	dnl -------------------------------------------------------------------------	5	dnl -------------------------------------------------------------------------
6		6
Lines 8-14 Link Here
8	PHP_HELP_SEPARATOR([SAPI modules:])	8	PHP_HELP_SEPARATOR([SAPI modules:])
9	PHP_SHLIB_SUFFIX_NAMES	9	PHP_SHLIB_SUFFIX_NAMES
10	PHP_SAPI=default	10	PHP_SAPI=default
11	@@ -295,7 +294,6 @@	11	@@ -327,7 +326,6 @@
12		12
13	if test "$enable_maintainer_zts" = "yes"; then	13	if test "$enable_maintainer_zts" = "yes"; then
14	PTHREADS_ASSIGN_VARS	14	PTHREADS_ASSIGN_VARS
Lines 16-22 Link Here
16	fi	16	fi
17		17
18	divert(3)	18	divert(3)
19	@@ -1136,7 +1134,7 @@	19	@@ -1162,7 +1160,7 @@
20	EXPANDED_DATADIR=$datadir	20	EXPANDED_DATADIR=$datadir
21	EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`	21	EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
22	EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`	22	EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
Lines 25-37 Link Here
25		25
26	exec_prefix=$old_exec_prefix	26	exec_prefix=$old_exec_prefix
27	libdir=$old_libdir	27	libdir=$old_libdir
28	@@ -1388,22 +1386,19 @@	28	@@ -1373,22 +1371,19 @@
29	pharcmd_install=	29	pharcmd_install=
30	fi;	30	fi;
31		31
32	-all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $pharcmd"	32	-all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $pharcmd"
33	-install_targets="$install_modules install-build install-headers install-programs $install_pear $pharcmd_install"	33	-install_targets="$install_modules install-build install-headers install-programs $install_pear $pharcmd_install"
34	+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET) $pharcmd"	34	+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET) \$(PHP_FPM_TARGET) $pharcmd"
35	+install_targets="$PHP_INSTALL_CLI_TARGET $PHP_INSTALL_CGI_TARGET $install_modules install-build install-headers install-programs $install_pear $pharcmd_install"	35	+install_targets="$PHP_INSTALL_CLI_TARGET $PHP_INSTALL_CGI_TARGET $install_modules install-build install-headers install-programs $install_pear $pharcmd_install"
36		36
37	case $PHP_SAPI in	37	case $PHP_SAPI in

Added Link Here

(-)ports/lang/php5/files/patch-sapi_fpm_config.m4 (+46 lines)
1	--- sapi/fpm/config.m4.orig 2010-06-16 10:58:42.000000000 +0200
2	+++ sapi/fpm/config.m4 2010-07-26 17:18:04.000000000 +0200
3	@@ -565,7 +565,9 @@
4	SAPI_EXTRA_LIBS="$LIBEVENT_LIBS"
5	PHP_SUBST(SAPI_EXTRA_LIBS)
6
7	- INSTALL_IT=":"
8	+ if test "$PHP_SAPI" = "default" -o "$PHP_SAPI" = "fpm" ; then
9	+ INSTALL_IT=":"
10	+ fi
11	PHP_FPM_FILES="fpm/fastcgi.c \
12	fpm/fpm.c \
13	fpm/fpm_children.c \
14	@@ -590,7 +592,8 @@
15	fpm/zlog.c \
16	"
17
18	- PHP_SELECT_SAPI(fpm, program, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES, $PHP_FPM_CFLAGS, '$(SAPI_FPM_PATH)')
19	+ PHP_ADD_SOURCES(sapi/fpm, $PHP_FPM_FILES $PHP_FPM_TRACE_FILES, $PHP_FPM_CFLAGS,fpm)
20	+ PHP_ADD_SOURCES(/main, internal_functions.c,,fpm)
21
22	case $host_alias in
23	aix)
24	@@ -600,11 +603,21 @@
25	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)"
26	;;
27	*)
28	- 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)"
29	+ 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) \$(SAPI_EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_FPM_PATH)"
30	;;
31	esac
32
33	+ PHP_FPM_TARGET="\$(SAPI_FPM_PATH)"
34	+ PHP_INSTALL_FPM_TARGET="install-fpm"
35	PHP_SUBST(BUILD_FPM)
36	+
37	+ PHP_SUBST(PHP_FPM_OBJS)
38	+ PHP_SUBST(PHP_FPM_TARGET)
39	+ PHP_SUBST(PHP_INSTALL_FPM_TARGET)
40	+ if test "$PHP_SAPI" = "default" -o "$PHP_SAPI" = "fpm" ; then
41	+ PHP_SUBST(INSTALL_IT)
42	+ PHP_BUILD_PROGRAM($SAPI_FPM_PATH)
43	+ fi
44	else
45	AC_MSG_RESULT(no)
46	fi

Added Link Here

(-)ports/lang/php5/files/php-fpm.in (+59 lines)
1	#!/bin/sh
2	#
3	# $FreeBSD: ports/lang/php52/files/php-fpm.in,v 1.1 2010/06/16 10:12:36 mm Exp $
4	#
5
6	# PROVIDE: php-fpm
7	# REQUIRE: LOGIN
8	# BEFORE: securelevel
9	# KEYWORD: shutdown
10
11	# Add the following lines to /etc/rc.conf to enable php-fpm:
12	#
13	# php_fpm_enable="YES"
14	# php_fpm_config=""
15	#
16
17	. /etc/rc.subr
18
19	name="php_fpm"
20	rcvar=`set_rcvar`
21
22	extra_commands="reload logrotate"
23
24	command="%%PREFIX%%/sbin/php-fpm"
25	pidfile="%%PHP_FPM_PID%%"
26	reload_cmd="php_fpm_reload_cmd"
27	logrotate_cmd="php_fpm_logrotate_cmd"
28
29	# read configuration and set defaults
30	load_rc_config "$name"
31	: ${php_fpm_enable="NO"}
32	: ${php_fpm_config=""}
33
34	if [ -n "${php_fpm_config}" ]; then
35	required_files="${php_fpm_config}"
36	command_args="--fpm-config ${php_fpm_config}"
37	else
38	required_files="%%PREFIX%%/etc/php-fpm.conf"
39	fi
40
41	php_fpm_reload_cmd () {
42	if [ -z "$rc_pid" ]; then
43	_run_rc_notrunning
44	return 1
45	fi
46	echo "Reloading $name."
47	kill -USR2 $rc_pid
48	}
49
50	php_fpm_logrotate_cmd () {
51	if [ -z "$rc_pid" ]; then
52	_run_rc_notrunning
53	return 1
54	fi
55	echo "Rotating logs $name."
56	kill -USR1 $rc_pid
57	}
58
59	run_rc_command "$1"