ports/186704: [patch] deskutils/libstreams: fix iconv detection

[Tijl Coosemans]

>Number:         186704
>Category:       ports
>Synopsis:       [patch] deskutils/libstreams: fix iconv detection
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 12 20:50:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Tijl Coosemans
>Release:        FreeBSD 11.0-CURRENT i386
>Organization:
>Environment:
>Description:
Always use iconv from libc on FreeBSD 10 even when libiconv is installed.
>How-To-Repeat:
>Fix:

--- strigi.patch begins here ---
Index: deskutils/libstreamanalyzer/Makefile
===================================================================
--- deskutils/libstreamanalyzer/Makefile	(revision 343867)
+++ deskutils/libstreamanalyzer/Makefile	(working copy)
@@ -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>
Index: deskutils/libstreams/Makefile
===================================================================
--- deskutils/libstreams/Makefile	(revision 343867)
+++ deskutils/libstreams/Makefile	(working copy)
@@ -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>
--- strigi.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: