Fix some 64-bit problems in x11 code.

Bump PKGREVISION.

7 files changed, 203 insertions, 11 deletions

diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index 5a44e43d493..2f290e5a67e 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2008/03/06 12:34:44 obache Exp $
+# $NetBSD: Makefile,v 1.34 2008/04/05 21:29:14 kristerw Exp $
 
 DISTNAME=	emacs-20.7
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	editors
 MASTER_SITES=	http://ftp.gnu.org/pub/old-gnu/emacs/	\
 		ftp://ftp.gnu.org/pub/old-gnu/emacs
diff --git a/editors/emacs20/distinfo b/editors/emacs20/distinfo
index 84a1447eaec..3c608488f04 100644
--- a/editors/emacs20/distinfo
+++ b/editors/emacs20/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2008/01/09 18:27:35 kristerw Exp $
+$NetBSD: distinfo,v 1.12 2008/04/05 21:29:14 kristerw Exp $
 
 SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452
 RMD160 (emacs-20.7.tar.gz) = f3b8ea8d6f6ad52ccdd7ca74c84e87a7409fc270
@@ -35,7 +35,10 @@ SHA1 (patch-au) = 9d416d2dcd2e5a2ef3a73f0841196ac86efea3c0
 SHA1 (patch-ax) = 572eed7ad29d0b2a2e82e53c1acdfab39c12b1b2
 SHA1 (patch-ay) = bc91b0759ce0b3f3c1be542c043748472cb8d8fc
 SHA1 (patch-az) = 643f927b726d825238b14cd6a4b70e3a0722104e
+SHA1 (patch-ba) = 9832a8c5afecc1f0b0805c78142afa62a31bc24f
+SHA1 (patch-bb) = 2b5df93c18a2baabed0d2a878242e1fa30647167
 SHA1 (patch-bc) = ce6240227e8a7af506c908e0c199e17ce73d7f27
+SHA1 (patch-bd) = 01c4490ec36fec09148bcb9c76ba6c8de509c346
 SHA1 (patch-bf) = 8a55b30ec5992e0408b3693b4f31f7d9e931d731
 SHA1 (patch-bg) = f76d459f0fbcadb0b7df4991c1d5d244accc0748
 SHA1 (patch-bh) = f59b14cc43d5977a5d80d5d1ab4e246df394d86a
@@ -46,10 +49,10 @@ SHA1 (patch-bl) = f2cd03713d7cdb6cb41119569031249d7d708b13
 SHA1 (patch-bm) = 148b3148587a31ec7a0674c5c1a359e8f09d952f
 SHA1 (patch-bn) = 247c04ae1accf3bc6b07b22767eb3cf2cdb55013
 SHA1 (patch-bo) = f9b8b73af91a445dbf50f9e862b84c7abc2b730e
-SHA1 (patch-bp) = bb7b824378b25ab1229fe21bd888170f023a774c
+SHA1 (patch-bp) = 9091134cf50e17ce58976c3193666e716345a124
 SHA1 (patch-bq) = 5d8cf584bb6d83df975a339c262902da1d35776e
 SHA1 (patch-br) = c14d33970609c65a22944514bc5b133d024b062e
-SHA1 (patch-bs) = bc8d0b83efd20cf67e657b955def8f3ce329a687
+SHA1 (patch-bs) = 7cf879039f93d92c2cc43a9cce74dac114f622aa
 SHA1 (patch-bt) = 29c8049c6dcd780190774173a1c64c7009685c92
 SHA1 (patch-bu) = 99374b0ca8402f6971c5a56c4e2ed0bc9ba8667e
 SHA1 (patch-bv) = fa51f5ad5152c344e83f056a3c565129a9b7a1ef
