Please welcome new participant of FreeBSD ports tree and Java ports

family -- first public patchset of native Sun JDK 1.5.0 port.

Most valuable addition of this patchset is native amd64 support.
And special thanks goes to Daniel Seuffert <ds@freeBSD.org> for
making it possible by providing amd64 hardware.

This patchset was tested on following configurations: i386/4.10,
i386/5.3, amd64/5.3.  5.3-RELEASE support is quite strong and
shown no huge visible problems over last week.

But even mentioning above note, keep in mind -- THIS IS ALPHA
PATCHSET and suitable for testers/developers ONLY!

Known issues are including (but for sure not limited to):

. Browser plugin support is missing
. JVMTI, JDWP and JMX are not tested yet
. FreeBSD i386/4.10 support is suffering from hidden memory
  allocation failres (ideas and patches are welcome)

NOTE ABOUT BOOTSTRAPING:  It's possible to bootstrap jdk 1.5.0 using
jdk 1.4.2 (either native or linux one).  There's no need to have
java/linux_jdk15 installed and working.

Supported by:		FreeBSD Foundation
This commit is contained in:
Alexey Zelkin 2005-01-20 08:41:13 +00:00
parent b0a9ba94f3
commit cfb6727090
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=126909
26 changed files with 220 additions and 4050 deletions

View file

