make this work with motif > 2.1 too

This commit is contained in:
kurt 2007-07-18 17:53:07 +00:00
parent a2553573d3
commit dacf31c5b4
6 changed files with 56 additions and 8 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2007/01/28 04:46:48 kurt Exp $
# $OpenBSD: Makefile,v 1.24 2007/07/18 17:53:07 kurt Exp $
# $FreeBSD: ports/java/jdk12/Makefile,v 1.11 2002/08/19 20:47:04 glewis Exp $
ONLY_FOR_ARCHS= arm i386 powerpc sparc
@ -7,9 +7,9 @@ COMMENT-main= "Java2(TM) Standard Edition Dev Kit v${V}"
COMMENT-jre= "Java2(TM) Standard Edition Runtime Environment v${V}"
V= 1.3.1
DISTNAME= j2sdk-1_3_1-src
PKGNAME= jdk-${V}p10
PKGNAME-main= jdk-${V}p10
PKGNAME-jre= jre-${V}p10
PKGNAME= jdk-${V}
PKGNAME-main= jdk-${V}p11
PKGNAME-jre= jre-${V}p11
CATEGORIES= devel/jdk java

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-j2sdk1_3_1_src_solaris_native_sun_awt_awt_motif21_c,v 1.1 2007/07/18 17:53:07 kurt Exp $
--- j2sdk1.3.1/src/solaris/native/sun/awt/awt_motif21.c.orig Wed Jul 18 10:12:16 2007
+++ j2sdk1.3.1/src/solaris/native/sun/awt/awt_motif21.c Wed Jul 18 10:13:01 2007
@@ -14,7 +14,7 @@
#include <Xm/Xm.h>
#include <jvm.h>
-#if (XmVersion == 2001)
+#if (XmVersion >= 2001)
#include <Xm/XmIm.h>
#else
#define XmPER_SHELL 0

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-j2sdk1_3_1_src_solaris_native_sun_awt_awt_util_c,v 1.1 2007/07/18 17:53:07 kurt Exp $
--- j2sdk1.3.1/src/solaris/native/sun/awt/awt_util.c.orig Wed Jul 18 10:15:11 2007
+++ j2sdk1.3.1/src/solaris/native/sun/awt/awt_util.c Wed Jul 18 10:17:31 2007
@@ -11,7 +11,7 @@
#include "awt_p.h"
#include "color.h"
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
-#if defined(XmVersion) && XmVersion == 2001
+#if defined(XmVersion) && XmVersion >= 2001
#define BSD_MOTIF21
#endif
#endif

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2007/01/28 04:45:04 kurt Exp $
# $OpenBSD: Makefile,v 1.22 2007/07/18 17:53:29 kurt Exp $
# $FreeBSD: /repoman/r/pcvs/ports/java/jdk14/Makefile,v 1.79 2004/08/18 07:06:03 glewis Exp $
ONLY_FOR_ARCHS= i386
@ -7,9 +7,9 @@ COMMENT-main= "Java2(TM) Standard Edition Dev Kit v${V}"
COMMENT-jre= "Java2(TM) Standard Edition Runtime Environment v${V}"
V= 1.4.2
DISTNAME= j2sdk-1_4_2
PKGNAME= jdk-${V}p12
PKGNAME-main= jdk-${V}p12
PKGNAME-jre= jre-${V}p12
PKGNAME= jdk-${V}
PKGNAME-main= jdk-${V}p13
PKGNAME-jre= jre-${V}p13
CATEGORIES= devel/jdk java

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-j2se_src_solaris_native_sun_awt_awt_motif21_c,v 1.1 2007/07/18 17:53:29 kurt Exp $
--- j2se/src/solaris/native/sun/awt/awt_motif21.c.orig Wed Jul 18 11:02:41 2007
+++ j2se/src/solaris/native/sun/awt/awt_motif21.c Wed Jul 18 11:03:04 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

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-j2se_src_solaris_native_sun_awt_awt_util_c,v 1.1 2007/07/18 17:53:29 kurt Exp $
--- j2se/src/solaris/native/sun/awt/awt_util.c.orig Wed Jul 18 11:02:46 2007
+++ j2se/src/solaris/native/sun/awt/awt_util.c Wed Jul 18 11:03:10 2007
@@ -31,7 +31,7 @@
#include <sys/time.h>
#if defined(_BSD_SOURCE)
-#if defined(XmVersion) && XmVersion == 2001
+#if defined(XmVersion) && XmVersion >= 2001
#define BSD_MOTIF21
#endif
#endif