Attachment #217255 for bug #248588




# $FreeBSD: head/editors/jove/Makefile 544922 2020-08-15 08:42:58Z tcberner $

PORTNAME=	jove
PORTVERSION=	4.17.0.5
PORTREVISION=	2
CATEGORIES=	editors
MASTER_SITES=	ftp://ftp.cs.toronto.edu/pub/moraes/jove/ \
		LOCAL/simon

MAINTAINER=	ports@FreeBSD.org

LICENSE_FILE=	${WRKSRC}/README
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

USES=		ncurses tar:tgz
MAKE_ARGS=	LIBS="${LDFLAGS} -lncurses"
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

OPTIONS_DEFINE=	EXTRADOCS
EXTRADOCS_DESC=	Build and install cmds.doc

Lines 1-2 Link Here

(-)/usr/ports/editors/jove/distinfo (-2 / +3 lines)
1	SHA256 (jove-4.16.tar.gz) = 0ce4b4f8e2c76c9727bc011791cea32480425e0b4da16b0a8a5e642b0b49018a	1	TIMESTAMP = 1597575858
2	SIZE (jove-4.16.tar.gz) = 432274	2	SHA256 (jove-4.17.0.5.tgz) = 97070b8c0d305c4aed629859bb98eb6c0b46087f2e9257fd06173972dacc6b89
		3	SIZE (jove-4.17.0.5.tgz) = 473157




--- Makefile.orig	1996-03-19 04:44:33 UTC
+++ Makefile
@@ -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 = ${DESTDIR}${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)
@@ -50,12 +50,12 @@ DFLTSHELL = /bin/csh
 INSTALLFLAGS = # -g bin -o root
 
 # to install executable files
-XINSTALL=cp
-#XINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 755 # -s
+#XINSTALL=cp
+XINSTALL=${BSD_INSTALL_PROGRAM}
 
 # to install text files
-TINSTALL=cp
-#TINSTALL=/usr/ucb/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.
@@ -79,7 +79,7 @@ JOVETOOLM = $(MANDIR)/jovetool.$(MANEXT)
 # 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 @@ LDFLAGS =
 #
 # You can just say 'make SYSDEFS=-Dwhatever' on these systems.
 
-SYSDEFS =
+SYSDEFS = -DBSDPOSIX
 
 # 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 @@ NROFF = nroff
 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 \




--- abbrev.c.orig	1996-03-07 17:34:41 UTC
+++ abbrev.c
@@ -274,7 +274,16 @@ EditAbbrevs()
 		"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);




--- io.c.orig	1996-03-07 17:34:42 UTC
+++ io.c
@@ -1193,10 +1193,16 @@ tmpinit()
 #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 */

Lines 1-11 Link Here

(-)/usr/ports/editors/jove/files/patch-mouse.c (-11 lines)
1	--- mouse.c.orig 1996-03-07 17:34:43 UTC
2	+++ mouse.c
3	@@ -266,7 +266,7 @@ int mproto;
4	/* Format of command to xterm to start or stop mouse hilite tracking:
5	* ^[ [ func ; startx ; starty ; firstrow ; lastrow T
6	*/
7	-#define XTERMBUG
8	+/* #undef XTERMBUG */
9	#ifdef XTERMBUG
10	static const char hl_fmt[] = "\033[%d;%d;%d;%d;%dTX";
11	#else




