Update to 4.16.0.63. Closes PR pkg/19924 by Greg A. Woods.

Changes since 4.16:
- Portability fixes.  Most important: work around a never-to-be-fixed
  bug in ncurses (the freely redistributable termcap/terminfo
  database).
- Various minor bug fixes.  Highlights:
  + use mkstemp to avoid a security loophole
  + avoid bad interaction between metakey and xterm mouse support
    in windows wider than 95 characters
  + handle symlinks better
  + obscure bug in text justification that could hang JOVE
  + misuse of stat that only misbehaved on LINUX

5 files changed, 48 insertions, 75 deletions

diff --git a/editors/jove/Makefile b/editors/jove/Makefile
index a992609aa33..14fff94a143 100644
--- a/editors/jove/Makefile
+++ b/editors/jove/Makefile
@@ -1,14 +1,18 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 16:44:36 martti Exp $
+# $NetBSD: Makefile,v 1.7 2003/09/22 14:10:14 jmmv Exp $
 #
 
-DISTNAME=	jove-4.16
-WRKSRC=		${WRKDIR}/jove
+DISTNAME=	jove4.16.0.63
+PKGNAME=	${DISTNAME:S/jove/jove-/}
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.cs.toronto.edu/pub/moraes/jove/
+MASTER_SITES=	ftp://ftp.cs.toronto.edu/pub/hugh/jove-dev/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	Small emacs-style editor, but lacks the LISP engine
 
 NO_CONFIGURE=	yes
 
+MAKE_ENV+=	ROOT_GROUP="${ROOT_GROUP}"
+MAKE_ENV+=	ROOT_USER="${ROOT_USER}"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/jove/PLIST b/editors/jove/PLIST
index be63887bcb1..e3e8a81ca94 100644
--- a/editors/jove/PLIST
+++ b/editors/jove/PLIST
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:22:57 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/09/22 14:10:15 jmmv Exp $
 bin/jove
 bin/teachjove
-lib/jove/portsrv
 lib/jove/recover
+man/man1/jove.1
+man/man1/jovetool.1
+man/man1/teachjove.1
+man/man1/xjove.1
 share/jove/XTermresource
 share/jove/cmds.doc
 share/jove/jove.rc
@@ -22,7 +25,5 @@ share/jove/keychart.wyse
 share/jove/keychart.xterm
 share/jove/keychart.z29
 share/jove/teach-jove
-man/man1/jove.1
-man/man1/jovetool.1
-man/man1/teachjove.1
-man/man1/xjove.1
+@dirrm share/jove
+@dirrm lib/jove
diff --git a/editors/jove/distinfo b/editors/jove/distinfo
index 5cebd78e726..9ac8f4e72ef 100644
--- a/editors/jove/distinfo
+++ b/editors/jove/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:01:02 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/09/22 14:10:15 jmmv Exp $
 
-SHA1 (jove-4.16.tar.gz) = 47272816abac0c4b7b9e41a89d390d06a988cfcb
-Size (jove-4.16.tar.gz) = 432274 bytes
-SHA1 (patch-aa) = 51592f10aaaf5de234d50bf154484463163a30c6
-SHA1 (patch-ab) = 9c63b0208ff1a84dc7f015841d8f19968cef6d01
+SHA1 (jove4.16.0.63.tgz) = f4625981f9ab9e7d2e2b8729e25f032618666f1f
+Size (jove4.16.0.63.tgz) = 448871 bytes
+SHA1 (patch-aa) = b00d7a337cf919b71b4f595df961d2d6b3b7e43c
 SHA1 (patch-ac) = 98329cfcbbec9d56cbef7e1bee6685b6dd25e8ac
diff --git a/editors/jove/patches/patch-aa b/editors/jove/patches/patch-aa
index 99359f54a55..b979c879e0e 100644
--- a/editors/jove/patches/patch-aa
+++ b/editors/jove/patches/patch-aa
@@ -1,76 +1,57 @@
-$NetBSD: patch-aa,v 1.2 2000/01/19 16:32:13 agc Exp $
+$NetBSD: patch-aa,v 1.3 2003/09/22 14:10:16 jmmv Exp $
 
---- Makefile.orig	Tue Mar 19 04:44:33 1996
-+++ Makefile	Wed Jan 19 16:25:36 2000
-@@ -27,16 +27,20 @@
+--- Makefile.orig	2003-04-06 07:18:03.000000000 +0200
++++ Makefile
+@@ -21,8 +21,8 @@ SHELL = /bin/sh
+ # If they don't exist, this makefile will try to create the directories
  # LIBDIR and SHAREDIR.  All others must already exist.
  
