From 642be1b81d8342d3a3323f43bcf5a0bd87a5d363 Mon Sep 17 00:00:00 2001 From: Guido Falsi 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) --- converters/py-iconv/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'converters/py-iconv') 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 + +.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 +.include -- cgit v1.2.3