6 files changed, 129 insertions, 10 deletions

diff --git a/editors/jove/Makefile b/editors/jove/Makefile
index 3859a85bbf7a..e2378e2bbfa0 100644
--- a/editors/jove/Makefile
+++ b/editors/jove/Makefile
@@ -7,12 +7,13 @@
 
 PORTNAME=	jove
 PORTVERSION=	4.16
+PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.cs.toronto.edu/pub/moraes/jove/
 
 MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/jove
-MAN1=		jove.1 teachjove.1 xjove.1 jovetool.1
+WRKSRC=		${WRKDIR}/${PORTNAME}
+MAN1=		jove.1 teachjove.1
 
 .include <bsd.port.mk>
diff --git a/editors/jove/files/patch-aa b/editors/jove/files/patch-aa
index 11c5c91dc11c..943ed0934926 100644
--- a/editors/jove/files/patch-aa
+++ b/editors/jove/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Mon Mar 18 22:44:33 1996
-+++ Makefile	Sun Sep 22 10:30:41 1996
+--- Makefile.orig	Tue Mar 19 13:44:33 1996
++++ Makefile	Wed Dec 20 05:39:12 2000
 @@ -27,16 +27,16 @@
  # LIBDIR and SHAREDIR.  All others must already exist.
  
@@ -22,21 +22,33 @@
  
  # The install commands of BSD and System V differ in unpleasant ways:
  # -c: copy (BSD); -c dir: destination directory (SysV)
-@@ -51,11 +51,11 @@
+@@ -50,12 +50,12 @@
+ INSTALLFLAGS = # -g bin -o root
  
  # to install executable files
- XINSTALL=cp
+-XINSTALL=cp
 -#XINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 755 # -s
-+XINSTALL=install $(INSTALLFLAGS) -c -m 755 # -s
++#XINSTALL=cp
++XINSTALL=${BSD_INSTALL_PROGRAM}
  
  # to install text files
- TINSTALL=cp
+-TINSTALL=cp
 -#TINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 644
-+#TINSTALL=install $(INSTALLFLAGS) -c -m 644
++#TINSTALL=cp
++TINSTALL=${BSD_INSTALL_DATA}
  
  # 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 @@
+@@ -79,7 +79,7 @@
+ # compiler, adding -Xa -v will increase compiler checking.
+ # On DEC OSF/1, -std1 -O
+ 
+-OPTFLAGS = -O
++#OPTFLAGS = -O
+ 
+ # For making dependencies under BSD systems
+ DEPENDFLAG = -M
+@@ -163,13 +163,13 @@
  #
  # You can just say 'make SYSDEFS=-Dwhatever' on these systems.
  
@@ -45,3 +57,19 @@
  
  # for SCO Xenix, set
  #	MEMFLAGS = -Mle
