ports/85821: japanese/emacs-emcws: compilation fails with new Xaw3d (same as ports/85508)

[NAKAJI Hiroyuki]

>Number:         85821
>Category:       ports
>Synopsis:       japanese/emacs-emcws: compilation fails with new Xaw3d (same as ports/85508)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 07 03:10:09 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     NAKAJI Hiroyuki
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD roddy.c3922.takamatsu-nct.ac.jp 7.0-CURRENT FreeBSD 7.0-CURRENT #29: Thu Jul 14 13:17:07 JST 2005 root at roddy.c3922.takamatsu-nct.ac.jp:/usr/obj/usr/src/sys/RODDY i386


>Description:
	The problem is as same as ports/85508.

>How-To-Repeat:
	# cd /usr/ports/japanese/emacs-emcws
	# make all

>Fix:

	Copy editors/emacs/files/patch-src:xterm.c to
japanese/emacs-emcws/files/.

diff -urN -x CVS /usr/ports/japanese/emacs-emcws/Makefile ./Makefile
--- /usr/ports/japanese/emacs-emcws/Makefile	Thu Jul 21 12:17:27 2005
+++ ./Makefile	Wed Sep  7 12:04:50 2005
@@ -7,7 +7,7 @@
 
 PORTNAME=	emcws
 PORTVERSION=	${EMACS_VER}
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	japanese editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
diff -urN -x CVS /usr/ports/japanese/emacs-emcws/files/patch-src:xterm.c ./files/patch-src:xterm.c
--- /usr/ports/japanese/emacs-emcws/files/patch-src:xterm.c	Thu Jan  1 09:00:00 1970
+++ ./files/patch-src:xterm.c	Wed Sep  7 11:53:37 2005
@@ -0,0 +1,42 @@
+--- src/xterm.c.orig	Tue Oct 15 23:21:45 2002
++++ src/xterm.c	Wed Aug 31 09:18:48 2005
+@@ -118,8 +118,6 @@
+ #ifdef HAVE_XAW3D
+ #include <X11/Xaw3d/Simple.h>
+ #include <X11/Xaw3d/Scrollbar.h>
+-#define ARROW_SCROLLBAR
+-#include <X11/Xaw3d/ScrollbarP.h>
+ #else /* !HAVE_XAW3D */
+ #include <X11/Xaw/Simple.h>
+ #include <X11/Xaw/Scrollbar.h>
+@@ -8863,30 +8861,12 @@
+ 	  XawScrollbarSetThumb (widget, top, shown);
+ 	else
+ 	  {
+-#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
+ 	  }
+       }
+   }



>Release-Note:
>Audit-Trail:
>Unformatted: