# HG changeset patch
# User Lukas Rovensky <Lukas.Rovensky@oracle.com>
# Date 1489050619 28800
# Node ID 9db1925bee3cff90a9ba4d0f30ad0f93dc1c8e52
# Parent  7e015829bd8d7f04688c2fb4a1080b2a9cfbbe25
25414933 Upgrade screen to version 4.5.1
25637014 problem in UTILITY/SCREEN

diff -r 7e015829bd8d -r 9db1925bee3c components/screen/Makefile
--- a/components/screen/Makefile	Wed Mar 08 04:08:46 2017 -0800
+++ b/components/screen/Makefile	Thu Mar 09 01:10:19 2017 -0800
@@ -26,12 +26,12 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		screen
-COMPONENT_VERSION=	4.4.0
+COMPONENT_VERSION=	4.5.1
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:ef722a54759a3bf23aad272bbf33c414c1078cad6bcd982fada93c0d7917218b
+    sha256:97db2114dd963b016cd4ded34831955dcbe3251e5eee45ac2606e67e9f097b2d
 COMPONENT_ANITYA_ID=	4772
 
-TPNO=			29565	
+TPNO=			34130	
 
 # Enable adiheap and adistack security extensions
 ADIHEAP_MODE =	$(ADIHEAP_ENABLE)
diff -r 7e015829bd8d -r 9db1925bee3c components/screen/patches/screen.texinfo.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/screen/patches/screen.texinfo.patch	Thu Mar 09 01:10:19 2017 -0800
@@ -0,0 +1,17 @@
+Home brewed.
+This is to fix info syntax for two e-mail addresses.
+Will be sent up-stream.
+
+--- screen-4.5.1/doc/screen.texinfo.orig	2017-03-09 00:59:43.320053794 -0800
++++ screen-4.5.1/doc/screen.texinfo	2017-03-09 01:00:16.444567600 -0800
+@@ -5796,8 +5796,8 @@
+ ============
+ 
+ @example
+-     Thomas Renninger <treen@suse.com>,
+-     Axel Beckert <abe@deuxchevaux.org>,
++     Thomas Renninger <treen@@suse.com>,
++     Axel Beckert <abe@@deuxchevaux.org>,
+      Ken Beal <kbeal@@amber.ssd.csd.harris.com>,
+      Rudolf Koenig <rfkoenig@@informatik.uni-erlangen.de>,
+      Toerless Eckert <eckert@@informatik.uni-erlangen.de>,
diff -r 7e015829bd8d -r 9db1925bee3c components/screen/patches/socket.patch
--- a/components/screen/patches/socket.patch	Wed Mar 08 04:08:46 2017 -0800
+++ b/components/screen/patches/socket.patch	Thu Mar 09 01:10:19 2017 -0800
@@ -1,3 +1,7 @@
+Home brewed.
+Created for the FOSS evaluation project to get screen built also on S11.3 FCS.
+Will not be sent upstream.
+
 --- screen-4.3.1/socket.c.~1~	2015-09-28 13:59:32.049275138 -0700
 +++ screen-4.3.1/socket.c	2015-09-28 13:59:47.162984046 -0700
 @@ -30,6 +30,9 @@
diff -r 7e015829bd8d -r 9db1925bee3c components/screen/patches/terminfo.patch
--- a/components/screen/patches/terminfo.patch	Wed Mar 08 04:08:46 2017 -0800
+++ b/components/screen/patches/terminfo.patch	Thu Mar 09 01:10:19 2017 -0800
@@ -1,17 +1,18 @@
 Home brewed patch.
 Use Solaris specific location of terminfo.
-
---- screen-4.3.1/Makefile.in.orig	Wed Jul 15 02:38:36 2015
-+++ screen-4.3.1/Makefile.in	Wed Jul 15 02:38:56 2015
+Will not be sent upstream.
+ 
+--- screen-4.5.1/Makefile.in.orig	2017-03-08 12:14:04.424391216 -0800
++++ screen-4.5.1/Makefile.in	2017-03-08 12:19:09.486329848 -0800
 @@ -96,9 +96,10 @@
  ###############################################################################
  install: installdirs install_bin
  	cd doc ; $(MAKE) install
--	-if [ -d /usr/lib/terminfo ]; then \
+-	-if [ -d $(DESTDIR)/usr/lib/terminfo ]; then \
 +	-if [ -d $(DESTDIR)/usr/share/lib/terminfo ]; then \
-+		TERMINFO=$(DESTDIR)/usr/share/lib/terminfo \
++	  TERMINFO=$(DESTDIR)/usr/share/lib/terminfo \
  		PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \
--		chmod 644 /usr/lib/terminfo/s/screen*; \
+-		chmod 644 $(DESTDIR)/usr/lib/terminfo/s/screen*; \
 +		chmod 644 $(DESTDIR)/usr/share/lib/terminfo/s/screen*; \
  	fi
  # Better do this by hand. E.g. under RCS...