diff options
| author | tijl <tijl@FreeBSD.org> | 2014-02-14 03:44:33 +0800 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2014-02-14 03:44:33 +0800 |
| commit | 6944d3871a9cfde73c807debbd00d1d6f70d4a3f (patch) | |
| tree | c4bc775fec5e9bf06834a1cee67d3bd4457fbb5d | |
| parent | 33e961ec4a15fea50a14cdfdb4a0d84eacadd69c (diff) | |
| download | freebsd-ports-gnome-6944d3871a9cfde73c807debbd00d1d6f70d4a3f.tar.gz freebsd-ports-gnome-6944d3871a9cfde73c807debbd00d1d6f70d4a3f.tar.zst freebsd-ports-gnome-6944d3871a9cfde73c807debbd00d1d6f70d4a3f.zip | |
Always use iconv from libc when available even when libiconv is installed.
PR: ports/186704
Approved by: kde (makc)
| -rw-r--r-- | deskutils/libstreamanalyzer/Makefile | 10 | ||||
| -rw-r--r-- | deskutils/libstreams/Makefile | 9 |
2 files changed, 16 insertions, 3 deletions
diff --git a/deskutils/libstreamanalyzer/Makefile b/deskutils/libstreamanalyzer/Makefile index 5555a99228d6..e8f0f9707f59 100644 --- a/deskutils/libstreamanalyzer/Makefile +++ b/deskutils/libstreamanalyzer/Makefile @@ -2,7 +2,7 @@ PORTNAME= libstreamanalyzer PORTVERSION= ${STRIGI_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils MASTER_SITES= ${STRIGI_MASTER_SITES} @@ -36,4 +36,10 @@ post-patch: ${WRKSRC}/libstreamanalyzer/CMakeLists.txt .include <${.CURDIR}/../strigi/Makefile.common> -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if empty(ICONV_LIB) +CMAKE_ARGS+= -DICONV_LIBRARIES:STRING="/usr/lib/libc.so" +.endif + +.include <bsd.port.post.mk> diff --git a/deskutils/libstreams/Makefile b/deskutils/libstreams/Makefile index f51778446e91..d5096edd6192 100644 --- a/deskutils/libstreams/Makefile +++ b/deskutils/libstreams/Makefile @@ -2,6 +2,7 @@ PORTNAME= libstreams PORTVERSION= ${STRIGI_VERSION} +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= ${STRIGI_MASTER_SITES} @@ -17,4 +18,10 @@ post-patch: ${WRKSRC}/libstreams/CMakeLists.txt .include <${.CURDIR}/../strigi/Makefile.common> -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if empty(ICONV_LIB) +CMAKE_ARGS+= -DICONV_LIBRARIES:STRING="/usr/lib/libc.so" +.endif + +.include <bsd.port.post.mk> |