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

update to 4.3.11;

Browse Source
This commit is contained in:
robert 2005-04-04 21:11:41 +00:00
parent b2df742ec5
commit 3264258f4e
10 changed files with 94 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/php4/Makefile.inc
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile.inc,v 1.29 2005/02/06 13:10:38 wilfried Exp $
# $OpenBSD: Makefile.inc,v 1.30 2005/04/04 21:11:41 robert Exp $
# This port currently only works with archs supporting dynamic loading
# and has Apache that supports DSO's.
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
V= 4.3.10
V= 4.3.11
DISTNAME= php-${V}
CATEGORIES= www lang

6
www/php4/core/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.27 2005/02/06 13:10:38 wilfried Exp $
# $OpenBSD: Makefile,v 1.28 2005/04/04 21:11:42 robert Exp $
MULTI_PACKAGES= -pear
SUBPACKAGE?=
COMMENT= "server-side HTML-embedded scripting language"
COMMENT-pear= "base classes for common PHP tasks"
PKGNAME= php4-core-${V}p1
FULLPKGNAME-pear= php4-pear-${V}p0
PKGNAME= php4-core-${V}
FULLPKGNAME-pear= php4-pear-${V}
CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \
--without-mysql \

10
www/php4/core/patches/patch-scripts_php_config_in
View File

@ -1,14 +1,14 @@
$OpenBSD: patch-scripts_php_config_in,v 1.1 2004/11/24 19:03:15 robert Exp $
--- scripts/php-config.in.orig Wed Nov 24 19:21:23 2004
+++ scripts/php-config.in Wed Nov 24 19:22:00 2004
$OpenBSD: patch-scripts_php_config_in,v 1.2 2005/04/04 21:11:42 robert Exp $
--- scripts/php-config.in.orig Wed Mar 16 07:37:03 2005
+++ scripts/php-config.in Sun Apr 3 21:49:32 2005
@@ -1,8 +1,8 @@
#! /bin/sh
-prefix="@prefix@"
+prefix="OPENBSD_PEAR_ROOT"
+prefix=OPENBSD_PEAR_ROOT
version="@PHP_VERSION@"
-includedir="@includedir@/php"
+includedir="@includedir@"
includes="-I$includedir -I$includedir/main -I$includedir/Zend"
includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend"
ldflags="@PHP_LDFLAGS@"
libs="@EXTRA_LIBS@"

147
www/php4/core/pkg/PLIST-pear
View File

