Changes 3.1:

* Regex and incremental search (jmacs ^S) now work for UTF-8
* More and improved syntax highlighting files, including Mason
* Use ^T E to set character set of file (hit <tab> <tab> at the
  prompt for a list of available character sets).
* Can install custom "i18n" style byte oriented character set
  definition files.
* No longer depends on iconv() (easier to compile)
* Fix bug where right arrow was not doing right thing on last line
* Fix UTF-8 codes between 0x10000 - 0x1FFFF
* Now prints <XXXX> for unicode control characters
* Improved smart home, indent, etc.
* TAB completion is now more "bash"-like
* When multiple files are given on command line, they end up in
  same order on the screen in JOE (before they were shuffled).
* Menu size is now variable (40% of window size or smaller if
  it's not filled).
* Added -icase option for case insensitive search by default.
* Added -wrap option, which makes searches wrap
* Added status line sequence %x: shows current context (function
  name if you're editing C).
* Added tab completion at search prompts and ESC-Enter for tab
  completion within text windows.
* Warn if file changed on save.
* Added Ctrl-space block selection method
* Added Ctrl-arrow key block selection method
* ^K E asks if you want to load original version of the file
* jmacs bugs fixes: upperase word, transpose words, ^X ^C is
  more emacs-like., ^X k and ^X ^V more like emacs.
* Much improved compile system ^[ c
* Much improved jpico
* aspell support.

12 files changed, 46 insertions, 387 deletions

diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 18a8634204f..18a71402e2f 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -1,25 +1,17 @@
-# $NetBSD: Makefile,v 1.18 2004/06/02 20:22:54 reed Exp $
-#
+# $NetBSD: Makefile,v 1.19 2004/06/03 08:52:23 adam Exp $
 
-DISTNAME=	joe2.8
-PKGNAME=	joe-2.8
-PKGREVISION=	2
+DISTNAME=	joe-3.1
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.std.com/src/editors/
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=joe-editor/}
 
 MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://joe-editor.sourceforge.net/
 COMMENT=	Joe's own editor
 
-WRKSRC=		${WRKDIR}/joe
-ALL_TARGET=	joe
-
-CFLAGS+=	-DTERMINFO
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Interix"
-CPPFLAGS+=	-Dsetpgrp=setpgid
-.endif
+USE_BUILDLINK3=		yes
+USE_PKGINSTALL=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--sysconfdir="${PREFIX}/share/examples"
 
+.include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/joe/PLIST b/editors/joe/PLIST
index d22d6c52fc2..1739623c2cb 100644
--- a/editors/joe/PLIST
+++ b/editors/joe/PLIST
@@ -1,12 +1,37 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:22:55 zuntum Exp $
-bin/joe
+@comment $NetBSD: PLIST,v 1.2 2004/06/03 08:52:23 adam Exp $
 bin/jmacs
+bin/joe
+bin/jpico
 bin/jstar
 bin/rjoe
-bin/jpico
-lib/joerc
-lib/jmacsrc
-lib/jstarrc
-lib/rjoerc
-lib/jpicorc
-man/man1/joe.1.gz
+bin/termidx
+man/man1/joe.1
+share/examples/joe/charmaps/klingon
+share/examples/joe/jmacsrc
+share/examples/joe/joerc
+share/examples/joe/jpicorc
+share/examples/joe/jstarrc
+share/examples/joe/rjoerc
+share/examples/joe/syntax/asm.jsf
+share/examples/joe/syntax/c.jsf
+share/examples/joe/syntax/conf.jsf
+share/examples/joe/syntax/csh.jsf
+share/examples/joe/syntax/diff.jsf
+share/examples/joe/syntax/fortran.jsf
+share/examples/joe/syntax/html.jsf
+share/examples/joe/syntax/java.jsf
+share/examples/joe/syntax/lisp.jsf
+share/examples/joe/syntax/mail.jsf
+share/examples/joe/syntax/mason.jsf
+share/examples/joe/syntax/pascal.jsf
+share/examples/joe/syntax/perl.jsf
+share/examples/joe/syntax/php.jsf
+share/examples/joe/syntax/python.jsf
+share/examples/joe/syntax/sh.jsf
+share/examples/joe/syntax/tcl.jsf
+share/examples/joe/syntax/verilog.jsf
+share/examples/joe/syntax/vhdl.jsf
+share/examples/joe/syntax/xml.jsf
+@dirrm share/examples/joe/syntax
+@dirrm share/examples/joe/charmaps
+@dirrm share/examples/joe
diff --git a/editors/joe/distinfo b/editors/joe/distinfo
index 0619e6f2b2b..fa462dd361b 100644
--- a/editors/joe/distinfo
+++ b/editors/joe/distinfo
@@ -1,13 +1,4 @@
-$NetBSD: distinfo,v 1.6 2003/06/10 05:08:47 jmc Exp $
+$NetBSD: distinfo,v 1.7 2004/06/03 08:52:23 adam Exp $
 
-SHA1 (joe2.8.tar.Z) = b2846ac8469fbdbfc7428cc0baf3f874d564959c
-Size (joe2.8.tar.Z) = 322108 bytes
-SHA1 (patch-aa) = 074c82a60e917a1b87dce7a53a62e6a9d1bf37e1
-SHA1 (patch-ab) = 0070f64c6d8c0ac26d6dce2032618265f7629931
-SHA1 (patch-ac) = c1ec2cea32a459b97362e429f35ff43a6b36cd48
-SHA1 (patch-ad) = 6269254fad1f54ecc9f6af4c0b32df53588f5564
-SHA1 (patch-ae) = d50e73849a2416d7300f9e410e40aa9bcf2e39c1
-SHA1 (patch-af) = ed937b1d648f629fbc23d33994fff8e16b3d4ee4
-SHA1 (patch-ag) = 675d5de283a8d38342e417839a1ee9dc43848f60
-SHA1 (patch-ah) = 30f8ac2d487bc42960e8b5c677b67c0da21ae1c5
-SHA1 (patch-ai) = 1aeb485fc1a1c2347f8c3db288adcbd7f468b426
+SHA1 (joe-3.1.tar.gz) = 52b8ce32e94b2269c7723a80892f8adf6b653017
+Size (joe-3.1.tar.gz) = 381201 bytes
diff --git a/editors/joe/patches/patch-aa b/editors/joe/patches/patch-aa
deleted file mode 100644
index 5af15f94a8b..00000000000
--- a/editors/joe/patches/patch-aa
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2003/06/08 15:20:41 abs Exp $
-
---- Makefile.orig	Mon Jan 23 06:01:28 1995
-+++ Makefile
-@@ -9,9 +9,9 @@
- # to go and where you want the man page
- # to go:
- 
--WHEREJOE = /usr/local/bin
--WHERERC = /usr/local/lib
--WHEREMAN = /usr/man/man1
-+WHEREJOE = ${PREFIX}/bin
-+WHERERC = ${PREFIX}/lib
-+WHEREMAN = ${PREFIX}/man/man1
- 
- # If you want to use TERMINFO, you have to set
- # the following variable to 1.  Also you have to
-@@ -27,11 +27,11 @@ TERMINFO = 0
- 
- # C compiler options: make's built-in rules use this variable
- 
--CFLAGS = -O
-+# CFLAGS = -O
- 
- # C compiler to use: make's built-in rules use this variable
- 
--CC = cc
-+CC ?= cc
- 
- # You may have to include some extra libraries
- # for some systems
-@@ -45,7 +45,7 @@ CC = cc
- # add '-ltinfo', '-lcurses' or '-ltermlib',
- # depending on the system.
- 
--EXTRALIBS =
-+EXTRALIBS = -ltermcap
- 
- # Object files
- 
-@@ -84,17 +84,17 @@ termidx: termidx.o
- 
- # Install proceedure
- 
--install: joe termidx
-+install: joe # termidx
- 	strip joe
--	strip termidx
-+#	strip termidx
- 	if [ ! -d $(WHEREJOE) ]; then mkdir $(WHEREJOE); chmod a+rx $(WHEREJOE); fi
--	rm -f $(WHEREJOE)/joe $(WHEREJOE)/jmacs $(WHEREJOE)/jstar $(WHEREJOE)/jpico $(WHEREJOE)/rjoe $(WHEREJOE)/termidx
-+	rm -f $(WHEREJOE)/joe $(WHEREJOE)/jmacs $(WHEREJOE)/jstar $(WHEREJOE)/jpico $(WHEREJOE)/rjoe # $(WHEREJOE)/termidx
- 	mv joe $(WHEREJOE)
- 	ln $(WHEREJOE)/joe $(WHEREJOE)/jmacs
- 	ln $(WHEREJOE)/joe $(WHEREJOE)/jstar
- 	ln $(WHEREJOE)/joe $(WHEREJOE)/rjoe
- 	ln $(WHEREJOE)/joe $(WHEREJOE)/jpico
--	mv termidx $(WHEREJOE)
-+#	mv termidx $(WHEREJOE)
- 	if [ ! -d $(WHERERC) ]; then mkdir $(WHERERC); chmod a+rx $(WHERERC); fi
- 	rm -f $(WHERERC)/joerc $(WHERERC)/jmacsrc $(WHERERC)/jstarrc $(WHERERC)/jpicorc $(WHERERC)/rjoerc $(WHEREMAN)/joe.1
- 	cp joerc $(WHERERC)
-@@ -114,13 +114,13 @@ install: joe termidx
- 	chmod a+r $(WHERERC)/rjoerc
- 	chmod a+r $(WHERERC)/jpicorc
- 	chmod a+r $(WHEREMAN)/joe.1
--	chmod a+x $(WHEREJOE)/termidx
--	rm -f $(WHERERC)/termcap
--	cp termcap $(WHERERC)/termcap
--	chmod a+r $(WHERERC)/termcap
--	rm -f $(WHERERC)/terminfo
--	cp terminfo $(WHERERC)/terminfo
--	chmod a+r $(WHERERC)/terminfo
-+#	chmod a+x $(WHEREJOE)/termidx
-+#	rm -f $(WHERERC)/termcap
-+#	cp termcap $(WHERERC)/termcap
-+#	chmod a+r $(WHERERC)/termcap
-+#	rm -f $(WHERERC)/terminfo
-+#	cp terminfo $(WHERERC)/terminfo
-+#	chmod a+r $(WHERERC)/terminfo
- 
- # Cleanup proceedure
- 
diff --git a/editors/joe/patches/patch-ab b/editors/joe/patches/patch-ab
deleted file mode 100644
index cf1d284c604..00000000000
--- a/editors/joe/patches/patch-ab
+++ /dev/null
@@ -1,112 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2003/04/27 17:45:31 cjep Exp $
-
---- b.c.orig	1995-01-20 08:38:25.000000000 +0000
-+++ b.c
-@@ -21,6 +21,9 @@ JOE; see the file COPYING.  If not, writ
- #include <pwd.h>
- #endif
- #include <errno.h>
-+#include <sys/file.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
- 
- #include "config.h"
- #include "blocks.h"
-@@ -201,6 +204,7 @@ long amnt, nlines;
-  if(prop) b->o=prop->o;
-  else b->o=pdefault;
-  mset(b->marks,0,sizeof(b->marks));
-+ b->filehandle = -1;	/* initialize filehandle &&& ob */
-  b->rdonly=0;
-  b->orphan=0;
-  b->oldcur=0;
-@@ -255,6 +259,10 @@ B *b;
-  {
-  if(b && !--b->count)
-   {
-+  if (b->filehandle != -1) {
-+    /* close filehandle, free lock &&& ob */
-+    close (b->filehandle);
-+    }
-   if(b->changed) abrerr(b->name);
-   if(b==errbuf) errbuf=0;
-   if(b->undo) undorm(b->undo);
-@@ -1671,7 +1679,8 @@ char *s;
-  B *b;
-  long skip,amnt;
-  char *n;
-- int nowrite=0;
-+ struct stat sb;
-+ int nowrite=0,fh=-1;
- 
-  if(!s || !s[0])
-   {
-@@ -1704,6 +1713,28 @@ char *s;
-   else fclose(fi);
-   fi=fopen(n,"r");
-   if(!fi) nowrite=0;
-+/*printf ("nowrite open=%i\n", nowrite); */
-+  
-+  /* check file mod, if no write flags set, 
-+     joe in read only mode. &&& ob */
-+
-+  if (!nowrite) { 
-+    nowrite = (!stat (n, &sb)) && (!(sb.st_mode & (S_IWUSR | S_IWGRP | S_IWOTH)));
-+    }
-+/*printf ("nowrite stat=%i\n", nowrite); */
-+
-+  /* lock the file if writable, or go into read only mode if
-+     already locked,      */
-+  
-+  if ((fi) && (!nowrite)) { 
-+    fh = dup( fileno(fi) ); 
-+    nowrite = (flock (fh, LOCK_EX | LOCK_NB));
-+    }
-+/*printf ("nowrite flock=%i\n", nowrite); */
-+
-+/*nowrite = 1; */	/* for test purpose */
-+/*printf ("nowrite=%i\n", nowrite); */
-+
-   }
-  joesep(n);
- 
-@@ -1761,6 +1792,7 @@ char *s;
-  vsrm(n);
- 
-  b->er=error;
-+ if( fh != -1 ) b->filehandle = fh;
-  return b;
-  }
- 
-@@ -1928,7 +1960,7 @@ long size;
-  if(s[0]=='!') pclose(f);
-  else
- #endif
-- if(zcmp(s,"-")) fclose(f);
-+ if(zcmp(s,"-")) { if (fclose(f)) return error = -5; }
-  else fflush(f);
- 
-  opnerr:;
-@@ -1988,9 +2020,20 @@ extern char *ctime();
- 
- void ttsig(sig)
-  {
-- long tim=time(0);
-+ time_t tim=time(0);
-  B *b;
-- FILE *f=fopen("DEADJOE","a");
-+ FILE *f;
-+ struct stat sb;
-+ if ((lstat("DEADJOE", &sb) == 0) && (((sb.st_mode & S_IFLNK) && (sb.st_uid != getuid())) || (sb.st_nlink > 1))) 
-+  {
-+  printf("*** JOE was aborted ");
-+  if (sig) printf("by signal %d, cannot save DEADJOE due to unsafe symlink\n",sig);
-+  else printf("because the terminal closed, cannot save DEADJOE due to unsafe symlink\n");
-+  if(sig) ttclsn();
-+  _exit(1);
-+  }
-+ f=fopen("DEADJOE","a");
-+ chmod("DEADJOE", S_IRUSR | S_IWUSR);
-  fprintf(f,"\n*** Modified files in JOE when it aborted on %s",ctime(&tim));
-  if(sig) fprintf(f,"*** JOE was aborted by signal %d\n",sig);
-  else fprintf(f,"*** JOE was aborted because the terminal closed\n");
diff --git a/editors/joe/patches/patch-ac b/editors/joe/patches/patch-ac
deleted file mode 100644
index 9e2deffe171..00000000000
--- a/editors/joe/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2003/04/27 17:45:31 cjep Exp $
-
---- b.h.orig	1994-12-21 12:04:46.000000000 +0000
-+++ b.h
-@@ -60,6 +60,7 @@ struct buffer
-  int rdonly;			/* Set for read-only */
-  int internal;			/* Set for internal buffers */
-  int er;			/* Error code when file was loaded */
-+ int filehandle;		/* File handle for locking */
-  };
- 
- extern int force;	/* Set to have final '\n' added to file */
diff --git a/editors/joe/patches/patch-ad b/editors/joe/patches/patch-ad
deleted file mode 100644
index add41c5826d..00000000000
--- a/editors/joe/patches/patch-ad
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2003/04/27 17:45:31 cjep Exp $
-
---- main.c.orig	1995-01-22 00:21:08.000000000 +0000
-+++ main.c
-@@ -18,6 +18,10 @@ JOE; see the file COPYING.  If not, writ
- 
- #include <stdio.h>
- #include <fcntl.h>
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
-+#include <locale.h>
-+#include <ctype.h>
-+#endif
- #include "config.h"
- #include "w.h"
- #include "tty.h"
-@@ -187,6 +191,20 @@ char *envv[];
-  run=namprt(argv[0]);
- #endif 
- 
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
-+ setlocale(LC_ALL, "");
-+ for(c=0;c<256;c++)
-+  { int a=0;
-+    if(iscntrl(c))
-+     a|=UNDERLINE;
-+    if((c&0x80)&&!isprint(c))
-+     a|=INVERSE;
-+    xlata[c]=a;
-+    if(isprint(c))
-+     xlatc[c]=c;
-+  }
-+#endif
-+
-  if(s=getenv("LINES")) sscanf(s,"%d",&lines);
-  if(s=getenv("COLUMNS")) sscanf(s,"%d",&columns);
-  if(s=getenv("BAUD")) sscanf(s,"%u",&Baud);
-@@ -234,20 +252,6 @@ char *envv[];
- 
- #else
- 
-- s=vsncpy(NULL,0,sc("."));
-- s=vsncpy(sv(s),sv(run));
-- s=vsncpy(sv(s),sc("rc"));
-- c=procrc(cap,s);
-- if(c==0) goto donerc;
-- if(c==1)
--  {
--  char buf[8];
--  fprintf(stderr,"There were errors in '%s'.  Use it anyway?",s);
--  fflush(stderr);
--  fgets(buf,8,stdin);
--  if(buf[0]=='y' || buf[0]=='Y') goto donerc;
--  }
--
-  vsrm(s);
-  s=getenv("HOME");
-  if(s)
diff --git a/editors/joe/patches/patch-ae b/editors/joe/patches/patch-ae
deleted file mode 100644
index 7282325a966..00000000000
--- a/editors/joe/patches/patch-ae
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2003/04/27 17:45:31 cjep Exp $
-
---- scrn.h.orig	1994-10-06 08:09:04.000000000 +0100
-+++ scrn.h
-@@ -254,10 +254,10 @@ extern int dspasis;
- 
- #define xlat(a,c) \
-   ( \
--  (dspasis && ((unsigned)(c)>=128)) ? \
-+  (dspasis && ((unsigned char)(c)>=128)) ? \
-       ((a)=0) \
-     : \
--      (((a)=xlata[(unsigned)(c)]), ((c)=xlatc[(unsigned)(c)])) \
-+      (((a)=xlata[(unsigned char)(c)]), ((c)=xlatc[(unsigned char)(c)])) \
-   )
- 
- /* int eraeol(SCRN *t,int x,int y);
diff --git a/editors/joe/patches/patch-af b/editors/joe/patches/patch-af
deleted file mode 100644
index 54a81621f16..00000000000
--- a/editors/joe/patches/patch-af
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-af,v 1.2 2003/04/27 17:45:31 cjep Exp $
-
---- termcap.c.orig	1995-01-23 09:07:10.000000000 +0000
-+++ termcap.c
-@@ -191,7 +191,11 @@ else
-    namebuf=0;
-   namebuf=vsncpy(sv(namebuf),sc(".termcap "));
-   namebuf=vsncpy(sv(namebuf),sc(JOERC));
-+#ifdef __NetBSD__
-+  namebuf=vsncpy(sv(namebuf),sc("termcap /usr/share/misc/termcap"));
-+#else
-   namebuf=vsncpy(sv(namebuf),sc("termcap /etc/termcap"));
-+#endif
-   }
-  }
- 
diff --git a/editors/joe/patches/patch-ag b/editors/joe/patches/patch-ag
deleted file mode 100644
index d237a4a7f31..00000000000
--- a/editors/joe/patches/patch-ag
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2003/04/27 17:45:31 cjep Exp $
-
---- ufile.c.orig	1995-01-13 17:13:16.000000000 +0000
-+++ ufile.c
-@@ -135,7 +135,7 @@ BW *bw;
- int cp(from,to)
- char *from, *to;
-  {
-- int f, g, amnt;
-+ int f, g, amnt, rc;
-  struct stat sbuf;
- 
- #ifdef HAVEUTIME
-@@ -157,8 +157,8 @@ char *from, *to;
-   }
-  while((amnt=read(f,stdbuf,stdsiz))>0)
-   if(amnt!=write(g,stdbuf,amnt)) break;
-- close(f); close(g);
-- if(amnt) return -1;
-+ close(f); rc = close(g);
-+ if(amnt || rc) return -1;
- 
- #ifdef HAVEUTIME
- #ifdef NeXT
diff --git a/editors/joe/patches/patch-ah b/editors/joe/patches/patch-ah
deleted file mode 100644
index d0fa64b81c5..00000000000
--- a/editors/joe/patches/patch-ah
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2003/04/27 18:11:02 cjep Exp $
---- conf.c.orig	Fri Jan 13 17:10:33 1995
-+++ conf.c	Sun Apr 27 17:39:41 2003
-@@ -204,8 +204,10 @@
-  fprintf(f,"\n");
- 
-  fprintf(f,"char *getenv();\n");
-- if(sizeof(long)==8) fprintf(f,"int time();\n");
-- else fprintf(f,"long time();\n");
-+/*
-+ * if(sizeof(long)==8) fprintf(f,"int time();\n");
-+ * else fprintf(f,"long time();\n");
-+ */
-  fprintf(f,"void *malloc();\n");
-  fprintf(f,"void free();\n");
-  fprintf(f,"void *calloc();\n");
diff --git a/editors/joe/patches/patch-ai b/editors/joe/patches/patch-ai
deleted file mode 100644
index 1d001b9fc27..00000000000
--- a/editors/joe/patches/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2003/06/08 15:20:41 abs Exp $
-
---- vs.c.orig	Thu Oct  6 07:20:35 1994
-+++ vs.c
-@@ -16,7 +16,6 @@ You should have received a copy of the G
- JOE; see the file COPYING.  If not, write to the Free Software Foundation, 
- 675 Mass Ave, Cambridge, MA 02139, USA.  */ 
- 
--#include <varargs.h>
- #include "config.h"
- #include "zstr.h"
- #include "blocks.h"