diff options
author | Edwin Groothuis <edwin@FreeBSD.org> | 2003-09-24 08:49:20 +0000 |
---|---|---|
committer | Edwin Groothuis <edwin@FreeBSD.org> | 2003-09-24 08:49:20 +0000 |
commit | 2d4fcfa2232f789d196d2d15560864e56c352087 (patch) | |
tree | 7af075fe2cc9e9fbd1a9d6e0bcf7a5b2a28faf9d /lang/php5 | |
parent | Add p5-Email-LocalDelivery-Ezmlm 0.10, (diff) |
[Maintainer Update] Port: lang/php5
Update to 5.0.0a2-alexdupre snapshot (and fix 5.0.0a1 memory leak).
Add DB4 extension.
Correctly use USE_MYSQL/USE_OPENSSL/USE_OPENLDAP.
PR: ports/56979
Submitted by: Alex Dupre <sysadmin@alexdupre.com>
Notes
Notes:
svn path=/head/; revision=89154
Diffstat (limited to 'lang/php5')
-rw-r--r-- | lang/php5/Makefile | 52 | ||||
-rw-r--r-- | lang/php5/distinfo | 2 | ||||
-rw-r--r-- | lang/php5/files/patch-configure | 2 | ||||
-rw-r--r-- | lang/php5/files/patch-ext::standard::datetime.c | 17 | ||||
-rw-r--r-- | lang/php5/pkg-plist | 23 | ||||
-rw-r--r-- | lang/php5/scripts/configure.php | 3 | ||||
-rw-r--r-- | lang/php5/scripts/php5_options | 1 |
7 files changed, 48 insertions, 52 deletions
diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 8ccb6bf784ff..0213c36b4652 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -20,8 +20,7 @@ # PORTNAME= php5 -PORTVERSION= 5.0.0.a1 -PORTREVISION= 2 +PORTVERSION= 5.0.0.a2 CATEGORIES?= lang devel www MASTER_SITES= http://www.php.net/distributions/ \ http://it.php.net/distributions/ \ @@ -123,13 +122,13 @@ PLIST_SUB+= CLI="" SAPI_FILE= "bin/php" .endif -ALL_OPTIONS= BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DBASE DBX DOM EXIF \ - FILEPRO FTP GD GDBM GETTEXT GMP ICONV IMAP INTERBASE INIFILE \ - MBSTRING MCAL MCVE MCRYPT MHASH MIME MING MYSQL NCURSES \ - OPENLDAP OPENSSL ORACLE PCNTL PCRE PDFLIB POSIX POSTGRESQL \ - PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP SOCKETS \ - SQLITE SYBASEDB SYBASECT SYSVSEM SYSVSHM TOKENIZER UNIXODBC \ - WDDX XML XMLRPC XSL YAZ YP ZLIB +ALL_OPTIONS= BCMATH BZIP2 CALENDAR CDB CRACK CTYPE CURL DB4 DBASE DBX DOM \ + EXIF FILEPRO FTP GD GDBM GETTEXT GMP ICONV IMAP INTERBASE \ + INIFILE MBSTRING MCAL MCVE MCRYPT MHASH MIME MING MYSQL \ + NCURSES OPENLDAP OPENSSL ORACLE PCNTL PCRE PDFLIB POSIX \ + POSTGRESQL PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP \ + SOCKETS SQLITE SYBASEDB SYBASECT SYSVSEM SYSVSHM TOKENIZER \ + UNIXODBC WDDX XML XMLRPC XSL YAZ YP ZLIB .for opt in ${ALL_OPTIONS} .if defined(WITH_${opt}) || defined(WITHOUT_${opt}) @@ -206,7 +205,7 @@ WITH_XML= yes .include "${WRKDIR}/Makefile.inc" .endif -.if defined(WITH_CDB) || defined(WITH_GDBM) || defined(WITH_INIFILE) +.if defined(WITH_CDB) || defined(WITH_DB4) || defined(WITH_GDBM) || defined(WITH_INIFILE) WITH_DBA= yes .endif @@ -218,7 +217,7 @@ WITH_DOM= yes WITH_ICONV_DEP= yes .endif -.if defined(WITH_SNMP) +.if defined(WITH_MCVE) || defined(WITH_SNMP) WITH_OPENSSL_DEP= yes .endif @@ -267,6 +266,11 @@ LIB_DEPENDS+= curl.2:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+=--with-curl=${LOCALBASE} .endif +.if defined(WITH_DB4) +LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 +CONFIGURE_ARGS+=--with-db4=${LOCALBASE} +.endif + .if defined(WITH_DBA) CONFIGURE_ARGS+=--enable-dba .endif @@ -398,15 +402,7 @@ CONFIGURE_ARGS+=--with-ming=${LOCALBASE} .endif .if defined(WITH_MYSQL) -.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.10) -LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -.else -.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.14) -LIB_DEPENDS+= mysqlclient.14:${PORTSDIR}/databases/mysql41-client -.else -LIB_DEPENDS+= mysqlclient.12:${PORTSDIR}/databases/mysql40-client -.endif -.endif +USE_MYSQL= yes CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} .endif @@ -421,21 +417,13 @@ CONFIGURE_ARGS+=--with-ncurses=${NCURSESBASE} .endif .if defined(WITH_OPENLDAP) -.if exists(${LOCALBASE}/lib/libldap.so.1) -LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap12 -.else -LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21-client -.endif +USE_OPENLDAP= yes CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} .endif .if defined(WITH_OPENSSL) || defined(WITH_OPENSSL_DEP) -.if exists(${LOCALBASE}/lib/libcrypto.so.3) -OPENSSLBASE= ${LOCALBASE} -LIB_DEPENDS+= crypto.3:${PORTSDIR}/security/openssl -.else -OPENSSLBASE= /usr -.endif +USE_OPENSSL= yes +CONFIGURE_ARGS+=--with-openssl-dir=${OPENSSLBASE} .endif .if defined(WITH_OPENSSL) @@ -502,7 +490,7 @@ LIB_DEPENDS+= snmp.4:${PORTSDIR}/net/net-snmp4 .else LIB_DEPENDS+= netsnmp.5:${PORTSDIR}/net/net-snmp .endif -CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} --with-openssl-dir=${OPENSSLBASE} --enable-ucd-snmp-hack +CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} --enable-ucd-snmp-hack .endif .if defined(WITH_SOCKETS) diff --git a/lang/php5/distinfo b/lang/php5/distinfo index afd0d2a78e2c..ca5170a04ba2 100644 --- a/lang/php5/distinfo +++ b/lang/php5/distinfo @@ -1 +1 @@ -MD5 (php-5.0.0a1.tar.bz2) = 470fbfdc2ba77a00e0d2e0bacf645103 +MD5 (php-5.0.0a2.tar.bz2) = d6bba61fad4be66fb0a79791fee5cff4 diff --git a/lang/php5/files/patch-configure b/lang/php5/files/patch-configure index 10b9fafe78b9..2a27455af5db 100644 --- a/lang/php5/files/patch-configure +++ b/lang/php5/files/patch-configure @@ -228,7 +228,7 @@ @@ -57066,8 +57240,8 @@ echo $ac_n "checking Oracle version""... $ac_c" 1>&6 - echo "configure:57069: checking Oracle version" >&5 + echo "configure:58744: checking Oracle version" >&5 - if test -s "$ORACLE_DIR/orainst/unix.rgs"; then - ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/ */:/g' | cut -d: -f 6 | cut -c 2-4` + if test -s "$ORACLE_DIR/ocommon/install/partial.prd"; then diff --git a/lang/php5/files/patch-ext::standard::datetime.c b/lang/php5/files/patch-ext::standard::datetime.c new file mode 100644 index 000000000000..24dc2963df17 --- /dev/null +++ b/lang/php5/files/patch-ext::standard::datetime.c @@ -0,0 +1,17 @@ +--- ext/standard/datetime.c.orig Tue Aug 26 11:06:04 2003 ++++ ext/standard/datetime.c Tue Aug 26 11:07:27 2003 +@@ -116,7 +116,13 @@ + /* Let DST be unknown. mktime() should compute the right value + ** and behave correctly. Unless the user overrides this. + */ +- ta->tm_isdst = -1; ++ if (gm) { ++ ta->tm_isdst = 0; ++ is_dst = 0; ++ } else { ++ ta->tm_isdst = -1; ++ is_dst = -1; ++ } + + /* + ** Now change date values with supplied parameters. diff --git a/lang/php5/pkg-plist b/lang/php5/pkg-plist index 2abeea06a301..c995849b2e32 100644 --- a/lang/php5/pkg-plist +++ b/lang/php5/pkg-plist @@ -31,7 +31,6 @@ include/php/Zend/zend_default_classes.h include/php/Zend/zend_dynamic_array.h include/php/Zend/zend_errors.h include/php/Zend/zend_execute.h -include/php/Zend/zend_execute_locks.h include/php/Zend/zend_extensions.h include/php/Zend/zend_fast_cache.h include/php/Zend/zend_globals.h @@ -49,6 +48,7 @@ include/php/Zend/zend_list.h include/php/Zend/zend_llist.h include/php/Zend/zend_mm.h include/php/Zend/zend_modules.h +include/php/Zend/zend_multibyte.h include/php/Zend/zend_multiply.h include/php/Zend/zend_object_handlers.h include/php/Zend/zend_objects.h @@ -64,30 +64,16 @@ include/php/Zend/zend_ts_hash.h include/php/Zend/zend_types.h include/php/Zend/zend_variables.h include/php/acconfig.h -include/php/ext/mbstring/cp932_table.h include/php/ext/mbstring/mb_gpc.h -include/php/ext/mbstring/mbfilter.h -include/php/ext/mbstring/mbfilter_cn.h -include/php/ext/mbstring/mbfilter_ja.h -include/php/ext/mbstring/mbfilter_kr.h -include/php/ext/mbstring/mbfilter_ru.h -include/php/ext/mbstring/mbfilter_tw.h -include/php/ext/mbstring/mbregex.h include/php/ext/mbstring/mbstring.h include/php/ext/mbstring/php_mbregex.h include/php/ext/mbstring/php_unicode.h include/php/ext/mbstring/unicode_data.h -include/php/ext/mbstring/unicode_table.h -include/php/ext/mbstring/unicode_table_cn.h -include/php/ext/mbstring/unicode_table_ja.h -include/php/ext/mbstring/unicode_table_kr.h -include/php/ext/mbstring/unicode_table_ru.h -include/php/ext/mbstring/unicode_table_tw.h -include/php/ext/pgsql/php_pgsql.h include/php/ext/session/mod_files.h include/php/ext/session/mod_mm.h include/php/ext/session/mod_user.h include/php/ext/session/php_session.h +include/php/ext/sqlite/libsqlite/src/sqlite.h include/php/ext/standard/base64.h include/php/ext/standard/basic_functions.h include/php/ext/standard/crc32.h @@ -120,6 +106,7 @@ include/php/ext/standard/php_ext_syslog.h include/php/ext/standard/php_filestat.h include/php/ext/standard/php_fopen_wrappers.h include/php/ext/standard/php_ftok.h +include/php/ext/standard/php_http.h include/php/ext/standard/php_image.h include/php/ext/standard/php_incomplete_class.h include/php/ext/standard/php_iptc.h @@ -237,8 +224,10 @@ lib/php/build/shtool @dirrm include/php/TSRM @dirrm include/php/Zend @dirrm include/php/ext/mbstring -@dirrm include/php/ext/pgsql @dirrm include/php/ext/session +@dirrm include/php/ext/sqlite/libsqlite/src +@dirrm include/php/ext/sqlite/libsqlite +@dirrm include/php/ext/sqlite @dirrm include/php/ext/standard @dirrm include/php/ext/xml/expat @dirrm include/php/ext/xml diff --git a/lang/php5/scripts/configure.php b/lang/php5/scripts/configure.php index 6263f5e3e1a1..a71c2c46392f 100644 --- a/lang/php5/scripts/configure.php +++ b/lang/php5/scripts/configure.php @@ -25,6 +25,7 @@ CDB "cdb database support (dba)" ${WITH_CDB:-OFF} \ CRACK "crack support" ${WITH_CRACK:-OFF} \ CTYPE "ctype functions" ${WITH_CTYPE:-OFF} \ CURL "CURL support" ${WITH_CURL:-OFF} \ +DB4 "Berkeley DB4 support" ${WITH_DB4:-OFF} \ DBASE "dBase library support" ${WITH_DBASE:-OFF} \ DBX "dbx support" ${WITH_DBX:-OFF} \ DOM "DOM support" ${WITH_DOM:-OFF} \ @@ -41,7 +42,7 @@ INIFILE "INI file support (dba)" ${WITH_INIFILE:-OFF} \ INTERBASE "Interbase 6 database support (Firebird)" ${WITH_INTERBASE:-OFF} \ MBSTRING "multibyte string support" ${WITH_MBSTRING:-OFF} \ MCAL "Modular Calendar Access Library support" ${WITH_MCAL:-OFF} \ -MCVE "MCVE support" ${WITH_MCVE:-OFF} \ +MCVE "MCVE support (implies OPENSSL)" ${WITH_MCVE:-OFF} \ MCRYPT "Encryption support" ${WITH_MCRYPT:-OFF} \ MHASH "Crypto-hashing support" ${WITH_MHASH:-OFF} \ MIME "mime_magic support" ${WITH_MIME:-OFF} \ diff --git a/lang/php5/scripts/php5_options b/lang/php5/scripts/php5_options index 30545182cc24..fdcc40d3a137 100644 --- a/lang/php5/scripts/php5_options +++ b/lang/php5/scripts/php5_options @@ -5,6 +5,7 @@ WITH_CDB=OFF WITH_CRACK=OFF WITH_CTYPE=ON WITH_CURL=OFF +WITH_DB4=OFF WITH_DBASE=OFF WITH_DBX=OFF WITH_DOM=ON |