update to screen 3.7.4 (from 3.7.2)

2 files changed, 41 insertions, 61 deletions

diff --git a/misc/screen/patches/patch-aa b/misc/screen/patches/patch-aa
index b28623063f7..f3eb3b952a2 100644
--- a/misc/screen/patches/patch-aa
+++ b/misc/screen/patches/patch-aa
@@ -1,29 +1,19 @@
-*** Makefile.in.bak	Mon Jan 16 17:59:20 1995
---- Makefile.in	Wed Jan 18 04:13:40 1995
-***************
-*** 20,26 ****
-  ETCSCREENRC = `sed < config.h -n -e '/define ETCSCREENRC/s/^.*"\([^"]*\)"/\1/p'`
-  
-  CC = @CC@
-- CFLAGS = -O
-  LDFLAGS =
-  LIBS = @LIBS@
-  
---- 20,25 ----
-***************
-*** 79,85 ****
-  
-  install: install_bin
-  	cd doc ; $(MAKE) install
-! 	-tic ${srcdir}/terminfo/screeninfo.src
-  # Better do this by hand. E.g. under RCS...
-  #	cat ${srcdir}/terminfo/screencap >> /etc/termcap
-  	@echo "termcap entry (${srcdir}/terminfo/screencap) should be installed manually."
---- 78,84 ----
-  
-  install: install_bin
-  	cd doc ; $(MAKE) install
-! #       -tic ${srcdir}/terminfo/screeninfo.src
-  # Better do this by hand. E.g. under RCS...
-  #	cat ${srcdir}/terminfo/screencap >> /etc/termcap
-  	@echo "termcap entry (${srcdir}/terminfo/screencap) should be installed manually."
+--- Makefile.in	Mon Jun 23 17:05:42 1997
++++ Makefile.in	Mon Nov  3 00:06:51 1997
+@@ -20,7 +20,6 @@
+ ETCSCREENRC = `sed < config.h -n -e '/define ETCSCREENRC/s/^.*"\([^"]*\)"/\1/p'`
+ 
+ CC = @CC@
+-CFLAGS = -O
+ LDFLAGS =
+ LIBS = @LIBS@
+ 
+@@ -79,7 +78,7 @@
+ 
+ install: installdirs install_bin
+ 	cd doc ; $(MAKE) install
+-	-tic ${srcdir}/terminfo/screeninfo.src
++#	-tic ${srcdir}/terminfo/screeninfo.src
+ # Better do this by hand. E.g. under RCS...
+ #	cat ${srcdir}/terminfo/screencap >> /etc/termcap
+ 	@echo "termcap entry (${srcdir}/terminfo/screencap) should be installed manually."
diff --git a/misc/screen/patches/patch-ab b/misc/screen/patches/patch-ab
index fc6b4815d2c..51ef0486e02 100644
--- a/misc/screen/patches/patch-ab
+++ b/misc/screen/patches/patch-ab
@@ -1,32 +1,22 @@
-*** doc/Makefile.in.orig	Mon Sep  2 06:54:27 1996
---- doc/Makefile.in	Mon Jun 16 15:24:12 1997
-***************
-*** 20,26 ****
-  	$(TEXI2DVI) $(srcdir)/screen.texinfo
-  
-  info screen.info: screen.texinfo
-! 	$(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info
-  
-  install: installdirs
-  	$(INSTALL_DATA) $(srcdir)/screen.1 $(mandir)/man1/screen.1
---- 20,27 ----
-  	$(TEXI2DVI) $(srcdir)/screen.texinfo
-  
-  info screen.info: screen.texinfo
-! 	rm -f ./screen.info*
-! 	$(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info
-  
-  install: installdirs
-  	$(INSTALL_DATA) $(srcdir)/screen.1 $(mandir)/man1/screen.1
-***************
-*** 28,36 ****
-  	-if test -f screen.info; then d=.; else d=$(srcdir); fi; \
-  	if test -f $$d/screen.info; then \
-  	for f in $$d/screen.info*; do $(INSTALL_DATA) $$f $(infodir);done; \
-- 	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-- 	  install-info --infodir=$(infodir) $$d/screen.info; \
-- 	else true; fi; \
-  	fi
-  
-  uninstall:
---- 29,34 ----
+--- doc/Makefile.in	Mon Jun 23 17:05:43 1997
++++ doc/Makefile.in	Mon Nov  3 00:07:58 1997
+@@ -20,7 +20,8 @@
+ 	$(TEXI2DVI) $(srcdir)/screen.texinfo
+ 
+ info screen.info: screen.texinfo
+-	$(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info
++	rm -f ./screen.info*
++	$(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info
+ 
+ install: installdirs
+ 	$(INSTALL_DATA) $(srcdir)/screen.1 $(mandir)/man1/screen.1
+@@ -28,9 +29,6 @@
+ 	-if test -f screen.info; then d=.; else d=$(srcdir); fi; \
+ 	if test -f $$d/screen.info; then \
+ 	for f in $$d/screen.info*; do $(INSTALL_DATA) $$f $(infodir);done; \
+-	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+-	  install-info --info-dir=$(infodir) $$d/screen.info; \
+-	else true; fi; \
+ 	fi
+ 
+ uninstall: