From 8f4eff3dc0bcc1d17da5981c8586fe0d8034ffcf Mon Sep 17 00:00:00 2001
From: sturm <sturm@openbsd.org>
Date: Sun, 26 Dec 2004 21:00:13 +0000
Subject: [PATCH] only set canna options in wrapper scripts, if FLAVOR == canna

from ports/4049
---
 editors/nvi-m17n/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index 7f38c2fbfe9..a2e1dd11698 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.20 2004/11/24 11:08:03 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2004/12/26 21:00:13 sturm Exp $
 # NetBSD: Makefile,v 1.6 2000/01/19 12:28:44 hubertf Exp
 # FreeBSD Id: Makefile,v 1.11 1999/04/17 10:51:03 itojun Exp
 
 COMMENT=	"multilingual clone of vi/ex"
 
 DISTNAME=	nvi-1.79
-PKGNAME=	nvi-m17n-1.79.19991117
+PKGNAME=	nvi-m17n-1.79.19991117p0
 CATEGORIES=	editors
 
 MASTER_SITES0=	ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
@@ -35,13 +35,13 @@ CONFIGURE_ARGS+=--enable-multibyte --program-prefix=n --host=${ARCH}-unknown-net
 .if ${FLAVOR:L} == "canna"
 LIB_DEPENDS+=	canna.1.::japanese/canna
 CONFIGURE_ARGS+=--enable-canna=${LOCALBASE}
-.endif
-
-PLIST=	${WRKDIR}/PLIST
 
 CANNA_OPT.euc-jp=canna cannactrl cannakey=
 CANNA_OPT.sjis=${CANNA_OPT.euc-jp}
 CANNA_OPT.iso-2022-jp=${CANNA_OPT.euc-jp}
+.endif
+
+PLIST=	${WRKDIR}/PLIST
 
 AUTODETECT.euc-jp=jp
 AUTODETECT.sjis=jp