From bbbb023fb360e982c8386a3deb043f000ce4fc1e Mon Sep 17 00:00:00 2001
From: ale <ale@FreeBSD.org>
Date: Wed, 14 May 2014 10:31:49 +0000
Subject: Fix build of a few extensions.

---
 lang/php55/Makefile.ext | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

(limited to 'lang')

diff --git a/lang/php55/Makefile.ext b/lang/php55/Makefile.ext
index 1e48b4247523..f7793db94d0b 100644
--- a/lang/php55/Makefile.ext
+++ b/lang/php55/Makefile.ext
@@ -126,7 +126,7 @@ CONFIGURE_ARGS+=--enable-hash \
 .endif
 
 .if ${PHP_MODNAME} == "iconv"
-CONFIGURE_ARGS+=--with-iconv
+CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
 
 USES+=	iconv:translit
 .endif
@@ -206,7 +206,10 @@ MYSQLND_DESC=	Use MySQL Native Driver
 .endif
 
 .if ${PHP_MODNAME} == "odbc"
-CONFIGURE_ARGS+=--enable-odbc
+LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
+
+CONFIGURE_ARGS+=--enable-odbc \
+		--with-unixODBC=${LOCALBASE}
 .endif
 
 .if ${PHP_MODNAME} == "openssl"
@@ -259,6 +262,9 @@ USE_PHP_BUILD=	yes
 .endif
 
 .if ${PHP_MODNAME} == "pdo_odbc"
+LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
+CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE}
+
 USE_PHP=	pdo
 USE_PHP_BUILD=	yes
 .endif
@@ -328,9 +334,9 @@ CONFIGURE_ARGS+=--enable-shmop
 
 .if ${PHP_MODNAME} == "simplexml"
 CONFIGURE_ARGS+=--enable-simplexml \
+		--with-pcre-dir=${LOCALBASE} \
 		--with-libxml-dir=${LOCALBASE}
 
-CFLAGS+=	-I${LOCALBASE}/include
 USES+=		pkgconfig
 USE_GNOME=	libxml2
 .endif
@@ -422,9 +428,10 @@ USE_PHP_BUILD=	yes
 
 .if ${PHP_MODNAME} == "xmlrpc"
 CONFIGURE_ARGS+=--with-xmlrpc \
-		--with-libxml-dir=${LOCALBASE}
+		--with-libxml-dir=${LOCALBASE} \
+		--with-iconv-dir=${LOCALBASE}
 
-USES+=		iconv
+USES+=		iconv::translit
 USE_GNOME=	libxml2
 
 PHP_HEADER_DIRS=libxmlrpc
@@ -552,11 +559,6 @@ post-extract:
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
 .endif
 
-.if ${PHP_MODNAME} == "odbc"
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
-CONFIGURE_ARGS+=--with-unixODBC=${LOCALBASE}
-.endif
-
 .if ${PHP_MODNAME} == "pdo_dblib"
 .	if ${PORT_OPTIONS:MMSSQL}
 LIB_DEPENDS+=	libsybdb.so:${PORTSDIR}/databases/freetds-msdblib
@@ -565,11 +567,6 @@ LIB_DEPENDS+=	libct.so:${PORTSDIR}/databases/freetds
 .	endif
 .endif
 
-.if ${PHP_MODNAME} == "pdo_odbc"
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
-CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE}
-.endif
-
 .if ${PHP_MODNAME} == "pdo_mysql"
 .	if ${PORT_OPTIONS:MMYSQLND}
 CONFIGURE_ARGS+=--with-pdo-mysql=mysqlnd
-- 
cgit