lang/jdk14 is broken with xorg42

[Yoshihiko Sarumaru]

Hi,

I found lang/jdk14 is broken with xorg42 with following error message.

../../../src/solaris/native/sun/awt/awt_motif21.c:26: error:
conflicting types for 'XmImGetXIC'
/usr/local/include/Xm/XmIm.h:92: error: previous declaration of
'XmImGetXIC' was here
../../../src/solaris/native/sun/awt/awt_motif21.c:26: error:
conflicting types for 'XmImGetXIC'
/usr/local/include/Xm/XmIm.h:92: error: previous declaration of
'XmImGetXIC' was here
../../../src/solaris/native/sun/awt/awt_motif21.c: In function `getTextWidget':
../../../src/solaris/native/sun/awt/awt_motif21.c:54: warning: cast to
pointer from integer of different size
../../../src/solaris/native/sun/awt/awt_motif21.c:58: warning: cast to
pointer from integer of different size
gmake[4]: *** [/usr/ports/java/jdk14/work/control/build/bsd-i586/tmp/sun/sun.awt/awt/obj/awt_motif21.o]
Error 1
gmake[4]: Leaving directory `/usr/ports/java/jdk14/work/j2se/make/sun/awt'
gmake[3]: *** [optimized] Error 2
gmake[3]: Leaving directory `/usr/ports/java/jdk14/work/j2se/make/sun/awt'
gmake[2]: *** [all] Error 1
gmake[2]: Leaving directory `/usr/ports/java/jdk14/work/j2se/make/sun'
gmake[1]: *** [all] Error 1
gmake[1]: Leaving directory `/usr/ports/java/jdk14/work/j2se/make'
gmake: *** [j2se-build] Error 2

This error was derived from two reason:
1. NeedWidePrototypes (X11/Xfuncproto.h) was changed from 0 to 1 from xorg42.
2. awt_motif21.c has an ifdef switch to see Xm/XmIm.h or declare
prototype by itself,
    but its condition is #if (XmVersion == 2001).

So far, NeedWidePrototypes have been 0 and prototype declaration have been
happened to be matched.

So this should be work:

--- work/j2se/src/solaris/native/sun/awt/awt_motif21.c.orig     Sun
May 20 23:57:17 2007
+++ work/j2se/src/solaris/native/sun/awt/awt_motif21.c  Sun May 20 23:10:20 2007
@@ -15,7 +15,7 @@
 #include "awt_p.h"
 #include "awt_Component.h"

-#if (XmVersion == 2001)
+#if (XmVersion >= 2001)
  #include <Xm/XmIm.h>
 #else
 #define XmPER_SHELL 0