aboutsummaryrefslogtreecommitdiffstats
path: root/deskutils/libstreams
diff options
context:
space:
mode:
authorrakuco <rakuco@FreeBSD.org>2015-09-03 23:44:13 +0800
committerrakuco <rakuco@FreeBSD.org>2015-09-03 23:44:13 +0800
commit960b6262cbb3e8ae7f17dc58f88490ad2b0ee41a (patch)
tree05f83f4626cc97a41e5a29dca71409286f46ae35 /deskutils/libstreams
parent99dabafbcc120d9a2df35d151fc40a7a35aedaef (diff)
downloadfreebsd-ports-gnome-960b6262cbb3e8ae7f17dc58f88490ad2b0ee41a.tar.gz
freebsd-ports-gnome-960b6262cbb3e8ae7f17dc58f88490ad2b0ee41a.tar.zst
freebsd-ports-gnome-960b6262cbb3e8ae7f17dc58f88490ad2b0ee41a.zip
Uses/iconv.mk: Set iconv-related CMake variables.
The way we deal with iconv in base and ports across different FreeBSD releases is complicated: 9.x does not have iconv.h in base, 10.1 has it with a different prototype for iconv(3) and later versions have the right iconv(3) prototype. And, in some cases (USES=iconv:{translit,wchar_t}), we must always use the libiconv port. This is why there are so many checks in Uses/iconv.mk: we need to know the situation we currently have in order to decide whether to pull iconv from converters/libiconv, whether to just use its header (and pull the library from base) or whether to use everything from base. r384038 adjusted several CMake-based ports, but did so in a way that was not very scalable and required a few intrusive patches to some ports. Most ports that have both USES=cmake and USES=iconv use variations of FindIconv.cmake that behave similarly. This change passes the header and library values we really want to use to CMake using the most common variable names, bypassing the calls to find_path() and find_library() that would sometimes end up finding the wrong file. The few ports that use different variable names have had their Makefiles adjusted (we manually pass the values we want via CMAKE_ARGS). Other changes: - chinese/fcitx: Explicitly set LIBICONV_LIBC_HAS_ICONV_OPEN=OFF as we always want the version from ports because of USES=iconv:wchar_t. - editors/calligra: Explicitly use iconv:translit because Kexi needs it. - irc/weechat and irc/weechat-devel: The FindIconv.cmake patches could not be entirely removed because the check_library_exists() calls are wrong. Sent upstream: https://github.com/weechat/weechat/pull/513 - textproc/ctpp2: Use iconv:translit when the TRANSLITERATE option is used. PORTREVISION has been bumped in editors/calligra and textproc/ctpp2 because their dependency list has changed in 10.2 and later as the ports version is always used now. PR: 202798 Reviewed by: antoine, tijl Approved by: portmgr (antoine)
Diffstat (limited to 'deskutils/libstreams')
-rw-r--r--deskutils/libstreams/Makefile8
1 files changed, 1 insertions, 7 deletions
diff --git a/deskutils/libstreams/Makefile b/deskutils/libstreams/Makefile
index d5096edd6192..b71d4da11134 100644
--- a/deskutils/libstreams/Makefile
+++ b/deskutils/libstreams/Makefile
@@ -18,10 +18,4 @@ post-patch:
${WRKSRC}/libstreams/CMakeLists.txt
.include <${.CURDIR}/../strigi/Makefile.common>
-.include <bsd.port.pre.mk>
-
-.if empty(ICONV_LIB)
-CMAKE_ARGS+= -DICONV_LIBRARIES:STRING="/usr/lib/libc.so"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>