svn commit: r352735 - in head/sysutils/screen: . files
Cy Schubert
cy at FreeBSD.org
Thu May 1 06:54:48 UTC 2014
Author: cy
Date: Thu May 1 06:54:47 2014
New Revision: 352735
URL: http://svnweb.freebsd.org/changeset/ports/352735
QAT: https://qat.redports.org/buildarchive/r352735/
Log:
Fix colour in hardstatus when color between two %= (GNU screen bug #42247).
Options CJK and HOSTINLOCKED are in the base screen, remove them.
Added:
head/sysutils/screen/files/patch-screen.c (contents, props changed)
Deleted:
head/sysutils/screen/files/opt-cjkwidth
head/sysutils/screen/files/opt-hostinlocked
Modified:
head/sysutils/screen/Makefile
Modified: head/sysutils/screen/Makefile
==============================================================================
--- head/sysutils/screen/Makefile Thu May 1 05:26:49 2014 (r352734)
+++ head/sysutils/screen/Makefile Thu May 1 06:54:47 2014 (r352735)
@@ -3,6 +3,7 @@
PORTNAME= screen
PORTVERSION= 4.2.1
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://ftp.gnu.org/gnu/screen/ \
ftp://ftp.gnu.org/gnu/screen/ \
@@ -17,14 +18,12 @@ MASTER_SITES= http://ftp.gnu.org/gnu/scr
MAINTAINER= cy at FreeBSD.org
COMMENT= Multi-screen window manager
-OPTIONS_DEFINE= CJK INFO MAN NETHACK XTERM_256 HOSTINLOCKED SHOWENC
+OPTIONS_DEFINE= INFO MAN NETHACK XTERM_256 SHOWENC
OPTIONS_DEFAULT= INFO MAN NETHACK XTERM_256
-CJK_DESC= Treat CJK ambiguous characters as full width
INFO_DESC= Build and install info documentation
MAN_DESC= Build and install man pages
NETHACK_DESC= Enable nethack-style messages
XTERM_256_DESC= Enable support for 256 colour xterm
-HOSTINLOCKED_DESC= Print user at host in locked message
SHOWENC_DESC= Show encoding on the status line
OPTIONS_SUB=
@@ -60,15 +59,6 @@ CFLAGS+= -DCOLORS256
CFLAGS+= -DNONETHACK
.endif
-# treat CJK ambiguous characters as full width via option "cjkwidth"
-.if ${PORT_OPTIONS:MCJK}
-EXTRA_PATCHES+= ${FILESDIR}/opt-cjkwidth
-.endif
-
-.if ${PORT_OPTIONS:MHOSTINLOCKED}
-EXTRA_PATCHES+= ${FILESDIR}/opt-hostinlocked
-.endif
-
# show encoding on the status line via option "showenc"
.if ${PORT_OPTIONS:MSHOWENC}
EXTRA_PATCHES+= ${FILESDIR}/opt-showencoding
Added: head/sysutils/screen/files/patch-screen.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/screen/files/patch-screen.c Thu May 1 06:54:47 2014 (r352735)
@@ -0,0 +1,20 @@
+--- screen.c.orig 2014-04-26 09:22:09.000000000 -0700
++++ screen.c 2014-04-30 23:34:47.613803805 -0700
+@@ -2257,7 +2257,7 @@
+ r = winmsg_numrend;
+ while (p >= buf)
+ {
+- if (r && *p != 127 && p - buf == winmsg_rendpos[r - 1])
++ if (r && p - buf == winmsg_rendpos[r - 1])
+ {
+ winmsg_rendpos[--r] = pn - buf;
+ continue;
+@@ -2271,8 +2271,6 @@
+ while (i-- > 0)
+ *pn-- = ' ';
+ numpad--;
+- if (r && p - buf == winmsg_rendpos[r - 1])
+- winmsg_rendpos[--r] = pn - buf;
+ }
+ }
+ return pn2;
More information about the svn-ports-head
mailing list