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: 9bdc788616
This commit is contained in:
@@ -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:
|
||||
|
||||
@@ -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 '{':
|
||||
{
|
||||
Reference in New Issue
Block a user