--- proc.c.orig	1996-03-08 21:46:40 UTC
+++ proc.c
@@ -827,8 +827,14 @@ UnixToBuf(flags, bnm, InFName, cmd)
 		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 @@ bool	wrap;
 	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) {




--- rec.c.orig	1996-03-07 17:34:43 UTC
+++ rec.c
@@ -55,8 +55,12 @@ recinit()
 #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*/

Lines 1-10 Link Here

(-)/usr/ports/editors/jove/files/patch-sysdep.h (-10 lines)
1	--- sysdep.h.orig 1996-03-19 04:44:33 UTC
2	+++ sysdep.h
3	@@ -154,6 +154,7 @@
4	# define USE_FSYNC 1
5	# define USE_FSTAT 1
6	# define USE_FCHMOD 1
7	+# define USE_CTYPE 1
8	#endif
9
10	#ifdef IRIX




bin/jove
bin/teachjove
lib/jove/XTermresource
lib/jove/jove.rc
lib/jove/jove.rc.3022
lib/jove/jove.rc.sun
lib/jove/jove.rc.sun-cmd
lib/jove/jove.rc.vt100
lib/jove/jove.rc.wyse
lib/jove/jove.rc.xterm
lib/jove/jove.rc.xterm-256color
lib/jove/jove.rc.z29
lib/jove/keychart.
lib/jove/keychart.3022
lib/jove/keychart.sun
lib/jove/keychart.sun-cmd
lib/jove/keychart.vt100
lib/jove/keychart.wyse
lib/jove/keychart.xterm
lib/jove/keychart.xterm-256color
lib/jove/keychart.z29
lib/jove/recover
lib/jove/teach-jove
man/man1/jove.1.gz
man/man1/teachjove.1.gz
%%DATADIR%%/XTermresource
%%EXTRADOCS%%%%DATADIR%%/cmds.doc
%%DATADIR%%/jove.rc
%%DATADIR%%/jove.rc.3022
%%DATADIR%%/jove.rc.sun
%%DATADIR%%/jove.rc.sun-cmd
%%DATADIR%%/jove.rc.vt100
%%DATADIR%%/jove.rc.wyse
%%DATADIR%%/jove.rc.xterm
%%DATADIR%%/jove.rc.z29
%%DATADIR%%/keychart.
%%DATADIR%%/keychart.3022
%%DATADIR%%/keychart.sun
%%DATADIR%%/keychart.sun-cmd
%%DATADIR%%/keychart.vt100
%%DATADIR%%/keychart.wyse
%%DATADIR%%/keychart.xterm
%%DATADIR%%/keychart.z29
%%DATADIR%%/teach-jove

Return to bug 248588

Lines 2-11 Link Here

(-)/usr/ports/editors/jove/Makefile (-5 / +4 lines)
2	# $FreeBSD: head/editors/jove/Makefile 544922 2020-08-15 08:42:58Z tcberner $	2	# $FreeBSD: head/editors/jove/Makefile 544922 2020-08-15 08:42:58Z tcberner $
3		3
4	PORTNAME= jove	4	PORTNAME= jove
5	PORTVERSION= 4.16	5	PORTVERSION= 4.17.0.5
6	PORTREVISION= 2
7	CATEGORIES= editors	6	CATEGORIES= editors
8	MASTER_SITES= ftp://ftp.cs.toronto.edu/pub/moraes/jove/ARCHIVE/4.16/ \	7	MASTER_SITES= ftp://ftp.cs.toronto.edu/pub/moraes/jove/ \
9	LOCAL/simon	8	LOCAL/simon
10		9
11	MAINTAINER= ports@FreeBSD.org	10	MAINTAINER= ports@FreeBSD.org
Lines 16-24 Link Here
16	LICENSE_FILE= ${WRKSRC}/README	15	LICENSE_FILE= ${WRKSRC}/README
17	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	16	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
18		17
19	USES= ncurses	18	USES= ncurses tar:tgz
20	MAKE_ARGS= LIBS="${LDFLAGS} -lncurses"	19	MAKE_ARGS= LIBS="${LDFLAGS} -lncurses"
21	WRKSRC= ${WRKDIR}/${PORTNAME}	20	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
22		21
23	OPTIONS_DEFINE= EXTRADOCS	22	OPTIONS_DEFINE= EXTRADOCS
24	EXTRADOCS_DESC= Build and install cmds.doc	23	EXTRADOCS_DESC= Build and install cmds.doc

Lines 1-75 Link Here

(-)/usr/ports/editors/jove/files/patch-Makefile (-75 lines)
1	--- Makefile.orig 1996-03-19 04:44:33 UTC
2	+++ Makefile
3	@@ -27,16 +27,16 @@
4	# LIBDIR and SHAREDIR. All others must already exist.
5
6	SHELL = /bin/sh
7	-TMPDIR = /usr/tmp
8	+TMPDIR = /var/tmp
9	RECDIR = /usr/preserve
10
11	-JOVEHOME = /usr/local
12	-SHAREDIR = $(JOVEHOME)/lib/jove
13	-LIBDIR = $(JOVEHOME)/lib/jove
14	+JOVEHOME = ${DESTDIR}${PREFIX}
15	+SHAREDIR = $(JOVEHOME)/share/jove
16	+LIBDIR = $(JOVEHOME)/libexec/jove
17	BINDIR = $(JOVEHOME)/bin
18	MANDIR = $(JOVEHOME)/man/man$(MANEXT)
19	MANEXT = 1
20	-DFLTSHELL = /bin/csh
21	+DFLTSHELL = /bin/sh
22
23	# The install commands of BSD and System V differ in unpleasant ways:
24	# -c: copy (BSD); -c dir: destination directory (SysV)
25	@@ -50,12 +50,12 @@ DFLTSHELL = /bin/csh
26	INSTALLFLAGS = # -g bin -o root
27
28	# to install executable files
29	-XINSTALL=cp
30	-#XINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 755 # -s
31	+#XINSTALL=cp
32	+XINSTALL=${BSD_INSTALL_PROGRAM}
33
34	# to install text files
35	-TINSTALL=cp
36	-#TINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 644
37	+#TINSTALL=cp
38	+TINSTALL=${BSD_INSTALL_DATA}
39
40	# These should all just be right if the above ones are.
41	# You will confuse JOVE if you move anything from LIBDIR or SHAREDIR.
42	@@ -79,7 +79,7 @@ JOVETOOLM = $(MANDIR)/jovetool.$(MANEXT)
43	# compiler, adding -Xa -v will increase compiler checking.
44	# On DEC OSF/1, -std1 -O
45
46	-OPTFLAGS = -O
47	+#OPTFLAGS = -O
48
49	# For making dependencies under BSD systems
50	DEPENDFLAG = -M
51	@@ -163,13 +163,13 @@ LDFLAGS =
52	#
53	# You can just say 'make SYSDEFS=-Dwhatever' on these systems.
54
55	-SYSDEFS =
56	+SYSDEFS = -DBSDPOSIX
57
58	# for SCO Xenix, set
59	# MEMFLAGS = -Mle
60	# CFLAGS = -LARGE -O -F 3000 -K -Mle (say -Mle2 for an 80286)
61
62	-CFLAGS = $(OPTFLAGS) $(SYSDEFS)
63	+CFLAGS += $(OPTFLAGS) $(SYSDEFS)
64
65	# For SYSVR4 (/usr/ucb/cc will NOT work because of setjmp.h):
66	# CC = /usr/bin/cc
67	@@ -213,7 +213,7 @@ NROFF = nroff
68	TROFF = troff -Tpost
69	TROFFPOST = \| /usr/lib/lp/postscript/dpost - >troff.out.ps
70
71	-MANUALS = $(JOVEM) $(TEACHJOVEM) $(XJOVEM) $(JOVETOOLM)
72	+MANUALS = $(JOVEM) $(TEACHJOVEM) # $(XJOVEM) $(JOVETOOLM)
73
74	C_SRC = commands.c commands.tab abbrev.c argcount.c ask.c buf.c c.c case.c jctype.c \
75	delete.c disp.c extend.c fp.c fmt.c insert.c io.c iproc.c \

Lines 1-19 Link Here

(-)/usr/ports/editors/jove/files/patch-abbrev.c (-19 lines)
1	--- abbrev.c.orig 1996-03-07 17:34:41 UTC
2	+++ abbrev.c
3	@@ -274,7 +274,16 @@ EditAbbrevs()
4	"jabbXXXXXX"
5	#endif
6	);
7	+#ifndef NO_MKSTEMP
8	+ {
9	+ int fd = mkstemp(tname);
10	+ if ( fd == -1 )
11	+ err( 1, "can't create temp file %s", tname );
12	+ close( fd );
13	+ }
14	+#else
15	(void) mktemp(tname);
16	+#endif
17	save_abbrevs(tname);
18	setfname(ebuf, tname);
19	read_file(tname, NO);

