From owner-svn-ports-head@freebsd.org  Fri Aug 14 21:20:11 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 963FA9B927B;
 Fri, 14 Aug 2015 21:20:11 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8713816F5;
 Fri, 14 Aug 2015 21:20:11 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7ELKBjR070325;
 Fri, 14 Aug 2015 21:20:11 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7ELKBKu070324;
 Fri, 14 Aug 2015 21:20:11 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201508142120.t7ELKBKu070324@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Fri, 14 Aug 2015 21:20:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r394260 - head/archivers/libarchive
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Aug 2015 21:20:11 -0000

Author: antoine
Date: Fri Aug 14 21:20:10 2015
New Revision: 394260
URL: https://svnweb.freebsd.org/changeset/ports/394260

Log:
  Add explicit USES=iconv, libarchive was linking against libiconv/libcharset
  when they were found and dependency was not registered

Modified:
  head/archivers/libarchive/Makefile

Modified: head/archivers/libarchive/Makefile
==============================================================================
--- head/archivers/libarchive/Makefile	Fri Aug 14 21:02:58 2015	(r394259)
+++ head/archivers/libarchive/Makefile	Fri Aug 14 21:20:10 2015	(r394260)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libarchive
 PORTVERSION=	3.1.2
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://libarchive.org/downloads/
@@ -18,7 +18,7 @@ OPTIONS_DEFAULT=LZO
 LZO_DESC=	Support lzo compression via liblzo2
 NETTLE_DESC=	Use Nettle instead of OpenSSL
 
-USES=		cpe libtool pathfix
+USES=		cpe iconv libtool pathfix
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
@@ -88,7 +88,15 @@ NETTLE_CONFIGURE_ON=	--without-openssl
 NETTLE_USE_OFF=		OPENSSL=yes
 NETTLE_CONFIGURE_OFF=	--with-openssl
 
+.include <bsd.port.pre.mk>
+
+.if empty(ICONV_LIB)
+CONFIGURE_ENV+=	ac_cv_header_localcharset_h=no \
+		ac_cv_func_locale_charset=no \
+		ac_cv_lib_charset_locale_charset=no
+.endif
+
 check:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>