Update to 4.0

Upstream changes:
JOE 4.0
JOE now has pop-up shell windows with full terminal emulation and shell commands
that can control the editor. Hit F1 - F4 to bring up a shell window.
See Pop-up shell feature for a full description.
The status command (^K SPACE) can now be customized using the same syntax
as the status bar. Look for smsg and zmsg in joerc to see how to do this.
parserr (the error parser) will parse only the highlighted block if it's set. Before it always parsed the entire buffer.
Now there is a per-buffer concept of current directory. This was added to
make the pop-up shell windows work better, but it's useful in general.
At file prompts you can begin a new anchored path without having to delete
the old one. It means that ~jhallen/foo//etc/passwd is translated to /etc/passwd.
Prompt windows are now highighted to indicate which parts of the path are
being dropped. There is a syntax file for this: filename.jsf
The error parser now ignores ANSI sequences (some versions of grep
color their results, now JOE can still parse it).
Temporary messages are now dismissed by keyboard input only. Before, they
could also be dismissed by shell input.
Tags search now supports multiple matches. ^K ; can be configured to
either provide a menu of the matches or to cycle through them.
Tags search will now match on the member name part of member functions
('fred' will match 'myclass::fred').
Tags search will prepend the path to the tags file file name in the tags
file. This is important when JOE finds the tags file via the TAGS
environment variable.
Remove ` as quote character from incremental search.
Clean up documentation, convert much of it to Markdown.

JOE 3.8
Search JOE image for :include files referenced by the joerc file.
Include ftyperc file in the JOE image.
Change default indent from 2 to 4. Add quick menu to change to common
indent values: ^T = (1, 2, 4, or 8). Switch to + and - for definitively
setting or clearing options so that 0 and 1 can be use for quick select.
Added option to suppress DEADJOE file
Jump to matching delimiter (Ctrl-G) has been improved. It can now use the
syntax files to parse the document in order to identify strings and
comments which should be skipped during the matching delimiter search.
(patch by Charles Tabony).
When 'notite' mode is enabled, JOE now emits linefeeds to preserve the
screen contents in the terminal emulator's scrollback buffer. This can be
suppressed with a new flag: nolinefeeds.
JOE now starts up quiet (prints no extra messages when starting).
Messages are collected in a startup log (view with ESC x showlog).
There is a new flag 'noexmsg' which, when set, makes JOE quiet when it shuts
down (suppresses "File not changed so no update needed" message).
Use 80th column if terminal has xn capability (patch by pts and Egmont
Koblinger).
Support italic text (on some terminal emulators) with "\l" (patch by
Egmont Koblinger)
Support bracketed paste (patch by Egmont Koblinger)
Fix line number in syntax highlighter error output
Prevent infinite loops caused by buggy syntax definitions.
New and improved syntax definitions for:
Ant: contributed by Christian Nicolai
Batch files: contributed by John Jordan
C#: contributed by John Jordan
Debian apt sources.list: contributed by Christian Nicolai
Elixir: contributed by Andrew Lisin
Erlang: contributed by Christian Nicolai, Jonas Rosling, Andrew Lisin
git-commit messages: contributed by Christian Nicolai
Go: contributed by Matthias S. Benkmann
HAML: contributed by Christian Nicolai
INI: contributed by Christian Nicolai
iptables: contributed by Christian Nicolai
Javascript: contributed by Rebecca Turner, Christian Nicolai
json: contributed by Rebecca Turner
Markdown: contributed by Christian Nicolai, Jonas Rosling
Powershell: contributed by Oskar Liljeblad
Prolog: contributed by Christian Nicolai
Puppet: contributed by Christian Nicolai, Eric Eisenhart
Sieve: contributed by Christian Nicolai
YAML: contributed by Christian Nicolai
(from github.com/cmur2/joe-syntax)
Syntax definition fixes for: C, Python, Java, Lua, sh, Ruby, PHP, TeX,
CSS, and XML
Save/restore utf-8 and crlf modes when changing in/out of hex edit for
better display
Fix autocomplete for paths containing spaces
Accept mouse events beyond column 208 (patch by Egmont Kobligner)
Adjust guess_indent behavior based on user feedback
Fix infinite loop in search and replace
Add a new command 'timer' which executes a macro every n seconds. I use
this for periodically injecting a command into a shell window for
overnight testing of some device.
Convert double to long long (if we have it) when printing hexadecimal.
Fix bug where undo was acting strangly in shell windows.
Fix crash when hitting -----------.. wordwrap bug.
Check for math functions
Use joerc if fancyjoerc not there.
fix segfault from -orphan
fix window size detection bug: can't take out types.h
from tty.c
update status line immediately on resize.
va_copy fix.
don't smartbackspace when smartbacks is off.

6 files changed, 64 insertions, 50 deletions

diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 7feb66f400a..5e5ec60d15c 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2012/10/03 11:43:35 asau Exp $
+# $NetBSD: Makefile,v 1.37 2015/05/03 01:45:32 wen Exp $
 
-DISTNAME=	joe-3.7
-PKGREVISION=	2
+DISTNAME=	joe-4.0
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=joe-editor/}
 
diff --git a/editors/joe/PLIST b/editors/joe/PLIST
index ebccfc877c7..89b2b08a56a 100644
--- a/editors/joe/PLIST
+++ b/editors/joe/PLIST
@@ -1,18 +1,19 @@
-@comment $NetBSD: PLIST,v 1.8 2010/06/23 12:52:43 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2015/05/03 01:45:32 wen Exp $
 bin/jmacs
 bin/joe
 bin/jpico
 bin/jstar
 bin/rjoe
+bin/stringify
 bin/termidx
 man/man1/joe.1
 man/ru/man1/joe.1
 share/doc/joe/ChangeLog
-share/doc/joe/HACKING
-share/doc/joe/HINTS
-share/doc/joe/LIST
-share/doc/joe/NEWS
-share/doc/joe/README
+share/doc/joe/NEWS.md
+share/doc/joe/README.md
+share/doc/joe/README.old
+share/doc/joe/hacking.md
+share/doc/joe/man.md
 share/examples/joe/ftyperc
 share/examples/joe/jicerc.ru
 share/examples/joe/jmacsrc
@@ -20,6 +21,8 @@ share/examples/joe/joerc
 share/examples/joe/jpicorc
 share/examples/joe/jstarrc
 share/examples/joe/rjoerc
+share/examples/joe/shell.csh
+share/examples/joe/shell.sh
 share/joe/charmaps/klingon
 share/joe/lang/de.po
 share/joe/lang/fr.po
@@ -27,37 +30,60 @@ share/joe/lang/ru.po
 share/joe/lang/uk.po
 share/joe/syntax/4gl.jsf
 share/joe/syntax/ada.jsf
+share/joe/syntax/ant.jsf
 share/joe/syntax/asm.jsf
 share/joe/syntax/awk.jsf
+share/joe/syntax/batch.jsf
 share/joe/syntax/c.jsf
 share/joe/syntax/cobol.jsf
+share/joe/syntax/comment_todo.jsf
 share/joe/syntax/conf.jsf
 share/joe/syntax/csh.jsf
+share/joe/syntax/csharp.jsf
 share/joe/syntax/css.jsf
+share/joe/syntax/debian.jsf
 share/joe/syntax/diff.jsf
+share/joe/syntax/elixir.jsf
+share/joe/syntax/erb.jsf
+share/joe/syntax/erlang.jsf
+share/joe/syntax/filename.jsf
 share/joe/syntax/fortran.jsf
+share/joe/syntax/git-commit.jsf
+share/joe/syntax/go.jsf
+share/joe/syntax/haml.jsf
 share/joe/syntax/haskell.jsf
 share/joe/syntax/html.jsf
+share/joe/syntax/htmlerb.jsf
+share/joe/syntax/ini.jsf
+share/joe/syntax/iptables.jsf
 share/joe/syntax/java.jsf
 share/joe/syntax/joerc.jsf
+share/joe/syntax/js.jsf
 share/joe/syntax/jsf.jsf
 share/joe/syntax/jsf_check.jsf
+share/joe/syntax/json.jsf
 share/joe/syntax/lisp.jsf
 share/joe/syntax/lua.jsf
 share/joe/syntax/m4.jsf
 share/joe/syntax/mail.jsf
 share/joe/syntax/mason.jsf
 share/joe/syntax/matlab.jsf
+share/joe/syntax/md.jsf
 share/joe/syntax/ocaml.jsf
 share/joe/syntax/pascal.jsf
 share/joe/syntax/perl.jsf
 share/joe/syntax/php.jsf
+share/joe/syntax/powershell.jsf
+share/joe/syntax/prolog.jsf
+share/joe/syntax/properties.jsf
 share/joe/syntax/ps.jsf
+share/joe/syntax/puppet.jsf
 share/joe/syntax/python.jsf
 share/joe/syntax/rexx.jsf
 share/joe/syntax/ruby.jsf
 share/joe/syntax/sed.jsf
 share/joe/syntax/sh.jsf
+share/joe/syntax/sieve.jsf
 share/joe/syntax/skill.jsf
 share/joe/syntax/sml.jsf
 share/joe/syntax/spec.jsf
@@ -65,6 +91,9 @@ share/joe/syntax/sql.jsf
 share/joe/syntax/tcl.jsf
 share/joe/syntax/tex.jsf
 share/joe/syntax/troff.jsf
+share/joe/syntax/typescript.jsf
 share/joe/syntax/verilog.jsf
 share/joe/syntax/vhdl.jsf
+share/joe/syntax/whitespace.jsf
 share/joe/syntax/xml.jsf
+share/joe/syntax/yaml.jsf
diff --git a/editors/joe/distinfo b/editors/joe/distinfo
index 032f3618bf2..2bc743f10cd 100644
--- a/editors/joe/distinfo
+++ b/editors/joe/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.18 2011/04/11 21:16:10 roy Exp $
+$NetBSD: distinfo,v 1.19 2015/05/03 01:45:32 wen Exp $
 
-SHA1 (joe-3.7.tar.gz) = 54398578886d4a3d325aece52c308a939d31101d
-RMD160 (joe-3.7.tar.gz) = 7e2c72a750c6aac4732cf4369bceee5333460f15
-Size (joe-3.7.tar.gz) = 696036 bytes
-SHA1 (patch-aa) = 18bf5044cf546c0080df5387719715735389f8cc
-SHA1 (patch-ab) = bd416192e0273b596db6ecc280ad743efd9ed421
-SHA1 (patch-main.c) = d5b8fee6e814ccbc3df048dcd2d31be5cb5f4225
+SHA1 (joe-4.0.tar.gz) = a51827c8c61c3cb09a038d8f6670efe84e144927
+RMD160 (joe-4.0.tar.gz) = 6d9195eedd6116ab51efd0d6b8adfa5d86cf3546
+Size (joe-4.0.tar.gz) = 838783 bytes
+SHA1 (patch-aa) = fa3b48b82c37d8eb0623b0a4f8d527eb80fe1a5b
+SHA1 (patch-ab) = c892db0e7675b25103dbb21762abe69b104f8be3
diff --git a/editors/joe/patches/patch-aa b/editors/joe/patches/patch-aa
index 2be15baaa5d..cfc986acf92 100644
--- a/editors/joe/patches/patch-aa
+++ b/editors/joe/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.11 2010/06/23 12:52:43 adam Exp $
+$NetBSD: patch-aa,v 1.12 2015/05/03 01:45:33 wen Exp $
 
---- b.c.orig	2008-11-02 20:59:06.000000000 +0000
-+++ b.c
+--- joe/b.c.orig	2015-05-03 09:33:50.000000000 +0000
++++ joe/b.c
 @@ -19,8 +19,6 @@
  #endif
  #endif
diff --git a/editors/joe/patches/patch-ab b/editors/joe/patches/patch-ab
index 0bc02bcab32..fd82ef16aa8 100644
--- a/editors/joe/patches/patch-ab
+++ b/editors/joe/patches/patch-ab
@@ -1,20 +1,25 @@
-$NetBSD: patch-ab,v 1.7 2010/06/23 12:52:43 adam Exp $
+$NetBSD: patch-ab,v 1.8 2015/05/03 01:45:33 wen Exp $
 
---- rc/Makefile.in.orig	2010-06-23 09:05:54.000000000 +0000
+--- rc/Makefile.in.orig	2015-05-03 09:22:39.000000000 +0000
 +++ rc/Makefile.in
-@@ -196,12 +196,12 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-sysconf_joeDATA: $(sysconf_joe_DATA)
+@@ -286,16 +286,16 @@ install-sysconf_joeDATA: $(sysconf_joe_D
  	@$(NORMAL_INSTALL)
--	test -z "$(sysconf_joedir)" || $(MKDIR_P) "$(DESTDIR)$(sysconf_joedir)"
-+	$(MKDIR_P) "$(DESTDIR)$(datarootdir)/examples/joe"
- 	@list='$(sysconf_joe_DATA)'; for p in $$list; do \
+ 	@list='$(sysconf_joe_DATA)'; test -n "$(sysconf_joedir)" || list=; \
+ 	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(sysconf_joedir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(sysconf_joedir)" || exit 1; \
++	  echo " $(MKDIR_P) '$(DESTDIR)$(datarootdir)/examples/joe'"; \
++	  $(MKDIR_P) "$(DESTDIR)$(datarootdir)/examples/joe" || exit 1; \
+ 	fi; \
+ 	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
--	  echo " $(sysconf_joeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconf_joedir)/$$f'"; \
--	  $(sysconf_joeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconf_joedir)/$$f"; \
-+	  echo " $(sysconf_joeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datarootdir)/examples/joe/$$f'"; \
-+	  $(sysconf_joeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datarootdir)/examples/joe/$$f"; \
+ 	  echo "$$d$$p"; \
+ 	done | $(am__base_list) | \
+ 	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconf_joedir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconf_joedir)" || exit $$?; \
++	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(datarootdir)/examples/joe'"; \
++	  $(INSTALL_DATA) $$files "$(DESTDIR)$(datarootdir)/examples/joe" || exit $$?; \
  	done
  
  uninstall-sysconf_joeDATA:
diff --git a/editors/joe/patches/patch-main.c b/editors/joe/patches/patch-main.c
deleted file mode 100644
index 9646f53d6e8..00000000000
--- a/editors/joe/patches/patch-main.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-main.c,v 1.1 2011/04/01 13:12:24 wiz Exp $
-
-Fix for crash with a segv if called as jmacs with more then
-one file as an argument on the command line from upstream.
-
-http://joe-editor.cvs.sourceforge.net/viewvc/joe-editor/joe-current/main/main.c?r1=1.5&r2=1.6
-
---- main.c.orig	2008-10-27 03:01:11.000000000 +0000
-+++ main.c
-@@ -431,7 +431,7 @@ int main(int argc, char **real_argv, cha
- 				b->orphan = 1;
- 				b->oldcur = pdup(b->bof, USTR "main");
- 				pline(b->oldcur, get_file_pos(b->name));
--				p_goto_bol(bw->cursor);
-+				p_goto_bol(b->oldcur);
- 				line = b->oldcur->line - (maint->h - 1) / 2;
- 				if (line < 0)
- 					line = 0;