Date: Tue, 19 Aug 2003 00:34:49 +0200 (CEST) From: Alex Dupre <sysadmin@alexdupre.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: nork@FreeBSD.org Subject: ports/55713: [Maintainer Update] Port: PHP 4.3.3RC4 Message-ID: <200308182234.h7IMYnew044996@vaio.alexdupre.com> Resent-Message-ID: <200308182240.h7IMe8o7032263@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 55713 >Category: ports >Synopsis: [Maintainer Update] Port: PHP 4.3.3RC4 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Aug 18 15:40:07 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Alex Dupre >Release: FreeBSD 4.8-ALEXDUPRE i386 >Organization: >Environment: System: FreeBSD 4.8-ALEXDUPRE i386 >Description: Update to 4.3.3RC4. Fix OpenLdap auto-detection. >How-To-Repeat: >Fix: --- php4.diff begins here --- diff -ruN php4.orig/Makefile php4/Makefile --- php4.orig/Makefile Fri Aug 15 02:49:25 2003 +++ php4/Makefile Tue Aug 19 00:32:53 2003 @@ -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 @@ IS_INTERACTIVE= yes .endif -PBDIR= ${PREFIX}/share/pear/boot - .include <bsd.port.pre.mk> .if ${OSVERSION} < 400014 || defined(WITHOUT_IPV6) @@ -435,11 +433,13 @@ .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 -ruN php4.orig/distinfo php4/distinfo --- php4.orig/distinfo Thu Jul 31 09:57:01 2003 +++ php4/distinfo Mon Aug 18 23:51:27 2003 @@ -1 +1 @@ -MD5 (php-4.3.3RC2.tar.bz2) = bc8cda0bd523c653d0900a460117c2af +MD5 (php-4.3.3RC4.tar.bz2) = 7d362a89977891f76b54179787b981de diff -ruN php4.orig/files/patch-configure php4/files/patch-configure --- php4.orig/files/patch-configure Thu Jul 31 09:57:01 2003 +++ php4/files/patch-configure Mon Aug 18 23:36:05 2003 @@ -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 -ruN php4.orig/pkg-plist php4/pkg-plist --- php4.orig/pkg-plist Thu Jul 31 09:57:01 2003 +++ php4/pkg-plist Mon Aug 18 23:36:06 2003 @@ -211,6 +211,7 @@ %%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 --- php4.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200308182234.h7IMYnew044996>