upgrade to 4.16 (non-beta)

move:
sharedir: lib => share
libdir:   lib => libexec (houses portsrv and recover only)
tmpdir:   /usr/tmp => /var/tmp (the former doesn't usually exist)

5 files changed, 72 insertions, 63 deletions

diff --git a/editors/jove/Makefile b/editors/jove/Makefile
index 94596b8bb662..1dab8f87ea83 100644
--- a/editors/jove/Makefile
+++ b/editors/jove/Makefile
@@ -3,15 +3,14 @@
 # Date created:		21 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.10 1995/04/01 12:44:47 jkh Exp $
+# $Id: Makefile,v 1.11 1995/04/09 06:11:10 asami Exp $
 #
 
-DISTNAME=	jove-4.16beta
-PKGNAME=	jove-4.16b
+DISTNAME=	jove-4.16
 CATEGORIES+=	editors
 MASTER_SITES=	ftp://relay.cs.toronto.edu/pub/moraes/jove/
 EXTRACT_SUFX=	.tar.gz
 
-WRKSRC=		${WRKDIR}/jove-4.16beta
+WRKSRC=		${WRKDIR}/jove
 
 .include <bsd.port.mk>
diff --git a/editors/jove/distinfo b/editors/jove/distinfo
index 73fca6be9e87..01980aaf9069 100644
--- a/editors/jove/distinfo
+++ b/editors/jove/distinfo
@@ -1 +1 @@
-MD5 (jove-4.16beta.tar.gz) = 50c04405ad5d845968d7ed93cfc8716d
+MD5 (jove-4.16.tar.gz) = 38ebd64355a99b0d007aaef17b0d00b1
diff --git a/editors/jove/files/patch-aa b/editors/jove/files/patch-aa
index 59021888cc5d..11c5c91dc11c 100644
--- a/editors/jove/files/patch-aa
+++ b/editors/jove/files/patch-aa
@@ -1,44 +1,47 @@
-*** Makefile.orig	Tue Nov 22 14:46:24 1994
---- Makefile	Tue Nov 22 14:50:29 1994
-***************
-*** 39,49 ****
-  DFLTSHELL = /bin/csh
-  
-  # to install executable files
-! XINSTALL=cp
-! #XINSTALL=/usr/ucb/install -c -m 755 # -s
-  # to install text files
-! TINSTALL=cp
-! #TINSTALL=/usr/ucb/install -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.
---- 39,49 ----
-  DFLTSHELL = /bin/csh
-  
-  # to install executable files
-! #XINSTALL=cp
-! XINSTALL=install -c -m 755 # -s
-  # to install text files
-! #TINSTALL=cp
-! TINSTALL=install -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.
-***************
-*** 151,157 ****
-  #
-  # You can just say 'make SYSDEFS=-Dwhatever' on these systems.
-  
-! SYSDEFS =
-  
-  # for SCO Xenix, set
-  #	MEMFLAGS = -Mle
---- 151,157 ----
-  #
-  # You can just say 'make SYSDEFS=-Dwhatever' on these systems.
-  
-! SYSDEFS = -DBSDPOSIX
-  
-  # for SCO Xenix, set
-  #	MEMFLAGS = -Mle
+--- Makefile.orig	Mon Mar 18 22:44:33 1996
++++ Makefile	Sun Sep 22 10:30:41 1996
+@@ -27,16 +27,16 @@
+ # LIBDIR and SHAREDIR.  All others must already exist.
+ 
+ SHELL = /bin/sh
+-TMPDIR = /usr/tmp
++TMPDIR = /var/tmp
+ RECDIR = /usr/preserve
+ 
+-JOVEHOME = /usr/local
+-SHAREDIR = $(JOVEHOME)/lib/jove
+-LIBDIR = $(JOVEHOME)/lib/jove
++JOVEHOME = ${PREFIX}
++SHAREDIR = $(JOVEHOME)/share/jove
++LIBDIR = $(JOVEHOME)/libexec/jove
+ BINDIR = $(JOVEHOME)/bin
+ MANDIR = $(JOVEHOME)/man/man$(MANEXT)
+ MANEXT = 1
+-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)
+@@ -51,11 +51,11 @@
+ 
+ # to install executable files
+ XINSTALL=cp
+-#XINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 755 # -s
++XINSTALL=install $(INSTALLFLAGS) -c -m 755 # -s
+ 
+ # to install text files
+ TINSTALL=cp
+-#TINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 644
++#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.
+@@ -163,7 +163,7 @@
+ #
+ # You can just say 'make SYSDEFS=-Dwhatever' on these systems.
+ 
+-SYSDEFS =
++SYSDEFS = -DBSDPOSIX
+ 
+ # for SCO Xenix, set
+ #	MEMFLAGS = -Mle
diff --git a/editors/jove/files/patch-ab b/editors/jove/files/patch-ab
deleted file mode 100644
index 8d60db58ccbb..000000000000
--- a/editors/jove/files/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-*** externs.h.orig	Tue Nov 22 15:00:07 1994
---- externs.h	Tue Nov 22 15:01:18 1994
-***************
-*** 72,78 ****
-  #ifdef POSIX_UNISTD
-  # include <unistd.h>
-  # if _POSIX_VERSION < 199009L	/* defined in <unistd.h>: can't test earlier */
-- typedef int	ssize_t;	/* not defined in original POSIX.1 */
-  # endif
-  # include <fcntl.h>
-  #else /* !POSIX_UNISTD */
---- 72,77 ----
diff --git a/editors/jove/pkg-plist b/editors/jove/pkg-plist
index 942b871ec2bd..bf6ce2df2097 100644
--- a/editors/jove/pkg-plist
+++ b/editors/jove/pkg-plist
@@ -1,8 +1,27 @@
-@cwd /usr/local
 bin/jove
 bin/teachjove
-lib/jove
+libexec/jove/portsrv
+libexec/jove/recover
 man/man1/jove.1
 man/man1/teachjove.1
 man/man1/xjove.1
 man/man1/jovetool.1
+share/jove/teach-jove
+share/jove/cmds.doc
+share/jove/jove.rc.sun
+share/jove/keychart.
+share/jove/keychart.3022
+share/jove/jove.rc.3022
+share/jove/keychart.z29
+share/jove/jove.rc.z29
+share/jove/keychart.xterm
+share/jove/jove.rc.xterm
+share/jove/keychart.wyse
+share/jove/jove.rc.wyse
+share/jove/keychart.vt100
+share/jove/jove.rc.vt100
+share/jove/keychart.sun-cmd
+share/jove/jove.rc.sun-cmd
+share/jove/keychart.sun
+share/jove/XTermresource
+share/jove/jove.rc