@ -1,9 +1,13 @@
@comment $OpenBSD: PLIST-pear,v 1.13 2004/12/29 21:53:14 espie Exp $
@comment $OpenBSD: PLIST-pear,v 1.14 2005/04/04 21:11:42 robert Exp $
@conflict php5-pear-*
pear/
pear/build/
pear/build/Makefile.global
pear/build/acinclude.m4
pear/build/config.guess
pear/build/config.sub
pear/build/libtool.m4
pear/build/ltmain.sh
pear/build/mkdep.awk
pear/build/phpize.m4
pear/build/scan_makefile_in.awk
@ -16,17 +20,11 @@ pear/doc/
pear/doc/Archive_Tar/
pear/doc/Archive_Tar/docs/
pear/doc/Archive_Tar/docs/Archive_Tar.txt
pear/doc/DB/
pear/doc/DB/doc/
pear/doc/DB/doc/IDEAS
pear/doc/DB/doc/MAINTAINERS
pear/doc/DB/doc/STATUS
pear/doc/DB/doc/TESTERS
pear/doc/Net_SMTP/
pear/doc/Net_SMTP/docs/
pear/doc/Net_SMTP/docs/examples/
pear/doc/Net_SMTP/docs/examples/basic.php
pear/doc/Net_SMTP/docs/guide.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
@ -87,6 +85,7 @@ pear/include/ext/
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
@ -232,46 +231,22 @@ pear/lib/
pear/lib/.registry/
pear/lib/.registry/archive_tar.reg
pear/lib/.registry/console_getopt.reg
pear/lib/.registry/db.reg
pear/lib/.registry/http.reg
pear/lib/.registry/mail.reg
pear/lib/.registry/net_smtp.reg
pear/lib/.registry/net_socket.reg
pear/lib/.registry/html_template_it.reg
pear/lib/.registry/net_useragent_detect.reg
pear/lib/.registry/pear.reg
pear/lib/.registry/xml_parser.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/DB/
pear/lib/DB.php
pear/lib/DB/common.php
pear/lib/DB/dbase.php
pear/lib/DB/fbsql.php
pear/lib/DB/ibase.php
pear/lib/DB/ifx.php
pear/lib/DB/msql.php
pear/lib/DB/mssql.php
pear/lib/DB/mysql.php
pear/lib/DB/mysqli.php
pear/lib/DB/oci8.php
pear/lib/DB/odbc.php
pear/lib/DB/pgsql.php
pear/lib/DB/sqlite.php
pear/lib/DB/storage.php
pear/lib/DB/sybase.php
pear/lib/HTTP.php
pear/lib/Mail/
pear/lib/Mail.php
pear/lib/Mail/RFC822.php
pear/lib/Mail/mail.php
pear/lib/Mail/null.php
pear/lib/Mail/sendmail.php
pear/lib/Mail/smtp.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/SMTP.php
pear/lib/Net/Socket.php
pear/lib/Net/UserAgent/
pear/lib/Net/UserAgent/Detect.php
pear/lib/OS/
pear/lib/OS/Guess.php
pear/lib/PEAR/
@ -294,74 +269,40 @@ pear/lib/PEAR/Config.php
pear/lib/PEAR/Dependency.php
pear/lib/PEAR/Downloader.php
pear/lib/PEAR/ErrorStack.php
pear/lib/PEAR/Exception.php
pear/lib/PEAR/Frontend/
pear/lib/PEAR/Frontend/CLI.php
pear/lib/PEAR/Installer.php
pear/lib/PEAR/Packager.php
pear/lib/PEAR/Registry.php
pear/lib/PEAR/Remote.php
pear/lib/PEAR/RunTest.php
pear/lib/System.php
pear/lib/XML/
pear/lib/XML/Parser.php
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/tests/
pear/tests/DB/
pear/tests/DB/tests/
pear/tests/DB/tests/db_error.phpt
pear/tests/DB/tests/db_error2.phpt
pear/tests/DB/tests/db_factory.phpt
pear/tests/DB/tests/db_ismanip.phpt
pear/tests/DB/tests/db_parsedsn.phpt
pear/tests/DB/tests/driver/
pear/tests/DB/tests/driver/01connect.phpt
pear/tests/DB/tests/driver/02fetch.phpt
pear/tests/DB/tests/driver/03simplequery.phpt
pear/tests/DB/tests/driver/04numcols.phpt
pear/tests/DB/tests/driver/05sequences.phpt
pear/tests/DB/tests/driver/06prepexec.phpt
pear/tests/DB/tests/driver/08affectedrows.phpt
pear/tests/DB/tests/driver/09numrows.phpt
pear/tests/DB/tests/driver/10errormap.phpt
pear/tests/DB/tests/driver/11transactions.phpt
pear/tests/DB/tests/driver/13limit.phpt
pear/tests/DB/tests/driver/14fetchmode_object.phpt
pear/tests/DB/tests/driver/15quote.phpt
pear/tests/DB/tests/driver/16tableinfo.phpt
pear/tests/DB/tests/driver/17query.phpt
pear/tests/DB/tests/driver/18get.phpt
pear/tests/DB/tests/driver/bug22328.phpt
pear/tests/DB/tests/driver/connect.inc
pear/tests/DB/tests/driver/mktable.inc
pear/tests/DB/tests/driver/run.cvs
pear/tests/DB/tests/driver/setup.inc.cvs
pear/tests/DB/tests/driver/skipif.inc
pear/tests/DB/tests/errors.inc
pear/tests/DB/tests/fetchmode_object.inc
pear/tests/DB/tests/fetchmodes.inc
pear/tests/DB/tests/include.inc
pear/tests/DB/tests/limit.inc
pear/tests/DB/tests/numcols.inc
pear/tests/DB/tests/numrows.inc
pear/tests/DB/tests/prepexe.inc
pear/tests/DB/tests/run.cvs
pear/tests/DB/tests/sequences.inc
pear/tests/DB/tests/simplequery.inc
pear/tests/DB/tests/skipif.inc
pear/tests/DB/tests/transactions.inc
pear/tests/Net_SMTP/
pear/tests/Net_SMTP/tests/
pear/tests/Net_SMTP/tests/auth.phpt
pear/tests/Net_SMTP/tests/basic.phpt
pear/tests/Net_SMTP/tests/config.php.dist
pear/tests/XML_Parser/
pear/tests/XML_Parser/tests/
pear/tests/XML_Parser/tests/001.phpt
pear/tests/XML_Parser/tests/002.phpt
pear/tests/XML_Parser/tests/003.phpt
pear/tests/XML_Parser/tests/004.phpt
pear/tests/XML_Parser/tests/005.phpt
pear/tests/XML_Parser/tests/test2.xml
pear/tests/XML_Parser/tests/test3.xml
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

