diff options
45 files changed, 249 insertions, 973 deletions
diff --git a/Mk/bsd.php.mk b/Mk/bsd.php.mk index 6188e12ca4a8..dcba081fc71f 100644 --- a/Mk/bsd.php.mk +++ b/Mk/bsd.php.mk @@ -27,7 +27,6 @@ # WANT_PHP_MOD=yes - Want the Apache Module for PHP. # WANT_PHP_SCR=yes - Want the CLI or the CGI version of PHP. # WANT_PHP_WEB=yes - Want the Apache Module or the CGI version of PHP. -# WANT_PHP_PEAR=yes - Want the PEAR framework. # # You may combine multiple WANT_PHP_* knobs. # Don't specify any WANT_PHP_* knob if your port will work with every PHP SAPI. @@ -37,33 +36,39 @@ PHP_Include_MAINTAINER= ale@FreeBSD.org .if exists(${LOCALBASE}/etc/php.conf) .include "${LOCALBASE}/etc/php.conf" -.endif - +PHP_EXT_DIR!= ${LOCALBASE}/bin/php-config --extension-dir | ${SED} -ne 's,^${LOCALBASE}/lib/php/\(.*\),\1,p' +.else DEFAULT_PHP_VER?= 4 PHP_VER?= ${DEFAULT_PHP_VER} -.if !defined(PHP_EXT_DIR) .if ${PHP_VER} == 4 PHP_EXT_DIR= 20020429 .else -PHP_EXT_DIR= 20041030 +PHP_EXT_DIR= 20050922 .endif -.if exists(${LOCALBASE}/include/apache2/httpd.h) + +HTTPD?= ${LOCALBASE}/sbin/httpd +.if exists(${HTTPD}) +APACHE_VERSION!= ${HTTPD} -V | ${SED} -ne 's/^Server version: Apache\/\([0-9]\)\.\([0-9]*\).*/\1\2/p' +. if ${APACHE_VERSION} > 13 APXS?= ${LOCALBASE}/sbin/apxs APACHE_MPM!= ${APXS} -q MPM_NAME -.if ${APACHE_MPM} == "worker" +. if ${APACHE_MPM} == "worker" PHP_EXT_DIR:= ${PHP_EXT_DIR}-zts -.endif -.else -.if defined(WITH_APACHE2) && defined(WITH_MPM) && ${WITH_MPM} == "worker" +. endif +. endif +.elif defined(APACHE_PORT) +APACHE_VERSION!= ${ECHO_CMD} ${APACHE_PORT} | ${SED} -ne 's,.*/apache\([0-9]*\).*,\1,p' +. if ${APACHE_VERSION} > 13 && defined(WITH_MPM) && ${WITH_MPM} == "worker" PHP_EXT_DIR:= ${PHP_EXT_DIR}-zts +. endif .endif -.endif + .if defined(WITH_DEBUG) PHP_EXT_DIR:= ${PHP_EXT_DIR}-debug .endif -.endif PHP_SAPI?= "" +.endif PHP_EXT_INC?= "" .if defined(BROKEN_WITH_PHP) @@ -152,13 +157,6 @@ check-makevars:: PHP_PORT?= ${PORTSDIR}/lang/php${PHP_VER} -.if defined(WANT_PHP_PEAR) -. if defined(USE_PHP_BUILD) -BUILD_DEPENDS+= pear:${PORTSDIR}/devel/php${PHP_VER}-pear -. endif -RUN_DEPENDS+= pear:${PORTSDIR}/devel/php${PHP_VER}-pear -.endif - .if defined(USE_PHP_BUILD) BUILD_DEPENDS+= ${LOCALBASE}/include/php/main/php.h:${PHP_PORT} .endif @@ -252,17 +250,19 @@ php-ini: # Extensions .if ${USE_PHP:L} != "yes" # non-version specific components -_USE_PHP_ALL= bcmath bz2 calendar ctype curl dba dbase dbx dio \ +_USE_PHP_ALL= bcmath bz2 calendar ctype curl dba dbase \ exif fileinfo filepro fribidi ftp gd gettext gmp \ - iconv imagick imap interbase ldap mbstring mcrypt mcve \ - mhash ming mnogosearch mssql mysql ncurses odbc \ - openssl oracle panda pcntl pcre pdf pgsql posix \ + iconv imagick imap interbase ldap mbstring mcrypt \ + mhash ming mssql mysql ncurses odbc \ + openssl panda pcntl pcre pdf pgsql posix \ pspell radius readline recode session shmop snmp \ sockets sybase_ct sysvmsg sysvsem sysvshm \ - tokenizer wddx xml xmlrpc yaz yp zip zlib + tokenizer wddx xml xmlrpc yaz zip zlib # version specific components -_USE_PHP_VER4= ${_USE_PHP_ALL} crack domxml mcal overload xslt -_USE_PHP_VER5= ${_USE_PHP_ALL} dom mysqli simplexml soap sqlite tidy xsl +_USE_PHP_VER4= ${_USE_PHP_ALL} crack dbx dio domxml mcal mcve \ + mnogosearch oracle overload xslt yp +_USE_PHP_VER5= ${_USE_PHP_ALL} dom mysqli simplexml soap sqlite \ + tidy xmlreader xsl bcmath_DEPENDS= math/php${PHP_VER}-bcmath bz2_DEPENDS= archivers/php${PHP_VER}-bz2 @@ -329,6 +329,7 @@ tidy_DEPENDS= www/php${PHP_VER}-tidy tokenizer_DEPENDS= devel/php${PHP_VER}-tokenizer wddx_DEPENDS= textproc/php${PHP_VER}-wddx xml_DEPENDS= textproc/php${PHP_VER}-xml +xmlreader_DEPENDS= textproc/php${PHP_VER}-xmlreader xmlrpc_DEPENDS= net/php${PHP_VER}-xmlrpc xsl_DEPENDS= textproc/php${PHP_VER}-xsl xslt_DEPENDS= textproc/php${PHP_VER}-xslt diff --git a/databases/Makefile b/databases/Makefile index 3f3b5e39bddc..96cc45f3ee9d 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -284,14 +284,12 @@ SUBDIR += php4-sybase_ct SUBDIR += php5-dba SUBDIR += php5-dbase - SUBDIR += php5-dbx SUBDIR += php5-filepro SUBDIR += php5-interbase SUBDIR += php5-mssql SUBDIR += php5-mysql SUBDIR += php5-mysqli SUBDIR += php5-odbc - SUBDIR += php5-oracle SUBDIR += php5-pgsql SUBDIR += php5-sqlite SUBDIR += php5-sybase_ct diff --git a/databases/php5-dbx/Makefile b/databases/php5-dbx/Makefile deleted file mode 100644 index 45e0bdd4cb14..000000000000 --- a/databases/php5-dbx/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# New ports collection makefile for: php5-dbx -# Date created: 7 Jul 2004 -# Whom: Alex Dupre <ale@FreeBSD.org> -# -# $FreeBSD$ -# - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php5 - -PKGNAMESUFFIX= -dbx - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php5-oracle/Makefile b/databases/php5-oracle/Makefile deleted file mode 100644 index 954d83b573da..000000000000 --- a/databases/php5-oracle/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# New ports collection makefile for: php5-oracle -# Date created: 7 Jul 2004 -# Whom: Alex Dupre <ale@FreeBSD.org> -# -# $FreeBSD$ -# - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php5 - -PKGNAMESUFFIX= -oracle - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php5-oracle/files/patch-config.m4 b/databases/php5-oracle/files/patch-config.m4 deleted file mode 100644 index 9f1d12d59af8..000000000000 --- a/databases/php5-oracle/files/patch-config.m4 +++ /dev/null @@ -1,40 +0,0 @@ ---- config.m4.orig Tue Jun 14 15:48:05 2005 -+++ config.m4 Tue Jun 14 15:48:08 2005 -@@ -4,8 +4,8 @@ - - AC_DEFUN([AC_ORACLE_VERSION],[ - AC_MSG_CHECKING([Oracle version]) -- 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 -+ ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/ocommon/install/partial.prd | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4` - test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3 - elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then - ORACLE_VERSION=9.0 -@@ -112,25 +112,7 @@ - if test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME; then - PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) - else -- PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(core3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(c3v6, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(nlsrtl3, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(epc, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(generic, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(common, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(ncr, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(generic, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(common, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(ncr, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(sqlnet, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) -- PHP_ADD_LIBRARY_WITH_PATH(client, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(oracle, ., ORACLE_SHARED_LIBADD) - fi - ;; - diff --git a/databases/php5-sqlite/files/patch-config.m4 b/databases/php5-sqlite/files/patch-config.m4 new file mode 100644 index 000000000000..5e421eda24ae --- /dev/null +++ b/databases/php5-sqlite/files/patch-config.m4 @@ -0,0 +1,47 @@ +--- config.m4.orig Tue Jun 14 03:44:16 2005 ++++ config.m4 Thu Dec 8 14:15:18 2005 +@@ -48,14 +48,6 @@ + + + if test "$PHP_SQLITE" != "no"; then +- if test "$PHP_PDO" != "no"; then +- PHP_CHECK_PDO_INCLUDES([], [AC_MSG_WARN([Cannot find php_pdo_driver.h.])]) +- if test -n "$pdo_inc_path"; then +- AC_DEFINE([PHP_SQLITE2_HAVE_PDO], [1], [Have PDO]) +- pdo_inc_path="-I$pdo_inc_path" +- fi +- fi +- + if test "$PHP_SQLITE" != "yes"; then + SEARCH_PATH="/usr/local /usr" + SEARCH_FOR="/include/sqlite.h" +@@ -85,13 +77,12 @@ + -L$SQLITE_DIR/$PHP_LIBDIR -lm + ]) + SQLITE_MODULE_TYPE=external +- PHP_SQLITE_CFLAGS=$pdo_inc_path + sqlite_extra_sources="libsqlite/src/encode.c" + else + # use bundled library + PHP_PROG_LEMON + SQLITE_MODULE_TYPE=builtin +- PHP_SQLITE_CFLAGS="-I@ext_builddir@/libsqlite/src $pdo_inc_path" ++ PHP_SQLITE_CFLAGS="-I@ext_builddir@/libsqlite/src" + sqlite_extra_sources="libsqlite/src/opcodes.c \ + libsqlite/src/parse.c libsqlite/src/encode.c \ + libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \ +@@ -107,13 +98,12 @@ + libsqlite/src/where.c libsqlite/src/trigger.c" + + PHP_ADD_EXTENSION_DEP(sqlite, spl) +- PHP_ADD_EXTENSION_DEP(sqlite, pdo) + fi + + dnl + dnl Common for both bundled/external + dnl +- sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources" ++ sqlite_sources="sqlite.c sess_sqlite.c $sqlite_extra_sources" + PHP_NEW_EXTENSION(sqlite, $sqlite_sources, $ext_shared,,$PHP_SQLITE_CFLAGS) + PHP_ADD_MAKEFILE_FRAGMENT + PHP_SUBST(SQLITE_SHARED_LIBADD) diff --git a/devel/Makefile b/devel/Makefile index 69bfe5c354cf..5df3772fa694 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1309,9 +1309,7 @@ SUBDIR += php4-sysvsem SUBDIR += php4-sysvshm SUBDIR += php4-tokenizer - SUBDIR += php5-dio SUBDIR += php5-gettext - SUBDIR += php5-mcve SUBDIR += php5-ncurses SUBDIR += php5-pcntl SUBDIR += php5-pcre diff --git a/devel/php5-dio/Makefile b/devel/php5-dio/Makefile deleted file mode 100644 index 1cd80721b77e..000000000000 --- a/devel/php5-dio/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# New ports collection makefile for: php5-dio -# Date created: 7 Jul 2004 -# Whom: Alex Dupre <ale@FreeBSD.org> -# -# $FreeBSD$ -# - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php5 - -PKGNAMESUFFIX= -dio - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php5-mcve/Makefile b/devel/php5-mcve/Makefile deleted file mode 100644 index 64368041bf87..000000000000 --- a/devel/php5-mcve/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# New ports collection makefile for: php5-mcve -# Date created: 7 Jul 2004 -# Whom: Alex Dupre <ale@FreeBSD.org> -# -# $FreeBSD$ -# - -CATEGORIES= devel - -MASTERDIR= ${.CURDIR}/../../lang/php5 - -PKGNAMESUFFIX= -mcve - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/php5-gd/files/patch-config.m4 b/graphics/php5-gd/files/patch-config.m4 index 3a4e549c1e45..03b69a1c248a 100644 --- a/graphics/php5-gd/files/patch-config.m4 +++ b/graphics/php5-gd/files/patch-config.m4 @@ -1,11 +1,11 @@ ---- config.m4.orig Thu Dec 25 23:33:02 2003 -+++ config.m4 Wed Jul 7 14:37:18 2004 -@@ -219,7 +219,7 @@ +--- config.m4.orig Mon May 30 01:16:41 2005 ++++ config.m4 Wed Dec 7 11:01:13 2005 +@@ -220,7 +220,7 @@ ],[ AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) ],[ -- -L$GD_T1_DIR/lib -+ -L$GD_T1_DIR/lib -lm +- -L$GD_T1_DIR/$PHP_LIBDIR ++ -L$GD_T1_DIR/$PHP_LIBDIR -lm ]) fi ]) diff --git a/lang/php5/Makefile b/lang/php5/Makefile index 77c8c1e5e793..d192cdc78474 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -6,8 +6,8 @@ # PORTNAME= php5 -PORTVERSION= 5.0.5 -PORTREVISION?= 2 +PORTVERSION= 5.1.1 +PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \ http://downloads.php.net/ilia/:rc \ @@ -24,7 +24,6 @@ LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} USE_BZIP2= yes .if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX} == "-cgi" || ${PKGNAMESUFFIX} == "-cli" GNU_CONFIGURE= yes -USE_BISON= yes USE_REINPLACE= yes CONFIGURE_ARGS= --enable-versioning \ @@ -64,7 +63,9 @@ WITH_APACHE= yes .if defined(WITH_APACHE) PKGMESSAGE= ${PKGDIR}/pkg-message.mod -APACHE_COMPAT= yes +USE_APACHE= 1.3+ +MODULENAME= lib${PORTNAME} +SHORTMODNAME= ${PORTNAME} .endif .if ${PHP_SAPI} == "cgi" @@ -73,19 +74,10 @@ OPTIONS= REDIRECT "Enable force-cgi-redirect support" off \ FASTCGI "Enable fastcgi support" off \ PATHINFO "Enable path-info-check support" on .endif -.if defined(WITH_APACHE) -.if defined(WITH_APACHE2) -OPTIONS= APACHE2 "Use apache 2.x instead of apache 1.3.x" on -.else -OPTIONS= APACHE2 "Use apache 2.x instead of apache 1.3.x" off -.endif -.endif OPTIONS+= DEBUG "Enable debug" off \ MULTIBYTE "Enable zend multibyte support" off \ IPV6 "Enable ipv6 support" on -EXT_DIR= 20041030 - CONFLICTS?= php5-cli-5* mod_php5-5* php5-cgi-5* CONFLICTS+= php4-4* php4-cli-4* mod_php4-4* php4-cgi-4* @@ -94,11 +86,13 @@ CONFIGURE_ARGS+=--disable-cli .endif MAN1= php-config.1 phpize.1 -.if ${PHP_SAPI} == "full" || ${PHP_SAPI} == "cli" -PLIST_SUB+= CLI="" +.if ${PHP_SAPI} != "mod" +PLIST_SUB+= CLICGI="" +.if ${PHP_SAPI} != "cgi" MAN1+= php.1 +.endif .else -PLIST_SUB+= CLI="@comment " +PLIST_SUB+= CLICGI="@comment " .endif .if defined(WITH_APACHE) @@ -109,11 +103,6 @@ PLIST_SUB+= APACHE="@comment " .if ${PHP_SAPI} == "cli" CONFIGURE_ARGS+=--disable-cgi -SAPI_FILE= "@comment " -.endif - -.if ${PHP_SAPI} == "cgi" -SAPI_FILE= bin/php .endif .include <bsd.port.pre.mk> @@ -122,38 +111,21 @@ CONFIGURE_ENV= ac_cv_pthreads_lib=${PTHREAD_LIBS} \ ac_cv_pthreads_cflags=${PTHREAD_CFLAGS} .if defined(WITH_APACHE) -.if exists(${LOCALBASE}/include/apache2/httpd.h) -WITH_APACHE2= yes -APACHE_MPM!= ${APXS} -q MPM_NAME -.endif -.if defined(WITH_APACHE2) -APACHE_MPM?= ${WITH_MPM} -APACHE_PORT= www/apache20 +.if ${APACHE_VERSION} > 13 CONFIGURE_ARGS+=--with-apxs2=${APXS} -SAPI_FILE= libexec/apache2/libphp5.so -.if ${APACHE_MPM} == "worker" -EXT_DIR:= ${EXT_DIR}-zts -.endif .else -APACHE_PORT?= www/apache13 CONFIGURE_ARGS+=--with-apxs=${APXS} -SAPI_FILE= libexec/apache/libphp5.so .endif -BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} -RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} .endif .if defined(WITH_DEBUG) CONFIGURE_ARGS+=--enable-debug -EXT_DIR:= ${EXT_DIR}-debug .endif .if defined(WITH_MULTIBYTE) CONFIGURE_ARGS+=--enable-zend-multibyte .endif -PLIST_SUB+= SAPI_FILE=${SAPI_FILE} - .if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6) CONFIGURE_ARGS+=--disable-ipv6 .endif @@ -195,7 +167,6 @@ pre-configure: post-build: @${ECHO_CMD} "PHP_VER=5" > ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf - @${ECHO_CMD} "PHP_EXT_DIR=${EXT_DIR}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_PORT=\$${PORTSDIR}/${PHP_PORT}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf @@ -209,10 +180,6 @@ post-install: .endif .else -.if ${PKGNAMESUFFIX} == "-pear" -.include "${MASTERDIR}/Makefile.pear" -.else .include "${MASTERDIR}/Makefile.ext" .endif -.endif .include <bsd.port.post.mk> diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext index b4afef087967..c59f4d3c035f 100644 --- a/lang/php5/Makefile.ext +++ b/lang/php5/Makefile.ext @@ -56,14 +56,6 @@ PHP_HEADER_DIRS= libcdb libflatfile libinifile CONFIGURE_ARGS+=--enable-dbase .endif -.if ${PHP_MODNAME} == "dbx" -CONFIGURE_ARGS+=--enable-dbx -.endif - -.if ${PHP_MODNAME} == "dio" -CONFIGURE_ARGS+=--enable-dio -.endif - .if ${PHP_MODNAME} == "dom" CONFIGURE_ARGS+=--enable-dom \ --with-libxml-dir=${LOCALBASE} @@ -83,7 +75,11 @@ CONFIGURE_ARGS+=--enable-filepro .endif .if ${PHP_MODNAME} == "ftp" -CONFIGURE_ARGS+=--enable-ftp +CONFIGURE_ARGS+=--enable-ftp \ + --with-openssl-dir=${OPENSSLBASE} + +LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl +USE_OPENSSL= yes .endif .if ${PHP_MODNAME} == "gd" @@ -169,16 +165,6 @@ CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE} USE_AUTOTOOLS= libltdl:15 .endif -.if ${PHP_MODNAME} == "mcve" -LIB_DEPENDS+= mcve.3:${PORTSDIR}/devel/libmcve - -CONFIGURE_ARGS+=--with-mcve=${LOCALBASE} \ - --with-openssl-dir=${OPENSSLBASE} - -LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl -USE_OPENSSL= yes -.endif - .if ${PHP_MODNAME} == "mhash" LIB_DEPENDS+= mhash.2:${PORTSDIR}/security/mhash @@ -191,12 +177,6 @@ LIB_DEPENDS+= ming.3:${PORTSDIR}/graphics/ming CONFIGURE_ARGS+=--with-ming=${LOCALBASE} .endif -.if ${PHP_MODNAME} == "mnogosearch" -LIB_DEPENDS+= udmsearch.1:${PORTSDIR}/www/mnogosearch31 - -CONFIGURE_ARGS+=--with-mnogosearch=${LOCALBASE} -.endif - .if ${PHP_MODNAME} == "mssql" LIB_DEPENDS+= sybdb.5:${PORTSDIR}/databases/freetds-msdblib @@ -236,12 +216,6 @@ LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl USE_OPENSSL= yes .endif -.if ${PHP_MODNAME} == "oracle" -BUILD_DEPENDS+= ${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client - -CONFIGURE_ARGS+=--with-oracle=${LOCALBASE}/oracle7 -.endif - .if ${PHP_MODNAME} == "pcntl" CONFIGURE_ARGS+=--enable-pcntl .endif @@ -373,27 +347,35 @@ CONFIGURE_ARGS+=--enable-xml \ USE_GNOME= libxml2 .endif -.if ${PHP_MODNAME} == "xmlrpc" -LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2 +.if ${PHP_MODNAME} == "xmlreader" +CONFIGURE_ARGS+=--with-xmlreader \ + --with-libxml-dir=${LOCALBASE} + +USE_GNOME= libxml2 + +USE_PHP= xml +USE_PHP_BUILD= yes +.endif +.if ${PHP_MODNAME} == "xmlrpc" CONFIGURE_ARGS+=--with-xmlrpc \ - --with-expat-dir=${LOCALBASE} \ + --with-libxml-dir=${LOCALBASE} \ --with-iconv-dir=${LOCALBASE} USE_ICONV= yes +USE_GNOME= libxml2 PHP_HEADER_DIRS=libxmlrpc + +USE_PHP= xml +USE_PHP_BUILD= yes .endif .if ${PHP_MODNAME} == "xsl" CONFIGURE_ARGS+=--with-xsl=${LOCALBASE} USE_GNOME= libxslt -USE_PHP= dom -.endif - -.if ${PHP_MODNAME} == "yp" -CONFIGURE_ARGS+=--enable-yp +USE_PHP= dom xml .endif .if ${PHP_MODNAME} == "zlib" @@ -461,13 +443,9 @@ post-extract: @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 .endif -.if ${PHP_MODNAME} == "oracle" -pre-configure: - @cd ${WRKSRC}; \ - for lib in c3v6 client common core3 epc generic ncr nlsrtl3 sqlnet wrap; do \ - /usr/bin/ar x ${LOCALBASE}/oracle7/lib/lib$${lib}.a; \ - done; \ - /usr/bin/ar rcs liboracle.a *.o +.if ${PHP_MODNAME} == "pcre" +post-extract: + @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 .endif .if ${PHP_MODNAME} == "snmp" diff --git a/lang/php5/Makefile.pear b/lang/php5/Makefile.pear deleted file mode 100644 index 8ba975ddab3f..000000000000 --- a/lang/php5/Makefile.pear +++ /dev/null @@ -1,37 +0,0 @@ -PORTREVISION= 1 - -USE_GNOME= libxml2 - -GNU_CONFIGURE= yes - -CONFIGURE_ARGS= --with-layout=GNU \ - --disable-cgi \ - --disable-all \ - --with-pcre-regex=yes \ - --enable-xml \ - --enable-libxml \ - --with-libxml-dir=${LOCALBASE} \ - --with-zlib-dir=/usr \ - --with-pear - -NO_BUILD= yes - -INSTALL_TARGET= install-pear - -USE_PHP= pcre xml -WANT_PHP_SCR= yes -DEFAULT_PHP_VER=5 -BROKEN_WITH_PHP=4 - -.include <bsd.port.pre.mk> - -post-patch: - @${SED} "s|%%PREFIX%%|${PREFIX}|g" \ - ${WRKSRC}/pear/scripts/pearcmd.php > ${WRKSRC}/pear/scripts/pear - -post-install: - @${INSTALL_SCRIPT} ${WRKSRC}/pear/scripts/pear ${PREFIX}/bin - @${MKDIR} ${PREFIX}/lib/php/pear/.registry - @${TOUCH} ${PREFIX}/lib/php/pear/.filemap - @${TOUCH} ${PREFIX}/lib/php/pear/.lock - @${SED} "s|\$${LOCALBASE}|${LOCALBASE}|g;s|\$${PREFIX}|${PREFIX}|g" < ${PKGMESSAGE} diff --git a/lang/php5/distinfo b/lang/php5/distinfo index 5877d94312bb..238205cbbe25 100644 --- a/lang/php5/distinfo +++ b/lang/php5/distinfo @@ -1,2 +1,3 @@ -MD5 (php-5.0.5.tar.bz2) = b5d4ca75bbb11ee5b830fa67213d9f7f -SIZE (php-5.0.5.tar.bz2) = 4895556 +MD5 (php-5.1.1.tar.bz2) = 70a7c90de182d1a1901c390b844153c7 +SHA256 (php-5.1.1.tar.bz2) = 29fee6733868019bc702f7a2b54d95bd9d20d01fc9e9e6681f3d32f50b5f28cd +SIZE (php-5.1.1.tar.bz2) = 6149470 diff --git a/lang/php5/files/patch-Zend::zend.h b/lang/php5/files/patch-Zend::zend.h index 701f6a556f56..49d678719636 100644 --- a/lang/php5/files/patch-Zend::zend.h +++ b/lang/php5/files/patch-Zend::zend.h @@ -1,11 +1,11 @@ ---- Zend/zend.h.orig Thu Aug 25 19:41:08 2005 -+++ Zend/zend.h Wed Nov 16 09:30:03 2005 +--- Zend/zend.h.orig Tue Nov 15 14:35:22 2005 ++++ Zend/zend.h Fri Nov 25 09:31:48 2005 @@ -178,7 +178,7 @@ #endif --#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(__darwin__) && !defined(__APPLE__) -+#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(__darwin__) && !defined(__APPLE__) && !(defined(ZTS) && defined(__FreeBSD__)) +-#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN) ++#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN) && !(defined(ZTS) && defined(__FreeBSD__)) # define do_alloca(p) alloca(p) # define free_alloca(p) #else diff --git a/lang/php5/files/patch-configure b/lang/php5/files/patch-configure index ecd4454dd4f3..1ac8ec049e63 100644 --- a/lang/php5/files/patch-configure +++ b/lang/php5/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Sep 5 13:16:17 2005 -+++ configure Fri Oct 14 07:48:01 2005 -@@ -2890,7 +2890,7 @@ +--- configure.orig Wed Nov 23 22:37:49 2005 ++++ configure Fri Nov 25 10:39:54 2005 +@@ -3654,7 +3654,7 @@ save_LIBS=$LIBS if test -n "$ac_cv_pthreads_lib"; then @@ -9,7 +9,7 @@ fi if test -n "$ac_cv_pthreads_cflags"; then -@@ -11285,7 +11285,7 @@ +@@ -12074,7 +12074,7 @@ if test "$enable_maintainer_zts" = "yes"; then if test -n "$ac_cv_pthreads_lib"; then @@ -18,7 +18,7 @@ fi if test -n "$ac_cv_pthreads_cflags"; then -@@ -11302,8 +11302,6 @@ +@@ -12091,8 +12091,6 @@ case $host_alias in *solaris*) PTHREAD_FLAGS="-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT";; @@ -27,51 +27,7 @@ *linux*) PTHREAD_FLAGS=-D_REENTRANT;; *aix*) -@@ -88384,6 +88382,10 @@ - #line 88385 "configure" - #include "confdefs.h" - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif -+ - #if HAVE_CRYPT_H - #include <crypt.h> - #endif -@@ -88441,6 +88443,10 @@ - #line 88442 "configure" - #include "confdefs.h" - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif -+ - #if HAVE_CRYPT_H - #include <crypt.h> - #endif -@@ -88498,6 +88504,10 @@ - #line 88499 "configure" - #include "confdefs.h" - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif -+ - #if HAVE_CRYPT_H - #include <crypt.h> - #endif -@@ -88593,6 +88603,10 @@ - #line 88594 "configure" - #include "confdefs.h" - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif -+ - #if HAVE_CRYPT_H - #include <crypt.h> - #endif -@@ -101571,7 +101585,7 @@ +@@ -100076,7 +100074,7 @@ save_LIBS=$LIBS if test -n "$ac_cv_pthreads_lib"; then @@ -80,3 +36,12 @@ fi if test -n "$ac_cv_pthreads_cflags"; then +@@ -108808,7 +108806,7 @@ + + + +- for header_file in Zend/ TSRM/ include/ main/ main/streams/ regex/; do ++ for header_file in Zend/ TSRM/ main/ main/streams/ regex/ ext/spl/; do + + + unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` diff --git a/lang/php5/files/patch-ext_date_lib_timelib_structs.h b/lang/php5/files/patch-ext_date_lib_timelib_structs.h new file mode 100644 index 000000000000..c85468abc7f0 --- /dev/null +++ b/lang/php5/files/patch-ext_date_lib_timelib_structs.h @@ -0,0 +1,11 @@ +--- ext/date/lib/timelib_structs.h.orig Wed Dec 7 11:11:39 2005 ++++ ext/date/lib/timelib_structs.h Wed Dec 7 11:11:53 2005 +@@ -21,7 +21,7 @@ + #ifndef __TIMELIB_STRUCTS_H__ + #define __TIMELIB_STRUCTS_H__ + +-#include <timelib_config.h> ++#include "timelib_config.h" + + #ifdef HAVE_SYS_TYPES_H + #include <sys/types.h> diff --git a/lang/php5/files/patch-ext_standard_incomplete_class.c b/lang/php5/files/patch-ext_standard_incomplete_class.c deleted file mode 100644 index f4b5c40e4c3b..000000000000 --- a/lang/php5/files/patch-ext_standard_incomplete_class.c +++ /dev/null @@ -1,20 +0,0 @@ ---- ext/standard/incomplete_class.c.orig Fri Oct 14 07:49:19 2005 -+++ ext/standard/incomplete_class.c Fri Oct 14 07:50:12 2005 -@@ -122,7 +122,7 @@ - - /* {{{ php_lookup_class_name - */ --char *php_lookup_class_name(zval *object, size_t *nlen) -+char *php_lookup_class_name(zval *object, zend_uint *nlen) - { - zval **val; - char *retval = NULL; -@@ -144,7 +144,7 @@ - - /* {{{ php_store_class_name - */ --void php_store_class_name(zval *object, const char *name, size_t len) -+void php_store_class_name(zval *object, const char *name, zend_uint len) - { - zval *val; - TSRMLS_FETCH(); diff --git a/lang/php5/files/patch-ext_standard_php_incomplete_class.h b/lang/php5/files/patch-ext_standard_php_incomplete_class.h deleted file mode 100644 index 936036a1b565..000000000000 --- a/lang/php5/files/patch-ext_standard_php_incomplete_class.h +++ /dev/null @@ -1,22 +0,0 @@ ---- ext/standard/php_incomplete_class.h.orig Fri Oct 14 07:50:22 2005 -+++ ext/standard/php_incomplete_class.h Fri Oct 14 07:50:59 2005 -@@ -42,7 +42,7 @@ - - #define PHP_CLASS_ATTRIBUTES \ - char *class_name; \ -- size_t name_len; \ -+ zend_uint name_len; \ - zend_bool free_class_name = 0; \ - zend_bool incomplete_class = 0 - -@@ -55,8 +55,8 @@ - - zend_class_entry *php_create_incomplete_class(TSRMLS_D); - --char *php_lookup_class_name(zval *object, size_t *nlen); --void php_store_class_name(zval *object, const char *name, size_t len); -+char *php_lookup_class_name(zval *object, zend_uint *nlen); -+void php_store_class_name(zval *object, const char *name, zend_uint len); - - #ifdef __cplusplus - }; diff --git a/lang/php5/files/patch-pear::Makefile.frag b/lang/php5/files/patch-pear::Makefile.frag deleted file mode 100644 index 41b525b28a7c..000000000000 --- a/lang/php5/files/patch-pear::Makefile.frag +++ /dev/null @@ -1,35 +0,0 @@ ---- pear/Makefile.frag.orig Tue Sep 2 03:30:13 2003 -+++ pear/Makefile.frag Thu Apr 22 23:52:40 2004 -@@ -1,6 +1,7 @@ - # -*- makefile -*- - - peardir=$(PEAR_INSTALLDIR) -+XML_RPC_ver=1.4.0 - - # Skip all php.ini files altogether - PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -@@ -13,10 +14,18 @@ - - install-pear: - @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" -- @if $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \ -- $(MAKE) -s install-pear-installer install-pear-packages; \ -- else \ -- cat $(srcdir)/install-pear.txt; \ -- exit 5; \ -- fi -+ @$(mkinstalldirs) $(INSTALL_ROOT)$(peardir)/bootstrap \ -+ $(INSTALL_ROOT)$(peardir)/bootstrap/Archive \ -+ $(INSTALL_ROOT)$(peardir)/bootstrap/Console \ -+ $(INSTALL_ROOT)$(peardir)/bootstrap/XML \ -+ $(INSTALL_ROOT)$(peardir)/bootstrap/XML/RPC -+ @cp $(srcdir)/PEAR.php $(srcdir)/System.php \ -+ $(INSTALL_ROOT)$(peardir)/bootstrap -+ @cp $(srcdir)/Archive/*.php $(INSTALL_ROOT)$(peardir)/bootstrap/Archive -+ @cp $(srcdir)/Console/*.php $(INSTALL_ROOT)$(peardir)/bootstrap/Console -+ @cp -R $(srcdir)/OS $(INSTALL_ROOT)$(peardir)/bootstrap -+ @cp -R $(srcdir)/PEAR $(INSTALL_ROOT)$(peardir)/bootstrap -+ @tar xf $(srcdir)/packages/XML_RPC-$(XML_RPC_ver).tar -+ @cp XML_RPC-$(XML_RPC_ver)/RPC.php $(INSTALL_ROOT)$(peardir)/bootstrap/XML -+ @cp XML_RPC-$(XML_RPC_ver)/Server.php $(INSTALL_ROOT)$(peardir)/bootstrap/XML/RPC - diff --git a/lang/php5/files/patch-pear::scripts::pearcmd.php b/lang/php5/files/patch-pear::scripts::pearcmd.php deleted file mode 100644 index e0898d9ed08a..000000000000 --- a/lang/php5/files/patch-pear::scripts::pearcmd.php +++ /dev/null @@ -1,21 +0,0 @@ ---- pear/scripts/pearcmd.php.orig Mon Mar 28 18:46:06 2005 -+++ pear/scripts/pearcmd.php Wed Nov 16 09:30:03 2005 -@@ -1,3 +1,4 @@ -+#!%%PREFIX%%/bin/php -nq - <?php - // - // +----------------------------------------------------------------------+ -@@ -24,9 +25,10 @@ - /** - * @nodep Gtk - */ --if ('@include_path@' != '@'.'include_path'.'@') { -- ini_set('include_path', '@include_path@'); --} -+dl('pcre.so'); -+dl('xml.so'); -+ini_set('include_path', '%%PREFIX%%/share/pear:%%PREFIX%%/share/pear/bootstrap'); -+ini_set('memory_limit', '16M'); - ini_set('allow_url_fopen', true); - if (!ini_get('safe_mode')) { - @set_time_limit(0); diff --git a/lang/php5/files/patch-scripts::Makefile.frag b/lang/php5/files/patch-scripts::Makefile.frag deleted file mode 100644 index f3200a0dc3c2..000000000000 --- a/lang/php5/files/patch-scripts::Makefile.frag +++ /dev/null @@ -1,25 +0,0 @@ ---- scripts/Makefile.frag.orig Tue Jun 7 23:57:06 2005 -+++ scripts/Makefile.frag Wed Sep 7 17:50:23 2005 -@@ -34,21 +34,12 @@ - / \ - Zend/ \ - TSRM/ \ -- include/ \ - main/ \ - main/streams/ \ - regex/ \ -- ext/iconv/ \ - ext/libxml/ \ - ext/standard/ \ -- ext/session/ \ -- ext/dom/xml_common.h \ -- ext/xml/ \ -- ext/xml/expat/ \ -- ext/mbstring/ \ -- ext/mbstring/libmbfl/ \ -- ext/mbstring/libmbfl/mbfl/ \ -- ext/sqlite/libsqlite/src/sqlite.h -+ ext/spl/ - - install-headers: - -@for i in $(HEADER_DIRS); do \ diff --git a/lang/php5/pkg-message.pear b/lang/php5/pkg-message.pear deleted file mode 100644 index 53827dba00cc..000000000000 --- a/lang/php5/pkg-message.pear +++ /dev/null @@ -1,8 +0,0 @@ -********************************************************* - -To use PEAR you have to add the correct include path into -your ${LOCALBASE}/etc/php.ini configuration file, like: - -include_path = ".:${PREFIX}/share/pear" - -********************************************************* diff --git a/lang/php5/pkg-plist b/lang/php5/pkg-plist index 494aeea29722..e66190e08479 100644 --- a/lang/php5/pkg-plist +++ b/lang/php5/pkg-plist @@ -1,4 +1,4 @@ -%%CLI%%bin/php +%%CLICGI%%bin/php bin/php-config bin/phpize etc/php.conf @@ -8,7 +8,6 @@ include/php/TSRM/TSRM.h include/php/TSRM/acconfig.h include/php/TSRM/readdir.h include/php/TSRM/tsrm_config.h -include/php/TSRM/tsrm_config.nw.h include/php/TSRM/tsrm_config.w32.h include/php/TSRM/tsrm_config_common.h include/php/TSRM/tsrm_nw.h @@ -65,14 +64,23 @@ include/php/Zend/zend_strtod.h 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/Zend/zend_vm.h +include/php/Zend/zend_vm_def.h +include/php/Zend/zend_vm_execute.h +include/php/Zend/zend_vm_opcodes.h +include/php/ext/date/lib/timelib.h +include/php/ext/date/lib/timelib_config.h +include/php/ext/date/lib/timelib_structs.h +include/php/ext/date/php_date.h include/php/ext/libxml/php_libxml.h include/php/ext/spl/php_spl.h include/php/ext/spl/spl_array.h include/php/ext/spl/spl_directory.h include/php/ext/spl/spl_engine.h +include/php/ext/spl/spl_exceptions.h include/php/ext/spl/spl_functions.h include/php/ext/spl/spl_iterators.h +include/php/ext/spl/spl_observer.h include/php/ext/spl/spl_sxe.h include/php/ext/standard/base64.h include/php/ext/standard/basic_functions.h @@ -96,7 +104,6 @@ include/php/ext/standard/md5.h include/php/ext/standard/microtime.h include/php/ext/standard/pack.h include/php/ext/standard/pageinfo.h -include/php/ext/standard/parsedate.h include/php/ext/standard/php_array.h include/php/ext/standard/php_assert.h include/php/ext/standard/php_browscap.h @@ -115,7 +122,6 @@ include/php/ext/standard/php_link.h include/php/ext/standard/php_mail.h include/php/ext/standard/php_math.h include/php/ext/standard/php_metaphone.h -include/php/ext/standard/php_parsedate.h include/php/ext/standard/php_rand.h include/php/ext/standard/php_smart_str.h include/php/ext/standard/php_smart_str_public.h @@ -142,14 +148,12 @@ include/php/main/SAPI.h include/php/main/build-defs.h include/php/main/config.w32.h include/php/main/fopen_wrappers.h -include/php/main/internal_functions_registry.h include/php/main/logos.h include/php/main/php.h include/php/main/php3_compat.h include/php/main/php_compat.h include/php/main/php_config.h include/php/main/php_content_types.h -include/php/main/php_embed.h include/php/main/php_globals.h include/php/main/php_ini.h include/php/main/php_logos.h @@ -192,13 +196,16 @@ lib/php/build/libtool.m4 lib/php/build/ltmain.sh lib/php/build/mkdep.awk lib/php/build/phpize.m4 +lib/php/build/run-tests.php lib/php/build/scan_makefile_in.awk lib/php/build/shtool -%%SAPI_FILE%% -%%APACHE%%@exec %D/sbin/apxs -e -a -n php5 %f -%%APACHE%%@unexec %D/sbin/apxs -e -A -n php5 %f +%%APACHE%%%%APACHEMODDIR%%/%%AP_MODULE%% +%%APACHE%%@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %f +%%APACHE%%@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f @dirrm include/php/TSRM @dirrm include/php/Zend +@dirrm include/php/ext/date/lib +@dirrm include/php/ext/date @dirrm include/php/ext/libxml @dirrm include/php/ext/spl @dirrm include/php/ext/standard diff --git a/lang/php5/pkg-plist.pear b/lang/php5/pkg-plist.pear deleted file mode 100644 index f6ae741953ca..000000000000 --- a/lang/php5/pkg-plist.pear +++ /dev/null @@ -1,71 +0,0 @@ -bin/pear -@exec mkdir -p %D/lib/php/pear/.channels/.alias -@exec mkdir -p %D/lib/php/pear/.registry/.channel.__uri -@exec mkdir -p %D/lib/php/pear/.registry/.channel.pecl.php.net -@exec touch %D/lib/php/pear/.channels/.alias/pear.txt -@exec touch %D/lib/php/pear/.channels/.alias/pecl.txt -@exec touch %D/lib/php/pear/.channels/__uri.reg -@exec touch %D/lib/php/pear/.channels/pear.php.net.reg -@exec touch %D/lib/php/pear/.channels/pecl.php.net.reg -@exec touch %D/lib/php/pear/.depdb -@exec touch %D/lib/php/pear/.depdblock -@exec touch %D/lib/php/pear/.filemap -@exec touch %D/lib/php/pear/.lock -share/pear/bootstrap/Archive/Tar.php -share/pear/bootstrap/PEAR.php -share/pear/bootstrap/System.php -share/pear/bootstrap/Console/Getopt.php -share/pear/bootstrap/OS/Guess.php -share/pear/bootstrap/PEAR/Autoloader.php -share/pear/bootstrap/PEAR/Builder.php -share/pear/bootstrap/PEAR/Command.php -share/pear/bootstrap/PEAR/Command/Auth.php -share/pear/bootstrap/PEAR/Command/Build.php -share/pear/bootstrap/PEAR/Command/Common.php -share/pear/bootstrap/PEAR/Command/Config.php -share/pear/bootstrap/PEAR/Command/Install.php -share/pear/bootstrap/PEAR/Command/Mirror.php -share/pear/bootstrap/PEAR/Command/Package.php -share/pear/bootstrap/PEAR/Command/Registry.php -share/pear/bootstrap/PEAR/Command/Remote.php -share/pear/bootstrap/PEAR/Common.php -share/pear/bootstrap/PEAR/Config.php -share/pear/bootstrap/PEAR/Dependency.php -share/pear/bootstrap/PEAR/DependencyDB.php -share/pear/bootstrap/PEAR/Downloader.php -share/pear/bootstrap/PEAR/ErrorStack.php -share/pear/bootstrap/PEAR/Exception.php -share/pear/bootstrap/PEAR/Frontend/CLI.php -share/pear/bootstrap/PEAR/Installer.php -share/pear/bootstrap/PEAR/Packager.php -share/pear/bootstrap/PEAR/Registry.php -share/pear/bootstrap/PEAR/Remote.php -share/pear/bootstrap/PEAR/RunTest.php -share/pear/bootstrap/XML/RPC.php -share/pear/bootstrap/XML/RPC/Server.php -@unexec rm %D/lib/php/pear/.channels/.alias/pear.txt 2> /dev/null || true -@unexec rm %D/lib/php/pear/.channels/.alias/pecl.txt 2> /dev/null || true -@unexec rm %D/lib/php/pear/.channels/__uri.reg 2> /dev/null || true -@unexec rm %D/lib/php/pear/.channels/pear.php.net.reg 2> /dev/null || true -@unexec rm %D/lib/php/pear/.channels/pecl.php.net.reg 2> /dev/null || true -@unexec rm %D/lib/php/pear/.depdb 2> /dev/null || true -@unexec rm %D/lib/php/pear/.depdblock 2> /dev/null || true -@unexec rm %D/lib/php/pear/.filemap 2> /dev/null || true -@unexec rm %D/lib/php/pear/.lock 2> /dev/null || true -@unexec rmdir %D/lib/php/pear/.channels/.alias 2> /dev/null || true -@unexec rmdir %D/lib/php/pear/.channels 2> /dev/null || true -@unexec rmdir %D/lib/php/pear/.registry/.channel.__uri 2> /dev/null || true -@unexec rmdir %D/lib/php/pear/.registry/.channel.pecl.php.net 2> /dev/null || true -@unexec rmdir %D/lib/php/pear/.registry 2> /dev/null || true -@unexec rmdir %D/lib/php/pear 2> /dev/null || true -@unexec rmdir %D/lib/php 2> /dev/null || true -@dirrm share/pear/bootstrap/Archive -@dirrm share/pear/bootstrap/Console -@dirrm share/pear/bootstrap/OS -@dirrm share/pear/bootstrap/PEAR/Command -@dirrm share/pear/bootstrap/PEAR/Frontend -@dirrm share/pear/bootstrap/PEAR -@dirrm share/pear/bootstrap/XML/RPC -@dirrm share/pear/bootstrap/XML -@dirrm share/pear/bootstrap -@unexec rmdir %D/share/pear 2> /dev/null || true diff --git a/lang/php53/Makefile b/lang/php53/Makefile index 77c8c1e5e793..d192cdc78474 100644 --- a/lang/php53/Makefile +++ b/lang/php53/Makefile @@ -6,8 +6,8 @@ # PORTNAME= php5 -PORTVERSION= 5.0.5 -PORTREVISION?= 2 +PORTVERSION= 5.1.1 +PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \ http://downloads.php.net/ilia/:rc \ @@ -24,7 +24,6 @@ LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} USE_BZIP2= yes .if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX} == "-cgi" || ${PKGNAMESUFFIX} == "-cli" GNU_CONFIGURE= yes -USE_BISON= yes USE_REINPLACE= yes CONFIGURE_ARGS= --enable-versioning \ @@ -64,7 +63,9 @@ WITH_APACHE= yes .if defined(WITH_APACHE) PKGMESSAGE= ${PKGDIR}/pkg-message.mod -APACHE_COMPAT= yes +USE_APACHE= 1.3+ +MODULENAME= lib${PORTNAME} +SHORTMODNAME= ${PORTNAME} .endif .if ${PHP_SAPI} == "cgi" @@ -73,19 +74,10 @@ OPTIONS= REDIRECT "Enable force-cgi-redirect support" off \ FASTCGI "Enable fastcgi support" off \ PATHINFO "Enable path-info-check support" on .endif -.if defined(WITH_APACHE) -.if defined(WITH_APACHE2) -OPTIONS= APACHE2 "Use apache 2.x instead of apache 1.3.x" on -.else -OPTIONS= APACHE2 "Use apache 2.x instead of apache 1.3.x" off -.endif -.endif OPTIONS+= DEBUG "Enable debug" off \ MULTIBYTE "Enable zend multibyte support" off \ IPV6 "Enable ipv6 support" on -EXT_DIR= 20041030 - CONFLICTS?= php5-cli-5* mod_php5-5* php5-cgi-5* CONFLICTS+= php4-4* php4-cli-4* mod_php4-4* php4-cgi-4* @@ -94,11 +86,13 @@ CONFIGURE_ARGS+=--disable-cli .endif MAN1= php-config.1 phpize.1 -.if ${PHP_SAPI} == "full" || ${PHP_SAPI} == "cli" -PLIST_SUB+= CLI="" +.if ${PHP_SAPI} != "mod" +PLIST_SUB+= CLICGI="" +.if ${PHP_SAPI} != "cgi" MAN1+= php.1 +.endif .else -PLIST_SUB+= CLI="@comment " +PLIST_SUB+= CLICGI="@comment " .endif .if defined(WITH_APACHE) @@ -109,11 +103,6 @@ PLIST_SUB+= APACHE="@comment " .if ${PHP_SAPI} == "cli" CONFIGURE_ARGS+=--disable-cgi -SAPI_FILE= "@comment " -.endif - -.if ${PHP_SAPI} == "cgi" -SAPI_FILE= bin/php .endif .include <bsd.port.pre.mk> @@ -122,38 +111,21 @@ CONFIGURE_ENV= ac_cv_pthreads_lib=${PTHREAD_LIBS} \ ac_cv_pthreads_cflags=${PTHREAD_CFLAGS} .if defined(WITH_APACHE) -.if exists(${LOCALBASE}/include/apache2/httpd.h) -WITH_APACHE2= yes -APACHE_MPM!= ${APXS} -q MPM_NAME -.endif -.if defined(WITH_APACHE2) -APACHE_MPM?= ${WITH_MPM} -APACHE_PORT= www/apache20 +.if ${APACHE_VERSION} > 13 CONFIGURE_ARGS+=--with-apxs2=${APXS} -SAPI_FILE= libexec/apache2/libphp5.so -.if ${APACHE_MPM} == "worker" -EXT_DIR:= ${EXT_DIR}-zts -.endif .else -APACHE_PORT?= www/apache13 CONFIGURE_ARGS+=--with-apxs=${APXS} -SAPI_FILE= libexec/apache/libphp5.so .endif -BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} -RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE_PORT} .endif .if defined(WITH_DEBUG) CONFIGURE_ARGS+=--enable-debug -EXT_DIR:= ${EXT_DIR}-debug .endif .if defined(WITH_MULTIBYTE) CONFIGURE_ARGS+=--enable-zend-multibyte .endif -PLIST_SUB+= SAPI_FILE=${SAPI_FILE} - .if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6) CONFIGURE_ARGS+=--disable-ipv6 .endif @@ -195,7 +167,6 @@ pre-configure: post-build: @${ECHO_CMD} "PHP_VER=5" > ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf - @${ECHO_CMD} "PHP_EXT_DIR=${EXT_DIR}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_PORT=\$${PORTSDIR}/${PHP_PORT}" >> ${WRKDIR}/php.conf @${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf @@ -209,10 +180,6 @@ post-install: .endif .else -.if ${PKGNAMESUFFIX} == "-pear" -.include "${MASTERDIR}/Makefile.pear" -.else .include "${MASTERDIR}/Makefile.ext" .endif -.endif .include <bsd.port.post.mk> diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext index b4afef087967..c59f4d3c035f 100644 --- a/lang/php53/Makefile.ext +++ b/lang/php53/Makefile.ext @@ -56,14 +56,6 @@ PHP_HEADER_DIRS= libcdb libflatfile libinifile CONFIGURE_ARGS+=--enable-dbase .endif -.if ${PHP_MODNAME} == "dbx" -CONFIGURE_ARGS+=--enable-dbx -.endif - -.if ${PHP_MODNAME} == "dio" -CONFIGURE_ARGS+=--enable-dio -.endif - .if ${PHP_MODNAME} == "dom" CONFIGURE_ARGS+=--enable-dom \ --with-libxml-dir=${LOCALBASE} @@ -83,7 +75,11 @@ CONFIGURE_ARGS+=--enable-filepro .endif .if ${PHP_MODNAME} == "ftp" -CONFIGURE_ARGS+=--enable-ftp +CONFIGURE_ARGS+=--enable-ftp \ + --with-openssl-dir=${OPENSSLBASE} + +LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl +USE_OPENSSL= yes .endif .if ${PHP_MODNAME} == "gd" @@ -169,16 +165,6 @@ CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE} USE_AUTOTOOLS= libltdl:15 .endif -.if ${PHP_MODNAME} == "mcve" -LIB_DEPENDS+= mcve.3:${PORTSDIR}/devel/libmcve - -CONFIGURE_ARGS+=--with-mcve=${LOCALBASE} \ - --with-openssl-dir=${OPENSSLBASE} - -LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl -USE_OPENSSL= yes -.endif - .if ${PHP_MODNAME} == "mhash" LIB_DEPENDS+= mhash.2:${PORTSDIR}/security/mhash @@ -191,12 +177,6 @@ LIB_DEPENDS+= ming.3:${PORTSDIR}/graphics/ming CONFIGURE_ARGS+=--with-ming=${LOCALBASE} .endif -.if ${PHP_MODNAME} == "mnogosearch" -LIB_DEPENDS+= udmsearch.1:${PORTSDIR}/www/mnogosearch31 - -CONFIGURE_ARGS+=--with-mnogosearch=${LOCALBASE} -.endif - .if ${PHP_MODNAME} == "mssql" LIB_DEPENDS+= sybdb.5:${PORTSDIR}/databases/freetds-msdblib @@ -236,12 +216,6 @@ LDFLAGS+= -L${OPENSSLLIB} -lcrypto -lssl USE_OPENSSL= yes .endif -.if ${PHP_MODNAME} == "oracle" -BUILD_DEPENDS+= ${LOCALBASE}/oracle7/lib/libcore3.a:${PORTSDIR}/databases/oracle7-client - -CONFIGURE_ARGS+=--with-oracle=${LOCALBASE}/oracle7 -.endif - .if ${PHP_MODNAME} == "pcntl" CONFIGURE_ARGS+=--enable-pcntl .endif @@ -373,27 +347,35 @@ CONFIGURE_ARGS+=--enable-xml \ USE_GNOME= libxml2 .endif -.if ${PHP_MODNAME} == "xmlrpc" -LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2 +.if ${PHP_MODNAME} == "xmlreader" +CONFIGURE_ARGS+=--with-xmlreader \ + --with-libxml-dir=${LOCALBASE} + +USE_GNOME= libxml2 + +USE_PHP= xml +USE_PHP_BUILD= yes +.endif +.if ${PHP_MODNAME} == "xmlrpc" CONFIGURE_ARGS+=--with-xmlrpc \ - --with-expat-dir=${LOCALBASE} \ + --with-libxml-dir=${LOCALBASE} \ --with-iconv-dir=${LOCALBASE} USE_ICONV= yes +USE_GNOME= libxml2 PHP_HEADER_DIRS=libxmlrpc + +USE_PHP= xml +USE_PHP_BUILD= yes .endif .if ${PHP_MODNAME} == "xsl" CONFIGURE_ARGS+=--with-xsl=${LOCALBASE} USE_GNOME= libxslt -USE_PHP= dom -.endif - -.if ${PHP_MODNAME} == "yp" -CONFIGURE_ARGS+=--enable-yp +USE_PHP= dom xml .endif .if ${PHP_MODNAME} == "zlib" @@ -461,13 +443,9 @@ post-extract: @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 .endif -.if ${PHP_MODNAME} == "oracle" -pre-configure: - @cd ${WRKSRC}; \ - for lib in c3v6 client common core3 epc generic ncr nlsrtl3 sqlnet wrap; do \ - /usr/bin/ar x ${LOCALBASE}/oracle7/lib/lib$${lib}.a; \ - done; \ - /usr/bin/ar rcs liboracle.a *.o +.if ${PHP_MODNAME} == "pcre" +post-extract: + @${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4 .endif .if ${PHP_MODNAME} == "snmp" diff --git a/lang/php53/Makefile.pear b/lang/php53/Makefile.pear deleted file mode 100644 index 8ba975ddab3f..000000000000 --- a/lang/php53/Makefile.pear +++ /dev/null @@ -1,37 +0,0 @@ -PORTREVISION= 1 - -USE_GNOME= libxml2 - -GNU_CONFIGURE= yes - -CONFIGURE_ARGS= --with-layout=GNU \ - --disable-cgi \ - --disable-all \ - --with-pcre-regex=yes \ - --enable-xml \ - --enable-libxml \ - --with-libxml-dir=${LOCALBASE} \ - --with-zlib-dir=/usr \ - --with-pear - -NO_BUILD= yes - -INSTALL_TARGET= install-pear - -USE_PHP= pcre xml -WANT_PHP_SCR= yes -DEFAULT_PHP_VER=5 -BROKEN_WITH_PHP=4 - -.include <bsd.port.pre.mk> - -post-patch: - @${SED} "s|%%PREFIX%%|${PREFIX}|g" \ - ${WRKSRC}/pear/scripts/pearcmd.php > ${WRKSRC}/pear/scripts/pear - -post-install: - @${INSTALL_SCRIPT} ${WRKSRC}/pear/scripts/pear ${PREFIX}/bin - @${MKDIR} ${PREFIX}/lib/php/pear/.registry - @${TOUCH} ${PREFIX}/lib/php/pear/.filemap - @${TOUCH} ${PREFIX}/lib/php/pear/.lock - @${SED} "s|\$${LOCALBASE}|${LOCALBASE}|g;s|\$${PREFIX}|${PREFIX}|g" < ${PKGMESSAGE} diff --git a/lang/php53/distinfo b/lang/php53/distinfo index 5877d94312bb..238205cbbe25 100644 --- a/lang/php53/distinfo +++ b/lang/php53/distinfo @@ -1,2 +1,3 @@ -MD5 (php-5.0.5.tar.bz2) = b5d4ca75bbb11ee5b830fa67213d9f7f -SIZE (php-5.0.5.tar.bz2) = 4895556 +MD5 (php-5.1.1.tar.bz2) = 70a7c90de182d1a1901c390b844153c7 +SHA256 (php-5.1.1.tar.bz2) = 29fee6733868019bc702f7a2b54d95bd9d20d01fc9e9e6681f3d32f50b5f28cd +SIZE (php-5.1.1.tar.bz2) = 6149470 diff --git a/lang/php53/files/patch-Zend::zend.h b/lang/php53/files/patch-Zend::zend.h index 701f6a556f56..49d678719636 100644 --- a/lang/php53/files/patch-Zend::zend.h +++ b/lang/php53/files/patch-Zend::zend.h @@ -1,11 +1,11 @@ ---- Zend/zend.h.orig Thu Aug 25 19:41:08 2005 -+++ Zend/zend.h Wed Nov 16 09:30:03 2005 +--- Zend/zend.h.orig Tue Nov 15 14:35:22 2005 ++++ Zend/zend.h Fri Nov 25 09:31:48 2005 @@ -178,7 +178,7 @@ #endif --#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(__darwin__) && !defined(__APPLE__) -+#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(__darwin__) && !defined(__APPLE__) && !(defined(ZTS) && defined(__FreeBSD__)) +-#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN) ++#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN) && !(defined(ZTS) && defined(__FreeBSD__)) # define do_alloca(p) alloca(p) # define free_alloca(p) #else diff --git a/lang/php53/files/patch-configure b/lang/php53/files/patch-configure index ecd4454dd4f3..1ac8ec049e63 100644 --- a/lang/php53/files/patch-configure +++ b/lang/php53/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Sep 5 13:16:17 2005 -+++ configure Fri Oct 14 07:48:01 2005 -@@ -2890,7 +2890,7 @@ +--- configure.orig Wed Nov 23 22:37:49 2005 ++++ configure Fri Nov 25 10:39:54 2005 +@@ -3654,7 +3654,7 @@ save_LIBS=$LIBS if test -n "$ac_cv_pthreads_lib"; then @@ -9,7 +9,7 @@ fi if test -n "$ac_cv_pthreads_cflags"; then -@@ -11285,7 +11285,7 @@ +@@ -12074,7 +12074,7 @@ if test "$enable_maintainer_zts" = "yes"; then if test -n "$ac_cv_pthreads_lib"; then @@ -18,7 +18,7 @@ fi if test -n "$ac_cv_pthreads_cflags"; then -@@ -11302,8 +11302,6 @@ +@@ -12091,8 +12091,6 @@ case $host_alias in *solaris*) PTHREAD_FLAGS="-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT";; @@ -27,51 +27,7 @@ *linux*) PTHREAD_FLAGS=-D_REENTRANT;; *aix*) -@@ -88384,6 +88382,10 @@ - #line 88385 "configure" - #include "confdefs.h" - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif -+ - #if HAVE_CRYPT_H - #include <crypt.h> - #endif -@@ -88441,6 +88443,10 @@ - #line 88442 "configure" - #include "confdefs.h" - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif -+ - #if HAVE_CRYPT_H - #include <crypt.h> - #endif -@@ -88498,6 +88504,10 @@ - #line 88499 "configure" - #include "confdefs.h" - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif -+ - #if HAVE_CRYPT_H - #include <crypt.h> - #endif -@@ -88593,6 +88603,10 @@ - #line 88594 "configure" - #include "confdefs.h" - -+#if HAVE_UNISTD_H -+#include <unistd.h> -+#endif -+ - #if HAVE_CRYPT_H - #include <crypt.h> - #endif -@@ -101571,7 +101585,7 @@ +@@ -100076,7 +100074,7 @@ save_LIBS=$LIBS if test -n "$ac_cv_pthreads_lib"; then @@ -80,3 +36,12 @@ fi if test -n "$ac_cv_pthreads_cflags"; then +@@ -108808,7 +108806,7 @@ + + + +- for header_file in Zend/ TSRM/ include/ main/ main/streams/ regex/; do ++ for header_file in Zend/ TSRM/ main/ main/streams/ regex/ ext/spl/; do + + + unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` diff --git a/lang/php53/files/patch-ext_date_lib_timelib_structs.h b/lang/php53/files/patch-ext_date_lib_timelib_structs.h new file mode 100644 index 000000000000..c85468abc7f0 --- /dev/null +++ b/lang/php53/files/patch-ext_date_lib_timelib_structs.h @@ -0,0 +1,11 @@ +--- ext/date/lib/timelib_structs.h.orig Wed Dec 7 11:11:39 2005 ++++ ext/date/lib/timelib_structs.h Wed Dec 7 11:11:53 2005 +@@ -21,7 +21,7 @@ + #ifndef __TIMELIB_STRUCTS_H__ + #define __TIMELIB_STRUCTS_H__ + +-#include <timelib_config.h> ++#include "timelib_config.h" + + #ifdef HAVE_SYS_TYPES_H + #include <sys/types.h> diff --git a/lang/php53/files/patch-ext_standard_incomplete_class.c b/lang/php53/files/patch-ext_standard_incomplete_class.c deleted file mode 100644 index f4b5c40e4c3b..000000000000 --- a/lang/php53/files/patch-ext_standard_incomplete_class.c +++ /dev/null @@ -1,20 +0,0 @@ ---- ext/standard/incomplete_class.c.orig Fri Oct 14 07:49:19 2005 -+++ ext/standard/incomplete_class.c Fri Oct 14 07:50:12 2005 -@@ -122,7 +122,7 @@ - - /* {{{ php_lookup_class_name - */ --char *php_lookup_class_name(zval *object, size_t *nlen) -+char *php_lookup_class_name(zval *object, zend_uint *nlen) - { - zval **val; - char *retval = NULL; -@@ -144,7 +144,7 @@ - - /* {{{ php_store_class_name - */ --void php_store_class_name(zval *object, const char *name, size_t len) -+void php_store_class_name(zval *object, const char *name, zend_uint len) - { - zval *val; - TSRMLS_FETCH(); diff --git a/lang/php53/files/patch-ext_standard_php_incomplete_class.h b/lang/php53/files/patch-ext_standard_php_incomplete_class.h deleted file mode 100644 index 936036a1b565..000000000000 --- a/lang/php53/files/patch-ext_standard_php_incomplete_class.h +++ /dev/null @@ -1,22 +0,0 @@ ---- ext/standard/php_incomplete_class.h.orig Fri Oct 14 07:50:22 2005 -+++ ext/standard/php_incomplete_class.h Fri Oct 14 07:50:59 2005 -@@ -42,7 +42,7 @@ - - #define PHP_CLASS_ATTRIBUTES \ - char *class_name; \ -- size_t name_len; \ -+ zend_uint name_len; \ - zend_bool free_class_name = 0; \ - zend_bool incomplete_class = 0 - -@@ -55,8 +55,8 @@ - - zend_class_entry *php_create_incomplete_class(TSRMLS_D); - --char *php_lookup_class_name(zval *object, size_t *nlen); --void php_store_class_name(zval *object, const char *name, size_t len); -+char *php_lookup_class_name(zval *object, zend_uint *nlen); -+void php_store_class_name(zval *object, const char *name, zend_uint len); - - #ifdef __cplusplus - }; diff --git a/lang/php53/files/patch-pear::Makefile.frag b/lang/php53/files/patch-pear::Makefile.frag deleted file mode 100644 index 41b525b28a7c..000000000000 --- a/lang/php53/files/patch-pear::Makefile.frag +++ /dev/null @@ -1,35 +0,0 @@ ---- pear/Makefile.frag.orig Tue Sep 2 03:30:13 2003 -+++ pear/Makefile.frag Thu Apr 22 23:52:40 2004 -@@ -1,6 +1,7 @@ - # -*- makefile -*- - - peardir=$(PEAR_INSTALLDIR) -+XML_RPC_ver=1.4.0 - - # Skip all php.ini files altogether - PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -@@ -13,10 +14,18 @@ - - install-pear: - @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" -- @if $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \ -- $(MAKE) -s install-pear-installer install-pear-packages; \ -- else \ -- cat $(srcdir)/install-pear.txt; \ -- exit 5; \ -- fi -+ @$(mkinstalldirs) $(INSTALL_ROOT)$(peardir)/bootstrap \ -+ $(INSTALL_ROOT)$(peardir)/bootstrap/Archive \ -+ $(INSTALL_ROOT)$(peardir)/bootstrap/Console \ -+ $(INSTALL_ROOT)$(peardir)/bootstrap/XML \ -+ $(INSTALL_ROOT)$(peardir)/bootstrap/XML/RPC -+ @cp $(srcdir)/PEAR.php $(srcdir)/System.php \ -+ $(INSTALL_ROOT)$(peardir)/bootstrap -+ @cp $(srcdir)/Archive/*.php $(INSTALL_ROOT)$(peardir)/bootstrap/Archive -+ @cp $(srcdir)/Console/*.php $(INSTALL_ROOT)$(peardir)/bootstrap/Console -+ @cp -R $(srcdir)/OS $(INSTALL_ROOT)$(peardir)/bootstrap -+ @cp -R $(srcdir)/PEAR $(INSTALL_ROOT)$(peardir)/bootstrap -+ @tar xf $(srcdir)/packages/XML_RPC-$(XML_RPC_ver).tar -+ @cp XML_RPC-$(XML_RPC_ver)/RPC.php $(INSTALL_ROOT)$(peardir)/bootstrap/XML -+ @cp XML_RPC-$(XML_RPC_ver)/Server.php $(INSTALL_ROOT)$(peardir)/bootstrap/XML/RPC - diff --git a/lang/php53/files/patch-pear::scripts::pearcmd.php b/lang/php53/files/patch-pear::scripts::pearcmd.php deleted file mode 100644 index e0898d9ed08a..000000000000 --- a/lang/php53/files/patch-pear::scripts::pearcmd.php +++ /dev/null @@ -1,21 +0,0 @@ ---- pear/scripts/pearcmd.php.orig Mon Mar 28 18:46:06 2005 -+++ pear/scripts/pearcmd.php Wed Nov 16 09:30:03 2005 -@@ -1,3 +1,4 @@ -+#!%%PREFIX%%/bin/php -nq - <?php - // - // +----------------------------------------------------------------------+ -@@ -24,9 +25,10 @@ - /** - * @nodep Gtk - */ --if ('@include_path@' != '@'.'include_path'.'@') { -- ini_set('include_path', '@include_path@'); --} -+dl('pcre.so'); -+dl('xml.so'); -+ini_set('include_path', '%%PREFIX%%/share/pear:%%PREFIX%%/share/pear/bootstrap'); -+ini_set('memory_limit', '16M'); - ini_set('allow_url_fopen', true); - if (!ini_get('safe_mode')) { - @set_time_limit(0); diff --git a/lang/php53/files/patch-scripts::Makefile.frag b/lang/php53/files/patch-scripts::Makefile.frag deleted file mode 100644 index f3200a0dc3c2..000000000000 --- a/lang/php53/files/patch-scripts::Makefile.frag +++ /dev/null @@ -1,25 +0,0 @@ ---- scripts/Makefile.frag.orig Tue Jun 7 23:57:06 2005 -+++ scripts/Makefile.frag Wed Sep 7 17:50:23 2005 -@@ -34,21 +34,12 @@ - / \ - Zend/ \ - TSRM/ \ -- include/ \ - main/ \ - main/streams/ \ - regex/ \ -- ext/iconv/ \ - ext/libxml/ \ - ext/standard/ \ -- ext/session/ \ -- ext/dom/xml_common.h \ -- ext/xml/ \ -- ext/xml/expat/ \ -- ext/mbstring/ \ -- ext/mbstring/libmbfl/ \ -- ext/mbstring/libmbfl/mbfl/ \ -- ext/sqlite/libsqlite/src/sqlite.h -+ ext/spl/ - - install-headers: - -@for i in $(HEADER_DIRS); do \ diff --git a/lang/php53/pkg-message.pear b/lang/php53/pkg-message.pear deleted file mode 100644 index 53827dba00cc..000000000000 --- a/lang/php53/pkg-message.pear +++ /dev/null @@ -1,8 +0,0 @@ -********************************************************* - -To use PEAR you have to add the correct include path into -your ${LOCALBASE}/etc/php.ini configuration file, like: - -include_path = ".:${PREFIX}/share/pear" - -********************************************************* diff --git a/lang/php53/pkg-plist b/lang/php53/pkg-plist index 494aeea29722..e66190e08479 100644 --- a/lang/php53/pkg-plist +++ b/lang/php53/pkg-plist @@ -1,4 +1,4 @@ -%%CLI%%bin/php +%%CLICGI%%bin/php bin/php-config bin/phpize etc/php.conf @@ -8,7 +8,6 @@ include/php/TSRM/TSRM.h include/php/TSRM/acconfig.h include/php/TSRM/readdir.h include/php/TSRM/tsrm_config.h -include/php/TSRM/tsrm_config.nw.h include/php/TSRM/tsrm_config.w32.h include/php/TSRM/tsrm_config_common.h include/php/TSRM/tsrm_nw.h @@ -65,14 +64,23 @@ include/php/Zend/zend_strtod.h 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/Zend/zend_vm.h +include/php/Zend/zend_vm_def.h +include/php/Zend/zend_vm_execute.h +include/php/Zend/zend_vm_opcodes.h +include/php/ext/date/lib/timelib.h +include/php/ext/date/lib/timelib_config.h +include/php/ext/date/lib/timelib_structs.h +include/php/ext/date/php_date.h include/php/ext/libxml/php_libxml.h include/php/ext/spl/php_spl.h include/php/ext/spl/spl_array.h include/php/ext/spl/spl_directory.h include/php/ext/spl/spl_engine.h +include/php/ext/spl/spl_exceptions.h include/php/ext/spl/spl_functions.h include/php/ext/spl/spl_iterators.h +include/php/ext/spl/spl_observer.h include/php/ext/spl/spl_sxe.h include/php/ext/standard/base64.h include/php/ext/standard/basic_functions.h @@ -96,7 +104,6 @@ include/php/ext/standard/md5.h include/php/ext/standard/microtime.h include/php/ext/standard/pack.h include/php/ext/standard/pageinfo.h -include/php/ext/standard/parsedate.h include/php/ext/standard/php_array.h include/php/ext/standard/php_assert.h include/php/ext/standard/php_browscap.h @@ -115,7 +122,6 @@ include/php/ext/standard/php_link.h include/php/ext/standard/php_mail.h include/php/ext/standard/php_math.h include/php/ext/standard/php_metaphone.h -include/php/ext/standard/php_parsedate.h include/php/ext/standard/php_rand.h include/php/ext/standard/php_smart_str.h include/php/ext/standard/php_smart_str_public.h @@ -142,14 +148,12 @@ include/php/main/SAPI.h include/php/main/build-defs.h include/php/main/config.w32.h include/php/main/fopen_wrappers.h -include/php/main/internal_functions_registry.h include/php/main/logos.h include/php/main/php.h include/php/main/php3_compat.h include/php/main/php_compat.h include/php/main/php_config.h include/php/main/php_content_types.h -include/php/main/php_embed.h include/php/main/php_globals.h include/php/main/php_ini.h include/php/main/php_logos.h @@ -192,13 +196,16 @@ lib/php/build/libtool.m4 lib/php/build/ltmain.sh lib/php/build/mkdep.awk lib/php/build/phpize.m4 +lib/php/build/run-tests.php lib/php/build/scan_makefile_in.awk lib/php/build/shtool -%%SAPI_FILE%% -%%APACHE%%@exec %D/sbin/apxs -e -a -n php5 %f -%%APACHE%%@unexec %D/sbin/apxs -e -A -n php5 %f +%%APACHE%%%%APACHEMODDIR%%/%%AP_MODULE%% +%%APACHE%%@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %f +%%APACHE%%@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f @dirrm include/php/TSRM @dirrm include/php/Zend +@dirrm include/php/ext/date/lib +@dirrm include/php/ext/date @dirrm include/php/ext/libxml @dirrm include/php/ext/spl @dirrm include/php/ext/standard diff --git a/lang/php53/pkg-plist.pear b/lang/php53/pkg-plist.pear deleted file mode 100644 index f6ae741953ca..000000000000 --- a/lang/php53/pkg-plist.pear +++ /dev/null @@ -1,71 +0,0 @@ -bin/pear -@exec mkdir -p %D/lib/php/pear/.channels/.alias -@exec mkdir -p %D/lib/php/pear/.registry/.channel.__uri -@exec mkdir -p %D/lib/php/pear/.registry/.channel.pecl.php.net -@exec touch %D/lib/php/pear/.channels/.alias/pear.txt -@exec touch %D/lib/php/pear/.channels/.alias/pecl.txt -@exec touch %D/lib/php/pear/.channels/__uri.reg -@exec touch %D/lib/php/pear/.channels/pear.php.net.reg -@exec touch %D/lib/php/pear/.channels/pecl.php.net.reg -@exec touch %D/lib/php/pear/.depdb -@exec touch %D/lib/php/pear/.depdblock -@exec touch %D/lib/php/pear/.filemap -@exec touch %D/lib/php/pear/.lock -share/pear/bootstrap/Archive/Tar.php -share/pear/bootstrap/PEAR.php -share/pear/bootstrap/System.php -share/pear/bootstrap/Console/Getopt.php -share/pear/bootstrap/OS/Guess.php -share/pear/bootstrap/PEAR/Autoloader.php -share/pear/bootstrap/PEAR/Builder.php -share/pear/bootstrap/PEAR/Command.php -share/pear/bootstrap/PEAR/Command/Auth.php -share/pear/bootstrap/PEAR/Command/Build.php -share/pear/bootstrap/PEAR/Command/Common.php -share/pear/bootstrap/PEAR/Command/Config.php -share/pear/bootstrap/PEAR/Command/Install.php -share/pear/bootstrap/PEAR/Command/Mirror.php -share/pear/bootstrap/PEAR/Command/Package.php -share/pear/bootstrap/PEAR/Command/Registry.php -share/pear/bootstrap/PEAR/Command/Remote.php -share/pear/bootstrap/PEAR/Common.php -share/pear/bootstrap/PEAR/Config.php -share/pear/bootstrap/PEAR/Dependency.php -share/pear/bootstrap/PEAR/DependencyDB.php -share/pear/bootstrap/PEAR/Downloader.php -share/pear/bootstrap/PEAR/ErrorStack.php -share/pear/bootstrap/PEAR/Exception.php -share/pear/bootstrap/PEAR/Frontend/CLI.php -share/pear/bootstrap/PEAR/Installer.php -share/pear/bootstrap/PEAR/Packager.php -share/pear/bootstrap/PEAR/Registry.php -share/pear/bootstrap/PEAR/Remote.php -share/pear/bootstrap/PEAR/RunTest.php -share/pear/bootstrap/XML/RPC.php -share/pear/bootstrap/XML/RPC/Server.php -@unexec rm %D/lib/php/pear/.channels/.alias/pear.txt 2> /dev/null || true -@unexec rm %D/lib/php/pear/.channels/.alias/pecl.txt 2> /dev/null || true -@unexec rm %D/lib/php/pear/.channels/__uri.reg 2> /dev/null || true -@unexec rm %D/lib/php/pear/.channels/pear.php.net.reg 2> /dev/null || true -@unexec rm %D/lib/php/pear/.channels/pecl.php.net.reg 2> /dev/null || true -@unexec rm %D/lib/php/pear/.depdb 2> /dev/null || true -@unexec rm %D/lib/php/pear/.depdblock 2> /dev/null || true -@unexec rm %D/lib/php/pear/.filemap 2> /dev/null || true -@unexec rm %D/lib/php/pear/.lock 2> /dev/null || true -@unexec rmdir %D/lib/php/pear/.channels/.alias 2> /dev/null || true -@unexec rmdir %D/lib/php/pear/.channels 2> /dev/null || true -@unexec rmdir %D/lib/php/pear/.registry/.channel.__uri 2> /dev/null || true -@unexec rmdir %D/lib/php/pear/.registry/.channel.pecl.php.net 2> /dev/null || true -@unexec rmdir %D/lib/php/pear/.registry 2> /dev/null || true -@unexec rmdir %D/lib/php/pear 2> /dev/null || true -@unexec rmdir %D/lib/php 2> /dev/null || true -@dirrm share/pear/bootstrap/Archive -@dirrm share/pear/bootstrap/Console -@dirrm share/pear/bootstrap/OS -@dirrm share/pear/bootstrap/PEAR/Command -@dirrm share/pear/bootstrap/PEAR/Frontend -@dirrm share/pear/bootstrap/PEAR -@dirrm share/pear/bootstrap/XML/RPC -@dirrm share/pear/bootstrap/XML -@dirrm share/pear/bootstrap -@unexec rmdir %D/share/pear 2> /dev/null || true diff --git a/net/Makefile b/net/Makefile index 8ecf70c4a049..3ff4a2bbea4f 100644 --- a/net/Makefile +++ b/net/Makefile @@ -559,7 +559,6 @@ SUBDIR += php5-soap SUBDIR += php5-sockets SUBDIR += php5-xmlrpc - SUBDIR += php5-yp SUBDIR += phpldapadmin SUBDIR += pipsecd SUBDIR += plb diff --git a/net/php5-ldap/files/patch-config.m4 b/net/php5-ldap/files/patch-config.m4 deleted file mode 100644 index a30ff8d70ddb..000000000000 --- a/net/php5-ldap/files/patch-config.m4 +++ /dev/null @@ -1,22 +0,0 @@ ---- config.m4.orig Sun May 8 17:59:18 2005 -+++ config.m4 Thu Sep 8 12:29:22 2005 -@@ -161,17 +161,18 @@ - _SAVE_CPPFLAGS=$CPPFLAGS - _SAVE_LDFLAGS=$LDFLAGS - CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR" -+ LDFLAGS="$LDFLAGS $LDAP_SHARED_LIBADD" - AC_CACHE_CHECK([for 3 arg ldap_set_rebind_proc], ac_cv_3arg_setrebindproc, - [AC_TRY_COMPILE([#include <ldap.h>], [ldap_set_rebind_proc(0,0,0)], - ac_cv_3arg_setrebindproc=yes, ac_cv_3arg_setrebindproc=no)]) - if test "$ac_cv_3arg_setrebindproc" = yes; then - AC_DEFINE(HAVE_3ARG_SETREBINDPROC,1,[Whether 3 arg set_rebind_proc()]) - fi -- CPPFLAGS=$_SAVE_CPPFLAGS - - dnl Solaris 2.8 claims to be 2004 API, but doesn't have - dnl ldap_parse_reference() nor ldap_start_tls_s() - AC_CHECK_FUNCS([ldap_parse_result ldap_parse_reference ldap_start_tls_s]) -+ CPPFLAGS=$_SAVE_CPPFLAGS - LDFLAGS=$_SAVE_LDFLAGS - - dnl diff --git a/net/php5-yp/Makefile b/net/php5-yp/Makefile deleted file mode 100644 index 7f235b91fcc1..000000000000 --- a/net/php5-yp/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# New ports collection makefile for: php5-yp -# Date created: 7 Jul 2004 -# Whom: Alex Dupre <ale@FreeBSD.org> -# -# $FreeBSD$ -# - -CATEGORIES= net - -MASTERDIR= ${.CURDIR}/../../lang/php5 - -PKGNAMESUFFIX= -yp - -.include "${MASTERDIR}/Makefile" diff --git a/www/Makefile b/www/Makefile index 1b1119d42f4b..3a6d67b29b55 100644 --- a/www/Makefile +++ b/www/Makefile @@ -702,7 +702,6 @@ SUBDIR += php4-mnogosearch SUBDIR += php4-session SUBDIR += php5-cgi - SUBDIR += php5-mnogosearch SUBDIR += php5-session SUBDIR += php5-tidy SUBDIR += phpSysInfo diff --git a/www/php5-mnogosearch/Makefile b/www/php5-mnogosearch/Makefile deleted file mode 100644 index 949071d4c2a5..000000000000 --- a/www/php5-mnogosearch/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# New ports collection makefile for: php5-mnogosearch -# Date created: 7 Jul 2004 -# Whom: Alex Dupre <ale@FreeBSD.org> -# -# $FreeBSD$ -# - -CATEGORIES= www - -MASTERDIR= ${.CURDIR}/../../lang/php5 - -PKGNAMESUFFIX= -mnogosearch - -.include "${MASTERDIR}/Makefile" |