ports/57609: [Maintainer Patch] Port: lang/php4

[Alex Dupre]

>Number:         57609
>Category:       ports
>Synopsis:       [Maintainer Patch] Port: lang/php4
>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:   Sun Oct 05 06:50:19 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Alex Dupre
>Release:        FreeBSD 4.9-ALEXDUPRE i386
>Organization:
>Environment:
System: FreeBSD 4.9-ALEXDUPRE i386
>Description:
Fix openssl/openldap/mysql/iconv/xml dependencies.
>How-To-Repeat:
>Fix:

--- php4.diff begins here ---
diff -ruN php4.orig/Makefile php4/Makefile
--- php4.orig/Makefile	Sun Oct  5 12:45:08 2003
+++ php4/Makefile	Sun Oct  5 14:46:53 2003
@@ -353,6 +353,7 @@
 
 .if defined(WITH_ICONV) || defined(WITH_ICONV_DEP)
 LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
+CONFIGURE_ARGS+=--with-iconv-dir=${LOCALBASE}
 .endif
 
 .if defined(WITH_ICONV)
@@ -420,7 +421,13 @@
 .endif
 
 .if defined(WITH_MYSQL)
-USE_MYSQL=	yes
+.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.10)
+LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+.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
 CONFIGURE_ARGS+=--with-mysql=${LOCALBASE}
 .endif
 
@@ -435,12 +442,19 @@
 .endif
 
 .if defined(WITH_OPENLDAP)
-USE_OPENLDAP=	yes
+.if exists(${LOCALBASE}/lib/libldap.so.1)
+LIB_DEPENDS+=	ldap.1:${PORTSDIR}/net/openldap12
+.else
+WANT_OPENLDAP_VER?=	21
+LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap${WANT_OPENLDAP_VER}-client
+.endif
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 .endif
 
 .if defined(WITH_OPENSSL) || defined(WITH_OPENSSL_DEP)
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
+LDFLAGS+=	-lcrypto -lssl
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS+=--with-openssl-dir=${OPENSSLBASE}
 .endif
 
@@ -548,10 +562,11 @@
 
 .if defined(WITH_XML) || defined(WITH_XML_DEP)
 LIB_DEPENDS+=	expat.4:${PORTSDIR}/textproc/expat2
+CONFIGURE_ARGS+=--with-expat-dir=${LOCALBASE}
 .endif
 
 .if defined(WITH_XML)
-CONFIGURE_ARGS+=--enable-xml --with-expat-dir=${LOCALBASE}
+CONFIGURE_ARGS+=--enable-xml
 .endif
 
 .if defined(WITH_XMLRPC)
--- php4.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: