Update this package to 8.3, to be consistent with the vile package,

and obviating the need for two distinct distfiles.
Update the vile package to version 8.3.
Remove the USE_MENUS /etc/mk.conf definition, which had very little
point. Add configuration args to use xpm, and to make perl support
legitimate.

Changes since 8.2 include:
        + Add xpm support in xvile.
        + make C-style indent logic available as a mode 'cindent', so it can be
          assigned as part of a majormode.  It is part of the builtin cmode.
        + added "-132" and "-80" command-line switches to set screen width from
          command line.
        + many other bug fixes, restructuring, and changes.

6 files changed, 101 insertions, 71 deletions

diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 8fe23679a30..28a38f354d6 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.17 1999/03/08 10:53:56 agc Exp $
+# $NetBSD: Makefile,v 1.18 1999/10/21 18:41:14 agc Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/09/06 19:58:03 gj Exp
 #
 
-DISTNAME=	vile-8.2
-PKGNAME=	xvile-8.2
+DISTNAME=	vile-8.3
+PKGNAME=	xvile-8.3
 CATEGORIES=	editors
 MASTER_SITES=   ftp://ftp.clark.net/pub/dickey/vile/ \
 		ftp://id.wing.net/pub/pgf/vile/
@@ -11,30 +11,18 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	packages@netbsd.org
 
+DEPENDS+=	xpm-3.4k:../../graphics/xpm
+
 USE_X11BASE=	yes
-MAKEFILE=	makefile
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-CONFIGURE_ARGS+= --with-screen=${SCREEN_TYPE}
+USE_XAW=	yes
+MAKEFILE=	makefile
+CONFIGURE_ARGS+= --with-screen=Xaw --with-xpm --with-perl --with-lib-dir=${X11BASE}/libexec
 INSTALL_TARGET=	install install-perl
 
-.include "../../mk/bsd.prefs.mk"
-
-pre-configure:
-	@${ECHO} "To use xvile with menus, set the variable USE_MENUS"
-	@${ECHO} "in the environment or in /etc/mk.conf"
-
-.if defined(USE_MENUS)
-SCREEN_TYPE=	Xaw
-.else
-SCREEN_TYPE=	x11
-.endif
-
 post-install:
 	@${ECHO} "You might want to copy the *.rc files from the source tree before"
 	@${ECHO} "doing \`${MAKE} clean'."
-.if defined(USE_MENUS)
-	@${ECHO} "And also take a look at README.MENU !"
-.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/xvile/files/md5 b/editors/xvile/files/md5
index f808ac6d6e0..dbdda2a3131 100644
--- a/editors/xvile/files/md5
+++ b/editors/xvile/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.8 1999/03/02 15:50:56 agc Exp $
+$NetBSD: md5,v 1.9 1999/10/21 18:41:15 agc Exp $
 
-MD5 (vile-8.2.tgz) = b96a02f2b999d9fba511a373558e4e1a
+MD5 (vile-8.3.tgz) = 6682d4fae3892d93e8a12f7756946dc9
diff --git a/editors/xvile/files/patch-sum b/editors/xvile/files/patch-sum
index c90b932b181..283c935e3d1 100644
--- a/editors/xvile/files/patch-sum
+++ b/editors/xvile/files/patch-sum
@@ -1,4 +1,3 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:46 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/10/21 18:41:15 agc Exp $
 
-MD5 (patch-aa) = bd44cf1b6ff0eaecb37668a360ddd730
-MD5 (patch-ab) = 6121967e21903b2e9529e798b77f8c45
+MD5 (patch-aa) = cd68420c42e32564332398e5b7e3a81f
diff --git a/editors/xvile/patches/patch-aa b/editors/xvile/patches/patch-aa
index 5b66b9c3664..3fec4155ccc 100644
--- a/editors/xvile/patches/patch-aa
+++ b/editors/xvile/patches/patch-aa
@@ -1,21 +1,23 @@
-$NetBSD: patch-aa,v 1.3 1998/09/14 22:26:06 garbled Exp $
---- makefile.in.orig	Tue May 26 17:54:37 1998
-+++ makefile.in	Mon Sep 14 15:06:04 1998
-@@ -58,7 +58,7 @@
+$NetBSD: patch-aa,v 1.4 1999/10/21 18:41:15 agc Exp $
+
+--- makefile.in.orig	Thu Oct 21 18:55:31 1999
++++ makefile.in	Thu Oct 21 19:05:02 1999
+@@ -51,7 +51,7 @@
  
- manext		= 1
- bindir		= @bindir@
--datadir		= @datadir@/vile
-+datadir		= @datadir@/xvile
- perldir		= $(datadir)/perl
- mandir		= @mandir@/man$(manext)
+ PERL		= @PERL@
+ PERLLIB		= @perl_lib_path@
+-INSTALL_SCRIPT	= $(srcdir)/sinstall.sh $(PERL) $(INSTALL_PROGRAM)
++INSTALL_SCRIPT	= ${BSD_INSTALL_SCRIPT}
  
-@@ -71,7 +71,7 @@
- 		-DVILE_STARTUP_PATH=\"@VILE_STARTUP_PATH@\" \
- 		-DHAVE_CONFIG_H @CPPFLAGS@
  
