emacs doesn't build with 6-current and completely updated ports

[Sean McNeil]

On Mon, 2005-09-05 at 06:12 +0000, FUJISHIMA Satsuki wrote:
> At Sun, 04 Sep 2005 23:00:26 -0700,
> Sean McNeil wrote:
> > 
> > On Mon, 2005-09-05 at 05:25 +0000, FUJISHIMA Satsuki wrote:
> > > fix obtained from: darwinports
> > 
> > Thanks, but sorry it is no help.
> > 
> > The problem is that there is no scroll_mode in Xaw3d-1.5E_1.  The patch
> > you provided still uses it:
> > 
> > +             sb->scrollbar.scroll_mode = scroll_mode;
> 
> That is odd. That line is ifdef'd out 
> #if defined(HAVE_XAW3D) && defined(XAW_ARROW_SCROLLBARS)
> and Xaw3d-1.5E_1 does not define XAW_ARROW_SCROLLBARS.

I see...

but your patch does nothing to effect the code already in xterm.c (at
least when I applied it I got the same errors).  The code in question
is:

#ifdef HAVE_XAW3D
	    ScrollbarWidget sb = (ScrollbarWidget) widget;
	    int scroll_mode = 0;
	    
	    /* `scroll_mode' only exists with Xaw3d + ARROW_SCROLLBAR.  */
	    if (xaw3d_arrow_scroll)
	      {
		/* Xaw3d stupidly ignores resize requests while dragging
		   so we have to make it believe it's not in dragging mode.  */
		scroll_mode = sb->scrollbar.scroll_mode;
		if (scroll_mode == 2)
		  sb->scrollbar.scroll_mode = 0;
	      }
#endif
	    /* Try to make the scrolling a tad smoother.  */
	    if (!xaw3d_pick_top)
	      shown = min (shown, old_shown);
	    
	    XawScrollbarSetThumb (widget, top, shown);
	    
#ifdef HAVE_XAW3D
	    if (xaw3d_arrow_scroll && scroll_mode == 2)
	      sb->scrollbar.scroll_mode = scroll_mode;
#endif

The following patch does work for me:

--- src/xterm.c.orig	Tue Oct 15 07:21:45 2002
+++ src/xterm.c	Mon Sep  5 08:57:38 2005
@@ -8863,7 +8863,7 @@
 	  XawScrollbarSetThumb (widget, top, shown);
 	else
 	  {
-#ifdef HAVE_XAW3D
+#if defined(HAVE_XAW3D) && defined(XAW_ARROW_SCROLLBARS)
 	    ScrollbarWidget sb = (ScrollbarWidget) widget;
 	    int scroll_mode = 0;
 	    
@@ -8883,7 +8883,7 @@
 	    
 	    XawScrollbarSetThumb (widget, top, shown);
 	    
-#ifdef HAVE_XAW3D
+#if defined(HAVE_XAW3D) && defined(XAW_ARROW_SCROLLBARS)
 	    if (xaw3d_arrow_scroll && scroll_mode == 2)
 	      sb->scrollbar.scroll_mode = scroll_mode;
 #endif