On 2012/11/05 16:38, Stuart Henderson wrote:
> On 2012/11/05 16:29, Rodolfo Gouveia wrote:
> > Hi,
> > I noticed that PHP 5.3.15 didn't hit 5.2-stable branch.
> > Was this because lack of testing from people?
>
> Probably due to lack of time rather than anything else.
Diff for this below.
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/lang/php/Makefile.inc,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile.inc
--- Makefile.inc 27 Jun 2012 19:28:52 -0000 1.31
+++ Makefile.inc 6 Nov 2012 00:02:16 -0000
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.31 2012/06/27 19:28:52 naddy Exp $
+# $OpenBSD: Makefile.inc,v 1.32 2012/08/23 19:19:17 sthen Exp $
# This port currently only works with archs supporting dynamic loading
# and has Apache that supports DSO's.
@@ -117,21 +117,21 @@ MULTI_PACKAGES+= -bz2
COMMENT-bz2= bzip2 compression extensions for php5
CONFIGURE_ARGS+= --with-bz2=shared,${LOCALBASE}
LIB_DEPENDS-bz2= archivers/bzip2
-WANTLIB-bz2= bz2>=10
+WANTLIB-bz2= bz2>=10 c pthread
# curl
MULTI_PACKAGES+= -curl
COMMENT-curl= curl URL library extensions for php5
CONFIGURE_ARGS+= --with-curl=shared,${LOCALBASE}
LIB_DEPENDS-curl= net/curl
-WANTLIB-curl= crypto idn ssl z curl>=2 ${MODGETTEXT_WANTLIB}
+WANTLIB-curl= c pthread crypto idn ssl z curl>=2 ${MODGETTEXT_WANTLIB}
# dba
MULTI_PACKAGES+= -dba
COMMENT-dba= dba GDBM access extensions for php5
CONFIGURE_ARGS+= --enable-dba=shared --with-gdbm=${LOCALBASE}
LIB_DEPENDS-dba= databases/gdbm
-WANTLIB-dba= gdbm>=2
+WANTLIB-dba= c gdbm>=2 pthread
# gd
MULTI_PACKAGES+= -gd
@@ -139,23 +139,22 @@ COMMENT-gd= image manipulation extensio
LIB_DEPENDS-gd= graphics/jpeg \
graphics/png \
devel/t1lib
-WANTLIB-gd= z jpeg>=62 png>=3 t1>=5
+WANTLIB-gd= z jpeg>=62 png>=3 t1>=5 c pthread X11 Xpm freetype
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include/libpng"
CONFIGURE_ARGS+= --with-gd=shared \
--with-jpeg-dir=${LOCALBASE} \
--with-png-dir=${LOCALBASE} \
--with-zlib-dir=/usr \
--with-t1lib=${LOCALBASE} \
- --with-freetype-dir=${X11BASE}
-CONFIGURE_ARGS+= --with-xpm-dir=${X11BASE}
-WANTLIB-gd+= X11 Xpm freetype
+ --with-freetype-dir=${X11BASE} \
+ --with-xpm-dir=${X11BASE}
# gmp
MULTI_PACKAGES+= -gmp
COMMENT-gmp= gmp math library support for php5
CONFIGURE_ARGS+= --with-gmp=shared,${LOCALBASE}
LIB_DEPENDS-gmp= devel/gmp
-WANTLIB-gmp= gmp>=4
+WANTLIB-gmp= c gmp>=4 pthread
# imap
MULTI_PACKAGES+= -imap
@@ -163,140 +162,140 @@ COMMENT-imap= imap, pop3 and nntp exten
CONFIGURE_ARGS+= --with-imap=shared,${LOCALBASE} \
--with-kerberos=/usr --with-imap-ssl
LIB_DEPENDS-imap= mail/imap-uw,-c-client
-WANTLIB-imap= crypto gssapi krb5 ssl c-client>=5
+WANTLIB-imap= c pthread crypto gssapi krb5 ssl c-client>=5
# ldap
MULTI_PACKAGES+= -ldap
COMMENT-ldap= ldap protocol extensions for php5
CONFIGURE_ARGS+= --with-ldap=shared,${LOCALBASE}
LIB_DEPENDS-ldap= databases/openldap
-WANTLIB-ldap= ldap>=2 lber
+WANTLIB-ldap= c pthread ldap>=2 lber
# mcrypt
MULTI_PACKAGES+= -mcrypt
COMMENT-mcrypt= mcrypt encryption/decryption extensions for php5
CONFIGURE_ARGS+= --with-mcrypt=shared,${LOCALBASE}
LIB_DEPENDS-mcrypt= security/libmcrypt devel/libtool,-ltdl
-WANTLIB-mcrypt= mcrypt ltdl>=1
+WANTLIB-mcrypt= c mcrypt ltdl>=1 pthread
# mysql
MULTI_PACKAGES+= -mysql
COMMENT-mysql= mysql database access extensions for php5
CONFIGURE_ARGS+= --with-mysql=shared,${LOCALBASE}
LIB_DEPENDS-mysql= databases/mysql
-WANTLIB-mysql= lib/mysql/mysqlclient>=10
+WANTLIB-mysql= c pthread lib/mysql/mysqlclient>=10
# mysqli
MULTI_PACKAGES+= -mysqli
COMMENT-mysqli= mysql database access extensions for php5
CONFIGURE_ARGS+= --with-mysqli=shared,${LOCALBASE}/bin/mysql_config
LIB_DEPENDS-mysqli= databases/mysql
-WANTLIB-mysqli= crypto m ssl z lib/mysql/mysqlclient>=10
+WANTLIB-mysqli= c crypto m pthread ssl z
lib/mysql/mysqlclient>=10
# odbc
MULTI_PACKAGES+= -odbc
COMMENT-odbc= odbc database access extensions for php5
CONFIGURE_ARGS+= --with-iodbc=shared,${LOCALBASE}
LIB_DEPENDS-odbc= databases/iodbc
-WANTLIB-odbc= iodbc>=2
+WANTLIB-odbc= c iodbc>=2 pthread
# pdo-mysql
MULTI_PACKAGES+= -pdo_mysql
COMMENT-pdo_mysql= PDO mysql database access extensions for php5
CONFIGURE_ARGS+= --with-pdo-mysql=shared,${LOCALBASE}
LIB_DEPENDS-pdo_mysql= databases/mysql
-WANTLIB-pdo_mysql= crypto m ssl z lib/mysql/mysqlclient>=10
+WANTLIB-pdo_mysql= c crypto m pthread ssl z lib/mysql/mysqlclient>=10
# pdo-pgsql
MULTI_PACKAGES+= -pdo_pgsql
COMMENT-pdo_pgsql= PDO database access extensions for php5
CONFIGURE_ARGS+= --with-pdo-pgsql=shared,${LOCALBASE}
LIB_DEPENDS-pdo_pgsql= databases/postgresql
-WANTLIB-pdo_pgsql= pq>=2
+WANTLIB-pdo_pgsql= c pq>=2 pthread
# pgsql
MULTI_PACKAGES+= -pgsql
COMMENT-pgsql= pgsql database access extensions for php5
CONFIGURE_ARGS+= --with-pgsql=shared,${LOCALBASE}
LIB_DEPENDS-pgsql= databases/postgresql
-WANTLIB-pgsql= pq>=2
+WANTLIB-pgsql= c pq>=2 pthread
# pspell
MULTI_PACKAGES+= -pspell
COMMENT-pspell= pspell library extensions for php5
CONFIGURE_ARGS+= --with-pspell=shared,${LOCALBASE}
LIB_DEPENDS-pspell= textproc/aspell/core
-WANTLIB-pspell= aspell>=16 pspell>=16
+WANTLIB-pspell= aspell>=16 c pspell>=16 pthread
# shmop
MULTI_PACKAGES+= -shmop
COMMENT-shmop= shared memory extensions for php5
CONFIGURE_ARGS+= --enable-shmop=shared,${LOCALBASE}
LIB_DEPENDS-shmop=
-WANTLIB-shmop=
+WANTLIB-shmop= c pthread
# soap
MULTI_PACKAGES+= -soap
COMMENT-soap= SOAP functions for php5
CONFIGURE_ARGS+= --enable-soap=shared,${LOCALBASE}
LIB_DEPENDS-soap= textproc/libxml
-WANTLIB-soap= ${MODLIBICONV_WANTLIB} m z xml2>=8
+WANTLIB-soap= ${MODLIBICONV_WANTLIB} c m pthread z xml2>=8
# snmp
MULTI_PACKAGES+= -snmp
COMMENT-snmp= snmp protocol extensions for php5
CONFIGURE_ARGS+= --with-snmp=shared,${LOCALBASE} --enable-ucd-snmp-hack
LIB_DEPENDS-snmp= net/net-snmp
-WANTLIB-snmp= crypto m netsnmp>=6.2
+WANTLIB-snmp= c crypto m netsnmp>=6.2 pthread
# sqlite
MULTI_PACKAGES+= -sqlite
COMMENT-sqlite= sqlite database access extensions for php5
CONFIGURE_ARGS+= --with-sqlite=shared,${LOCALBASE} --enable-sqlite-utf8
LIB_DEPENDS-sqlite= databases/sqlite
-WANTLIB-sqlite= sqlite>=8
+WANTLIB-sqlite= sqlite>=8 c pthread
# pdo-dblib
MULTI_PACKAGES+= -pdo_dblib
COMMENT-pdo_dblib= PDO DB-LIB support for php5
CONFIGURE_ARGS+= --with-pdo-dblib=shared,${LOCALBASE}
LIB_DEPENDS-pdo_dblib= databases/freetds
-WANTLIB-pdo_dblib= sybdb>=6
+WANTLIB-pdo_dblib= sybdb>=6 c pthread
# mssql
MULTI_PACKAGES+= -mssql
COMMENT-mssql= microsoft sql access extensions for php5
CONFIGURE_ARGS+= --with-mssql=shared,${LOCALBASE}
LIB_DEPENDS-mssql= databases/freetds
-WANTLIB-mssql= sybdb>=6
+WANTLIB-mssql= sybdb>=6 c pthread
# tidy
MULTI_PACKAGES+= -tidy
COMMENT-tidy= tidy HTML cleaner bindings
CONFIGURE_ARGS+= --with-tidy=shared,${LOCALBASE}
LIB_DEPENDS-tidy= www/tidyp
-WANTLIB-tidy= tidyp
+WANTLIB-tidy= tidyp c pthread
# xml-rpc
MULTI_PACKAGES+= -xmlrpc
COMMENT-xmlrpc= XML RPC functions for php5
CONFIGURE_ARGS+= --with-xmlrpc=shared
LIB_DEPENDS-xmlrpc= textproc/libxml
-WANTLIB-xmlrpc= ${MODLIBICONV_WANTLIB} m z xml2>=8
+WANTLIB-xmlrpc= ${MODLIBICONV_WANTLIB} m z xml2>=8 c pthread
# xsl
MULTI_PACKAGES+= -xsl
COMMENT-xsl= XSL functions for php5
CONFIGURE_ARGS+= --with-xsl=shared --enable-dom
LIB_DEPENDS-xsl= textproc/libxslt
-WANTLIB-xsl= ${MODLIBICONV_WANTLIB} m xml2 z xslt>=3 exslt
+WANTLIB-xsl= ${MODLIBICONV_WANTLIB} m xml2 z xslt>=3 exslt c pthread
# zip
MULTI_PACKAGES+= -zip
COMMENT-zip= zip functions for php5
CONFIGURE_ARGS+= --enable-zip=shared,${LOCALBASE}
LIB_DEPENDS-zip=
-WANTLIB-zip= z
+WANTLIB-zip= z c pthread
# some variables to substitute
SUBST_VARS= MODPHP_CONFIG_PATH PV ^MODULE_NAME
Index: 5.2/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/5.2/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- 5.2/Makefile 2 Jul 2012 08:14:26 -0000 1.29
+++ 5.2/Makefile 6 Nov 2012 00:02:16 -0000
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2012/07/02 08:14:26 jasper Exp $
+# $OpenBSD: Makefile,v 1.30 2012/08/23 19:19:17 sthen Exp $
# doesn't set USE_LIBTOOL but use the bundled one because it needs some
# specific options we don't have.
@@ -8,16 +8,7 @@ V= 5.2.17
SUHOSIN_PHPV= 5.2.16
SUHOSIN_P_V= 0.9.7
-REVISION= 6
-REVISION-main= 12
-REVISION-curl= 8
-REVISION-fastcgi= 10
-REVISION-snmp= 7
-REVISION-gd= 7
-REVISION-dbase= 7
-REVISION-mhash= 7
-REVISION-ncurses= 7
-REVISION-sybase_ct= 7
+REVISION= 13
INI_TEMPLATES= dist recommended
@@ -26,27 +17,27 @@ MULTI_PACKAGES+= -dbase
COMMENT-dbase= dBase database access extensions for php5
CONFIGURE_ARGS+= --enable-dbase=shared
LIB_DEPENDS-dbase=
-WANTLIB-dbase=
+WANTLIB-dbase= c pthread
# mhash
MULTI_PACKAGES+= -mhash
COMMENT-mhash= mhash extensions for php5
CONFIGURE_ARGS+= --with-mhash=shared,${LOCALBASE}
LIB_DEPENDS-mhash= security/mhash
-WANTLIB-mhash= mhash>=2
+WANTLIB-mhash= c mhash>=2 pthread
# ncurses
MULTI_PACKAGES+= -ncurses
COMMENT-ncurses= ncurses extensions for php5
CONFIGURE_ARGS+= --with-ncurses=shared,${LOCALBASE}
LIB_DEPENDS-ncurses=
-WANTLIB-ncurses= ncurses panel
+WANTLIB-ncurses= c ncurses panel pthread
# sybase-ct
MULTI_PACKAGES+= -sybase_ct
COMMENT-sybase_ct= sybase database access extensions for php5
CONFIGURE_ARGS+= --with-sybase-ct=shared,${LOCALBASE}
LIB_DEPENDS-sybase_ct= databases/freetds
-WANTLIB-sybase_ct= ct
+WANTLIB-sybase_ct= c ct pthread
.include <bsd.port.mk>
Index: 5.3/Makefile
===================================================================
RCS file: /cvs/ports/lang/php/5.3/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- 5.3/Makefile 21 Jun 2012 06:58:51 -0000 1.35
+++ 5.3/Makefile 6 Nov 2012 00:02:16 -0000
@@ -1,15 +1,12 @@
-# $OpenBSD: Makefile,v 1.35 2012/06/21 06:58:51 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.40 2012/09/25 20:16:08 sthen Exp $
BROKEN-hppa = no __sync_bool_compare_and_swap support nor asm fallback
PV= 5.3
-V= ${PV}.14
+V= ${PV}.17
SUHOSIN_PHPV= 5.3.9
SUHOSIN_P_V= 0.9.10
-REVISION= 0
-REVISION-main= 1
-
INI_TEMPLATES= development production
# fpm
@@ -30,6 +27,6 @@ MULTI_PACKAGES+= -pcntl
COMMENT-pcntl= PCNTL extensions for php5
CONFIGURE_ARGS+= --enable-pcntl=shared
LIB_DEPENDS-pcntl=
-WANTLIB-pcntl=
+WANTLIB-pcntl= c pthread
.include <bsd.port.mk>
Index: 5.3/distinfo
===================================================================
RCS file: /cvs/ports/lang/php/5.3/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- 5.3/distinfo 16 Jun 2012 12:51:07 -0000 1.13
+++ 5.3/distinfo 6 Nov 2012 00:02:16 -0000
@@ -1,15 +1,6 @@
-MD5 (php-5.3.14.tar.gz) = FIcwhlJCoDGmOO47q0qdTQ==
-MD5 (suhosin-0.9.33.tgz) = DOSYoCqCgeQnTqjjkMK0hw==
-MD5 (suhosin-patch-5.3.9-0.9.10.patch.gz) = wJmz1+rJUBirq9Qd7X8wZg==
-RMD160 (php-5.3.14.tar.gz) = PlujPHv/RAbU+fkEKpfKS3f3dgM=
-RMD160 (suhosin-0.9.33.tgz) = nGC2lbIm3cvlVisVdiKHgBI+s3I=
-RMD160 (suhosin-patch-5.3.9-0.9.10.patch.gz) = zkOSH9mxg7FUcT7NqYKU9saNXyI=
-SHA1 (php-5.3.14.tar.gz) = Soz2BW+p6e6VC1AFilULdf8ltXE=
-SHA1 (suhosin-0.9.33.tgz) = q7MMIuf+NBlVtC7HHtWXxDQ54rg=
-SHA1 (suhosin-patch-5.3.9-0.9.10.patch.gz) = e571w+CDEVTfDWKQq6CYnKkBOO0=
-SHA256 (php-5.3.14.tar.gz) = jW8foEksGOS8i8UPtbIHfJxWcvlcQ6NPfTjIVRzaYrk=
+SHA256 (php-5.3.17.tar.gz) = JiIRaU0DtApN3rgmaZlJvyLX7oL1ziH6tjGZNG6imv4=
SHA256 (suhosin-0.9.33.tgz) = hlsccrrppacQ/gsHoGNVVs5sg4ZT7DZNKipub1lFKcU=
SHA256 (suhosin-patch-5.3.9-0.9.10.patch.gz) =
RDjK6rChDGyUrun36qcD9Xmfl9TgV59DqUe7cxTjgxc=
-SIZE (php-5.3.14.tar.gz) = 14924167
+SIZE (php-5.3.17.tar.gz) = 14819748
SIZE (suhosin-0.9.33.tgz) = 104488
SIZE (suhosin-patch-5.3.9-0.9.10.patch.gz) = 40967
Index: 5.3/patches/patch-aclocal_m4
===================================================================
RCS file: /cvs/ports/lang/php/5.3/patches/patch-aclocal_m4,v
retrieving revision 1.6
diff -u -p -r1.6 patch-aclocal_m4
--- 5.3/patches/patch-aclocal_m4 16 Nov 2011 12:29:00 -0000 1.6
+++ 5.3/patches/patch-aclocal_m4 6 Nov 2012 00:02:16 -0000
@@ -1,6 +1,6 @@
-$OpenBSD: patch-aclocal_m4,v 1.6 2011/11/16 12:29:00 espie Exp $
---- aclocal.m4.orig.port Tue Aug 23 11:33:49 2011
-+++ aclocal.m4 Wed Nov 16 12:59:21 2011
+$OpenBSD: patch-aclocal_m4,v 1.7 2012/08/05 12:00:54 sthen Exp $
+--- aclocal.m4.orig.port Thu Jul 12 23:18:55 2012
++++ aclocal.m4 Sat Jul 21 10:36:20 2012
@@ -194,7 +194,7 @@ dnl the path is interpreted relative to the top build-
dnl
dnl which array to append to?
@@ -63,7 +63,7 @@ $OpenBSD: patch-aclocal_m4,v 1.6 2011/11
PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)
PHP_EVAL_INCLINE($OPENSSL_INCS)
fi
-@@ -4326,7 +4312,7 @@ bsdi[[45]]*)
+@@ -4332,7 +4318,7 @@ bsdi[[45]]*)
need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major $libname${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
@@ -72,7 +72,7 @@ $OpenBSD: patch-aclocal_m4,v 1.6 2011/11
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib
/lib /usr/local/lib"
sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-@@ -4651,7 +4637,7 @@ openbsd*)
+@@ -4657,7 +4643,7 @@ openbsd*)
*) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${shared_ext}$versuffix'
Index: 5.3/patches/patch-php_ini-production
===================================================================
RCS file: /cvs/ports/lang/php/5.3/patches/patch-php_ini-production,v
retrieving revision 1.5
diff -u -p -r1.5 patch-php_ini-production
--- 5.3/patches/patch-php_ini-production 21 Jan 2012 23:34:35 -0000
1.5
+++ 5.3/patches/patch-php_ini-production 6 Nov 2012 00:02:16 -0000
@@ -1,4 +1,4 @@
-$OpenBSD: patch-php_ini-production,v 1.5 2012/01/21 23:34:35 sthen Exp $
+$OpenBSD: patch-php_ini-production,v 1.7 2012/08/05 12:00:54 sthen Exp $
--- php.ini-production.orig.port Thu Dec 15 10:31:02 2011
+++ php.ini-production Wed Jan 18 13:57:26 2012
@@ -793,11 +793,8 @@ default_mimetype = "text/html"
Index: 5.3/patches/patch-sapi_cgi_cgi_main_c
===================================================================
RCS file: /cvs/ports/lang/php/5.3/patches/patch-sapi_cgi_cgi_main_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-sapi_cgi_cgi_main_c
--- 5.3/patches/patch-sapi_cgi_cgi_main_c 8 May 2012 21:29:16 -0000
1.5
+++ 5.3/patches/patch-sapi_cgi_cgi_main_c 6 Nov 2012 00:02:16 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-sapi_cgi_cgi_main_c,v 1.5 2012/05/08 21:29:16 sthen Exp $
---- sapi/cgi/cgi_main.c.orig.port Fri May 4 01:28:40 2012
-+++ sapi/cgi/cgi_main.c Fri May 4 01:28:42 2012
-@@ -1486,6 +1486,7 @@ int main(int argc, char *argv[])
+$OpenBSD: patch-sapi_cgi_cgi_main_c,v 1.6 2012/08/05 12:00:54 sthen Exp $
+--- sapi/cgi/cgi_main.c.orig.port Sat Jul 21 10:36:15 2012
++++ sapi/cgi/cgi_main.c Sat Jul 21 10:36:15 2012
+@@ -1487,6 +1487,7 @@ int main(int argc, char *argv[])
char *orig_optarg = php_optarg;
char *script_file = NULL;
int ini_entries_len = 0;
@@ -9,7 +9,7 @@ $OpenBSD: patch-sapi_cgi_cgi_main_c,v 1.
/* end of temporary locals */
#ifdef ZTS
-@@ -1538,8 +1539,12 @@ int main(int argc, char *argv[])
+@@ -1539,8 +1540,12 @@ int main(int argc, char *argv[])
tsrm_ls = ts_resource(0);
#endif
Index: 5.3/patches/patch-sapi_fpm_config_m4
===================================================================
RCS file: /cvs/ports/lang/php/5.3/patches/patch-sapi_fpm_config_m4,v
retrieving revision 1.3
diff -u -p -r1.3 patch-sapi_fpm_config_m4
--- 5.3/patches/patch-sapi_fpm_config_m4 21 Jan 2012 23:34:35 -0000
1.3
+++ 5.3/patches/patch-sapi_fpm_config_m4 6 Nov 2012 00:02:16 -0000
@@ -1,6 +1,6 @@
---- sapi/fpm/config.m4.orig.port Sat Oct 8 22:04:10 2011
-+++ sapi/fpm/config.m4 Wed Jan 18 13:57:26 2012
-@@ -594,7 +594,9 @@ if test "$PHP_FPM" != "no"; then
+--- sapi/fpm/config.m4.orig.port Thu Jul 12 23:17:37 2012
++++ sapi/fpm/config.m4 Sat Jul 21 10:36:15 2012
+@@ -595,7 +595,9 @@ if test "$PHP_FPM" != "no"; then
PHP_FPM_CFLAGS="-I$abs_srcdir/sapi/fpm"
@@ -11,7 +11,7 @@
PHP_FPM_FILES="fpm/fastcgi.c \
fpm/fpm.c \
fpm/fpm_children.c \
-@@ -626,7 +628,8 @@ if test "$PHP_FPM" != "no"; then
+@@ -627,7 +629,8 @@ if test "$PHP_FPM" != "no"; then
fpm/events/port.c \
"
@@ -21,7 +21,7 @@
case $host_alias in
*aix*)
-@@ -636,11 +639,19 @@ if test "$PHP_FPM" != "no"; then
+@@ -637,11 +640,19 @@ if test "$PHP_FPM" != "no"; then
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)"
;;
*)
Index: 5.3/patches/patch-sapi_fpm_php-fpm_conf_in
===================================================================
RCS file: /cvs/ports/lang/php/5.3/patches/patch-sapi_fpm_php-fpm_conf_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-sapi_fpm_php-fpm_conf_in
--- 5.3/patches/patch-sapi_fpm_php-fpm_conf_in 21 Jan 2012 23:59:43 -0000
1.3
+++ 5.3/patches/patch-sapi_fpm_php-fpm_conf_in 6 Nov 2012 00:02:16 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-sapi_fpm_php-fpm_conf_in,v 1.3 2012/01/21 23:59:43 sthen Exp $
---- sapi/fpm/php-fpm.conf.in.orig.port Sat Oct 8 22:04:10 2011
-+++ sapi/fpm/php-fpm.conf.in Fri Jan 20 13:55:43 2012
-@@ -437,7 +437,7 @@ pm.max_spare_servers = 3
+$OpenBSD: patch-sapi_fpm_php-fpm_conf_in,v 1.4 2012/08/05 12:00:54 sthen Exp $
+--- sapi/fpm/php-fpm.conf.in.orig.port Thu Jul 12 23:17:37 2012
++++ sapi/fpm/php-fpm.conf.in Sat Jul 21 10:36:15 2012
+@@ -453,7 +453,7 @@ pm.max_spare_servers = 3
; possible. However, all PHP paths will be relative to the chroot
; (error_log, sessions.save_path, ...).
; Default Value: not set
