diff options
| author | nork <nork@FreeBSD.org> | 2003-07-31 15:57:01 +0800 |
|---|---|---|
| committer | nork <nork@FreeBSD.org> | 2003-07-31 15:57:01 +0800 |
| commit | 65817201fb40990de723e20fcb0fb755498af375 (patch) | |
| tree | 6987403c8de6ce77c0f37a1b20918088b6dfd658 /lang/php4/Makefile | |
| parent | 427877706ca37e143fe399e2bc3eee5b3ef17a85 (diff) | |
| download | freebsd-ports-graphics-65817201fb40990de723e20fcb0fb755498af375.tar.gz freebsd-ports-graphics-65817201fb40990de723e20fcb0fb755498af375.tar.zst freebsd-ports-graphics-65817201fb40990de723e20fcb0fb755498af375.zip | |
o Update to 4.3.3RC2.
o Add identification to php4 configuration dialog [1].
o Fix incorrect detecting of OpenLDAP dependency [2].
PR: ports/55100, ports/54283[1], ports/54726[2]
Submitted by: Alex Dupre <sysadmin@alexdupre.com> (maintainer)
Mark Linimon <linimon@lonesome.com> [1]
Jens Rehsack <rehsack@liwing.de> [2]
Diffstat (limited to 'lang/php4/Makefile')
| -rw-r--r-- | lang/php4/Makefile | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/lang/php4/Makefile b/lang/php4/Makefile index b3693984520..99e2b4b1bf3 100644 --- a/lang/php4/Makefile +++ b/lang/php4/Makefile @@ -20,8 +20,8 @@ # PORTNAME= php4 -PORTVERSION= 4.3.3.r1 -PORTREVISION= 1 +PORTVERSION= 4.3.3.r2 +PORTREVISION= 0 CATEGORIES?= lang devel www MASTER_SITES= http://www.php.net/distributions/ \ http://it.php.net/distributions/ \ @@ -98,6 +98,7 @@ CONFLICTS= php4-4* php4-cgi-4* mod_php4-4* CONFLICTS= php4-4* php4-cli-4* php4-cgi-4* .endif .endif +CONFLICTS+= php5-5* php5-cli-5* mod_php5-5* php5-cgi-5* .if defined(WITHOUT_APACHE) CONFIGURE_ARGS+=--enable-discard-path @@ -411,13 +412,11 @@ CONFIGURE_ARGS+=--with-ming=${LOCALBASE} .if defined(WITH_MYSQL) .if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.10) LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -.else -.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.14) +.elif exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.14) LIB_DEPENDS+= mysqlclient.14:${PORTSDIR}/databases/mysql41-client .else LIB_DEPENDS+= mysqlclient.12:${PORTSDIR}/databases/mysql40-client .endif -.endif CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} .endif @@ -434,8 +433,14 @@ CONFIGURE_ARGS+=--with-ncurses=${NCURSESBASE} .if defined(WITH_OPENLDAP) .if exists(${LOCALBASE}/lib/libldap.so.1) LIB_DEPENDS+= ldap.1:${PORTSDIR}/net/openldap12 -.else +.elif exists(${LOCALBASE}/lib/libldap.la) +.if exists(${LOCALBASE}/bin/ldapwhoami) LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap21 +.else +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap20 +.endif +.else +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap22 .endif CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} .endif |