From owner-svn-ports-head@FreeBSD.ORG Thu May 15 08:08:24 2014 Return-Path: Delivered-To: svn-ports-head@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 73A97503; Thu, 15 May 2014 08:08:24 +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 60F432D6C; Thu, 15 May 2014 08:08:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4F88Oav048382; Thu, 15 May 2014 08:08:24 GMT (envelope-from ale@svn.freebsd.org) Received: (from ale@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4F88NS7048377; Thu, 15 May 2014 08:08:23 GMT (envelope-from ale@svn.freebsd.org) Message-Id: <201405150808.s4F88NS7048377@svn.freebsd.org> From: Alex Dupre Date: Thu, 15 May 2014 08:08:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354103 - in head: lang/php5 lang/php55 net/php5-xmlrpc/files net/php55-xmlrpc/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-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 May 2014 08:08:24 -0000 Author: ale Date: Thu May 15 08:08:23 2014 New Revision: 354103 URL: http://svnweb.freebsd.org/changeset/ports/354103 QAT: https://qat.redports.org/buildarchive/r354103/ Log: Fix build of xmlrpc extension. Added: head/net/php5-xmlrpc/files/ head/net/php5-xmlrpc/files/patch-config.m4 (contents, props changed) head/net/php55-xmlrpc/files/ head/net/php55-xmlrpc/files/patch-config.m4 (contents, props changed) Modified: head/lang/php5/Makefile.ext head/lang/php55/Makefile.ext Modified: head/lang/php5/Makefile.ext ============================================================================== --- head/lang/php5/Makefile.ext Thu May 15 07:46:37 2014 (r354102) +++ head/lang/php5/Makefile.ext Thu May 15 08:08:23 2014 (r354103) @@ -427,7 +427,7 @@ CONFIGURE_ARGS+=--with-xmlrpc \ --with-libxml-dir=${LOCALBASE} \ --with-iconv-dir=${LOCALBASE} -USES+= iconv::translit +USES+= iconv:translit USE_GNOME= libxml2 PHP_HEADER_DIRS=libxmlrpc Modified: head/lang/php55/Makefile.ext ============================================================================== --- head/lang/php55/Makefile.ext Thu May 15 07:46:37 2014 (r354102) +++ head/lang/php55/Makefile.ext Thu May 15 08:08:23 2014 (r354103) @@ -431,7 +431,7 @@ CONFIGURE_ARGS+=--with-xmlrpc \ --with-libxml-dir=${LOCALBASE} \ --with-iconv-dir=${LOCALBASE} -USES+= iconv::translit +USES+= iconv:translit USE_GNOME= libxml2 PHP_HEADER_DIRS=libxmlrpc Added: head/net/php5-xmlrpc/files/patch-config.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/php5-xmlrpc/files/patch-config.m4 Thu May 15 08:08:23 2014 (r354103) @@ -0,0 +1,23 @@ +--- config.m4.orig 2014-05-15 08:00:57.801291749 +0000 ++++ config.m4 2014-05-15 08:01:40.161014307 +0000 +@@ -61,11 +61,9 @@ + fi + fi + +- dnl if iconv is shared or missing then we should build iconv ourselves +- if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then +- + if test "$PHP_ICONV_DIR" != "no"; then + PHP_ICONV=$PHP_ICONV_DIR ++ PHP_ADD_INCLUDE($PHP_ICONV_DIR/include) + fi + + if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then +@@ -75,7 +73,6 @@ + PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [ + AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library]) + ]) +- fi + fi + + if test "$PHP_XMLRPC" = "yes"; then Added: head/net/php55-xmlrpc/files/patch-config.m4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/php55-xmlrpc/files/patch-config.m4 Thu May 15 08:08:23 2014 (r354103) @@ -0,0 +1,23 @@ +--- config.m4.orig 2014-04-29 08:04:30.000000000 +0000 ++++ config.m4 2014-05-15 08:04:00.883004682 +0000 +@@ -61,11 +61,9 @@ if test "$PHP_XMLRPC" != "no"; then + fi + fi + +- dnl if iconv is shared or missing then we should build iconv ourselves +- if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then +- + if test "$PHP_ICONV_DIR" != "no"; then + PHP_ICONV=$PHP_ICONV_DIR ++ PHP_ADD_INCLUDE($PHP_ICONV_DIR/include) + fi + + if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then +@@ -75,7 +73,6 @@ if test "$PHP_XMLRPC" != "no"; then + PHP_SETUP_ICONV(XMLRPC_SHARED_LIBADD, [], [ + AC_MSG_ERROR([iconv not found, in order to build xmlrpc you need the iconv library]) + ]) +- fi + fi + + if test "$PHP_XMLRPC" = "yes"; then