From owner-svn-ports-all@FreeBSD.ORG  Tue Mar 25 07:23:07 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 79281A7E;
 Tue, 25 Mar 2014 07:23:07 +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 4B9122F7;
 Tue, 25 Mar 2014 07:23:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2P7N7RY052426;
 Tue, 25 Mar 2014 07:23:07 GMT
 (envelope-from madpilot@svn.freebsd.org)
Received: (from madpilot@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2P7N6cc052424;
 Tue, 25 Mar 2014 07:23:06 GMT
 (envelope-from madpilot@svn.freebsd.org)
Message-Id: <201403250723.s2P7N6cc052424@svn.freebsd.org>
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Tue, 25 Mar 2014 07:23:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r349107 - in head/converters/p5-Text-Iconv: . 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-all@freebsd.org
X-Mailman-Version: 2.1.17
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: Tue, 25 Mar 2014 07:23:07 -0000

Author: madpilot
Date: Tue Mar 25 07:23:06 2014
New Revision: 349107
URL: http://svnweb.freebsd.org/changeset/ports/349107
QAT: https://qat.redports.org/buildarchive/r349107/

Log:
  Fix build on 10 and head when converters/libiconv is installed.
  
  Reported by:	Mike Harding <mvharding@gmail.com> (via email)
  Approved by:	perl (mat)

Added:
  head/converters/p5-Text-Iconv/files/
  head/converters/p5-Text-Iconv/files/patch-Makefile.PL   (contents, props changed)
Modified:
  head/converters/p5-Text-Iconv/Makefile

Modified: head/converters/p5-Text-Iconv/Makefile
==============================================================================
--- head/converters/p5-Text-Iconv/Makefile	Tue Mar 25 06:46:36 2014	(r349106)
+++ head/converters/p5-Text-Iconv/Makefile	Tue Mar 25 07:23:06 2014	(r349107)
@@ -13,6 +13,15 @@ COMMENT=	Perl interface to iconv() codes
 USES=		perl5 iconv
 USE_PERL5=	configure
 CONFIGURE_ARGS+=	INC="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}"
+		LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" \
+		ccflags="${CFLAGS}"
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+post-patch:
+.if ${OSVERSION} >= 1000043
+	@${REINPLACE_CMD} 's|<iconv.h>|"/usr/include/iconv.h"|' \
+		${WRKSRC}/Iconv.xs
+.endif
+
+.include <bsd.port.post.mk>

Added: head/converters/p5-Text-Iconv/files/patch-Makefile.PL
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/converters/p5-Text-Iconv/files/patch-Makefile.PL	Tue Mar 25 07:23:06 2014	(r349107)
@@ -0,0 +1,25 @@
+--- Makefile.PL.orig	2007-10-17 16:06:22.000000000 +0200
++++ Makefile.PL	2014-03-24 21:28:37.147481295 +0100
+@@ -90,6 +90,7 @@
+ 		AUTHOR        => 'Michael Piotrowski <mxp@dynalabs.de>') : ()),
+ 	      'LIBS'              => $config{LIBS},
+ 	      'DEFINE'            => "@DEFINE",
++              'CCFLAGS'           => $config{ccflags},
+ 	      'INC'               => $config{INC},
+ 	      'dist'              => {COMPRESS => 'gzip', SUFFIX => 'gz'},
+ 	     );
+@@ -119,12 +120,12 @@
+    {
+       # It is admittedly a bit simplistic to simply concatenate all
+       # flags, but it seems to work in most cases.
+-      $compile = join ' ', $Config{cc}, $incs, $Config{ccflags},
++      $compile = join ' ', $Config{cc}, $incs, $config{ccflags},
+ 	  $Config{ldflags}, $libs;
+    }
+    else
+    {
+-      $compile = join ' ', $Config{cc}, $incs, $Config{ccflags}, $libs;
++      $compile = join ' ', $Config{cc}, $incs, $config{ccflags}, $libs;
+    }
+ 
+    if (exists $config{verbose})