+ #	CFLAGS = -LARGE -O -F 3000 -K -Mle  (say -Mle2 for an 80286)
+ 
+-CFLAGS = $(OPTFLAGS) $(SYSDEFS)
++CFLAGS += $(OPTFLAGS) $(SYSDEFS)
+ 
+ # For SYSVR4 (/usr/ucb/cc will NOT work because of setjmp.h):
+ # CC = /usr/bin/cc
+@@ -213,7 +213,7 @@
+ TROFF = troff -Tpost
+ TROFFPOST = | /usr/lib/lp/postscript/dpost - >troff.out.ps
+ 
+-MANUALS = $(JOVEM) $(TEACHJOVEM) $(XJOVEM) $(JOVETOOLM)
++MANUALS = $(JOVEM) $(TEACHJOVEM) # $(XJOVEM) $(JOVETOOLM)
+ 
+ C_SRC = commands.c commands.tab abbrev.c argcount.c ask.c buf.c c.c case.c jctype.c \
+ 	delete.c disp.c extend.c fp.c fmt.c insert.c io.c iproc.c \
diff --git a/editors/jove/files/patch-ad b/editors/jove/files/patch-ad
new file mode 100644
index 000000000000..f2797a9d4f85
--- /dev/null
+++ b/editors/jove/files/patch-ad
@@ -0,0 +1,19 @@
+--- abbrev.c.orig	Fri Mar  8 02:34:41 1996
++++ abbrev.c	Wed Dec 20 05:19:33 2000
+@@ -274,7 +274,16 @@
+ 		"jabbXXXXXX"
+ #endif
+ 		);
++#ifndef NO_MKSTEMP
++	{
++		int fd = mkstemp(tname);
++		if ( fd == -1 )
++			err( 1, "can't create temp file %s", tname );
++		close( fd );
++	}
++#else
+ 	(void) mktemp(tname);
++#endif
+ 	save_abbrevs(tname);
+ 	setfname(ebuf, tname);
+ 	read_file(tname, NO);
diff --git a/editors/jove/files/patch-ae b/editors/jove/files/patch-ae
new file mode 100644
index 000000000000..284c1eb35bc7
--- /dev/null
+++ b/editors/jove/files/patch-ae
@@ -0,0 +1,19 @@
+--- io.c.orig	Fri Mar  8 02:34:42 1996
++++ io.c	Wed Dec 20 05:19:17 2000
+@@ -1193,10 +1193,16 @@
+ #endif
+ 		);
+ 	tfname = copystr(buf);
++#ifdef NO_MKSTEMP
+ 	tfname = mktemp(tfname);
++#endif
+ #ifndef MSFILESYSTEM
++#ifndef NO_MKSTEMP
++	tmpfd = mkstemp(tfname);
++#else
+ 	(void) close(creat(tfname, 0600));
+ 	tmpfd = open(tfname, 2);
++#endif
+ #else /* MSFILESYSTEM */
+ 	tmpfd = open(tfname, O_CREAT|O_EXCL|O_BINARY|O_RDWR, S_IWRITE|S_IREAD);
+ #endif /* MSFILESYSTEM */
diff --git a/editors/jove/files/patch-af b/editors/jove/files/patch-af
new file mode 100644
index 000000000000..edc2c841990f
--- /dev/null
+++ b/editors/jove/files/patch-af
@@ -0,0 +1,37 @@
+--- proc.c.orig	Sat Mar  9 06:46:40 1996
++++ proc.c	Wed Dec 20 05:20:13 2000
+@@ -827,8 +827,14 @@
+ 		int	ph;
+ 
+ 		swritef(pnbuf, sizeof(pnbuf), "%s/%s", TmpDir, "jpXXXXXX");
++#ifndef NO_MKSTEMP
++		pipename = pnbuf;
++		ph = mkstemp( pipename );
++#else
+ 		pipename = mktemp(pnbuf);
+-		if ((ph = creat(pipename, S_IWRITE|S_IREAD)) < 0)
++		ph = creat(pipename, S_IWRITE|S_IREAD);
++#endif
++		if (ph == -1)
+ 			complain("cannot make pipe for filter: %s", strerror(errno));
+ 		close(1);
+ 		close(2);
+@@ -923,7 +929,18 @@
+ 	jmp_buf	sav_jmp;
+ 
+ 	swritef(tnambuf, sizeof(tnambuf), "%s/%s", TmpDir, "jfXXXXXX");
++#ifndef NO_MKSTEMP
++	{
++		int fd = mkstemp(tnambuf);
++		if ( fd == -1 )
++			complain( "can't create temp file %s: %s",
++				  tnambuf, strerror(errno) );
++		close( fd );
++		tname = tnambuf;
++	}
++#else
+ 	tname = mktemp(tnambuf);
++#endif
+ 	fp = open_file(tname, iobuff, F_WRITE, YES);
+ 	push_env(sav_jmp);
+ 	if (setjmp(mainjmp) == 0) {
diff --git a/editors/jove/files/patch-ag b/editors/jove/files/patch-ag
new file mode 100644
index 000000000000..f252f686b54b
--- /dev/null
+++ b/editors/jove/files/patch-ag
@@ -0,0 +1,15 @@
+--- rec.c.orig	Fri Mar  8 02:34:43 1996
++++ rec.c	Wed Dec 20 05:19:50 2000
+@@ -55,8 +55,12 @@
+ #endif
+ 		);
+ 	recfname = copystr(buf);
++#ifndef NO_MKSTEMP
++	rec_fd = mkstemp(recfname);
++#else
+ 	recfname = mktemp(recfname);
+ 	rec_fd = creat(recfname, 0644);
++#endif
+ 	if (rec_fd == -1) {
+ 		complain("Cannot create \"%s\"; recovery disabled.", recfname);
+ 		/*NOTREACHED*/