From owner-svn-ports-all@freebsd.org  Wed Jan 18 20:28:05 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 94F69CB6FC1;
 Wed, 18 Jan 2017 20:28:05 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 63D711F49;
 Wed, 18 Jan 2017 20:28:05 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0IKS4wN021789;
 Wed, 18 Jan 2017 20:28:04 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0IKS4ff021788;
 Wed, 18 Jan 2017 20:28:04 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201701182028.v0IKS4ff021788@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Wed, 18 Jan 2017 20:28:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r431826 - head/sysutils/screen/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Jan 2017 20:28:05 -0000

Author: cy
Date: Wed Jan 18 20:28:04 2017
New Revision: 431826
URL: https://svnweb.freebsd.org/changeset/ports/431826

Log:
  Fix optional patch.
  
  Reported by:	ler

Modified:
  head/sysutils/screen/files/opt-showencoding

Modified: head/sysutils/screen/files/opt-showencoding
==============================================================================
--- head/sysutils/screen/files/opt-showencoding	Wed Jan 18 20:25:55 2017	(r431825)
+++ head/sysutils/screen/files/opt-showencoding	Wed Jan 18 20:28:04 2017	(r431826)
@@ -1,19 +1,9 @@
---- process.c.orig	2008-05-08 02:37:33.000000000 +0800
-+++ process.c	2008-05-08 02:37:49.000000000 +0800
-@@ -3422,6 +3422,7 @@
- 	    {
- 	      WinSwitchEncoding(fore, n);
- 	      ResetCharsets(fore);
-+	      RedisplayDisplays(0);
- 	    }
- 	  else if (i && display)
- 	    D_encoding  = n;
---- screen.c.orig	2008-05-08 02:37:22.000000000 +0800
-+++ screen.c	2008-05-20 20:34:37.000000000 +0800
-@@ -2584,6 +2584,18 @@
- 	    }
- 	  p += strlen(p) - 1;
- 	  break;
+--- screen.c.orig	2017-01-17 11:28:29.397404660 -0800
++++ screen.c	2017-01-18 12:24:40.855402000 -0800
+@@ -2760,6 +2760,18 @@
+       }
+       p += strlen(p) - 1;
+       break;
 +#ifdef ENCODINGS
 +	case 'e':
 +	  *p = 0;
@@ -26,6 +16,6 @@
 +	  p += strlen(p) - 1;
 +	  break;
 +#endif
- 	case '{':
-           {
- 	    char rbuf[128];
+ 
+     case '{':
+     {