- 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)

5 files changed, 21 insertions, 5 deletions

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index a640159bba61..7c7c31a26208 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -49,4 +49,11 @@ post-patch:
 		${WRKSRC}/libcharset/configure \
 		${WRKSRC}/preload/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 1000043
+IGNORE=		converters/libiconv should not be used with OSVERSION > 1000050. \
+Please fix the port which tries to use it
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/converters/lua-iconv/Makefile b/converters/lua-iconv/Makefile
index 3988537d9b05..8dacfe99119c 100644
--- a/converters/lua-iconv/Makefile
+++ b/converters/lua-iconv/Makefile
@@ -21,7 +21,9 @@ USES=		pkgconfig iconv
 PLIST_FILES=	%%LUA_MODLIBDIR%%/iconv.so
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%INCDIR%%|-I${PREFIX}/include|;s|%%LIBDIR%%|-L${PREFIX}/lib|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|%%INCDIR%%|-I${PREFIX}/include| ; \
+		s|%%LIBDIR%%|-L${PREFIX}/lib|; \
+		s|%%ICONV_LIB%%|${ICONV_LIB}|' ${WRKSRC}/Makefile
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/iconv.so ${LUA_MODLIBDIR}
diff --git a/converters/lua-iconv/files/patch-Makefile b/converters/lua-iconv/files/patch-Makefile
index ae1eeb119222..ed29001d0b7d 100644
--- a/converters/lua-iconv/files/patch-Makefile
+++ b/converters/lua-iconv/files/patch-Makefile
@@ -8,7 +8,7 @@
 -CFLAGS = `pkg-config $(LUAPKG) --cflags` -fPIC -O3 -Wall
 +LUAPKG = lua-5.1
 +CFLAGS += `pkg-config $(LUAPKG) --cflags` -fPIC %%INCDIR%%
-+LIBS = `pkg-config $(LUAPKG) --libs` -liconv %%LIBDIR%%
++LIBS = `pkg-config $(LUAPKG) --libs` %%ICONV_LIB%% %%LIBDIR%%
  LFLAGS = -shared $(OMIT_FRAME_POINTER)
  INSTALL_PATH = `pkg-config $(LUAPKG) --variable=INSTALL_CMOD`
  
diff --git a/converters/p5-Text-Iconv/Makefile b/converters/p5-Text-Iconv/Makefile
index a83dec15351d..bac197b30dd4 100644
--- a/converters/p5-Text-Iconv/Makefile
+++ b/converters/p5-Text-Iconv/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl interface to iconv() codeset conversion function
 USES=		perl5 iconv
 USE_PERL5=	configure
 CONFIGURE_ARGS+=	INC="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -liconv"
+		LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}"
 
 MAN3=		Text::Iconv.3
 
diff --git a/converters/py-iconv/Makefile b/converters/py-iconv/Makefile
index 5193fe4fdfa5..bfa5c990fffb 100644
--- a/converters/py-iconv/Makefile
+++ b/converters/py-iconv/Makefile
@@ -21,11 +21,18 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PLIST_SUB=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||g}
 
+.include <bsd.port.pre.mk>
+
+.if empty(ICONV_LIB)
+SETUPINFO=	,library_dirs=["${LOCALBASE}/lib"],\
+		include_dirs=["${LOCALBASE}/include"]
+.else
 SETUPINFO=	,libraries=["iconv"],library_dirs=["${LOCALBASE}/lib"],\
 		include_dirs=["${LOCALBASE}/include"]
+.endif
 
 post-patch:
 	cd ${WRKSRC} && ${SED} 's!^\(.*ext_mod.*\)\()]\)$$!\1${SETUPINFO}\2!g'\
 		setup.py > setup.py.tmp && ${CAT} setup.py.tmp > setup.py
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>