cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use PATCHORIG, regen patches and rename the files which didn't match the

Browse Source 
normal update-patches filenames. This avoids update-patches picking up the
.orig files in PHP distfiles and make it easier to keep in-sync. ok robert@
This commit is contained in:
sthen 2011-06-18 19:49:22 +00:00
parent e103efa4ae
commit 748511976d
83 changed files with 249 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lang/php/5.2/patches/patch-aclocal_m4
View File

@ -1,5 +1,6 @@
--- aclocal.m4.orig Thu Jan 6 18:04:40 2011
+++ aclocal.m4 Sat Mar 12 12:57:42 2011
$OpenBSD: patch-aclocal_m4,v 1.4 2011/06/18 19:49:50 sthen Exp $
--- aclocal.m4.orig.port Thu Jan 6 23:04:40 2011
+++ aclocal.m4 Sat Jun 18 12:46:53 2011
@@ -194,7 +194,7 @@ dnl the path is interpreted relative to the top build-
dnl
dnl which array to append to?

5
lang/php/5.2/patches/patch-configure_in
View File

@ -1,5 +1,6 @@
--- configure.in.orig Mon Jan 3 14:34:43 2011
+++ configure.in Mon Jan 3 14:34:45 2011
$OpenBSD: patch-configure_in,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- configure.in.orig.port Sat Jun 18 12:44:52 2011
+++ configure.in Sat Jun 18 12:46:53 2011
@@ -352,8 +352,8 @@ AC_CHECK_LIB(m, sin)
dnl Check for resolver routines.