@ -1,5 +1,5 @@
# New ports collection makefile for: jdk14 # New ports collection makefile for: jdk15
# Date created: 6 March 2003 # Date created: 12 January 2005
# Whom: Alexey Zelkin <phantom@FreeBSD.org> # Whom: Alexey Zelkin <phantom@FreeBSD.org>
# #
# $FreeBSD$ # $FreeBSD$
@ -9,45 +9,39 @@ PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION} PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION}
CATEGORIES= java devel CATEGORIES= java devel
MASTER_SITES= # http://www.sun.com/software/java2/download.html MASTER_SITES= # http://www.sun.com/software/java2/download.html
# http://www.eyesbeyond.com/freebsddom/java/jdk14.html # http://www.eyesbeyond.com/freebsddom/java/jdk15.html
SCSL_SRCFILE= j2sdk-${JDK_VERSION:S/./_/g}-src-scsl.zip SCSL_SRCFILE= jdk-${JDK_VERSION:S/./_/g}-src-scsl.zip
SCSL_BINFILE= j2sdk-${JDK_VERSION:S/./_/g}-bin-scsl.zip SCSL_BINFILE= jdk-${JDK_VERSION:S/./_/g}-bin-scsl.zip
PATCHSETFILE= bsd-jdk14-patches-${JDK_PATCHSET_VERSION}.tar.gz PATCHSETFILE= bsd-jdk15-patches-${JDK_PATCHSET_VERSION}.tar.bz2
DISTFILES= ${SCSL_SRCFILE} ${SCSL_BINFILE} ${PATCHSETFILE} DISTFILES= ${SCSL_SRCFILE} ${SCSL_BINFILE} ${PATCHSETFILE}
MAINTAINER= phantom@FreeBSD.org MAINTAINER= phantom@FreeBSD.org
COMMENT= Java Development Kit 1.4.2 COMMENT= Java Development Kit 1.5.0
# XXX: iconv dependency?
EXTRACT_DEPENDS=zip:${PORTSDIR}/archivers/zip EXTRACT_DEPENDS=zip:${PORTSDIR}/archivers/zip
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
zip:${PORTSDIR}/archivers/zip \ zip:${PORTSDIR}/archivers/zip \
${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif \ ${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif
${LOCALBASE}/include/nspr/prtypes.h:${PORTSDIR}/devel/nspr
RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper
.if !defined(MINIMAL)
RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts PLIST= ${WRKDIR}/pkg-plist
.endif PKGINSTALL= ${WRKDIR}/pkg-install
WRKSRC= ${WRKDIR}/control/make WRKSRC= ${WRKDIR}/control/make
JDK_VERSION= 1.4.2 JDK_VERSION= 1.5.0
JDK_PATCHSET_VERSION= 7 JDK_PATCHSET_VERSION= 1
LATEST_LINK= jdk14 LATEST_LINK= jdk15
SUN_LINUX_JDK_VERSION= 1.4.2 SUN_LINUX_JDK_VERSION= 1.4.2
.if !defined(WITH_LINUX_BOOTSTRAP) .if !defined(WITH_LINUX_BOOTSTRAP)
NATIVE_BOOTSTRAP_JDKS= ${LOCALBASE}/jdk1.4.2 \ NATIVE_BOOTSTRAP_JDKS= ${LOCALBASE}/jdk1.4.2 \
${LOCALBASE}/jdk1.4.1 ${LOCALBASE}/jdk1.5.0
.endif .endif
LINUX_BOOTSTRAP_JDKS= ${LOCALBASE}/linux-sun-jdk1.4.2_03 \ LINUX_BOOTSTRAP_JDKS= ${LOCALBASE}/linux-sun-jdk1.4.2
${LOCALBASE}/linux-sun-jdk1.4.2_02 \
${LOCALBASE}/linux-sun-jdk1.4.2_01 \
${LOCALBASE}/linux-sun-jdk1.4.2 \
${LOCALBASE}/linux-sun-jdk1.4.1_02 \
${LOCALBASE}/linux-sun-jdk1.4.1_01 \
${LOCALBASE}/linux-sun-jdk1.4.1
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
@ -77,61 +71,54 @@ JDK14DIR?= ${LOCALBASE}/linux-sun-jdk${SUN_LINUX_JDK_VERSION}
BUILD_DEPENDS+= ${JDK14DIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk14 BUILD_DEPENDS+= ${JDK14DIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk14
# workaround to handle both 'zip' and 'tar.gz' distfiles # workaround to handle both 'zip' and 'tar.bz2' distfiles
USE_ZIP= YES USE_ZIP= YES
EXTRACT_ONLY= ${SCSL_SRCFILE} ${SCSL_BINFILE} EXTRACT_ONLY= ${SCSL_SRCFILE} ${SCSL_BINFILE}
ONLY_FOR_ARCHS= i386 ONLY_FOR_ARCHS= i386 amd64
USE_GMAKE= YES USE_GMAKE= YES
USE_REINPLACE= YES USE_REINPLACE= YES
RESTRICTED= "Redistribution of pre-compiled binaries is not permitted" RESTRICTED= "Redistribution of pre-compiled binaries is not permitted"
NO_CDROM= "Redistribution of pre-compiled binaries is not permitted" NO_CDROM= "Redistribution of pre-compiled binaries is not permitted"
MAKE_ENV= ALT_BOOTDIR="${JDK14DIR}" \ MAKE_ENV= ALT_BOOTDIR="${JDK14DIR}" \
ALT_MOTIF_DIR="${X11BASE}" \ ALT_MOTIF_DIR="${X11BASE}" \
SYS_CFLAGS="${CFLAGS}" \ SYS_CFLAGS="${CFLAGS}" \
DEV_ONLY="YES" \
LANG="C" \ LANG="C" \
JAVA_HOME="" \ JAVA_HOME="" \
CLASSPATH="" \ CLASSPATH="" \
LD_LIBRARY_PATH="" \ LD_LIBRARY_PATH="" \
MAKEFLAGS="" MAKEFLAGS="" \
.if defined(MINIMAL) SKIP_COMPARE_IMAGES="YES" \
MAKE_ENV+= NO_PLUGIN="YES" \ DONT_BUILD_DOCS="YES" \
NO_JAVAWS="YES" DONT_BUILD_DEPLOY="YES" \
.endif DONT_BUILD_INSTALL="YES"
ALL_TARGET= all
PLIST_SUB+= JDK_VERSION=${JDK_VERSION}
PKGINSTALL= ${WRKDIR}/pkg-install
JDKIMAGEDIR= ${WRKSRC}/../build/bsd-i586/j2sdk-image
JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-i586/j2sdk-debug-image
.if !defined(WITH_IPV6) .if !defined(WITH_IPV6)
EXTRA_PATCHES+= ${PATCHDIR}/disable-ipv6.patch MAKE_ENV+= DONT_ENABLE_IPV6="YES"
.endif .endif
.if defined(MINIMAL) ALL_TARGET= all
PLIST_SUB+= MINIMAL:="@comment "
PKGNAMESUFFIX= -minimal .if (${ARCH} == amd64)
HOTSPOTARCH=amd64
.else .else
PLIST_SUB+= MINIMAL:="" HOTSPOTARCH=i586
.endif .endif
.if defined(WITH_DEBUG) JDKIMAGEDIR= ${WRKSRC}/../build/bsd-${HOTSPOTARCH}/j2sdk-image
PLIST_SUB+= DEBUG:="" JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-${HOTSPOTARCH}/j2sdk-debug-image
.else
PLIST_SUB+= DEBUG:="@comment "
.endif
PTHREAD_FILES= ../../hotspot/build/bsd/makefiles/vm.make \ PTHREAD_FILES= ../../hotspot/build/bsd/makefiles/vm.make \
../../j2se/make/com/sun/java/pack/Makefile \
../../j2se/make/common/Defs.gmk \ ../../j2se/make/common/Defs.gmk \
../../j2se/make/common/Program.gmk \
../../j2se/make/common/Defs-bsd.gmk \ ../../j2se/make/common/Defs-bsd.gmk \
../../j2se/make/java/hpi/hpi_common.gmk \ ../../j2se/make/common/Program.gmk \
../../j2se/make/java/hpi/native/Makefile \ ../../j2se/make/java/hpi/native/Makefile \
../../j2se/make/java/net/Makefile \ ../../j2se/make/java/net/Makefile \
../../deploy/make/common/Defs-bsd.gmk \ ../../j2se/make/java/nio/Makefile \
../../deploy/make/plugin/common/config.gmk ../../j2se/make/jpda/transport/socket/Makefile \
../../j2se/make/sun/cmm/Makefile \
../../j2se/make/sun/xawt/Makefile
LD_LIBRARY_PATH_FILES= ../../hotspot/src/os/bsd/vm/os_bsd.cpp LD_LIBRARY_PATH_FILES= ../../hotspot/src/os/bsd/vm/os_bsd.cpp
@ -168,45 +155,17 @@ IGNORE= :\n\
The source distribution exists on your system, but due to\n\ The source distribution exists on your system, but due to\n\
licensing restrictions you still need to download the\n\ licensing restrictions you still need to download the\n\
patchset, ${PATCHSETFILE}, from\n\ patchset, ${PATCHSETFILE}, from\n\
http://www.eyesbeyond.com/freebsddom/java/jdk14.html.\n\ http://www.eyesbeyond.com/freebsddom/java/jdk15.html.\n\
Please place the patchset in ${DISTDIR}.\n Please place the patchset in ${DISTDIR}.\n
.endif .endif
# JDK 1.4.2 require recent version of FreeBSD due to recent libc_r updates. pre-fetch:
# Make check for reqiuired primities as early as possible
TESTPROG=testos
.if ${OSVERSION} > 500000
LINKIT= -lc_r
.else
LINKIT= -pthread
.endif
check-os:
.if !defined(SKIP_OS_TEST)
-@mkdir -p ${WRKDIR} ; \
rm -f ${WRKDIR}/${TESTPROG} ; \
gcc ${LINKIT} -o ${WRKDIR}/${TESTPROG} \
${FILESDIR}/${TESTPROG}.c > /dev/null 2>&1
@if [ ! -f ${WRKDIR}/${TESTPROG} ] ; \
then \
/usr/bin/printf "\n\
You must have a version of FreeBSD later than 4.7-STABLE\n\
February 2003 or 5-CURRENT February 2003 to compile and\n\
use JDK 1.4.2.\n\n" ; \
exit 1 ; \
fi
@${WRKDIR}/${TESTPROG} 2>/dev/null
.endif
pre-fetch: check-os
@${ECHO_MSG} @${ECHO_MSG}
@${ECHO_MSG} "IMPORTANT: To build JDK 1.4.2 port, you should have at least" @${ECHO_MSG} "IMPORTANT: To build JDK 1.5.0 port, you should have at least"
@${ECHO_MSG} "1.7Gb of free disk space in build area!" @${ECHO_MSG} "1.7Gb of free disk space in build area!"
@${ECHO_MSG} @${ECHO_MSG}
.if defined(WITH_LINUX_BOOTSTRAP) .if defined(WITH_LINUX_BOOTSTRAP)
@${ECHO_MSG} "IMPORTANT: To build JDK 1.4.2 port, you should have linux emulation" @${ECHO_MSG} "IMPORTANT: To build JDK 1.5.0 port, you should have linux emulation"
@${ECHO_MSG} "enabled in the kernel and linux procfs (linprocfs) filesystem" @${ECHO_MSG} "enabled in the kernel and linux procfs (linprocfs) filesystem"
@${ECHO_MSG} "mounted." @${ECHO_MSG} "mounted."
@${ECHO_MSG} @${ECHO_MSG}
@ -216,17 +175,21 @@ pre-fetch: check-os
@${ECHO_MSG} " WITH_DEBUG - install JDK binaries and libraries" @${ECHO_MSG} " WITH_DEBUG - install JDK binaries and libraries"
@${ECHO_MSG} " with debuging support" @${ECHO_MSG} " with debuging support"
@${ECHO_MSG} @${ECHO_MSG}
@${ECHO_MSG} " MINIMAL - don't build/install mozilla java"
@${ECHO_MSG} " plugin, javaws and JDK demos"
@${ECHO_MSG}
@${ECHO_MSG} " WITH_IPV6 - enable JDK IPv6 support" @${ECHO_MSG} " WITH_IPV6 - enable JDK IPv6 support"
@${ECHO_MSG} @${ECHO_MSG}
pre-everything::
@${ECHO_MSG}
@${ECHO_MSG} "WARNING: "
@${ECHO_MSG} "WARNING: This is ALPHA quality software, and suitable for testing ONLY!"
@${ECHO_MSG} "WARNING: "
@${ECHO_MSG}
pre-patch: pre-patch:
@cd ${WRKDIR} && \ @cd ${WRKDIR} && \
${GZIP_CMD} -dc ${DISTDIR}/${PATCHSETFILE} | ${TAR} -xf - && \ ${BZIP2_CMD} -dc ${DISTDIR}/${PATCHSETFILE} | ${TAR} -xf - && \
${CHMOD} -R u+w * && \ ${CHMOD} -R u+w * && \
${PATCH} -p0 < ${WRKDIR}/jdk14.patches ${PATCH} -p0 < ${WRKDIR}/jdk15.patches
post-patch: post-patch:
@for file in ${LD_LIBRARY_PATH_FILES}; do \ @for file in ${LD_LIBRARY_PATH_FILES}; do \
@ -234,7 +197,7 @@ post-patch:
${WRKSRC}/$${file}; \ ${WRKSRC}/$${file}; \
done done
@for file in ${PTHREAD_FILES}; do \ @for file in ${PTHREAD_FILES}; do \
${REINPLACE_CMD} -e "s:-lkse:${PTHREAD_LIBS}:g" \ ${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" \
${WRKSRC}/$${file}; \ ${WRKSRC}/$${file}; \
done done
@ -280,9 +243,6 @@ do-build:
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
post-build: post-build:
@# make sure that SwingSet2/resources does not exists
@${RM} -rf ${JDKIMAGEDIR}/demo/jfc/SwingSet2/resources
@${RM} -rf ${JDKIMAGEDIR}/demo/plugin/jfc/SwingSet2/resources
@# XXX don't install japanese manpages @# XXX don't install japanese manpages
@${RM} -rf ${JDKIMAGEDIR}/man/ja @${RM} -rf ${JDKIMAGEDIR}/man/ja
@${RM} -rf ${JDKIMAGEDIR}/man/ja_JP.eucJP @${RM} -rf ${JDKIMAGEDIR}/man/ja_JP.eucJP
@ -294,29 +254,28 @@ pre-install:
@${ECHO_MSG} "with debugging support." @${ECHO_MSG} "with debugging support."
@${ECHO_MSG} @${ECHO_MSG}
.endif .endif
.if defined(MINIMAL)
@${RM} -rf ${JDKIMAGEDIR}/demo
.endif
do-install: do-install:
${RM} -f ${PLIST}
${TOUCH} ${PLIST}
${MKDIR} ${PREFIX}/jdk${JDK_VERSION} ${MKDIR} ${PREFIX}/jdk${JDK_VERSION}
cd ${JDKIMAGEDIR} && ${FIND} . \ cd ${JDKIMAGEDIR} && ${FIND} . \
| ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
@${FIND} -s ${JDKIMAGEDIR} -not -type d | \
${SED} -ne 's#^${JDKIMAGEDIR}#jdk${JDK_VERSION}#p' >> ${PLIST}
.if defined(WITH_DEBUG) .if defined(WITH_DEBUG)
cd ${JDKIMAGEDIR_G} && ${FIND} . \ cd ${JDKIMAGEDIR_G} && ${FIND} . \
| ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
@${FIND} -s ${JDKIMAGEDIR_G} -not -type d | \
${SED} -ne 's#^${JDKIMAGEDIR}#jdk${JDK_VERSION}#p' >> ${PLIST}
.endif .endif
${INSTALL_DATA} ${FILESDIR}/cacerts \ @${FIND} -s -d ${PREFIX}/jdk${JDK_VERSION} -type d | \
${PREFIX}/jdk${JDK_VERSION}/jre/lib/security/cacerts ${SED} -ne 's#^${PREFIX}/#@dirrm #p' >> ${PLIST}
.if !defined(MINIMAL) @${ECHO_MSG} "@exec ${LOCALBASE}/bin/registervm ${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" >> ${PLIST}
${INSTALL_DATA} ${FILESDIR}/cacerts \ @${ECHO_MSG} "@unexec ${LOCALBASE}/bin/unregistervm ${PREFIX}/jdk${JDK_VERSION}/bin/java" >> ${PLIST}
${PREFIX}/jdk${JDK_VERSION}/jre/javaws/cacerts
.endif
# XXX: put unregistervm into install script ?
post-install: post-install:
.if !defined(MINIMAL)
${FIND} "${PREFIX}/jdk${JDK_VERSION}/jre/plugin" -type d | ${XARGS} ${CHMOD} a+rx
.endif
@${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" @${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
@${SED} -e "s:%%JRE_HOME%%:${PREFIX}/jdk${JDK_VERSION}/jre:g" \ @${SED} -e "s:%%JRE_HOME%%:${PREFIX}/jdk${JDK_VERSION}/jre:g" \
< ${FILESDIR}/pkg-install.in > ${PKGINSTALL} < ${FILESDIR}/pkg-install.in > ${PKGINSTALL}

View file

@ -1,6 +1,6 @@
MD5 (j2sdk-1_4_2-src-scsl.zip) = 387ae674dcd686f3a7a477c191aa8b65 MD5 (jdk-1_5_0-src-scsl.zip) = 7802831198068c9a0df727c3ea6617a9
SIZE (j2sdk-1_4_2-src-scsl.zip) = 49269919 SIZE (jdk-1_5_0-src-scsl.zip) = 58338869
MD5 (j2sdk-1_4_2-bin-scsl.zip) = 24877ff50ae66744090c3723968bb7dc MD5 (jdk-1_5_0-bin-scsl.zip) = 3c3b2c079628141fa28f5f0f1cde5bf0
SIZE (j2sdk-1_4_2-bin-scsl.zip) = 2513462 SIZE (jdk-1_5_0-bin-scsl.zip) = 2219433
MD5 (bsd-jdk14-patches-7.tar.gz) = fe76afc2dd8651350a2f0e221d928fa5 MD5 (bsd-jdk15-patches-1.tar.bz2) = 13f8027f86106f2cee68aa702afd63f5
SIZE (bsd-jdk14-patches-7.tar.gz) = 1137785 SIZE (bsd-jdk15-patches-1.tar.bz2) = 618044

Binary file not shown.

View file

@ -1,15 +0,0 @@
$FreeBSD$
--- ../../j2se/src/solaris/native/java/net/net_util_md.c.orig Tue Jan 27 17:31:03 2004
+++ ../../j2se/src/solaris/native/java/net/net_util_md.c Tue Jan 27 17:31:38 2004
@@ -166,6 +166,10 @@
int fd;
void *ipv6_fn;
+#ifdef __FreeBSD__
+ return JNI_FALSE;
+#endif
+
fd = JVM_Socket(AF_INET6, SOCK_STREAM, 0) ;
if (fd < 0) {
/*

View file

@ -1,8 +1,8 @@
$FreeBSD$ $FreeBSD$
--- ../../control/make/common/Defs-bsd.gmk.orig Wed Nov 12 16:52:22 2003 --- ../../control/make/common/Defs-bsd.gmk.orig Thu Jan 13 02:01:40 2005
+++ ../../control/make/common/Defs-bsd.gmk Wed Nov 12 16:51:41 2003 +++ ../../control/make/common/Defs-bsd.gmk Thu Jan 13 02:01:54 2005
@@ -212,7 +212,7 @@ @@ -200,7 +200,7 @@
ifeq ($(TRUE_PLATFORM), NetBSD) ifeq ($(TRUE_PLATFORM), NetBSD)
DEVTOOLS_PATH = /usr/pkg/bin/ DEVTOOLS_PATH = /usr/pkg/bin/
else else

View file

@ -1,8 +1,8 @@
$FreeBSD$ $FreeBSD$
--- ../../j2se/make/common/Defs-bsd.gmk.orig Fri Oct 10 09:50:48 2003 --- ../../j2se/make/common/Defs-bsd.gmk.orig Thu Jan 13 02:03:20 2005
+++ ../../j2se/make/common/Defs-bsd.gmk Fri Oct 10 09:54:35 2003 +++ ../../j2se/make/common/Defs-bsd.gmk Thu Jan 13 02:03:38 2005
@@ -162,7 +162,7 @@ @@ -172,7 +172,7 @@
ifeq ($(TRUE_PLATFORM), NetBSD) ifeq ($(TRUE_PLATFORM), NetBSD)
DEVTOOLS_PATH = /usr/pkg/bin/ DEVTOOLS_PATH = /usr/pkg/bin/
else else

View file

@ -0,0 +1,15 @@
$FreeBSD$
--- ../../j2se/make/java/instrument/Makefile.orig Thu Jan 13 02:04:44 2005
+++ ../../j2se/make/java/instrument/Makefile Thu Jan 13 02:05:03 2005
@@ -72,8 +72,8 @@
else
ifeq ($(PLATFORM), bsd)
ifneq ($(TRUE_PLATFORM), NetBSD)
- OTHER_INCLUDES += -I/usr/local/include
- OTHER_LDLIBS += -L/usr/local/lib -liconv
+ OTHER_INCLUDES += -I${LOCALBASE}/include
+ OTHER_LDLIBS += -L${LOCALBASE}/lib -liconv
endif
else
OTHER_LDLIBS = -lnsl -ldl

View file

@ -1,13 +0,0 @@
$FreeBSD$
--- ../../deploy/make/plugin/common/config.gmk.orig Wed Nov 12 16:53:30 2003
+++ ../../deploy/make/plugin/common/config.gmk Wed Nov 12 16:53:43 2003
@@ -57,7 +57,7 @@
# include search paths
# XXXBSD: these should be defined in other place
- CPPFLAGS1 += -I/usr/X11R6/include -I/usr/local/include
+ CPPFLAGS1 += -I/usr/X11R6/include -I${LOCALBASE}/include
ifeq ($(TRUE_PLATFORM), FreeSBD)
ifeq ($(FREEBSD_4STABLE), true)

View file

@ -1,13 +0,0 @@
$FreeBSD$
--- ../../deploy/make/plugin/ns6/Makefile.orig Wed Jan 14 11:10:30 2004
+++ ../../deploy/make/plugin/ns6/Makefile Wed Jan 14 11:12:11 2004
@@ -46,7 +46,7 @@
ifeq ($(TRUE_PLATFORM), FreeBSD)
# XXXBSD: is there any differences between nspr for ns610 and ns4
# XXXBSD: direct /usr/local/include/nspr path is used!!!
-EXTRA_CPPFLAGS += -I/usr/local/include/nspr
+EXTRA_CPPFLAGS += -I${LOCALBASE}/include/nspr
endif
ifeq ($(TRUE_PLATFORM), NetBSD)
EXTRA_CPPFLAGS += -I/usr/pkg/include/mozilla/nspr

View file

@ -1,81 +0,0 @@
/*-
* Copyright (c) 2003 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* Test pthreads primitives for required functionality in order to run
* native FreeBSD JDK1.4.2 port.
*
* Returns:
* 0 - test passed
* 1 - general failure
* 200 - tests failed
*
* $FreeBSD$
*/
#include <stdio.h>
#include <pthread.h>
#include <pthread_np.h>
#define TRY(call) { \
if ((call) != 0) { \
printf("LIBC_R TEST: Unexpected error. Report to MAINTAINER\n"); \
exit(200); \
} \
}
void *
doit(void *data)
{
pthread_attr_t attr;
void *mystack = NULL;
TRY(pthread_attr_init(&attr));
TRY(pthread_attr_get_np(pthread_self(), &attr));
TRY(pthread_attr_getstackaddr(&attr, &mystack));
if (mystack == NULL) {
printf("LIBC_R TEST FAILED: libc_r update required\n");
exit(1);
}
printf("LIBC_R TEST PASSED: All Ok\n");
return(NULL);
}
int
main()
{
pthread_t tid;
pthread_attr_t attr;
int sz = 128*1024;
TRY(pthread_attr_init(&attr));
TRY(pthread_attr_setstacksize(&attr, sz));
TRY(pthread_create(&tid, &attr, doit, NULL));
TRY(pthread_join(tid, NULL));
exit(0);
}

View file

@ -1,5 +1,5 @@
This is the latest patchset from the Java 2 FreeBSD porting project. This This is the latest JDK 1.5.0 patchset from the Java 2 FreeBSD porting
port allows you to easily build a native JDK1.4.2 for FreeBSD. project. This port allows you to easily build a native JDK1.5.0 for FreeBSD.
Please note that due to the current Sun licensing policy the resulting binaries Please note that due to the current Sun licensing policy the resulting binaries
can't be distributed and you are only permitted to use/hack it personally. can't be distributed and you are only permitted to use/hack it personally.

View file

@ -1,5 +1,5 @@
SUN COMMUNITY SOURCE LICENSE Version 2.3 (Rev. Date Feb. SUN COMMUNITY SOURCE LICENSE Version 2.3 (Rev. Date Sept.
23, 1999) 29, 2004)
RECITALS RECITALS
@ -119,9 +119,8 @@ to You.
3.Requirements and Responsibilities. 3.Requirements and Responsibilities.
3.1 Research Use License. As a condition of exercising 3.1 Research Use License. As a condition of exercising the rights
the rights granted under Section 2.1 a) above, You agree to granted under Section 2.1 a) above, You agree to comply with the following:
comply with the following:
a) Your Contribution to the Community. All Error a) Your Contribution to the Community. All Error
Corrections and Shared Modifications which You create or Corrections and Shared Modifications which You create or
@ -309,7 +308,7 @@ Original Code, Upgraded Code, Error Corrections or Shared
Modifications contributed by You, or Specifications, Modifications contributed by You, or Specifications,
infringe a patent owned or controlled by You. infringe a patent owned or controlled by You.
6.3 Effective of Termination. Upon termination, You agree 6.3 Effect of Termination. Upon termination, You agree
to discontinue use and return or destroy all copies of to discontinue use and return or destroy all copies of
Covered Code in your possession. All sublicenses to the Covered Code in your possession. All sublicenses to the
Covered Code which you have properly granted shall survive Covered Code which you have properly granted shall survive
@ -708,7 +707,7 @@ Java(tm) 2 SDK Technology
Description of "Technology" Description of "Technology"
Java(tm) 2 SDK Technology v.1.4.2 as described on the Java(tm) 2 SDK Technology v. 5.0 as described on the
Technology Download Site. Technology Download Site.
ATTACHMENT C ATTACHMENT C
@ -1014,12 +1013,10 @@ hereby waive the benefit of any state or federal statutes
dealing with the establishment and regulation of franchises. dealing with the establishment and regulation of franchises.
Agreed: Agreed:
You: Original Contributor: You: Original Contributor:
_____________________________ Sun Microsystems, Inc. _____________________________ Sun Microsystems, Inc.
(Your Name) (Your Name)
By:_________________________ By:_____________________ By:_________________________ By:_____________________
Title:_______________________ Title:____________________ Title:_______________________ Title:____________________

File diff suppressed because it is too large Load diff

View file

@ -1,5 +1,5 @@
# New ports collection makefile for: jdk14 # New ports collection makefile for: jdk15
# Date created: 6 March 2003 # Date created: 12 January 2005
# Whom: Alexey Zelkin <phantom@FreeBSD.org> # Whom: Alexey Zelkin <phantom@FreeBSD.org>
# #
# $FreeBSD$ # $FreeBSD$
@ -9,45 +9,39 @@ PORTNAME= jdk
PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION} PORTVERSION= ${JDK_VERSION}p${JDK_PATCHSET_VERSION}
CATEGORIES= java devel CATEGORIES= java devel
MASTER_SITES= # http://www.sun.com/software/java2/download.html MASTER_SITES= # http://www.sun.com/software/java2/download.html
# http://www.eyesbeyond.com/freebsddom/java/jdk14.html # http://www.eyesbeyond.com/freebsddom/java/jdk15.html
SCSL_SRCFILE= j2sdk-${JDK_VERSION:S/./_/g}-src-scsl.zip SCSL_SRCFILE= jdk-${JDK_VERSION:S/./_/g}-src-scsl.zip
SCSL_BINFILE= j2sdk-${JDK_VERSION:S/./_/g}-bin-scsl.zip SCSL_BINFILE= jdk-${JDK_VERSION:S/./_/g}-bin-scsl.zip
PATCHSETFILE= bsd-jdk14-patches-${JDK_PATCHSET_VERSION}.tar.gz PATCHSETFILE= bsd-jdk15-patches-${JDK_PATCHSET_VERSION}.tar.bz2
DISTFILES= ${SCSL_SRCFILE} ${SCSL_BINFILE} ${PATCHSETFILE} DISTFILES= ${SCSL_SRCFILE} ${SCSL_BINFILE} ${PATCHSETFILE}
MAINTAINER= phantom@FreeBSD.org MAINTAINER= phantom@FreeBSD.org
COMMENT= Java Development Kit 1.4.2 COMMENT= Java Development Kit 1.5.0
# XXX: iconv dependency?
EXTRACT_DEPENDS=zip:${PORTSDIR}/archivers/zip EXTRACT_DEPENDS=zip:${PORTSDIR}/archivers/zip
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
zip:${PORTSDIR}/archivers/zip \ zip:${PORTSDIR}/archivers/zip \
${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif \ ${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif
${LOCALBASE}/include/nspr/prtypes.h:${PORTSDIR}/devel/nspr
RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper
.if !defined(MINIMAL)
RUN_DEPENDS+= ${X11BASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts PLIST= ${WRKDIR}/pkg-plist
.endif PKGINSTALL= ${WRKDIR}/pkg-install
WRKSRC= ${WRKDIR}/control/make WRKSRC= ${WRKDIR}/control/make
JDK_VERSION= 1.4.2 JDK_VERSION= 1.5.0
JDK_PATCHSET_VERSION= 7 JDK_PATCHSET_VERSION= 1
LATEST_LINK= jdk14 LATEST_LINK= jdk15
SUN_LINUX_JDK_VERSION= 1.4.2 SUN_LINUX_JDK_VERSION= 1.4.2
.if !defined(WITH_LINUX_BOOTSTRAP) .if !defined(WITH_LINUX_BOOTSTRAP)
NATIVE_BOOTSTRAP_JDKS= ${LOCALBASE}/jdk1.4.2 \ NATIVE_BOOTSTRAP_JDKS= ${LOCALBASE}/jdk1.4.2 \
${LOCALBASE}/jdk1.4.1 ${LOCALBASE}/jdk1.5.0
.endif .endif
LINUX_BOOTSTRAP_JDKS= ${LOCALBASE}/linux-sun-jdk1.4.2_03 \ LINUX_BOOTSTRAP_JDKS= ${LOCALBASE}/linux-sun-jdk1.4.2
${LOCALBASE}/linux-sun-jdk1.4.2_02 \
${LOCALBASE}/linux-sun-jdk1.4.2_01 \
${LOCALBASE}/linux-sun-jdk1.4.2 \
${LOCALBASE}/linux-sun-jdk1.4.1_02 \
${LOCALBASE}/linux-sun-jdk1.4.1_01 \
${LOCALBASE}/linux-sun-jdk1.4.1
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
@ -77,61 +71,54 @@ JDK14DIR?= ${LOCALBASE}/linux-sun-jdk${SUN_LINUX_JDK_VERSION}
BUILD_DEPENDS+= ${JDK14DIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk14 BUILD_DEPENDS+= ${JDK14DIR}/bin/javac:${PORTSDIR}/java/linux-sun-jdk14
# workaround to handle both 'zip' and 'tar.gz' distfiles # workaround to handle both 'zip' and 'tar.bz2' distfiles
USE_ZIP= YES USE_ZIP= YES
EXTRACT_ONLY= ${SCSL_SRCFILE} ${SCSL_BINFILE} EXTRACT_ONLY= ${SCSL_SRCFILE} ${SCSL_BINFILE}
ONLY_FOR_ARCHS= i386 ONLY_FOR_ARCHS= i386 amd64
USE_GMAKE= YES USE_GMAKE= YES
USE_REINPLACE= YES USE_REINPLACE= YES
RESTRICTED= "Redistribution of pre-compiled binaries is not permitted" RESTRICTED= "Redistribution of pre-compiled binaries is not permitted"
NO_CDROM= "Redistribution of pre-compiled binaries is not permitted" NO_CDROM= "Redistribution of pre-compiled binaries is not permitted"
MAKE_ENV= ALT_BOOTDIR="${JDK14DIR}" \ MAKE_ENV= ALT_BOOTDIR="${JDK14DIR}" \
ALT_MOTIF_DIR="${X11BASE}" \ ALT_MOTIF_DIR="${X11BASE}" \
SYS_CFLAGS="${CFLAGS}" \ SYS_CFLAGS="${CFLAGS}" \
DEV_ONLY="YES" \
LANG="C" \ LANG="C" \
JAVA_HOME="" \ JAVA_HOME="" \
CLASSPATH="" \ CLASSPATH="" \
LD_LIBRARY_PATH="" \ LD_LIBRARY_PATH="" \
MAKEFLAGS="" MAKEFLAGS="" \
.if defined(MINIMAL) SKIP_COMPARE_IMAGES="YES" \
MAKE_ENV+= NO_PLUGIN="YES" \ DONT_BUILD_DOCS="YES" \
NO_JAVAWS="YES" DONT_BUILD_DEPLOY="YES" \
.endif DONT_BUILD_INSTALL="YES"
ALL_TARGET= all
PLIST_SUB+= JDK_VERSION=${JDK_VERSION}
PKGINSTALL= ${WRKDIR}/pkg-install
JDKIMAGEDIR= ${WRKSRC}/../build/bsd-i586/j2sdk-image
JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-i586/j2sdk-debug-image
.if !defined(WITH_IPV6) .if !defined(WITH_IPV6)
EXTRA_PATCHES+= ${PATCHDIR}/disable-ipv6.patch MAKE_ENV+= DONT_ENABLE_IPV6="YES"
.endif .endif
.if defined(MINIMAL) ALL_TARGET= all
PLIST_SUB+= MINIMAL:="@comment "
PKGNAMESUFFIX= -minimal .if (${ARCH} == amd64)
HOTSPOTARCH=amd64
.else .else
PLIST_SUB+= MINIMAL:="" HOTSPOTARCH=i586
.endif .endif
.if defined(WITH_DEBUG) JDKIMAGEDIR= ${WRKSRC}/../build/bsd-${HOTSPOTARCH}/j2sdk-image
PLIST_SUB+= DEBUG:="" JDKIMAGEDIR_G= ${WRKSRC}/../build/bsd-${HOTSPOTARCH}/j2sdk-debug-image
.else
PLIST_SUB+= DEBUG:="@comment "
.endif
PTHREAD_FILES= ../../hotspot/build/bsd/makefiles/vm.make \ PTHREAD_FILES= ../../hotspot/build/bsd/makefiles/vm.make \
../../j2se/make/com/sun/java/pack/Makefile \
../../j2se/make/common/Defs.gmk \ ../../j2se/make/common/Defs.gmk \
../../j2se/make/common/Program.gmk \
../../j2se/make/common/Defs-bsd.gmk \ ../../j2se/make/common/Defs-bsd.gmk \
../../j2se/make/java/hpi/hpi_common.gmk \ ../../j2se/make/common/Program.gmk \
../../j2se/make/java/hpi/native/Makefile \ ../../j2se/make/java/hpi/native/Makefile \
../../j2se/make/java/net/Makefile \ ../../j2se/make/java/net/Makefile \
../../deploy/make/common/Defs-bsd.gmk \ ../../j2se/make/java/nio/Makefile \
../../deploy/make/plugin/common/config.gmk ../../j2se/make/jpda/transport/socket/Makefile \
../../j2se/make/sun/cmm/Makefile \
../../j2se/make/sun/xawt/Makefile
LD_LIBRARY_PATH_FILES= ../../hotspot/src/os/bsd/vm/os_bsd.cpp LD_LIBRARY_PATH_FILES= ../../hotspot/src/os/bsd/vm/os_bsd.cpp
@ -168,45 +155,17 @@ IGNORE= :\n\
The source distribution exists on your system, but due to\n\ The source distribution exists on your system, but due to\n\
licensing restrictions you still need to download the\n\ licensing restrictions you still need to download the\n\
patchset, ${PATCHSETFILE}, from\n\ patchset, ${PATCHSETFILE}, from\n\
http://www.eyesbeyond.com/freebsddom/java/jdk14.html.\n\ http://www.eyesbeyond.com/freebsddom/java/jdk15.html.\n\
Please place the patchset in ${DISTDIR}.\n Please place the patchset in ${DISTDIR}.\n
.endif .endif
# JDK 1.4.2 require recent version of FreeBSD due to recent libc_r updates. pre-fetch:
# Make check for reqiuired primities as early as possible
TESTPROG=testos
.if ${OSVERSION} > 500000
LINKIT= -lc_r
.else
LINKIT= -pthread
.endif
check-os:
.if !defined(SKIP_OS_TEST)
-@mkdir -p ${WRKDIR} ; \
rm -f ${WRKDIR}/${TESTPROG} ; \
gcc ${LINKIT} -o ${WRKDIR}/${TESTPROG} \
${FILESDIR}/${TESTPROG}.c > /dev/null 2>&1
@if [ ! -f ${WRKDIR}/${TESTPROG} ] ; \
then \
/usr/bin/printf "\n\
You must have a version of FreeBSD later than 4.7-STABLE\n\
February 2003 or 5-CURRENT February 2003 to compile and\n\
use JDK 1.4.2.\n\n" ; \
exit 1 ; \
fi
@${WRKDIR}/${TESTPROG} 2>/dev/null
.endif
pre-fetch: check-os
@${ECHO_MSG} @${ECHO_MSG}
@${ECHO_MSG} "IMPORTANT: To build JDK 1.4.2 port, you should have at least" @${ECHO_MSG} "IMPORTANT: To build JDK 1.5.0 port, you should have at least"
@${ECHO_MSG} "1.7Gb of free disk space in build area!" @${ECHO_MSG} "1.7Gb of free disk space in build area!"
@${ECHO_MSG} @${ECHO_MSG}
.if defined(WITH_LINUX_BOOTSTRAP) .if defined(WITH_LINUX_BOOTSTRAP)
@${ECHO_MSG} "IMPORTANT: To build JDK 1.4.2 port, you should have linux emulation" @${ECHO_MSG} "IMPORTANT: To build JDK 1.5.0 port, you should have linux emulation"
@${ECHO_MSG} "enabled in the kernel and linux procfs (linprocfs) filesystem" @${ECHO_MSG} "enabled in the kernel and linux procfs (linprocfs) filesystem"
@${ECHO_MSG} "mounted." @${ECHO_MSG} "mounted."
@${ECHO_MSG} @${ECHO_MSG}
@ -216,17 +175,21 @@ pre-fetch: check-os
@${ECHO_MSG} " WITH_DEBUG - install JDK binaries and libraries" @${ECHO_MSG} " WITH_DEBUG - install JDK binaries and libraries"
@${ECHO_MSG} " with debuging support" @${ECHO_MSG} " with debuging support"
@${ECHO_MSG} @${ECHO_MSG}
@${ECHO_MSG} " MINIMAL - don't build/install mozilla java"
@${ECHO_MSG} " plugin, javaws and JDK demos"
@${ECHO_MSG}
@${ECHO_MSG} " WITH_IPV6 - enable JDK IPv6 support" @${ECHO_MSG} " WITH_IPV6 - enable JDK IPv6 support"
@${ECHO_MSG} @${ECHO_MSG}
pre-everything::
@${ECHO_MSG}
@${ECHO_MSG} "WARNING: "
@${ECHO_MSG} "WARNING: This is ALPHA quality software, and suitable for testing ONLY!"
@${ECHO_MSG} "WARNING: "
@${ECHO_MSG}
pre-patch: pre-patch:
@cd ${WRKDIR} && \ @cd ${WRKDIR} && \
${GZIP_CMD} -dc ${DISTDIR}/${PATCHSETFILE} | ${TAR} -xf - && \ ${BZIP2_CMD} -dc ${DISTDIR}/${PATCHSETFILE} | ${TAR} -xf - && \
${CHMOD} -R u+w * && \ ${CHMOD} -R u+w * && \
${PATCH} -p0 < ${WRKDIR}/jdk14.patches ${PATCH} -p0 < ${WRKDIR}/jdk15.patches
post-patch: post-patch:
@for file in ${LD_LIBRARY_PATH_FILES}; do \ @for file in ${LD_LIBRARY_PATH_FILES}; do \
@ -234,7 +197,7 @@ post-patch:
${WRKSRC}/$${file}; \ ${WRKSRC}/$${file}; \
done done
@for file in ${PTHREAD_FILES}; do \ @for file in ${PTHREAD_FILES}; do \
${REINPLACE_CMD} -e "s:-lkse:${PTHREAD_LIBS}:g" \ ${REINPLACE_CMD} -e "s:-pthread:${PTHREAD_LIBS}:g" \
${WRKSRC}/$${file}; \ ${WRKSRC}/$${file}; \
done done
@ -280,9 +243,6 @@ do-build:
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}) @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
post-build: post-build:
@# make sure that SwingSet2/resources does not exists
@${RM} -rf ${JDKIMAGEDIR}/demo/jfc/SwingSet2/resources
@${RM} -rf ${JDKIMAGEDIR}/demo/plugin/jfc/SwingSet2/resources
@# XXX don't install japanese manpages @# XXX don't install japanese manpages
@${RM} -rf ${JDKIMAGEDIR}/man/ja @${RM} -rf ${JDKIMAGEDIR}/man/ja
@${RM} -rf ${JDKIMAGEDIR}/man/ja_JP.eucJP @${RM} -rf ${JDKIMAGEDIR}/man/ja_JP.eucJP
@ -294,29 +254,28 @@ pre-install:
@${ECHO_MSG} "with debugging support." @${ECHO_MSG} "with debugging support."
@${ECHO_MSG} @${ECHO_MSG}
.endif .endif
.if defined(MINIMAL)
@${RM} -rf ${JDKIMAGEDIR}/demo
.endif
do-install: do-install:
${RM} -f ${PLIST}
${TOUCH} ${PLIST}
${MKDIR} ${PREFIX}/jdk${JDK_VERSION} ${MKDIR} ${PREFIX}/jdk${JDK_VERSION}
cd ${JDKIMAGEDIR} && ${FIND} . \ cd ${JDKIMAGEDIR} && ${FIND} . \
| ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
@${FIND} -s ${JDKIMAGEDIR} -not -type d | \
${SED} -ne 's#^${JDKIMAGEDIR}#jdk${JDK_VERSION}#p' >> ${PLIST}
.if defined(WITH_DEBUG) .if defined(WITH_DEBUG)
cd ${JDKIMAGEDIR_G} && ${FIND} . \ cd ${JDKIMAGEDIR_G} && ${FIND} . \
| ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION} | ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
@${FIND} -s ${JDKIMAGEDIR_G} -not -type d | \
${SED} -ne 's#^${JDKIMAGEDIR}#jdk${JDK_VERSION}#p' >> ${PLIST}
.endif .endif
${INSTALL_DATA} ${FILESDIR}/cacerts \ @${FIND} -s -d ${PREFIX}/jdk${JDK_VERSION} -type d | \
${PREFIX}/jdk${JDK_VERSION}/jre/lib/security/cacerts ${SED} -ne 's#^${PREFIX}/#@dirrm #p' >> ${PLIST}
.if !defined(MINIMAL) @${ECHO_MSG} "@exec ${LOCALBASE}/bin/registervm ${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" >> ${PLIST}
${INSTALL_DATA} ${FILESDIR}/cacerts \ @${ECHO_MSG} "@unexec ${LOCALBASE}/bin/unregistervm ${PREFIX}/jdk${JDK_VERSION}/bin/java" >> ${PLIST}
${PREFIX}/jdk${JDK_VERSION}/jre/javaws/cacerts
.endif
# XXX: put unregistervm into install script ?
post-install: post-install:
.if !defined(MINIMAL)
${FIND} "${PREFIX}/jdk${JDK_VERSION}/jre/plugin" -type d | ${XARGS} ${CHMOD} a+rx
.endif
@${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}" @${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"
@${SED} -e "s:%%JRE_HOME%%:${PREFIX}/jdk${JDK_VERSION}/jre:g" \ @${SED} -e "s:%%JRE_HOME%%:${PREFIX}/jdk${JDK_VERSION}/jre:g" \
< ${FILESDIR}/pkg-install.in > ${PKGINSTALL} < ${FILESDIR}/pkg-install.in > ${PKGINSTALL}

View file

@ -1,6 +1,6 @@
MD5 (j2sdk-1_4_2-src-scsl.zip) = 387ae674dcd686f3a7a477c191aa8b65 MD5 (jdk-1_5_0-src-scsl.zip) = 7802831198068c9a0df727c3ea6617a9
SIZE (j2sdk-1_4_2-src-scsl.zip) = 49269919 SIZE (jdk-1_5_0-src-scsl.zip) = 58338869
MD5 (j2sdk-1_4_2-bin-scsl.zip) = 24877ff50ae66744090c3723968bb7dc MD5 (jdk-1_5_0-bin-scsl.zip) = 3c3b2c079628141fa28f5f0f1cde5bf0
SIZE (j2sdk-1_4_2-bin-scsl.zip) = 2513462 SIZE (jdk-1_5_0-bin-scsl.zip) = 2219433
MD5 (bsd-jdk14-patches-7.tar.gz) = fe76afc2dd8651350a2f0e221d928fa5 MD5 (bsd-jdk15-patches-1.tar.bz2) = 13f8027f86106f2cee68aa702afd63f5
SIZE (bsd-jdk14-patches-7.tar.gz) = 1137785 SIZE (bsd-jdk15-patches-1.tar.bz2) = 618044

Binary file not shown.

View file

@ -1,15 +0,0 @@
$FreeBSD$
--- ../../j2se/src/solaris/native/java/net/net_util_md.c.orig Tue Jan 27 17:31:03 2004
+++ ../../j2se/src/solaris/native/java/net/net_util_md.c Tue Jan 27 17:31:38 2004
@@ -166,6 +166,10 @@
int fd;
void *ipv6_fn;
+#ifdef __FreeBSD__
+ return JNI_FALSE;
+#endif
+
fd = JVM_Socket(AF_INET6, SOCK_STREAM, 0) ;
if (fd < 0) {
/*

View file

@ -1,8 +1,8 @@
$FreeBSD$ $FreeBSD$
--- ../../control/make/common/Defs-bsd.gmk.orig Wed Nov 12 16:52:22 2003 --- ../../control/make/common/Defs-bsd.gmk.orig Thu Jan 13 02:01:40 2005
+++ ../../control/make/common/Defs-bsd.gmk Wed Nov 12 16:51:41 2003 +++ ../../control/make/common/Defs-bsd.gmk Thu Jan 13 02:01:54 2005
@@ -212,7 +212,7 @@ @@ -200,7 +200,7 @@
ifeq ($(TRUE_PLATFORM), NetBSD) ifeq ($(TRUE_PLATFORM), NetBSD)
DEVTOOLS_PATH = /usr/pkg/bin/ DEVTOOLS_PATH = /usr/pkg/bin/
else else

View file

@ -1,8 +1,8 @@
$FreeBSD$ $FreeBSD$
--- ../../j2se/make/common/Defs-bsd.gmk.orig Fri Oct 10 09:50:48 2003 --- ../../j2se/make/common/Defs-bsd.gmk.orig Thu Jan 13 02:03:20 2005
+++ ../../j2se/make/common/Defs-bsd.gmk Fri Oct 10 09:54:35 2003 +++ ../../j2se/make/common/Defs-bsd.gmk Thu Jan 13 02:03:38 2005
@@ -162,7 +162,7 @@ @@ -172,7 +172,7 @@
ifeq ($(TRUE_PLATFORM), NetBSD) ifeq ($(TRUE_PLATFORM), NetBSD)
DEVTOOLS_PATH = /usr/pkg/bin/ DEVTOOLS_PATH = /usr/pkg/bin/
else else

View file

@ -0,0 +1,15 @@
$FreeBSD$
--- ../../j2se/make/java/instrument/Makefile.orig Thu Jan 13 02:04:44 2005
+++ ../../j2se/make/java/instrument/Makefile Thu Jan 13 02:05:03 2005
@@ -72,8 +72,8 @@
else
ifeq ($(PLATFORM), bsd)
ifneq ($(TRUE_PLATFORM), NetBSD)
- OTHER_INCLUDES += -I/usr/local/include
- OTHER_LDLIBS += -L/usr/local/lib -liconv
+ OTHER_INCLUDES += -I${LOCALBASE}/include
+ OTHER_LDLIBS += -L${LOCALBASE}/lib -liconv
endif
else
OTHER_LDLIBS = -lnsl -ldl

View file

@ -1,13 +0,0 @@
$FreeBSD$
--- ../../deploy/make/plugin/common/config.gmk.orig Wed Nov 12 16:53:30 2003
+++ ../../deploy/make/plugin/common/config.gmk Wed Nov 12 16:53:43 2003
@@ -57,7 +57,7 @@
# include search paths
# XXXBSD: these should be defined in other place
- CPPFLAGS1 += -I/usr/X11R6/include -I/usr/local/include
+ CPPFLAGS1 += -I/usr/X11R6/include -I${LOCALBASE}/include
ifeq ($(TRUE_PLATFORM), FreeSBD)
ifeq ($(FREEBSD_4STABLE), true)

View file

@ -1,13 +0,0 @@
$FreeBSD$
--- ../../deploy/make/plugin/ns6/Makefile.orig Wed Jan 14 11:10:30 2004
+++ ../../deploy/make/plugin/ns6/Makefile Wed Jan 14 11:12:11 2004
@@ -46,7 +46,7 @@
ifeq ($(TRUE_PLATFORM), FreeBSD)
# XXXBSD: is there any differences between nspr for ns610 and ns4
# XXXBSD: direct /usr/local/include/nspr path is used!!!
-EXTRA_CPPFLAGS += -I/usr/local/include/nspr
+EXTRA_CPPFLAGS += -I${LOCALBASE}/include/nspr
endif
ifeq ($(TRUE_PLATFORM), NetBSD)
EXTRA_CPPFLAGS += -I/usr/pkg/include/mozilla/nspr

View file

@ -1,81 +0,0 @@
/*-
* Copyright (c) 2003 Alexey Zelkin <phantom@FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* Test pthreads primitives for required functionality in order to run
* native FreeBSD JDK1.4.2 port.
*
* Returns:
* 0 - test passed
* 1 - general failure
* 200 - tests failed
*
* $FreeBSD$
*/
#include <stdio.h>
#include <pthread.h>
#include <pthread_np.h>
#define TRY(call) { \
if ((call) != 0) { \
printf("LIBC_R TEST: Unexpected error. Report to MAINTAINER\n"); \
exit(200); \
} \
}
void *
doit(void *data)
{
pthread_attr_t attr;
void *mystack = NULL;
TRY(pthread_attr_init(&attr));
TRY(pthread_attr_get_np(pthread_self(), &attr));
TRY(pthread_attr_getstackaddr(&attr, &mystack));
if (mystack == NULL) {
printf("LIBC_R TEST FAILED: libc_r update required\n");
exit(1);
}
printf("LIBC_R TEST PASSED: All Ok\n");
return(NULL);
}
int
main()
{
pthread_t tid;
pthread_attr_t attr;
int sz = 128*1024;
TRY(pthread_attr_init(&attr));
TRY(pthread_attr_setstacksize(&attr, sz));
TRY(pthread_create(&tid, &attr, doit, NULL));
TRY(pthread_join(tid, NULL));
exit(0);
}

View file

@ -1,5 +1,5 @@
This is the latest patchset from the Java 2 FreeBSD porting project. This This is the latest JDK 1.5.0 patchset from the Java 2 FreeBSD porting
port allows you to easily build a native JDK1.4.2 for FreeBSD. project. This port allows you to easily build a native JDK1.5.0 for FreeBSD.
Please note that due to the current Sun licensing policy the resulting binaries Please note that due to the current Sun licensing policy the resulting binaries
can't be distributed and you are only permitted to use/hack it personally. can't be distributed and you are only permitted to use/hack it personally.

View file

@ -1,5 +1,5 @@
SUN COMMUNITY SOURCE LICENSE Version 2.3 (Rev. Date Feb. SUN COMMUNITY SOURCE LICENSE Version 2.3 (Rev. Date Sept.
23, 1999) 29, 2004)
RECITALS RECITALS
@ -119,9 +119,8 @@ to You.
3.Requirements and Responsibilities. 3.Requirements and Responsibilities.
3.1 Research Use License. As a condition of exercising 3.1 Research Use License. As a condition of exercising the rights
the rights granted under Section 2.1 a) above, You agree to granted under Section 2.1 a) above, You agree to comply with the following:
comply with the following:
a) Your Contribution to the Community. All Error a) Your Contribution to the Community. All Error
Corrections and Shared Modifications which You create or Corrections and Shared Modifications which You create or
@ -309,7 +308,7 @@ Original Code, Upgraded Code, Error Corrections or Shared
Modifications contributed by You, or Specifications, Modifications contributed by You, or Specifications,
infringe a patent owned or controlled by You. infringe a patent owned or controlled by You.
6.3 Effective of Termination. Upon termination, You agree 6.3 Effect of Termination. Upon termination, You agree
to discontinue use and return or destroy all copies of to discontinue use and return or destroy all copies of
Covered Code in your possession. All sublicenses to the Covered Code in your possession. All sublicenses to the
Covered Code which you have properly granted shall survive Covered Code which you have properly granted shall survive
@ -708,7 +707,7 @@ Java(tm) 2 SDK Technology
Description of "Technology" Description of "Technology"
Java(tm) 2 SDK Technology v.1.4.2 as described on the Java(tm) 2 SDK Technology v. 5.0 as described on the
Technology Download Site. Technology Download Site.
ATTACHMENT C ATTACHMENT C
@ -1014,12 +1013,10 @@ hereby waive the benefit of any state or federal statutes
dealing with the establishment and regulation of franchises. dealing with the establishment and regulation of franchises.
Agreed: Agreed:
You: Original Contributor: You: Original Contributor:
_____________________________ Sun Microsystems, Inc. _____________________________ Sun Microsystems, Inc.
(Your Name) (Your Name)
By:_________________________ By:_____________________ By:_________________________ By:_____________________
Title:_______________________ Title:____________________ Title:_______________________ Title:____________________

File diff suppressed because it is too large Load diff