BUILD_DIRS correction

pax USE_TOOLS added
modular X11_TYPE added
corrected buildlink3.mk
make gcc independable from jdk16/Makefile.common
updated openmotif checks

jdk14/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2009/05/19 09:00:08 thomasklausner Exp $
+# $NetBSD: Makefile,v 1.43 2009/06/02 13:25:58 noud4 Exp $
 
 .include "../../wip/jdk16/Makefile.common"
 
@@ -24,6 +24,8 @@ ONLY_FOR_PLATFORM=	NetBSD-[2-9]*-i386 DragonFly-*-i386
 JAVA_NAME=		jdk14
 JAVA_WRAPPERS=		appletviewer jar java javac javadoc javah javap
 
+USE_TOOLS+=		pax
+
 # Let an installed version of this package bootstrap a later version
 # (skips having to reinstall sun-jdk14 again)
 #
@@ -60,8 +62,8 @@ PATCHSETFILE=		bsd-jdk14-patches-${JDK_PATCHSET_VERSION}.tar.gz
 SCSL_DOWNLOAD=		http://wwws.sun.com/software/java2/download.html
 PATCH_DOWNLOAD=		http://www.eyesbeyond.com/freebsddom/java/JDK14SCSLConfirm.html
 
-JDKIMAGEDIR=		${BUILD_DIRS}/../build/bsd-i586/j2sdk-image
-JDKIMAGEDIR_G=		${BUILD_DIRS}/../build/bsd-i586/j2sdk-debug-image
+JDKIMAGEDIR=		${WRKDIR}/${BUILD_DIRS}/../build/bsd-i586/j2sdk-image
+JDKIMAGEDIR_G=		${WRKDIR}/${BUILD_DIRS}/../build/bsd-i586/j2sdk-debug-image
 
 FETCH_MESSAGE+="The files ${SCSL_SRCFILE} and ${SCSL_BINFILE}"
 FETCH_MESSAGE+="containing the Java(tm) 2 SDK, Standard Edition must be fetched"
@@ -128,7 +130,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM_DIR} ${DESTDIR}${JAVA_HOME}
-	cd ${JDKIMAGEDIR} && pax -rwp ma . ${DESTDIR}${JAVA_HOME}
+	cd ${JDKIMAGEDIR} && ${PAX} -rwp ma . ${DESTDIR}${JAVA_HOME}
 	${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME}/jre/.systemPrefs
 	${TOUCH} ${DESTDIR}${JAVA_HOME}/jre/.systemPrefs/.system.lock
 	${CHMOD} 644 ${DESTDIR}${JAVA_HOME}/jre/.systemPrefs/.system.lock
@@ -139,6 +141,17 @@ do-install:
 #	 ${INSTALL_DATA} ${FILESDIR}/cacerts \
 #		${DESTDIR}${JAVA_HOME}/jre/javaws/cacerts
 
+GCC_REQD+=		3.0
+.if !empty(MACHINE_PLATFORM:MNetBSD-4*) || !empty(MACHINE_PLATFORM:MNetBSD-5*)
+USE_PKGSRC_GCC=		yes
+.endif
+.include "../../mk/compiler.mk"
+
+.if ${X11_TYPE} == "modular"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
+.endif
 .include "../../mk/java-env.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

jdk14/TODO

@@ -1 +1,2 @@
 - Generate wrappers to avoid directly setting LD_LIBRARY_PATH.
+- patches/patch-ec

jdk14/buildlink3.mk

@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2009/05/06 10:47:32 cheusov Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2009/06/02 13:25:58 noud4 Exp $
 
 BUILDLINK_TREE+=	jdk14
 
@@ -15,7 +15,13 @@ BUILDLINK_CPPFLAGS.jdk14= \
 	-I${BUILDLINK_JAVA_PREFIX.jdk14}/include				\
 	-I${BUILDLINK_JAVA_PREFIX.jdk14}/include/netbsd
 
+.if ${X11_TYPE} == "modular"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
+.else
 .include "../../mk/x11.buildlink3.mk"
+.endif # X11_TYPE
 .endif # JDK14_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-jdk14

