Index: head/editors/vile/Makefile =================================================================== --- head/editors/vile/Makefile (revision 537119) +++ head/editors/vile/Makefile (revision 537120) @@ -1,56 +1,57 @@ # Created by: pgf # $FreeBSD$ PORTNAME= vile -PORTVERSION= 9.8t +PORTVERSION= 9.8u CATEGORIES= editors MASTER_SITES= ftp://dickey.his.com/vile/current/ \ ftp://ftp.invisible-island.net/vile/current/ \ https://invisible-mirror.net/archives/vile/current/ PATCH_SITES= ${MASTER_SITES:S,vile/current/,vile/patches/,g} #PATCHFILES= MAINTAINER= dickey@invisible-island.net COMMENT= VI Like Emacs -- console version LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= reflex:textproc/reflex USES= ncurses pkgconfig shebangfix tar:tgz SHEBANG_FILES= perl/vileget GNU_CONFIGURE= yes CONFIGURE_ENV= cf_cv_crypt_works=yes MAKEFILE= makefile INSTALL_TARGET= install install-doc install-html CONFLICTS_INSTALL= xvile-[0-9]* OPTIONS_DEFINE= DOCS FILTERS ICONV PERL OPTIONS_SUB= yes FILTERS_DESC= Loadable filters FILTERS_CONFIGURE_WITH= loadable-filters ICONV_USES= iconv ICONV_CONFIGURE_ON= --with-iconv ${ICONV_CONFIGURE_ARG} ICONV_CONFIGURE_OFF= --without-iconv --without-locale PERL_USES= perl5 PERL_CONFIGURE_WITH= perl .include .if ${PORT_OPTIONS:MFILTERS} PLIST_SUB+= SO_EXT=".so" .else PLIST_SUB+= SO_EXT="" .endif post-patch: @${REINPLACE_CMD} -e \ 's|$$(datadir)/doc|@datadir@/doc/vile| ; \ s|$$(datadir)/html|$$(docdir)/html| ; \ s|\($$(DOCDIR)\) \($$(MANDIR)\)|\1 $$(HTMLDIR) \2|' \ ${WRKSRC}/makefile.in .include Index: head/editors/vile/distinfo =================================================================== --- head/editors/vile/distinfo (revision 537119) +++ head/editors/vile/distinfo (revision 537120) @@ -1,3 +1,3 @@ -TIMESTAMP = 1546252826 -SHA256 (vile-9.8t.tgz) = 60b288432cfd32b7149c4cd662844e2694c5ab92bc469b282f33ded5110f6ded -SIZE (vile-9.8t.tgz) = 2352119 +TIMESTAMP = 1589844782 +SHA256 (vile-9.8u.tgz) = 31a82833fe4fef5a60043bcc3278d1a875a1028b1b2577c9e0fa3a179cff165e +SIZE (vile-9.8u.tgz) = 2375989 Index: head/editors/vile/files/patch-configure =================================================================== --- head/editors/vile/files/patch-configure (nonexistent) +++ head/editors/vile/files/patch-configure (revision 537120) @@ -0,0 +1,11 @@ +--- configure.orig 2020-03-29 21:46:05 UTC ++++ configure +@@ -32100,7 +32100,7 @@ if test "x$CLANG_COMPILER" = "xyes" + then + { echo "$as_me:32101: WARNING: clang only pretends to honor gcc -rdynamic option" >&5 + echo "$as_me: WARNING: clang only pretends to honor gcc -rdynamic option" >&2;} +- cf_cv_gcc_opt_rdynamic=no ++ # cf_cv_gcc_opt_rdynamic=no + else + + echo "$as_me:32106: checking if $CC has -rdynamic option" >&5 Property changes on: head/editors/vile/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/editors/vile/pkg-plist =================================================================== --- head/editors/vile/pkg-plist (revision 537119) +++ head/editors/vile/pkg-plist (revision 537120) @@ -1,253 +1,261 @@ bin/vile bin/vile-libdir-path bin/vile-pager bin/vile-to-html %%PERL%%bin/vileget lib/vile/atr2ansi lib/vile/atr2html lib/vile/atr2text lib/vile/vile-ada-filt%%SO_EXT%% lib/vile/vile-as-filt%%SO_EXT%% lib/vile/vile-asm-filt%%SO_EXT%% lib/vile/vile-au3-filt%%SO_EXT%% lib/vile/vile-awk-filt%%SO_EXT%% lib/vile/vile-basic-filt%%SO_EXT%% lib/vile/vile-bat-filt%%SO_EXT%% lib/vile/vile-bnf-filt%%SO_EXT%% lib/vile/vile-c-filt%%SO_EXT%% lib/vile/vile-cfg-filt%%SO_EXT%% lib/vile/vile-conf-filt%%SO_EXT%% lib/vile/vile-crypt lib/vile/vile-css-filt%%SO_EXT%% lib/vile/vile-cweb-filt%%SO_EXT%% lib/vile/vile-dcl-filt%%SO_EXT%% lib/vile/vile-def-filt%%SO_EXT%% lib/vile/vile-diff-filt%%SO_EXT%% lib/vile/vile-ecl-filt%%SO_EXT%% lib/vile/vile-erl-filt%%SO_EXT%% lib/vile/vile-esql-filt%%SO_EXT%% lib/vile/vile-est-filt%%SO_EXT%% lib/vile/vile-fdl-filt%%SO_EXT%% lib/vile/vile-hs-filt%%SO_EXT%% lib/vile/vile-html-filt%%SO_EXT%% lib/vile/vile-imake-filt%%SO_EXT%% lib/vile/vile-info-filt%%SO_EXT%% lib/vile/vile-ini-filt%%SO_EXT%% lib/vile/vile-iss-filt%%SO_EXT%% lib/vile/vile-json-filt%%SO_EXT%% lib/vile/vile-key-filt%%SO_EXT%% lib/vile/vile-latex-filt%%SO_EXT%% lib/vile/vile-lex-filt%%SO_EXT%% lib/vile/vile-lisp-filt%%SO_EXT%% lib/vile/vile-lua-filt%%SO_EXT%% lib/vile/vile-m4-filt%%SO_EXT%% lib/vile/vile-mail-filt%%SO_EXT%% lib/vile/vile-mailcap-filt%%SO_EXT%% lib/vile/vile-make-filt%%SO_EXT%% lib/vile/vile-manfilt lib/vile/vile-mcrl-filt%%SO_EXT%% lib/vile/vile-midl-filt%%SO_EXT%% lib/vile/vile-mms-filt%%SO_EXT%% +lib/vile/vile-nmake-filt%%SO_EXT%% lib/vile/vile-nr-filt%%SO_EXT%% lib/vile/vile-pas-filt%%SO_EXT%% lib/vile/vile-perl-filt%%SO_EXT%% +lib/vile/vile-perl6-filt%%SO_EXT%% lib/vile/vile-php-filt%%SO_EXT%% lib/vile/vile-pot-filt%%SO_EXT%% lib/vile/vile-ps-filt%%SO_EXT%% lib/vile/vile-ps1-filt%%SO_EXT%% lib/vile/vile-py-filt%%SO_EXT%% lib/vile/vile-rc-filt%%SO_EXT%% lib/vile/vile-rcs-filt%%SO_EXT%% lib/vile/vile-rexx-filt%%SO_EXT%% lib/vile/vile-rpm-filt%%SO_EXT%% lib/vile/vile-rtf-filt%%SO_EXT%% lib/vile/vile-ruby-filt%%SO_EXT%% lib/vile/vile-rust-filt%%SO_EXT%% lib/vile/vile-sccs-filt%%SO_EXT%% lib/vile/vile-scheme-filt%%SO_EXT%% lib/vile/vile-sed-filt%%SO_EXT%% lib/vile/vile-sh-filt%%SO_EXT%% lib/vile/vile-sml-filt%%SO_EXT%% lib/vile/vile-spell-filt%%SO_EXT%% lib/vile/vile-sql-filt%%SO_EXT%% lib/vile/vile-tags-filt%%SO_EXT%% lib/vile/vile-tbl-filt%%SO_EXT%% lib/vile/vile-tc-filt%%SO_EXT%% lib/vile/vile-tcl-filt%%SO_EXT%% lib/vile/vile-texi-filt%%SO_EXT%% lib/vile/vile-ti-filt%%SO_EXT%% +lib/vile/vile-tpu-filt%%SO_EXT%% lib/vile/vile-txt-filt%%SO_EXT%% lib/vile/vile-vile-filt%%SO_EXT%% lib/vile/vile-vlog-filt%%SO_EXT%% lib/vile/vile-wbt-filt%%SO_EXT%% lib/vile/vile-xml-filt%%SO_EXT%% lib/vile/vile-xq-filt%%SO_EXT%% lib/vile/vile-xres-filt%%SO_EXT%% lib/vile/vile-xs-filt%%SO_EXT%% lib/vile/vile-yacc-filt%%SO_EXT%% lib/vile/vile-yaml-filt%%SO_EXT%% man/man1/vile-libdir-path.1.gz man/man1/vile-pager.1.gz man/man1/vile-to-html.1.gz man/man1/vile.1.gz %%PORTDOCS%%%%DOCSDIR%%/Vileserv.doc %%PORTDOCS%%%%DOCSDIR%%/config.doc %%PORTDOCS%%%%DOCSDIR%%/dir.doc %%PORTDOCS%%%%DOCSDIR%%/filters.doc %%PORTDOCS%%%%DOCSDIR%%/html/Vileserv.html %%PORTDOCS%%%%DOCSDIR%%/html/config.html %%PORTDOCS%%%%DOCSDIR%%/html/dir.html %%PORTDOCS%%%%DOCSDIR%%/html/filters.html %%PORTDOCS%%%%DOCSDIR%%/html/macros.html %%PORTDOCS%%%%DOCSDIR%%/html/menus.html %%PORTDOCS%%%%DOCSDIR%%/html/modes.html %%PORTDOCS%%%%DOCSDIR%%/html/oleauto.html %%PORTDOCS%%%%DOCSDIR%%/html/perl.html %%PORTDOCS%%%%DOCSDIR%%/html/vile-hlp.html %%PORTDOCS%%%%DOCSDIR%%/html/vile-toc.html %%PORTDOCS%%%%DOCSDIR%%/html/visvile.html %%PORTDOCS%%%%DOCSDIR%%/macros.doc %%PORTDOCS%%%%DOCSDIR%%/menus.doc %%PORTDOCS%%%%DOCSDIR%%/modes.doc %%PORTDOCS%%%%DOCSDIR%%/oleauto.doc %%PORTDOCS%%%%DOCSDIR%%/perl.doc %%PORTDOCS%%%%DOCSDIR%%/visvile.doc %%DATADIR%%/ada.keywords %%DATADIR%%/ant.keywords %%DATADIR%%/as.keywords %%DATADIR%%/as386.keywords %%DATADIR%%/asm.keywords %%DATADIR%%/au3.keywords %%DATADIR%%/awk.keywords %%DATADIR%%/bash.keywords %%DATADIR%%/basic.keywords %%DATADIR%%/bat.keywords %%DATADIR%%/bnf.keywords %%DATADIR%%/c.keywords %%DATADIR%%/color-ls.rc %%DATADIR%%/complete.rc %%DATADIR%%/cpp.keywords %%DATADIR%%/cs.keywords %%DATADIR%%/csh.keywords %%DATADIR%%/css.keywords %%DATADIR%%/cweb.keywords %%DATADIR%%/dates.rc %%DATADIR%%/dcl.keywords %%DATADIR%%/def.keywords %%DATADIR%%/delphi.keywords %%DATADIR%%/diff.keywords %%DATADIR%%/digraphs.rc %%DATADIR%%/docbook.keywords %%DATADIR%%/ecl.keywords %%DATADIR%%/erl.keywords %%DATADIR%%/esql.keywords %%DATADIR%%/est.keywords %%DATADIR%%/fdl.keywords %%DATADIR%%/filters.rc %%DATADIR%%/gnugpg.rc +%%DATADIR%%/go.keywords %%DATADIR%%/hs.keywords %%DATADIR%%/html.keywords %%DATADIR%%/imake.keywords %%DATADIR%%/ini.keywords %%DATADIR%%/iss.keywords %%DATADIR%%/java.keywords %%DATADIR%%/js.keywords %%DATADIR%%/json.keywords %%DATADIR%%/ksh.keywords %%DATADIR%%/latex.keywords %%DATADIR%%/lex.keywords %%DATADIR%%/lisp.keywords %%DATADIR%%/loaderrs.rc %%DATADIR%%/lua.keywords %%DATADIR%%/m4.keywords %%DATADIR%%/mail.keywords %%DATADIR%%/mailcap.keywords %%DATADIR%%/make.keywords %%DATADIR%%/manpage.rc %%DATADIR%%/mcrl.keywords %%DATADIR%%/midl.keywords %%DATADIR%%/modes.rc %%DATADIR%%/mvn.keywords +%%DATADIR%%/nmake.keywords %%DATADIR%%/nr.keywords %%DATADIR%%/nsis.keywords %%DATADIR%%/objc.keywords %%DATADIR%%/palettes.rc %%DATADIR%%/pas.keywords %%DATADIR%%/pc.keywords -%%PERL%%%%DATADIR%%/perl/Breadcrumbs.pm -%%PERL%%%%DATADIR%%/perl/CaptHook.pm -%%PERL%%%%DATADIR%%/perl/Glob2re.pm -%%PERL%%%%DATADIR%%/perl/Help.pm -%%PERL%%%%DATADIR%%/perl/Vile/Exporter.pm -%%PERL%%%%DATADIR%%/perl/Vile/Manual.pm -%%PERL%%%%DATADIR%%/perl/Vile.pm -%%PERL%%%%DATADIR%%/perl/Vileserv.pm -%%PERL%%%%DATADIR%%/perl/Visit.pm -%%PERL%%%%DATADIR%%/perl/capture.pm -%%PERL%%%%DATADIR%%/perl/dict.pm -%%PERL%%%%DATADIR%%/perl/directory.pm -%%PERL%%%%DATADIR%%/perl/dirlist.pm -%%PERL%%%%DATADIR%%/perl/gdb.pm -%%PERL%%%%DATADIR%%/perl/hgrep.pm -%%PERL%%%%DATADIR%%/perl/lock.pm -%%PERL%%%%DATADIR%%/perl/man.pm -%%PERL%%%%DATADIR%%/perl/mime.pl -%%PERL%%%%DATADIR%%/perl/plugins.pl -%%PERL%%%%DATADIR%%/perl/search.pm -%%PERL%%%%DATADIR%%/perl/shell.pm -%%PERL%%%%DATADIR%%/perl/spell.pm -%%PERL%%%%DATADIR%%/perl/winops.pm %%DATADIR%%/perl.keywords +%%DATADIR%%/perl6.keywords %%DATADIR%%/php.keywords %%DATADIR%%/pictmode.rc %%DATADIR%%/pot.keywords %%DATADIR%%/prolog.keywords %%DATADIR%%/ps.keywords %%DATADIR%%/ps1.keywords %%DATADIR%%/py.keywords %%DATADIR%%/rb.keywords %%DATADIR%%/rc.keywords %%DATADIR%%/rcs.keywords %%DATADIR%%/rexx.keywords %%DATADIR%%/rpm.keywords %%DATADIR%%/rtf.keywords %%DATADIR%%/ruby.keywords %%DATADIR%%/rust.keywords %%DATADIR%%/sccs.keywords %%DATADIR%%/scheme.keywords %%DATADIR%%/search.rc %%DATADIR%%/sh.keywords %%DATADIR%%/shifts.rc %%DATADIR%%/showeach.rc %%DATADIR%%/sml.keywords %%DATADIR%%/spell.rc %%DATADIR%%/sql.keywords %%DATADIR%%/syntax.keywords %%DATADIR%%/tags.keywords %%DATADIR%%/tbl.keywords %%DATADIR%%/tc.keywords %%DATADIR%%/tcl.keywords %%DATADIR%%/tex.keywords %%DATADIR%%/texi.keywords %%DATADIR%%/ti.keywords +%%DATADIR%%/tpu.keywords +%%DATADIR%%/ts.keywords %%DATADIR%%/vb.keywords %%DATADIR%%/vb6.keywords %%DATADIR%%/vbs.keywords %%DATADIR%%/vcproj.keywords %%DATADIR%%/vcxproj.keywords %%DATADIR%%/vile.hlp %%DATADIR%%/vile.keywords %%DATADIR%%/vileinit.rc %%DATADIR%%/vileperl.rc %%DATADIR%%/vim.keywords %%DATADIR%%/vlog.keywords %%DATADIR%%/wbt.keywords %%DATADIR%%/which.rc %%DATADIR%%/xml.keywords %%DATADIR%%/xq.keywords %%DATADIR%%/xres.keywords %%DATADIR%%/xs.keywords %%DATADIR%%/xsl.keywords %%DATADIR%%/yacc.keywords %%DATADIR%%/yaml.keywords %%DATADIR%%/zsh.keywords +%%PERL%%%%DATADIR%%/perl/Breadcrumbs.pm +%%PERL%%%%DATADIR%%/perl/CaptHook.pm +%%PERL%%%%DATADIR%%/perl/Glob2re.pm +%%PERL%%%%DATADIR%%/perl/Help.pm +%%PERL%%%%DATADIR%%/perl/Vile.pm +%%PERL%%%%DATADIR%%/perl/Vile/Exporter.pm +%%PERL%%%%DATADIR%%/perl/Vile/Manual.pm +%%PERL%%%%DATADIR%%/perl/Vileserv.pm +%%PERL%%%%DATADIR%%/perl/Visit.pm +%%PERL%%%%DATADIR%%/perl/capture.pm +%%PERL%%%%DATADIR%%/perl/dict.pm +%%PERL%%%%DATADIR%%/perl/directory.pm +%%PERL%%%%DATADIR%%/perl/dirlist.pm +%%PERL%%%%DATADIR%%/perl/gdb.pm +%%PERL%%%%DATADIR%%/perl/hgrep.pm +%%PERL%%%%DATADIR%%/perl/lock.pm +%%PERL%%%%DATADIR%%/perl/man.pm +%%PERL%%%%DATADIR%%/perl/mime.pl +%%PERL%%%%DATADIR%%/perl/plugins.pl +%%PERL%%%%DATADIR%%/perl/search.pm +%%PERL%%%%DATADIR%%/perl/shell.pm +%%PERL%%%%DATADIR%%/perl/spell.pm +%%PERL%%%%DATADIR%%/perl/winops.pm Index: head/editors/xvile/Makefile =================================================================== --- head/editors/xvile/Makefile (revision 537119) +++ head/editors/xvile/Makefile (revision 537120) @@ -1,91 +1,89 @@ # Created by: pgf # $FreeBSD$ PORTNAME= vile -PORTVERSION= 9.8t +PORTVERSION= 9.8u CATEGORIES= editors MASTER_SITES= ftp://dickey.his.com/vile/current/ \ ftp://ftp.invisible-island.net/vile/current/ \ https://invisible-mirror.net/archives/vile/current/ PKGNAMEPREFIX= x PATCH_SITES= ${MASTER_SITES:S,vile/current/,vile/patches/,g} PATCHFILES= # none MAINTAINER= dickey@invisible-island.net COMMENT= VI Like Emacs -- X11 version LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= reflex:textproc/reflex USES= pkgconfig shebangfix tar:tgz xorg SHEBANG_FILES= macros/lxvile macros/lxvile-fonts perl/vileget USE_XORG= x11 xext xpm xt GNU_CONFIGURE= yes CONFIGURE_ENV= cf_cv_crypt_works=yes CONFIGURE_ARGS= --disable-imake \ --disable-desktop \ --enable-fontset \ --with-icon-theme \ --with-xpm \ --with-icondir=${PREFIX}/share/icons \ --with-pixmapdir=${PREFIX}/share/pixmaps MAKEFILE= makefile INSTALL_TARGET= install install-doc install-html CONFLICTS_INSTALL= vile-[0-9]* OPTIONS_DEFINE= DOCS FILTERS ICONV PERL OPTIONS_RADIO= MENUS OPTIONS_RADIO_MENUS= MOTIF XAW XAW3D OPTIONS_DEFAULT= ICONV OPTIONS_SUB= yes FILTERS_DESC= Loadable filters FILTERS_CONFIGURE_WITH= loadable-filters ICONV_USES= iconv ICONV_CONFIGURE_ON= --with-iconv ${ICONV_CONFIGURE_ARG} ICONV_CONFIGURE_OFF= --without-iconv --without-locale MENUS_DESC= Support for menus MOTIF_USES= motif MOTIF_CONFIGURE_ON= --enable-colored-menus \ --with-screen=motif PERL_USES= perl5 PERL_CONFIGURE_WITH= perl XAW_DESC= X Athena Widgets XAW_USE= XORG=xaw XAW_CONFIGURE_ON= --with-screen=athena XAW3D_DESC= X Athena Widgets with 3D effect XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d XAW3D_CONFIGURE_ON= --enable-colored-menus \ --with-Xaw3d \ --with-screen=xaw3d .include .if ${PORT_OPTIONS:MFILTERS} PLIST_SUB+= SO_EXT=".so" .else PLIST_SUB+= SO_EXT="" .endif .if empty(PORT_OPTIONS:MMOTIF) && empty(PORT_OPTIONS:MXAW) && empty(PORT_OPTIONS:MXAW3D) CONFIGURE_ARGS+= --with-screen=x11 .endif post-patch: @${REINPLACE_CMD} -e \ 's|$$(datadir)/doc|@datadir@/doc/vile| ; \ s|$$(datadir)/html|$$(docdir)/html| ; \ s|\($$(DOCDIR)\) \($$(MANDIR)\)|\1 $$(HTMLDIR) \2|' \ ${WRKSRC}/makefile.in - @${REINPLACE_CMD} -e \ - '/^Categories/s|Application;||' \ - ${WRKSRC}/macros/*.desktop post-install: (cd ${WRKSRC}/macros && ${INSTALL_DATA} *.desktop \ ${STAGEDIR}${PREFIX}/share/applications) .include Index: head/editors/xvile/distinfo =================================================================== --- head/editors/xvile/distinfo (revision 537119) +++ head/editors/xvile/distinfo (revision 537120) @@ -1,3 +1,3 @@ -TIMESTAMP = 1546254826 -SHA256 (vile-9.8t.tgz) = 60b288432cfd32b7149c4cd662844e2694c5ab92bc469b282f33ded5110f6ded -SIZE (vile-9.8t.tgz) = 2352119 +TIMESTAMP = 1589844782 +SHA256 (vile-9.8u.tgz) = 31a82833fe4fef5a60043bcc3278d1a875a1028b1b2577c9e0fa3a179cff165e +SIZE (vile-9.8u.tgz) = 2375989 Index: head/editors/xvile/files/patch-configure =================================================================== --- head/editors/xvile/files/patch-configure (nonexistent) +++ head/editors/xvile/files/patch-configure (revision 537120) @@ -0,0 +1,11 @@ +--- configure.orig 2020-03-29 21:46:05 UTC ++++ configure +@@ -32100,7 +32100,7 @@ if test "x$CLANG_COMPILER" = "xyes" + then + { echo "$as_me:32101: WARNING: clang only pretends to honor gcc -rdynamic option" >&5 + echo "$as_me: WARNING: clang only pretends to honor gcc -rdynamic option" >&2;} +- cf_cv_gcc_opt_rdynamic=no ++ # cf_cv_gcc_opt_rdynamic=no + else + + echo "$as_me:32106: checking if $CC has -rdynamic option" >&5 Property changes on: head/editors/xvile/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/editors/xvile/files/patch-x11menu.c =================================================================== --- head/editors/xvile/files/patch-x11menu.c (revision 537119) +++ head/editors/xvile/files/patch-x11menu.c (revision 537120) @@ -1,24 +1,23 @@ --- x11menu.c.orig 2013-12-07 16:26:12 UTC +++ x11menu.c -@@ -29,12 +29,21 @@ +@@ -29,11 +29,20 @@ #endif #if ATHENA_WIDGETS +#ifdef HAVE_LIB_XAW3D +#include +#include +#include +#include +#include +#endif +#ifdef HAVE_LIB_XAW #include #include #include #include #include - #endif +#endif + #endif #define Nval(name,value) name, (XtArgVal)(value) - #define Sval(name,value) name, (value) Index: head/editors/xvile/files/patch-x11vile.h =================================================================== --- head/editors/xvile/files/patch-x11vile.h (revision 537119) +++ head/editors/xvile/files/patch-x11vile.h (revision 537120) @@ -1,22 +1,21 @@ --- x11vile.h.orig 2013-04-14 19:09:08 UTC +++ x11vile.h -@@ -282,11 +282,19 @@ +@@ -282,10 +282,18 @@ #if OPT_MENUS #if ATHENA_WIDGETS +#ifdef HAVE_LIB_XAW3D +#include +#include +#include +#include +#endif +#ifdef HAVE_LIB_XAW #include #include #include #include - #endif +#endif + #endif #if MOTIF_WIDGETS #include - #endif Index: head/editors/xvile/pkg-plist =================================================================== --- head/editors/xvile/pkg-plist (revision 537119) +++ head/editors/xvile/pkg-plist (revision 537120) @@ -1,266 +1,274 @@ bin/lxvile bin/lxvile-fonts bin/uxvile %%PERL%%bin/vileget bin/xshell.sh bin/xvile bin/xvile-libdir-path bin/xvile-pager bin/xvile-to-html lib/X11/app-defaults/UXVile lib/X11/app-defaults/XVile lib/vile/atr2ansi lib/vile/atr2html lib/vile/atr2text lib/vile/vile-ada-filt%%SO_EXT%% lib/vile/vile-as-filt%%SO_EXT%% lib/vile/vile-asm-filt%%SO_EXT%% lib/vile/vile-au3-filt%%SO_EXT%% lib/vile/vile-awk-filt%%SO_EXT%% lib/vile/vile-basic-filt%%SO_EXT%% lib/vile/vile-bat-filt%%SO_EXT%% lib/vile/vile-bnf-filt%%SO_EXT%% lib/vile/vile-c-filt%%SO_EXT%% lib/vile/vile-cfg-filt%%SO_EXT%% lib/vile/vile-conf-filt%%SO_EXT%% lib/vile/vile-crypt lib/vile/vile-css-filt%%SO_EXT%% lib/vile/vile-cweb-filt%%SO_EXT%% lib/vile/vile-dcl-filt%%SO_EXT%% lib/vile/vile-def-filt%%SO_EXT%% lib/vile/vile-diff-filt%%SO_EXT%% lib/vile/vile-ecl-filt%%SO_EXT%% lib/vile/vile-erl-filt%%SO_EXT%% lib/vile/vile-esql-filt%%SO_EXT%% lib/vile/vile-est-filt%%SO_EXT%% lib/vile/vile-fdl-filt%%SO_EXT%% lib/vile/vile-hs-filt%%SO_EXT%% lib/vile/vile-html-filt%%SO_EXT%% lib/vile/vile-imake-filt%%SO_EXT%% lib/vile/vile-info-filt%%SO_EXT%% lib/vile/vile-ini-filt%%SO_EXT%% lib/vile/vile-iss-filt%%SO_EXT%% lib/vile/vile-json-filt%%SO_EXT%% lib/vile/vile-key-filt%%SO_EXT%% lib/vile/vile-latex-filt%%SO_EXT%% lib/vile/vile-lex-filt%%SO_EXT%% lib/vile/vile-lisp-filt%%SO_EXT%% lib/vile/vile-lua-filt%%SO_EXT%% lib/vile/vile-m4-filt%%SO_EXT%% lib/vile/vile-mail-filt%%SO_EXT%% lib/vile/vile-mailcap-filt%%SO_EXT%% lib/vile/vile-make-filt%%SO_EXT%% lib/vile/vile-manfilt lib/vile/vile-mcrl-filt%%SO_EXT%% lib/vile/vile-midl-filt%%SO_EXT%% lib/vile/vile-mms-filt%%SO_EXT%% +lib/vile/vile-nmake-filt%%SO_EXT%% lib/vile/vile-nr-filt%%SO_EXT%% lib/vile/vile-pas-filt%%SO_EXT%% lib/vile/vile-perl-filt%%SO_EXT%% +lib/vile/vile-perl6-filt%%SO_EXT%% lib/vile/vile-php-filt%%SO_EXT%% lib/vile/vile-pot-filt%%SO_EXT%% lib/vile/vile-ps-filt%%SO_EXT%% lib/vile/vile-ps1-filt%%SO_EXT%% lib/vile/vile-py-filt%%SO_EXT%% lib/vile/vile-rc-filt%%SO_EXT%% lib/vile/vile-rcs-filt%%SO_EXT%% lib/vile/vile-rexx-filt%%SO_EXT%% lib/vile/vile-rpm-filt%%SO_EXT%% lib/vile/vile-rtf-filt%%SO_EXT%% lib/vile/vile-ruby-filt%%SO_EXT%% lib/vile/vile-rust-filt%%SO_EXT%% lib/vile/vile-sccs-filt%%SO_EXT%% lib/vile/vile-scheme-filt%%SO_EXT%% lib/vile/vile-sed-filt%%SO_EXT%% lib/vile/vile-sh-filt%%SO_EXT%% lib/vile/vile-sml-filt%%SO_EXT%% lib/vile/vile-spell-filt%%SO_EXT%% lib/vile/vile-sql-filt%%SO_EXT%% lib/vile/vile-tags-filt%%SO_EXT%% lib/vile/vile-tbl-filt%%SO_EXT%% lib/vile/vile-tc-filt%%SO_EXT%% lib/vile/vile-tcl-filt%%SO_EXT%% lib/vile/vile-texi-filt%%SO_EXT%% lib/vile/vile-ti-filt%%SO_EXT%% +lib/vile/vile-tpu-filt%%SO_EXT%% lib/vile/vile-txt-filt%%SO_EXT%% lib/vile/vile-vile-filt%%SO_EXT%% lib/vile/vile-vlog-filt%%SO_EXT%% lib/vile/vile-wbt-filt%%SO_EXT%% lib/vile/vile-xml-filt%%SO_EXT%% lib/vile/vile-xq-filt%%SO_EXT%% lib/vile/vile-xres-filt%%SO_EXT%% lib/vile/vile-xs-filt%%SO_EXT%% lib/vile/vile-yacc-filt%%SO_EXT%% lib/vile/vile-yaml-filt%%SO_EXT%% man/man1/xvile.1.gz man/man1/xvile-libdir-path.1.gz man/man1/xvile-pager.1.gz man/man1/xvile-to-html.1.gz share/applications/lxvile.desktop share/applications/uxvile.desktop share/applications/xvile.desktop %%PORTDOCS%%%%DOCSDIR%%/Vileserv.doc %%PORTDOCS%%%%DOCSDIR%%/config.doc %%PORTDOCS%%%%DOCSDIR%%/dir.doc %%PORTDOCS%%%%DOCSDIR%%/filters.doc %%PORTDOCS%%%%DOCSDIR%%/html/Vileserv.html %%PORTDOCS%%%%DOCSDIR%%/html/config.html %%PORTDOCS%%%%DOCSDIR%%/html/dir.html %%PORTDOCS%%%%DOCSDIR%%/html/filters.html %%PORTDOCS%%%%DOCSDIR%%/html/macros.html %%PORTDOCS%%%%DOCSDIR%%/html/menus.html %%PORTDOCS%%%%DOCSDIR%%/html/modes.html %%PORTDOCS%%%%DOCSDIR%%/html/oleauto.html %%PORTDOCS%%%%DOCSDIR%%/html/perl.html %%PORTDOCS%%%%DOCSDIR%%/html/vile-hlp.html %%PORTDOCS%%%%DOCSDIR%%/html/vile-toc.html %%PORTDOCS%%%%DOCSDIR%%/html/visvile.html %%PORTDOCS%%%%DOCSDIR%%/macros.doc %%PORTDOCS%%%%DOCSDIR%%/menus.doc %%PORTDOCS%%%%DOCSDIR%%/modes.doc %%PORTDOCS%%%%DOCSDIR%%/oleauto.doc %%PORTDOCS%%%%DOCSDIR%%/perl.doc %%PORTDOCS%%%%DOCSDIR%%/visvile.doc share/icons/hicolor/48x48/apps/vile.png share/icons/hicolor/scalable/apps/vile.svg share/pixmaps/vile.xpm %%DATADIR%%/ada.keywords %%DATADIR%%/ant.keywords %%DATADIR%%/as.keywords %%DATADIR%%/as386.keywords %%DATADIR%%/asm.keywords %%DATADIR%%/au3.keywords %%DATADIR%%/awk.keywords %%DATADIR%%/bash.keywords %%DATADIR%%/basic.keywords %%DATADIR%%/bat.keywords %%DATADIR%%/bnf.keywords %%DATADIR%%/c.keywords %%DATADIR%%/color-ls.rc %%DATADIR%%/complete.rc %%DATADIR%%/cpp.keywords %%DATADIR%%/cs.keywords %%DATADIR%%/csh.keywords %%DATADIR%%/css.keywords %%DATADIR%%/cweb.keywords %%DATADIR%%/dates.rc %%DATADIR%%/dcl.keywords %%DATADIR%%/def.keywords %%DATADIR%%/delphi.keywords %%DATADIR%%/diff.keywords %%DATADIR%%/digraphs.rc %%DATADIR%%/docbook.keywords %%DATADIR%%/ecl.keywords %%DATADIR%%/erl.keywords %%DATADIR%%/esql.keywords %%DATADIR%%/est.keywords %%DATADIR%%/fdl.keywords %%DATADIR%%/filters.rc %%DATADIR%%/gnugpg.rc +%%DATADIR%%/go.keywords %%DATADIR%%/hs.keywords %%DATADIR%%/html.keywords %%DATADIR%%/imake.keywords %%DATADIR%%/ini.keywords %%DATADIR%%/iss.keywords %%DATADIR%%/java.keywords %%DATADIR%%/js.keywords %%DATADIR%%/json.keywords %%DATADIR%%/ksh.keywords %%DATADIR%%/latex.keywords %%DATADIR%%/lex.keywords %%DATADIR%%/lisp.keywords %%DATADIR%%/loaderrs.rc %%DATADIR%%/lua.keywords %%DATADIR%%/m4.keywords %%DATADIR%%/mail.keywords %%DATADIR%%/mailcap.keywords %%DATADIR%%/make.keywords %%DATADIR%%/manpage.rc %%DATADIR%%/mcrl.keywords %%DATADIR%%/midl.keywords %%DATADIR%%/modes.rc %%DATADIR%%/mvn.keywords +%%DATADIR%%/nmake.keywords %%DATADIR%%/nr.keywords %%DATADIR%%/nsis.keywords %%DATADIR%%/objc.keywords %%DATADIR%%/palettes.rc %%DATADIR%%/pas.keywords %%DATADIR%%/pc.keywords -%%DATADIR%%/rust.keywords -%%DATADIR%%/vcproj.keywords -%%DATADIR%%/vcxproj.keywords -%%DATADIR%%/yaml.keywords -%%PERL%%%%DATADIR%%/perl/Breadcrumbs.pm -%%PERL%%%%DATADIR%%/perl/CaptHook.pm -%%PERL%%%%DATADIR%%/perl/Glob2re.pm -%%PERL%%%%DATADIR%%/perl/Help.pm -%%PERL%%%%DATADIR%%/perl/Vile/Exporter.pm -%%PERL%%%%DATADIR%%/perl/Vile/Manual.pm -%%PERL%%%%DATADIR%%/perl/Vile.pm -%%PERL%%%%DATADIR%%/perl/Vileserv.pm -%%PERL%%%%DATADIR%%/perl/Visit.pm -%%PERL%%%%DATADIR%%/perl/capture.pm -%%PERL%%%%DATADIR%%/perl/dict.pm -%%PERL%%%%DATADIR%%/perl/directory.pm -%%PERL%%%%DATADIR%%/perl/dirlist.pm -%%PERL%%%%DATADIR%%/perl/gdb.pm -%%PERL%%%%DATADIR%%/perl/hgrep.pm -%%PERL%%%%DATADIR%%/perl/lock.pm -%%PERL%%%%DATADIR%%/perl/man.pm -%%PERL%%%%DATADIR%%/perl/mime.pl -%%PERL%%%%DATADIR%%/perl/plugins.pl -%%PERL%%%%DATADIR%%/perl/search.pm -%%PERL%%%%DATADIR%%/perl/shell.pm -%%PERL%%%%DATADIR%%/perl/spell.pm -%%PERL%%%%DATADIR%%/perl/winops.pm %%DATADIR%%/perl.keywords +%%DATADIR%%/perl6.keywords %%DATADIR%%/php.keywords %%DATADIR%%/pictmode.rc %%DATADIR%%/pot.keywords %%DATADIR%%/prolog.keywords %%DATADIR%%/ps.keywords %%DATADIR%%/ps1.keywords %%DATADIR%%/py.keywords %%DATADIR%%/rb.keywords %%DATADIR%%/rc.keywords %%DATADIR%%/rcs.keywords %%DATADIR%%/rexx.keywords %%DATADIR%%/rpm.keywords %%DATADIR%%/rtf.keywords %%DATADIR%%/ruby.keywords +%%DATADIR%%/rust.keywords %%DATADIR%%/sccs.keywords %%DATADIR%%/scheme.keywords %%DATADIR%%/search.rc %%DATADIR%%/sh.keywords %%DATADIR%%/shifts.rc %%DATADIR%%/showeach.rc %%DATADIR%%/sml.keywords %%DATADIR%%/spell.rc %%DATADIR%%/sql.keywords %%DATADIR%%/syntax.keywords %%DATADIR%%/tags.keywords %%DATADIR%%/tbl.keywords %%DATADIR%%/tc.keywords %%DATADIR%%/tcl.keywords %%DATADIR%%/tex.keywords %%DATADIR%%/texi.keywords %%DATADIR%%/ti.keywords +%%DATADIR%%/tpu.keywords +%%DATADIR%%/ts.keywords %%DATADIR%%/vb.keywords %%DATADIR%%/vb6.keywords %%DATADIR%%/vbs.keywords +%%DATADIR%%/vcproj.keywords +%%DATADIR%%/vcxproj.keywords %%DATADIR%%/vile.hlp %%DATADIR%%/vile.keywords %%DATADIR%%/vileinit.rc %%DATADIR%%/vilemenu.rc %%DATADIR%%/vileperl.rc %%DATADIR%%/vim.keywords %%DATADIR%%/vlog.keywords %%DATADIR%%/wbt.keywords %%DATADIR%%/which.rc %%DATADIR%%/xml.keywords %%DATADIR%%/xq.keywords %%DATADIR%%/xres.keywords %%DATADIR%%/xs.keywords %%DATADIR%%/xsl.keywords %%DATADIR%%/yacc.keywords +%%DATADIR%%/yaml.keywords %%DATADIR%%/zsh.keywords +%%PERL%%%%DATADIR%%/perl/Breadcrumbs.pm +%%PERL%%%%DATADIR%%/perl/CaptHook.pm +%%PERL%%%%DATADIR%%/perl/Glob2re.pm +%%PERL%%%%DATADIR%%/perl/Help.pm +%%PERL%%%%DATADIR%%/perl/Vile.pm +%%PERL%%%%DATADIR%%/perl/Vile/Exporter.pm +%%PERL%%%%DATADIR%%/perl/Vile/Manual.pm +%%PERL%%%%DATADIR%%/perl/Vileserv.pm +%%PERL%%%%DATADIR%%/perl/Visit.pm +%%PERL%%%%DATADIR%%/perl/capture.pm +%%PERL%%%%DATADIR%%/perl/dict.pm +%%PERL%%%%DATADIR%%/perl/directory.pm +%%PERL%%%%DATADIR%%/perl/dirlist.pm +%%PERL%%%%DATADIR%%/perl/gdb.pm +%%PERL%%%%DATADIR%%/perl/hgrep.pm +%%PERL%%%%DATADIR%%/perl/lock.pm +%%PERL%%%%DATADIR%%/perl/man.pm +%%PERL%%%%DATADIR%%/perl/mime.pl +%%PERL%%%%DATADIR%%/perl/plugins.pl +%%PERL%%%%DATADIR%%/perl/search.pm +%%PERL%%%%DATADIR%%/perl/shell.pm +%%PERL%%%%DATADIR%%/perl/spell.pm +%%PERL%%%%DATADIR%%/perl/winops.pm