8
www/php4/distinfo
View File

@ -1,4 +1,4 @@
MD5 (php-4.3.10.tar.gz) = 73f5d1f42e34efa534a09c6091b5a21e
RMD160 (php-4.3.10.tar.gz) = 542a9777386b81f1716cedb126b51258160f44fb
SHA1 (php-4.3.10.tar.gz) = 9b519cd23d5180a4bf62302cdca50fffba3506ee
SIZE (php-4.3.10.tar.gz) = 4892209
MD5 (php-4.3.11.tar.gz) = 5de2ba1aababb5868d55ea43cf3bebef
RMD160 (php-4.3.11.tar.gz) = c52b17e1645b5eeccacde1cb9af6ba88f5139fa8
SHA1 (php-4.3.11.tar.gz) = 0974c78de325404b36ff113729fe7b9244f82210
SIZE (php-4.3.11.tar.gz) = 4875262

4
www/php4/extensions/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.41 2005/03/16 21:55:54 naddy Exp $
# $OpenBSD: Makefile,v 1.42 2005/04/04 21:11:42 robert Exp $
FULLPKGNAME= php4-extensions-${V}
COMMENT= "informational package about PHP4 extensions"
@ -308,7 +308,7 @@ XSLT_WANTLIB= iconv
.for i in ${MULTI_PACKAGES}
.if !defined(FULLPKGNAME${i})
FULLPKGNAME${i}= php4${i}-${V}p1
FULLPKGNAME${i}= php4${i}-${V}
.endif
.endfor

