3 files changed, 261 insertions, 245 deletions

diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 07a75be66116..103fd8d6735c 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -17,7 +17,11 @@ MAINTAINER=	gj@freebsd.org
 
 USE_XLIB=	yes
 MAKEFILE=	makefile
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
+
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
+		--with-libdir-path=${PREFIX}/lib/xvile \
+		--datadir=${PREFIX}/share/xvile
 MAN1=		xvile.1
 
 pre-configure:
@@ -29,9 +33,9 @@ pre-configure:
 .endif
 
 .if defined(WITH_MENUS)
-CONFIGURE_ARGS= --with-screen=Xaw
+CONFIGURE_ARGS+= --with-screen=Xaw
 .else
-CONFIGURE_ARGS= --with-screen=x11
+CONFIGURE_ARGS+= --with-screen=x11
 .endif
 
 .if defined(WITH_PERL)
@@ -42,16 +46,16 @@ USE_PERL5=	yes
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@if ! [ -d ${PREFIX}/share/doc/vile ]; then ${MKDIR} ${PREFIX}/share/doc/vile; fi
-	${INSTALL_DATA} ${WRKSRC}/doc/*.doc ${PREFIX}/share/doc/vile
+	@if ! [ -d ${PREFIX}/share/doc/xvile ]; then ${MKDIR} ${PREFIX}/share/doc/xvile; fi
+	${INSTALL_DATA} ${WRKSRC}/doc/*.doc ${PREFIX}/share/doc/xvile
 .endif
-	@if ! [ -d ${PREFIX}/share/vile/macros ]; then ${MKDIR} ${PREFIX}/share/vile/macros; fi
-	${INSTALL_DATA} ${WRKSRC}/macros/*.rc ${PREFIX}/share/vile/macros
-	${INSTALL_SCRIPT} ${WRKSRC}/macros/vile-pager ${PREFIX}/share/vile/macros
+	@if ! [ -d ${PREFIX}/share/xvile/macros ]; then ${MKDIR} ${PREFIX}/share/xvile/macros; fi
+	${INSTALL_DATA} ${WRKSRC}/macros/*.rc ${PREFIX}/share/xvile/macros
+	${INSTALL_SCRIPT} ${WRKSRC}/macros/vile-pager ${PREFIX}/share/xvile/macros
 .if defined(WITH_PERL)
-	${INSTALL_DATA} ${WRKSRC}/*.doc ${PREFIX}/share/doc/vile
+	${INSTALL_DATA} ${WRKSRC}/*.doc ${PREFIX}/share/doc/xvile
 .endif
-	@${ECHO_MSG} "Look in ${PREFIX}/share/doc/vile for documentation."
-	@${ECHO_MSG} "Look in ${PREFIX}/share/vile/macros for macros."
+	@${ECHO_MSG} "Look in ${PREFIX}/share/doc/xvile for documentation."
+	@${ECHO_MSG} "Look in ${PREFIX}/share/xvile/macros for macros."
 
 .include <bsd.port.mk>
diff --git a/editors/xvile/pkg-plist b/editors/xvile/pkg-plist
index 4b74b16fa976..70dddd4829c7 100644
--- a/editors/xvile/pkg-plist
+++ b/editors/xvile/pkg-plist
@@ -1,111 +1,116 @@
 bin/xvile
 bin/xvile-pager
 bin/xshell.sh
-lib/vile/vile-c-filt
-lib/vile/vile-crypt
-lib/vile/vile-key-filt
-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-cfg-filt
-lib/vile/vile-cweb-filt
-lib/vile/vile-dcl-filt
-lib/vile/vile-fdl-filt
-lib/vile/vile-diff-filt
-lib/vile/vile-esql-filt
-lib/vile/vile-html-filt
-lib/vile/vile-latex-filt
-lib/vile/vile-lex-filt
-lib/vile/vile-m4-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-py-filt
-lib/vile/vile-rcs-filt
-lib/vile/vile-rexx-filt
-lib/vile/vile-sccs-filt
-lib/vile/vile-sh-filt
-lib/vile/vile-spell-filt
-lib/vile/vile-sql-filt
-lib/vile/vile-tags-filt
-lib/vile/vile-tbl-filt
-lib/vile/vile-tc-filt
-lib/vile/vile-tcl-filt
-lib/vile/vile-ti-filt
-lib/vile/vile-txt-filt
-lib/vile/vile-vile-filt
-lib/vile/vile-xres-filt
-lib/vile/vile-xs-filt
-lib/vile/vile-yacc-filt
-share/doc/vile/Vileserv.doc
-share/doc/vile/config.doc
-share/doc/vile/dir.doc
-share/doc/vile/filters.doc
-share/doc/vile/macros.doc
-share/doc/vile/menus.doc
-share/doc/vile/modes.doc
-share/doc/vile/oleauto.doc
-share/doc/vile/perl.doc
-share/doc/vile/visvile.doc
-share/doc/vile/w32modes.doc
-share/vile/digraphs.rc
-share/vile/manpage.rc
-share/vile/palettes.rc
-share/vile/pictmode.rc
-share/vile/vileinit.rc
-share/vile/vileperl.rc
-share/vile/vile.hlp
-share/vile/.vilemenu
-share/vile/c.keywords
-share/vile/cpp.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/cweb.keywords
-share/vile/dcl.keywords
-share/vile/diff.keywords
-share/vile/esql.keywords
-share/vile/fdl.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/m4.keywords
-share/vile/mail.keywords
-share/vile/make.keywords
-share/vile/nr.keywords
-share/vile/perl.keywords
-share/vile/py.keywords
-share/vile/pot.keywords
-share/vile/rcs.keywords
-share/vile/rexx.keywords
-share/vile/sccs.keywords
-share/vile/sh.keywords
-share/vile/spell.rc
-share/vile/sql.keywords
-share/vile/tags.keywords
-share/vile/tbl.keywords
-share/vile/tc.keywords
-share/vile/tcl.keywords
-share/vile/ti.keywords
-share/vile/xres.keywords
-share/vile/xs.keywords
-share/vile/yacc.keywords
-share/vile/macros/digraphs.rc
-share/vile/macros/manpage.rc
-share/vile/macros/palettes.rc
-share/vile/macros/pictmode.rc
-share/vile/macros/vileinit.rc
-share/vile/macros/vilemenu.rc
-share/vile/macros/vileperl.rc
-share/vile/macros/vile-pager
+lib/xvile/vile-c-filt
+lib/xvile/vile-crypt
+lib/xvile/vile-key-filt
+lib/xvile/vile-manfilt
+lib/xvile/vile-pas-filt
+lib/xvile/vile-ada-filt
+lib/xvile/vile-awk-filt
+lib/xvile/vile-bat-filt
+lib/xvile/vile-cfg-filt
+lib/xvile/vile-cweb-filt
+lib/xvile/vile-dcl-filt
+lib/xvile/vile-fdl-filt
+lib/xvile/vile-diff-filt
+lib/xvile/vile-esql-filt
+lib/xvile/vile-html-filt
+lib/xvile/vile-latex-filt
+lib/xvile/vile-lex-filt
+lib/xvile/vile-m4-filt
+lib/xvile/vile-mail-filt
+lib/xvile/vile-make-filt
+lib/xvile/vile-mms-filt
+lib/xvile/vile-nr-filt
+lib/xvile/vile-perl-filt
+lib/xvile/vile-py-filt
+lib/xvile/vile-rcs-filt
+lib/xvile/vile-rexx-filt
+lib/xvile/vile-sccs-filt
+lib/xvile/vile-sh-filt
+lib/xvile/vile-spell-filt
+lib/xvile/vile-sql-filt
+lib/xvile/vile-tags-filt
+lib/xvile/vile-tbl-filt
+lib/xvile/vile-tc-filt
+lib/xvile/vile-tcl-filt
+lib/xvile/vile-ti-filt
+lib/xvile/vile-txt-filt
+lib/xvile/vile-vile-filt
+lib/xvile/vile-xres-filt
+lib/xvile/vile-xs-filt
+lib/xvile/vile-yacc-filt
+@dirrm lib/xvile
+share/doc/xvile/Vileserv.doc
+share/doc/xvile/config.doc
+share/doc/xvile/dir.doc
+share/doc/xvile/filters.doc
+share/doc/xvile/macros.doc
+share/doc/xvile/menus.doc
+share/doc/xvile/modes.doc
+share/doc/xvile/oleauto.doc
+share/doc/xvile/perl.doc
+share/doc/xvile/visvile.doc
+share/doc/xvile/w32modes.doc
+@dirrm share/doc/xvile
+share/xvile/vile/digraphs.rc
+share/xvile/vile/manpage.rc
+share/xvile/vile/palettes.rc
+share/xvile/vile/pictmode.rc
+share/xvile/vile/vileinit.rc
+share/xvile/vile/vileperl.rc
+share/xvile/vile/vile.hlp
+share/xvile/vile/.vilemenu
+share/xvile/vile/c.keywords
+share/xvile/vile/cpp.keywords
+share/xvile/vile/filters.rc
+share/xvile/vile/pas.keywords
+share/xvile/vile/vile.keywords
+share/xvile/vile/ada.keywords
+share/xvile/vile/awk.keywords
+share/xvile/vile/bat.keywords
+share/xvile/vile/csh.keywords
+share/xvile/vile/cweb.keywords
+share/xvile/vile/dcl.keywords
+share/xvile/vile/diff.keywords
+share/xvile/vile/esql.keywords
+share/xvile/vile/fdl.keywords
+share/xvile/vile/html.keywords
+share/xvile/vile/imake.keywords
+share/xvile/vile/java.keywords
+share/xvile/vile/js.keywords
+share/xvile/vile/latex.keywords
+share/xvile/vile/lex.keywords
+share/xvile/vile/m4.keywords
+share/xvile/vile/mail.keywords
+share/xvile/vile/make.keywords
+share/xvile/vile/nr.keywords
+share/xvile/vile/perl.keywords
+share/xvile/vile/py.keywords
+share/xvile/vile/pot.keywords
+share/xvile/vile/rcs.keywords
+share/xvile/vile/rexx.keywords
+share/xvile/vile/sccs.keywords
+share/xvile/vile/sh.keywords
+share/xvile/vile/spell.rc
+share/xvile/vile/sql.keywords
+share/xvile/vile/tags.keywords
+share/xvile/vile/tbl.keywords
+share/xvile/vile/tc.keywords
+share/xvile/vile/tcl.keywords
+share/xvile/vile/ti.keywords
+share/xvile/vile/xres.keywords
+share/xvile/vile/xs.keywords
+share/xvile/vile/yacc.keywords
+share/xvile/macros/digraphs.rc
+share/xvile/macros/manpage.rc
+share/xvile/macros/palettes.rc
+share/xvile/macros/pictmode.rc
+share/xvile/macros/vileinit.rc
+share/xvile/macros/vilemenu.rc
+share/xvile/macros/vileperl.rc
+share/xvile/macros/vile-pager
+@dirrm share/xvile/vile
+@dirrm share/xvile/macros
+@dirrm share/xvile
diff --git a/editors/xvile/pkg-plist.perl b/editors/xvile/pkg-plist.perl
index ed6f6c5b93fd..1ac2bc222a2a 100644
--- a/editors/xvile/pkg-plist.perl
+++ b/editors/xvile/pkg-plist.perl
@@ -2,129 +2,136 @@ bin/xvile
 bin/xvile-pager
 bin/vileget
 bin/xshell.sh
-lib/vile/vile-c-filt
-lib/vile/vile-crypt
-lib/vile/vile-key-filt
-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-cfg-filt
-lib/vile/vile-cweb-filt
-lib/vile/vile-dcl-filt
-lib/vile/vile-fdl-filt
-lib/vile/vile-diff-filt
-lib/vile/vile-esql-filt
-lib/vile/vile-html-filt
-lib/vile/vile-latex-filt
-lib/vile/vile-lex-filt
-lib/vile/vile-m4-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-py-filt
-lib/vile/vile-rcs-filt
-lib/vile/vile-rexx-filt
-lib/vile/vile-sccs-filt
-lib/vile/vile-sh-filt
-lib/vile/vile-spell-filt
-lib/vile/vile-sql-filt
-lib/vile/vile-tags-filt
-lib/vile/vile-tbl-filt
-lib/vile/vile-tc-filt
-lib/vile/vile-tcl-filt
-lib/vile/vile-ti-filt
-lib/vile/vile-txt-filt
-lib/vile/vile-vile-filt
-lib/vile/vile-xres-filt
-lib/vile/vile-xs-filt
-lib/vile/vile-yacc-filt
-share/doc/vile/Vileserv.doc
-share/doc/vile/config.doc
-share/doc/vile/dir.doc
-share/doc/vile/filters.doc
-share/doc/vile/macros.doc
-share/doc/vile/menus.doc
-share/doc/vile/modes.doc
-share/doc/vile/oleauto.doc
-share/doc/vile/perl.doc
-share/doc/vile/visvile.doc
-share/doc/vile/w32modes.doc
-share/doc/vile/vile-perl-api.doc
-share/vile/perl/Vile/Exporter.pm
-share/vile/perl/Vile/Manual.pm
-share/vile/perl/Glob2re.pm
-share/vile/perl/Vile.pm
-share/vile/perl/Vileserv.pm
-share/vile/perl/Visit.pm
-share/vile/perl/capture.pm
-share/vile/perl/directory.pm
-share/vile/perl/dirlist.pm
-share/vile/perl/hgrep.pm
-share/vile/perl/lock.pm
-share/vile/perl/mime.pl
-share/vile/perl/plugins.pl
-share/vile/perl/search.pm
-share/vile/perl/shell.pm
-share/vile/perl/spell.pm
-share/vile/perl/winops.pm
-share/vile/digraphs.rc
-share/vile/manpage.rc
-share/vile/palettes.rc
-share/vile/pictmode.rc
-share/vile/vileinit.rc
-share/vile/vileperl.rc
-share/vile/vile.hlp
-share/vile/.vilemenu
-share/vile/c.keywords
-share/vile/cpp.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/cweb.keywords
-share/vile/dcl.keywords
-share/vile/diff.keywords
-share/vile/esql.keywords
-share/vile/fdl.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/m4.keywords
-share/vile/mail.keywords
-share/vile/make.keywords
-share/vile/nr.keywords
-share/vile/perl.keywords
-share/vile/py.keywords
-share/vile/pot.keywords
-share/vile/rcs.keywords
-share/vile/rexx.keywords
-share/vile/sccs.keywords
-share/vile/sh.keywords
-share/vile/spell.rc
-share/vile/sql.keywords
-share/vile/tags.keywords
-share/vile/tbl.keywords
-share/vile/tc.keywords
-share/vile/tcl.keywords
-share/vile/ti.keywords
-share/vile/xres.keywords
-share/vile/xs.keywords
-share/vile/yacc.keywords
-share/vile/macros/digraphs.rc
-share/vile/macros/manpage.rc
-share/vile/macros/palettes.rc
-share/vile/macros/pictmode.rc
-share/vile/macros/vileinit.rc
-share/vile/macros/vilemenu.rc
-share/vile/macros/vileperl.rc
-share/vile/macros/vile-pager
+lib/xvile/vile-c-filt
+lib/xvile/vile-crypt
+lib/xvile/vile-key-filt
+lib/xvile/vile-manfilt
+lib/xvile/vile-pas-filt
+lib/xvile/vile-ada-filt
+lib/xvile/vile-awk-filt
+lib/xvile/vile-bat-filt
+lib/xvile/vile-cfg-filt
+lib/xvile/vile-cweb-filt
+lib/xvile/vile-dcl-filt
+lib/xvile/vile-fdl-filt
+lib/xvile/vile-diff-filt
+lib/xvile/vile-esql-filt
+lib/xvile/vile-html-filt
+lib/xvile/vile-latex-filt
+lib/xvile/vile-lex-filt
+lib/xvile/vile-m4-filt
+lib/xvile/vile-mail-filt
+lib/xvile/vile-make-filt
+lib/xvile/vile-mms-filt
+lib/xvile/vile-nr-filt
+lib/xvile/vile-perl-filt
+lib/xvile/vile-py-filt
+lib/xvile/vile-rcs-filt
+lib/xvile/vile-rexx-filt
+lib/xvile/vile-sccs-filt
+lib/xvile/vile-sh-filt
+lib/xvile/vile-spell-filt
+lib/xvile/vile-sql-filt
+lib/xvile/vile-tags-filt
+lib/xvile/vile-tbl-filt
+lib/xvile/vile-tc-filt
+lib/xvile/vile-tcl-filt
+lib/xvile/vile-ti-filt
+lib/xvile/vile-txt-filt
+lib/xvile/vile-vile-filt
+lib/xvile/vile-xres-filt
+lib/xvile/vile-xs-filt
+lib/xvile/vile-yacc-filt
+@dirrm lib/xvile
+share/doc/xvile/Vileserv.doc
+share/doc/xvile/config.doc
+share/doc/xvile/dir.doc
+share/doc/xvile/filters.doc
+share/doc/xvile/macros.doc
+share/doc/xvile/menus.doc
+share/doc/xvile/modes.doc
+share/doc/xvile/oleauto.doc
+share/doc/xvile/perl.doc
+share/doc/xvile/visvile.doc
+share/doc/xvile/w32modes.doc
+share/doc/xvile/vile-perl-api.doc
+@dirrm share/doc/xvile
+share/xvile/vile/perl/Vile/Exporter.pm
+share/xvile/vile/perl/Vile/Manual.pm
+share/xvile/vile/perl/Glob2re.pm
+share/xvile/vile/perl/Vile.pm
+share/xvile/vile/perl/Vileserv.pm
+share/xvile/vile/perl/Visit.pm
+share/xvile/vile/perl/capture.pm
+share/xvile/vile/perl/directory.pm
+share/xvile/vile/perl/dirlist.pm
+share/xvile/vile/perl/hgrep.pm
+share/xvile/vile/perl/lock.pm
+share/xvile/vile/perl/mime.pl
+share/xvile/vile/perl/plugins.pl
+share/xvile/vile/perl/search.pm
+share/xvile/vile/perl/shell.pm
+share/xvile/vile/perl/spell.pm
+share/xvile/vile/perl/winops.pm
+share/xvile/vile/digraphs.rc
+share/xvile/vile/manpage.rc
+share/xvile/vile/palettes.rc
+share/xvile/vile/pictmode.rc
+share/xvile/vile/vileinit.rc
+share/xvile/vile/vileperl.rc
+share/xvile/vile/vile.hlp
+share/xvile/vile/.vilemenu
+share/xvile/vile/c.keywords
+share/xvile/vile/cpp.keywords
+share/xvile/vile/filters.rc
+share/xvile/vile/pas.keywords
+share/xvile/vile/vile.keywords
+share/xvile/vile/ada.keywords
+share/xvile/vile/awk.keywords
+share/xvile/vile/bat.keywords
+share/xvile/vile/csh.keywords
+share/xvile/vile/cweb.keywords
+share/xvile/vile/dcl.keywords
+share/xvile/vile/diff.keywords
+share/xvile/vile/esql.keywords
+share/xvile/vile/fdl.keywords
+share/xvile/vile/html.keywords
+share/xvile/vile/imake.keywords
+share/xvile/vile/java.keywords
+share/xvile/vile/js.keywords
+share/xvile/vile/latex.keywords
+share/xvile/vile/lex.keywords
+share/xvile/vile/m4.keywords
+share/xvile/vile/mail.keywords
+share/xvile/vile/make.keywords
+share/xvile/vile/nr.keywords
+share/xvile/vile/perl.keywords
+share/xvile/vile/py.keywords
+share/xvile/vile/pot.keywords
+share/xvile/vile/rcs.keywords
+share/xvile/vile/rexx.keywords
+share/xvile/vile/sccs.keywords
+share/xvile/vile/sh.keywords
+share/xvile/vile/spell.rc
+share/xvile/vile/sql.keywords
+share/xvile/vile/tags.keywords
+share/xvile/vile/tbl.keywords
+share/xvile/vile/tc.keywords
+share/xvile/vile/tcl.keywords
+share/xvile/vile/ti.keywords
+share/xvile/vile/xres.keywords
+share/xvile/vile/xs.keywords
+share/xvile/vile/yacc.keywords
+share/xvile/macros/digraphs.rc
+share/xvile/macros/manpage.rc
+share/xvile/macros/palettes.rc
+share/xvile/macros/pictmode.rc
+share/xvile/macros/vileinit.rc
+share/xvile/macros/vilemenu.rc
+share/xvile/macros/vileperl.rc
+share/xvile/macros/vile-pager
+@dirrm share/xvile/vile/perl/Vile
+@dirrm share/xvile/vile/perl
+@dirrm share/xvile/vile
+@dirrm share/xvile/macros
+@dirrm share/xvile