Apply patches provided in pkg/9537 and pkg/9539 by Mathew Richardson.

3 files changed, 33 insertions, 31 deletions

diff --git a/x11/tvtwm/files/patch-sum b/x11/tvtwm/files/patch-sum
index db5ab660b94..157702a5e42 100644
--- a/x11/tvtwm/files/patch-sum
+++ b/x11/tvtwm/files/patch-sum
@@ -1,10 +1,10 @@
-$NetBSD: patch-sum,v 1.4 2000/02/05 15:58:29 wiz Exp $
+$NetBSD: patch-sum,v 1.5 2000/09/11 00:58:29 wiz Exp $
 
 MD5 (patch-aa) = d304c6366ef0dcb3ab1a2d00896d6fe9
 MD5 (patch-ab) = e65958b07272ba20302d0ffcb9501789
 MD5 (patch-ac) = 5cd534d6deaf3b8275e30828d2fa9926
 MD5 (patch-ad) = e8e46b5564cb6ec6ca7f2118a7c4fe95
-MD5 (patch-ae) = 919ca97ce10aa9634643398e4a5a5040
+MD5 (patch-ae) = b6ba9900002aec7938ff956557c0b0b7
 MD5 (patch-af) = 4d004d60e742e3b2d1fccfd0c59b9685
 MD5 (patch-ag) = 0981d9eefb055f116e1e5998fad865f5
 MD5 (patch-ah) = bf556d932567cef553b3b6da0c7e5a0d
@@ -13,7 +13,7 @@ MD5 (patch-aj) = db8741bca4c546a46582e5655ac09156
 MD5 (patch-ak) = 2813de3747b6a068888972692ba2eca9
 MD5 (patch-al) = 5584c4428fbc3c7e807aa08d0f997b07
 MD5 (patch-am) = afa1c255a98b25a56dccc1d21915273f
-MD5 (patch-an) = 8db5b2f9103c1ea94226b89e23b27041
+MD5 (patch-an) = 55b4c9645c12b5830948651fe3d1380e
 MD5 (patch-ao) = 7403853911ba0ca5ec3d176a52178b88
 MD5 (patch-ap) = 6dd668b2ec1ad4f225634556b0c9daaa
 MD5 (patch-aq) = a4a35ccafa1233f5e3e4c3e5388bb9c0
diff --git a/x11/tvtwm/patches/patch-ae b/x11/tvtwm/patches/patch-ae
index 196f1564b2b..6f5922a8641 100644
--- a/x11/tvtwm/patches/patch-ae
+++ b/x11/tvtwm/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2000/02/05 15:58:29 wiz Exp $
+$NetBSD: patch-ae,v 1.3 2000/09/11 00:58:30 wiz Exp $
 
 Index: add_window.c
 ===================================================================
