From owner-svn-ports-all@FreeBSD.ORG  Fri May 16 10:50:28 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B8D09F66;
 Fri, 16 May 2014 10:50:28 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A62F42194;
 Fri, 16 May 2014 10:50:28 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4GAoS8e069978;
 Fri, 16 May 2014 10:50:28 GMT (envelope-from kwm@svn.freebsd.org)
Received: (from kwm@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4GAoSsb069977;
 Fri, 16 May 2014 10:50:28 GMT (envelope-from kwm@svn.freebsd.org)
Message-Id: <201405161050.s4GAoSsb069977@svn.freebsd.org>
From: Koop Mast <kwm@FreeBSD.org>
Date: Fri, 16 May 2014 10:50:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r354210 - head/textproc/libxml2
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.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 16 May 2014 10:50:28 -0000

Author: kwm
Date: Fri May 16 10:50:28 2014
New Revision: 354210
URL: http://svnweb.freebsd.org/changeset/ports/354210
QAT: https://qat.redports.org/buildarchive/r354210/

Log:
  Fix miss merge relating to iconv support.
  
  Reported & tested by:	Cyril Kalinchikov <cyr.k@me.com>

Modified:
  head/textproc/libxml2/Makefile

Modified: head/textproc/libxml2/Makefile
==============================================================================
--- head/textproc/libxml2/Makefile	Fri May 16 10:44:03 2014	(r354209)
+++ head/textproc/libxml2/Makefile	Fri May 16 10:50:28 2014	(r354210)
@@ -4,7 +4,7 @@
 
 PORTNAME=	libxml2
 PORTVERSION=	2.9.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	textproc gnome
 MASTER_SITES=	ftp://xmlsoft.org/libxml2/ \
 		http://xmlsoft.org/sources/ \
@@ -19,7 +19,7 @@ COMMENT?=	XML parser library for GNOME
 GNU_CONFIGURE=	yes
 USES=		gmake iconv libtool:keepla pathfix pkgconfig shebangfix
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS?=--with-iconv=${ICONVBASE} \
+CONFIGURE_ARGS?=--with-iconv=${ICONV_PREFIX} \
 		--with-html-dir=${PREFIX}/share/doc \
 		--with-html-subdir=${PORTNAME} \
 		--with-lzma=/usr \