diff --git a/editors/emacs20/patches/patch-ba b/editors/emacs20/patches/patch-ba
new file mode 100644
index 00000000000..014dafdeba1
--- /dev/null
+++ b/editors/emacs20/patches/patch-ba
@@ -0,0 +1,49 @@
+$NetBSD: patch-ba,v 1.1 2008/04/05 21:29:14 kristerw Exp $
+
+--- src/widget.c.orig	2008-04-02 22:40:30.000000000 +0200
++++ src/widget.c	2008-04-04 21:13:56.000000000 +0200
+@@ -464,7 +464,7 @@
+ 	len = strlen (shell_position) + 1;
+ 	tem = (char *) xmalloc (len);
+ 	strncpy (tem, shell_position, len);
+-	XtVaSetValues (wmshell, XtNgeometry, tem, 0);
++	XtVaSetValues (wmshell, XtNgeometry, tem, NULL);
+       }
+     else if (flags & (WidthValue | HeightValue))
+       {
+@@ -474,7 +474,7 @@
+ 	len = strlen (shell_position) + 1;
+ 	tem = (char *) xmalloc (len);
+ 	strncpy (tem, shell_position, len);
+-	XtVaSetValues (wmshell, XtNgeometry, tem, 0);
++	XtVaSetValues (wmshell, XtNgeometry, tem, NULL);
+       }
+ 
+     /* If the geometry spec we're using has W/H components, mark the size
+@@ -484,7 +484,7 @@
+ 
+     /* Also assign the iconic status of the frame to the Shell, so that
+        the WM sees it. */
+-    XtVaSetValues (wmshell, XtNiconic, ew->emacs_frame.iconic, 0);
++    XtVaSetValues (wmshell, XtNiconic, ew->emacs_frame.iconic, NULL);
+ #endif /* 0 */
+   }
+ }
+@@ -538,7 +538,7 @@
+ 		 XtNheightInc, ch,
+ 		 XtNminWidth, base_width + min_cols * cw,
+ 		 XtNminHeight, base_height + min_rows * ch,
+-		 0);
++		 NULL);
+ }
+ 
+ static void
+@@ -854,7 +854,7 @@
+   if (cur->emacs_frame.iconic != new->emacs_frame.iconic)
+     {
+       Widget wmshell = get_wm_shell ((Widget) cur);
+-      XtVaSetValues (wmshell, XtNiconic, new->emacs_frame.iconic, 0);
++      XtVaSetValues (wmshell, XtNiconic, new->emacs_frame.iconic, NULL);
+     }
+ 
+   return needs_a_refresh;
diff --git a/editors/emacs20/patches/patch-bb b/editors/emacs20/patches/patch-bb
new file mode 100644
index 00000000000..48ffd04e78f
--- /dev/null
+++ b/editors/emacs20/patches/patch-bb
@@ -0,0 +1,22 @@
+$NetBSD: patch-bb,v 1.1 2008/04/05 21:29:14 kristerw Exp $
+
+--- lwlib/lwlib-Xaw.c.orig	1996-01-15 10:17:38.000000000 +0100
++++ lwlib/lwlib-Xaw.c	2008-04-04 21:35:59.000000000 +0200
+@@ -84,7 +84,7 @@
+ 	  XtVaSetValues (widget,
+ 			 XtNlength, data->scrollbar_height,
+ 			 XtNthickness, width,
+-			 0);
++			 NULL);
+ 	}
+ 
+       /*
+@@ -611,7 +611,7 @@
+ 
+   /* We have to force the border width to be 0 otherwise the
+      geometry manager likes to start looping for awhile... */
+-  XtVaSetValues (scrollbar, XtNborderWidth, 0, 0);
++  XtVaSetValues (scrollbar, XtNborderWidth, 0, NULL);
+ 
+   XtRemoveAllCallbacks (scrollbar, "jumpProc");
+   XtRemoveAllCallbacks (scrollbar, "scrollProc");
diff --git a/editors/emacs20/patches/patch-bd b/editors/emacs20/patches/patch-bd
new file mode 100644
index 00000000000..078e6580380
--- /dev/null
+++ b/editors/emacs20/patches/patch-bd
@@ -0,0 +1,100 @@
+$NetBSD: patch-bd,v 1.1 2008/04/05 21:29:14 kristerw Exp $
+
+--- lwlib/lwlib-Xm.c.orig	1997-12-21 00:02:56.000000000 +0100
++++ lwlib/lwlib-Xm.c	2008-04-04 21:36:10.000000000 +0200
+@@ -267,7 +267,7 @@
+      Widget widget;
+      widget_value* val;
+ {
+-  XtVaSetValues (widget, XmNalignment, XmALIGNMENT_CENTER, 0);
++  XtVaSetValues (widget, XmNalignment, XmALIGNMENT_CENTER, NULL);
+   XtRemoveAllCallbacks (widget, XmNactivateCallback);
+   XtAddCallback (widget, XmNactivateCallback, xm_generic_callback, instance);
+ }
+@@ -295,7 +295,7 @@
+   XtAddCallback (widget, XmNvalueChangedCallback,
+ 		 xm_internal_update_other_instances, instance);
+   XtVaSetValues (widget, XmNset, val->selected,
+-		 XmNalignment, XmALIGNMENT_BEGINNING, 0);
++		 XmNalignment, XmALIGNMENT_BEGINNING, NULL);
+ }
+ 
+ static void
+@@ -323,11 +323,11 @@
+       toggle = XtNameToWidget (widget, cur->value);
+       if (toggle)
+ 	{
+-	  XtVaSetValues (toggle, XmNsensitive, cur->enabled, 0);
++	  XtVaSetValues (toggle, XmNsensitive, cur->enabled, NULL);
+ 	  if (!val->value && cur->selected)
+-	    XtVaSetValues (toggle, XmNset, cur->selected, 0);
++	    XtVaSetValues (toggle, XmNset, cur->selected, NULL);
+ 	  if (val->value && strcmp (val->value, cur->value))
+-	    XtVaSetValues (toggle, XmNset, False, 0);
++	    XtVaSetValues (toggle, XmNset, False, NULL);
+ 	}
+     }
+ 
+@@ -336,7 +336,7 @@
+     {
+       toggle = XtNameToWidget (widget, val->value);
+       if (toggle)
+-	XtVaSetValues (toggle, XmNset, True, 0);
++	XtVaSetValues (toggle, XmNset, True, NULL);
+     }
+ }
+ 
+@@ -491,7 +491,7 @@
+   XtVaSetValues (widget,
+ 		 XmNsensitive, val->enabled,
+ 		 XmNuserData, val->call_data,
+-		 0);
++		 NULL);
+ 
+   /* update the menu button as a label. */
+   if (val->this_one_change >= VISIBLE_CHANGE)
+@@ -690,7 +690,7 @@
+   XtVaSetValues (widget,
+ 		 XmNsensitive, val->enabled,
+ 		 XmNuserData, val->call_data,
+-		 0);
++		 NULL);
+   
+   /* Common to all label like widgets */
+   if (XtIsSubclass (widget, xmLabelWidgetClass))
+@@ -1194,7 +1194,7 @@
+   if (y < 0)
+     y = 0;
+ 
+-  XtVaSetValues (widget, XtNx, x, XtNy, y, 0);
++  XtVaSetValues (widget, XtNx, x, XtNy, y, NULL);
+ }
+ 
+ static Widget
+@@ -1225,7 +1225,7 @@
+       /* shrink the separator label back to their original size */
+       separator = XtNameToWidget (widget, "*separator_button");
+       if (separator)
+-	XtVaSetValues (separator, XtNwidth, 5, XtNheight, 5, 0);
++	XtVaSetValues (separator, XtNwidth, 5, XtNheight, 5, NULL);
+ 
+       /* Center the dialog in its parent */
+       recenter_widget (widget);
+@@ -1561,7 +1561,7 @@
+       else if (event->xbutton.state & Button3Mask) trans = "<Btn3Down>";
+       else if (event->xbutton.state & Button2Mask) trans = "<Btn2Down>";
+       else if (event->xbutton.state & Button1Mask) trans = "<Btn1Down>";
+-      if (trans) XtVaSetValues (widget, XmNmenuPost, trans, 0);
++      if (trans) XtVaSetValues (widget, XmNmenuPost, trans, NULL);
+       XmMenuPosition (widget, (XButtonPressedEvent *) event);
+     }
+   XtManageChild (widget);
+@@ -1574,7 +1574,7 @@
+   short width;
+   short height;
+   XtVaGetValues (w, XmNwidth, &width, XmNheight, &height, 0);
+-  XtVaSetValues (w, XmNminWidth, width, XmNminHeight, height, 0);
++  XtVaSetValues (w, XmNminWidth, width, XmNminHeight, height, NULL);
+ }
+ 
+ void
diff --git a/editors/emacs20/patches/patch-bp b/editors/emacs20/patches/patch-bp
index 64615ff4f96..3bf3b6e5b56 100644
--- a/editors/emacs20/patches/patch-bp
+++ b/editors/emacs20/patches/patch-bp
@@ -1,7 +1,7 @@
-$NetBSD: patch-bp,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+$NetBSD: patch-bp,v 1.2 2008/04/05 21:29:14 kristerw Exp $
 