16
www/php4/extensions/patches/patch-ext_imap_config_m4
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-ext_imap_config_m4,v 1.9 2004/04/06 07:28:31 brad Exp $
--- ext/imap/config.m4.orig 2004-01-16 19:01:06.000000000 -0500
+++ ext/imap/config.m4 2004-04-06 03:11:44.000000000 -0400
@@ -85,10 +85,9 @@ AC_DEFUN(PHP_IMAP_KRB_CHK, [
fi
AC_DEFINE(HAVE_IMAP_KRB,1,[ ])
PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/lib, IMAP_SHARED_LIBADD)
- PHP_ADD_LIBRARY(gssapi_krb5, 1, IMAP_SHARED_LIBADD)
PHP_ADD_LIBRARY(krb5, 1, IMAP_SHARED_LIBADD)
- PHP_ADD_LIBRARY(k5crypto, 1, IMAP_SHARED_LIBADD)
- PHP_ADD_LIBRARY(com_err, 1, IMAP_SHARED_LIBADD)
+ PHP_ADD_LIBRARY(crypto, 1, IMAP_SHARED_LIBADD)
+ PHP_ADD_LIBRARY(gssapi, 1, IMAP_SHARED_LIBADD)
PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include)
else
AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [

21
www/php4/extensions/patches/patch-ext_snmp_snmp_c
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-ext_snmp_snmp_c,v 1.1 2004/10/13 01:46:02 danh Exp $
--- ext/snmp/snmp.c.orig Tue Feb 3 09:44:17 2004
+++ ext/snmp/snmp.c Tue Oct 12 14:18:10 2004
@@ -801,7 +801,7 @@ static int netsnmp_session_gen_auth_key(
s->securityAuthKeyLen = USM_AUTH_KU_LEN;
if (s->securityAuthProto == NULL) {
/* get .conf set default */
- oid *def = get_default_authtype(&(s->securityAuthProtoLen));
+ const oid *def = get_default_authtype(&(s->securityAuthProtoLen));
s->securityAuthProto = snmp_duplicate_objid(def, s->securityAuthProtoLen);
}
if (s->securityAuthProto == NULL) {
@@ -830,7 +830,7 @@ static int netsnmp_session_gen_sec_key(s
s->securityPrivKeyLen = USM_PRIV_KU_LEN;
if (s->securityPrivProto == NULL) {
/* get .conf set default */
- oid *def = get_default_privtype(&(s->securityPrivProtoLen));
+ const oid *def = get_default_privtype(&(s->securityPrivProtoLen));
s->securityPrivProto = snmp_duplicate_objid(def, s->securityPrivProtoLen);
}
if (s->securityPrivProto == NULL) {

23
www/php4/patches/patch-aclocal_m4
View File

@ -1,7 +1,20 @@
$OpenBSD: patch-aclocal_m4,v 1.6 2004/02/29 00:08:08 avsm Exp $
--- aclocal.m4.orig 2004-02-16 15:30:25.000000000 +0000
+++ aclocal.m4 2004-02-28 17:54:33.000000000 +0000
@@ -1659,6 +1659,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
$OpenBSD: patch-aclocal_m4,v 1.7 2005/04/04 21:11:42 robert Exp $
--- aclocal.m4.orig Wed Mar 30 16:35:19 2005
+++ aclocal.m4 Sun Apr 3 22:21:42 2005
@@ -1660,10 +1660,9 @@
if test "$PHP_KERBEROS_DIR"; then
found_kerberos=yes
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)
- PHP_ADD_LIBRARY(com_err, 1, $1)
+ PHP_ADD_LIBRARY(crypto, 1, $1)
+ PHP_ADD_LIBRARY(gssapi, 1, $1)
PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include)
fi
fi
@@ -1757,6 +1756,7 @@
PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [
PHP_ADD_LIBRARY(crypto,,$1)
@ -9,7 +22,7 @@ $OpenBSD: patch-aclocal_m4,v 1.6 2004/02/29 00:08:08 avsm Exp $
],[
AC_MSG_ERROR([libcrypto not found!])
],[
@@ -4074,7 +4075,7 @@ openbsd*)
@@ -4231,7 +4231,7 @@
shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'

28
www/php4/patches/patch-configure_in
View File

@ -1,18 +1,19 @@
$OpenBSD: patch-configure_in,v 1.11 2004/06/06 18:09:22 avsm Exp $
--- configure.in.orig 2004-06-02 14:25:44.000000000 +0100
+++ configure.in 2004-06-06 19:11:28.000000000 +0100
@@ -31,9 +31,7 @@ AC_PREREQ(2.13)
$OpenBSD: patch-configure_in,v 1.12 2005/04/04 21:11:42 robert Exp $
--- configure.in.orig Wed Mar 30 16:18:36 2005
+++ configure.in Sun Apr 3 21:47:19 2005
@@ -30,10 +30,7 @@
AC_PREREQ(2.13)
AC_INIT(README.CVS-RULES)
PHP_CONFIG_NICE(config.nice)
-PHP_CONFIG_NICE(config.nice)
-for arg in $0 "$@"; do
- CONFIGURE_COMMAND="$CONFIGURE_COMMAND '$arg'"
-done
+CONFIGURE_COMMAND="Built via the OpenBSD Ports Tree"
AC_CANONICAL_HOST
PHP_CANONICAL_HOST
AC_CONFIG_HEADER(main/php_config.h)
@@ -813,14 +811,14 @@ unset with_pic
@@ -838,7 +835,7 @@
case $php_build_target in
program|static)
@ -21,15 +22,18 @@ $OpenBSD: patch-configure_in,v 1.11 2004/06/06 18:09:22 avsm Exp $
if test -z "$PHP_MODULES"; then
enable_shared=no
fi
;;
@@ -846,8 +843,8 @@
shared)
enable_static=no
- standard_libtool_flag=-prefer-pic
+ standard_libtool_flag=
case $with_pic in
- yes) standard_libtool_flag='-prefer-pic';;
- no) standard_libtool_flag='-prefer-non-pic';;
+ yes) standard_libtool_flag='';;
+ no) standard_libtool_flag='';;
esac
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
;;
esac
@@ -1002,7 +1000,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd
@@ -1032,7 +1029,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"`