From owner-svn-ports-all@FreeBSD.ORG Wed May 14 10:31:50 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B2A7DA86; Wed, 14 May 2014 10:31:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9EA9E215A; Wed, 14 May 2014 10:31:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4EAVo5C060762; Wed, 14 May 2014 10:31:50 GMT (envelope-from ale@svn.freebsd.org) Received: (from ale@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4EAVocS060760; Wed, 14 May 2014 10:31:50 GMT (envelope-from ale@svn.freebsd.org) Message-Id: <201405141031.s4EAVocS060760@svn.freebsd.org> From: Alex Dupre Date: Wed, 14 May 2014 10:31:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354036 - in head: lang/php55 textproc/php55-simplexml/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 May 2014 10:31:50 -0000 Author: ale Date: Wed May 14 10:31:49 2014 New Revision: 354036 URL: http://svnweb.freebsd.org/changeset/ports/354036 QAT: https://qat.redports.org/buildarchive/r354036/ Log: Fix build of a few extensions. Added: head/textproc/php55-simplexml/files/ head/textproc/php55-simplexml/files/patch-config.m4 (contents, props changed) Modified: head/lang/php55/Makefile.ext Modified: head/lang/php55/Makefile.ext ============================================================================== --- head/lang/php55/Makefile.ext Wed May 14 10:20:08 2014 (r354035) +++ head/lang/php55/Makefile.ext Wed May 14 10:31:49 2014 (r354036) @@ -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}/datab . 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 Added: head/textproc/php55-simplexml/files/patch-config.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/php55-simplexml/files/patch-config.m4 Wed May 14 10:31:49 2014 (r354036) @@ -0,0 +1,43 @@ +--- config.m4.orig 2014-05-14 10:14:22.929420181 +0000 ++++ config.m4 2014-05-14 10:15:36.967414693 +0000 +@@ -4,6 +4,9 @@ + PHP_ARG_ENABLE(simplexml, whether to enable SimpleXML support, + [ --disable-simplexml Disable SimpleXML support], yes) + ++PHP_ARG_WITH(pcre-dir, pcre install prefix, ++[ --with-pcre-dir SimpleXML: pcre install prefix], no, no) ++ + if test -z "$PHP_LIBXML_DIR"; then + PHP_ARG_WITH(libxml-dir, libxml2 install dir, + [ --with-libxml-dir=DIR SimpleXML: libxml2 install prefix], no, no) +@@ -11,6 +14,30 @@ + + if test "$PHP_SIMPLEXML" != "no"; then + ++ dnl This is PECL build, check if bundled PCRE library is used ++ old_CPPFLAGS=$CPPFLAGS ++ CPPFLAGS=$INCLUDES ++ AC_EGREP_CPP(yes,[ ++#include
++#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) ++yes ++#endif ++ ],[ ++ PHP_PCRE_REGEX=yes ++ ],[ ++ AC_EGREP_CPP(yes,[ ++#include
++#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) ++yes ++#endif ++ ],[ ++ PHP_PCRE_REGEX=pecl ++ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include) ++ ],[ ++ PHP_PCRE_REGEX=no ++ ]) ++ ]) ++ + if test "$PHP_LIBXML" = "no"; then + AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --enable-libxml]) + fi