Lines 1-19 Link Here

(-)/usr/ports/editors/jove/files/patch-io.c (-19 lines)
1	--- io.c.orig 1996-03-07 17:34:42 UTC
2	+++ io.c
3	@@ -1193,10 +1193,16 @@ tmpinit()
4	#endif
5	);
6	tfname = copystr(buf);
7	+#ifdef NO_MKSTEMP
8	tfname = mktemp(tfname);
9	+#endif
10	#ifndef MSFILESYSTEM
11	+#ifndef NO_MKSTEMP
12	+ tmpfd = mkstemp(tfname);
13	+#else
14	(void) close(creat(tfname, 0600));
15	tmpfd = open(tfname, 2);
16	+#endif
17	#else /* MSFILESYSTEM */
18	tmpfd = open(tfname, O_CREAT\|O_EXCL\|O_BINARY\|O_RDWR, S_IWRITE\|S_IREAD);
19	#endif /* MSFILESYSTEM */

Lines 1-37 Link Here

(-)/usr/ports/editors/jove/files/patch-proc.c (-37 lines)
1	--- proc.c.orig 1996-03-08 21:46:40 UTC
2	+++ proc.c
3	@@ -827,8 +827,14 @@ UnixToBuf(flags, bnm, InFName, cmd)
4	int ph;
5
6	swritef(pnbuf, sizeof(pnbuf), "%s/%s", TmpDir, "jpXXXXXX");
7	+#ifndef NO_MKSTEMP
8	+ pipename = pnbuf;
9	+ ph = mkstemp( pipename );
10	+#else
11	pipename = mktemp(pnbuf);
12	- if ((ph = creat(pipename, S_IWRITE\|S_IREAD)) < 0)
13	+ ph = creat(pipename, S_IWRITE\|S_IREAD);
14	+#endif
15	+ if (ph == -1)
16	complain("cannot make pipe for filter: %s", strerror(errno));
17	close(1);
18	close(2);
19	@@ -923,7 +929,18 @@ bool wrap;
20	jmp_buf sav_jmp;
21
22	swritef(tnambuf, sizeof(tnambuf), "%s/%s", TmpDir, "jfXXXXXX");
23	+#ifndef NO_MKSTEMP
24	+ {
25	+ int fd = mkstemp(tnambuf);
26	+ if ( fd == -1 )
27	+ complain( "can't create temp file %s: %s",
28	+ tnambuf, strerror(errno) );
29	+ close( fd );
30	+ tname = tnambuf;
31	+ }
32	+#else
33	tname = mktemp(tnambuf);
34	+#endif
35	fp = open_file(tname, iobuff, F_WRITE, YES);
36	push_env(sav_jmp);
37	if (setjmp(mainjmp) == 0) {

Lines 1-15 Link Here

(-)/usr/ports/editors/jove/files/patch-rec.c (-15 lines)
1	--- rec.c.orig 1996-03-07 17:34:43 UTC
2	+++ rec.c
3	@@ -55,8 +55,12 @@ recinit()
4	#endif
5	);
6	recfname = copystr(buf);
7	+#ifndef NO_MKSTEMP
8	+ rec_fd = mkstemp(recfname);
9	+#else
10	recfname = mktemp(recfname);
11	rec_fd = creat(recfname, 0644);
12	+#endif
13	if (rec_fd == -1) {
14	complain("Cannot create \"%s\"; recovery disabled.", recfname);
15	/NOTREACHED/

Lines 1-25 Link Here

(-)/usr/ports/editors/jove/pkg-plist (-21 / +21 lines)
1	bin/jove	1	bin/jove
2	bin/teachjove	2	bin/teachjove
3	libexec/jove/portsrv	3	lib/jove/XTermresource
4	libexec/jove/recover	4	lib/jove/jove.rc
		5	lib/jove/jove.rc.3022
		6	lib/jove/jove.rc.sun
		7	lib/jove/jove.rc.sun-cmd
		8	lib/jove/jove.rc.vt100
		9	lib/jove/jove.rc.wyse
		10	lib/jove/jove.rc.xterm
		11	lib/jove/jove.rc.xterm-256color
		12	lib/jove/jove.rc.z29
		13	lib/jove/keychart.
		14	lib/jove/keychart.3022
		15	lib/jove/keychart.sun
		16	lib/jove/keychart.sun-cmd
		17	lib/jove/keychart.vt100
		18	lib/jove/keychart.wyse
		19	lib/jove/keychart.xterm
		20	lib/jove/keychart.xterm-256color
		21	lib/jove/keychart.z29
		22	lib/jove/recover
		23	lib/jove/teach-jove
5	man/man1/jove.1.gz	24	man/man1/jove.1.gz
6	man/man1/teachjove.1.gz	25	man/man1/teachjove.1.gz
7	%%DATADIR%%/XTermresource
8	%%EXTRADOCS%%%%DATADIR%%/cmds.doc
9	%%DATADIR%%/jove.rc
10	%%DATADIR%%/jove.rc.3022
11	%%DATADIR%%/jove.rc.sun
12	%%DATADIR%%/jove.rc.sun-cmd
13	%%DATADIR%%/jove.rc.vt100
14	%%DATADIR%%/jove.rc.wyse
15	%%DATADIR%%/jove.rc.xterm
16	%%DATADIR%%/jove.rc.z29
17	%%DATADIR%%/keychart.
18	%%DATADIR%%/keychart.3022
19	%%DATADIR%%/keychart.sun
20	%%DATADIR%%/keychart.sun-cmd
21	%%DATADIR%%/keychart.vt100
22	%%DATADIR%%/keychart.wyse
23	%%DATADIR%%/keychart.xterm
24	%%DATADIR%%/keychart.z29
25	%%DATADIR%%/teach-jove