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

more

Browse Source
This commit is contained in:
sturm 2005-12-29 23:06:28 +00:00
parent 5e4046399d
commit 4184a780de
17 changed files with 326 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
www/php5/core/patches/patch-ext_yp_yp_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-ext_yp_yp_c,v 1.3 2005/12/29 23:06:28 sturm Exp $
--- ext/yp/yp.c.orig Mon Jul 26 22:49:33 2004
+++ ext/yp/yp.c Mon Jul 26 22:51:22 2004
@@ -280,7 +280,7 @@
convert_to_string_ex(domain);
convert_to_string_ex(map);
- callback.foreach = php_foreach_all;
+ (char *) callback.foreach = php_foreach_all;
callback.data = (char *) php_callback;
yp_all(Z_STRVAL_PP(domain),Z_STRVAL_PP(map),&callback);
@@ -337,7 +337,7 @@
array_init(return_value);
- callback.foreach = php_foreach_cat;
+ (char *) callback.foreach = php_foreach_cat;
callback.data = (char *) return_value;
yp_all(Z_STRVAL_PP(domain),Z_STRVAL_PP(map),&callback);

57
www/php5/core/patches/patch-pear_PEAR_Config_php Normal file
View File

@ -0,0 +1,57 @@
$OpenBSD: patch-pear_PEAR_Config_php,v 1.3 2005/12/29 23:06:28 sturm Exp $
--- pear/PEAR/Config.php.orig Thu Jan 8 18:33:12 2004
+++ pear/PEAR/Config.php Mon Jul 26 23:01:21 2004
@@ -66,12 +66,7 @@
if (getenv('PHP_PEAR_INSTALL_DIR')) {
define('PEAR_CONFIG_DEFAULT_PHP_DIR', getenv('PHP_PEAR_INSTALL_DIR'));
} else {
- if (@is_dir($PEAR_INSTALL_DIR)) {
- define('PEAR_CONFIG_DEFAULT_PHP_DIR',
- $PEAR_INSTALL_DIR);
- } else {
- define('PEAR_CONFIG_DEFAULT_PHP_DIR', $PEAR_INSTALL_DIR);
- }
+ define('PEAR_CONFIG_DEFAULT_PHP_DIR', OPENBSD_PEAR_ROOT.'/lib');
}
// Default for ext_dir
@@ -93,8 +88,7 @@
if (getenv('PHP_PEAR_DOC_DIR')) {
define('PEAR_CONFIG_DEFAULT_DOC_DIR', getenv('PHP_PEAR_DOC_DIR'));
} else {
- define('PEAR_CONFIG_DEFAULT_DOC_DIR',
- $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'docs');
+ define('PEAR_CONFIG_DEFAULT_DOC_DIR', OPENBSD_PEAR_ROOT.'/doc');
}
// Default for bin_dir
@@ -108,16 +102,14 @@
if (getenv('PHP_PEAR_DATA_DIR')) {
define('PEAR_CONFIG_DEFAULT_DATA_DIR', getenv('PHP_PEAR_DATA_DIR'));
} else {
- define('PEAR_CONFIG_DEFAULT_DATA_DIR',
- $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'data');
+ define('PEAR_CONFIG_DEFAULT_DATA_DIR', OPENBSD_PEAR_ROOT.'/data');
}
// Default for test_dir
if (getenv('PHP_PEAR_TEST_DIR')) {
define('PEAR_CONFIG_DEFAULT_TEST_DIR', getenv('PHP_PEAR_TEST_DIR'));
} else {
- define('PEAR_CONFIG_DEFAULT_TEST_DIR',
- $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'tests');
+ define('PEAR_CONFIG_DEFAULT_TEST_DIR', OPENBSD_PEAR_ROOT.'/tests');
}
// Default for cache_dir
@@ -176,9 +168,7 @@
if (getenv('PHP_PEAR_SIG_BIN')) {
define('PEAR_CONFIG_DEFAULT_SIG_BIN', getenv('PHP_PEAR_SIG_BIN'));
} else {
- define('PEAR_CONFIG_DEFAULT_SIG_BIN',
- System::which(
- 'gpg', OS_WINDOWS ? 'c:\gnupg\gpg.exe' : '/usr/local/bin/gpg'));
+ define('PEAR_CONFIG_DEFAULT_SIG_BIN', PHP_PREFIX . '/bin/gpg');
}
// Default for sig_keydir

