From 642be1b81d8342d3a3323f43bcf5a0bd87a5d363 Mon Sep 17 00:00:00 2001
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Wed, 4 Sep 2013 18:06:07 +0000
Subject: - Make ports use the libc provided iconv implementation on 10-CURRENT
   after r254273 - Fix a bunch of ports to properly work after this - Mark
 converters/libiconv as IGNORE for systems with iconv in libc

Reviewed by:	bapt
Approved by:	portmgr (bapt)
Discussed with:	bapt, bsam (who both contributed ideas and code)
---
 devel/cgit/Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'devel/cgit/Makefile')

diff --git a/devel/cgit/Makefile b/devel/cgit/Makefile
index 423cd4bc0977..ad8a1755191e 100644
--- a/devel/cgit/Makefile
+++ b/devel/cgit/Makefile
@@ -33,6 +33,7 @@ SUB_LIST+=	PORTNAME=${PORTNAME}
 PLIST_SUB+=	PORTNAME=${PORTNAME} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 .include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 post-extract:
 	@${RMDIR} ${WRKSRC}/git
@@ -44,6 +45,11 @@ post-patch:
 		${WRKSRC}/git/Makefile
 	@${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' \
 		-e 's,-Igit,-I.,g' ${WRKSRC}/Makefile
+.if empty(ICONV_LIB)
+	@${REINPLACE_CMD} -e '/NEEDS_LIBICONV = YesPlease/d' \
+		-e '/OLD_ICONV = YesPlease/d' \
+		${WRKSRC}/git/config.mak.uname
+.endif
 
 post-install:
 	@${MKDIR} /var/cache/${PORTNAME}
@@ -54,4 +60,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}rc.5.txt ${DOCSDIR}/
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
-- 
cgit v1.2.3