git: f65342707d22 - main - sysutils/screen: Fix SHOWENC build

The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f65342707d226f3685e96f5463ea14921dc27f71

commit f65342707d226f3685e96f5463ea14921dc27f71
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2022-03-18 13:05:49 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2022-03-18 13:05:49 +0000

    sysutils/screen: Fix SHOWENC build
    
    The SHOWENC optional patch is now included in screen 4.9.0. We simply
    enable the option now and build. The patch is redundant.
    
    PR:             262641
    Reported by:    Trond.Endrestol@ximalas.info, sunpoet, many others
    Fixes:          9bdc78861688
---
 sysutils/screen/Makefile               |  2 +-
 sysutils/screen/files/opt-showencoding | 21 ---------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile
index e0cd0e7b650a..70c2698736ad 100644
--- a/sysutils/screen/Makefile
+++ b/sysutils/screen/Makefile
@@ -75,7 +75,7 @@ CFLAGS+=	-DNONETHACK
 
 # show encoding on the status line via option "showenc"
 .if ${PORT_OPTIONS:MSHOWENC}
-EXTRA_PATCHES+=	${FILESDIR}/opt-showencoding
+CFLAGS+=	-DENCODINGS
 .endif
 
 post-patch:
diff --git a/sysutils/screen/files/opt-showencoding b/sysutils/screen/files/opt-showencoding
deleted file mode 100644
index b931f0d67292..000000000000
--- a/sysutils/screen/files/opt-showencoding
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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;
-+	  D_encoding = nwin_options.encoding > 0 ? nwin_options.encoding : 0;
-+	  if (win && win->w_encoding)
-+	    {
-+	      *p++ = ' ';
-+	      strcpy(p, EncodingName(win->w_encoding));
-+	    }
-+	  p += strlen(p) - 1;
-+	  break;
-+#endif
- 
-     case '{':
-     {