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)
---
 biology/ncbi-toolkit/Makefile                     | 4 +++-
 biology/ncbi-toolkit/files/patch-make-makeall.unx | 2 +-
 biology/ncbi-toolkit/files/patch-make-makenet.unx | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'biology/ncbi-toolkit')

diff --git a/biology/ncbi-toolkit/Makefile b/biology/ncbi-toolkit/Makefile
index f829f790b278..1f5b7cf28ae5 100644
--- a/biology/ncbi-toolkit/Makefile
+++ b/biology/ncbi-toolkit/Makefile
@@ -13,7 +13,7 @@ COMMENT=	NCBI development toolkit, including BLAST 2 and GenBank/Entrez support
 
 OPTIONS_DEFINE=	DOCS
 
-USES=		motif
+USES=		iconv motif
 MAKE_JOBS_UNSAFE=	yes
 
 SUB_FILES=	pkg-message
@@ -66,6 +66,8 @@ post-patch:
 		 s|/usr/local|${LOCALBASE}|g ; \
 		 s|-Wl,-Bstatic|| ; \
 		 s|-Wl,-Bdynamic||' ${WRKSRC}/platform/freebsd.ncbi.mk
+	@${REINPLACE_CMD} -e 's/%%ICONV_LIB%%/${ICONV_LIB}/' \
+		${WRKSRC}/make/makeall.unx ${WRKSRC}/make/makenet.unx
 
 # the ncbi-toolkit provides a shell script to drive the build
 # and we use it
diff --git a/biology/ncbi-toolkit/files/patch-make-makeall.unx b/biology/ncbi-toolkit/files/patch-make-makeall.unx
index 2c46de62b96f..8767a69f7dab 100644
--- a/biology/ncbi-toolkit/files/patch-make-makeall.unx
+++ b/biology/ncbi-toolkit/files/patch-make-makeall.unx
@@ -6,7 +6,7 @@
  AR=ar
 -OTHERLIBS = -lm
 -VIBLIBS = 
-+OTHERLIBS = -lm -liconv
++OTHERLIBS = -lm %%ICONV_LIB%%
 +VIBLIBS = -lXft -lpng -ljpeg
  VIBFLAG =
  LIBCOPY = cp -p
diff --git a/biology/ncbi-toolkit/files/patch-make-makenet.unx b/biology/ncbi-toolkit/files/patch-make-makenet.unx
index 878c36e2abc9..2e51654e29e1 100644
--- a/biology/ncbi-toolkit/files/patch-make-makenet.unx
+++ b/biology/ncbi-toolkit/files/patch-make-makenet.unx
@@ -4,7 +4,7 @@
  VIB =
  VIBLIBS= -lXm -lXmu -lXt -lX11
  VIBLIBS=
-+USERLIBS = -lXft -lpng -ljpeg -liconv
++USERLIBS = -lXft -lpng -ljpeg %%ICONV_LIB%%
  SEQUIN_OPTS =
  LIBCOPY = cp -p
  SRCCOPY = ./ln-if-absent
-- 
cgit v1.2.3