From owner-svn-ports-all@FreeBSD.ORG  Tue Mar 25 18:40:44 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 C5F456AC;
 Tue, 25 Mar 2014 18:40:44 +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 B2D7733F;
 Tue, 25 Mar 2014 18:40:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2PIeiDq033647;
 Tue, 25 Mar 2014 18:40:44 GMT (envelope-from tijl@svn.freebsd.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2PIei31033646;
 Tue, 25 Mar 2014 18:40:44 GMT (envelope-from tijl@svn.freebsd.org)
Message-Id: <201403251840.s2PIei31033646@svn.freebsd.org>
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Tue, 25 Mar 2014 18:40:44 +0000 (UTC)
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
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 18:40:44 -0000

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>