svn commit: r383178 - in head/chinese/fcitx: . files

[Xin LI]

Author: delphij
Date: Fri Apr  3 20:56:52 2015
New Revision: 383178
URL: https://svnweb.freebsd.org/changeset/ports/383178

Log:
  Fix build when building in an environment with old version of fcitx
  present.
  
  PR:		ports/199112
  Submitted by:	maintainer

Added:
  head/chinese/fcitx/files/patch-cmake__FindLibiconv.cmake   (contents, props changed)
Modified:
  head/chinese/fcitx/Makefile

Modified: head/chinese/fcitx/Makefile
==============================================================================
--- head/chinese/fcitx/Makefile	Fri Apr  3 20:53:27 2015	(r383177)
+++ head/chinese/fcitx/Makefile	Fri Apr  3 20:56:52 2015	(r383178)
@@ -33,10 +33,9 @@ CONFLICTS=	zh-scim-fcitx-3.*
 USE_GNOME=	pango intltool libxml2 introspection
 USE_XORG=	x11 xext xkbfile
 USE_LDCONFIG=	yes
-USES=		tar:xz cmake desktop-file-utils execinfo gettext iconv \
+USES=		tar:xz cmake desktop-file-utils execinfo gettext iconv:wchar_t \
 		pathfix pkgconfig shared-mime-info
 INSTALLS_ICONS=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 
 OPTIONS_DEFINE=	GTK2 GTK3 QT4 OPENCC TPUNC DOCS
 OPTIONS_DEFAULT=GTK2 QT4

Added: head/chinese/fcitx/files/patch-cmake__FindLibiconv.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/chinese/fcitx/files/patch-cmake__FindLibiconv.cmake	Fri Apr  3 20:56:52 2015	(r383178)
@@ -0,0 +1,11 @@
+--- cmake/FindLibiconv.cmake.orig	2015-04-03 02:44:55.321687654 +0000
++++ cmake/FindLibiconv.cmake	2015-04-03 02:46:05.734216729 +0000
+@@ -30,7 +30,7 @@ set(LIBICONV_LIB_FOUND FALSE)
+ 
+ if(LIBICONV_INCLUDE_DIR)
+   include(CheckFunctionExists)
+-  check_function_exists(iconv_open LIBICONV_LIBC_HAS_ICONV_OPEN)
++  set(LIBICONV_LIBC_HAS_ICONV_OPEN FALSE)
+ 
+   if (LIBICONV_LIBC_HAS_ICONV_OPEN)
+     set(LIBICONV_LIBRARIES)