diff options
| author | James E. Housley <jeh@FreeBSD.org> | 2003-11-05 11:06:59 +0000 |
|---|---|---|
| committer | James E. Housley <jeh@FreeBSD.org> | 2003-11-05 11:06:59 +0000 |
| commit | 7c34833e473f9b66b912a04dee95c6ec98357167 (patch) | |
| tree | 693aad04ec2643f03f0ecff00f9c4c06eb576341 /lang | |
| parent | 14988eebf4bf7cc15cf2823acfe60dc5b66b789e (diff) | |
| download | ports-7c34833e473f9b66b912a04dee95c6ec98357167.tar.gz ports-7c34833e473f9b66b912a04dee95c6ec98357167.zip | |
Update to 4.3.4 final release.
PR: 58914
Submitted by: MAINTAINER
Notes
Notes:
svn path=/head/; revision=93128
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/php4/Makefile | 14 | ||||
| -rw-r--r-- | lang/php4/distinfo | 2 | ||||
| -rw-r--r-- | lang/php4/files/patch-configure | 2 | ||||
| -rw-r--r-- | lang/php4/pkg-plist | 14 |
4 files changed, 6 insertions, 26 deletions
diff --git a/lang/php4/Makefile b/lang/php4/Makefile index 8ba3dbe30cf9..7223038f6c80 100644 --- a/lang/php4/Makefile +++ b/lang/php4/Makefile @@ -20,7 +20,7 @@ # PORTNAME= php4 -PORTVERSION= 4.3.4.r1 +PORTVERSION= 4.3.4 PORTREVISION= 0 CATEGORIES?= lang devel www MASTER_SITES= http://www.php.net/distributions/:release \ @@ -45,7 +45,7 @@ PKGNAMESUFFIX= -cli .endif .endif DISTNAME= php-${PORTVERSION:S/.r/RC/} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:rc +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:release MAINTAINER?= sysadmin@alexdupre.com COMMENT= PHP Scripting Language (Apache Module and CLI) @@ -143,13 +143,6 @@ BATCH= yes IS_INTERACTIVE= yes .endif -.if !defined(WITHOUT_APACHE) -APXS?= ${LOCALBASE}/sbin/apxs -PLIST_SUB+= APACHE="" -.else -PLIST_SUB+= APACHE="@comment " -.endif - WRKDIR?= ${WRKDIRPREFIX}${.CURDIR}/work PHP4_OPTFILE?= ${HOME}/php4_options @@ -342,7 +335,7 @@ CONFIGURE_ARGS+=--with-interbase=${LOCALBASE}/firebird .endif .if defined(WITH_MBSTRING) -CONFIGURE_ARGS+=--enable-mbstring --enable-mbregex +CONFIGURE_ARGS+=--enable-mbstring .endif .if defined(WITH_MCAL) @@ -529,6 +522,7 @@ CONFIGURE_ARGS+=--with-zlib=yes .include <bsd.port.pre.mk> .if !defined(WITHOUT_APACHE) +APXS?= ${LOCALBASE}/sbin/apxs .if exists(${LOCALBASE}/include/apache2/apr.h) WITH_APACHE2= yes .endif diff --git a/lang/php4/distinfo b/lang/php4/distinfo index f88ac89667fb..a1bb44aaf057 100644 --- a/lang/php4/distinfo +++ b/lang/php4/distinfo @@ -1 +1 @@ -MD5 (php-4.3.4RC1.tar.bz2) = f7ff7bf763f917b9f955e19caf77c1f1 +MD5 (php-4.3.4.tar.bz2) = b9dd601863e08e52e3c4d5e02c2627cf diff --git a/lang/php4/files/patch-configure b/lang/php4/files/patch-configure index 7e334b145d0b..2de827da56b8 100644 --- a/lang/php4/files/patch-configure +++ b/lang/php4/files/patch-configure @@ -228,7 +228,7 @@ @@ -58977,8 +59151,8 @@ echo $ac_n "checking Oracle version""... $ac_c" 1>&6 - echo "configure:59852: checking Oracle version" >&5 + echo "configure:60535: 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/php4/pkg-plist b/lang/php4/pkg-plist index a9003ed8367c..5d7da120700c 100644 --- a/lang/php4/pkg-plist +++ b/lang/php4/pkg-plist @@ -57,24 +57,10 @@ include/php/Zend/zend_static_allocator.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/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 |