Changes 3.7:

* backspace/DEL means 'n' in replace prompt for better emacs
  compatibility
* Menus are now made up of macros instead of options.
* ^T is now a user definable menu system
* Treat \ as a quote character for file I/O.  Now you can edit
  files like !test with \!test
* Print NULs in default search string.  Handle many \s properly.
* Allow backslashes in file names
* Fix %A to print unicode
* Charles Tabony's (vectorshifts's) highlighter stack patch
* ! is relace all in replace prompt
* Turn off UTF-8 when we enter hex mode
* Call ttsig on vfile I/O errors.
* Abort cleanly when malloc returns NULL
* Add reload command to reload file from disk
* Modify configure scrips to use docdir for extra documents and
* Don't use bold yellow, it's bad for white screens
* Fix TeX highlighter: don't highlight "
* Make mail.jsf more forgiving for those of us who still use old UNIX mail
* Fix file rename bugs
* Improve ubop: can reformat a block of paragraphs again.  Reformat
  of adjacent indented paragraphs working again.
* Improve XML highlighter: allow \r in whitespace

5 files changed, 99 insertions, 62 deletions

diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 34fd8fce0d8..cce4fe20259 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2008/07/14 12:56:03 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2010/06/23 12:52:42 adam Exp $
 
-DISTNAME=	joe-3.5
+DISTNAME=	joe-3.7
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=joe-editor/}
 
@@ -12,7 +12,18 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PREFIX:Q}/share/examples
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+
+INSTALLATION_DIRS+=	${PKG_SYSCONFDIR}/joe
+
+EGDIR=		${PREFIX}/share/examples/joe
+CONF_FILES=	${EGDIR}/ftyperc ${PKG_SYSCONFDIR}/joe/ftyperc
+CONF_FILES+=	${EGDIR}/jicerc.ru ${PKG_SYSCONFDIR}/joe/jicerc.ru
+CONF_FILES+=	${EGDIR}/jmacsrc ${PKG_SYSCONFDIR}/joe/jmacsrc
+CONF_FILES+=	${EGDIR}/joerc ${PKG_SYSCONFDIR}/joe/joerc
+CONF_FILES+=	${EGDIR}/jpicorc ${PKG_SYSCONFDIR}/joe/jpicorc
+CONF_FILES+=	${EGDIR}/jstarrc ${PKG_SYSCONFDIR}/joe/jstarrc
+CONF_FILES+=	${EGDIR}/rjoerc ${PKG_SYSCONFDIR}/joe/rjoerc
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/joe/PLIST b/editors/joe/PLIST
index 06dbd40bbea..ebccfc877c7 100644
--- a/editors/joe/PLIST
+++ b/editors/joe/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:50:23 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2010/06/23 12:52:43 adam Exp $
 bin/jmacs
 bin/joe
 bin/jpico
@@ -7,59 +7,64 @@ bin/rjoe
 bin/termidx
 man/man1/joe.1
 man/ru/man1/joe.1
-share/examples/joe/charmaps/klingon
-share/examples/joe/doc/ChangeLog
-share/examples/joe/doc/HACKING
-share/examples/joe/doc/HINTS
-share/examples/joe/doc/LIST
-share/examples/joe/doc/NEWS
-share/examples/joe/doc/README
+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/examples/joe/ftyperc
 share/examples/joe/jicerc.ru
 share/examples/joe/jmacsrc
 share/examples/joe/joerc
 share/examples/joe/jpicorc
 share/examples/joe/jstarrc
-share/examples/joe/lang/de.po
-share/examples/joe/lang/fr.po
-share/examples/joe/lang/ru.po
 share/examples/joe/rjoerc