@@ -60,7 +60,7 @@ diff -u -r1.1.1.1 -r1.2
 -	    !(short)(int) LookInList(Scr->DontIconify, tmp_win->full_name,
 -		&tmp_win->class);
 +	    (LookInList(Scr->DontIconify, tmp_win->full_name,
-+			&tmp_win->class) != NULL);
++			&tmp_win->class) == NULL);
      }
      tmp_win->iconify_by_unmapping |= 
 -	(short)(int) LookInList(Scr->IconifyByUn, tmp_win->full_name,
diff --git a/x11/tvtwm/patches/patch-an b/x11/tvtwm/patches/patch-an
index 2af03ea884d..0bdac21f6e5 100644
--- a/x11/tvtwm/patches/patch-an
+++ b/x11/tvtwm/patches/patch-an
@@ -1,13 +1,7 @@
-$NetBSD: patch-an,v 1.2 2000/02/05 15:58:30 wiz Exp $
+$NetBSD: patch-an,v 1.3 2000/09/11 00:58:30 wiz Exp $
 
-Index: menus.c
-===================================================================
-RCS file: /home/siren/src/tvtwm/menus.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -u -r1.1.1.1 -r1.2
---- menus.c	1999/08/08 05:46:53	1.1.1.1
-+++ menus.c	1999/08/08 05:56:53	1.2
+--- menus.c.orig	Thu Feb  9 21:09:18 1995
++++ menus.c
 @@ -191,6 +191,7 @@
  #include "gram.h"
  #include "screen.h"
@@ -328,7 +322,15 @@ diff -u -r1.1.1.1 -r1.2
      struct MenuItem *item;
  
      RootFunction = 0;
-@@ -2092,8 +1958,6 @@
+@@ -2049,6 +1915,7 @@
+     case F_SCROLLUP:
+     case F_SCROLLDOWN:
+     case F_SCROLLBACK:
++	FocusOnRoot();
+ 	ScrollDesktop(func, action);
+ 	break;
+ 
+@@ -2092,8 +1959,6 @@
  	    return TRUE;
  
  	if (Scr->VirtualDesktop) {
@@ -337,7 +339,7 @@ diff -u -r1.1.1.1 -r1.2
  	    if (tmp_win->sticky) {
  		if (Scr->StickyAbove) {
  		    XReparentWindow(dpy, tmp_win->frame, Scr->VirtualDesktop,
-@@ -2300,7 +2164,7 @@
+@@ -2300,7 +2165,7 @@
  	    return TRUE;
  
  	PopDownMenu();
@@ -346,7 +348,7 @@ diff -u -r1.1.1.1 -r1.2
  	MoveFunction = func;
  	if (MoveFunction == F_OPAQUEMOVE) {
  	    Real_OpaqueMove = Scr->OpaqueMove;
-@@ -2313,11 +2177,11 @@
+@@ -2313,11 +2178,11 @@
  
  	if (context == C_ICON && tmp_win->icon.w)
  	{
@@ -360,7 +362,7 @@ diff -u -r1.1.1.1 -r1.2
  	}
  #ifdef OLD_MOVE
  	if (DeferExecution(context, func, action, Scr->MoveCursor))
-@@ -3149,7 +3013,7 @@
+@@ -3149,7 +3014,7 @@
   ***********************************************************************
   */
  
@@ -369,7 +371,7 @@ diff -u -r1.1.1.1 -r1.2
  {
      XGrabPointer(dpy, Scr->Root, True,
  	ButtonPressMask | ButtonReleaseMask,
-@@ -3171,6 +3035,7 @@
+@@ -3171,6 +3036,7 @@
   ***********************************************************************
   */
  
@@ -377,7 +379,7 @@ diff -u -r1.1.1.1 -r1.2
  Deferrable(func)
  int func;
  {
-@@ -3205,7 +3070,7 @@
+@@ -3205,7 +3071,7 @@
      }
  }
  
@@ -386,7 +388,7 @@ diff -u -r1.1.1.1 -r1.2
  MenuRoot *root;
  {
      MenuItem *mitem;
-@@ -3321,7 +3186,7 @@
+@@ -3321,7 +3187,7 @@
      Scr->FocusRoot = TRUE;
  }
  
@@ -395,7 +397,7 @@ diff -u -r1.1.1.1 -r1.2
  TwmWindow *tmp_win;
  {
      TwmWindow *t;
-@@ -3396,7 +3261,7 @@
+@@ -3396,7 +3262,7 @@
  
  
  
@@ -404,7 +406,7 @@ diff -u -r1.1.1.1 -r1.2
  TwmWindow *tmp_win;
  int def_x, def_y;
  {
-@@ -3603,7 +3468,7 @@
+@@ -3603,7 +3469,7 @@
  
  
  
@@ -413,7 +415,7 @@ diff -u -r1.1.1.1 -r1.2
  TwmWindow *tmp_win;
  int state;
  {
-@@ -3647,7 +3512,7 @@
+@@ -3647,7 +3513,7 @@
  
  
  
@@ -422,7 +424,7 @@ diff -u -r1.1.1.1 -r1.2
      int n, inc;
  {
      Window dumwin;
-@@ -3691,7 +3556,7 @@
+@@ -3691,7 +3557,7 @@
   * BumpWindowColormap - rotate our internal copy of WM_COLORMAP_WINDOWS
   */
  
@@ -431,7 +433,7 @@ diff -u -r1.1.1.1 -r1.2
      TwmWindow *tmp;
      int inc;
  {
-@@ -3704,9 +3569,9 @@
+@@ -3704,9 +3570,9 @@
  	cwins = (ColormapWindow **) malloc(sizeof(ColormapWindow *)*
  					   tmp->cmaps.number_cwins);
  	if (cwins) {
@@ -444,7 +446,7 @@ diff -u -r1.1.1.1 -r1.2
  		for (i = tmp->cmaps.number_cwins; i-- > 0; )
  		    tmp->cmaps.cwins[i]->colormap->state = 0;
  	    }
-@@ -3737,7 +3602,7 @@
+@@ -3737,7 +3603,7 @@
  
  
  
@@ -453,7 +455,7 @@ diff -u -r1.1.1.1 -r1.2
  {
      SetMapStateProp (Scr->iconmgr.twm_win, WithdrawnState);
      UnmapFrame(Scr->iconmgr.twm_win);
-@@ -3749,7 +3614,7 @@
+@@ -3749,7 +3615,7 @@
  
  
  
@@ -462,7 +464,7 @@ diff -u -r1.1.1.1 -r1.2
      TwmWindow *tmp;
      Bool onoroff;
  {
-@@ -3768,7 +3633,7 @@
+@@ -3768,7 +3634,7 @@
  
  
  
@@ -471,7 +473,7 @@ diff -u -r1.1.1.1 -r1.2
      MenuRoot *menu;
  {
      MenuItem *item;
-@@ -3890,14 +3755,14 @@
+@@ -3890,14 +3756,14 @@
      XSendEvent (dpy, w, False, 0L, (XEvent *) &ev);
  }
  
@@ -488,7 +490,7 @@ diff -u -r1.1.1.1 -r1.2
      TwmWindow *tmp;
      Time timestamp;
  {
-@@ -3905,7 +3770,7 @@
+@@ -3905,7 +3771,7 @@
  }