summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/openjdk7/Makefile24
-rw-r--r--lang/openjdk7/PLIST67
-rw-r--r--lang/openjdk7/PLIST.SunOS84
-rw-r--r--lang/openjdk7/PLIST.debug37
-rw-r--r--lang/openjdk7/distinfo5
-rw-r--r--lang/openjdk7/options.mk62
-rw-r--r--lang/openjdk7/patches/patch-ao34
-rw-r--r--lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_zeroshark.make12
8 files changed, 157 insertions, 168 deletions
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index 2885f892635..d039942560e 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2015/02/08 07:57:55 tnn Exp $
+# $NetBSD: Makefile,v 1.89 2015/02/08 23:40:09 tnn Exp $
DISTNAME= openjdk-1.7.76-20150127
PKGNAME= openjdk7-1.7.76
@@ -15,12 +15,6 @@ LICENSE= gnu-gpl-v2
DISTFILES= ${DEFAULT_DISTFILES}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-# diff between distfile and bsd-port branch. To check out, use:
-# "hg fclone http://hg.openjdk.java.net/bsd-port/bsd-port/"
-#PATCH_DIST_STRIP= -p1
-#PATCHFILES+= jdk-7u21-20130526.diff
-#PATCH_SITES+= ${MASTER_SITE_LOCAL:=openjdk7/}
-
JAVA_NAME= openjdk7
JAVA_HOME= ${PREFIX}/java/${JAVA_NAME}
JAVA_WRAPPERS= jar java javac javadoc javah javap keytool orbd \
@@ -30,9 +24,6 @@ MAKE_ENV+= PKGSRC_ZIPEXE=${TOOLS_PATH.zip}
MAKE_ENV+= PKGSRC_UNZIP=${TOOLS_PATH.unzip}
MAKE_ENV+= PKGSRC_UNZIPSFX=${TOOLS_PATH.unzip}sfx
-DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
-#DEPENDS+= ja-sazanami-ttf-[0-9]*:../../fonts/ja-sazanami-ttf
-#DEPENDS+= baekmuk-ttf-[0-9]*:../../fonts/baekmuk-ttf
BUILD_DEPENDS+= mozilla-rootcerts>=1.0.20140820nb2:../../security/mozilla-rootcerts
NO_CONFIGURE= yes
@@ -40,6 +31,7 @@ USE_LANGUAGES= c c++
USE_TOOLS+= gmake pax unzip:run zip:run # patch
UNLIMIT_RESOURCES= datasize stacksize
WRKSRC= ${WRKDIR}/openjdk
+PLIST_SRC+= ${PLIST_SRC_DFLT}
BUILDLINK_PASSTHRU_DIRS+= ${ALT_BOOTDIR}
PREPEND_PATH+= ${ALT_BOOTDIR}/bin
@@ -51,7 +43,6 @@ MAKE_ENV+= ALT_FREETYPE_HEADERS_PATH=${BUILDLINK_PREFIX.freetype2}/include
MAKE_ENV+= ALT_CUPS_HEADERS_PATH=${BUILDLINK_PREFIX.cups}/include
MAKE_ENV+= ALT_COMPILER_PATH=${WRAPPER_DIR}/bin
MAKE_ENV+= ALT_PACKAGE_PATH=${PREFIX}
-MAKE_ENV+= ALT_X11_PATH=${X11BASE}
MAKE_ENV+= RHINO_JAR=${WRKDIR}/${RHINO}/js.jar
MAKE_ENV+= ALT_PARALLEL_COMPILE_JOBS=${MAKE_JOBS:U1}
@@ -60,8 +51,6 @@ MAKE_ENV+= HOTSPOT_BUILD_JOBS=${MAKE_JOBS}
MAKE_ENV+= HOTSPOT_BUILD_USER=pkgsrc
MAKE_ENV+= NO_DOCS=true
MAKE_ENV+= SKIP_COMPARE_IMAGES=true
-MAKE_ENV+= SKIP_FASTDEBUG_BUILD=yes
-MAKE_ENV+= SKIP_DEBUG_BUILD=yes
# Avoid build errors when JAVA_HOME and CLASSPATH are defined by user.
MAKE_ENV+= JAVA_HOME=
@@ -163,13 +152,10 @@ SUBST_FILES.fontpaths+= jdk/src/solaris/native/sun/awt/fontpath.c
SUBST_SED.fontpaths= -e 's|@PREFIX@|${PREFIX}|g'
SUBST_SED.fontpaths+= -e 's|@BUILDLINK_PREFIX.fontconfig@|${BUILDLINK_PREFIX.fontconfig}|g'
-PLIST_VARS+= i386 jce manja
+PLIST_VARS+= i386
.if ${MACHINE_ARCH} == "i386"
PLIST.i386= yes
.endif
-.if ${OPSYS} != "SunOS"
-PLIST.manja= yes
-.endif
PLIST_VARS+= sctp alsa
.if ${OPSYS} == "FreeBSD"
@@ -209,7 +195,7 @@ do-build: ${WRKDIR}/stage3-done
# stage 1 builds a native JDK using the bootstrap binaries
${WRKDIR}/stage1-done:
- ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+ ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${JDK_MAKE_TARGET}
rm -rf ${ALT_BOOTDIR}
cd ${BUILDDIR} && mv j2sdk-image ${ALT_BOOTDIR}
mv ${BUILDDIR} ${BUILDDIR}-stage1
@@ -217,7 +203,7 @@ ${WRKDIR}/stage1-done:
# stage 2 rebuilds the JDK using native tools
${WRKDIR}/stage2-done: ${WRKDIR}/stage1-done
- ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+ ${_ULIMIT_CMD} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${JDK_MAKE_TARGET}
touch ${BUILDDIR}/j2sdk-image/jre/lib/applet/.keep
touch ${WRKDIR}/stage2-done
diff --git a/lang/openjdk7/PLIST b/lang/openjdk7/PLIST
index 0baa96155fd..e92264afc6b 100644
--- a/lang/openjdk7/PLIST
+++ b/lang/openjdk7/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2015/02/08 04:13:23 tnn Exp $
+@comment $NetBSD: PLIST,v 1.20 2015/02/08 23:40:09 tnn Exp $
bin/openjdk7-jar
bin/openjdk7-java
bin/openjdk7-javac
@@ -15,7 +15,7 @@ bin/openjdk7-tnameserv
java/openjdk7/ASSEMBLY_EXCEPTION
java/openjdk7/LICENSE
java/openjdk7/THIRD_PARTY_README
-java/openjdk7/bin/appletviewer
+${PLIST.x11}java/openjdk7/bin/appletviewer
java/openjdk7/bin/apt
java/openjdk7/bin/extcheck
java/openjdk7/bin/idlj
@@ -43,7 +43,7 @@ java/openjdk7/bin/keytool
java/openjdk7/bin/native2ascii
java/openjdk7/bin/orbd
java/openjdk7/bin/pack200
-java/openjdk7/bin/policytool
+${PLIST.x11}java/openjdk7/bin/policytool
java/openjdk7/bin/rmic
java/openjdk7/bin/rmid
java/openjdk7/bin/rmiregistry
@@ -349,7 +349,7 @@ java/openjdk7/jre/bin/java
java/openjdk7/jre/bin/keytool
java/openjdk7/jre/bin/orbd
java/openjdk7/jre/bin/pack200
-java/openjdk7/jre/bin/policytool
+${PLIST.x11}java/openjdk7/jre/bin/policytool
java/openjdk7/jre/bin/rmid
java/openjdk7/jre/bin/rmiregistry
java/openjdk7/jre/bin/servertool
@@ -363,51 +363,42 @@ java/openjdk7/jre/lib/${ARCH}/jexec
java/openjdk7/jre/lib/${ARCH}/jli/libjli.so
java/openjdk7/jre/lib/${ARCH}/jspawnhelper
java/openjdk7/jre/lib/${ARCH}/jvm.cfg
-java/openjdk7/jre/lib/${ARCH}/libattach.diz
java/openjdk7/jre/lib/${ARCH}/libattach.so
java/openjdk7/jre/lib/${ARCH}/libawt.so
-java/openjdk7/jre/lib/${ARCH}/libdt_socket.diz
java/openjdk7/jre/lib/${ARCH}/libdt_socket.so
java/openjdk7/jre/lib/${ARCH}/libfontmanager.so
-java/openjdk7/jre/lib/${ARCH}/libhprof.diz
java/openjdk7/jre/lib/${ARCH}/libhprof.so
-java/openjdk7/jre/lib/${ARCH}/libinstrument.diz
java/openjdk7/jre/lib/${ARCH}/libinstrument.so
java/openjdk7/jre/lib/${ARCH}/libj2gss.so
java/openjdk7/jre/lib/${ARCH}/libj2pcsc.so
java/openjdk7/jre/lib/${ARCH}/libj2pkcs11.so
java/openjdk7/jre/lib/${ARCH}/libjaas_unix.so
java/openjdk7/jre/lib/${ARCH}/libjava.so
-java/openjdk7/jre/lib/${ARCH}/libjava_crw_demo.diz
java/openjdk7/jre/lib/${ARCH}/libjava_crw_demo.so
java/openjdk7/jre/lib/${ARCH}/libjawt.so
java/openjdk7/jre/lib/${ARCH}/libjdwp.so
java/openjdk7/jre/lib/${ARCH}/libjpeg.so
-java/openjdk7/jre/lib/${ARCH}/libjsdt.diz
java/openjdk7/jre/lib/${ARCH}/libjsdt.so
java/openjdk7/jre/lib/${ARCH}/libjsig.so
java/openjdk7/jre/lib/${ARCH}/libjsound.so
${PLIST.alsa}java/openjdk7/jre/lib/${ARCH}/libjsoundalsa.so
java/openjdk7/jre/lib/${ARCH}/liblcms.so
-java/openjdk7/jre/lib/${ARCH}/libmanagement.diz
java/openjdk7/jre/lib/${ARCH}/libmanagement.so
java/openjdk7/jre/lib/${ARCH}/libmlib_image.so
java/openjdk7/jre/lib/${ARCH}/libnet.so
java/openjdk7/jre/lib/${ARCH}/libnio.so
-java/openjdk7/jre/lib/${ARCH}/libnpt.diz
java/openjdk7/jre/lib/${ARCH}/libnpt.so
-java/openjdk7/jre/lib/${ARCH}/libsaproc.so
+${PLIST.native}java/openjdk7/jre/lib/${ARCH}/libsaproc.so
${PLIST.sctp}java/openjdk7/jre/lib/${ARCH}/libsctp.so
-java/openjdk7/jre/lib/${ARCH}/libsplashscreen.so
+${PLIST.x11}java/openjdk7/jre/lib/${ARCH}/libsplashscreen.so
java/openjdk7/jre/lib/${ARCH}/libsunec.so
java/openjdk7/jre/lib/${ARCH}/libunpack.so
-java/openjdk7/jre/lib/${ARCH}/libverify.diz
java/openjdk7/jre/lib/${ARCH}/libverify.so
java/openjdk7/jre/lib/${ARCH}/libzip.so
java/openjdk7/jre/lib/${ARCH}/server/Xusage.txt
java/openjdk7/jre/lib/${ARCH}/server/libjsig.so
java/openjdk7/jre/lib/${ARCH}/server/libjvm.so
-java/openjdk7/jre/lib/${ARCH}/xawt/libmawt.so
+${PLIST.x11}java/openjdk7/jre/lib/${ARCH}/xawt/libmawt.so
java/openjdk7/jre/lib/applet/.keep
java/openjdk7/jre/lib/calendars.properties
java/openjdk7/jre/lib/charsets.jar
@@ -453,7 +444,6 @@ java/openjdk7/jre/lib/psfontj2d.properties
java/openjdk7/jre/lib/resources.jar
java/openjdk7/jre/lib/rhino.jar
java/openjdk7/jre/lib/rt.jar
-${PLIST.jce}java/openjdk7/jre/lib/security/README.txt
java/openjdk7/jre/lib/security/US_export_policy.jar
java/openjdk7/jre/lib/security/cacerts
java/openjdk7/jre/lib/security/java.policy
@@ -867,49 +857,8 @@ java/openjdk7/lib/ct.sym
java/openjdk7/lib/ir.idl
java/openjdk7/lib/jconsole.jar
java/openjdk7/lib/orb.idl
-java/openjdk7/lib/sa-jdi.jar
+${PLIST.native}java/openjdk7/lib/sa-jdi.jar
java/openjdk7/lib/tools.jar
-java/openjdk7/man/ja
-${PLIST.manja}java/openjdk7/man/ja
-java/openjdk7/man/ja_JP.UTF-8/man1/appletviewer.1
-java/openjdk7/man/ja_JP.UTF-8/man1/apt.1
-java/openjdk7/man/ja_JP.UTF-8/man1/extcheck.1
-java/openjdk7/man/ja_JP.UTF-8/man1/idlj.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jar.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jarsigner.1
-java/openjdk7/man/ja_JP.UTF-8/man1/java.1
-java/openjdk7/man/ja_JP.UTF-8/man1/javac.1
-java/openjdk7/man/ja_JP.UTF-8/man1/javadoc.1
-java/openjdk7/man/ja_JP.UTF-8/man1/javah.1
-java/openjdk7/man/ja_JP.UTF-8/man1/javap.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jcmd.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jconsole.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jdb.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jhat.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jinfo.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jmap.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jps.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jrunscript.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jsadebugd.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jstack.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jstat.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jstatd.1
-java/openjdk7/man/ja_JP.UTF-8/man1/keytool.1
-java/openjdk7/man/ja_JP.UTF-8/man1/native2ascii.1
-java/openjdk7/man/ja_JP.UTF-8/man1/orbd.1
-java/openjdk7/man/ja_JP.UTF-8/man1/pack200.1
-java/openjdk7/man/ja_JP.UTF-8/man1/policytool.1
-java/openjdk7/man/ja_JP.UTF-8/man1/rmic.1
-java/openjdk7/man/ja_JP.UTF-8/man1/rmid.1
-java/openjdk7/man/ja_JP.UTF-8/man1/rmiregistry.1
-java/openjdk7/man/ja_JP.UTF-8/man1/schemagen.1
-java/openjdk7/man/ja_JP.UTF-8/man1/serialver.1
-java/openjdk7/man/ja_JP.UTF-8/man1/servertool.1
-java/openjdk7/man/ja_JP.UTF-8/man1/tnameserv.1
-java/openjdk7/man/ja_JP.UTF-8/man1/unpack200.1
-java/openjdk7/man/ja_JP.UTF-8/man1/wsgen.1
-java/openjdk7/man/ja_JP.UTF-8/man1/wsimport.1
-java/openjdk7/man/ja_JP.UTF-8/man1/xjc.1
java/openjdk7/man/man1/appletviewer.1
java/openjdk7/man/man1/apt.1
java/openjdk7/man/man1/extcheck.1
diff --git a/lang/openjdk7/PLIST.SunOS b/lang/openjdk7/PLIST.SunOS
index 1373d7cfcb8..422667aa771 100644
--- a/lang/openjdk7/PLIST.SunOS
+++ b/lang/openjdk7/PLIST.SunOS
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.SunOS,v 1.4 2014/01/27 11:04:20 ryoon Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.5 2015/02/08 23:40:09 tnn Exp $
bin/openjdk7-jar
bin/openjdk7-java
bin/openjdk7-javac
@@ -15,7 +15,7 @@ bin/openjdk7-tnameserv
java/openjdk7/ASSEMBLY_EXCEPTION
java/openjdk7/LICENSE
java/openjdk7/THIRD_PARTY_README
-java/openjdk7/bin/appletviewer
+${PLIST.x11}java/openjdk7/bin/appletviewer
java/openjdk7/bin/apt
java/openjdk7/bin/extcheck
java/openjdk7/bin/idlj
@@ -43,7 +43,7 @@ java/openjdk7/bin/keytool
java/openjdk7/bin/native2ascii
java/openjdk7/bin/orbd
java/openjdk7/bin/pack200
-java/openjdk7/bin/policytool
+${PLIST.x11}java/openjdk7/bin/policytool
java/openjdk7/bin/rmic
java/openjdk7/bin/rmid
java/openjdk7/bin/rmiregistry
@@ -344,8 +344,8 @@ java/openjdk7/include/jni.h
java/openjdk7/include/jni_md.h
java/openjdk7/include/jvmti.h
java/openjdk7/include/jvmticmlr.h
-java/openjdk7/include/solaris/jawt_md.h
-java/openjdk7/include/solaris/jni_md.h
+java/openjdk7/include/${LOWER_OPSYS}/jawt_md.h
+java/openjdk7/include/${LOWER_OPSYS}/jni_md.h
java/openjdk7/jre/ASSEMBLY_EXCEPTION
java/openjdk7/jre/LICENSE
java/openjdk7/jre/THIRD_PARTY_README
@@ -353,7 +353,7 @@ java/openjdk7/jre/bin/java
java/openjdk7/jre/bin/keytool
java/openjdk7/jre/bin/orbd
java/openjdk7/jre/bin/pack200
-java/openjdk7/jre/bin/policytool
+${PLIST.x11}java/openjdk7/jre/bin/policytool
java/openjdk7/jre/bin/rmid
java/openjdk7/jre/bin/rmiregistry
java/openjdk7/jre/bin/servertool
@@ -380,80 +380,57 @@ java/openjdk7/jre/lib/ext/zipfs.jar
java/openjdk7/jre/lib/flavormap.properties
java/openjdk7/jre/lib/fontconfig.bfc
java/openjdk7/jre/lib/fontconfig.properties.src
-${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/64/libjvm_db.diz
${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/64/libjvm_db.so
-${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/64/libjvm_dtrace.diz
${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/64/libjvm_dtrace.so
${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/Xusage.txt
-${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjsig.diz
${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjsig.so
-${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm.diz
${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm.so
-${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm_db.diz
${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm_db.so
-${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm_dtrace.diz
${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/client/libjvm_dtrace.so
java/openjdk7/jre/lib/${ARCH}/headless/libmawt.so
java/openjdk7/jre/lib/${ARCH}/jexec
java/openjdk7/jre/lib/${ARCH}/jli/libjli.so
java/openjdk7/jre/lib/${ARCH}/jvm.cfg
-java/openjdk7/jre/lib/${ARCH}/libattach.diz
java/openjdk7/jre/lib/${ARCH}/libattach.so
java/openjdk7/jre/lib/${ARCH}/libawt.so
-java/openjdk7/jre/lib/${ARCH}/libdt_socket.diz
java/openjdk7/jre/lib/${ARCH}/libdt_socket.so
java/openjdk7/jre/lib/${ARCH}/libfontmanager.so
java/openjdk7/jre/lib/${ARCH}/libfreetype.so.6
-java/openjdk7/jre/lib/${ARCH}/libhprof.diz
java/openjdk7/jre/lib/${ARCH}/libhprof.so
-java/openjdk7/jre/lib/${ARCH}/libinstrument.diz
java/openjdk7/jre/lib/${ARCH}/libinstrument.so
java/openjdk7/jre/lib/${ARCH}/libj2gss.so
java/openjdk7/jre/lib/${ARCH}/libj2pcsc.so
java/openjdk7/jre/lib/${ARCH}/libj2pkcs11.so
java/openjdk7/jre/lib/${ARCH}/libjaas_unix.so
java/openjdk7/jre/lib/${ARCH}/libjava.so
-java/openjdk7/jre/lib/${ARCH}/libjava_crw_demo.diz
java/openjdk7/jre/lib/${ARCH}/libjava_crw_demo.so
java/openjdk7/jre/lib/${ARCH}/libjawt.so
java/openjdk7/jre/lib/${ARCH}/libjdwp.so
java/openjdk7/jre/lib/${ARCH}/libjpeg.so
-java/openjdk7/jre/lib/${ARCH}/libjsdt.diz
java/openjdk7/jre/lib/${ARCH}/libjsdt.so
-java/openjdk7/jre/lib/${ARCH}/libjsig.diz
java/openjdk7/jre/lib/${ARCH}/libjsig.so
java/openjdk7/jre/lib/${ARCH}/libjsound.so
java/openjdk7/jre/lib/${ARCH}/liblcms.so
-java/openjdk7/jre/lib/${ARCH}/libmanagement.diz
java/openjdk7/jre/lib/${ARCH}/libmanagement.so
java/openjdk7/jre/lib/${ARCH}/libmlib_image.so
java/openjdk7/jre/lib/${ARCH}/libnet.so
java/openjdk7/jre/lib/${ARCH}/libnio.so
-java/openjdk7/jre/lib/${ARCH}/libnpt.diz
java/openjdk7/jre/lib/${ARCH}/libnpt.so
-java/openjdk7/jre/lib/${ARCH}/libsaproc.diz
-java/openjdk7/jre/lib/${ARCH}/libsaproc.so
-java/openjdk7/jre/lib/${ARCH}/libsctp.so
-java/openjdk7/jre/lib/${ARCH}/libsplashscreen.so
+${PLIST.native}java/openjdk7/jre/lib/${ARCH}/libsaproc.so
+${PLIST.sctp}java/openjdk7/jre/lib/${ARCH}/libsctp.so
+${PLIST.x11}java/openjdk7/jre/lib/${ARCH}/libsplashscreen.so
java/openjdk7/jre/lib/${ARCH}/libsunec.so
java/openjdk7/jre/lib/${ARCH}/libunpack.so
-java/openjdk7/jre/lib/${ARCH}/libverify.diz
java/openjdk7/jre/lib/${ARCH}/libverify.so
java/openjdk7/jre/lib/${ARCH}/libzip.so
-${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/server/64/libjvm_db.diz
${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/server/64/libjvm_db.so
-${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/server/64/libjvm_dtrace.diz
${PLIST.i386}java/openjdk7/jre/lib/${ARCH}/server/64/libjvm_dtrace.so
java/openjdk7/jre/lib/${ARCH}/server/Xusage.txt
-java/openjdk7/jre/lib/${ARCH}/server/libjsig.diz
java/openjdk7/jre/lib/${ARCH}/server/libjsig.so
-java/openjdk7/jre/lib/${ARCH}/server/libjvm.diz
java/openjdk7/jre/lib/${ARCH}/server/libjvm.so
-java/openjdk7/jre/lib/${ARCH}/server/libjvm_db.diz
java/openjdk7/jre/lib/${ARCH}/server/libjvm_db.so
-java/openjdk7/jre/lib/${ARCH}/server/libjvm_dtrace.diz
java/openjdk7/jre/lib/${ARCH}/server/libjvm_dtrace.so
-java/openjdk7/jre/lib/${ARCH}/xawt/libmawt.so
+${PLIST.x11}java/openjdk7/jre/lib/${ARCH}/xawt/libmawt.so
java/openjdk7/jre/lib/images/cursors/cursors.properties
java/openjdk7/jre/lib/images/cursors/invalid32x32.gif
java/openjdk7/jre/lib/images/cursors/motif_CopyDrop32x32.gif
@@ -932,47 +909,8 @@ java/openjdk7/lib/${ARCH}/jli/libjli.so
java/openjdk7/lib/ir.idl
java/openjdk7/lib/jconsole.jar
java/openjdk7/lib/orb.idl
-java/openjdk7/lib/sa-jdi.jar
+${PLIST.native}java/openjdk7/lib/sa-jdi.jar
java/openjdk7/lib/tools.jar
-java/openjdk7/man/ja_JP.UTF-8/man1/appletviewer.1
-java/openjdk7/man/ja_JP.UTF-8/man1/apt.1
-java/openjdk7/man/ja_JP.UTF-8/man1/extcheck.1
-java/openjdk7/man/ja_JP.UTF-8/man1/idlj.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jar.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jarsigner.1
-java/openjdk7/man/ja_JP.UTF-8/man1/java.1
-java/openjdk7/man/ja_JP.UTF-8/man1/javac.1
-java/openjdk7/man/ja_JP.UTF-8/man1/javadoc.1
-java/openjdk7/man/ja_JP.UTF-8/man1/javah.1
-java/openjdk7/man/ja_JP.UTF-8/man1/javap.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jcmd.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jconsole.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jdb.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jhat.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jinfo.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jmap.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jps.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jrunscript.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jsadebugd.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jstack.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jstat.1
-java/openjdk7/man/ja_JP.UTF-8/man1/jstatd.1
-java/openjdk7/man/ja_JP.UTF-8/man1/keytool.1
-java/openjdk7/man/ja_JP.UTF-8/man1/native2ascii.1
-java/openjdk7/man/ja_JP.UTF-8/man1/orbd.1
-java/openjdk7/man/ja_JP.UTF-8/man1/pack200.1
-java/openjdk7/man/ja_JP.UTF-8/man1/policytool.1
-java/openjdk7/man/ja_JP.UTF-8/man1/rmic.1
-java/openjdk7/man/ja_JP.UTF-8/man1/rmid.1
-java/openjdk7/man/ja_JP.UTF-8/man1/rmiregistry.1
-java/openjdk7/man/ja_JP.UTF-8/man1/schemagen.1
-java/openjdk7/man/ja_JP.UTF-8/man1/serialver.1
-java/openjdk7/man/ja_JP.UTF-8/man1/servertool.1
-java/openjdk7/man/ja_JP.UTF-8/man1/tnameserv.1
-java/openjdk7/man/ja_JP.UTF-8/man1/unpack200.1
-java/openjdk7/man/ja_JP.UTF-8/man1/wsgen.1
-java/openjdk7/man/ja_JP.UTF-8/man1/wsimport.1
-java/openjdk7/man/ja_JP.UTF-8/man1/xjc.1
java/openjdk7/man/man1/appletviewer.1
java/openjdk7/man/man1/apt.1
java/openjdk7/man/man1/extcheck.1
diff --git a/lang/openjdk7/PLIST.debug b/lang/openjdk7/PLIST.debug
new file mode 100644
index 00000000000..03be9be861e
--- /dev/null
+++ b/lang/openjdk7/PLIST.debug
@@ -0,0 +1,37 @@
+@comment $NetBSD: PLIST.debug,v 1.1 2015/02/08 23:40:09 tnn Exp $
+java/openjdk7/jre/lib/${ARCH}/jexec.debuginfo
+java/openjdk7/jre/lib/${ARCH}/jli/libjli.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libattach.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libawt.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libawt_headless.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libdt_socket.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libfontmanager.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libhprof.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libinstrument.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libj2gss.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libj2pcsc.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libj2pkcs11.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libjaas_unix.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libjava.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libjava_crw_demo.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libjawt.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libjdwp.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libjpeg.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libjsdt.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libjsig.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libjsound.debuginfo
+java/openjdk7/jre/lib/${ARCH}/liblcms.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libmanagement.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libmlib_image.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libnet.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libnio.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libnpt.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libsaproc.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libsctp.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libsplashscreen.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libsunec.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libunpack.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libverify.debuginfo
+java/openjdk7/jre/lib/${ARCH}/libzip.debuginfo
+java/openjdk7/jre/lib/${ARCH}/server/libjsig.debuginfo
+java/openjdk7/jre/lib/${ARCH}/server/libjvm.debuginfo
diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo
index 2b370c455ab..261e83c9c17 100644
--- a/lang/openjdk7/distinfo
+++ b/lang/openjdk7/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.68 2015/02/08 05:55:29 tnn Exp $
+$NetBSD: distinfo,v 1.69 2015/02/08 23:40:09 tnn Exp $
SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306
RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260
@@ -53,7 +53,7 @@ SHA1 (patch-ak) = a8ce55038ee8755cf69a23bf77c4ea79466a8897
SHA1 (patch-al) = d174343a5baa8a73d18ff1020cb0cc19e6714175
SHA1 (patch-am) = d3ea039c882a73ff370b2c7bd6be94136b9f2bbb
SHA1 (patch-an) = da6a3a2451504a71faed11789fa7b015867a89cd
-SHA1 (patch-ao) = 6bfc842ceb0d7e03f9288e80fe762bd1d54cf503
+SHA1 (patch-ao) = 5eba16fc16c9a54a855951a153dc9138956dcf08
SHA1 (patch-ap) = cf1d5a79fdf57316f40a91fed30a87ae4a04d476
SHA1 (patch-aq) = 97303ebcdcf0251406eef816ae56c82c703dab9d
SHA1 (patch-ar) = 6544d4c7d4f30a3baeac95834e41ce8f7d41f9ec
@@ -72,6 +72,7 @@ SHA1 (patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformIn
SHA1 (patch-hotspot_make_bsd_makefiles_buildtree.make) = aed6cab66a8c55a2214432cb531fe0d5a9239d55
SHA1 (patch-hotspot_make_bsd_makefiles_defs.make) = 85eda2125ef39c5fe5fcfbc072bd8a3591d5c4bf
SHA1 (patch-hotspot_make_bsd_makefiles_rules.make) = ba5bbe69d44143105bc74641bc55f3814d55abb0
+SHA1 (patch-hotspot_make_bsd_makefiles_zeroshark.make) = fe0e3d001f2ff996c44dd977595e08c06f911773
SHA1 (patch-hotspot_make_solaris_makefiles_adlc.make) = 1d1be862ed0d8fc3da4710da169ad5a965d9df14
SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f2957b5c2a7a7982866f99239
SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 5d3003a2b98501cb17695d11f8d3bfc7737657bd
diff --git a/lang/openjdk7/options.mk b/lang/openjdk7/options.mk
index 47b841c998b..002823b32da 100644
--- a/lang/openjdk7/options.mk
+++ b/lang/openjdk7/options.mk
@@ -1,8 +1,11 @@
-# $NetBSD: options.mk,v 1.6 2014/11/15 12:10:54 ryoon Exp $
+# $NetBSD: options.mk,v 1.7 2015/02/08 23:40:09 tnn Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.openjdk7
-PKG_SUPPORTED_OPTIONS= jre-jce # jdk-zero-vm
-PKG_SUGGESTED_OPTIONS= jre-jce
+PKG_SUPPORTED_OPTIONS= debug jre-jce jdk-zero-vm x11
+PKG_SUGGESTED_OPTIONS= jre-jce x11
+.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64"
+PKG_SUGGESTED_OPTIONS+= jdk-zero-vm
+.endif
.include "../../mk/bsd.options.mk"
@@ -13,9 +16,56 @@ PKG_SUGGESTED_OPTIONS= jre-jce
MAKE_ENV+= UNLIMITED_CRYPTO=true
.endif
-# this option builds a JVM without assembly optimisation. Useful for porting.
-# NOTE: This is work in progress.
+###
+### X11 or headless build
+###
+PLIST_VARS+= x11
+.if !empty(PKG_OPTIONS:Mx11)
+PLIST.x11= yes
+MAKE_ENV+= ALT_X11_PATH=${X11BASE}
+DEPENDS+= dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
+#DEPENDS+= ja-sazanami-ttf-[0-9]*:../../fonts/ja-sazanami-ttf
+#DEPENDS+= baekmuk-ttf-[0-9]*:../../fonts/baekmuk-ttf
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXp?= build
+.include "../../x11/libXp/buildlink3.mk"
+BUILDLINK_DEPMETHOD.libXt?= build
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
+.else
+MAKE_ENV+= BUILD_HEADLESS_ONLY=true
+.endif
+
+#
+# Debugging
+#
+.if !empty(PKG_OPTIONS:Mdebug)
+PKG_FAIL_REASON+= "The fastdebug build is currently broken due to a linker error"
+PLIST_SRC+= PLIST.debug
+JDK_MAKE_TARGET= fastdebug_build
+MAKE_ENV+= FULL_DEBUG_SYMBOLS=1
+MAKE_ENV+= ZIP_DEBUGINFO_FILES=0
+MAKE_ENV+= USE_PRECOMPILED_HEADER=0
+.else
+JDK_MAKE_TARGET= all
+MAKE_ENV+= FULL_DEBUG_SYMBOLS=0
+.endif
+
+#
+# Build variant. Zero VM builds a portable JVM without assembly optimization.
+#
+PLIST_VARS+= native
.if !empty(PKG_OPTIONS:Mjdk-zero-vm)
-MAKE_ENV+= ZERO_BUILD=true
+MAKE_ENV+= ZERO_BUILD=true
+ # valid are i386 / amd64 / sparc* / ppc32 / ppc64
+MAKE_ENV+= ZERO_LIBARCH=${MACHINE_ARCH:S/x86_64/amd64/}
+ # valid are IA32 / AMD64 / SPARC / PPC32 / PPC64
+MAKE_ENV+= ZERO_ARCHDEF=${MACHINE_ARCH:S/i386/IA32/:S/x86_64/AMD64/}
+.include "../../mk/endian.mk"
+MAKE_ENV+= ZERO_ENDIANNESS=${MACHINE_ENDIAN}
.include "../../devel/libffi/buildlink3.mk"
+.else
+PLIST.native= yes
.endif
diff --git a/lang/openjdk7/patches/patch-ao b/lang/openjdk7/patches/patch-ao
index 9449d60e8bd..1919a3ed6f1 100644
--- a/lang/openjdk7/patches/patch-ao
+++ b/lang/openjdk7/patches/patch-ao
@@ -1,12 +1,12 @@
-$NetBSD: patch-ao,v 1.4 2013/06/23 17:39:43 jperkin Exp $
+$NetBSD: patch-ao,v 1.5 2015/02/08 23:40:09 tnn Exp $
-Support rhino.
+- Support rhino
+- Disable SunOS multiarch
+- Building japanese manpages crashes bootstrap JVM
-Disable SunOS multiarch.
-
---- jdk/make/common/Release.gmk.orig 2013-06-21 13:12:13.781215177 +0000
+--- jdk/make/common/Release.gmk.orig 2015-01-26 15:20:57.000000000 +0000
+++ jdk/make/common/Release.gmk
-@@ -67,7 +67,7 @@ EXPORTED_PRIVATE_PKGS = com.sun.servicet
+@@ -66,7 +66,7 @@ EXPORTED_PRIVATE_PKGS = com.oracle.net \
# 64-bit solaris has a few special cases. We define the variable
# SOLARIS64 for use in this Makefile to easily test those cases
ifeq ($(PLATFORM), solaris)
@@ -15,7 +15,15 @@ Disable SunOS multiarch.
SOLARIS64 = true
IMAGE_BINDIR = bin/$(ARCH)
endif
-@@ -227,7 +227,7 @@ endif
+@@ -193,6 +193,7 @@ for manbase in $(MANBASEDIRS:%=%/$(MAN1S
+ if [ -f $${manbase}/$${manpage} ] ; then \
+ $(CP) $${manbase}/$${manpage} $1/man/man1 ; \
+ for ja_encoding in $(JA_TARGET_ENCODINGS); do \
++ continue; \
+ ja_dir="ja"; \
+ if [ "$${ja_encoding}" != "$(JA_SOURCE_ENCODING)" ]; then \
+ ja_dir="ja_JP.$${ja_encoding}"; \
+@@ -229,7 +230,7 @@ endif
INITIAL_IMAGE_JRE=initial-image-jre
INITIAL_IMAGE_JDK=initial-image-jdk
ifeq ($(PLATFORM), solaris)
@@ -24,7 +32,7 @@ Disable SunOS multiarch.
INITIAL_IMAGE_JRE=initial-image-jre-sol64
INITIAL_IMAGE_JDK=initial-image-jdk-sol64
endif
-@@ -842,6 +842,7 @@ initial-image-jre:: initial-image-jre-se
+@@ -830,6 +831,7 @@ initial-image-jre:: initial-image-jre-se
$(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
$(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
$(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
@@ -32,7 +40,15 @@ Disable SunOS multiarch.
ifneq ($(JFR_JAR),)
$(CP) $(JFR_JAR) $(JRE_IMAGE_DIR)/lib/jfr.jar
endif
-@@ -1170,7 +1171,8 @@ initial-image-jdk:: initial-image-jdk-se
+@@ -931,6 +933,7 @@ ifeq ($(PLATFORM), macosx)
+ $(RM) $(JDK_SERVER_BUNDLE_DIR)/Home/man/man1/javaws.1
+ else
+ $(RM) -r $(JDK_SERVER_IMAGE_DIR)
++ $(RM) -rf $(JDK_IMAGE_DIR)/man/ja
+ $(CP) -r $(JDK_IMAGE_DIR) $(JDK_SERVER_IMAGE_DIR)
+ $(RM) -r $(JDK_SERVER_IMAGE_DIR)/demo
+ $(RM) -r $(JDK_SERVER_IMAGE_DIR)/sample
+@@ -1159,7 +1162,8 @@ initial-image-jdk:: initial-image-jdk-se
@#
@# Swing BeanInfo generation
@#
diff --git a/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_zeroshark.make b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_zeroshark.make
new file mode 100644
index 00000000000..945c829bf69
--- /dev/null
+++ b/lang/openjdk7/patches/patch-hotspot_make_bsd_makefiles_zeroshark.make
@@ -0,0 +1,12 @@
+$NetBSD: patch-hotspot_make_bsd_makefiles_zeroshark.make,v 1.1 2015/02/08 23:40:09 tnn Exp $
+
+--- hotspot/make/bsd/makefiles/zeroshark.make.orig 2015-01-26 15:21:52.000000000 +0000
++++ hotspot/make/bsd/makefiles/zeroshark.make
+@@ -57,6 +57,6 @@ else
+ endif
+
+ CFLAGS += -I$(PACKAGE_PATH)/include
+-LIBS += -L$(PACKAGE_PATH)/lib -lffi
++LIBS += -Wl,-R$(PACKAGE_PATH)/lib -L$(PACKAGE_PATH)/lib -lffi
+
+ OPT_CFLAGS/compactingPermGenGen.o = -O1
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-20 15:18:30 +0000