pkg/38089: wm/mlvwm

[makoto%ki.nu@localhost]

>Number:         38089
>Category:       pkg
>Synopsis:       can't build with // comments
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Feb 23 02:15:00 +0000 2008
>Originator:     Makoto Fujiwara
>Release:        NetBSD 4.0
>Organization:
KINU Corporation
        
>Environment:
        
        
System: NetBSD trapani.ki.nu 4.0 NetBSD 4.0 (GENERIC) #0: Sun Dec 16 00:27:58 
PST 2007 
builds@wb30:/home/builds/ab/netbsd-4-0-RELEASE/macppc/200712160005Z-obj/home/builds/ab/netbsd-4-0-RELEASE/src/sys/arch/macppc/compile/GENERIC
 macppc
Architecture: powerpc
Machine: macppc
>Description:
        commets with // may not be accepted for this build.
         | menus.c: In function 'ChoiseMenu':
         | menus.c:508: error: expected expression before '/' token
         | menus.c: In function 'press_menu':
         | menus.c:631: error: expected expression before '/' token
         | menus.c: In function 'CreateMenuLabel':
         | menus.c:792: error: expected expression before '/' token

>How-To-Repeat:
        (cd /usr/pkgsrc/wm/mlvwm; make)
>Fix:
Index: wm/mlvwm/distinfo
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/wm/mlvwm/distinfo,v
retrieving revision 1.1.1.1
diff -u -u -a -r1.1.1.1 distinfo
--- wm/mlvwm/distinfo   4 Sep 2005 06:57:08 -0000       1.1.1.1
+++ wm/mlvwm/distinfo   23 Feb 2008 02:08:57 -0000
@@ -4,3 +4,4 @@
 RMD160 (mlvwm091.tar.gz) = f06fe9d0b29b9a4ce7ff57c8b7a95b848ecea508
 Size (mlvwm091.tar.gz) = 88575 bytes
 SHA1 (patch-aa) = 51ee6f9eef7802bdbf18c15858b16cabf1cfac84
+SHA1 (patch-ab) = 516fba344c50f9a60dce385848b376b8e21efb9e
Index: wm/mlvwm/patches/patch-ab
===================================================================
RCS file: wm/mlvwm/patches/patch-ab
diff -N wm/mlvwm/patches/patch-ab
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ wm/mlvwm/patches/patch-ab   23 Feb 2008 02:08:43 -0000
@@ -0,0 +1,34 @@
+$NetBSD$
+
+--- mlvwm/menus.c-orig 2000-06-25 22:26:52.000000000 +0900
++++ mlvwm/menus.c      2008-02-23 10:55:34.000000000 +0900
+@@ -505,7 +505,9 @@
+               XMaskEvent( dpy, ExposureMask | ButtonReleaseMask | 
ButtonPressMask|
+                                               EnterWindowMask | 
PointerMotionMask | ButtonMotionMask,
+                                               &Event );
++#if 0
+ //            XNextEvent( dpy, &Event );
++#endif
+               switch( Event.type ){
+               case Expose:
+                       if( XFindContext( dpy, Event.xany.window, MenuContext,
+@@ -628,7 +630,9 @@
+               XMaskEvent( dpy, ExposureMask | ButtonReleaseMask | 
ButtonPressMask|
+                                               EnterWindowMask | 
PointerMotionMask | ButtonMotionMask,
+                                               &Event );
++#if 0
+ //            XNextEvent( dpy, &Event );
++#endif
+               switch( Event.type ){
+               case Expose:
+                       if( mapped && Event.xany.window==mapped->PullWin &&
+@@ -789,7 +793,9 @@
+       if( ml->flags&SWALLOW ){
+               if( SwallowMenu( ml ) ){
+                       XSetWindowBorderWidth( dpy, ml->LabelWin, 0 );
++#if 0
+ //                    XResizeWindow( dpy, ml->LabelWin, ml->LabelWidth, 
MENUB_H-2 );
++#endif
+                       XReparentWindow( dpy, ml->LabelWin, Scr.MenuBar, 0, 0 );
+                       ml->LabelWidth += 6;
+               }

>Unformatted: