svn commit: r391964 - in head/devel/ice: . files

[Michael Gmelin]

Author: grembo
Date: Mon Jul 13 21:53:23 2015
New Revision: 391964
URL: https://svnweb.freebsd.org/changeset/ports/391964

Log:
  Bring back support for new iconv from r384038.
  
  This fixes builds on FreeBSD versions without native iconv.
  This had been lost due to changes in the Ice code structure
  (iconv support moved from Ice to IceUtil).
  
  Approved by:	mentors (implicit)

Added:
  head/devel/ice/files/patch-cpp-include-IceUtil-IconvStringConverter.h   (contents, props changed)
Modified:
  head/devel/ice/Makefile

Modified: head/devel/ice/Makefile
==============================================================================
--- head/devel/ice/Makefile	Mon Jul 13 21:15:50 2015	(r391963)
+++ head/devel/ice/Makefile	Mon Jul 13 21:53:23 2015	(r391964)
@@ -125,12 +125,6 @@ post-patch:
 		s|%%INSTALL_DATA%%|${INSTALL_DATA}|g; \
 		s|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/php/config/Make.rules.php
-.if empty(ICONV_LIB)
-	# native iconv detected
-	@${REINPLACE_CMD} \
-		-e 's|<iconv.h>|</usr/include/iconv.h>|g;' \
-		${WRKSRC}/cpp/include/IceUtil/IconvStringConverter.h
-.endif
 
 .if ${PORT_OPTIONS:MTESTS}
 TEST_CMD=		@cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py

Added: head/devel/ice/files/patch-cpp-include-IceUtil-IconvStringConverter.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ice/files/patch-cpp-include-IceUtil-IconvStringConverter.h	Mon Jul 13 21:53:23 2015	(r391964)
@@ -0,0 +1,15 @@
+--- cpp/include/IceUtil/IconvStringConverter.h.orig	2013-10-04 15:48:14 UTC
++++ cpp/include/IceUtil/IconvStringConverter.h
+@@ -14,11 +14,11 @@
+ #include <IceUtil/UndefSysMacros.h>
+ 
+ #include <algorithm>
+ #include <iconv.h>
+ #include <langinfo.h>
+ #include <string.h> // For strerror
+ 
+-#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) || defined(__FreeBSD__)
++#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B)
+     //
+     // See http://sourceware.org/bugzilla/show_bug.cgi?id=2962
+     //