- SHELL = /bin/sh
--TMPDIR = /usr/tmp
--RECDIR = /usr/preserve
-+TMPDIR = /var/tmp
-+RECDIR = /var/preserve
- 
-+.if defined(LOCALBASE)
-+JOVEHOME = $(LOCALBASE)
-+.else
- JOVEHOME = /usr/local
+-JOVEHOME = /usr/local
 -SHAREDIR = $(JOVEHOME)/lib/jove
-+.endif
++JOVEHOME = $(PREFIX)
 +SHAREDIR = $(JOVEHOME)/share/jove
  LIBDIR = $(JOVEHOME)/lib/jove
  BINDIR = $(JOVEHOME)/bin
- MANDIR = $(JOVEHOME)/man/man$(MANEXT)
- MANEXT = 1
+ XEXT=
+@@ -38,11 +38,11 @@ MANEXT = 1
+ # (in case the system startup salvages tempfiles by moving them,
+ # which is probably a good idea).
+ 
+-TMPDIR = /tmp
++TMPDIR = /var/tmp
+ RECDIR = /var/preserve
+ 
+ # DFLTSHELL is the default shell invoked by JOVE and TEACHJOVE.
 -DFLTSHELL = /bin/csh
 +DFLTSHELL = /bin/sh
  
  # The install commands of BSD and System V differ in unpleasant ways:
  # -c: copy (BSD); -c dir: destination directory (SysV)
-@@ -47,15 +51,15 @@
+@@ -53,15 +53,15 @@ DFLTSHELL = /bin/csh
  # "cp" will work reasonably well, but be aware that any links continue
  # referencing the old file with new contents.
  
 -INSTALLFLAGS = # -g bin -o root
-+INSTALLFLAGS = -g wheel -o root
++INSTALLFLAGS = -g $(ROOT_GROUP) -o $(ROOT_USER)
  
  # to install executable files
 -XINSTALL=cp
--#XINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 755 # -s
-+#XINSTALL=cp
-+XINSTALL=${BSD_INSTALL_PROGRAM}
++XINSTALL=$(BSD_INSTALL_PROGRAM)
+ #XINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 755 # -s
+ #CYGWIN32: XINSTALL=install $(INSTALLFLAGS) -c -m 755
  
  # to install text files
 -TINSTALL=cp
--#TINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 644
-+#TINSTALL=cp
-+TINSTALL=${BSD_INSTALL_DATA}
++TINSTALL=$(BSD_INSTALL_DATA)
+ #TINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 644
+ #CYGWIN32: TINSTALL=install $(INSTALLFLAGS) -c -m 644
  
- # These should all just be right if the above ones are.
- # You will confuse JOVE if you move anything from LIBDIR or SHAREDIR.
-@@ -79,7 +83,7 @@
- # compiler, adding -Xa -v will increase compiler checking.
- # On DEC OSF/1, -std1 -O
+@@ -146,7 +146,7 @@ SYSDEFS = -DBSDPOSIX
+ # On DEC OSF/1 and Digital UNIX VV4.0, add -std1 to enable ANSI C features
+ # and perhaps -g3 for more debugging info with optimization.
  
 -OPTFLAGS = -O
-+OPTFLAGS = -O2
++OPTFLAGS += -O2
  
  # For making dependencies under BSD systems
  DEPENDFLAG = -M
-@@ -163,7 +167,7 @@
- #
- # You can just say 'make SYSDEFS=-Dwhatever' on these systems.
- 
--SYSDEFS =
-+SYSDEFS = -DBSDPOSIX
- 
- # for SCO Xenix, set
- #	MEMFLAGS = -Mle
-@@ -179,6 +183,7 @@
- # CC = /opt/SUNWspro/bin/cc
- # For DG AViiON, expect compile errors unless you use the GNU C compiler:
- # CC=gcc
-+CC= gcc
- 
- # Load invocation of cc.
- # LDCC = purify $(CC)
diff --git a/editors/jove/patches/patch-ab b/editors/jove/patches/patch-ab
deleted file mode 100644
index bd1fa8f5e1d..00000000000
--- a/editors/jove/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1999/09/27 18:21:59 kim Exp $
-
---- sysdep.h.orig	Mon Mar 18 23:44:33 1996
-+++ sysdep.h	Mon Sep 27 14:18:52 1999
-@@ -154,6 +154,7 @@
- # define USE_FSYNC	1
- # define USE_FSTAT	1
- # define USE_FCHMOD	1
-+# define USE_CTYPE	1
- #endif
- 
- #ifdef IRIX