ports/186295: commit references a PR

[dfilter service]

The following reply was made to PR ports/186295; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/186295: commit references a PR
Date: Sat,  8 Feb 2014 09:26:51 +0000 (UTC)

 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 at oz42.eu> (PR submitter)
   		Tijl Coosemans <tijl at 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
 + 
 _______________________________________________
 svn-ports-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"