Update to vile-9.7. This is a bug-fix release with some minor

feature improvements (remove obsolete filters, improve ruby filter,
improved syntax highlighting, some locale/encoding fixes, etc.)

In pkgsrc, add DESTDIR support to xvile.  While here, include
libXt and libXmu so that xvile will build if XAW_TYPE=xpm.

5 files changed, 24 insertions, 23 deletions

diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index bfc737bb501..dba218e4693 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2008/02/21 21:40:44 jlam Exp $
+# $NetBSD: Makefile,v 1.53 2008/09/09 10:14:30 bjs Exp $
 
-DISTNAME=		vile-9.6
-PKGREVISION=		1
+DISTNAME=		vile-9.7
 CATEGORIES=		editors
 MASTER_SITES=		ftp://invisible-island.net/vile/ \
 			ftp://ftp.phred.org/pub/vile/
diff --git a/editors/vile/PLIST b/editors/vile/PLIST
index e16287f8d3d..30d5b8d1e33 100644
--- a/editors/vile/PLIST
+++ b/editors/vile/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2008/01/05 14:58:42 agc Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/09/09 10:14:30 bjs Exp $
 bin/vile
 bin/vile-pager
 bin/vileget
@@ -47,11 +47,9 @@ libexec/vile/vile-nr-filt
 libexec/vile/vile-pas-filt
 libexec/vile/vile-perl-filt
 libexec/vile/vile-php-filt
-libexec/vile/vile-pl-filt
 libexec/vile/vile-pot-filt
 libexec/vile/vile-ps-filt
 libexec/vile/vile-py-filt
-libexec/vile/vile-rb-filt
 libexec/vile/vile-rc-filt
 libexec/vile/vile-rcs-filt
 libexec/vile/vile-rexx-filt
@@ -182,6 +180,7 @@ share/vile/rexx.keywords
 share/vile/rpm.keywords
 share/vile/rtf.keywords
 share/vile/sccs.keywords
+share/vile/scheme.keywords
 share/vile/search.rc
 share/vile/sh.keywords
 share/vile/shifts.rc
@@ -210,9 +209,9 @@ share/vile/xml.keywords
 share/vile/xres.keywords
 share/vile/xs.keywords
 share/vile/yacc.keywords
-@dirrm share/vile/doc
 @dirrm share/vile/perl/Vile
 @dirrm share/vile/perl
+@dirrm share/vile/doc
 @dirrm share/vile
 @dirrm share/examples/vile
 @dirrm libexec/vile
diff --git a/editors/vile/distinfo b/editors/vile/distinfo
index 34bc5950937..22bafcfc44c 100644
--- a/editors/vile/distinfo
+++ b/editors/vile/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2008/01/05 14:58:42 agc Exp $
+$NetBSD: distinfo,v 1.10 2008/09/09 10:14:30 bjs Exp $
 
-SHA1 (vile-9.6.tgz) = b588582e5fc6516453b4b47e1e2b693336d36d2f
-RMD160 (vile-9.6.tgz) = 1577ab756c1018b7c0aca9c6120707e6e165f9c6
-Size (vile-9.6.tgz) = 1773866 bytes
+SHA1 (vile-9.7.tgz) = 8c77644fd0327417f4023819657cccafad977ae3
+RMD160 (vile-9.7.tgz) = e1815661da16ad0f46dabaca80d5d3155d83c5d0
+Size (vile-9.7.tgz) = 1796227 bytes
 SHA1 (patch-aa) = 90ea8d0e9cdde45c1708562a54009e2064c4886d
 SHA1 (patch-ab) = 795c377290028995d0909148c3584dd821102b8a
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 5cd2dd218b8..987a71d7f84 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2008/01/05 14:59:47 agc Exp $
+# $NetBSD: Makefile,v 1.57 2008/09/09 10:14:30 bjs Exp $
 
-DISTNAME=		vile-9.6
+DISTNAME=		vile-9.7
 PKGNAME=		x${DISTNAME}
 CATEGORIES=		editors
 MASTER_SITES=		ftp://invisible-island.net/vile/ \
@@ -11,6 +11,8 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://invisible-island.net/vile/
 COMMENT=		VI Like Emacs, X11 version -- a fully "X aware" vi work-alike
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 DISTINFO_FILE=		${.CURDIR}/../../editors/vile/distinfo
 PATCHDIR=		${.CURDIR}/../../editors/vile/patches
 
@@ -41,15 +43,17 @@ CONFIGURE_ARGS+=	--with-screen=Xaw
 CONFIGURE_ARGS+=	--with-xpm
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/perl/vileget ${PREFIX}/bin/xvileget
-	${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/xvileget
+	${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 "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
diff --git a/editors/xvile/PLIST b/editors/xvile/PLIST
index bf0aa601a7d..d5bdc7d67f2 100644
--- a/editors/xvile/PLIST
+++ b/editors/xvile/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2008/01/05 14:59:47 agc Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/09/09 10:14:30 bjs Exp $
 bin/xshell.sh
 bin/xvile
 bin/xvile-pager
@@ -48,11 +48,9 @@ libexec/xvile/vile-nr-filt
 libexec/xvile/vile-pas-filt
 libexec/xvile/vile-perl-filt
 libexec/xvile/vile-php-filt
-libexec/xvile/vile-pl-filt
 libexec/xvile/vile-pot-filt
 libexec/xvile/vile-ps-filt
 libexec/xvile/vile-py-filt
-libexec/xvile/vile-rb-filt
 libexec/xvile/vile-rc-filt
 libexec/xvile/vile-rcs-filt
 libexec/xvile/vile-rexx-filt
@@ -183,6 +181,7 @@ share/xvile/rexx.keywords
 share/xvile/rpm.keywords
 share/xvile/rtf.keywords
 share/xvile/sccs.keywords
+share/xvile/scheme.keywords
 share/xvile/search.rc
 share/xvile/sh.keywords
 share/xvile/shifts.rc