diff options
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 | 1 |
4 files changed, 10 insertions, 9 deletions
diff --git a/lang/php4/Makefile b/lang/php4/Makefile index 9959dca7a3c9..6d0cc38abc47 100644 --- a/lang/php4/Makefile +++ b/lang/php4/Makefile @@ -20,7 +20,7 @@ # PORTNAME= php4 -PORTVERSION= 4.3.3.r2 +PORTVERSION= 4.3.3.r4 PORTREVISION= 0 CATEGORIES?= lang devel www MASTER_SITES= http://www.php.net/distributions/:release \ @@ -137,8 +137,6 @@ BATCH= yes IS_INTERACTIVE= yes .endif -PBDIR= ${PREFIX}/share/pear/boot - .include <bsd.port.pre.mk> .if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6) @@ -435,11 +433,13 @@ CONFIGURE_ARGS+=--with-ncurses=${NCURSESBASE} .if defined(WITH_OPENLDAP) .if exists(${LOCALBASE}/lib/libldap.so.1) LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap12 -.elif exists(${LOCALBASE}/lib/libldap.la) -.if exists(${LOCALBASE}/bin/ldapwhoami) -LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21-client -.else +.elif exists(${LOCALBASE}/lib/libldap.so.2) +.if exists(${LOCALBASE}/include/srchpref.h) LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20-client +.elif exists(${LOCALBASE}/include/slapi-plugin.h) +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap22-client +.else +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21-client .endif .else LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap22-client diff --git a/lang/php4/distinfo b/lang/php4/distinfo index 0ef7e51f748d..df1daf1791c2 100644 --- a/lang/php4/distinfo +++ b/lang/php4/distinfo @@ -1 +1 @@ -MD5 (php-4.3.3RC2.tar.bz2) = bc8cda0bd523c653d0900a460117c2af +MD5 (php-4.3.3RC4.tar.bz2) = 7d362a89977891f76b54179787b981de diff --git a/lang/php4/files/patch-configure b/lang/php4/files/patch-configure index 20e1bccefbd6..acf76d563b6e 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:58980: checking Oracle version" >&5 + echo "configure:58981: 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 02e3314ccb4b..7dc4dd74285d 100644 --- a/lang/php4/pkg-plist +++ b/lang/php4/pkg-plist @@ -211,6 +211,7 @@ lib/php/build/shtool %%CLI%%share/pear/bootstrap/PEAR/Command/Common.php %%CLI%%share/pear/bootstrap/PEAR/Command/Config.php %%CLI%%share/pear/bootstrap/PEAR/Command/Install.php +%%CLI%%share/pear/bootstrap/PEAR/Command/Mirror.php %%CLI%%share/pear/bootstrap/PEAR/Command/Package.php %%CLI%%share/pear/bootstrap/PEAR/Command/Registry.php %%CLI%%share/pear/bootstrap/PEAR/Command/Remote.php |