Date: Thu, 13 Feb 2014 19:44:34 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344139 - in head/deskutils: libstreamanalyzer libstreams Message-ID: <201402131944.s1DJiYaL026903@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Thu Feb 13 19:44:33 2014 New Revision: 344139 URL: http://svnweb.freebsd.org/changeset/ports/344139 QAT: https://qat.redports.org/buildarchive/r344139/ Log: Always use iconv from libc when available even when libiconv is installed. PR: ports/186704 Approved by: kde (makc) Modified: head/deskutils/libstreamanalyzer/Makefile head/deskutils/libstreams/Makefile Modified: head/deskutils/libstreamanalyzer/Makefile ============================================================================== --- head/deskutils/libstreamanalyzer/Makefile Thu Feb 13 19:42:23 2014 (r344138) +++ head/deskutils/libstreamanalyzer/Makefile Thu Feb 13 19:44:33 2014 (r344139) @@ -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> Modified: head/deskutils/libstreams/Makefile ============================================================================== --- head/deskutils/libstreams/Makefile Thu Feb 13 19:42:23 2014 (r344138) +++ head/deskutils/libstreams/Makefile Thu Feb 13 19:44:33 2014 (r344139) @@ -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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402131944.s1DJiYaL026903>