jdk14/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2005/12/19 13:32:01 ghen Exp $
+$NetBSD: distinfo,v 1.10 2009/06/02 13:25:58 noud4 Exp $
 
 SHA1 (j2sdk-1_4_2-src-scsl.zip) = a48f7df999e27a23071e259bd11f2eac18d99d3c
 RMD160 (j2sdk-1_4_2-src-scsl.zip) = 4214219cb1a7d20e2049193d1eaf3f31c1ff6edc
@@ -23,3 +23,7 @@ SHA1 (patch-al) = 5719028ccc4266e8c10fdd7a97899599b1d25b59
 SHA1 (patch-am) = 7c3109a99565bb988726a33da2da7ebba700c486
 SHA1 (patch-da) = ff7f3f0412044f940338fd3bfef277dce3b3e892
 SHA1 (patch-db) = a36f5a0a0396372de2be0c8b03dafc0c4022fed0
+SHA1 (patch-ea) = 266081beec91e7dbc194956d7e4bb5cbadc6fcb5
+SHA1 (patch-eb) = 689e49ff5f70b9ac54d984173ecac1b8ba3d928d
+SHA1 (patch-ec) = 0eeb5c26729ea260ab99ddd4c045c77d2a946cc9
+SHA1 (patch-ed) = 2eca2258c7952a1b31bef23c3723d576e7518e91

jdk14/patches/patch-ea

@@ -0,0 +1,16 @@
+
+$NetBSD: patch-ea,v 1.1 2009/06/02 13:25:58 noud4 Exp $
+
+http://archive.netbsd.se/?ml=freebsd-x11&a=2007-01&t=2977826
+
+--- j2se/src/solaris/native/sun/awt/awt_motif21.c.orig	2008-03-21 22:37:26.000000000 +0100
++++ j2se/src/solaris/native/sun/awt/awt_motif21.c	2008-03-22 11:45:40.000000000 +0100
+@@ -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

jdk14/patches/patch-eb

@@ -0,0 +1,13 @@
+$NetBSD: patch-eb,v 1.1 2009/06/02 13:25:58 noud4 Exp $
+
+--- j2se/src/solaris/native/sun/awt/awt_util.c.orig	2008-03-22 11:48:53.000000000 +0100
++++ j2se/src/solaris/native/sun/awt/awt_util.c	2008-03-22 11:48:57.000000000 +0100
+@@ -31,7 +31,7 @@
+ #include <sys/time.h>
+ 
+ #if defined(_ALLBSD_SOURCE)
+-#if defined(XmVersion) && XmVersion == 2001
++#if defined(XmVersion) && (XmVersion >= 2001)
+ #define BSD_MOTIF21
+ #endif
+ #endif

jdk14/patches/patch-ec

@@ -0,0 +1,16 @@
+
+TODO: this should be fixed
+
+$NetBSD: patch-ec,v 1.1 2009/06/02 13:25:58 noud4 Exp $
+
+--- hotspot/build/bsd/makefiles/vm.make.orig	2007-12-31 13:16:24.000000000 +0100
++++ hotspot/build/bsd/makefiles/vm.make	2007-12-31 13:16:51.000000000 +0100
+@@ -139,7 +139,7 @@
+ endif
+ 
+ ifeq ($(TRUE_PLATFORM), NetBSD)
+-LIBS += -Wl,-Bstatic -lgcc_pic -Wl,-Bdynamic -lm -pthread
++LIBS += -Wl,-Bstatic -lgcc_pic -Wl,-Bdynamic -lgcc_s -lm -pthread
+ endif
+ 
+ ifeq ($(TRUE_PLATFORM), OpenBSD)

jdk14/patches/patch-ed

@@ -0,0 +1,13 @@
+$NetBSD: patch-ed,v 1.1 2009/06/02 13:25:58 noud4 Exp $
+
+--- j2se/make/sun/awt/Makefile.orig	2009-04-02 10:37:33.000000000 +0000
++++ j2se/make/sun/awt/Makefile	2009-04-02 10:38:46.000000000 +0000
+@@ -76,7 +76,7 @@
+ OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
+ OTHER_CFLAGS += -DMOTIF_VERSION=2
+ OTHER_LDLIBS = -lmlib_image$(SUFFIX) $(LIBCXX) $(JVMLIB) $(LIBXM) \
+-               -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lm
++               -lXt -lXext -lXft $(LIBXTST) $(LIBXMU) -lX11 -lm
+ endif
+ 
+ FILES_c += initIDs.c