---- lwlib/lwlib.c.orig	Mon Apr  6 10:24:33 1998
-+++ lwlib/lwlib.c	Fri Jul 19 02:38:04 2002
+--- lwlib/lwlib.c.orig	1998-04-06 12:24:33.000000000 +0200
++++ lwlib/lwlib.c	2008-04-04 21:33:16.000000000 +0200
 @@ -29,10 +29,8 @@
  #include "lwlib-utils.h"
  #include <X11/StringDefs.h>
@@ -13,3 +13,12 @@ $NetBSD: patch-bp,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  extern long *xmalloc();
  
  #if defined (USE_LUCID)
+@@ -1302,7 +1300,7 @@
+   XtVaSetValues (widget_to_invert,
+ 		 XtNforeground, background,
+ 		 XtNbackground, foreground,
+-		 0);
++		 NULL);
+ }
+ 
+ void
diff --git a/editors/emacs20/patches/patch-bs b/editors/emacs20/patches/patch-bs
index f0d3ac44e8d..4ec6b429805 100644
--- a/editors/emacs20/patches/patch-bs
+++ b/editors/emacs20/patches/patch-bs
@@ -1,7 +1,7 @@
-$NetBSD: patch-bs,v 1.1 2004/03/25 22:13:34 kristerw Exp $
+$NetBSD: patch-bs,v 1.2 2008/04/05 21:29:14 kristerw Exp $
 
---- src/xmenu.c.orig	2004-03-25 22:06:49.000000000 +0100
-+++ src/xmenu.c	2004-03-25 22:07:45.000000000 +0100
+--- src/xmenu.c.orig	1998-12-28 23:15:47.000000000 +0100
++++ src/xmenu.c	2008-04-02 22:40:18.000000000 +0200
 @@ -35,6 +35,7 @@
  #include <config.h>
  
@@ -10,3 +10,12 @@ $NetBSD: patch-bs,v 1.1 2004/03/25 22:13:34 kristerw Exp $
  #include "lisp.h"
  #include "termhooks.h"
  #include "frame.h"
+@@ -1500,7 +1501,7 @@
+     {
+       XtManageChild (x->menubar_widget);
+       XtMapWidget (x->menubar_widget);
+-      XtVaSetValues (x->menubar_widget, XtNmappedWhenManaged, 1, 0);
++      XtVaSetValues (x->menubar_widget, XtNmappedWhenManaged, 1, NULL);
+     }
+ 
+   /* Re-manage the text-area widget, and then thrash the sizes.  */