6
lang/php/5.2/patches/patch-ext_gd_config_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_gd_config_m4,v 1.2 2011/01/05 09:31:23 robert Exp $
--- ext/gd/config.m4.orig Fri May 4 23:57:47 2007
+++ ext/gd/config.m4 Mon Jul 2 10:38:20 2007
$OpenBSD: patch-ext_gd_config_m4,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- ext/gd/config.m4.orig.port Tue Jul 3 18:25:43 2007
+++ ext/gd/config.m4 Sat Jun 18 12:44:54 2011
@@ -111,13 +111,13 @@ AC_DEFUN([PHP_GD_PNG],[
AC_MSG_ERROR([PNG support requires ZLIB. Use --with-zlib-dir=<DIR>])
fi

6
lang/php/5.2/patches/patch-ext_gd_gdcache_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_gd_gdcache_h,v 1.2 2011/01/05 09:31:23 robert Exp $
--- ext/gd/gdcache.h.orig Sun Dec 28 22:08:46 2003
+++ ext/gd/gdcache.h Tue Jul 27 01:42:24 2004
$OpenBSD: patch-ext_gd_gdcache_h,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- ext/gd/gdcache.h.orig.port Sun Dec 28 21:08:46 2003
+++ ext/gd/gdcache.h Sat Jun 18 12:44:54 2011
@@ -41,6 +41,7 @@
/*********************************************************/

6
lang/php/5.2/patches/patch-ext_gd_gdttf_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_gd_gdttf_c,v 1.2 2011/01/05 09:31:23 robert Exp $
--- ext/gd/gdttf.c.orig Sun Jan 9 22:05:05 2005
+++ ext/gd/gdttf.c Mon Jul 2 10:38:20 2007
$OpenBSD: patch-ext_gd_gdttf_c,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- ext/gd/gdttf.c.orig.port Sun Jan 9 21:05:06 2005
+++ ext/gd/gdttf.c Sat Jun 18 12:44:55 2011
@@ -712,7 +712,7 @@ gdttfchar(gdImage *im, int fg, font_t *font,
}
#if HAVE_LIBGD20

6
lang/php/5.2/patches/patch-ext_gd_libgd_gdcache_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_gd_libgd_gdcache_h,v 1.2 2011/01/05 09:31:23 robert Exp $
--- ext/gd/libgd/gdcache.h.orig Sun Dec 28 21:11:08 2003
+++ ext/gd/libgd/gdcache.h Tue Jul 27 02:21:28 2004
$OpenBSD: patch-ext_gd_libgd_gdcache_h,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- ext/gd/libgd/gdcache.h.orig.port Sun Dec 28 20:11:08 2003
+++ ext/gd/libgd/gdcache.h Sat Jun 18 12:44:55 2011
@@ -41,7 +41,7 @@
/*********************************************************/

6
lang/php/5.2/patches/patch-ext_gd_libgd_gdkanji_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_gd_libgd_gdkanji_c,v 1.2 2011/01/05 09:31:23 robert Exp $
--- ext/gd/libgd/gdkanji.c.orig Sun Dec 28 21:11:08 2003
+++ ext/gd/libgd/gdkanji.c Mon Jul 2 10:38:20 2007
$OpenBSD: patch-ext_gd_libgd_gdkanji_c,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- ext/gd/libgd/gdkanji.c.orig.port Sun Dec 28 20:11:08 2003
+++ ext/gd/libgd/gdkanji.c Sat Jun 18 12:44:55 2011
@@ -362,7 +362,7 @@ do_convert (unsigned char *to, unsigned char *from, co
from_len = strlen ((const char *) from) + 1;
to_len = BUFSIZ;

6
lang/php/5.2/patches/patch-ext_gmp_gmp_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_gmp_gmp_c,v 1.1 2011/05/27 21:11:37 jasper Exp $
--- ext/gmp/gmp.c.orig Fri May 27 21:32:54 2011
+++ ext/gmp/gmp.c Fri May 27 21:33:33 2011
$OpenBSD: patch-ext_gmp_gmp_c,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- ext/gmp/gmp.c.orig.port Sun Jan 3 09:23:27 2010
+++ ext/gmp/gmp.c Sat Jun 18 12:44:55 2011
@@ -1396,7 +1396,7 @@ ZEND_FUNCTION(gmp_random)
GMPG(rand_initialized) = 1;

6
lang/php/5.2/patches/patch-ext_iconv_iconv_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_iconv_iconv_c,v 1.2 2011/01/05 09:31:23 robert Exp $
--- ext/iconv/iconv.c.orig Thu Nov 1 20:13:49 2007
+++ ext/iconv/iconv.c Tue Nov 13 11:45:09 2007
$OpenBSD: patch-ext_iconv_iconv_c,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- ext/iconv/iconv.c.orig.port Tue May 4 12:56:59 2010
+++ ext/iconv/iconv.c Sat Jun 18 12:44:55 2011
@@ -345,7 +345,7 @@ static php_iconv_err_t _php_iconv_appendl(smart_str *d
out_p = (d)->c + (d)->len;

6
lang/php/5.2/patches/patch-ext_odbc_config_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_odbc_config_m4,v 1.1.1.1 2010/06/27 20:28:45 robert Exp $
--- ext/odbc/config.m4.orig Sat Jun 26 17:29:40 2010
+++ ext/odbc/config.m4 Sat Jun 26 17:29:46 2010
$OpenBSD: patch-ext_odbc_config_m4,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- ext/odbc/config.m4.orig.port Tue Jul 31 14:02:00 2007
+++ ext/odbc/config.m4 Sat Jun 18 12:44:56 2011
@@ -373,7 +373,6 @@ PHP_ARG_WITH(iodbc,,
if test "$PHP_IODBC" = "yes"; then
PHP_IODBC=/usr/local

6
lang/php/5.2/patches/patch-ext_openssl_config0_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_openssl_config0_m4,v 1.1 2011/03/21 19:50:18 jasper Exp $
--- ext/openssl/config0.m4.orig Sat Mar 12 12:58:08 2011
+++ ext/openssl/config0.m4 Sat Mar 12 12:58:50 2011
$OpenBSD: patch-ext_openssl_config0_m4,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- ext/openssl/config0.m4.orig.port Sun Jan 7 18:38:22 2007
+++ ext/openssl/config0.m4 Sat Jun 18 12:44:56 2011
@@ -16,7 +16,7 @@ if test "$PHP_OPENSSL" != "no"; then
PHP_SETUP_KERBEROS(OPENSSL_SHARED_LIBADD)
fi

6
lang/php/5.2/patches/patch-ext_standard_config_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_standard_config_m4,v 1.2 2011/01/05 09:31:23 robert Exp $
--- ext/standard/config.m4.orig Sat Nov 28 00:41:13 2009
+++ ext/standard/config.m4 Mon Jan 3 14:34:43 2011
$OpenBSD: patch-ext_standard_config_m4,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- ext/standard/config.m4.orig.port Fri Nov 27 23:41:13 2009
+++ ext/standard/config.m4 Sat Jun 18 12:44:56 2011
@@ -311,9 +311,9 @@ dnl
dnl Detect library functions needed by php dns_xxx functions
dnl ext/standard/php_dns.h will collect these in a single define: HAVE_DNS_FUNCS

6
lang/php/5.2/patches/patch-ext_tidy_config_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_tidy_config_m4,v 1.1 2011/03/15 19:49:42 jasper Exp $
--- ext/tidy/config.m4.orig Sat Dec 23 18:58:47 2006
+++ ext/tidy/config.m4 Sun Mar 13 21:23:50 2011
$OpenBSD: patch-ext_tidy_config_m4,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- ext/tidy/config.m4.orig.port Sat Dec 23 17:58:47 2006
+++ ext/tidy/config.m4 Sat Jun 18 12:44:56 2011
@@ -14,12 +14,12 @@ if test "$PHP_TIDY" != "no"; then
fi

6
lang/php/5.2/patches/patch-ext_tidy_tidy_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_tidy_tidy_c,v 1.1 2011/03/15 19:49:42 jasper Exp $
--- ext/tidy/tidy.c.orig Sun Mar 13 20:55:24 2011
+++ ext/tidy/tidy.c Sun Mar 13 20:55:38 2011
$OpenBSD: patch-ext_tidy_tidy_c,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- ext/tidy/tidy.c.orig.port Sun Jan 3 09:23:27 2010
+++ ext/tidy/tidy.c Sat Jun 18 12:44:56 2011
@@ -31,7 +31,7 @@
#include "ext/standard/info.h"
#include "safe_mode.h"

8
lang/php/5.2/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ext_xmlrpc_libxmlrpc_encodings_c,v 1.2 2011/01/05 09:31:23 robert Exp $
--- ext/xmlrpc/libxmlrpc/encodings.c.orig Tue Mar 9 00:04:33 2004
+++ ext/xmlrpc/libxmlrpc/encodings.c Mon Jul 2 10:38:20 2007
@@ -70,7 +70,7 @@ static char* convert(const char* src, int src_len, int
$OpenBSD: patch-ext_xmlrpc_libxmlrpc_encodings_c,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- ext/xmlrpc/libxmlrpc/encodings.c.orig.port Wed Sep 19 01:33:43 2007
+++ ext/xmlrpc/libxmlrpc/encodings.c Sat Jun 18 12:44:57 2011
@@ -78,7 +78,7 @@ static char* convert(const char* src, int src_len, int
if(outbuf) {
out_ptr = (char*)outbuf;
while(inlenleft) {

6
lang/php/5.2/patches/patch-main_php_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-main_php_h,v 1.2 2011/01/05 09:31:23 robert Exp $
--- main/php.h.orig Mon Jul 2 10:34:20 2007
+++ main/php.h Mon Jul 2 10:34:20 2007
$OpenBSD: patch-main_php_h,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- main/php.h.orig.port Sat Jun 18 12:44:53 2011
+++ main/php.h Sat Jun 18 12:44:57 2011
@@ -150,7 +150,7 @@ char *strtok_r(char *s, const char *delim, char **last
END_EXTERN_C()
#endif

6
lang/php/5.2/patches/patch-main_php_open_temporary_file_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-main_php_open_temporary_file_c,v 1.2 2011/01/05 09:31:23 robert Exp $
--- main/php_open_temporary_file.c.orig Fri Aug 10 12:13:15 2007
+++ main/php_open_temporary_file.c Fri Aug 31 09:26:46 2007
$OpenBSD: patch-main_php_open_temporary_file_c,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- main/php_open_temporary_file.c.orig.port Sun Jan 3 09:23:27 2010
+++ main/php_open_temporary_file.c Sat Jun 18 12:44:57 2011
@@ -131,7 +131,7 @@ static int php_do_open_temporary_file(const char *path
trailing_slash = "/";
}

6
lang/php/5.2/patches/patch-php_ini-dist
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-php_ini-dist,v 1.2 2011/01/05 09:31:23 robert Exp $
--- php.ini-dist.orig Mon Jan 3 14:35:22 2011
+++ php.ini-dist Mon Jan 3 14:38:34 2011
$OpenBSD: patch-php_ini-dist,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- php.ini-dist.orig.port Mon Aug 16 01:26:39 2010
+++ php.ini-dist Sat Jun 18 12:44:57 2011
@@ -471,10 +471,7 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;

6
lang/php/5.2/patches/patch-php_ini-recommended
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-php_ini-recommended,v 1.2 2011/01/05 09:31:23 robert Exp $
--- php.ini-recommended.orig Mon Jan 3 14:37:12 2011
+++ php.ini-recommended Mon Jan 3 14:38:25 2011
$OpenBSD: patch-php_ini-recommended,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- php.ini-recommended.orig.port Mon Aug 16 01:26:39 2010
+++ php.ini-recommended Sat Jun 18 12:44:57 2011
@@ -522,10 +522,7 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;

6
lang/php/5.2/patches/patch-sapi_apache_mod_php5_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-sapi_apache_mod_php5_c,v 1.2 2011/01/05 09:31:23 robert Exp $
--- sapi/apache/mod_php5.c.orig Mon Jan 3 14:34:43 2011
+++ sapi/apache/mod_php5.c Mon Jan 3 14:34:43 2011
$OpenBSD: patch-sapi_apache_mod_php5_c,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- sapi/apache/mod_php5.c.orig.port Sat Jun 18 12:44:53 2011
+++ sapi/apache/mod_php5.c Sat Jun 18 12:44:58 2011
@@ -940,12 +940,19 @@ static void php_child_exit_handler(server_rec *s, pool
*/
static void php_init_handler(server_rec *s, pool *p)

6
lang/php/5.2/patches/patch-sapi_cgi_Makefile_frag
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-sapi_cgi_Makefile_frag,v 1.2 2011/01/05 09:31:23 robert Exp $
--- sapi/cgi/Makefile.frag.orig Wed Jul 2 03:08:26 2003
+++ sapi/cgi/Makefile.frag Sun Apr 1 15:18:21 2007
$OpenBSD: patch-sapi_cgi_Makefile_frag,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- sapi/cgi/Makefile.frag.orig.port Wed Jul 2 02:08:26 2003
+++ sapi/cgi/Makefile.frag Sat Jun 18 12:44:58 2011
@@ -1,2 +1,2 @@
-$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CGI_OBJS)

5
lang/php/5.2/patches/patch-sapi_cgi_main_c → lang/php/5.2/patches/patch-sapi_cgi_cgi_main_c
View File

@ -1,5 +1,6 @@
--- sapi/cgi/cgi_main.c.orig Mon Jan 3 14:34:43 2011
+++ sapi/cgi/cgi_main.c Mon Jan 3 14:34:43 2011
$OpenBSD: patch-sapi_cgi_cgi_main_c,v 1.1 2011/06/18 19:49:50 sthen Exp $
--- sapi/cgi/cgi_main.c.orig.port Sat Jun 18 12:44:54 2011
+++ sapi/cgi/cgi_main.c Sat Jun 18 12:44:58 2011
@@ -1327,7 +1327,7 @@ int main(int argc, char *argv[])
char *orig_optarg = php_optarg;
char *script_file = NULL;

6
lang/php/5.2/patches/patch-sapi_cgi_config9_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-sapi_cgi_config9_m4,v 1.2 2011/01/05 09:31:23 robert Exp $
--- sapi/cgi/config9.m4.orig Thu Jul 12 01:20:36 2007
+++ sapi/cgi/config9.m4 Fri Aug 31 09:33:21 2007
$OpenBSD: patch-sapi_cgi_config9_m4,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- sapi/cgi/config9.m4.orig.port Thu Jul 12 00:20:37 2007
+++ sapi/cgi/config9.m4 Sat Jun 18 12:44:58 2011
@@ -25,7 +25,6 @@ PHP_ARG_ENABLE(path-info-check,,
dnl
dnl CGI setup

6
lang/php/5.2/patches/patch-sapi_cli_php_cli_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-sapi_cli_php_cli_c,v 1.2 2011/01/05 09:31:23 robert Exp $
--- sapi/cli/php_cli.c.orig Mon Jan 3 14:34:43 2011
+++ sapi/cli/php_cli.c Mon Jan 3 14:34:43 2011
$OpenBSD: patch-sapi_cli_php_cli_c,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- sapi/cli/php_cli.c.orig.port Sat Jun 18 12:44:54 2011
+++ sapi/cli/php_cli.c Sat Jun 18 12:44:59 2011
@@ -636,6 +636,7 @@ int main(int argc, char *argv[])
char *exec_direct=NULL, *exec_run=NULL, *exec_begin=NULL, *exec_end=NULL;
const char *param_error=NULL;

6
lang/php/5.2/patches/patch-scripts_Makefile_frag
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-scripts_Makefile_frag,v 1.2 2011/01/05 09:31:23 robert Exp $
--- scripts/Makefile.frag.orig Tue Jun 7 23:57:06 2005
+++ scripts/Makefile.frag Wed Sep 14 16:48:56 2005
$OpenBSD: patch-scripts_Makefile_frag,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- scripts/Makefile.frag.orig.port Tue Jul 13 18:24:44 2010
+++ scripts/Makefile.frag Sat Jun 18 12:44:59 2011
@@ -3,8 +3,8 @@
# Build environment install
#

6
www/php5/core/patches/patch-scripts_php_config_in → lang/php/5.2/patches/patch-scripts_php-config_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-scripts_php_config_in,v 1.5 2007/09/17 08:37:22 robert Exp $
--- scripts/php-config.in.orig Fri Aug 24 13:44:10 2007
+++ scripts/php-config.in Fri Aug 31 09:29:40 2007
$OpenBSD: patch-scripts_php-config_in,v 1.1 2011/06/18 19:49:50 sthen Exp $
--- scripts/php-config.in.orig.port Fri Aug 24 12:44:10 2007
+++ scripts/php-config.in Sat Jun 18 12:44:59 2011
@@ -1,11 +1,11 @@
#! /bin/sh

6
lang/php/5.2/patches/patch-scripts_phpize_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-scripts_phpize_in,v 1.2 2011/01/05 09:31:23 robert Exp $
--- scripts/phpize.in.orig Fri Jun 29 03:10:35 2007
+++ scripts/phpize.in Wed Sep 5 10:38:43 2007
$OpenBSD: patch-scripts_phpize_in,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- scripts/phpize.in.orig.port Wed Jun 24 08:43:18 2009
+++ scripts/phpize.in Sat Jun 18 12:44:59 2011
@@ -1,10 +1,10 @@
#!/bin/sh

5
lang/php/5.3/patches/patch-aclocal_m4
View File

@ -1,5 +1,6 @@
--- aclocal.m4.orig Wed Jan 5 11:41:34 2011
+++ aclocal.m4 Sat Mar 12 13:09:46 2011
$OpenBSD: patch-aclocal_m4,v 1.4 2011/06/18 19:49:50 sthen Exp $
--- aclocal.m4.orig.port Wed Jan 5 16:41:34 2011
+++ aclocal.m4 Sat Jun 18 12:17:01 2011
@@ -194,7 +194,7 @@ dnl the path is interpreted relative to the top build-
dnl
dnl which array to append to?

5
lang/php/5.3/patches/patch-configure_in
View File

@ -1,5 +1,6 @@
--- configure.in.orig Wed Jan 5 10:02:06 2011
+++ configure.in Wed Jan 5 10:02:09 2011
$OpenBSD: patch-configure_in,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- configure.in.orig.port Sat Jun 18 12:14:45 2011
+++ configure.in Sat Jun 18 12:17:01 2011
@@ -960,7 +960,7 @@ enable_static=yes
case $php_build_target in

5
lang/php/5.3/patches/patch-ext_gd_config_m4
View File

@ -1,5 +1,6 @@
--- ext/gd/config.m4.orig Wed May 27 10:18:24 2009
+++ ext/gd/config.m4 Wed Jan 5 10:02:06 2011
$OpenBSD: patch-ext_gd_config_m4,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- ext/gd/config.m4.orig.port Wed May 27 09:18:24 2009
+++ ext/gd/config.m4 Sat Jun 18 12:14:48 2011
@@ -108,13 +108,13 @@ AC_DEFUN([PHP_GD_PNG],[
AC_MSG_ERROR([PNG support requires ZLIB. Use --with-zlib-dir=<DIR>])
fi

5
lang/php/5.3/patches/patch-ext_gd_gdcache_h
View File

@ -1,5 +1,6 @@
--- ext/gd/gdcache.h.orig Sun Dec 28 22:08:46 2003
+++ ext/gd/gdcache.h Tue Jul 27 01:42:24 2004
$OpenBSD: patch-ext_gd_gdcache_h,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- ext/gd/gdcache.h.orig.port Wed Sep 26 16:44:16 2007
+++ ext/gd/gdcache.h Sat Jun 18 12:14:48 2011
@@ -41,6 +41,7 @@
/*********************************************************/

5
lang/php/5.3/patches/patch-ext_gd_libgd_gdcache_h
View File

@ -1,5 +1,6 @@
--- ext/gd/libgd/gdcache.h.orig Sun Dec 28 21:11:08 2003
+++ ext/gd/libgd/gdcache.h Tue Jul 27 02:21:28 2004
$OpenBSD: patch-ext_gd_libgd_gdcache_h,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- ext/gd/libgd/gdcache.h.orig.port Wed Sep 26 16:44:16 2007
+++ ext/gd/libgd/gdcache.h Sat Jun 18 12:14:49 2011
@@ -41,7 +41,7 @@
/*********************************************************/

5
lang/php/5.3/patches/patch-ext_gd_libgd_gdkanji_c
View File

@ -1,5 +1,6 @@
--- ext/gd/libgd/gdkanji.c.orig Sun Dec 28 21:11:08 2003
+++ ext/gd/libgd/gdkanji.c Mon Jul 2 10:38:20 2007
$OpenBSD: patch-ext_gd_libgd_gdkanji_c,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- ext/gd/libgd/gdkanji.c.orig.port Wed Sep 26 16:44:16 2007
+++ ext/gd/libgd/gdkanji.c Sat Jun 18 12:14:49 2011
@@ -362,7 +362,7 @@ do_convert (unsigned char *to, unsigned char *from, co
from_len = strlen ((const char *) from) + 1;
to_len = BUFSIZ;

5
lang/php/5.3/patches/patch-ext_iconv_iconv_c
View File

@ -1,5 +1,6 @@
--- ext/iconv/iconv.c.orig Wed Dec 1 15:03:36 2010
+++ ext/iconv/iconv.c Wed Jan 5 10:02:06 2011
$OpenBSD: patch-ext_iconv_iconv_c,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- ext/iconv/iconv.c.orig.port Wed Dec 1 14:03:36 2010
+++ ext/iconv/iconv.c Sat Jun 18 12:14:49 2011
@@ -334,7 +334,7 @@ static php_iconv_err_t _php_iconv_appendl(smart_str *d
out_p = (d)->c + (d)->len;

5
lang/php/5.3/patches/patch-ext_mysqlnd_config9_m4
View File

@ -1,5 +1,6 @@
--- ext/mysqlnd/config9.m4.orig Thu Oct 28 15:46:54 2010
+++ ext/mysqlnd/config9.m4 Wed Jan 5 10:02:06 2011
$OpenBSD: patch-ext_mysqlnd_config9_m4,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- ext/mysqlnd/config9.m4.orig.port Thu Oct 28 14:46:54 2010
+++ ext/mysqlnd/config9.m4 Sat Jun 18 12:14:50 2011
@@ -13,6 +13,7 @@ if test -z "$PHP_ZLIB_DIR"; then
fi

6
lang/php/5.3/patches/patch-ext_odbc_config_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_odbc_config_m4,v 1.1.1.1 2010/06/27 20:28:46 robert Exp $
--- ext/odbc/config.m4.orig Sat Jun 26 17:29:40 2010
+++ ext/odbc/config.m4 Sat Jun 26 17:29:46 2010
$OpenBSD: patch-ext_odbc_config_m4,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- ext/odbc/config.m4.orig.port Tue Jul 31 14:02:00 2007
+++ ext/odbc/config.m4 Sat Jun 18 12:14:50 2011
@@ -373,7 +373,6 @@ PHP_ARG_WITH(iodbc,,
if test "$PHP_IODBC" = "yes"; then
PHP_IODBC=/usr/local

6
lang/php/5.3/patches/patch-ext_openssl_config0_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_openssl_config0_m4,v 1.1 2011/03/21 19:50:18 jasper Exp $
--- ext/openssl/config0.m4.orig Sat Mar 12 13:09:58 2011
+++ ext/openssl/config0.m4 Sat Mar 12 13:10:19 2011
$OpenBSD: patch-ext_openssl_config0_m4,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- ext/openssl/config0.m4.orig.port Sun Jan 7 18:38:22 2007
+++ ext/openssl/config0.m4 Sat Jun 18 12:14:50 2011
@@ -16,7 +16,7 @@ if test "$PHP_OPENSSL" != "no"; then
PHP_SETUP_KERBEROS(OPENSSL_SHARED_LIBADD)
fi

5
lang/php/5.3/patches/patch-ext_spl_php_spl_c
View File

@ -1,5 +1,6 @@
--- ext/spl/php_spl.c.orig Sun Nov 14 19:40:08 2010
+++ ext/spl/php_spl.c Wed Jan 5 10:02:06 2011
$OpenBSD: patch-ext_spl_php_spl_c,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- ext/spl/php_spl.c.orig.port Sun Nov 14 18:40:08 2010
+++ ext/spl/php_spl.c Sat Jun 18 12:14:50 2011
@@ -736,7 +736,7 @@ PHP_FUNCTION(spl_object_hash)
PHPAPI void php_spl_object_hash(zval *obj, char *result TSRMLS_DC) /* {{{*/

5
lang/php/5.3/patches/patch-ext_spl_php_spl_h
View File

@ -1,5 +1,6 @@
--- ext/spl/php_spl.h.orig Sun Jan 3 10:23:27 2010
+++ ext/spl/php_spl.h Wed Jan 5 10:02:06 2011
$OpenBSD: patch-ext_spl_php_spl_h,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- ext/spl/php_spl.h.orig.port Sun Jan 3 09:23:27 2010
+++ ext/spl/php_spl.h Sat Jun 18 12:14:51 2011
@@ -67,8 +67,8 @@ ZEND_BEGIN_MODULE_GLOBALS(spl)
HashTable * autoload_functions;
int autoload_running;

5
lang/php/5.3/patches/patch-ext_standard_config_m4
View File

@ -1,5 +1,6 @@
--- ext/standard/config.m4.orig Thu Jun 17 12:22:03 2010
+++ ext/standard/config.m4 Wed Jan 5 10:02:06 2011
$OpenBSD: patch-ext_standard_config_m4,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- ext/standard/config.m4.orig.port Thu Jun 17 11:22:03 2010
+++ ext/standard/config.m4 Sat Jun 18 12:14:51 2011
@@ -370,16 +370,16 @@ dnl
dnl Detect library functions needed by php dns_xxx functions
dnl ext/standard/php_dns.h will collect these in a single define: HAVE_FULL_DNS_FUNCS

6
lang/php/5.3/patches/patch-ext_tidy_config_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_tidy_config_m4,v 1.1 2011/03/15 19:49:42 jasper Exp $
--- ext/tidy/config.m4.orig Sat Dec 23 18:58:47 2006
+++ ext/tidy/config.m4 Sun Mar 13 21:23:50 2011
$OpenBSD: patch-ext_tidy_config_m4,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- ext/tidy/config.m4.orig.port Wed Sep 26 16:44:16 2007
+++ ext/tidy/config.m4 Sat Jun 18 12:14:51 2011
@@ -14,12 +14,12 @@ if test "$PHP_TIDY" != "no"; then
fi

6
lang/php/5.3/patches/patch-ext_tidy_tidy_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_tidy_tidy_c,v 1.1 2011/03/15 19:49:42 jasper Exp $
--- ext/tidy/tidy.c.orig Sun Mar 13 20:55:24 2011
+++ ext/tidy/tidy.c Sun Mar 13 20:55:38 2011
$OpenBSD: patch-ext_tidy_tidy_c,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- ext/tidy/tidy.c.orig.port Thu Nov 18 15:22:22 2010
+++ ext/tidy/tidy.c Sat Jun 18 12:14:51 2011
@@ -31,7 +31,7 @@
#include "ext/standard/info.h"
#include "safe_mode.h"

5
lang/php/5.3/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
View File

@ -1,5 +1,6 @@
--- ext/xmlrpc/libxmlrpc/encodings.c.orig Wed Sep 26 17:44:16 2007
+++ ext/xmlrpc/libxmlrpc/encodings.c Wed Jan 5 10:02:06 2011
$OpenBSD: patch-ext_xmlrpc_libxmlrpc_encodings_c,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- ext/xmlrpc/libxmlrpc/encodings.c.orig.port Wed Sep 26 16:44:16 2007
+++ ext/xmlrpc/libxmlrpc/encodings.c Sat Jun 18 12:14:51 2011
@@ -78,7 +78,7 @@ static char* convert(const char* src, int src_len, int
if(outbuf) {
out_ptr = (char*)outbuf;

5
lang/php/5.3/patches/patch-main_php_h
View File

@ -1,5 +1,6 @@
--- main/php.h.orig Wed Jan 5 10:02:06 2011
+++ main/php.h Wed Jan 5 10:02:06 2011
$OpenBSD: patch-main_php_h,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- main/php.h.orig.port Sat Jun 18 12:14:46 2011
+++ main/php.h Sat Jun 18 12:14:52 2011
@@ -146,7 +146,7 @@ char *strtok_r(char *s, const char *delim, char **last
END_EXTERN_C()
#endif

5
lang/php/5.3/patches/patch-main_php_open_temporary_file_c
View File

@ -1,5 +1,6 @@
--- main/php_open_temporary_file.c.orig Sun Feb 7 21:15:58 2010
+++ main/php_open_temporary_file.c Wed Jan 5 10:02:06 2011
$OpenBSD: patch-main_php_open_temporary_file_c,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- main/php_open_temporary_file.c.orig.port Sun Feb 7 20:15:58 2010
+++ main/php_open_temporary_file.c Sat Jun 18 12:14:52 2011
@@ -138,7 +138,7 @@ static int php_do_open_temporary_file(const char *path
trailing_slash = "/";
}

6
lang/php/5.3/patches/patch-php_ini-development
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-php_ini-development,v 1.2 2011/01/05 09:31:23 robert Exp $
--- php.ini-development.orig Wed Jan 5 10:02:31 2011
+++ php.ini-development Wed Jan 5 10:03:52 2011
$OpenBSD: patch-php_ini-development,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- php.ini-development.orig.port Tue Dec 7 23:53:51 2010
+++ php.ini-development Sat Jun 18 12:14:52 2011
@@ -781,11 +781,8 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;

6
lang/php/5.3/patches/patch-php_ini-production
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-php_ini-production,v 1.2 2011/01/05 09:31:23 robert Exp $
--- php.ini-production.orig Wed Jan 5 10:03:59 2011
+++ php.ini-production Wed Jan 5 10:04:47 2011
$OpenBSD: patch-php_ini-production,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- php.ini-production.orig.port Tue Dec 7 23:53:51 2010
+++ php.ini-production Sat Jun 18 12:14:52 2011
@@ -781,11 +781,8 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;

5
lang/php/5.3/patches/patch-sapi_apache_mod_php5_c
View File

@ -1,5 +1,6 @@
--- sapi/apache/mod_php5.c.orig Wed Jan 5 10:02:06 2011
+++ sapi/apache/mod_php5.c Wed Jan 5 10:02:06 2011
$OpenBSD: patch-sapi_apache_mod_php5_c,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- sapi/apache/mod_php5.c.orig.port Sat Jun 18 12:14:47 2011
+++ sapi/apache/mod_php5.c Sat Jun 18 12:14:53 2011
@@ -956,12 +956,19 @@ static void php_child_exit_handler(server_rec *s, pool
*/
static void php_init_handler(server_rec *s, pool *p)

5
lang/php/5.3/patches/patch-sapi_cgi_Makefile_frag
View File

@ -1,5 +1,6 @@
--- sapi/cgi/Makefile.frag.orig Wed Jul 2 03:08:26 2003
+++ sapi/cgi/Makefile.frag Sun Apr 1 15:18:21 2007
$OpenBSD: patch-sapi_cgi_Makefile_frag,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- sapi/cgi/Makefile.frag.orig.port Wed Sep 26 16:44:16 2007
+++ sapi/cgi/Makefile.frag Sat Jun 18 12:14:53 2011
@@ -1,2 +1,2 @@
-$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CGI_OBJS)

5
lang/php/5.3/patches/patch-sapi_cgi_cgi_main_c
View File

@ -1,5 +1,6 @@
--- sapi/cgi/cgi_main.c.orig Wed Jan 5 10:02:06 2011
+++ sapi/cgi/cgi_main.c Wed Jan 5 10:02:06 2011
$OpenBSD: patch-sapi_cgi_cgi_main_c,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- sapi/cgi/cgi_main.c.orig.port Sat Jun 18 12:14:47 2011
+++ sapi/cgi/cgi_main.c Sat Jun 18 12:14:53 2011
@@ -1478,6 +1478,7 @@ int main(int argc, char *argv[])
char *orig_optarg = php_optarg;
char *script_file = NULL;

5
lang/php/5.3/patches/patch-sapi_cgi_config9_m4
View File

@ -1,5 +1,6 @@
--- sapi/cgi/config9.m4.orig Mon Oct 1 14:40:54 2007
+++ sapi/cgi/config9.m4 Wed Jan 5 10:02:06 2011
$OpenBSD: patch-sapi_cgi_config9_m4,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- sapi/cgi/config9.m4.orig.port Mon Oct 1 13:40:54 2007
+++ sapi/cgi/config9.m4 Sat Jun 18 12:14:53 2011
@@ -8,7 +8,6 @@ PHP_ARG_ENABLE(cgi,,
dnl
dnl CGI setup

5
lang/php/5.3/patches/patch-sapi_cli_php_cli_c
View File

@ -1,5 +1,6 @@
--- sapi/cli/php_cli.c.orig Wed Jan 5 10:02:06 2011
+++ sapi/cli/php_cli.c Wed Jan 5 10:02:06 2011
$OpenBSD: patch-sapi_cli_php_cli_c,v 1.3 2011/06/18 19:49:50 sthen Exp $
--- sapi/cli/php_cli.c.orig.port Sat Jun 18 12:14:47 2011
+++ sapi/cli/php_cli.c Sat Jun 18 12:14:54 2011
@@ -662,6 +662,7 @@ int main(int argc, char *argv[])
char *exec_direct=NULL, *exec_run=NULL, *exec_begin=NULL, *exec_end=NULL;
const char *param_error=NULL;

5
lang/php/5.3/patches/patch-scripts_Makefile_frag
View File

@ -1,5 +1,6 @@
--- scripts/Makefile.frag.orig Tue Jun 7 23:57:06 2005
+++ scripts/Makefile.frag Wed Sep 14 16:48:56 2005
$OpenBSD: patch-scripts_Makefile_frag,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- scripts/Makefile.frag.orig.port Tue Jul 13 18:24:13 2010
+++ scripts/Makefile.frag Sat Jun 18 12:14:54 2011
@@ -3,8 +3,8 @@
# Build environment install
#

6
lang/php/5.2/patches/patch-scripts_php_config_in → lang/php/5.3/patches/patch-scripts_php-config_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-scripts_php_config_in,v 1.2 2011/01/05 09:31:23 robert Exp $
--- scripts/php-config.in.orig Fri Aug 24 13:44:10 2007
+++ scripts/php-config.in Fri Aug 31 09:29:40 2007
$OpenBSD: patch-scripts_php-config_in,v 1.1 2011/06/18 19:49:50 sthen Exp $
--- scripts/php-config.in.orig.port Fri Aug 24 12:44:10 2007
+++ scripts/php-config.in Sat Jun 18 12:14:54 2011
@@ -1,11 +1,11 @@
#! /bin/sh

5
lang/php/5.3/patches/patch-scripts_phpize_in
View File

@ -1,5 +1,6 @@
--- scripts/phpize.in.orig Fri Jun 29 03:10:35 2007
+++ scripts/phpize.in Wed Sep 5 10:38:43 2007
$OpenBSD: patch-scripts_phpize_in,v 1.2 2011/06/18 19:49:50 sthen Exp $
--- scripts/phpize.in.orig.port Wed Jun 24 08:42:33 2009
+++ scripts/phpize.in Sat Jun 18 12:14:54 2011
@@ -1,10 +1,10 @@
#!/bin/sh

3
lang/php/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.11 2011/05/12 14:30:12 robert Exp $
# $OpenBSD: Makefile.inc,v 1.12 2011/06/18 19:49:50 sthen Exp $
# This port currently only works with archs supporting dynamic loading
# and has Apache that supports DSO's.
@ -56,6 +56,7 @@ PSEUDO_FLAVORS+= no_suhosin
FLAVOR?=
USE_GROFF= Yes
PATCHORIG= .orig.port
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.13
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -pthread" \

3
www/php5/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.37 2011/03/26 10:23:13 sthen Exp $
# $OpenBSD: Makefile.inc,v 1.38 2011/06/18 19:49:22 sthen Exp $
# This port currently only works with archs supporting dynamic loading
# and has Apache that supports DSO's.
@ -44,6 +44,7 @@ MODULES_DIR= ${CHROOT_DIR}/${MODULES_SUBDIR}
PHP_LDFLAGS= -lstdc++ -lm
.endif
PATCHORIG= .orig.port
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.13
CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -pthread" \

6
www/php5/core/patches/patch-sapi_apache_mod_php5_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-sapi_apache_mod_php5_c,v 1.2 2011/01/03 15:03:03 robert Exp $
--- sapi/apache/mod_php5.c.orig Mon Jan 3 14:34:43 2011
+++ sapi/apache/mod_php5.c Mon Jan 3 14:34:43 2011
$OpenBSD: patch-sapi_apache_mod_php5_c,v 1.3 2011/06/18 19:49:22 sthen Exp $
--- sapi/apache/mod_php5.c.orig.port Sat Jun 18 12:14:53 2011
+++ sapi/apache/mod_php5.c Sat Jun 18 12:14:56 2011
@@ -940,12 +940,19 @@ static void php_child_exit_handler(server_rec *s, pool
*/
static void php_init_handler(server_rec *s, pool *p)

6
www/php5/core/patches/patch-sapi_cgi_Makefile_frag
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-sapi_cgi_Makefile_frag,v 1.1 2007/04/01 21:37:27 robert Exp $
--- sapi/cgi/Makefile.frag.orig Wed Jul 2 03:08:26 2003
+++ sapi/cgi/Makefile.frag Sun Apr 1 15:18:21 2007
$OpenBSD: patch-sapi_cgi_Makefile_frag,v 1.2 2011/06/18 19:49:22 sthen Exp $
--- sapi/cgi/Makefile.frag.orig.port Wed Jul 2 02:08:26 2003
+++ sapi/cgi/Makefile.frag Sat Jun 18 12:14:56 2011
@@ -1,2 +1,2 @@
-$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+$(SAPI_CGI_PATH): $(PHP_GLOBAL_OBJS) $(PHP_CGI_OBJS)

5
www/php5/core/patches/patch-sapi_cgi_main_c → www/php5/core/patches/patch-sapi_cgi_cgi_main_c
View File

@ -1,5 +1,6 @@
--- sapi/cgi/cgi_main.c.orig Mon Jan 3 14:34:43 2011
+++ sapi/cgi/cgi_main.c Mon Jan 3 14:34:43 2011
$OpenBSD: patch-sapi_cgi_cgi_main_c,v 1.1 2011/06/18 19:49:22 sthen Exp $
--- sapi/cgi/cgi_main.c.orig.port Sat Jun 18 12:14:53 2011
+++ sapi/cgi/cgi_main.c Sat Jun 18 12:14:57 2011
@@ -1327,7 +1327,7 @@ int main(int argc, char *argv[])
char *orig_optarg = php_optarg;
char *script_file = NULL;

6
www/php5/core/patches/patch-sapi_cgi_config9_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-sapi_cgi_config9_m4,v 1.4 2007/09/05 09:11:34 robert Exp $
--- sapi/cgi/config9.m4.orig Thu Jul 12 01:20:36 2007
+++ sapi/cgi/config9.m4 Fri Aug 31 09:33:21 2007
$OpenBSD: patch-sapi_cgi_config9_m4,v 1.5 2011/06/18 19:49:22 sthen Exp $
--- sapi/cgi/config9.m4.orig.port Thu Jul 12 00:20:37 2007
+++ sapi/cgi/config9.m4 Sat Jun 18 12:14:57 2011
@@ -25,7 +25,6 @@ PHP_ARG_ENABLE(path-info-check,,
dnl
dnl CGI setup

6
www/php5/core/patches/patch-sapi_cli_php_cli_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-sapi_cli_php_cli_c,v 1.2 2011/01/03 15:03:03 robert Exp $
--- sapi/cli/php_cli.c.orig Mon Jan 3 14:34:43 2011
+++ sapi/cli/php_cli.c Mon Jan 3 14:34:43 2011
$OpenBSD: patch-sapi_cli_php_cli_c,v 1.3 2011/06/18 19:49:22 sthen Exp $
--- sapi/cli/php_cli.c.orig.port Sat Jun 18 12:14:53 2011
+++ sapi/cli/php_cli.c Sat Jun 18 12:14:57 2011
@@ -636,6 +636,7 @@ int main(int argc, char *argv[])
char *exec_direct=NULL, *exec_run=NULL, *exec_begin=NULL, *exec_end=NULL;
const char *param_error=NULL;

6
www/php5/core/patches/patch-scripts_Makefile_frag
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-scripts_Makefile_frag,v 1.2 2005/09/14 15:44:19 robert Exp $
--- scripts/Makefile.frag.orig Tue Jun 7 23:57:06 2005
+++ scripts/Makefile.frag Wed Sep 14 16:48:56 2005
$OpenBSD: patch-scripts_Makefile_frag,v 1.3 2011/06/18 19:49:22 sthen Exp $
--- scripts/Makefile.frag.orig.port Tue Jul 13 18:24:44 2010
+++ scripts/Makefile.frag Sat Jun 18 12:14:58 2011
@@ -3,8 +3,8 @@
# Build environment install
#

5
lang/php/5.3/patches/patch-scripts_php_config_in → www/php5/core/patches/patch-scripts_php-config_in
View File

@ -1,5 +1,6 @@
--- scripts/php-config.in.orig Fri Aug 24 13:44:10 2007
+++ scripts/php-config.in Fri Aug 31 09:29:40 2007
$OpenBSD: patch-scripts_php-config_in,v 1.6 2011/06/18 19:49:22 sthen Exp $
--- scripts/php-config.in.orig.port Fri Aug 24 12:44:10 2007
+++ scripts/php-config.in Sat Jun 18 12:14:58 2011
@@ -1,11 +1,11 @@
#! /bin/sh

6
www/php5/core/patches/patch-scripts_phpize_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-scripts_phpize_in,v 1.7 2007/09/05 09:11:34 robert Exp $
--- scripts/phpize.in.orig Fri Jun 29 03:10:35 2007
+++ scripts/phpize.in Wed Sep 5 10:38:43 2007
$OpenBSD: patch-scripts_phpize_in,v 1.8 2011/06/18 19:49:22 sthen Exp $
--- scripts/phpize.in.orig.port Wed Jun 24 08:43:18 2009
+++ scripts/phpize.in Sat Jun 18 12:14:58 2011
@@ -1,10 +1,10 @@
#!/bin/sh

6
www/php5/extensions/patches/patch-ext_gd_config_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_gd_config_m4,v 1.5 2007/07/02 08:53:17 robert Exp $
--- ext/gd/config.m4.orig Fri May 4 23:57:47 2007
+++ ext/gd/config.m4 Mon Jul 2 10:38:20 2007
$OpenBSD: patch-ext_gd_config_m4,v 1.6 2011/06/18 19:49:22 sthen Exp $
--- ext/gd/config.m4.orig.port Tue Jul 3 18:25:43 2007
+++ ext/gd/config.m4 Sat Jun 18 12:19:28 2011
@@ -111,13 +111,13 @@ AC_DEFUN([PHP_GD_PNG],[
AC_MSG_ERROR([PNG support requires ZLIB. Use --with-zlib-dir=<DIR>])
fi

6
www/php5/extensions/patches/patch-ext_gd_gdcache_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_gd_gdcache_h,v 1.1.1.1 2004/10/02 11:32:35 robert Exp $
--- ext/gd/gdcache.h.orig Sun Dec 28 22:08:46 2003
+++ ext/gd/gdcache.h Tue Jul 27 01:42:24 2004
$OpenBSD: patch-ext_gd_gdcache_h,v 1.2 2011/06/18 19:49:22 sthen Exp $
--- ext/gd/gdcache.h.orig.port Sun Dec 28 21:08:46 2003
+++ ext/gd/gdcache.h Sat Jun 18 12:19:28 2011
@@ -41,6 +41,7 @@
/*********************************************************/

6
www/php5/extensions/patches/patch-ext_gd_gdttf_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_gd_gdttf_c,v 1.2 2007/07/02 08:53:17 robert Exp $
--- ext/gd/gdttf.c.orig Sun Jan 9 22:05:05 2005
+++ ext/gd/gdttf.c Mon Jul 2 10:38:20 2007
$OpenBSD: patch-ext_gd_gdttf_c,v 1.3 2011/06/18 19:49:22 sthen Exp $
--- ext/gd/gdttf.c.orig.port Sun Jan 9 21:05:06 2005
+++ ext/gd/gdttf.c Sat Jun 18 12:19:28 2011
@@ -712,7 +712,7 @@ gdttfchar(gdImage *im, int fg, font_t *font,
}
#if HAVE_LIBGD20

6
www/php5/extensions/patches/patch-ext_gd_libgd_gdcache_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_gd_libgd_gdcache_h,v 1.1.1.1 2004/10/02 11:32:35 robert Exp $
--- ext/gd/libgd/gdcache.h.orig Sun Dec 28 21:11:08 2003
+++ ext/gd/libgd/gdcache.h Tue Jul 27 02:21:28 2004
$OpenBSD: patch-ext_gd_libgd_gdcache_h,v 1.2 2011/06/18 19:49:22 sthen Exp $
--- ext/gd/libgd/gdcache.h.orig.port Sun Dec 28 20:11:08 2003
+++ ext/gd/libgd/gdcache.h Sat Jun 18 12:19:29 2011
@@ -41,7 +41,7 @@
/*********************************************************/

6
www/php5/extensions/patches/patch-ext_gd_libgd_gdkanji_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_gd_libgd_gdkanji_c,v 1.2 2007/07/02 08:53:17 robert Exp $
--- ext/gd/libgd/gdkanji.c.orig Sun Dec 28 21:11:08 2003
+++ ext/gd/libgd/gdkanji.c Mon Jul 2 10:38:20 2007
$OpenBSD: patch-ext_gd_libgd_gdkanji_c,v 1.3 2011/06/18 19:49:22 sthen Exp $
--- ext/gd/libgd/gdkanji.c.orig.port Sun Dec 28 20:11:08 2003
+++ ext/gd/libgd/gdkanji.c Sat Jun 18 12:19:29 2011
@@ -362,7 +362,7 @@ do_convert (unsigned char *to, unsigned char *from, co
from_len = strlen ((const char *) from) + 1;
to_len = BUFSIZ;

6
www/php5/extensions/patches/patch-ext_gmp_gmp_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_gmp_gmp_c,v 1.1 2011/05/27 20:42:36 naddy Exp $
--- ext/gmp/gmp.c.orig Fri May 27 21:32:54 2011
+++ ext/gmp/gmp.c Fri May 27 21:33:33 2011
$OpenBSD: patch-ext_gmp_gmp_c,v 1.2 2011/06/18 19:49:22 sthen Exp $
--- ext/gmp/gmp.c.orig.port Sun Jan 3 09:23:27 2010
+++ ext/gmp/gmp.c Sat Jun 18 12:19:29 2011
@@ -1396,7 +1396,7 @@ ZEND_FUNCTION(gmp_random)
GMPG(rand_initialized) = 1;

6
www/php5/extensions/patches/patch-ext_tidy_config_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_tidy_config_m4,v 1.1 2011/03/15 19:49:42 jasper Exp $
--- ext/tidy/config.m4.orig Sat Dec 23 18:58:47 2006
+++ ext/tidy/config.m4 Sun Mar 13 21:23:50 2011
$OpenBSD: patch-ext_tidy_config_m4,v 1.2 2011/06/18 19:49:22 sthen Exp $
--- ext/tidy/config.m4.orig.port Sat Dec 23 17:58:47 2006
+++ ext/tidy/config.m4 Sat Jun 18 12:19:29 2011
@@ -14,12 +14,12 @@ if test "$PHP_TIDY" != "no"; then
fi

6
www/php5/extensions/patches/patch-ext_tidy_tidy_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_tidy_tidy_c,v 1.1 2011/03/15 19:49:42 jasper Exp $
--- ext/tidy/tidy.c.orig Sun Mar 13 20:55:24 2011
+++ ext/tidy/tidy.c Sun Mar 13 20:55:38 2011
$OpenBSD: patch-ext_tidy_tidy_c,v 1.2 2011/06/18 19:49:22 sthen Exp $
--- ext/tidy/tidy.c.orig.port Sun Jan 3 09:23:27 2010
+++ ext/tidy/tidy.c Sat Jun 18 12:19:29 2011
@@ -31,7 +31,7 @@
#include "ext/standard/info.h"
#include "safe_mode.h"

8
www/php5/extensions/patches/patch-ext_xmlrpc_libxmlrpc_encodings_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ext_xmlrpc_libxmlrpc_encodings_c,v 1.2 2007/07/02 08:53:17 robert Exp $
--- ext/xmlrpc/libxmlrpc/encodings.c.orig Tue Mar 9 00:04:33 2004
+++ ext/xmlrpc/libxmlrpc/encodings.c Mon Jul 2 10:38:20 2007
@@ -70,7 +70,7 @@ static char* convert(const char* src, int src_len, int
$OpenBSD: patch-ext_xmlrpc_libxmlrpc_encodings_c,v 1.3 2011/06/18 19:49:22 sthen Exp $
--- ext/xmlrpc/libxmlrpc/encodings.c.orig.port Wed Sep 19 01:33:43 2007
+++ ext/xmlrpc/libxmlrpc/encodings.c Sat Jun 18 12:19:29 2011
@@ -78,7 +78,7 @@ static char* convert(const char* src, int src_len, int
if(outbuf) {
out_ptr = (char*)outbuf;
while(inlenleft) {

5
www/php5/patches/patch-aclocal_m4
View File

@ -1,5 +1,6 @@
--- aclocal.m4.orig Thu Jan 6 18:04:40 2011
+++ aclocal.m4 Tue Jan 25 18:56:25 2011
$OpenBSD: patch-aclocal_m4,v 1.13 2011/06/18 19:49:22 sthen Exp $
--- aclocal.m4.orig.port Thu Jan 6 23:04:40 2011
+++ aclocal.m4 Sat Jun 18 12:17:02 2011
@@ -194,7 +194,7 @@ dnl the path is interpreted relative to the top build-
dnl
dnl which array to append to?

5
www/php5/patches/patch-configure_in
View File

@ -1,5 +1,6 @@
--- configure.in.orig Mon Jan 3 14:34:43 2011
+++ configure.in Mon Jan 3 14:34:45 2011
$OpenBSD: patch-configure_in,v 1.14 2011/06/18 19:49:22 sthen Exp $
--- configure.in.orig.port Sat Jun 18 12:14:51 2011
+++ configure.in Sat Jun 18 12:17:02 2011
@@ -352,8 +352,8 @@ AC_CHECK_LIB(m, sin)
dnl Check for resolver routines.

6
www/php5/patches/patch-ext_iconv_iconv_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_iconv_iconv_c,v 1.4 2007/11/14 10:53:50 robert Exp $
--- ext/iconv/iconv.c.orig Thu Nov 1 20:13:49 2007
+++ ext/iconv/iconv.c Tue Nov 13 11:45:09 2007
$OpenBSD: patch-ext_iconv_iconv_c,v 1.5 2011/06/18 19:49:22 sthen Exp $
--- ext/iconv/iconv.c.orig.port Tue May 4 12:56:59 2010
+++ ext/iconv/iconv.c Sat Jun 18 12:14:54 2011
@@ -345,7 +345,7 @@ static php_iconv_err_t _php_iconv_appendl(smart_str *d
out_p = (d)->c + (d)->len;

6
www/php5/patches/patch-ext_openssl_config0_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_openssl_config0_m4,v 1.1 2011/03/21 19:50:18 jasper Exp $
--- ext/openssl/config0.m4.orig Tue Jan 25 18:08:01 2011
+++ ext/openssl/config0.m4 Tue Jan 25 18:08:48 2011
$OpenBSD: patch-ext_openssl_config0_m4,v 1.2 2011/06/18 19:49:22 sthen Exp $
--- ext/openssl/config0.m4.orig.port Sun Jan 7 18:38:22 2007
+++ ext/openssl/config0.m4 Sat Jun 18 12:14:54 2011
@@ -16,7 +16,7 @@ if test "$PHP_OPENSSL" != "no"; then
PHP_SETUP_KERBEROS(OPENSSL_SHARED_LIBADD)
fi

6
www/php5/patches/patch-ext_standard_config_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_standard_config_m4,v 1.2 2011/01/03 15:03:03 robert Exp $
--- ext/standard/config.m4.orig Sat Nov 28 00:41:13 2009
+++ ext/standard/config.m4 Mon Jan 3 14:34:43 2011
$OpenBSD: patch-ext_standard_config_m4,v 1.3 2011/06/18 19:49:22 sthen Exp $
--- ext/standard/config.m4.orig.port Fri Nov 27 23:41:13 2009
+++ ext/standard/config.m4 Sat Jun 18 12:14:55 2011
@@ -311,9 +311,9 @@ dnl
dnl Detect library functions needed by php dns_xxx functions
dnl ext/standard/php_dns.h will collect these in a single define: HAVE_DNS_FUNCS

6
www/php5/patches/patch-main_php_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-main_php_h,v 1.4 2007/07/02 08:53:17 robert Exp $
--- main/php.h.orig Mon Jul 2 10:34:20 2007
+++ main/php.h Mon Jul 2 10:34:20 2007
$OpenBSD: patch-main_php_h,v 1.5 2011/06/18 19:49:22 sthen Exp $
--- main/php.h.orig.port Sat Jun 18 12:14:52 2011
+++ main/php.h Sat Jun 18 12:14:55 2011
@@ -150,7 +150,7 @@ char *strtok_r(char *s, const char *delim, char **last
END_EXTERN_C()
#endif

6
www/php5/patches/patch-main_php_open_temporary_file_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-main_php_open_temporary_file_c,v 1.4 2007/09/05 09:11:34 robert Exp $
--- main/php_open_temporary_file.c.orig Fri Aug 10 12:13:15 2007
+++ main/php_open_temporary_file.c Fri Aug 31 09:26:46 2007
$OpenBSD: patch-main_php_open_temporary_file_c,v 1.5 2011/06/18 19:49:22 sthen Exp $
--- main/php_open_temporary_file.c.orig.port Sun Jan 3 09:23:27 2010
+++ main/php_open_temporary_file.c Sat Jun 18 12:14:55 2011
@@ -131,7 +131,7 @@ static int php_do_open_temporary_file(const char *path
trailing_slash = "/";
}

6
www/php5/patches/patch-php_ini-dist
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-php_ini-dist,v 1.14 2011/01/03 15:03:03 robert Exp $
--- php.ini-dist.orig Mon Jan 3 14:35:22 2011
+++ php.ini-dist Mon Jan 3 14:38:34 2011
$OpenBSD: patch-php_ini-dist,v 1.15 2011/06/18 19:49:22 sthen Exp $
--- php.ini-dist.orig.port Mon Aug 16 01:26:39 2010
+++ php.ini-dist Sat Jun 18 12:14:55 2011
@@ -471,10 +471,7 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;

6
www/php5/patches/patch-php_ini-recommended
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-php_ini-recommended,v 1.14 2011/01/03 15:03:03 robert Exp $
--- php.ini-recommended.orig Mon Jan 3 14:37:12 2011
+++ php.ini-recommended Mon Jan 3 14:38:25 2011
$OpenBSD: patch-php_ini-recommended,v 1.15 2011/06/18 19:49:22 sthen Exp $
--- php.ini-recommended.orig.port Mon Aug 16 01:26:39 2010
+++ php.ini-recommended Sat Jun 18 12:14:56 2011
@@ -522,10 +522,7 @@ default_mimetype = "text/html"
;;;;;;;;;;;;;;;;;;;;;;;;;