+ Rename the "ncursesw" option to "wide-curses". This should be supported

  under NetBSD-current without actually needing ncursesw.

+ It's not necessary to use ncurses for narrow curses support.  The native
  BSD curses on NetBSD is enough.

+ Add full DESTDIR support.

Bump the PKGREVISION to 1.

2 files changed, 20 insertions, 12 deletions

diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index da88d32cd50..bfc737bb501 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2008/01/05 14:58:42 agc Exp $
+# $NetBSD: Makefile,v 1.52 2008/02/21 21:40:44 jlam Exp $
 
 DISTNAME=		vile-9.6
+PKGREVISION=		1
 CATEGORIES=		editors
 MASTER_SITES=		ftp://invisible-island.net/vile/ \
 			ftp://ftp.phred.org/pub/vile/
@@ -10,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://invisible-island.net/vile/
 COMMENT=		VI Like Emacs.  a vi "workalike", with many additional features
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "options.mk"
 
 GNU_CONFIGURE=		yes
@@ -30,13 +33,14 @@ FILTERDIR=		${PREFIX}/libexec/vile
 EGDIR=			${PREFIX}/share/examples/vile
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/perl/vileget ${PREFIX}/bin/vileget
-	${INSTALL_DATA_DIR} ${EGDIR}
-	set -e;							\
-	for f in filters/spell.rc filters/filters.rc		\
-		macros/digraphs.rc macros/pictmode.rc		\
-		macros/manpage.rc visvile/visvile.rc; do	\
-		${INSTALL_DATA} ${WRKSRC}/$$f ${EGDIR};		\
+	${INSTALL_SCRIPT} ${WRKSRC}/perl/vileget			\
+		${DESTDIR}${PREFIX}/bin/vileget
+	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+	set -e;								\
+	for f in filters/spell.rc filters/filters.rc			\
+		macros/digraphs.rc macros/pictmode.rc			\
+		macros/manpage.rc visvile/visvile.rc; do		\
+		${INSTALL_DATA} ${WRKSRC}/$$f ${DESTDIR}${EGDIR};	\
 	done
 
 .include "../../lang/perl5/buildlink3.mk"
diff --git a/editors/vile/options.mk b/editors/vile/options.mk
index 8a385b1f951..94f92be6275 100644
--- a/editors/vile/options.mk
+++ b/editors/vile/options.mk
@@ -1,13 +1,17 @@
-# $NetBSD: options.mk,v 1.1 2007/10/14 04:53:35 obache Exp $
+# $NetBSD: options.mk,v 1.2 2008/02/21 21:40:44 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.vile
-PKG_SUPPORTED_OPTIONS=	ncursesw
+PKG_SUPPORTED_OPTIONS=	wide-curses
+PKG_LEGACY_OPTS+=	ncursesw:wide-curses
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mncursesw)
+###
+### Wide curses support; otherwise, default to using narrow curses.
+###
+.if !empty(PKG_OPTIONS:Mwide-curses)
 .  include "../../devel/ncursesw/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-screen=ncursesw
 .else
-.  include "../../devel/ncurses/buildlink3.mk"
+.  include "../../mk/curses.buildlink3.mk"
 .endif