-share/examples/joe/syntax/4gl.jsf
-share/examples/joe/syntax/ada.jsf
-share/examples/joe/syntax/asm.jsf
-share/examples/joe/syntax/awk.jsf
-share/examples/joe/syntax/c.jsf
-share/examples/joe/syntax/cobol.jsf
-share/examples/joe/syntax/conf.jsf
-share/examples/joe/syntax/csh.jsf
-share/examples/joe/syntax/css.jsf
-share/examples/joe/syntax/diff.jsf
-share/examples/joe/syntax/fortran.jsf
-share/examples/joe/syntax/haskell.jsf
-share/examples/joe/syntax/html.jsf
-share/examples/joe/syntax/java.jsf
-share/examples/joe/syntax/joerc.jsf
-share/examples/joe/syntax/lisp.jsf
-share/examples/joe/syntax/lua.jsf
-share/examples/joe/syntax/m4.jsf
-share/examples/joe/syntax/mail.jsf
-share/examples/joe/syntax/mason.jsf
-share/examples/joe/syntax/ocaml.jsf
-share/examples/joe/syntax/pascal.jsf
-share/examples/joe/syntax/perl.jsf
-share/examples/joe/syntax/php.jsf
-share/examples/joe/syntax/ps.jsf
-share/examples/joe/syntax/python.jsf
-share/examples/joe/syntax/rexx.jsf
-share/examples/joe/syntax/ruby.jsf
-share/examples/joe/syntax/sed.jsf
-share/examples/joe/syntax/sh.jsf
-share/examples/joe/syntax/skill.jsf
-share/examples/joe/syntax/sml.jsf
-share/examples/joe/syntax/sql.jsf
-share/examples/joe/syntax/tcl.jsf
-share/examples/joe/syntax/tex.jsf
-share/examples/joe/syntax/troff.jsf
-share/examples/joe/syntax/verilog.jsf
-share/examples/joe/syntax/vhdl.jsf
-share/examples/joe/syntax/xml.jsf
+share/joe/charmaps/klingon
+share/joe/lang/de.po
+share/joe/lang/fr.po
+share/joe/lang/ru.po
+share/joe/lang/uk.po
+share/joe/syntax/4gl.jsf
+share/joe/syntax/ada.jsf
+share/joe/syntax/asm.jsf
+share/joe/syntax/awk.jsf
+share/joe/syntax/c.jsf
+share/joe/syntax/cobol.jsf
+share/joe/syntax/conf.jsf
+share/joe/syntax/csh.jsf
+share/joe/syntax/css.jsf
+share/joe/syntax/diff.jsf
+share/joe/syntax/fortran.jsf
+share/joe/syntax/haskell.jsf
+share/joe/syntax/html.jsf
+share/joe/syntax/java.jsf
+share/joe/syntax/joerc.jsf
+share/joe/syntax/jsf.jsf
+share/joe/syntax/jsf_check.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/ocaml.jsf
+share/joe/syntax/pascal.jsf
+share/joe/syntax/perl.jsf
+share/joe/syntax/php.jsf
+share/joe/syntax/ps.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/skill.jsf
+share/joe/syntax/sml.jsf
+share/joe/syntax/spec.jsf
+share/joe/syntax/sql.jsf
+share/joe/syntax/tcl.jsf
+share/joe/syntax/tex.jsf
+share/joe/syntax/troff.jsf
+share/joe/syntax/verilog.jsf
+share/joe/syntax/vhdl.jsf
+share/joe/syntax/xml.jsf
diff --git a/editors/joe/distinfo b/editors/joe/distinfo
index a15a763ef9a..7c7a3a2ffb1 100644
--- a/editors/joe/distinfo
+++ b/editors/joe/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.14 2006/07/24 07:50:12 adam Exp $
+$NetBSD: distinfo,v 1.15 2010/06/23 12:52:43 adam Exp $
 
-SHA1 (joe-3.5.tar.gz) = aeee6bb71ed1e9b9c9a2a64d8e078a06245957e5
-RMD160 (joe-3.5.tar.gz) = c58d2bdd4882bf698722d5a8e840f3d7a0221fc6
-Size (joe-3.5.tar.gz) = 613815 bytes
-SHA1 (patch-aa) = 25d7b96349b20af7e2f3de09dc6c8a229028c9dc
+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
diff --git a/editors/joe/patches/patch-aa b/editors/joe/patches/patch-aa
index adfc39056ea..2be15baaa5d 100644
--- a/editors/joe/patches/patch-aa
+++ b/editors/joe/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.10 2006/07/11 00:30:09 joerg Exp $
+$NetBSD: patch-aa,v 1.11 2010/06/23 12:52:43 adam Exp $
 
---- b.c.orig	2006-07-11 00:24:25.000000000 +0000
+--- b.c.orig	2008-11-02 20:59:06.000000000 +0000
 +++ b.c
-@@ -11,8 +11,6 @@
- #include <pwd.h>
+@@ -19,8 +19,6 @@
+ #endif
  #endif
  
 -extern int errno;
diff --git a/editors/joe/patches/patch-ab b/editors/joe/patches/patch-ab
new file mode 100644
index 00000000000..0bc02bcab32
--- /dev/null
+++ b/editors/joe/patches/patch-ab
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.7 2010/06/23 12:52:43 adam Exp $
+
+--- rc/Makefile.in.orig	2010-06-23 09:05:54.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)
+ 	@$(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 \
+ 	  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"; \
+ 	done
+ 
+ uninstall-sysconf_joeDATA: