1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00

. Update to 1.4.2 patchset 6.

. Install the cacerts file from Sun's 1.4.2_03 release to avoid some
  problems associated with expired root certificates described in:

  http://sunsolve.sun.com/pub-cgi/retrieve.pl?doc=fsalert%2F57436

Hopefully not objected to by:	phantom
This commit is contained in:
Greg Lewis 2004-01-14 21:21:53 +00:00
parent 4f7e8bc001
commit df0cd23644
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=98174
21 changed files with 60 additions and 114 deletions

View File

@ -31,7 +31,7 @@ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \
WRKSRC= ${WRKDIR}/control/make
JDK_VERSION= 1.4.2
JDK_PATCHSET_VERSION= 5
JDK_PATCHSET_VERSION= 6
SUN_LINUX_JDK_VERSION= 1.4.2
@ -262,6 +262,10 @@ do-install:
cd ${JDKIMAGEDIR_G} && ${FIND} . \
| ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
.endif
${INSTALL_DATA} ${FILESDIR}/cacerts \
${PREFIX}/jdk${JDK_VERSION}/jre/lib/security/cacerts
${INSTALL_DATA} ${FILESDIR}/cacerts \
${PREFIX}/jdk${JDK_VERSION}/jre/javaws/cacerts
post-install:
@${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"

View File

@ -1,3 +1,3 @@
MD5 (j2sdk-1_4_2-src-scsl.zip) = 387ae674dcd686f3a7a477c191aa8b65
MD5 (j2sdk-1_4_2-bin-scsl.zip) = 24877ff50ae66744090c3723968bb7dc
MD5 (bsd-jdk14-patches-5.tar.gz) = 2e1aac5a64910c8c476eca7061a237f3
MD5 (bsd-jdk14-patches-6.tar.gz) = fe01a66ce4e8425f169c1b4a88d08f87

BIN
java/jdk14/files/cacerts Normal file

Binary file not shown.

View File

@ -1,13 +0,0 @@
$FreeBSD$
--- ../../deploy/make/common/Defs-bsd.gmk.orig Wed Nov 12 16:52:55 2003
+++ ../../deploy/make/common/Defs-bsd.gmk Wed Nov 12 16:53:08 2003
@@ -10,7 +10,7 @@
# XXXBSD: this issue need to be rehashed (/usr/local/ should be defined
# in other place
ifeq ($(TRUE_PLATFORM), FreeBSD)
-USR_LOCAL_PATH = /usr/local/
+USR_LOCAL_PATH = ${LOCALBASE}/
endif
BUNDLE_SUFFIX = .zip

View File

@ -1,13 +1,13 @@
$FreeBSD$
--- ../../deploy/make/plugin/ns6/Makefile.orig Wed Nov 12 16:54:05 2003
+++ ../../deploy/make/plugin/ns6/Makefile Wed Nov 12 16:54:22 2003
@@ -37,7 +37,7 @@
--- ../../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$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610/nspr -DRAPTOR_API -DNEW_STREAMING_API
-EXTRA_CPPFLAGS = -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I/usr/local/include/nspr -DRAPTOR_API -DNEW_STREAMING_API
+EXTRA_CPPFLAGS = -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I${LOCALBASE}/include/nspr -DRAPTOR_API -DNEW_STREAMING_API
vpath %.c $(SRCDIR):$(SRCDIR)/../common:
vpath %.cpp $(SRCDIR):$(SRCDIR)/../common:$(SHARED_DIR2)/jcomponent
-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,13 +0,0 @@
$FreeBSD$
--- ../../j2se/make/tools/pack-unpack/unpack/Makefile.orig Thu Nov 13 13:07:59 2003
+++ ../../j2se/make/tools/pack-unpack/unpack/Makefile Thu Nov 13 13:07:43 2003
@@ -50,7 +50,7 @@
ifeq ($(PLATFORM), bsd)
OBJOUTPUT = -o #Caution:the space after the -o is significant!.
LNKOUTPUT = $(OBJOUTPUT)
-LINK = $(CXX)
+LINK = g++
else
OBJOUTPUT = -o #Caution:the space after the -o is significant!.
LNKOUTPUT = $(OBJOUTPUT)

View File

@ -956,8 +956,12 @@ jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightDemiItalic.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightItalic.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightRegular.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansDemiBold.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansDemiOblique.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansOblique.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansRegular.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterBold.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterBoldOblique.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterOblique.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterRegular.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/fonts.dir
jdk%%JDK_VERSION%%/jre/lib/i386/awt_robot

View File

@ -31,7 +31,7 @@ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \
WRKSRC= ${WRKDIR}/control/make
JDK_VERSION= 1.4.2
JDK_PATCHSET_VERSION= 5
JDK_PATCHSET_VERSION= 6
SUN_LINUX_JDK_VERSION= 1.4.2
@ -262,6 +262,10 @@ do-install:
cd ${JDKIMAGEDIR_G} && ${FIND} . \
| ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
.endif
${INSTALL_DATA} ${FILESDIR}/cacerts \
${PREFIX}/jdk${JDK_VERSION}/jre/lib/security/cacerts
${INSTALL_DATA} ${FILESDIR}/cacerts \
${PREFIX}/jdk${JDK_VERSION}/jre/javaws/cacerts
post-install:
@${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"

View File

@ -1,3 +1,3 @@
MD5 (j2sdk-1_4_2-src-scsl.zip) = 387ae674dcd686f3a7a477c191aa8b65
MD5 (j2sdk-1_4_2-bin-scsl.zip) = 24877ff50ae66744090c3723968bb7dc
MD5 (bsd-jdk14-patches-5.tar.gz) = 2e1aac5a64910c8c476eca7061a237f3
MD5 (bsd-jdk14-patches-6.tar.gz) = fe01a66ce4e8425f169c1b4a88d08f87

BIN
java/jdk15/files/cacerts Normal file

Binary file not shown.

View File

@ -1,13 +0,0 @@
$FreeBSD$
--- ../../deploy/make/common/Defs-bsd.gmk.orig Wed Nov 12 16:52:55 2003
+++ ../../deploy/make/common/Defs-bsd.gmk Wed Nov 12 16:53:08 2003
@@ -10,7 +10,7 @@
# XXXBSD: this issue need to be rehashed (/usr/local/ should be defined
# in other place
ifeq ($(TRUE_PLATFORM), FreeBSD)
-USR_LOCAL_PATH = /usr/local/
+USR_LOCAL_PATH = ${LOCALBASE}/
endif
BUNDLE_SUFFIX = .zip

View File

@ -1,13 +1,13 @@
$FreeBSD$
--- ../../deploy/make/plugin/ns6/Makefile.orig Wed Nov 12 16:54:05 2003
+++ ../../deploy/make/plugin/ns6/Makefile Wed Nov 12 16:54:22 2003
@@ -37,7 +37,7 @@
--- ../../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$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610/nspr -DRAPTOR_API -DNEW_STREAMING_API
-EXTRA_CPPFLAGS = -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I/usr/local/include/nspr -DRAPTOR_API -DNEW_STREAMING_API
+EXTRA_CPPFLAGS = -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I${LOCALBASE}/include/nspr -DRAPTOR_API -DNEW_STREAMING_API
vpath %.c $(SRCDIR):$(SRCDIR)/../common:
vpath %.cpp $(SRCDIR):$(SRCDIR)/../common:$(SHARED_DIR2)/jcomponent
-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,13 +0,0 @@
$FreeBSD$
--- ../../j2se/make/tools/pack-unpack/unpack/Makefile.orig Thu Nov 13 13:07:59 2003
+++ ../../j2se/make/tools/pack-unpack/unpack/Makefile Thu Nov 13 13:07:43 2003
@@ -50,7 +50,7 @@
ifeq ($(PLATFORM), bsd)
OBJOUTPUT = -o #Caution:the space after the -o is significant!.
LNKOUTPUT = $(OBJOUTPUT)
-LINK = $(CXX)
+LINK = g++
else
OBJOUTPUT = -o #Caution:the space after the -o is significant!.
LNKOUTPUT = $(OBJOUTPUT)

View File

@ -956,8 +956,12 @@ jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightDemiItalic.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightItalic.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightRegular.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansDemiBold.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansDemiOblique.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansOblique.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansRegular.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterBold.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterBoldOblique.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterOblique.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterRegular.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/fonts.dir
jdk%%JDK_VERSION%%/jre/lib/i386/awt_robot

View File

@ -31,7 +31,7 @@ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \
WRKSRC= ${WRKDIR}/control/make
JDK_VERSION= 1.4.2
JDK_PATCHSET_VERSION= 5
JDK_PATCHSET_VERSION= 6
SUN_LINUX_JDK_VERSION= 1.4.2
@ -262,6 +262,10 @@ do-install:
cd ${JDKIMAGEDIR_G} && ${FIND} . \
| ${CPIO} -pdmu -R ${LIBOWN}:${LIBGRP} ${PREFIX}/jdk${JDK_VERSION}
.endif
${INSTALL_DATA} ${FILESDIR}/cacerts \
${PREFIX}/jdk${JDK_VERSION}/jre/lib/security/cacerts
${INSTALL_DATA} ${FILESDIR}/cacerts \
${PREFIX}/jdk${JDK_VERSION}/jre/javaws/cacerts
post-install:
@${LOCALBASE}/bin/registervm "${PREFIX}/jdk${JDK_VERSION}/bin/java # FREEBSD-JDK${JDK_VERSION}"

View File

@ -1,3 +1,3 @@
MD5 (j2sdk-1_4_2-src-scsl.zip) = 387ae674dcd686f3a7a477c191aa8b65
MD5 (j2sdk-1_4_2-bin-scsl.zip) = 24877ff50ae66744090c3723968bb7dc
MD5 (bsd-jdk14-patches-5.tar.gz) = 2e1aac5a64910c8c476eca7061a237f3
MD5 (bsd-jdk14-patches-6.tar.gz) = fe01a66ce4e8425f169c1b4a88d08f87

BIN
java/jdk16/files/cacerts Normal file

Binary file not shown.

View File

@ -1,13 +0,0 @@
$FreeBSD$
--- ../../deploy/make/common/Defs-bsd.gmk.orig Wed Nov 12 16:52:55 2003
+++ ../../deploy/make/common/Defs-bsd.gmk Wed Nov 12 16:53:08 2003
@@ -10,7 +10,7 @@
# XXXBSD: this issue need to be rehashed (/usr/local/ should be defined
# in other place
ifeq ($(TRUE_PLATFORM), FreeBSD)
-USR_LOCAL_PATH = /usr/local/
+USR_LOCAL_PATH = ${LOCALBASE}/
endif
BUNDLE_SUFFIX = .zip

View File

@ -1,13 +1,13 @@
$FreeBSD$
--- ../../deploy/make/plugin/ns6/Makefile.orig Wed Nov 12 16:54:05 2003
+++ ../../deploy/make/plugin/ns6/Makefile Wed Nov 12 16:54:22 2003
@@ -37,7 +37,7 @@
--- ../../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$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610/nspr -DRAPTOR_API -DNEW_STREAMING_API
-EXTRA_CPPFLAGS = -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I/usr/local/include/nspr -DRAPTOR_API -DNEW_STREAMING_API
+EXTRA_CPPFLAGS = -I$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns610 -I${LOCALBASE}/include/nspr -DRAPTOR_API -DNEW_STREAMING_API
vpath %.c $(SRCDIR):$(SRCDIR)/../common:
vpath %.cpp $(SRCDIR):$(SRCDIR)/../common:$(SHARED_DIR2)/jcomponent
-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,13 +0,0 @@
$FreeBSD$
--- ../../j2se/make/tools/pack-unpack/unpack/Makefile.orig Thu Nov 13 13:07:59 2003
+++ ../../j2se/make/tools/pack-unpack/unpack/Makefile Thu Nov 13 13:07:43 2003
@@ -50,7 +50,7 @@
ifeq ($(PLATFORM), bsd)
OBJOUTPUT = -o #Caution:the space after the -o is significant!.
LNKOUTPUT = $(OBJOUTPUT)
-LINK = $(CXX)
+LINK = g++
else
OBJOUTPUT = -o #Caution:the space after the -o is significant!.
LNKOUTPUT = $(OBJOUTPUT)

View File

@ -956,8 +956,12 @@ jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightDemiItalic.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightItalic.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaBrightRegular.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansDemiBold.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansDemiOblique.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansOblique.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaSansRegular.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterBold.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterBoldOblique.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterOblique.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/LucidaTypewriterRegular.ttf
jdk%%JDK_VERSION%%/jre/lib/fonts/fonts.dir
jdk%%JDK_VERSION%%/jre/lib/i386/awt_robot