From e0b3fdf8891fbb8777a091c918e4eb664086af03 Mon Sep 17 00:00:00 2001 From: kurt Date: Wed, 6 Feb 2013 22:08:33 +0000 Subject: [PATCH] - Fix java.lang.UnsatisfiedLinkError: java.awt.Toolkit.initIDs by correcting awt Makefile merge error. --- devel/jdk/1.7/Makefile | 6 +++--- .../patches/patch-jdk_make_sun_awt_Makefile | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 devel/jdk/1.7/patches/patch-jdk_make_sun_awt_Makefile diff --git a/devel/jdk/1.7/Makefile b/devel/jdk/1.7/Makefile index 2a92c87edbc..f8484c1bc03 100644 --- a/devel/jdk/1.7/Makefile +++ b/devel/jdk/1.7/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.56 2013/02/02 17:39:23 kurt Exp $ +# $OpenBSD: Makefile,v 1.57 2013/02/06 22:08:33 kurt Exp $ SHARED_ONLY= Yes ONLY_FOR_ARCHS= i386 amd64 @@ -9,9 +9,9 @@ V= 1.7.0.11 B= b24 PKGNAME= jdk-${V} PKGNAME-main= jdk-${V} -REVISION-main= 1 +REVISION-main= 2 PKGNAME-jre= jre-${V} -REVISION-jre= 1 +REVISION-jre= 2 EPOCH= 0 JDK_SRC= openjdk-7u6-fcs-src-b24-28_aug_2012.zip diff --git a/devel/jdk/1.7/patches/patch-jdk_make_sun_awt_Makefile b/devel/jdk/1.7/patches/patch-jdk_make_sun_awt_Makefile new file mode 100644 index 00000000000..74cb4962d70 --- /dev/null +++ b/devel/jdk/1.7/patches/patch-jdk_make_sun_awt_Makefile @@ -0,0 +1,21 @@ +$OpenBSD: patch-jdk_make_sun_awt_Makefile,v 1.6 2013/02/06 22:08:33 kurt Exp $ +--- jdk/make/sun/awt/Makefile.orig Wed Feb 6 14:59:12 2013 ++++ jdk/make/sun/awt/Makefile Wed Feb 6 14:59:35 2013 +@@ -123,8 +123,6 @@ OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH + OTHER_LDLIBS = $(JVMLIB) $(LIBM) $(LIBDL) + endif + +-FILES_c += initIDs.c +- + ifeq ($(PLATFORM), bsd) + FILES_c = $(FILES_2D_c) + FILES_c += awt_LoadLibrary.c +@@ -138,6 +136,8 @@ FILES_c += awt_LoadLibrary.c + OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH + OTHER_LDLIBS = $(JVMLIB) $(LIBM) + endif ++ ++FILES_c += initIDs.c + + # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS/LINUX + endif # PLATFORM