Resurrection.
This commit is contained in:
Francois Tigeot
Thomas Klausner
parent
34b0efa4c6
commit
be75143eaf
29 changed files with 3211 additions and 0 deletions
6
jdk15/DEINSTALL
Normal file
6
jdk15/DEINSTALL
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
# $NetBSD: DEINSTALL,v 1.3 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
case ${STAGE} in
|
||||
DEINSTALL)
|
||||
${RM} -f @JAVA_HOME@/lib/@MACHINE_ARCH@/client/classes.jsa;;
|
||||
esac
|
||||
19
jdk15/DESCR
Normal file
19
jdk15/DESCR
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
This is Sun's Java[tm] Development Kit, version 1.5.0, made buildable
|
||||
and usable natively on NetBSD/i386 by Greg Lewis and a host of others.
|
||||
|
||||
===== From the patchset README:
|
||||
|
||||
This is a set of source code patches for the JDK 1.5.0 Update 13 JRL source.
|
||||
The resulting JDK should be suitable for most uses, although using it in
|
||||
a production environment is at your own risk. Please note that this
|
||||
patchset only provides support for recent versions of FreeBSD, NetBSD
|
||||
and OpenBSD. The patchset is available at
|
||||
|
||||
http://www.eyesbeyond.com/freebsddom/java/jdk15.html
|
||||
|
||||
Please read the file THANKS for attributions.
|
||||
|
||||
Instructions to build the JDK are contained in the file BUILD.
|
||||
|
||||
You should also examine the ChangeLog for the changes that have been
|
||||
made so far, and notes on them.
|
||||
6
jdk15/INSTALL
Normal file
6
jdk15/INSTALL
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
# $NetBSD: INSTALL,v 1.3 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
case ${STAGE} in
|
||||
POST-INSTALL)
|
||||
${PREFIX}/bin/jdk15-java -Xshare:dump;;
|
||||
esac
|
||||
21
jdk15/MESSAGE.plugin
Normal file
21
jdk15/MESSAGE.plugin
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
===========================================================================
|
||||
$NetBSD: MESSAGE.plugin,v 1.5 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
If you have built the Mozilla browser plugin, you must create a symlink to
|
||||
|
||||
${JAVA_HOME}/jre/plugin/i386/ns7/libjavaplugin_oji.so
|
||||
|
||||
in the ${PREFIX}/lib/${MOZILLA}/plugins/ dir, for any ${MOZILLA} package
|
||||
(firefox, firefox-gtk1, seamonkey, seamonkey-gtk1) you want to use the plugin
|
||||
with.
|
||||
|
||||
There may be problems loading Java applets if you have ipv6 support enabled.
|
||||
The workaround is to disable ipv6 for java applets:
|
||||
|
||||
1. Go to the Java control panel (${JAVA_HOME}/bin/ControlPanel)
|
||||
2. Go to the 'Java' tab and click 'View' under 'Java Applet Runtime Settings'
|
||||
3. In the 'Java Runtime Parameters' box, paste the following line in:
|
||||
|
||||
-Djava.net.preferIPv6Addresses=false -Djava.net.preferIPv4Stack=true
|
||||
|
||||
===========================================================================
|
||||
171
jdk15/Makefile
Normal file
171
jdk15/Makefile
Normal file
|
|
@ -0,0 +1,171 @@
|
|||
# $NetBSD: Makefile,v 1.38 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
.include "../../wip/jdk16/Makefile.common"
|
||||
|
||||
JDK_VERSION= 1.5.0
|
||||
JDK_UPDATE= 13
|
||||
# If updating, please check if patch-ar is still needed. (introduced in patch8)
|
||||
JDK_PATCHSET_VERSION= 8
|
||||
JDK_VERSION_STRING= b05-jrl-25_sep_2007
|
||||
|
||||
DISTNAME= jdk-${JDK_VERSION:S/./_/g}_${JDK_UPDATE}
|
||||
PKGNAME= jdk15-${JDK_VERSION}.${JDK_UPDATE}.${JDK_PATCHSET_VERSION}
|
||||
MASTER_SITES+= # http://download.java.net/tiger/archive/tiger_u${JDK_UPDATE}/
|
||||
MASTER_SITES+= # http://www.eyesbeyond.com/freebsddom/java/jdk15.html
|
||||
DISTFILES= ${JRL_SRCFILE} ${JRL_BINFILE} ${PATCHSETFILE}
|
||||
|
||||
COMMENT= Java Development Kit ${JDK_VERSION}
|
||||
LICENSE= sun-jrl-16-license
|
||||
|
||||
MAKE_JOBS_SAFE= no
|
||||
USE_TOOLS+= patch pax
|
||||
WRKSRC= ${WRKDIR}
|
||||
|
||||
ONLY_FOR_PLATFORM= NetBSD-[2-9]*-i386
|
||||
ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-x86_64
|
||||
|
||||
JAVA_NAME= jdk15
|
||||
JAVA_WRAPPERS= appletviewer jar java javac javadoc javah javap
|
||||
|
||||
.if exists(${PREFIX}/java/jdk-1.6.0/bin/javac) && defined(NOT_YET)
|
||||
BUILD_DEPENDS+= jdk16>=1:../../wip/jdk16
|
||||
ALT_BOOTDIR= ${PREFIX}/java/jdk-1.6.0
|
||||
.elif exists(${PREFIX}/java/jdk-1.5.0/bin/javac)
|
||||
#don't depend on my myself
|
||||
#BUILD_DEPENDS+= jdk15>=1
|
||||
ALT_BOOTDIR= ${PREFIX}/java/jdk-1.5.0
|
||||
.elif exists(${PREFIX}/java/sun-6/bin/javac) && defined(NOT_YET)
|
||||
BUILD_DEPENDS+= sun-jdk6>=1:../../lang/sun-jdk6
|
||||
ALT_BOOTDIR= ${PREFIX}/java/sun-6
|
||||
.else
|
||||
BUILD_DEPENDS+= sun-jdk15>=1:../../lang/sun-jdk15
|
||||
ALT_BOOTDIR= ${PREFIX}/java/sun-1.5
|
||||
.endif
|
||||
|
||||
.if !empty(MAKE_ENV:M*/java/sun-*) && !exists(/emul/linux/proc/uptime) && !exists(/proc/uptime)
|
||||
PKG_FAIL_REASON= "If bootstrapping with Linux JDK,"
|
||||
PKG_FAIL_REASON+= "then /emul/linux/proc must be mounted. Run:"
|
||||
PKG_FAIL_REASON+= "mount -o linux -t procfs /dev/null /emul/linux/proc"
|
||||
.endif
|
||||
|
||||
# used to find "zip" and "unzipsfx"
|
||||
MAKE_FLAGS+= M4=${M4:Q}
|
||||
MAKE_FLAGS+= ALT_DEVTOOLS_PATH=${PREFIX}/bin
|
||||
MAKE_FLAGS+= ALT_COMPILER_PATH=${WRAPPER_BINDIR:Q}
|
||||
MAKE_ENV+= LANG=C
|
||||
MAKE_ENV+= JAVA_HOME=
|
||||
MAKE_ENV+= CLASSPATH=
|
||||
MAKE_ENV+= ALT_MOTIF_DIR=${MOTIFBASE:Q}
|
||||
MAKE_ENV+= DEV_ONLY=YES
|
||||
MAKE_ENV+= SYS_CFLAGS=${CFLAGS:Q}
|
||||
MAKE_ENV+= LD_LIBRARY_PATH=
|
||||
MAKE_ENV+= SKIP_COMPARE_IMAGES=YES
|
||||
MAKE_ENV+= ALT_BOOTDIR=${ALT_BOOTDIR}
|
||||
|
||||
# MAKE_ENV+= WRAPPER_DEBUG=yes
|
||||
|
||||
JRL_SRCFILE= ${DISTNAME}-fcs-src-${JDK_VERSION_STRING}.jar
|
||||
JRL_BINFILE= ${DISTNAME}-fcs-bin-${JDK_VERSION_STRING}.jar
|
||||
PATCHSETFILE= bsd-jdk15-patches-${JDK_PATCHSET_VERSION}.tar.bz2
|
||||
|
||||
JRL_DOWNLOAD= http://download.java.net/tiger/archive/tiger_u${JDK_UPDATE}/
|
||||
PATCH_DOWNLOAD= http://www.eyesbeyond.com/freebsddom/java/JDK15JRLConfirm.html
|
||||
|
||||
# Use JAVA_MACHINE_ARCH rather than MACHINE as we would want to share
|
||||
# at a MACHINE_ARCH level if we ever build for powerpc or mips
|
||||
JAVA_MACHINE_ARCH=${MACHINE_ARCH}
|
||||
.if ${MACHINE_ARCH} == "i386"
|
||||
JDKIMAGEDIR= ${WRKDIR}/${BUILD_DIRS}/../build/bsd-i586/j2sdk-image
|
||||
# JDKIMAGEDIR_G= ${WRKDIR}/${BUILD_DIRS}/../build/bsd-i586/j2sdk-debug-image
|
||||
.elif ${MACHINE_ARCH} == "x86_64"
|
||||
JAVA_MACHINE_ARCH= amd64
|
||||
JDKIMAGEDIR= ${WRKDIR}/${BUILD_DIRS}/../build/bsd-amd64/j2sdk-image
|
||||
# JDKIMAGEDIR_G= ${WRKDIR}/${BUILD_DIRS}/../build/bsd-amd64/j2sdk-debug-image
|
||||
.endif
|
||||
|
||||
FETCH_MESSAGE+= " The source and patches for the Java (tm) 2 SDK require"
|
||||
FETCH_MESSAGE+= " a Sun Java Research License, and cannot be"
|
||||
FETCH_MESSAGE+= " fetched automatically."
|
||||
FETCH_MESSAGE+= ""
|
||||
FETCH_MESSAGE+= " Please download the JDK 5.0 JRL Source (${JRL_SRCFILE})"
|
||||
FETCH_MESSAGE+= " and JRL Binaries (${JRL_BINFILE}) for J2SE from:"
|
||||
FETCH_MESSAGE+= " ${JRL_DOWNLOAD}"
|
||||
FETCH_MESSAGE+= " and place them as:"
|
||||
FETCH_MESSAGE+= " ${DISTDIR}/${JRL_SRCFILE}"
|
||||
FETCH_MESSAGE+= " ${DISTDIR}/${JRL_BINFILE}"
|
||||
.if !empty(PKG_OPTIONS:Mjdk15-jce)
|
||||
FETCH_MESSAGE+= ""
|
||||
FETCH_MESSAGE+= " Additionally, for the Java Cryptography Extension"
|
||||
FETCH_MESSAGE+= " please download jce_policy-1_5_0.zip from"
|
||||
FETCH_MESSAGE+= " http://java.sun.com/javase/downloads/index_jdk5.jsp"
|
||||
FETCH_MESSAGE+= " via the link named Java Cryptography Extension (JCE)"
|
||||
FETCH_MESSAGE+= " Unlimited Strength Jurisdiction Policy Files 5.0"
|
||||
FETCH_MESSAGE+= " and place it in ${DISTDIR}"
|
||||
.endif
|
||||
FETCH_MESSAGE+= ""
|
||||
FETCH_MESSAGE+= " Please download the BSD JDK 1.5 Patchset ${JDK_PATCHSET_VERSION}"
|
||||
FETCH_MESSAGE+= " (${PATCHSETFILE}) from:"
|
||||
FETCH_MESSAGE+= " ${PATCH_DOWNLOAD}"
|
||||
FETCH_MESSAGE+= " and place it as:"
|
||||
FETCH_MESSAGE+= " ${DISTDIR}/${PATCHSETFILE}"
|
||||
FETCH_MESSAGE+= ""
|
||||
FETCH_MESSAGE+= " Then resume this build by running '"${MAKE:Q}"' again."
|
||||
|
||||
MESSAGE_SUBST+= PREFIX=${PREFIX}
|
||||
MESSAGE_SUBST+= JAVA_HOME=${JAVA_HOME}
|
||||
MESSAGE_SUBST+= MOZILLA=${MOZILLA}
|
||||
|
||||
SUBST_CLASSES+= paths
|
||||
SUBST_STAGE.paths= pre-configure
|
||||
SUBST_FILES.paths= control/make/common/Defs-bsd.gmk
|
||||
SUBST_FILES.paths+= deploy/make/common/Defs-bsd.gmk
|
||||
SUBST_FILES.paths+= deploy/make/plugin/common/config.gmk
|
||||
SUBST_FILES.paths+= deploy/make/plugin/unsupported/ns6-adapter/Makefile
|
||||
SUBST_FILES.paths+= hotspot/src/os/bsd/vm/os_bsd.cpp
|
||||
SUBST_FILES.paths+= j2se/make/common/Defs-bsd.gmk
|
||||
SUBST_FILES.paths+= motif/lib/Xm/Makefile
|
||||
SUBST_FILES.paths+= motif/lib/Xm/util/Makefile
|
||||
SUBST_FILES.paths+= j2se/src/solaris/native/sun/awt/fontpath.c
|
||||
SUBST_FILES.paths+= j2se/make/sun/xawt/Makefile
|
||||
SUBST_FILES.paths+= j2se/make/sun/awt/mawt.gmk
|
||||
SUBST_SED.paths= -e 's,%%PREFIX%%,${PREFIX},g'
|
||||
SUBST_SED.paths+= -e 's,%%X11BASE%%,${X11BASE},g'
|
||||
SUBST_SED.paths+= -e 's,%%JVM_HOME%%,${JVM_HOME},g'
|
||||
|
||||
.include "options.mk"
|
||||
|
||||
PLIST_VARS+= jce plugin
|
||||
PLIST_SUBST+= JAVA_MACHINE_ARCH=${JAVA_MACHINE_ARCH:Q}
|
||||
|
||||
.include "../../wip/jdk16/license-extract.mk"
|
||||
|
||||
pre-patch:
|
||||
cd ${WRKSRC} && ${PATCH} -p0 -E -s <jdk15.patches
|
||||
${FIND} ${WRKSRC}/ -name '*.orig' -print | ${XARGS} ${RM} -f
|
||||
|
||||
post-patch:
|
||||
${MKDIR} ${WRKSRC}/control/build/bsd-i586/lib/i386/server
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM_DIR} ${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
|
||||
${TOUCH} ${DESTDIR}${JAVA_HOME}/jre/.systemPrefs/.systemRootModFile
|
||||
${CHMOD} 644 ${DESTDIR}${JAVA_HOME}/jre/.systemPrefs/.systemRootModFile
|
||||
${INSTALL_DATA} ${FILESDIR}/cacerts \
|
||||
${DESTDIR}${JAVA_HOME}/jre/lib/security/cacerts
|
||||
# ${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"
|
||||
|
||||
.include "../../mk/java-env.mk"
|
||||
.include "../../x11/libXi/buildlink3.mk"
|
||||
.include "../../x11/libXtst/buildlink3.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
2403
jdk15/PLIST
Normal file
2403
jdk15/PLIST
Normal file
File diff suppressed because it is too large
Load diff
7
jdk15/TODO
Normal file
7
jdk15/TODO
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
* files/cacerts stolen from a Sun JDK 1.6 installation -- is there
|
||||
a better source?
|
||||
|
||||
* The JDK Makefiles use `gcc -w' to suppress all the static and
|
||||
inline warning messages from the build -- and there are lots!
|
||||
But `-w' is stripped by the pkgsrc wrappers for gcc. Can we
|
||||
add this back in? Is it worth it?
|
||||
22
jdk15/buildlink3.mk
Normal file
22
jdk15/buildlink3.mk
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
# $NetBSD: buildlink3.mk,v 1.8 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
BUILDLINK_TREE+= jdk15
|
||||
|
||||
.if !defined(JDK15_BUILDLINK3_MK)
|
||||
JDK15_BUILDLINK3_MK:=
|
||||
|
||||
BUILDLINK_API_DEPENDS.jdk15+= jdk15>=1.5.0.2
|
||||
BUILDLINK_PKGSRCDIR.jdk15?= ../../wip/jdk15
|
||||
BUILDLINK_JAVA_PREFIX.jdk15= ${PREFIX}/java/jdk-1.5.0
|
||||
|
||||
BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_JAVA_PREFIX.jdk15}
|
||||
|
||||
BUILDLINK_CPPFLAGS.jdk15= \
|
||||
-I${BUILDLINK_JAVA_PREFIX.jdk15}/include \
|
||||
-I${BUILDLINK_JAVA_PREFIX.jdk15}/include/netbsd
|
||||
|
||||
.include "../../x11/libXi/buildlink3.mk"
|
||||
.include "../../x11/libXtst/buildlink3.mk"
|
||||
.endif # JDK15_BUILDLINK3_MK
|
||||
|
||||
BUILDLINK_TREE+= -jdk15
|
||||
32
jdk15/distinfo
Normal file
32
jdk15/distinfo
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
$NetBSD: distinfo,v 1.14 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
SHA1 (bsd-jdk15-patches-8.tar.bz2) = d79d11da85629933530e64ad53ab3319c626a090
|
||||
RMD160 (bsd-jdk15-patches-8.tar.bz2) = 36efc84ca89f11e7a3cd51511656164a22d5e7b6
|
||||
Size (bsd-jdk15-patches-8.tar.bz2) = 795972 bytes
|
||||
SHA1 (jce_policy-1_5_0.zip) = f0e887b91b4499142285633e65c5710c3a133a16
|
||||
RMD160 (jce_policy-1_5_0.zip) = eb12d0333c3ddbbba57a0e825a6891a75ec485c0
|
||||
Size (jce_policy-1_5_0.zip) = 8826 bytes
|
||||
SHA1 (jdk-1_5_0_13-fcs-bin-b05-jrl-25_sep_2007.jar) = bfb00bc2932ed0f2b94c32e04ad2f9ad14615f85
|
||||
RMD160 (jdk-1_5_0_13-fcs-bin-b05-jrl-25_sep_2007.jar) = 2e77b0d7840db8551ec8ff81792a3618f61e3cd7
|
||||
Size (jdk-1_5_0_13-fcs-bin-b05-jrl-25_sep_2007.jar) = 2211512 bytes
|
||||
SHA1 (jdk-1_5_0_13-fcs-src-b05-jrl-25_sep_2007.jar) = b0e6c0865812b999b02297b2e5b907178a4bb6e7
|
||||
RMD160 (jdk-1_5_0_13-fcs-src-b05-jrl-25_sep_2007.jar) = e4f845610846cfc26c0bf04d12eeacf419dfb902
|
||||
Size (jdk-1_5_0_13-fcs-src-b05-jrl-25_sep_2007.jar) = 57749554 bytes
|
||||
SHA1 (patch-aa) = 6f250d23eda6ec3d6ec0c7b485fcc3739b379a88
|
||||
SHA1 (patch-ab) = 549dac84644247e0c90978f2c78ce49ee62f7434
|
||||
SHA1 (patch-ac) = ceb2b0fe31ca6fc3a06285625655db1ee20ec0a1
|
||||
SHA1 (patch-ad) = 18014bd4b668be764cc1a170b161e80cd48c625f
|
||||
SHA1 (patch-ae) = a5c50cc33f8fcbdd66318af81fe303285bab6f3b
|
||||
SHA1 (patch-af) = c6ab873b86e71bf23476a2a17a3e40454f24608a
|
||||
SHA1 (patch-ag) = bec1a8c871b826361ab5acbe7c7b64f92b71d8bc
|
||||
SHA1 (patch-ah) = ebba71477dccc416e81e1d3aaca5d098a03df760
|
||||
SHA1 (patch-aj) = c28c777ebfceea200fd0e0311981be5b38cbb247
|
||||
SHA1 (patch-ak) = 8a9140f181fcc8a02b3c70b062fc3e750393d235
|
||||
SHA1 (patch-al) = c4213a76eed62ce25b7a7ce7a594cbb100e597bd
|
||||
SHA1 (patch-am) = b5ada7467faacb99847260793dc9675e31b05132
|
||||
SHA1 (patch-an) = 131efa89c7a4623a2aa56238f27b336a5c5cda4e
|
||||
SHA1 (patch-ao) = 331f0ebcc03382cf44ad6c4ea3d1f40b2409907e
|
||||
SHA1 (patch-ap) = e9288fdd092e5015ac116f3b4fd76a946a625380
|
||||
SHA1 (patch-aq) = 84e71786c7c399646cd4bc964cffb27dcfedac2c
|
||||
SHA1 (patch-ar) = bcacdff75fd31ec3d75df0ac420b5c30b3713c6d
|
||||
SHA1 (patch-as) = c230c9e376ee74d7c75681aaf62d9b1c9527515f
|
||||
BIN
jdk15/files/cacerts
Normal file
BIN
jdk15/files/cacerts
Normal file
Binary file not shown.
43
jdk15/options.mk
Normal file
43
jdk15/options.mk
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
# $NetBSD: options.mk,v 1.16 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
PKG_OPTIONS_VAR= PKG_OPTIONS.jdk15
|
||||
PKG_SUPPORTED_OPTIONS= sun-jre-jce jdk15-plugin inet6
|
||||
#PKG_SUGGESTED_OPTIONS= jdk15-plugin
|
||||
|
||||
#.include "../../www/seamonkey/gecko-options.mk"
|
||||
.include "../../mk/bsd.options.mk"
|
||||
|
||||
.if empty(PKG_OPTIONS:Minet6)
|
||||
MAKE_ENV+= DONT_ENABLE_IPV6=YES
|
||||
.endif
|
||||
|
||||
###
|
||||
### Java(TM) Cryptography Extension (JCE)
|
||||
###
|
||||
.if !empty(PKG_OPTIONS:Msun-jre-jce)
|
||||
DISTFILES+= jce_policy-1_5_0.zip
|
||||
PLIST.jce= yes
|
||||
post-build:
|
||||
cd ${WRKDIR}/jce ; pax -rw -pp . ${JDKIMAGEDIR}/jre/lib/security
|
||||
.endif
|
||||
|
||||
|
||||
###
|
||||
### Mozilla plugin
|
||||
###
|
||||
.if !empty(PKG_OPTIONS:Mjdk15-plugin)
|
||||
|
||||
MOZILLA= ${PKG_OPTIONS:@opt@${PKG_OPTIONS_GROUP.gecko:M${opt}}@}
|
||||
MAKE_ENV+= BROWSER=${MOZILLA:Q}
|
||||
MAKE_ENV+= ALT_MOZILLA_HEADERS_PATH=${PREFIX:Q}/include/${MOZILLA}
|
||||
|
||||
#.include "../../www/seamonkey/gecko-depends.mk"
|
||||
# Check: is nspr necessary?
|
||||
#.include "../../devel/nspr/buildlink3.mk"
|
||||
BUILDLINK_DEPMETHOD.nspr= build
|
||||
PLIST.plugin= yes
|
||||
MESSAGE_SRC+= MESSAGE.plugin
|
||||
|
||||
.else
|
||||
MAKE_ENV+= BUILD_PLUGIN=false
|
||||
.endif
|
||||
16
jdk15/patches/patch-aa
Normal file
16
jdk15/patches/patch-aa
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
$NetBSD: patch-aa,v 1.4 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
--- control/make/common/Defs-bsd.gmk.orig 2005-09-07 10:16:01.000000000 +0200
|
||||
+++ control/make/common/Defs-bsd.gmk
|
||||
@@ -198,9 +198,9 @@ endif
|
||||
# DEVTOOLS_PATH is for other tools required for building (such as
|
||||
# zip, etc.)
|
||||
ifeq ($(TRUE_PLATFORM), NetBSD)
|
||||
-DEVTOOLS_PATH = /usr/pkg/bin/
|
||||
+DEVTOOLS_PATH = %%PREFIX%%/bin/
|
||||
else
|
||||
-DEVTOOLS_PATH = /usr/local/bin/
|
||||
+DEVTOOLS_PATH = %%PREFIX%%/bin/
|
||||
endif
|
||||
# Allow the user to override the default value...
|
||||
ifdef ALT_DEVTOOLS_PATH
|
||||
22
jdk15/patches/patch-ab
Normal file
22
jdk15/patches/patch-ab
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
$NetBSD: patch-ab,v 1.4 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
--- deploy/make/common/Sanity.gmk.orig 2007-02-28 09:48:25.000000000 -0600
|
||||
+++ deploy/make/common/Sanity.gmk
|
||||
@@ -181,7 +181,7 @@ mozilla:
|
||||
fi
|
||||
else
|
||||
ifeq ($(PLATFORM), bsd)
|
||||
- @if [ ! -r $(subst \,/,$(MOZILLA_HEADERS_PATH))/mozilla_headers_ns7/nsIPlugin.h ]; then \
|
||||
+ @if [ ! -r $(subst \,/,$(MOZILLA_HEADERS_PATH))/plugin/nsIPlugin.h ]; then \
|
||||
$(ECHO) "ERROR: You do not have access to valid Mozilla header files. \n" \
|
||||
" Please check your access to \n" \
|
||||
" $(subst \,/,$(MOZILLA_HEADERS_PATH))/mozilla_headers_ns7/nsIPlugin.h \n" \
|
||||
@@ -189,7 +189,7 @@ mozilla:
|
||||
"" >> $(ERROR_FILE) ; \
|
||||
fi
|
||||
else
|
||||
- @if [ ! -r $(subst \,/,$(MOZILLA_HEADERS_PATH))/mozilla_headers_ns7/bool.h ]; then \
|
||||
+ @if [ ! -r $(subst \,/,$(MOZILLA_HEADERS_PATH))/java/bool.h ]; then \
|
||||
$(ECHO) "ERROR: You do not have access to valid Mozilla header files. \n" \
|
||||
" Please check your access to \n" \
|
||||
" $(subst \,/,$(MOZILLA_HEADERS_PATH))/mozilla_headers_ns7/bool.h \n" \
|
||||
16
jdk15/patches/patch-ac
Normal file
16
jdk15/patches/patch-ac
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
$NetBSD: patch-ac,v 1.3 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
--- deploy/make/plugin/common/config.gmk.orig 2005-09-07 10:16:01.000000000 +0200
|
||||
+++ deploy/make/plugin/common/config.gmk
|
||||
@@ -44,9 +44,9 @@ endif
|
||||
|
||||
ifeq ($(LINUX_OR_BSD), true)
|
||||
PLUGIN_PLATFORM_SRC := $(PLUGIN_TOP)/src/plugin/solaris
|
||||
- OTHER_LDFLAGS = -L/usr/X11R6/lib
|
||||
+ OTHER_LDFLAGS = -L%%X11BASE%%/lib
|
||||
ifeq ($(TRUE_PLATFORM), NetBSD)
|
||||
- OTHER_LDFLAGS += -Wl,-R/usr/X11R6/lib
|
||||
+ OTHER_LDFLAGS += -Wl,-R%%X11BASE%%/lib
|
||||
endif
|
||||
endif
|
||||
|
||||
13
jdk15/patches/patch-ad
Normal file
13
jdk15/patches/patch-ad
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
$NetBSD: patch-ad,v 1.4 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
--- deploy/make/plugin/unsupported/ns6-adapter/Makefile.orig 2005-09-07 10:58:23.000000000 +0200
|
||||
+++ deploy/make/plugin/unsupported/ns6-adapter/Makefile
|
||||
@@ -29,7 +29,7 @@ endif
|
||||
endif
|
||||
|
||||
CPPINCPATH = $(SRCDIR) $(SRCDIR)/../adapter-common $(SRCDIR)/../jcomponent/public-include $(subst $(LIBRARY),,$(TMPDIR)) $(subst $(LIBRARY)/,,$(CLASSHDRDIR))
|
||||
-EXTRA_CPPFLAGS = -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610/nspr -I$(MOZILLA_LIBS_PATH)/../jpi/X11/include -I$(MOZILLA_LIBS_PATH)/../jpi/X11/lib/glib/include -DRAPTOR_API -DNEW_STREAMING_API
|
||||
+EXTRA_CPPFLAGS = -I%%PREFIX%%/include/nspr
|
||||
|
||||
vpath %.c $(SRCDIR):$(SRCDIR)/../adapter-common:$(PLUGIN_TOP)/src/plugin/oji-plugin/src/motif/common
|
||||
vpath %.cpp $(SRCDIR):$(SRCDIR)/../adapter-common:$(PLUGIN_TOP)/src/plugin/oji-plugin/src/motif/common
|
||||
13
jdk15/patches/patch-ae
Normal file
13
jdk15/patches/patch-ae
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
$NetBSD: patch-ae,v 1.3 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
--- j2se/make/sun/xawt/Makefile.orig 2005-09-19 19:19:53.000000000 +0200
|
||||
+++ j2se/make/sun/xawt/Makefile
|
||||
@@ -111,7 +111,7 @@ ifeq ($(PLATFORM), linux)
|
||||
endif
|
||||
|
||||
ifeq ($(PLATFORM), bsd)
|
||||
- CPPFLAGS += -I/usr/X11R6/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include
|
||||
+ CPPFLAGS += -I%%X11BASE%%/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include
|
||||
endif
|
||||
|
||||
ifeq ($(PLATFORM), solaris)
|
||||
43
jdk15/patches/patch-af
Normal file
43
jdk15/patches/patch-af
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
$NetBSD: patch-af,v 1.8 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
--- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2009-03-06 01:20:09.000000000 +0000
|
||||
+++ hotspot/src/os/bsd/vm/os_bsd.cpp
|
||||
@@ -57,8 +57,20 @@
|
||||
# define pthread_getprio(a) 0
|
||||
# define pthread_setprio(a, b) 0
|
||||
# define pthread_main_np() 0
|
||||
+typedef struct link_map Link_map; /* Needed on at least NetBSD 5.0 */
|
||||
#endif
|
||||
|
||||
+/*
|
||||
+ * XXX I have no idea why this is suddently needed.
|
||||
+ * It built fine on NetBSD 4.99.54 and then began failing on 4.99.55.
|
||||
+ * This definition usually lives in:
|
||||
+ * hotspot/src/share/vm/utilities/globalDefinitions.hpp
|
||||
+ * But doesn't seem to be picked up anymore.
|
||||
+ */
|
||||
+#ifdef bool
|
||||
+#undef bool
|
||||
+#endif
|
||||
+#define bool jint
|
||||
#ifndef timespecsub
|
||||
#define timespecsub(tsp, usp, vsp) \
|
||||
do { \
|
||||
@@ -508,7 +520,7 @@ void os::init_system_properties_values()
|
||||
#define getenv(n) ::getenv(n)
|
||||
|
||||
#ifndef DEFAULT_LD_LIBRARY_PATH
|
||||
-#define DEFAULT_LD_LIBRARY_PATH "/usr/lib" /* See ld.so.1(1) */
|
||||
+#define DEFAULT_LD_LIBRARY_PATH "/usr/lib:%%PREFIX%%/lib:%%X11BASE%%/lib" /* See ld.so.1(1) */
|
||||
#endif
|
||||
#define EXTENSIONS_DIR "/lib/ext"
|
||||
#define ENDORSED_DIR "/lib/endorsed"
|
||||
@@ -3000,7 +3012,7 @@ jint os::init_2(void) {
|
||||
|
||||
// XXX ugly hack for 32-bit address space, since we know the
|
||||
// java heap is allocated with mmap() not sbrk():
|
||||
-#if !defined(__OpenBSD__) && !defined(_LP64)
|
||||
+#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(_LP64)
|
||||
// set the max datasegment size to something reasonable
|
||||
// complain if getrlimit/setrlimit fails but continue regardless.
|
||||
struct rlimit dseg_size;
|
||||
58
jdk15/patches/patch-ag
Normal file
58
jdk15/patches/patch-ag
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
$NetBSD: patch-ag,v 1.5 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
--- j2se/make/common/Defs-bsd.gmk.orig 2007-02-28 10:53:38.000000000 -0600
|
||||
+++ j2se/make/common/Defs-bsd.gmk
|
||||
@@ -178,9 +178,9 @@ endif
|
||||
# DEVTOOLS_PATH is for other tools required for building (such as
|
||||
# zip, etc.)
|
||||
ifeq ($(TRUE_PLATFORM), NetBSD)
|
||||
-DEVTOOLS_PATH = /usr/pkg/bin/
|
||||
+DEVTOOLS_PATH = %%PREFIX%%/bin/
|
||||
else
|
||||
-DEVTOOLS_PATH = /usr/local/bin/
|
||||
+DEVTOOLS_PATH = %%PREFIX%%/bin/
|
||||
endif
|
||||
# Allow the user to override the default value...
|
||||
ifdef ALT_DEVTOOLS_PATH
|
||||
@@ -347,6 +347,10 @@ EXTRA_LIBS += -pthread
|
||||
# -L paths for finding and -ljava
|
||||
#
|
||||
LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH)
|
||||
+ifeq ($(TRUE_PLATFORM), NetBSD)
|
||||
+LDFLAGS_COMMON += -Wl,-rpath $(LIBDIR)/$(LIBARCH)
|
||||
+LDFLAGS_COMMON += -Wl,-rpath %%JVM_HOME%%/jre/lib/$(LIBARCH)
|
||||
+endif
|
||||
LDFLAGS_OPT = -Xlinker -O1 -Wl,-soname=$(LIB_PREFIX)$(LIBRARY)$(OPT_SUFFIX).$(LIBRARY_SUFFIX)
|
||||
LDFLAGS_DBG = -Wl,-soname=$(LIB_PREFIX)$(LIBRARY)$(DBG_SUFFIX).$(LIBRARY_SUFFIX)
|
||||
|
||||
@@ -398,6 +402,10 @@ endif
|
||||
VM_NAME = server
|
||||
JVMLIB = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME)
|
||||
JVMLIB += -ljvm$(SUFFIX)
|
||||
+ifeq ($(TRUE_PLATFORM), NetBSD)
|
||||
+JVMLIB += -Wl,-rpath $(LIBDIR)/$(LIBARCH)/$(VM_NAME)
|
||||
+JVMLIB += -Wl,-rpath %%JVM_HOME%%/jre/lib/$(LIBARCH)/$(VM_NAME)
|
||||
+endif
|
||||
JAVALIB = -ljava$(SUFFIX) $(JVMLIB)
|
||||
|
||||
#
|
||||
@@ -432,7 +440,7 @@ override LIBSOCKET =
|
||||
override LIBTHREAD =
|
||||
override MOOT_PRIORITIES = true
|
||||
override NO_INTERRUPTIBLE_IO = false
|
||||
-override OPENWIN_HOME = /usr/X11R6
|
||||
+override OPENWIN_HOME = %%X11BASE%%
|
||||
override OPENWIN_LIB = $(OPENWIN_HOME)/lib
|
||||
override OTHER_M4FLAGS = -DGNU_ASSEMBLER
|
||||
override SUN_CMM_SUBDIR =
|
||||
@@ -491,6 +499,10 @@ ifeq ($(TRUE_PLATFORM), OpenBSD)
|
||||
SYSTEM_ZLIB = true
|
||||
endif
|
||||
|
||||
+ifeq ($(TRUE_PLATFORM), NetBSD)
|
||||
+ SYSTEM_ZLIB = true
|
||||
+endif
|
||||
+
|
||||
#
|
||||
# Japanese manpages
|
||||
#
|
||||
26
jdk15/patches/patch-ah
Normal file
26
jdk15/patches/patch-ah
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
$NetBSD: patch-ah,v 1.3 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
--- j2se/make/sun/awt/mawt.gmk.orig 2005-09-19 19:19:53.000000000 +0200
|
||||
+++ j2se/make/sun/awt/mawt.gmk
|
||||
@@ -132,9 +132,9 @@ ifeq ($(STATIC_MOTIF),true)
|
||||
ifeq ($(ARCH_DATA_MODEL), 64)
|
||||
LIBXT = -lXt
|
||||
else
|
||||
- LIBXT = /usr/X11R6/lib/libXt.a
|
||||
- LIBSM = /usr/X11R6/lib/libSM.a
|
||||
- LIBICE = /usr/X11R6/lib/libICE.a
|
||||
+ LIBXT = %%X11BASE%%/lib/libXt.a
|
||||
+ LIBSM = %%X11BASE%%/lib/libSM.a
|
||||
+ LIBICE = %%X11BASE%%/lib/libICE.a
|
||||
endif
|
||||
endif
|
||||
else
|
||||
@@ -229,7 +229,7 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGD
|
||||
$(EVENT_MODEL)
|
||||
|
||||
ifeq ($(LINUX_OR_BSD), true)
|
||||
- CPPFLAGS += -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
|
||||
+ CPPFLAGS += -I%%X11BASE%%/include -I%%X11BASE%%/include/X11/extensions
|
||||
endif
|
||||
|
||||
ifeq ($(PLATFORM), solaris)
|
||||
15
jdk15/patches/patch-aj
Normal file
15
jdk15/patches/patch-aj
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
$NetBSD: patch-aj,v 1.4 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
--- deploy/make/common/Defs-bsd.gmk.orig 2005-09-07 10:16:01.000000000 +0200
|
||||
+++ deploy/make/common/Defs-bsd.gmk
|
||||
@@ -13,8 +13,8 @@ CLASSPATH_SEP = $(CLASSPATH_SEPARATOR)
|
||||
JUMP_EXE = $(BIN_DIR)/javaws$(SUFFIX)
|
||||
JUMP_EXE_DBG = $(BIN_DIR_DBG)/javaws$(DBG_SUFFIX)
|
||||
PATH_SEP = /
|
||||
-X11DIR = /usr/X11R6
|
||||
-LOCALDIR = /usr/local
|
||||
+X11DIR = %%X11BASE%%
|
||||
+LOCALDIR = %%PREFIX%%
|
||||
ifneq ($(TRUE_PLATFORM), NetBSD)
|
||||
LIBS = -L$(X11DIR)/lib -lX11 -L$(LOCALDIR)/lib -liconv
|
||||
else
|
||||
57
jdk15/patches/patch-ak
Normal file
57
jdk15/patches/patch-ak
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
$NetBSD: patch-ak,v 1.3 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
--- motif/lib/Xm/Makefile.orig 2004-10-19 20:44:03.000000000 +0200
|
||||
+++ motif/lib/Xm/Makefile
|
||||
@@ -128,12 +128,12 @@ TCLIBDIR = /usr/lib
|
||||
IMAKESRC = $(CONFIGSRC)/imake
|
||||
DEPENDSRC = $(CONFIGSRC)/makedepend
|
||||
|
||||
- INCROOT = /usr/X11R6/include
|
||||
- USRLIBDIR = /usr/X11R6/lib
|
||||
+ INCROOT = %%X11BASE%%/include
|
||||
+ USRLIBDIR = %%X11BASE%%/lib
|
||||
VARLIBDIR = /var/lib
|
||||
- SHLIBDIR = /usr/X11R6/lib
|
||||
+ SHLIBDIR = %%X11BASE%%/lib
|
||||
LINTLIBDIR = $(USRLIBDIR)/lint
|
||||
- MANPATH = /usr/X11R6/man
|
||||
+ MANPATH = %%X11BASE%%/man
|
||||
MANSOURCEPATH = $(MANPATH)/man
|
||||
MANDIR = $(MANSOURCEPATH)1
|
||||
LIBMANDIR = $(MANSOURCEPATH)3
|
||||
@@ -229,7 +229,7 @@ CXXEXTRA_INCLUDES =
|
||||
INSTDATFLAGS = -m 0444
|
||||
INSTKMEMFLAGS = -m 4711
|
||||
|
||||
- PROJECTROOT = /usr/X11R6
|
||||
+ PROJECTROOT = %%X11BASE%%
|
||||
|
||||
#CDEBUGFLAGS = -g -fno-strength-reduce
|
||||
CCOPTIONS = -ansi -pedantic
|
||||
@@ -302,7 +302,7 @@ CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN
|
||||
# X Window System make variables; these need to be coordinated with rules
|
||||
|
||||
XTOP = $(TOP)
|
||||
- BINDIR = /usr/X11R6/bin
|
||||
+ BINDIR = %%X11BASE%%/bin
|
||||
BUILDINCROOT = $(TOP)/exports
|
||||
BUILDINCDIR = $(BUILDINCROOT)/include
|
||||
BUILDINCTOP = ../..
|
||||
@@ -633,7 +633,7 @@ CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN
|
||||
# X Window System make variables; these need to be coordinated with rules
|
||||
|
||||
XTOP = $(TOP)
|
||||
- BINDIR = /usr/X11R6/bin
|
||||
+ BINDIR = %%X11BASE%%/bin
|
||||
BUILDINCROOT = $(TOP)/exports
|
||||
BUILDINCDIR = $(BUILDINCROOT)/include
|
||||
BUILDINCTOP = ../..
|
||||
@@ -955,7 +955,7 @@ TOP_MOTIF_INCLUDES = -I$(MINCLUDESRC)
|
||||
|
||||
MOTIFENVLIBDIR = $(TOP)/exports/lib
|
||||
|
||||
- USRINCDIR = /usr/X11R6/include
|
||||
+ USRINCDIR = %%X11BASE%%/include
|
||||
UIDDIR = $(LIBDIR)/uid
|
||||
TESTSRC = $(MTOP)/tests
|
||||
TESTLIB = $(TESTSRC)/lib
|
||||
57
jdk15/patches/patch-al
Normal file
57
jdk15/patches/patch-al
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
$NetBSD: patch-al,v 1.3 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
--- motif/lib/Xm/util/Makefile.orig 2004-10-19 20:44:15.000000000 +0200
|
||||
+++ motif/lib/Xm/util/Makefile
|
||||
@@ -128,12 +128,12 @@ TCLIBDIR = /usr/lib
|
||||
IMAKESRC = $(CONFIGSRC)/imake
|
||||
DEPENDSRC = $(CONFIGSRC)/util
|
||||
|
||||
- INCROOT = /usr/X11R6/include
|
||||
- USRLIBDIR = /usr/X11R6/lib
|
||||
+ INCROOT = %%X11BASE%%/include
|
||||
+ USRLIBDIR = %%X11BASE%%/lib
|
||||
VARLIBDIR = /var/lib
|
||||
- SHLIBDIR = /usr/X11R6/lib
|
||||
+ SHLIBDIR = %%X11BASE%%/lib
|
||||
LINTLIBDIR = $(USRLIBDIR)/lint
|
||||
- MANPATH = /usr/X11R6/man
|
||||
+ MANPATH = %%X11BASE%%/man
|
||||
MANSOURCEPATH = $(MANPATH)/man
|
||||
MANDIR = $(MANSOURCEPATH)1
|
||||
LIBMANDIR = $(MANSOURCEPATH)3
|
||||
@@ -230,7 +230,7 @@ CXXEXTRA_INCLUDES =
|
||||
INSTDATFLAGS = -m 0444
|
||||
INSTKMEMFLAGS = -m 4711
|
||||
|
||||
- PROJECTROOT = /usr/X11R6
|
||||
+ PROJECTROOT = %%X11BASE%%
|
||||
|
||||
#CDEBUGFLAGS = -O2 -fno-strength-reduce
|
||||
CDEBUGFLAGS =
|
||||
@@ -304,7 +304,7 @@ CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN
|
||||
# X Window System make variables; these need to be coordinated with rules
|
||||
|
||||
XTOP = $(TOP)
|
||||
- BINDIR = /usr/X11R6/bin
|
||||
+ BINDIR = %%X11BASE%%/bin
|
||||
BUILDINCROOT = $(TOP)/exports
|
||||
BUILDINCDIR = $(BUILDINCROOT)/include
|
||||
BUILDINCTOP = ../..
|
||||
@@ -634,7 +634,7 @@ CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN
|
||||
# X Window System make variables; these need to be coordinated with rules
|
||||
|
||||
XTOP = $(TOP)
|
||||
- BINDIR = /usr/X11R6/bin
|
||||
+ BINDIR = %%X11BASE%%/bin
|
||||
BUILDINCROOT = $(TOP)/exports
|
||||
BUILDINCDIR = $(BUILDINCROOT)/include
|
||||
BUILDINCTOP = ../..
|
||||
@@ -955,7 +955,7 @@ TOP_MOTIF_INCLUDES =
|
||||
|
||||
MOTIFENVLIBDIR = $(USRLIBDIR)
|
||||
|
||||
- USRINCDIR = /usr/X11R6/include
|
||||
+ USRINCDIR = %%X11BASE%%/include
|
||||
UIDDIR = $(LIBDIR)/uid
|
||||
TESTSRC = $(MTOP)/tests
|
||||
TESTLIB = $(TESTSRC)/lib
|
||||
34
jdk15/patches/patch-am
Normal file
34
jdk15/patches/patch-am
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
$NetBSD: patch-am,v 1.3 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
--- j2se/src/solaris/native/sun/awt/fontpath.c.orig 2005-09-07 11:10:06.000000000 +0200
|
||||
+++ j2se/src/solaris/native/sun/awt/fontpath.c
|
||||
@@ -93,24 +93,12 @@ static char *fullSolarisFontPath[] = {
|
||||
NULL, /* terminates the list */
|
||||
};
|
||||
|
||||
-#else /* __linux */
|
||||
-/* All the known interesting locations we have discovered on
|
||||
- * various flavors of Linux
|
||||
- */
|
||||
+#else /* __linux, BSD */
|
||||
static char *fullLinuxFontPath[] = {
|
||||
- "/usr/X11R6/lib/X11/fonts/TrueType", /* RH 7.1+ */
|
||||
- "/usr/X11R6/lib/X11/fonts/truetype", /* SuSE */
|
||||
- "/usr/X11R6/lib/X11/fonts/tt",
|
||||
- "/usr/X11R6/lib/X11/fonts/TTF",
|
||||
- "/usr/X11R6/lib/X11/fonts/OTF", /* RH 9.0 (but empty!) */
|
||||
- "/usr/share/fonts/ja/TrueType", /* RH 7.2+ */
|
||||
- "/usr/share/fonts/truetype",
|
||||
- "/usr/share/fonts/ko/TrueType", /* RH 9.0 */
|
||||
- "/usr/share/fonts/zh_CN/TrueType", /* RH 9.0 */
|
||||
- "/usr/share/fonts/zh_TW/TrueType", /* RH 9.0 */
|
||||
- "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType", /* Debian */
|
||||
- "/usr/X11R6/lib/X11/fonts/Type1",
|
||||
- "/usr/share/fonts/default/Type1", /* RH 9.0 */
|
||||
+ "%%X11BASE%%/lib/X11/fonts/Type1",
|
||||
+ "%%X11BASE%%/lib/X11/fonts/TTF",
|
||||
+ "%%X11BASE%%/lib/X11/fonts/TrueType",
|
||||
+ "%%X11BASE%%/lib/X11/fonts/tt",
|
||||
NULL, /* terminates the list */
|
||||
};
|
||||
#endif
|
||||
29
jdk15/patches/patch-an
Normal file
29
jdk15/patches/patch-an
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
$NetBSD: patch-an,v 1.4 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
--- deploy/src/plugin/share/adapter/ns7/CNS7Adapter_PluginServiceProvider.cpp.orig 2007-10-26 16:27:25.000000000 +0200
|
||||
+++ deploy/src/plugin/share/adapter/ns7/CNS7Adapter_PluginServiceProvider.cpp
|
||||
@@ -27,6 +27,7 @@
|
||||
#include "nsIJVMManager.h"
|
||||
#include "nsILiveconnect.h"
|
||||
#include "nsIObserverService.h"
|
||||
+#include "nsIComponentManager.h"
|
||||
#include "nsIJVMAuthTools.h"
|
||||
#include "CNSAdapter_JVMManager.h"
|
||||
#include "CNSAdapter_PluginManager.h"
|
||||
@@ -64,6 +65,16 @@ static JD_DEFINE_CID(jIBrowserAuthentica
|
||||
static JD_DEFINE_CID(jIBrowserAuthenticatorCID, IBROWSERAUTHENTICATOR_IID);
|
||||
|
||||
|
||||
+#ifndef NS_COMPONENTMANAGER_CID
|
||||
+#define NS_COMPONENTMANAGER_CID \
|
||||
+{ /* 91775d60-d5dc-11d2-92fb-00e09805570f */ \
|
||||
+ 0x91775d60, \
|
||||
+ 0xd5dc, \
|
||||
+ 0x11d2, \
|
||||
+ {0x92, 0xfb, 0x00, 0xe0, 0x98, 0x05, 0x57, 0x0f} \
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
static NS_DEFINE_CID(kCPluginManagerCID, NS_PLUGINMANAGER_CID);
|
||||
static NS_DEFINE_CID(kCJVMManagerCID, NS_JVMMANAGER_CID);
|
||||
static NS_DEFINE_CID(kCLiveConnectCID, NS_CLIVECONNECT_CID);
|
||||
20
jdk15/patches/patch-ao
Normal file
20
jdk15/patches/patch-ao
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
$NetBSD: patch-ao,v 1.3 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
--- deploy/make/plugin/adapter/ns7-adapter/Makefile.orig 2007-02-08 19:39:26.000000000 -0600
|
||||
+++ deploy/make/plugin/adapter/ns7-adapter/Makefile 2007-02-08 18:41:56.000000000 -0600
|
||||
@@ -65,7 +65,14 @@
|
||||
COREDIR = $(PLUGIN_TOP)/src/plugin/solaris/nscore
|
||||
COMMONDIR= $(PLUGIN_TOP)/src/plugin/solaris/common
|
||||
ifeq ($(PLATFORM), bsd)
|
||||
-MOZHDRDIR = $(subst \,/,$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns7)
|
||||
+MOZHDRDIR = $(subst \,/,$(MOZILLA_HEADERS_PATH)/) \
|
||||
+ $(subst \,/,$(MOZILLA_HEADERS_PATH)/plugin) \
|
||||
+ $(subst \,/,$(MOZILLA_HEADERS_PATH)/xpcom) \
|
||||
+ $(subst \,/,$(MOZILLA_HEADERS_PATH)/nspr) \
|
||||
+ $(subst \,/,$(MOZILLA_HEADERS_PATH)/caps) \
|
||||
+ $(subst \,/,$(MOZILLA_HEADERS_PATH)/liveconnect) \
|
||||
+ $(subst \,/,$(MOZILLA_HEADERS_PATH)/oji) \
|
||||
+ $(subst \,/,$(MOZILLA_HEADERS_PATH)/js)
|
||||
X11HDRDIR = /usr/X11R6/include
|
||||
ICONVHDRDIR = /usr/local/include
|
||||
NSPRHDRDIR = $(NSPR_HEADERS_PATH)
|
||||
22
jdk15/patches/patch-ap
Normal file
22
jdk15/patches/patch-ap
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
$NetBSD: patch-ap,v 1.4 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
--- deploy/src/plugin/share/adapter/common/CNSAdapter_JVMManager.cpp.orig 2008-02-27 03:38:28.000000000 +0100
|
||||
+++ deploy/src/plugin/share/adapter/common/CNSAdapter_JVMManager.cpp
|
||||
@@ -139,7 +139,7 @@ CNSAdapter_JVMManager::GetCurrentThread(
|
||||
|
||||
nsresult res = JD_OK;
|
||||
|
||||
- nsPluginThread* pPluginThread = NULL;
|
||||
+ PRThread* pPluginThread = NULL;
|
||||
res = m_pThreadManager->GetCurrentThread(&pPluginThread);
|
||||
|
||||
if (NS_SUCCEEDED(res) && pPluginThread)
|
||||
@@ -169,7 +169,7 @@ CNSAdapter_JVMManager::PostEvent(JDThrea
|
||||
if (spRunnable == NULL)
|
||||
return JD_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
- return m_pThreadManager->PostEvent((unsigned long)threadID, spRunnable, async);
|
||||
+ return m_pThreadManager->PostEvent((PRThread*)threadID, spRunnable, async);
|
||||
}
|
||||
|
||||
//nsISupports
|
||||
13
jdk15/patches/patch-aq
Normal file
13
jdk15/patches/patch-aq
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
$NetBSD: patch-aq,v 1.3 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
--- deploy/make/common/Defs.gmk.orig 2004-10-19 13:03:55.000000000 -0600
|
||||
+++ deploy/make/common/Defs.gmk
|
||||
@@ -70,7 +70,7 @@ ifeq ($(PLATFORM), windows)
|
||||
$(ECHO) false; \
|
||||
fi)
|
||||
else
|
||||
- BUILD_PLUGIN := true
|
||||
+ BUILD_PLUGIN ?= true
|
||||
endif
|
||||
|
||||
ifneq ($(MILESTONE),fcs)
|
||||
14
jdk15/patches/patch-ar
Normal file
14
jdk15/patches/patch-ar
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
$NetBSD: patch-ar,v 1.3 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
--- hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.cpp.orig 2008-02-27 03:38:29.000000000 +0100
|
||||
+++ hotspot/src/os_cpu/bsd_i486/vm/os_bsd_i486.cpp
|
||||
@@ -643,7 +643,8 @@ int JVM_handle_bsd_signal(int sig, sigin
|
||||
if ((sig == SIGSEGV || sig == SIGBUS) &&
|
||||
os::is_memory_serialize_page(thread, (address)info->si_addr)) {
|
||||
// Block current thread until the memory serialize page permission restored.
|
||||
- os::block_on_serialize_page_trap();
|
||||
+ //XXX Where is this defined?
|
||||
+ //os::block_on_serialize_page_trap();
|
||||
return true;
|
||||
}
|
||||
|
||||
13
jdk15/patches/patch-as
Normal file
13
jdk15/patches/patch-as
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
$NetBSD: patch-as,v 1.3 2010/11/27 14:04:52 ftigeot Exp $
|
||||
|
||||
--- hotspot/build/bsd/makefiles/vm.make.orig 2009-03-06 22:07:32.000000000 +0100
|
||||
+++ hotspot/build/bsd/makefiles/vm.make
|
||||
@@ -82,7 +82,7 @@ CFLAGS += -w
|
||||
#AOUT_FLAGS += -norunpath
|
||||
|
||||
COMPILE = ${CPP} ${CPPFLAGS} ${CFLAGS}
|
||||
-LINK_LIB = ${CPP} -shared -mimpure-text -fPIC
|
||||
+LINK_LIB = ${CPP} -shared -mimpure-text -fPIC -lgcc_s
|
||||
LINK = ${CPP} ${AOUT_FLAGS}
|
||||
|
||||
|
||||
Loading…
Reference in a new issue