diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2014-02-27 22:21:37 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2014-02-27 22:21:37 +0000 |
| commit | 91b4789c38e2d69cf6c05d324938e5c098359363 (patch) | |
| tree | 423fc4d60f9acb47cea5a85406c775582a6f7d64 /devel/libslang2 | |
| parent | 32578850f4dfb083c219a358c885d1f0ff077546 (diff) | |
Prefer libc iconv over libiconv.
The configure script has some simple tests that pick up libiconv when it
is installed. By passing --without-iconv these tests can be skipped so
the configure script falls back on a more standard iconv test that tests
libc before libiconv. However, this fall-back does not set CFLAGS/LDFLAGS
correctly when libiconv needs to be used, so only pass --without-iconv
when libc iconv needs to be used (ICONV_LIB empty).
PR: ports/186688
Approved by: garga (maintainer)
Notes
Notes:
svn path=/head/; revision=346395
Diffstat (limited to 'devel/libslang2')
| -rw-r--r-- | devel/libslang2/Makefile | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/devel/libslang2/Makefile b/devel/libslang2/Makefile index aa5b44675032..c62b60167b83 100644 --- a/devel/libslang2/Makefile +++ b/devel/libslang2/Makefile @@ -2,7 +2,7 @@ PORTNAME= libslang2 PORTVERSION= 2.2.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v${PORTVERSION:R}/ \ ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${PORTVERSION:R}/ \ @@ -42,11 +42,16 @@ PCRE_CONFIGURE_WITH= pcre PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre PNG_CONFIGURE_WITH= png PNG_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png -ICONV_CONFIGURE_WITH= iconv ICONV_USES= iconv ONIG_CONFIGURE_WITH= onig ONIG_LIB_DEPENDS= libonig.so:${PORTSDIR}/devel/oniguruma4 +.include <bsd.port.pre.mk> + +.if ! ${PORT_OPTIONS:MICONV} || empty(ICONV_LIB) +CONFIGURE_ARGS+= --without-iconv +.endif + post-patch: @${REINPLACE_CMD} -E 's,doc/slsh,doc/slang/v\@slang_major_version\@,' \ ${WRKSRC}/slsh/Makefile.in @@ -61,4 +66,4 @@ post-install: .endfor (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) -.include <bsd.port.mk> +.include <bsd.port.post.mk> |