svn commit: r354103 - in head: lang/php5 lang/php55 net/php5-xmlrpc/files net/php55-xmlrpc/files

[Alex Dupre]

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