Index: Makefile
===================================================================
--- Makefile	(revision 347902)
+++ Makefile	(working copy)
@@ -211,6 +211,10 @@
 	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' \
 		${WRKSRC}/contrib/subtree/git-subtree.sh
 .endif
+.if ${PORT_OPTIONS:MICONV} && empty(ICONV_LIB)
+	@${REINPLACE_CMD} -e '/LIBS/ s|-liconv|-lno-iconv-from-ports|' \
+		${WRKSRC}/configure
+.endif
 
 post-build:
 .if ${PORT_OPTIONS:MP4} || ${PORT_OPTIONS:MCONTRIB}