diff -ruN /usr/ports/editors/jove/Makefile ./jove/Makefile
--- /usr/ports/editors/jove/Makefile	2020-09-06 11:32:04.416382000 +0200
+++ ./jove/Makefile	2020-09-09 15:35:28.020996000 +0200
@@ -2,11 +2,9 @@
 # $FreeBSD: head/editors/jove/Makefile 544922 2020-08-15 08:42:58Z tcberner $
 
 PORTNAME=	jove
-PORTVERSION=	4.16
-PORTREVISION=	2
+PORTVERSION=	4.17.0.5
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.cs.toronto.edu/pub/moraes/jove/ARCHIVE/4.16/ \
-		LOCAL/simon
+MASTER_SITES=	ftp://ftp.cs.toronto.edu/pub/moraes/jove/ \
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Jonathan's Own Version of Emacs
@@ -16,22 +14,16 @@
 LICENSE_FILE=	${WRKSRC}/README
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		ncurses
+BUILD_DEPENDS=	nroff:textproc/groff
+
+USES=		ncurses tar:tgz
 MAKE_ARGS=	LIBS="${LDFLAGS} -lncurses"
-WRKSRC=		${WRKDIR}/${PORTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	EXTRADOCS
 EXTRADOCS_DESC=	Build and install cmds.doc
 EXTRADOCS_USES=	groff
 OPTIONS_DEFAULT=
 OPTIONS_SUB=	yes
-
-post-patch:
-# Fix collisions with getline(3)
-	@${REINPLACE_CMD} 's|[[:<:]]getline[[:>:]]|get_line|g' ${WRKSRC}/*.c ${WRKSRC}/*.h
-
-post-patch-EXTRADOCS-off:
-	@${REINPLACE_CMD} -E 's|^(all:.*) doc/cmds\.doc$$|\1|' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} 's|^CMDS.DOC = .*|CMDS.DOC=|' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff -ruN /usr/ports/editors/jove/distinfo ./jove/distinfo
--- /usr/ports/editors/jove/distinfo	2020-09-06 11:32:04.415808000 +0200
+++ ./jove/distinfo	2020-08-16 13:04:18.985390000 +0200
@@ -1,2 +1,3 @@
-SHA256 (jove-4.16.tar.gz) = 0ce4b4f8e2c76c9727bc011791cea32480425e0b4da16b0a8a5e642b0b49018a
-SIZE (jove-4.16.tar.gz) = 432274
+TIMESTAMP = 1597575858
+SHA256 (jove-4.17.0.5.tgz) = 97070b8c0d305c4aed629859bb98eb6c0b46087f2e9257fd06173972dacc6b89
+SIZE (jove-4.17.0.5.tgz) = 473157
diff -ruN /usr/ports/editors/jove/files/patch-Makefile ./jove/files/patch-Makefile
--- /usr/ports/editors/jove/files/patch-Makefile	2020-09-06 11:32:04.421529000 +0200
+++ ./jove/files/patch-Makefile	1970-01-01 01:00:00.000000000 +0100
@@ -1,75 +0,0 @@
---- 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 \
diff -ruN /usr/ports/editors/jove/files/patch-abbrev.c ./jove/files/patch-abbrev.c
--- /usr/ports/editors/jove/files/patch-abbrev.c	2020-09-06 11:32:04.416891000 +0200
+++ ./jove/files/patch-abbrev.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
---- 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);
diff -ruN /usr/ports/editors/jove/files/patch-io.c ./jove/files/patch-io.c
--- /usr/ports/editors/jove/files/patch-io.c	2020-09-06 11:32:04.414801000 +0200
+++ ./jove/files/patch-io.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
---- 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 */
diff -ruN /usr/ports/editors/jove/files/patch-mouse.c ./jove/files/patch-mouse.c
--- /usr/ports/editors/jove/files/patch-mouse.c	2020-09-06 11:32:04.495542000 +0200
+++ ./jove/files/patch-mouse.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- mouse.c.orig	1996-03-07 17:34:43 UTC
-+++ mouse.c
-@@ -266,7 +266,7 @@ int	mproto;
- 	/* Format of command to xterm to start or stop mouse hilite tracking:
- 	 * ^[ [ func ; startx ; starty ; firstrow ; lastrow T
- 	 */
--#define XTERMBUG
-+/* #undef XTERMBUG */
- #ifdef XTERMBUG
- 	static const char	hl_fmt[] = "\033[%d;%d;%d;%d;%dTX";
- #else
diff -ruN /usr/ports/editors/jove/files/patch-proc.c ./jove/files/patch-proc.c
--- /usr/ports/editors/jove/files/patch-proc.c	2020-09-06 11:32:04.415307000 +0200
+++ ./jove/files/patch-proc.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,37 +0,0 @@
---- 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) {
diff -ruN /usr/ports/editors/jove/files/patch-rec.c ./jove/files/patch-rec.c
--- /usr/ports/editors/jove/files/patch-rec.c	2020-09-06 11:32:04.422029000 +0200
+++ ./jove/files/patch-rec.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,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*/
diff -ruN /usr/ports/editors/jove/files/patch-sysdep.h ./jove/files/patch-sysdep.h
--- /usr/ports/editors/jove/files/patch-sysdep.h	2020-09-06 11:32:04.417407000 +0200
+++ ./jove/files/patch-sysdep.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
---- sysdep.h.orig	1996-03-19 04:44:33 UTC
-+++ sysdep.h
-@@ -154,6 +154,7 @@
- # define USE_FSYNC	1
- # define USE_FSTAT	1
- # define USE_FCHMOD	1
-+# define USE_CTYPE	1
- #endif
- 
- #ifdef IRIX
diff -ruN /usr/ports/editors/jove/pkg-plist ./jove/pkg-plist
--- /usr/ports/editors/jove/pkg-plist	2020-09-06 11:32:04.495040000 +0200
+++ ./jove/pkg-plist	2020-09-09 16:03:02.494146000 +0200
@@ -1,25 +1,26 @@
 bin/jove
 bin/teachjove
-libexec/jove/portsrv
-libexec/jove/recover
+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
+%%EXTRADOCS%%lib/jove/cmds.doc
 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