From owner-svn-ports-head@FreeBSD.ORG  Sat Feb  8 09:26:44 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 89BB05E2;
 Sat,  8 Feb 2014 09:26:44 +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 757211A09;
 Sat,  8 Feb 2014 09:26:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s189Qicm002079;
 Sat, 8 Feb 2014 09:26:44 GMT (envelope-from kwm@svn.freebsd.org)
Received: (from kwm@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s189Qi3r002078;
 Sat, 8 Feb 2014 09:26:44 GMT (envelope-from kwm@svn.freebsd.org)
Message-Id: <201402080926.s189Qi3r002078@svn.freebsd.org>
From: Koop Mast <kwm@FreeBSD.org>
Date: Sat, 8 Feb 2014 09:26:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r343312 - head/devel/glib20/files
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Feb 2014 09:26:44 -0000

Author: kwm
Date: Sat Feb  8 09:26:43 2014
New Revision: 343312
URL: http://svnweb.freebsd.org/changeset/ports/343312
QAT: https://qat.redports.org/buildarchive/r343312/

Log:
  Fix build if libiconv is installed.
  
  PR:		ports/186295
  Submitted by:	Olaf Zaplinski <oz42@oz42.eu> (PR submitter)
  		Tijl Coosemans <tijl@coosemans.org> (patch submitter)

Added:
  head/devel/glib20/files/patch-glib_gconvert.c   (contents, props changed)

Added: head/devel/glib20/files/patch-glib_gconvert.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/glib20/files/patch-glib_gconvert.c	Sat Feb  8 09:26:43 2014	(r343312)
@@ -0,0 +1,14 @@
+Work around our situation of having both libiconv in libc and libiconv from
+ports installed.
+
+--- glib/gconvert.c.orig	2014-02-08 10:15:50.000000000 +0100
++++ glib/gconvert.c	2014-02-08 10:16:52.000000000 +0100
+@@ -62,7 +62,7 @@
+ #error GNU libiconv in use but included iconv.h not from libiconv
+ #endif
+ #if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) \
+-     && !defined (__APPLE_CC__) && !defined (__LP_64__)
++  && !defined (LIBICONV_PLUG) && !defined (__APPLE_CC__) && !defined (__LP_64__)
+ #error GNU libiconv not in use but included iconv.h is from libiconv
+ #endif
+