Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Mar 2014 18:40:44 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r349168 - in head/converters/p5-Text-Iconv: . files
Message-ID:  <201403251840.s2PIei31033646@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Tue Mar 25 18:40:44 2014
New Revision: 349168
URL: http://svnweb.freebsd.org/changeset/ports/349168
QAT: https://qat.redports.org/buildarchive/r349168/

Log:
  Instead of patching the code to use /usr/include/iconv.h replace LOCALBASE
  in CONFIGURE_ARGS with ICONV_PREFIX.  Also add CFLAGS to INC in
  CONFIGURE_ARGS to get -DLIBICONV_PLUG on FreeBSD 10 with libiconv installed.
  
  PR:		ports/187907
  Approved by:	perl (mat)

Deleted:
  head/converters/p5-Text-Iconv/files/
Modified:
  head/converters/p5-Text-Iconv/Makefile

Modified: head/converters/p5-Text-Iconv/Makefile
==============================================================================
--- head/converters/p5-Text-Iconv/Makefile	Tue Mar 25 18:26:09 2014	(r349167)
+++ head/converters/p5-Text-Iconv/Makefile	Tue Mar 25 18:40:44 2014	(r349168)
@@ -3,6 +3,7 @@
 
 PORTNAME=	Text-Iconv
 PORTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -12,16 +13,7 @@ COMMENT=	Perl interface to iconv() codes
 
 USES=		perl5 iconv
 USE_PERL5=	configure
-CONFIGURE_ARGS+=	INC="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" \
-		ccflags="${CFLAGS}"
+CONFIGURE_ARGS+=INC="-I${ICONV_PREFIX}/include ${CFLAGS}" \
+		LIBS="-L${ICONV_PREFIX}/lib ${ICONV_LIB}"
 
-.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>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403251840.s2PIei31033646>