From owner-svn-ports-all@FreeBSD.ORG Thu Feb 27 22:21:37 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DD4B5497; Thu, 27 Feb 2014 22:21:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CA5D11C84; Thu, 27 Feb 2014 22:21:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1RMLbXT009485; Thu, 27 Feb 2014 22:21:37 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1RMLbnG009484; Thu, 27 Feb 2014 22:21:37 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201402272221.s1RMLbnG009484@svn.freebsd.org> From: Tijl Coosemans Date: Thu, 27 Feb 2014 22:21:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346395 - head/devel/libslang2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Feb 2014 22:21:37 -0000 Author: tijl Date: Thu Feb 27 22:21:37 2014 New Revision: 346395 URL: http://svnweb.freebsd.org/changeset/ports/346395 QAT: https://qat.redports.org/buildarchive/r346395/ Log: 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) Modified: head/devel/libslang2/Makefile Modified: head/devel/libslang2/Makefile ============================================================================== --- head/devel/libslang2/Makefile Thu Feb 27 22:18:36 2014 (r346394) +++ head/devel/libslang2/Makefile Thu Feb 27 22:21:37 2014 (r346395) @@ -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 + +.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 +.include