svn commit: r349107 - in head/converters/p5-Text-Iconv: . files

[Tijl Coosemans]

On Tue, 25 Mar 2014 07:23:06 +0000 (UTC) Guido Falsi wrote:
> 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 at 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>

Thanks, I received a PR about this yesterday:
http://www.freebsd.org/cgi/query-pr.cgi?pr=187907

The OSVERSION check isn't correct though.  It should be empty(ICONV_LIB).
But, I've attached a patch that uses a different approach.  You can
make the port use /usr/include/iconv.h by replacing LOCALBASE in
CONFIGURE_ARGS with ICONV_PREFIX.

That fixes the build phase, during configure however, something(?) is
still adding -I/usr/local/include to the command line so you still need
-DLIBICONV_PLUG when empty(ICONV_LIB).  The patch adds CFLAGS to INC in
CONFIGURE_ARGS for this.  You can verify this by adding verbose=1 to
CONFIGURE_ARGS and running "make configure".

Can perl@ review/approve this?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: p5-Text-Iconv.patch
Type: text/x-patch
Size: 2193 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-perl/attachments/20140325/c7ea98c9/attachment.bin>