Date: Tue, 25 Mar 2014 07:23:06 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> 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 Message-ID: <201403250723.s2P7N6cc052424@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403250723.s2P7N6cc052424>