diff options
| -rw-r--r-- | Mk/bsd.php.mk | 4 | ||||
| -rw-r--r-- | lang/php4/Makefile | 7 | ||||
| -rw-r--r-- | lang/php4/Makefile.pear | 2 | ||||
| -rw-r--r-- | lang/php4/distinfo | 4 | ||||
| -rw-r--r-- | lang/php4/files/patch-pear::Makefile.frag | 2 | ||||
| -rw-r--r-- | lang/php4/files/patch-scripts::Makefile.frag | 35 | ||||
| -rw-r--r-- | lang/php4/files/patch-scripts::phpize.in | 24 | ||||
| -rw-r--r-- | lang/php4/pkg-plist | 1 |
8 files changed, 43 insertions, 36 deletions
diff --git a/Mk/bsd.php.mk b/Mk/bsd.php.mk index 7556ffceb53b..451cfd233580 100644 --- a/Mk/bsd.php.mk +++ b/Mk/bsd.php.mk @@ -168,8 +168,12 @@ PLIST_SUB+= PHP_EXT_DIR=${PHP_EXT_DIR} .if defined(USE_PHPIZE) || defined(USE_PHPEXT) BUILD_DEPENDS+= phpize:${PHP_PORT} GNU_CONFIGURE= YES +.if ${PHP_VER} == 4 +WANT_AUTOCONF_VER= 259 +.else WANT_AUTOMAKE_VER= 15 WANT_AUTOCONF_VER= 253 +.endif CONFIGURE_ARGS+=--with-php-config=${LOCALBASE}/bin/php-config configure-message: phpize-message do-phpize diff --git a/lang/php4/Makefile b/lang/php4/Makefile index 8c567b270463..c9edf38473a1 100644 --- a/lang/php4/Makefile +++ b/lang/php4/Makefile @@ -6,8 +6,8 @@ # PORTNAME= php4 -PORTVERSION= 4.3.11 -PORTREVISION?= 1 +PORTVERSION= 4.4.0 +PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \ http://downloads.php.net/ilia/:rc \ @@ -84,9 +84,10 @@ CONFLICTS+= php5-5* php5-cli-5* mod_php5-5* php5-cgi-5* CONFIGURE_ARGS+=--disable-cli .endif +MAN1= php-config.1 phpize.1 .if ${PHP_SAPI} == "full" || ${PHP_SAPI} == "cli" PLIST_SUB+= CLI="" -MAN1= php.1 +MAN1+= php.1 .else PLIST_SUB+= CLI="@comment " .endif diff --git a/lang/php4/Makefile.pear b/lang/php4/Makefile.pear index dc09d2be81fd..f49c4e7b460f 100644 --- a/lang/php4/Makefile.pear +++ b/lang/php4/Makefile.pear @@ -1,4 +1,4 @@ -PORTREVISION= 3 +PORTREVISION= 0 LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2 diff --git a/lang/php4/distinfo b/lang/php4/distinfo index c1655cc872e4..f5409e3e2e7a 100644 --- a/lang/php4/distinfo +++ b/lang/php4/distinfo @@ -1,2 +1,2 @@ -MD5 (php-4.3.11.tar.bz2) = fbc67d240812136a9842bc1f2a217b7a -SIZE (php-4.3.11.tar.bz2) = 4012575 +MD5 (php-4.4.0.tar.bz2) = e85b606fe48198bfcd785e5a5b1c9613 +SIZE (php-4.4.0.tar.bz2) = 4086074 diff --git a/lang/php4/files/patch-pear::Makefile.frag b/lang/php4/files/patch-pear::Makefile.frag index 082aa5e74fb8..aec8fdddbf09 100644 --- a/lang/php4/files/patch-pear::Makefile.frag +++ b/lang/php4/files/patch-pear::Makefile.frag @@ -4,7 +4,7 @@ # -*- makefile -*- peardir=$(PEAR_INSTALLDIR) -+XML_RPC_ver=1.2.2 ++XML_RPC_ver=1.3.1 # Skip all php.ini files altogether PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 diff --git a/lang/php4/files/patch-scripts::Makefile.frag b/lang/php4/files/patch-scripts::Makefile.frag index 6a3f941cb2ff..c0d6f9c744e3 100644 --- a/lang/php4/files/patch-scripts::Makefile.frag +++ b/lang/php4/files/patch-scripts::Makefile.frag @@ -1,17 +1,22 @@ ---- scripts/Makefile.frag.orig Wed Jul 7 13:15:53 2004 -+++ scripts/Makefile.frag Wed Jul 7 13:16:07 2004 -@@ -27,14 +27,7 @@ - Zend \ - TSRM \ - ext/standard \ -- ext/session \ -- ext/xml \ -- ext/xml/expat \ - main \ -- ext/mbstring \ -- ext/mbstring/libmbfl \ -- ext/mbstring/libmbfl/mbfl \ -- ext/pgsql \ - regex +--- scripts/Makefile.frag.orig Wed Jun 8 12:34:41 2005 ++++ scripts/Makefile.frag Wed Jul 13 09:28:45 2005 +@@ -34,18 +34,9 @@ + / \ + Zend/ \ + TSRM/ \ +- include/ \ + main/ \ + regex/ \ +- ext/iconv/ \ +- ext/pgsql/ \ +- ext/standard/ \ +- ext/session/ \ +- ext/xml/ \ +- ext/xml/expat/ \ +- ext/mbstring/ \ +- ext/mbstring/libmbfl/ \ +- ext/mbstring/libmbfl/mbfl/ ++ ext/standard/ install-headers: + -@for i in $(HEADER_DIRS); do \ diff --git a/lang/php4/files/patch-scripts::phpize.in b/lang/php4/files/patch-scripts::phpize.in index 8b250b897908..83f38a656499 100644 --- a/lang/php4/files/patch-scripts::phpize.in +++ b/lang/php4/files/patch-scripts::phpize.in @@ -1,15 +1,13 @@ ---- scripts/phpize.in.orig Fri Apr 1 11:37:05 2005 -+++ scripts/phpize.in Fri Apr 1 11:37:25 2005 -@@ -102,9 +102,9 @@ +--- scripts/phpize.in.orig Wed Jun 15 19:13:52 2005 ++++ scripts/phpize.in Wed Jul 13 09:30:59 2005 +@@ -94,8 +94,8 @@ - phpize_autotools() + phpize_check_autotools() { -- aclocal || exit 1 -- autoconf || exit 1 -- autoheader || exit 1 -+ aclocal15 || exit 1 -+ autoconf253 || exit 1 -+ autoheader253 || exit 1 - } - - # Main script +- test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf +- test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader ++ test -z "$PHP_AUTOCONF" && PHP_AUTOCONF=autoconf259 ++ test -z "$PHP_AUTOHEADER" && PHP_AUTOHEADER=autoheader259 + + if ! test -x "`$php_shtool path $PHP_AUTOCONF`"; then + cat <<EOF diff --git a/lang/php4/pkg-plist b/lang/php4/pkg-plist index 77fba0c8ea20..8d3460b38be2 100644 --- a/lang/php4/pkg-plist +++ b/lang/php4/pkg-plist @@ -1,6 +1,5 @@ %%CLI%%bin/php bin/php-config -bin/phpextdist bin/phpize etc/php.conf etc/php.ini-dist |