From owner-svn-ports-all@freebsd.org Mon Dec 30 16:58:14 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0CC851E3EE3; Mon, 30 Dec 2019 16:58:14 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47mkC96fzqz4BGj; Mon, 30 Dec 2019 16:58:13 +0000 (UTC) (envelope-from hrs@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DE60A4E09; Mon, 30 Dec 2019 16:58:13 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBUGwDgA016402; Mon, 30 Dec 2019 16:58:13 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBUGwBDu016392; Mon, 30 Dec 2019 16:58:11 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201912301658.xBUGwBDu016392@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Mon, 30 Dec 2019 16:58:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r521518 - head/japanese/kterm/files X-SVN-Group: ports-head X-SVN-Commit-Author: hrs X-SVN-Commit-Paths: head/japanese/kterm/files X-SVN-Commit-Revision: 521518 X-SVN-Commit-Repository: ports 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.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Dec 2019 16:58:14 -0000 Author: hrs Date: Mon Dec 30 16:58:11 2019 New Revision: 521518 URL: https://svnweb.freebsd.org/changeset/ports/521518 Log: Fixup patches by makepatch. No functional change. Modified: head/japanese/kterm/files/patch-Imakefile head/japanese/kterm/files/patch-KTerm.ad head/japanese/kterm/files/patch-VTPrsTbl.c head/japanese/kterm/files/patch-VTparse.h head/japanese/kterm/files/patch-charproc.c head/japanese/kterm/files/patch-main.c head/japanese/kterm/files/patch-menu.c head/japanese/kterm/files/patch-scrollbar.c head/japanese/kterm/files/patch-util.c Modified: head/japanese/kterm/files/patch-Imakefile ============================================================================== --- head/japanese/kterm/files/patch-Imakefile Mon Dec 30 16:58:10 2019 (r521517) +++ head/japanese/kterm/files/patch-Imakefile Mon Dec 30 16:58:11 2019 (r521518) @@ -1,6 +1,6 @@ ---- Imakefile.orig 2016-11-05 06:41:21.000000000 +0900 -+++ Imakefile 2016-11-05 07:43:25.595182000 +0900 -@@ -13,6 +13,16 @@ +--- Imakefile.orig 2016-11-04 21:41:21 UTC ++++ Imakefile +@@ -13,6 +13,16 @@ XCOMM $Id: Imakefile,v 6.3 1996/07/12 05:01:03 kagotan XPOLL_DEF = -DNO_XPOLL_H #endif @@ -17,7 +17,7 @@ /* * add -DWTMP and -DLASTLOG if you want them. */ -@@ -27,9 +37,12 @@ +@@ -27,9 +37,12 @@ XCOMM $Id: Imakefile,v 6.3 1996/07/12 05:01:03 kagotan OSMAJORVERSION = OSMajorVersion OSMINORVERSION = OSMinorVersion @@ -31,7 +31,7 @@ MISC_DEFINES = /* -DALLOWLOGFILEEXEC */ XKB_DEFINES = XkbClientDefines DEFINES = $(XKB_DEFINES) $(XPOLL_DEF) -DKTERM -DSTATUSLINE -DKEEPALIVE -DWALLPAPER -@@ -72,7 +85,7 @@ +@@ -72,7 +85,7 @@ XCOMM $Id: Imakefile,v 6.3 1996/07/12 05:01:03 kagotan #endif #endif Modified: head/japanese/kterm/files/patch-KTerm.ad ============================================================================== --- head/japanese/kterm/files/patch-KTerm.ad Mon Dec 30 16:58:10 2019 (r521517) +++ head/japanese/kterm/files/patch-KTerm.ad Mon Dec 30 16:58:11 2019 (r521518) @@ -1,6 +1,6 @@ ---- KTerm.ad.old Tue Feb 5 02:02:39 2002 -+++ KTerm.ad Mon Feb 4 21:54:16 2002 -@@ -51,37 +51,43 @@ +--- KTerm.ad.orig 2016-11-04 21:41:21 UTC ++++ KTerm.ad +@@ -52,37 +52,43 @@ KTerm.JoinSession:False *fontMenu.Label: VT Fonts *fontMenu*fontdefault*Label: Default @@ -69,7 +69,7 @@ *fontMenu*fontescape*Label: Escape Sequence *fontMenu*fontsel*Label: Selection !fontescape and fontsel overridden by application -@@ -131,5 +137,18 @@ +@@ -132,5 +138,18 @@ KTerm.JoinSession:False *tek4014*font3: 6x13 *tek4014*fontSmall: 6x10 Modified: head/japanese/kterm/files/patch-VTPrsTbl.c ============================================================================== --- head/japanese/kterm/files/patch-VTPrsTbl.c Mon Dec 30 16:58:10 2019 (r521517) +++ head/japanese/kterm/files/patch-VTPrsTbl.c Mon Dec 30 16:58:11 2019 (r521518) @@ -1,6 +1,6 @@ ---- VTPrsTbl.c.orig Wed Nov 13 23:56:22 2002 -+++ VTPrsTbl.c Wed Nov 13 01:10:07 2002 -@@ -490,7 +490,7 @@ +--- VTPrsTbl.c.orig 2016-11-04 21:41:21 UTC ++++ VTPrsTbl.c +@@ -490,7 +490,7 @@ CASE_GROUND_STATE, CASE_GROUND_STATE, CASE_GROUND_STATE, /* X Y Z [ */ Modified: head/japanese/kterm/files/patch-VTparse.h ============================================================================== --- head/japanese/kterm/files/patch-VTparse.h Mon Dec 30 16:58:10 2019 (r521517) +++ head/japanese/kterm/files/patch-VTparse.h Mon Dec 30 16:58:11 2019 (r521518) @@ -1,5 +1,5 @@ ---- VTparse.h.orig Wed Nov 13 23:56:22 2002 -+++ VTparse.h Wed Nov 13 01:07:07 2002 +--- VTparse.h.orig 2016-11-04 21:41:21 UTC ++++ VTparse.h @@ -118,3 +118,4 @@ #define CASE_SCS_STATE 77 #define CASE_GSET_VERSION_STATE 78 Modified: head/japanese/kterm/files/patch-charproc.c ============================================================================== --- head/japanese/kterm/files/patch-charproc.c Mon Dec 30 16:58:10 2019 (r521517) +++ head/japanese/kterm/files/patch-charproc.c Mon Dec 30 16:58:11 2019 (r521518) @@ -1,6 +1,6 @@ ---- charproc.c.orig Tue Jul 2 04:34:14 2002 -+++ charproc.c Tue Jul 2 04:34:29 2002 -@@ -102,8 +102,8 @@ +--- charproc.c.orig 2016-11-04 21:41:21 UTC ++++ charproc.c +@@ -103,8 +103,8 @@ extern jmp_buf VTend; extern XtAppContext app_con; extern Widget toplevel; extern void exit(); @@ -11,16 +11,16 @@ extern fd_set Select_mask; extern fd_set X_mask; extern fd_set pty_mask; -@@ -1837,6 +1837,12 @@ +@@ -1974,6 +1974,12 @@ static void VTparse() + } parsestate = groundtable; break; - ++ + case CASE_ECH: + /* ECH */ + ClearRightN(screen, param[0] < 1 ? 1 : param[0]); + parsestate = groundtable; + break; -+ + case CASE_IL: /* IL */ - if((row = param[0]) < 1) Modified: head/japanese/kterm/files/patch-main.c ============================================================================== --- head/japanese/kterm/files/patch-main.c Mon Dec 30 16:58:10 2019 (r521517) +++ head/japanese/kterm/files/patch-main.c Mon Dec 30 16:58:11 2019 (r521518) @@ -1,6 +1,6 @@ ---- main.c.orig 2013-01-20 15:06:09.000000000 +0900 -+++ main.c 2013-01-20 15:06:31.000000000 +0900 -@@ -211,7 +211,9 @@ +--- main.c.orig 2016-11-04 21:41:21 UTC ++++ main.c +@@ -211,7 +211,9 @@ static Bool IsPts = False; #undef FIOCLEX #undef FIONCLEX #define setpgrp2 setpgrp @@ -10,7 +10,7 @@ #include #endif #ifdef sco -@@ -237,7 +239,7 @@ +@@ -237,7 +239,7 @@ static Bool IsPts = False; #define HAS_UTMP_UT_HOST #endif #else /* } !SYSV { */ /* BSD systems */ @@ -19,7 +19,7 @@ #include #endif #include -@@ -294,7 +296,7 @@ +@@ -294,7 +296,7 @@ extern Time_t time (); #define ttyslot() 1 #endif /* apollo */ @@ -28,7 +28,7 @@ #include #define setutent setutxent #define getutent getutxent -@@ -320,6 +322,10 @@ +@@ -320,6 +322,10 @@ extern struct utmp *getutid __((struct utmp *_Id)); int Ptyfd; #endif /* PUCC_PTYD */ @@ -39,7 +39,7 @@ #ifdef sequent #define USE_GET_PSEUDOTTY #endif -@@ -1360,6 +1366,8 @@ +@@ -1360,6 +1366,8 @@ char **argv; d_tio.c_cc[VDISCARD] = CFLUSH; d_tio.c_cc[VWERASE] = CWERASE; d_tio.c_cc[VLNEXT] = CLNEXT; @@ -48,7 +48,7 @@ #endif /* } */ #ifdef TIOCSLTC /* { */ d_ltc.t_suspc = CSUSP; /* t_suspc */ -@@ -1408,6 +1416,8 @@ +@@ -1408,6 +1416,8 @@ char **argv; d_tio.c_cc[VQUIT] = CQUIT; /* '^\' */ d_tio.c_cc[VEOF] = CEOF; /* '^D' */ d_tio.c_cc[VEOL] = CEOL; /* '^@' */ @@ -57,7 +57,7 @@ #ifdef VSWTCH d_tio.c_cc[VSWTCH] = CSWTCH; /* usually '^Z' */ #endif -@@ -1722,11 +1732,11 @@ +@@ -1722,11 +1732,11 @@ char **argv; case 'u': case 'U': term->flags |= UTF8_KANJI; update_utf8mode(); @@ -70,7 +70,7 @@ } #endif /* KTERM_KANJIMODE */ -@@ -1973,6 +1983,10 @@ +@@ -1973,6 +1983,10 @@ char *name; get_pty (pty) int *pty; { @@ -81,7 +81,7 @@ #ifdef __osf__ int tty; return (openpty(pty, &tty, ttydev, NULL, NULL)); -@@ -2076,6 +2090,7 @@ +@@ -2076,6 +2090,7 @@ get_pty (pty) #endif /* __sgi or umips else */ #endif /* USE_GET_PSEUDOTTY else */ #endif /* ATT else */ Modified: head/japanese/kterm/files/patch-menu.c ============================================================================== --- head/japanese/kterm/files/patch-menu.c Mon Dec 30 16:58:10 2019 (r521517) +++ head/japanese/kterm/files/patch-menu.c Mon Dec 30 16:58:11 2019 (r521518) @@ -1,6 +1,6 @@ ---- menu.c.orig 2013-01-20 15:02:29.000000000 +0900 -+++ menu.c 2013-01-20 15:02:56.000000000 +0900 -@@ -843,6 +843,7 @@ +--- menu.c.orig 2016-11-04 21:41:21 UTC ++++ menu.c +@@ -843,6 +843,7 @@ static void do_jismode (gw, closure, data) update_eucmode(); update_sjismode(); update_utf8mode(); @@ -8,7 +8,7 @@ } -@@ -867,6 +868,7 @@ +@@ -867,6 +868,7 @@ static void do_eucmode (gw, closure, data) update_eucmode(); update_sjismode(); update_utf8mode(); @@ -16,7 +16,7 @@ } } -@@ -891,6 +893,7 @@ +@@ -891,6 +893,7 @@ static void do_sjismode (gw, closure, data) update_eucmode(); update_sjismode(); update_utf8mode(); Modified: head/japanese/kterm/files/patch-scrollbar.c ============================================================================== --- head/japanese/kterm/files/patch-scrollbar.c Mon Dec 30 16:58:10 2019 (r521517) +++ head/japanese/kterm/files/patch-scrollbar.c Mon Dec 30 16:58:11 2019 (r521518) @@ -1,6 +1,6 @@ ---- scrollbar.c.orig Thu Feb 13 02:06:51 2003 -+++ scrollbar.c Thu Feb 13 02:07:58 2003 -@@ -46,6 +46,7 @@ +--- scrollbar.c.orig 2016-11-04 21:41:21 UTC ++++ scrollbar.c +@@ -49,6 +49,7 @@ extern int BackgroundPixmapIsOn; static void ScrollTextTo(); static void ScrollTextUpDownBy(); @@ -8,7 +8,7 @@ /* resize the text window for a terminal screen, modifying the * appropriate WM_SIZE_HINTS and taking advantage of bit gravity. -@@ -535,6 +536,7 @@ +@@ -555,6 +556,7 @@ void HandleScrollForward (gw, event, params, nparams) XtermWidget w = (XtermWidget) gw; register TScreen *screen = &w->screen; @@ -16,7 +16,7 @@ ScrollTextUpDownBy (gw, (XtPointer) NULL, (XtPointer)params_to_pixels (screen, params, (int) *nparams)); return; -@@ -551,6 +553,7 @@ +@@ -571,6 +573,7 @@ void HandleScrollBack (gw, event, params, nparams) XtermWidget w = (XtermWidget) gw; register TScreen *screen = &w->screen; @@ -24,4 +24,3 @@ ScrollTextUpDownBy (gw, (XtPointer) NULL, (XtPointer)-params_to_pixels (screen, params, (int) *nparams)); return; - Modified: head/japanese/kterm/files/patch-util.c ============================================================================== --- head/japanese/kterm/files/patch-util.c Mon Dec 30 16:58:10 2019 (r521517) +++ head/japanese/kterm/files/patch-util.c Mon Dec 30 16:58:11 2019 (r521518) @@ -1,5 +1,5 @@ ---- util.c.orig Wed Nov 13 23:56:22 2002 -+++ util.c Wed Nov 13 23:53:41 2002 +--- util.c.orig 2016-11-04 21:41:21 UTC ++++ util.c @@ -36,6 +36,7 @@ #include @@ -8,7 +8,7 @@ static void horizontal_copy_area(); static void vertical_copy_area(); -@@ -706,6 +707,54 @@ +@@ -706,6 +707,54 @@ register TScreen *screen; /* * Clear last part of cursor's line, inclusive. */