From d68951ddadce043caf2d17e6de759fc98cc0b46c Mon Sep 17 00:00:00 2001
From: Gary Jennejohn <gj@FreeBSD.org>
Date: Sun, 17 Feb 2008 11:49:05 +0000
Subject: [PATCH] It seems that vile now automatically turns on ICONV unless
 otherwise specified in CONFIGURE_ARGS. Add a config option to control this -
 default is OFF.

---
 editors/vile/Makefile  | 12 ++++++++++++
 editors/xvile/Makefile | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index 13bd2d0c4557..18371e2994bd 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -29,10 +29,18 @@ GNU_CONFIGURE=	yes
 MAN1=		vile.1
 
 OPTIONS= FILTERS "Add support for loadable filters" OFF
+OPTIONS+= ICONV "Add support for ICONV" OFF
 OPTIONS+= PERL "Add support for perl functions" OFF
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_ICONV)
+CONFIGURE_ARGS+=	--with-iconv
+USE_ICONV=	yes
+.else
+CONFIGURE_ARGS+=	--without-iconv
+.endif
+
 .if defined(WITH_PERL)
 CONFIGURE_ARGS+=	--with-perl
 PLIST=		${PKGDIR}/pkg-plist.perl
@@ -49,6 +57,10 @@ PLIST=		${PKGDIR}/pkg-plist.perl+filt
 .endif
 
 pre-configure:
+.if ! defined(WITH_ICONV)
+	@${ECHO_MSG} "Choose the option ICONV if you want to make a vile which includes"
+	@${ECHO_MSG} "ICONV functionality"
+.endif
 .if ! defined(WITH_PERL)
 	@${ECHO_MSG} "Choose the option PERL if you want to make a vile which includes"
 	@${ECHO_MSG} "PERL functionality"
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 1e39d75e9961..15753e0b9d73 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -37,6 +37,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 MAN1=		xvile.1
 
 OPTIONS= FILTERS "Add support for loadable filters" OFF
+OPTIONS+= ICONV "Add support for ICONV" OFF
 OPTIONS+= MENUS "Add support for menus" OFF
 OPTIONS+= PERL "Add support for perl functions" OFF
 OPTIONS+= XAW3D "Use XAW3D to get a 3D effect" OFF
@@ -44,6 +45,10 @@ OPTIONS+= XAW3D "Use XAW3D to get a 3D effect" OFF
 .include <bsd.port.pre.mk>
 
 pre-configure:
+.if ! defined(WITH_ICONV)
+	@${ECHO_MSG} "Choose the option ICONV if you want to make an xvile which includes"
+	@${ECHO_MSG} "ICONV functionality"
+.endif
 .if ! defined(WITH_MENUS)
 	@${ECHO_MSG} "To use xvile with menus, choose the option MENUS,"
 	@${ECHO_MSG} "which will also turn on Xaw. If you have Xaw3d, you can use it"
@@ -59,6 +64,13 @@ pre-configure:
 	@${ECHO_MSG} "dynamically load filters as needed."
 .endif
 
+.if defined(WITH_ICONV)
+CONFIGURE_ARGS+=	--with-iconv
+USE_ICONV=	yes
+.else
+CONFIGURE_ARGS+=	--without-iconv
+.endif
+
 .if defined(WITH_MENUS)
 CONFIGURE_ARGS+= --with-screen=Xaw
 .if defined(WITH_XAW3D)