--LDFLAGS		= @IMAKE_LOADFLAGS@
-+LDFLAGS		= @IMAKE_LOADFLAGS@ @LDFLAGS@
+ prefix		= @prefix@
+@@ -615,6 +615,9 @@
  
- INSTALL_DIRS    = $(bindir) $(datadir) $(perldir) $(mandir)
+ $(INSTALL_DIRS):
+ 	$(SHELL) ${srcdir}/mkdirs.sh $@
++
++${INSTALL_PERL_DIRS}:
++	${SHELL} ${srcdir}/mkdirs.sh $@
+ 
+ ALWAYS:
  
diff --git a/editors/xvile/patches/patch-ab b/editors/xvile/patches/patch-ab
deleted file mode 100644
index 5e22dd36611..00000000000
--- a/editors/xvile/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1998/10/05 12:43:47 agc Exp $
-
-Remember to create the Perl example dir.
-
---- makefile.in	1998/10/05 12:07:06	1.1
-+++ makefile.in	1998/10/05 12:07:54
-@@ -599,5 +599,8 @@
- $(INSTALL_DIRS):
- 	$(SHELL) ${srcdir}/mkdirs.sh $@
- 
-+${INSTALL_PERL_DIRS}:
-+	${SHELL} ${srcdir}/mkdirs.sh $@
-+
- ALWAYS:
- 
diff --git a/editors/xvile/pkg/PLIST b/editors/xvile/pkg/PLIST
index 8e861375914..f13f1e9841c 100644
--- a/editors/xvile/pkg/PLIST
+++ b/editors/xvile/pkg/PLIST
@@ -1,19 +1,75 @@
-@comment $NetBSD: PLIST,v 1.5 1998/10/05 12:43:46 agc Exp $
+@comment $NetBSD: PLIST,v 1.6 1999/10/21 18:41:16 agc Exp $
 bin/xvile
-bin/vile-c-filt
-bin/vile-crypt
-bin/vile-manfilt
-bin/vile-pas-filt
-man/man1/xvile.1.gz
-share/xvile/perl/glob2re.pl
-share/xvile/perl/hgrep.pl
-share/xvile/perl/hilite.pl
-share/xvile/perl/manfilt.pl
-share/xvile/perl/search.pl
-share/xvile/perl/shell.pl
-share/xvile/perl/syntax.pl
-share/xvile/perl/tailf.pl
-share/xvile/perl/visit.pl
+lib/vile/vile-c-filt
+lib/vile/vile-crypt
+lib/vile/vile-manfilt
+lib/vile/vile-pas-filt
+lib/vile/vile-ada-filt
+lib/vile/vile-awk-filt
+lib/vile/vile-bat-filt
+lib/vile/vile-dcl-filt
+lib/vile/vile-diff-filt
+lib/vile/vile-html-filt
+lib/vile/vile-latex-filt
+lib/vile/vile-lex-filt
+lib/vile/vile-mail-filt
+lib/vile/vile-make-filt
+lib/vile/vile-mms-filt
+lib/vile/vile-nr-filt
+lib/vile/vile-perl-filt
+lib/vile/vile-sh-filt
+lib/vile/vile-spell-filt
+lib/vile/vile-sql-filt
+lib/vile/vile-tc-filt
+lib/vile/vile-tcl-filt
+lib/vile/vile-txt-filt
+lib/vile/vile-ti-filt
+lib/vile/vile-vile-filt
+lib/vile/vile-yacc-filt
+man/man1/xvile.1
 share/xvile/vile.hlp
+share/vile/c.keywords
+share/vile/filters.rc
+share/vile/pas.keywords
+share/vile/vile.keywords
+share/vile/ada.keywords
+share/vile/awk.keywords
+share/vile/bat.keywords
+share/vile/csh.keywords
+share/vile/dcl.keywords
+share/vile/diff.keywords
+share/vile/html.keywords
+share/vile/imake.keywords
+share/vile/java.keywords
+share/vile/js.keywords
+share/vile/latex.keywords
+share/vile/lex.keywords
+share/vile/mail.keywords
+share/vile/make.keywords
+share/vile/nr.keywords
+share/vile/perl.keywords
+share/vile/sh.keywords
+share/vile/spell.rc
+share/vile/sql.keywords
+share/vile/tc.keywords
+share/vile/tcl.keywords
+share/vile/ti.keywords
+share/vile/yacc.keywords
+share/vile/perl/Vileserv.pm
+share/vile/perl/dir.pl
+share/vile/perl/glob2re.pl
+share/vile/perl/hgrep.pl
+share/vile/perl/hilite.pl
+share/vile/perl/manfilt.pl
+share/vile/perl/mime.pl
+share/vile/perl/plugins.pl
+share/vile/perl/search.pl
+share/vile/perl/shell.pl
+share/vile/perl/syntax.pl
+share/vile/perl/tailf.pl
+share/vile/perl/visit.pl
+@dirrm lib/vile
 @dirrm share/xvile/perl
 @dirrm share/xvile
+@dirrm share/vile/perl
+@dirrm share/vile