From 642be1b81d8342d3a3323f43bcf5a0bd87a5d363 Mon Sep 17 00:00:00 2001
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Wed, 4 Sep 2013 18:06:07 +0000
Subject: - Make ports use the libc provided iconv implementation on 10-CURRENT
   after r254273 - Fix a bunch of ports to properly work after this - Mark
 converters/libiconv as IGNORE for systems with iconv in libc

Reviewed by:	bapt
Approved by:	portmgr (bapt)
Discussed with:	bapt, bsam (who both contributed ideas and code)
---
 x11-wm/awesome2/Makefile | 2 +-
 x11-wm/fluxbox/Makefile  | 2 +-
 x11-wm/i3/Makefile       | 1 +
 x11-wm/pekwm/Makefile    | 2 +-
 x11-wm/wmii/Makefile     | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'x11-wm')

diff --git a/x11-wm/awesome2/Makefile b/x11-wm/awesome2/Makefile
index 7977ab49fce5..1a665be8bd15 100644
--- a/x11-wm/awesome2/Makefile
+++ b/x11-wm/awesome2/Makefile
@@ -49,7 +49,7 @@ post-patch:
 .	endfor
 
 post-configure:
-	@${REINPLACE_CMD} -E '/^awesome2_(message_)?LDADD/s/$$/ -liconv/g; \
+	@${REINPLACE_CMD} -E '/^awesome2_(message_)?LDADD/s/$$/ ${ICONV_LIB}/g; \
 			      /^doc_DATA/s/=.*$$/=/g' \
 		${WRKSRC}/Makefile
 
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index be557abdca42..0800957993ca 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -79,7 +79,7 @@ CONFIGURE_ARGS+=	--enable-xinerama
 
 .if ${PORT_OPTIONS:MNLS}
 USES+=			iconv
-CONFIGURE_ENV=		LIBS="-L${LOCALBASE}/lib -liconv"
+CONFIGURE_ENV=		LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}"
 CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--enable-nls
 PLIST_SUB+=		NLS=""
diff --git a/x11-wm/i3/Makefile b/x11-wm/i3/Makefile
index 3d55ecaf3a1a..31cc8f0d7520 100644
--- a/x11-wm/i3/Makefile
+++ b/x11-wm/i3/Makefile
@@ -70,6 +70,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/|${PREFIX}/|g' ${WRKSRC}/man/i3-input.1
 	@${REINPLACE_CMD} -e 's|.SILENT||g' ${WRKSRC}/common.mk
 	@${REINPLACE_CMD} -e 's|-Iinclude|-Iinclude -Isrc|g' \
+			  -e 's|-liconv|${ICONV_LIB}|' \
 			  -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/common.mk
 
 do-install:
diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile
index cb6ae79a5e19..d70d3012ed2e 100644
--- a/x11-wm/pekwm/Makefile
+++ b/x11-wm/pekwm/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+=--enable-shape --enable-xinerama --enable-xrandr \
 		--enable-image-png --disable-debug \
 		--disable-pedantic
 CFLAGS+=	-DICONV_CONST -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -liconv
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 MAN1=		pekwm.1
 MANCOMPRESSED=	no
 
diff --git a/x11-wm/wmii/Makefile b/x11-wm/wmii/Makefile
index e0936a506139..19200ce7e400 100644
--- a/x11-wm/wmii/Makefile
+++ b/x11-wm/wmii/Makefile
@@ -32,7 +32,7 @@ SLIM_LAYOUT_BOX_DESC=	Build with slim layout boxes
 
 .if ${PORT_OPTIONS:MUTF8}
 USES+=		iconv
-MAKE_ARGS+=	LIBICONV="-liconv"
+MAKE_ARGS+=	LIBICONV="${ICONV_LIB}"
 .else
 MAKE_ARGS+=	-DNO_UTF8
 .endif
-- 
cgit v1.2.3