16
www/php5/core/patches/patch-pear_install-pear_php Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-pear_install-pear_php,v 1.3 2005/12/29 23:06:28 sturm Exp $
--- pear/install-pear.php.orig Mon Jul 26 23:02:15 2004
+++ pear/install-pear.php Mon Jul 26 23:02:59 2004
@@ -46,10 +46,11 @@
// User supplied a dir prefix
if (!empty($with_dir)) {
$ds = DIRECTORY_SEPARATOR;
- $config->set('php_dir', $with_dir, 'default');
+ $config->set('php_dir', $with_dir . $ds . 'lib', 'default');
$config->set('doc_dir', $with_dir . $ds . 'doc', 'default');
$config->set('data_dir', $with_dir . $ds . 'data', 'default');
$config->set('test_dir', $with_dir . $ds . 'test', 'default');
+ $config->set('test_dir', $with_dir . $ds . 'tests', 'default');
}
/* Print PEAR Conf (useful for debuging do NOT REMOVE)
sort($keys);

14
www/php5/core/patches/patch-scripts_php-config_in Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-scripts_php-config_in,v 1.4 2005/12/29 23:06:28 sturm Exp $
--- scripts/php-config.in.orig Wed Mar 16 07:36:54 2005
+++ scripts/php-config.in Sun Apr 3 12:39:04 2005
@@ -1,8 +1,8 @@
#! /bin/sh
-prefix="@prefix@"
+prefix=OPENBSD_PEAR_ROOT
version="@PHP_VERSION@"
-includedir="@includedir@/php"
+includedir="@includedir@"
includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend"
ldflags="@PHP_LDFLAGS@"
libs="@EXTRA_LIBS@"

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

@ -1,6 +1,6 @@
$OpenBSD: patch-scripts_phpize_in,v 1.3 2005/12/21 15:42:06 robert Exp $
--- scripts/phpize.in.orig Thu Sep 1 15:59:03 2005
+++ scripts/phpize.in Sat Nov 26 13:07:08 2005
$OpenBSD: patch-scripts_phpize_in,v 1.4 2005/12/29 23:06:28 sturm Exp $
--- scripts/phpize.in.orig Wed Jun 15 19:19:41 2005
+++ scripts/phpize.in Wed Sep 14 16:50:39 2005
@@ -1,10 +1,10 @@
#!/bin/sh

4
www/php5/core/pkg/PLIST
View File

@ -1,9 +1,7 @@
@comment $OpenBSD: PLIST,v 1.5 2005/12/21 15:42:06 robert Exp $
@comment $OpenBSD: PLIST,v 1.6 2005/12/29 23:06:28 sturm Exp $
@conflict php4-core-*
%%SHARED%%
bin/pear
bin/peardev
bin/pecl
bin/php
bin/php-config
bin/phpize

192
www/php5/core/pkg/PLIST-pear
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-pear,v 1.6 2005/12/21 15:42:06 robert Exp $
@comment $OpenBSD: PLIST-pear,v 1.7 2005/12/29 23:06:28 sturm Exp $
@conflict php4-pear-*
pear/
pear/build/
@ -10,7 +10,6 @@ pear/build/libtool.m4
pear/build/ltmain.sh
pear/build/mkdep.awk
pear/build/phpize.m4
pear/build/run-tests.php
pear/build/scan_makefile_in.awk
pear/build/shtool
pear/data/
@ -21,12 +20,18 @@ pear/doc/
pear/doc/Archive_Tar/
pear/doc/Archive_Tar/docs/
pear/doc/Archive_Tar/docs/Archive_Tar.txt
pear/doc/HTML_Template_IT/
pear/doc/HTML_Template_IT/examples/
pear/doc/HTML_Template_IT/examples/sample_it.php
pear/doc/HTML_Template_IT/examples/templates/
pear/doc/HTML_Template_IT/examples/templates/main.tpl.htm
pear/include/
pear/include/TSRM/
pear/include/TSRM/TSRM.h
pear/include/TSRM/acconfig.h
pear/include/TSRM/readdir.h
pear/include/TSRM/tsrm_config.h
pear/include/TSRM/tsrm_config.nw.h
pear/include/TSRM/tsrm_config.w32.h
pear/include/TSRM/tsrm_config_common.h
pear/include/TSRM/tsrm_nw.h
@ -84,17 +89,8 @@ pear/include/Zend/zend_strtod.h
pear/include/Zend/zend_ts_hash.h
pear/include/Zend/zend_types.h
pear/include/Zend/zend_variables.h
pear/include/Zend/zend_vm.h
pear/include/Zend/zend_vm_def.h
pear/include/Zend/zend_vm_execute.h
pear/include/Zend/zend_vm_opcodes.h
pear/include/acconfig.h
pear/include/ext/
pear/include/ext/date/
pear/include/ext/date/lib/
pear/include/ext/date/lib/timelib.h
pear/include/ext/date/lib/timelib_config.h
pear/include/ext/date/lib/timelib_structs.h
pear/include/ext/date/php_date.h
pear/include/ext/dom/
pear/include/ext/dom/xml_common.h
pear/include/ext/iconv/
@ -108,25 +104,37 @@ pear/include/ext/iconv/php_php_iconv_h_path.h
pear/include/ext/iconv/php_php_iconv_impl.h
pear/include/ext/libxml/
pear/include/ext/libxml/php_libxml.h
pear/include/ext/pcre/
pear/include/ext/pcre/pcrelib/
pear/include/ext/pcre/pcrelib/internal.h
pear/include/ext/pcre/pcrelib/pcre.h
pear/include/ext/pcre/pcrelib/pcre_internal.h
pear/include/ext/pcre/pcrelib/pcre_scanner.h
pear/include/ext/pcre/pcrelib/pcre_stringpiece.h
pear/include/ext/pcre/pcrelib/pcrecpp.h
pear/include/ext/pcre/pcrelib/pcreposix.h
pear/include/ext/pcre/pcrelib/ucp.h
pear/include/ext/pcre/pcrelib/ucpinternal.h
pear/include/ext/pcre/php_pcre.h
pear/include/ext/pdo/
pear/include/ext/pdo/php_pdo.h
pear/include/ext/pdo/php_pdo_driver.h
pear/include/ext/mbstring/
pear/include/ext/mbstring/libmbfl/
pear/include/ext/mbstring/libmbfl/mbfl/
pear/include/ext/mbstring/libmbfl/mbfl/eaw_table.h
pear/include/ext/mbstring/libmbfl/mbfl/mbfilter.h
pear/include/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h
pear/include/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h
pear/include/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h
pear/include/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h
pear/include/ext/mbstring/libmbfl/mbfl/mbfl_consts.h
pear/include/ext/mbstring/libmbfl/mbfl/mbfl_convert.h
pear/include/ext/mbstring/libmbfl/mbfl/mbfl_defs.h
pear/include/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
pear/include/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h
pear/include/ext/mbstring/libmbfl/mbfl/mbfl_ident.h
pear/include/ext/mbstring/libmbfl/mbfl/mbfl_language.h
pear/include/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h
pear/include/ext/mbstring/libmbfl/mbfl/mbfl_string.h
pear/include/ext/mbstring/mb_gpc.h
pear/include/ext/mbstring/mbstring.h
pear/include/ext/mbstring/php_mbregex.h
pear/include/ext/mbstring/php_unicode.h
pear/include/ext/mbstring/unicode_data.h
pear/include/ext/session/
pear/include/ext/session/mod_files.h
pear/include/ext/session/mod_mm.h
pear/include/ext/session/mod_user.h
pear/include/ext/session/php_session.h
pear/include/ext/sqlite/
pear/include/ext/sqlite/libsqlite/
pear/include/ext/sqlite/libsqlite/src/
pear/include/ext/standard/
pear/include/ext/standard/base64.h
pear/include/ext/standard/basic_functions.h
@ -150,6 +158,7 @@ pear/include/ext/standard/md5.h
pear/include/ext/standard/microtime.h
pear/include/ext/standard/pack.h
pear/include/ext/standard/pageinfo.h
pear/include/ext/standard/parsedate.h
pear/include/ext/standard/php_array.h
pear/include/ext/standard/php_assert.h
pear/include/ext/standard/php_browscap.h
@ -168,6 +177,7 @@ pear/include/ext/standard/php_link.h
pear/include/ext/standard/php_mail.h
pear/include/ext/standard/php_math.h
pear/include/ext/standard/php_metaphone.h
pear/include/ext/standard/php_parsedate.h
pear/include/ext/standard/php_rand.h
pear/include/ext/standard/php_smart_str.h
pear/include/ext/standard/php_smart_str_public.h
@ -189,6 +199,7 @@ pear/include/ext/standard/url.h
pear/include/ext/standard/url_scanner.h
pear/include/ext/standard/url_scanner_ex.h
pear/include/ext/xml/
pear/include/ext/xml/expat/
pear/include/ext/xml/expat_compat.h
pear/include/ext/xml/php_xml.h
pear/include/include/
@ -197,12 +208,14 @@ pear/include/main/SAPI.h
pear/include/main/build-defs.h
pear/include/main/config.w32.h
pear/include/main/fopen_wrappers.h
pear/include/main/internal_functions_registry.h
pear/include/main/logos.h
pear/include/main/php.h
pear/include/main/php3_compat.h
pear/include/main/php_compat.h
pear/include/main/php_config.h
pear/include/main/php_content_types.h
pear/include/main/php_embed.h
pear/include/main/php_globals.h
pear/include/main/php_ini.h
pear/include/main/php_logos.h
@ -240,130 +253,81 @@ pear/include/regex/regex2.h
pear/include/regex/regex_extra.h
pear/include/regex/utils.h
pear/lib/
pear/lib/.channels/
pear/lib/.channels/.alias/
pear/lib/.channels/.alias/pear.txt
pear/lib/.channels/.alias/pecl.txt
pear/lib/.channels/__uri.reg
pear/lib/.channels/pear.php.net.reg
pear/lib/.channels/pecl.php.net.reg
pear/lib/.depdb
pear/lib/.depdblock
pear/lib/.registry/
pear/lib/.registry/.channel.__uri/
pear/lib/.registry/.channel.pecl.php.net/
pear/lib/.registry/archive_tar.reg
pear/lib/.registry/console_getopt.reg
pear/lib/.registry/html_template_it.reg
pear/lib/.registry/net_useragent_detect.reg
pear/lib/.registry/pear.reg
pear/lib/.registry/xml_rpc.reg
pear/lib/Archive/
pear/lib/Archive/Tar.php
pear/lib/Console/
pear/lib/Console/Getopt.php
pear/lib/HTML/
pear/lib/HTML/Template/
pear/lib/HTML/Template/IT.php
pear/lib/HTML/Template/ITX.php
pear/lib/HTML/Template/IT_Error.php
pear/lib/Net/
pear/lib/Net/UserAgent/
pear/lib/Net/UserAgent/Detect.php
pear/lib/OS/
pear/lib/OS/Guess.php
pear/lib/PEAR/
pear/lib/PEAR.php
pear/lib/PEAR/Autoloader.php
pear/lib/PEAR/Builder.php
pear/lib/PEAR/ChannelFile/
pear/lib/PEAR/ChannelFile.php
pear/lib/PEAR/ChannelFile/Parser.php
pear/lib/PEAR/Command/
pear/lib/PEAR/Command.php
pear/lib/PEAR/Command/Auth.php
pear/lib/PEAR/Command/Auth.xml
pear/lib/PEAR/Command/Build.php
pear/lib/PEAR/Command/Build.xml
pear/lib/PEAR/Command/Channels.php
pear/lib/PEAR/Command/Channels.xml
pear/lib/PEAR/Command/Common.php
pear/lib/PEAR/Command/Config.php
pear/lib/PEAR/Command/Config.xml
pear/lib/PEAR/Command/Install.php
pear/lib/PEAR/Command/Install.xml
pear/lib/PEAR/Command/Mirror.php
pear/lib/PEAR/Command/Mirror.xml
pear/lib/PEAR/Command/Package.php
pear/lib/PEAR/Command/Package.xml
pear/lib/PEAR/Command/Pickle.php
pear/lib/PEAR/Command/Pickle.xml
pear/lib/PEAR/Command/Registry.php
pear/lib/PEAR/Command/Registry.xml
pear/lib/PEAR/Command/Remote.php
pear/lib/PEAR/Command/Remote.xml
pear/lib/PEAR/Command/Test.php
pear/lib/PEAR/Command/Test.xml
pear/lib/PEAR/Common.php
pear/lib/PEAR/Config.php
pear/lib/PEAR/Dependency.php
pear/lib/PEAR/Dependency2.php
pear/lib/PEAR/DependencyDB.php
pear/lib/PEAR/Downloader/
pear/lib/PEAR/Downloader.php
pear/lib/PEAR/Downloader/Package.php
pear/lib/PEAR/ErrorStack.php
pear/lib/PEAR/Exception.php
pear/lib/PEAR/Frontend/
pear/lib/PEAR/Frontend.php
pear/lib/PEAR/Frontend/CLI.php
pear/lib/PEAR/Installer/
pear/lib/PEAR/Installer.php
pear/lib/PEAR/Installer/Role/
pear/lib/PEAR/Installer/Role.php
pear/lib/PEAR/Installer/Role/Common.php
pear/lib/PEAR/Installer/Role/Data.php
pear/lib/PEAR/Installer/Role/Data.xml
pear/lib/PEAR/Installer/Role/Doc.php
pear/lib/PEAR/Installer/Role/Doc.xml
pear/lib/PEAR/Installer/Role/Ext.php
pear/lib/PEAR/Installer/Role/Ext.xml
pear/lib/PEAR/Installer/Role/Php.php
pear/lib/PEAR/Installer/Role/Php.xml
pear/lib/PEAR/Installer/Role/Script.php
pear/lib/PEAR/Installer/Role/Script.xml
pear/lib/PEAR/Installer/Role/Src.php
pear/lib/PEAR/Installer/Role/Src.xml
pear/lib/PEAR/Installer/Role/Test.php
pear/lib/PEAR/Installer/Role/Test.xml
pear/lib/PEAR/PackageFile/
pear/lib/PEAR/PackageFile.php
pear/lib/PEAR/PackageFile/Generator/
pear/lib/PEAR/PackageFile/Generator/v1.php
pear/lib/PEAR/PackageFile/Generator/v2.php
pear/lib/PEAR/PackageFile/Parser/
pear/lib/PEAR/PackageFile/Parser/v1.php
pear/lib/PEAR/PackageFile/Parser/v2.php
pear/lib/PEAR/PackageFile/v1.php
pear/lib/PEAR/PackageFile/v2/
pear/lib/PEAR/PackageFile/v2.php
pear/lib/PEAR/PackageFile/v2/Validator.php
pear/lib/PEAR/PackageFile/v2/rw.php
pear/lib/PEAR/Packager.php
pear/lib/PEAR/REST/
pear/lib/PEAR/REST.php
pear/lib/PEAR/REST/10.php
pear/lib/PEAR/REST/11.php
pear/lib/PEAR/Registry.php
pear/lib/PEAR/Remote.php
pear/lib/PEAR/RunTest.php
pear/lib/PEAR/Task/
pear/lib/PEAR/Task/Common.php
pear/lib/PEAR/Task/Postinstallscript/
pear/lib/PEAR/Task/Postinstallscript.php
pear/lib/PEAR/Task/Postinstallscript/rw.php
pear/lib/PEAR/Task/Replace/
pear/lib/PEAR/Task/Replace.php
pear/lib/PEAR/Task/Replace/rw.php
pear/lib/PEAR/Task/Unixeol/
pear/lib/PEAR/Task/Unixeol.php
pear/lib/PEAR/Task/Unixeol/rw.php
pear/lib/PEAR/Task/Windowseol/
pear/lib/PEAR/Task/Windowseol.php
pear/lib/PEAR/Task/Windowseol/rw.php
pear/lib/PEAR/Validate.php
pear/lib/PEAR/Validator/
pear/lib/PEAR/Validator/PECL.php
pear/lib/PEAR/XMLParser.php
pear/lib/System.php
pear/lib/XML/
pear/lib/XML/RPC/
pear/lib/XML/RPC.php
pear/lib/XML/RPC/Dump.php
pear/lib/XML/RPC/Server.php
pear/lib/pearcmd.php
pear/lib/peclcmd.php
pear/tests/
pear/tests/HTML_Template_IT/
pear/tests/HTML_Template_IT/tests/
pear/tests/HTML_Template_IT/tests/Console_TestListener.php
pear/tests/HTML_Template_IT/tests/ITX_api_testcase.php
pear/tests/HTML_Template_IT/tests/ITX_usage_testcase.php
pear/tests/HTML_Template_IT/tests/IT_api_testcase.php
pear/tests/HTML_Template_IT/tests/IT_usage_testcase.php
pear/tests/HTML_Template_IT/tests/templates/
pear/tests/HTML_Template_IT/tests/templates/__include.html
pear/tests/HTML_Template_IT/tests/templates/addblock.html
pear/tests/HTML_Template_IT/tests/templates/blockiteration.html
pear/tests/HTML_Template_IT/tests/templates/blocks.html
pear/tests/HTML_Template_IT/tests/templates/globals.html
pear/tests/HTML_Template_IT/tests/templates/include.html
pear/tests/HTML_Template_IT/tests/templates/loadtemplatefile.html
pear/tests/HTML_Template_IT/tests/templates/replaceblock.html
pear/tests/HTML_Template_IT/tests/test.php
pear/tests/XML_RPC/
pear/tests/XML_RPC/tests/
pear/tests/XML_RPC/tests/protoport.php
pear/tests/XML_RPC/tests/test_Dump.php

16
www/php5/extensions/Makefile
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.16 2005/12/21 15:42:06 robert Exp $
# $OpenBSD: Makefile,v 1.17 2005/12/29 23:06:28 sturm Exp $
FULLPKGNAME= php5-extensions-${V}
FULLPKGNAME= php5-extensions-${V}p0
COMMENT= "informational package about PHP5 extensions"
MULTI_PACKAGES=
@ -75,6 +75,16 @@ COMMENT-dbase= "dBase database access extensions for php5"
CONFIGURE_ARGS+= --enable-dbase=shared
.endif
# dbx
PSEUDO_FLAVORS+= no_dbx
.if ${FLAVOR:L:Mno_dbx}
CONFIGURE_ARGS+= --disable-dbx
.else
MULTI_PACKAGES+= -dbx
COMMENT-dbx= "dbx database abstraction interface for php5"
CONFIGURE_ARGS+= --enable-dbx=shared
.endif
# filepro
PSEUDO_FLAVORS+= no_filepro
.if ${FLAVOR:L:Mno_filepro}
@ -306,7 +316,7 @@ FULLPKGNAME-xsl= php5-xsl-${V}p1
.for i in ${MULTI_PACKAGES}
.if !defined(FULLPKGNAME${i})
FULLPKGNAME${i}= php5${i}-${V}
FULLPKGNAME${i}= php5${i}-${V}p0
.endif
.endfor

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

@ -1,6 +1,6 @@
$OpenBSD: patch-ext_gd_config_m4,v 1.2 2005/12/21 15:42:06 robert Exp $
--- ext/gd/config.m4.orig Sat Nov 26 15:34:51 2005
+++ ext/gd/config.m4 Sat Nov 26 15:35:23 2005
$OpenBSD: patch-ext_gd_config_m4,v 1.3 2005/12/29 23:06:28 sturm Exp $
--- ext/gd/config.m4.orig Thu Dec 25 23:12:08 2003
+++ ext/gd/config.m4 Tue Jul 27 00:41:56 2004
@@ -87,13 +87,13 @@
AC_MSG_ERROR([PNG support requires ZLIB. Use --with-zlib-dir=<DIR>])
fi
@ -14,6 +14,6 @@ $OpenBSD: patch-ext_gd_config_m4,v 1.2 2005/12/21 15:42:06 robert Exp $
[
- PHP_ADD_INCLUDE($GD_PNG_DIR/include)
+ PHP_ADD_INCLUDE($GD_PNG_DIR/include/libpng)
PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD)
PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib, GD_SHARED_LIBADD)
],[

3
www/php5/extensions/pkg/DESCR-dbx Normal file
View File

@ -0,0 +1,3 @@
Database abstraction layer, allowing database-independent PHP code
with some semblance of efficiency.

3
www/php5/extensions/pkg/PLIST-dbx Normal file
View File

@ -0,0 +1,3 @@
@comment $OpenBSD: PLIST-dbx,v 1.4 2005/12/29 23:07:19 sturm Exp $
@conflict php4-dbx-*
lib/php/modules/dbx.so

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

@ -1,10 +1,10 @@
$OpenBSD: patch-aclocal_m4,v 1.4 2005/12/21 15:42:06 robert Exp $
--- aclocal.m4.orig Wed Nov 23 22:37:40 2005
+++ aclocal.m4 Sat Nov 26 12:59:21 2005
@@ -2100,10 +2100,9 @@
$OpenBSD: patch-aclocal_m4,v 1.5 2005/12/29 23:07:19 sturm Exp $
--- aclocal.m4.orig Wed Mar 30 23:45:38 2005
+++ aclocal.m4 Sun Apr 3 21:38:56 2005
@@ -1656,10 +1656,9 @@
if test "$PHP_KERBEROS_DIR"; then
found_kerberos=yes
PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/$PHP_LIBDIR, $1)
PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/lib, $1)
- PHP_ADD_LIBRARY(gssapi_krb5, 1, $1)
PHP_ADD_LIBRARY(krb5, 1, $1)
- PHP_ADD_LIBRARY(k5crypto, 1, $1)
@ -14,12 +14,29 @@ $OpenBSD: patch-aclocal_m4,v 1.4 2005/12/21 15:42:06 robert Exp $
PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include)
fi
fi
@@ -4165,7 +4164,7 @@
*) need_version=no ;;
esac
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
@@ -1753,6 +1752,7 @@
PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [
PHP_ADD_LIBRARY(crypto,,$1)
+ PHP_ADD_LIBRARY(des,,$1)
],[
AC_MSG_ERROR([libcrypto not found!])
],[
@@ -4083,7 +4083,7 @@
need_version=no
library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
soname_spec='${libname}${release}.so$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+ finish_cmds=
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"
@@ -4313,7 +4313,7 @@
shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ finish_cmds=
shlibpath_var=LD_LIBRARY_PATH
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
case $host_os in
;;

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

@ -1,16 +1,27 @@
$OpenBSD: patch-configure_in,v 1.3 2005/12/21 15:42:06 robert Exp $
--- configure.in.orig Tue Nov 29 16:01:38 2005
+++ configure.in Tue Nov 29 16:02:41 2005
@@ -816,7 +816,7 @@
$OpenBSD: patch-configure_in,v 1.4 2005/12/29 23:07:19 sturm Exp $
--- configure.in.orig Wed Mar 30 23:43:12 2005
+++ configure.in Sun Apr 3 12:37:35 2005
@@ -31,9 +31,7 @@
AC_INIT(README.CVS-RULES)
PHP_CONFIG_NICE(config.nice)
-for arg in $0 "$@"; do
- CONFIGURE_COMMAND="$CONFIGURE_COMMAND '$arg'"
-done
+CONFIGURE_COMMAND="Built via the OpenBSD Ports Tree"
PHP_CANONICAL_HOST
AC_CONFIG_HEADER(main/php_config.h)
@@ -876,7 +874,7 @@
case $php_build_target in
program|static)
- standard_libtool_flag='-prefer-non-pic -static'
+ standard_libtool_flag=''
+ standard_libtool_flag='-static'
if test -z "$PHP_MODULES"; then
enable_shared=no
fi
@@ -824,8 +824,8 @@
@@ -884,8 +882,8 @@
shared)
enable_static=no
case $with_pic in
@ -21,7 +32,7 @@ $OpenBSD: patch-configure_in,v 1.3 2005/12/21 15:42:06 robert Exp $
esac
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
;;
@@ -1009,7 +1009,7 @@
@@ -1070,7 +1068,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"`

17
www/php5/patches/patch-ext_ming_config_m4
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-ext_ming_config_m4,v 1.1 2005/12/21 15:42:06 robert Exp $
--- ext/ming/config.m4.orig Tue Nov 29 16:14:37 2005
+++ ext/ming/config.m4 Tue Nov 29 16:15:12 2005
@@ -72,13 +72,6 @@
AC_DEFINE(HAVE_NEW_MING, 1, [ ])
dnl FIXME: This is now unconditional..better check coming later.
AC_DEFINE(HAVE_MING_ZLIB, 1, [ ])
- AC_TRY_COMPILE([
-#include <ming.h>
-int main(int,void) {
- SWFMovie_output(NULL, NULL, NULL, 0));
- return 0;
-}
- ], [ AC_DEFINE(HAVE_MING_MOVIE_LEVEL, 1, []) ])
])
CPPFLAGS=$old_CPPFLAGS

50
www/php5/patches/patch-ltmain_sh
View File

@ -1,44 +1,44 @@
$OpenBSD: patch-ltmain_sh,v 1.2 2005/12/21 15:42:06 robert Exp $
--- ltmain.sh.orig Fri May 27 15:06:04 2005
+++ ltmain.sh Sat Nov 26 13:03:08 2005
@@ -5902,40 +5902,6 @@
$OpenBSD: patch-ltmain_sh,v 1.3 2005/12/29 23:07:19 sturm Exp $
--- ltmain.sh.orig Mon Jul 26 23:13:52 2004
+++ ltmain.sh Mon Jul 26 23:14:18 2004
@@ -4524,40 +4524,6 @@
# Exit here if they wanted silent mode.
test "$show" = : && exit $EXIT_SUCCESS
test "$show" = ":" && exit 0
- $echo "----------------------------------------------------------------------"
- $echo "Libraries have been installed in:"
- echo "----------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- $echo " $libdir"
- echo " $libdir"
- done
- $echo
- $echo "If you ever happen to want to link against installed libraries"
- $echo "in a given directory, LIBDIR, you must either use libtool, and"
- $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- $echo "flag during linking and do at least one of the following:"
- echo
- echo "If you ever happen to want to link against installed libraries"
- echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
- echo "flag during linking and do at least one of the following:"
- if test -n "$shlibpath_var"; then
- $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- $echo " during execution"
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- fi
- if test -n "$runpath_var"; then
- $echo " - add LIBDIR to the \`$runpath_var' environment variable"
- $echo " during linking"
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- $echo " - use the \`$flag' linker flag"
- echo " - use the \`$flag' linker flag"
- fi
- if test -n "$admincmds"; then
- $echo " - have your system administrator run these commands:$admincmds"
- echo " - have your system administrator run these commands:$admincmds"
- fi
- if test -f /etc/ld.so.conf; then
- $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- $echo
- $echo "See any operating system documentation about shared libraries for"
- $echo "more information, such as the ld(1) and ld.so(8) manual pages."
- $echo "----------------------------------------------------------------------"
exit $EXIT_SUCCESS
- echo
- echo "See any operating system documentation about shared libraries for"
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "----------------------------------------------------------------------"
exit 0
;;

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

@ -1,7 +1,7 @@
$OpenBSD: patch-php_ini-dist,v 1.4 2005/12/21 15:42:06 robert Exp $
--- php.ini-dist.orig Tue Nov 15 00:14:23 2005
+++ php.ini-dist Sat Nov 26 13:18:08 2005
@@ -441,10 +441,7 @@
$OpenBSD: patch-php_ini-dist,v 1.5 2005/12/29 23:07:19 sturm Exp $
--- php.ini-dist.orig Thu May 5 14:33:56 2005
+++ php.ini-dist Wed Sep 14 16:43:30 2005
@@ -437,10 +437,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@ -13,7 +13,7 @@ $OpenBSD: patch-php_ini-dist,v 1.4 2005/12/21 15:42:06 robert Exp $
; The root of the PHP pages, used only if nonempty.
; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
@@ -458,7 +455,7 @@
@@ -454,7 +451,7 @@
user_dir =
; Directory in which the loadable extensions (modules) reside.
@ -22,7 +22,7 @@ $OpenBSD: patch-php_ini-dist,v 1.4 2005/12/21 15:42:06 robert Exp $
; Whether or not to enable the dl() function. The dl() function does NOT work
; properly in multithreaded servers, such as IIS or Zeus, and is automatically
@@ -519,7 +516,7 @@
@@ -515,7 +512,7 @@
;;;;;;;;;;;;;;;;;;
; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
@ -31,11 +31,10 @@ $OpenBSD: patch-php_ini-dist,v 1.4 2005/12/21 15:42:06 robert Exp $
; Define the anonymous ftp password (your email address)
;from="john@doe.com"
@@ -537,70 +534,6 @@
; fgets() and file() will work regardless of the source of the file.
@@ -534,74 +531,6 @@
; auto_detect_line_endings = Off
-
-;;;;;;;;;;;;;;;;;;;;;;
-; Dynamic Extensions ;
-;;;;;;;;;;;;;;;;;;;;;;
@ -58,25 +57,27 @@ $OpenBSD: patch-php_ini-dist,v 1.4 2005/12/21 15:42:06 robert Exp $
-; extension_dir directive above.
-
-
-; Windows Extensions
-; Note that ODBC support is built in, so no dll is needed for it.
-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
-; extension folders as well as the separate PECL DLL download (PHP 5).
-; Be sure to appropriately set the extension_dir directive.
-;Windows Extensions
-;Note that ODBC support is built in, so no dll is needed for it.
-;
-
-;extension=php_mbstring.dll
-;extension=php_bz2.dll
-;extension=php_cpdf.dll
-;extension=php_curl.dll
-;extension=php_dba.dll
-;extension=php_dbase.dll
-;extension=php_dbx.dll
-;extension=php_exif.dll
-;extension=php_fdf.dll
-;extension=php_filepro.dll
-;extension=php_gd2.dll
-;extension=php_gettext.dll
-;extension=php_ifx.dll
-;extension=php_iisfunc.dll
-;extension=php_imap.dll
-;extension=php_interbase.dll
-;extension=php_java.dll
-;extension=php_ldap.dll
-;extension=php_mcrypt.dll
-;extension=php_mhash.dll
@ -88,21 +89,24 @@ $OpenBSD: patch-php_ini-dist,v 1.4 2005/12/21 15:42:06 robert Exp $
-;extension=php_oci8.dll
-;extension=php_openssl.dll
-;extension=php_oracle.dll
-;extension=php_pdf.dll
-;extension=php_pgsql.dll
-;extension=php_shmop.dll
-;extension=php_snmp.dll
-;extension=php_sockets.dll
-;extension=php_sqlite.dll
-;extension=php_sybase_ct.dll
-;extension=php_tidy.dll
-;extension=php_w32api.dll
-;extension=php_xmlrpc.dll
-;extension=php_xsl.dll
-;extension=php_yaz.dll
-;extension=php_zip.dll
-
-
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
@@ -616,13 +549,6 @@
@@ -613,13 +542,6 @@
define_syslog_variables = Off
[mail function]
@ -116,7 +120,7 @@ $OpenBSD: patch-php_ini-dist,v 1.4 2005/12/21 15:42:06 robert Exp $
; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
;sendmail_path =
@@ -1173,6 +1099,53 @@
@@ -1197,6 +1119,53 @@
; instead of original one.
soap.wsdl_cache_ttl=86400

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

@ -1,7 +1,7 @@
$OpenBSD: patch-php_ini-recommended,v 1.4 2005/12/21 15:42:06 robert Exp $
--- php.ini-recommended.orig Tue Nov 15 00:14:23 2005
+++ php.ini-recommended Sat Nov 26 13:19:47 2005
@@ -499,10 +499,7 @@
$OpenBSD: patch-php_ini-recommended,v 1.5 2005/12/29 23:07:19 sturm Exp $
--- php.ini-recommended.orig Wed Sep 14 16:40:29 2005
+++ php.ini-recommended Wed Sep 14 16:46:06 2005
@@ -495,10 +495,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@ -13,7 +13,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.4 2005/12/21 15:42:06 robert Exp $
; The root of the PHP pages, used only if nonempty.
; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
@@ -516,7 +513,7 @@
@@ -512,7 +509,7 @@
user_dir =
; Directory in which the loadable extensions (modules) reside.
@ -22,7 +22,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.4 2005/12/21 15:42:06 robert Exp $
; Whether or not to enable the dl() function. The dl() function does NOT work
; properly in multithreaded servers, such as IIS or Zeus, and is automatically
@@ -577,7 +574,7 @@
@@ -573,7 +570,7 @@
;;;;;;;;;;;;;;;;;;
; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
@ -31,7 +31,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.4 2005/12/21 15:42:06 robert Exp $
; Define the anonymous ftp password (your email address)
;from="john@doe.com"
@@ -595,70 +592,6 @@
@@ -591,75 +588,6 @@
; fgets() and file() will work regardless of the source of the file.
; auto_detect_line_endings = Off
@ -58,25 +58,27 @@ $OpenBSD: patch-php_ini-recommended,v 1.4 2005/12/21 15:42:06 robert Exp $
-; extension_dir directive above.
-
-
-; Windows Extensions
-; Note that ODBC support is built in, so no dll is needed for it.
-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
-; extension folders as well as the separate PECL DLL download (PHP 5).
-; Be sure to appropriately set the extension_dir directive.
-;Windows Extensions
-;Note that ODBC support is built in, so no dll is needed for it.
-;
-
-;extension=php_mbstring.dll
-;extension=php_bz2.dll
-;extension=php_cpdf.dll
-;extension=php_curl.dll
-;extension=php_dba.dll
-;extension=php_dbase.dll
-;extension=php_dbx.dll
-;extension=php_exif.dll
-;extension=php_fdf.dll
-;extension=php_filepro.dll
-;extension=php_gd2.dll
-;extension=php_gettext.dll
-;extension=php_ifx.dll
-;extension=php_iisfunc.dll
-;extension=php_imap.dll
-;extension=php_interbase.dll
-;extension=php_java.dll
-;extension=php_ldap.dll
-;extension=php_mcrypt.dll
-;extension=php_mhash.dll
@ -88,21 +90,24 @@ $OpenBSD: patch-php_ini-recommended,v 1.4 2005/12/21 15:42:06 robert Exp $
-;extension=php_oci8.dll
-;extension=php_openssl.dll
-;extension=php_oracle.dll
-;extension=php_pdf.dll
-;extension=php_pgsql.dll
-;extension=php_shmop.dll
-;extension=php_snmp.dll
-;extension=php_sockets.dll
-;extension=php_sqlite.dll
-;extension=php_sybase_ct.dll
-;extension=php_tidy.dll
-;extension=php_w32api.dll
-;extension=php_xmlrpc.dll
-;extension=php_xsl.dll
-;extension=php_yaz.dll
-;extension=php_zip.dll
-
-
;;;;;;;;;;;;;;;;;;;
; Module Settings ;
;;;;;;;;;;;;;;;;;;;
@@ -674,13 +607,6 @@
@@ -671,13 +599,6 @@
define_syslog_variables = Off
[mail function]
@ -116,7 +121,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.4 2005/12/21 15:42:06 robert Exp $
; For Unix only. You may supply arguments as well (default: "sendmail -t -i").
;sendmail_path =
@@ -1231,6 +1157,53 @@
@@ -1255,6 +1176,53 @@
; instead of original one.
soap.wsdl_cache_ttl=86400