PR/54520: greywolf, our TIOCREMOTE seems to be broken, disable it.

Also make the openpty use NetBSD only (Jonathan Perkin)

4 files changed, 18 insertions, 32 deletions

diff --git a/editors/jove/Makefile b/editors/jove/Makefile
index e5e04eaab9c..24ad06edf67 100644
--- a/editors/jove/Makefile
+++ b/editors/jove/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/09/02 08:55:08 christos Exp $
+# $NetBSD: Makefile,v 1.20 2019/09/06 14:52:39 christos Exp $
 #
 
 DISTNAME=	jove4.16.0.74
@@ -19,6 +19,8 @@ MAKE_FLAGS+=	NROFF=${NROFF:Q}
 
 INSTALL_MAKE_FLAGS+=	JOVEHOME=${DESTDIR}${PREFIX}
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
+CFLAGS.NetBSD+=-DUSE_OPENPTY -DNO_TIOCREMOTE
+LDFLAGS.NetBSD+=-lutil
 
 SUBST_CLASSES+=		getline
 SUBST_STAGE.getline=	pre-build # no pre-configure with NO_CONFIGURE...
diff --git a/editors/jove/PLIST b/editors/jove/PLIST
index 8bcc370f4f1..6a185be5797 100644
--- a/editors/jove/PLIST
+++ b/editors/jove/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:50:23 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/09/06 14:52:39 christos Exp $
 bin/jove
 bin/teachjove
 lib/jove/recover
@@ -15,6 +15,7 @@ share/jove/jove.rc.sun-cmd
 share/jove/jove.rc.vt100
 share/jove/jove.rc.wyse
 share/jove/jove.rc.xterm
+share/jove/jove.rc.xterm-256color
 share/jove/jove.rc.z29
 share/jove/keychart.
 share/jove/keychart.3022
@@ -23,5 +24,6 @@ share/jove/keychart.sun-cmd
 share/jove/keychart.vt100
 share/jove/keychart.wyse
 share/jove/keychart.xterm
+share/jove/keychart.xterm-256color
 share/jove/keychart.z29
 share/jove/teach-jove
diff --git a/editors/jove/distinfo b/editors/jove/distinfo
index 5519a048065..e96b288420b 100644
--- a/editors/jove/distinfo
+++ b/editors/jove/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.9 2019/09/02 08:55:08 christos Exp $
+$NetBSD: distinfo,v 1.10 2019/09/06 14:52:39 christos Exp $
 
 SHA1 (jove4.16.0.74.tgz) = a9a9fbb07e314eae5427b5be93ca985fd3c29699
 RMD160 (jove4.16.0.74.tgz) = 5eb3eb4c0c4fe13b3296a37344e33c1c21abf931
 SHA512 (jove4.16.0.74.tgz) = 53d94fb4044efbac990efd8a2056bc60039cbbaf0b62fcbfc37a413393e3b838ea4813384d8f36c43a43a2a3052d2a72fd8f6f829ef4700bfeda717781a85337
 Size (jove4.16.0.74.tgz) = 468165 bytes
-SHA1 (patch-aa) = 19c7911af41061a92c89d3e78513d3faf4f09f5a
+SHA1 (patch-aa) = 5431a846a159f3805d505260ae4b797d7bb0561f
 SHA1 (patch-ac) = 98329cfcbbec9d56cbef7e1bee6685b6dd25e8ac
 SHA1 (patch-jove.h) = 38e85de80c772d90e90355e386f1eba243bd3191
+SHA1 (patch-proc.c) = 3d8f65a7977bbd8e5ebb4920e5efc07b2c98f1de
diff --git a/editors/jove/patches/patch-aa b/editors/jove/patches/patch-aa
index 54a4095f7ad..96179d30a56 100644
--- a/editors/jove/patches/patch-aa
+++ b/editors/jove/patches/patch-aa
@@ -1,13 +1,12 @@
-$NetBSD: patch-aa,v 1.6 2019/09/02 08:51:29 christos Exp $
+$NetBSD: patch-aa,v 1.7 2019/09/06 14:52:39 christos Exp $
 
 - configure for pkgsrc
 - honor PKGMANDIR
 - honor pkgsrc CFLAGS and LDFLAGS
-- add -DUSE_OPENPTY -lutil
 
---- Makefile.orig	2015-10-16 15:29:50.000000000 -0400
-+++ Makefile	2019-09-02 04:47:15.636767739 -0400
-@@ -21,12 +21,12 @@
+--- Makefile.orig	2005-09-30 22:14:41.000000000 +0000
++++ Makefile
+@@ -21,12 +21,12 @@ SHELL = /bin/sh
  # If they don't exist, this makefile will try to create the directories
  # LIBDIR and SHAREDIR.  All others must already exist.
  
@@ -23,7 +22,7 @@ $NetBSD: patch-aa,v 1.6 2019/09/02 08:51:29 christos Exp $
  MANEXT = 1
  
  # TMPDIR is where the tmp files get stored, usually /tmp, /var/tmp, or
-@@ -38,11 +38,11 @@
+@@ -38,11 +38,11 @@ MANEXT = 1
  # (in case the system startup salvages tempfiles by moving them,
  # which is probably a good idea).
  
@@ -37,7 +36,7 @@ $NetBSD: patch-aa,v 1.6 2019/09/02 08:51:29 christos Exp $
  
  # The install commands of BSD and System V differ in unpleasant ways:
  # -c: copy (BSD); -c dir: destination directory (SysV)
-@@ -53,15 +53,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.
  
@@ -56,34 +55,16 @@ $NetBSD: patch-aa,v 1.6 2019/09/02 08:51:29 christos Exp $
  #TINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 644
  #CYGWIN32: TINSTALL=install $(INSTALLFLAGS) -c -m 644
  
-@@ -137,7 +137,7 @@
- # Add -DUSE_EXIT if you're profiling or using purify (this causes Jove
- # to exit using exit(), instead of _exit()).
- 
--SYSDEFS = -DBSDPOSIX_STDC
-+SYSDEFS = -DBSDPOSIX_STDC -DUSE_OPENPTY
- 
- # Select optimization level (flags passed to compiling and linking steps).
- # On most systems: -g for debugging, -O for optimization.
-@@ -146,7 +146,7 @@
+@@ -146,7 +146,7 @@ SYSDEFS = -DBSDPOSIX_STDC
  # 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 -g
  
  # For making dependencies under BSD systems
  DEPENDFLAG = -M
-@@ -169,7 +169,7 @@
- #	FreeBSD 4.2: EXTRALIBS = -lutil
- #	FreeBSD 4.2, NetBSD 1.5, OpenBSD 2.x:  EXTRALIBS = -lutil
- 
--EXTRALIBS =
-+EXTRALIBS = -lutil
- 
- # Flags of linker (LDFLAGS)
- # Most systems do not need any flags.
-@@ -182,13 +182,13 @@
+@@ -181,13 +181,13 @@ EXTRALIBS =
  #	PDP-11 with separate I&D: -i
  #	PDP-11 without separate I&D: -n