summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/CHANGES4
-rw-r--r--lang/sun-jdk14/DESCR3
-rw-r--r--lang/sun-jdk14/MESSAGE4
-rw-r--r--lang/sun-jdk14/Makefile41
-rw-r--r--lang/sun-jdk14/PLIST30
-rw-r--r--lang/sun-jdk14/distinfo6
-rw-r--r--lang/sun-jdk14/files/common36
-rw-r--r--lang/sun-jre14/DESCR3
-rw-r--r--lang/sun-jre14/MESSAGE4
-rw-r--r--lang/sun-jre14/Makefile50
-rw-r--r--lang/sun-jre14/Makefile.common14
-rw-r--r--lang/sun-jre14/PLIST63
-rw-r--r--lang/sun-jre14/buildlink2.mk4
-rw-r--r--lang/sun-jre14/distinfo6
14 files changed, 171 insertions, 97 deletions
diff --git a/doc/CHANGES b/doc/CHANGES
index 28acb505558..ba75864fdb9 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.1272 2003/01/29 11:10:28 jlam Exp $
+$NetBSD: CHANGES,v 1.1273 2003/01/29 11:13:41 jlam Exp $
Changes to the packages collection and infrastructure in 2003:
@@ -471,3 +471,5 @@ Changes to the packages collection and infrastructure in 2003:
Updated blackdown-jre13 to 1nb1 [jlam 2003-01-29]
Updated sun-jre13 to 1.0.7 [jlam 2003-01-29]
Updated sun-jdk13 to 1.0.7 [jlam 2003-01-29]
+ Updated sun-jre14 to 1.0.1 [jlam 2003-01-29]
+ Updated sun-jdk14 to 1.0.1 [jlam 2003-01-29]
diff --git a/lang/sun-jdk14/DESCR b/lang/sun-jdk14/DESCR
index 210df9b0755..e2fea1a57df 100644
--- a/lang/sun-jdk14/DESCR
+++ b/lang/sun-jdk14/DESCR
@@ -1,2 +1 @@
-This is the Linux port of the Sun Java(tm) Development Kit, version 1.4.0.
-This version runs only on Linux and NetBSD-1.6*-i386.
+This is the Linux port of the Sun Java(tm) Development Kit, version 1.4.1.
diff --git a/lang/sun-jdk14/MESSAGE b/lang/sun-jdk14/MESSAGE
index 09f350dc082..f4b72a93a34 100644
--- a/lang/sun-jdk14/MESSAGE
+++ b/lang/sun-jdk14/MESSAGE
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.5 2002/10/13 07:29:34 jlam Exp $
+$NetBSD: MESSAGE,v 1.6 2003/01/29 11:13:28 jlam Exp $
In order to invoke the JVM, the data segment size set by your shell's
'ulimit' builtin must be at least 131204 -- please refer to your shell's
@@ -9,7 +9,7 @@ You may want to read
${PREFIX}/README
-for details about running this jdk. In a nutshell you may want to set the
+for details about running this JDK. In a nutshell you may want to set the
following in your shell environment:
CLASSPATH to ${PREFIX}/src.zip:.
diff --git a/lang/sun-jdk14/Makefile b/lang/sun-jdk14/Makefile
index 446f5d32cfc..bc74ead67d4 100644
--- a/lang/sun-jdk14/Makefile
+++ b/lang/sun-jdk14/Makefile
@@ -1,20 +1,37 @@
-# $NetBSD: Makefile,v 1.3 2002/10/13 07:45:32 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/29 11:13:28 jlam Exp $
-# MASTER_SITES is very special, and must end in "=":
-DISTNAME= j2sdk-1_4_0-linux-i386
-PKGNAME= sun-jdk14-0
-PKGREVISION= 1
-MASTER_SITES= http://java.sun.com/Download4?config-file=j2sdk-1_4_0.config&platform=linux-i386&protocol=HTTP+download&download-name=
+DISTNAME= j2sdk-1_4_1_01-linux-i586
+PKGNAME= sun-jdk14-1.0.1
+WRKSRC= ${WRKDIR}/j2sdk1.4.1_01
+MASTER_SITES= # empty
-COMMENT= Sun's Java(tm) Development Kit 1.4.0
+COMMENT= Sun's Java(tm) 2 SDK, Standard Edition 1.4.1
-DEPENDS= sun-jre14>=0:../../lang/sun-jre14
+DEPENDS= sun-jre14>=1.0.1:../../lang/sun-jre14
-WRKSRC= ${WRKDIR}/j2sdk1.4.0
-
-# these are part of JRE
+# Remove parts that are in common with the JRE
+#
post-extract:
- ${RM} -fr ${WRKSRC}/jre ${WRKSRC}/LICENSE ${WRKSRC}/README
+ common=`${AWK} '/^#.*/ { next } /^$$/ { next } { print }' ${FILESDIR}/common`; \
+ cd ${WRKSRC}; for i in $$common; do \
+ if [ -d $$i ]; then \
+ ${RM} -rf $$i; \
+ else \
+ ${RM} -f $$i; \
+ fi; \
+ done
+
+_FETCH_MESSAGE= \
+ ${ECHO} "======================================================================"; \
+ ${ECHO} ; \
+ ${ECHO} " The file ${DISTNAME}${EXTRACT_SUFX} containing the"; \
+ ${ECHO} " Java(tm) 2 SDK, Standard Edition must be fetched"; \
+ ${ECHO} " into:"; \
+ ${ECHO} " ${DISTDIR}"; \
+ ${ECHO} " from:"; \
+ ${ECHO} " ${DOWNLOAD}"; \
+ ${ECHO} ; \
+ ${ECHO} "======================================================================"
.include "../../lang/sun-jre14/Makefile.common"
diff --git a/lang/sun-jdk14/PLIST b/lang/sun-jdk14/PLIST
index 0e4cc2127e3..a01672c8207 100644
--- a/lang/sun-jdk14/PLIST
+++ b/lang/sun-jdk14/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/07/27 22:21:05 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/01/29 11:13:28 jlam Exp $
README.html
bin/HtmlConverter
bin/appletviewer
@@ -236,7 +236,6 @@ demo/jfc/FileChooserDemo/src/ExampleFileView.java
demo/jfc/FileChooserDemo/src/FileChooserDemo.java
demo/jfc/Font2DTest/Font2DTest.html
demo/jfc/Font2DTest/Font2DTest.jar
-demo/jfc/Font2DTest/Font2DTestPlugin.html
demo/jfc/Font2DTest/README.txt
demo/jfc/Font2DTest/src/Font2DTest.java
demo/jfc/Font2DTest/src/Font2DTestApplet.java
@@ -344,7 +343,7 @@ demo/jfc/Notepad/README.txt
demo/jfc/Notepad/resources/Notepad.properties
demo/jfc/Notepad/resources/Notepad_fr.properties
demo/jfc/Notepad/resources/Notepad_sv.properties
-demo/jfc/Notepad/resources/Notepad_zh.properties
+demo/jfc/Notepad/resources/Notepad_zh_CN.properties
demo/jfc/Notepad/resources/copy.gif
demo/jfc/Notepad/resources/cut.gif
demo/jfc/Notepad/resources/new.gif
@@ -362,18 +361,15 @@ demo/jfc/SampleTree/src/SampleData.java
demo/jfc/SampleTree/src/SampleTree.java
demo/jfc/SampleTree/src/SampleTreeCellRenderer.java
demo/jfc/SampleTree/src/SampleTreeModel.java
-demo/jfc/SimpleExample/README.txt
-demo/jfc/SimpleExample/SimpleExample.jar
-demo/jfc/SimpleExample/src/SimpleExample.java
demo/jfc/Stylepad/README.txt
demo/jfc/Stylepad/Stylepad.jar
demo/jfc/Stylepad/resources/Notepad.properties
demo/jfc/Stylepad/resources/Notepad_fr.properties
demo/jfc/Stylepad/resources/Notepad_sv.properties
-demo/jfc/Stylepad/resources/Notepad_zh.properties
+demo/jfc/Stylepad/resources/Notepad_zh_CN.properties
demo/jfc/Stylepad/resources/Stylepad.properties
demo/jfc/Stylepad/resources/Stylepad_sv.properties
-demo/jfc/Stylepad/resources/Stylepad_zh.properties
+demo/jfc/Stylepad/resources/Stylepad_zh_CN.properties
demo/jfc/Stylepad/resources/alice.gif
demo/jfc/Stylepad/resources/bold.gif
demo/jfc/Stylepad/resources/bullets.gif
@@ -405,7 +401,6 @@ demo/jfc/SwingApplet/src/SwingApplet.java
demo/jfc/SwingSet2/README.txt
demo/jfc/SwingSet2/SwingSet2.html
demo/jfc/SwingSet2/SwingSet2.jar
-demo/jfc/SwingSet2/SwingSet2Plugin.html
demo/jfc/SwingSet2/src/AquaTheme.java
demo/jfc/SwingSet2/src/BezierAnimationPanel.java
demo/jfc/SwingSet2/src/ButtonDemo.java
@@ -669,7 +664,6 @@ demo/plugin/jfc/FileChooserDemo/src/ExampleFileView.java
demo/plugin/jfc/FileChooserDemo/src/FileChooserDemo.java
demo/plugin/jfc/Font2DTest/Font2DTest.html
demo/plugin/jfc/Font2DTest/Font2DTest.jar
-demo/plugin/jfc/Font2DTest/Font2DTestPlugin.html
demo/plugin/jfc/Font2DTest/README.txt
demo/plugin/jfc/Font2DTest/src/Font2DTest.java
demo/plugin/jfc/Font2DTest/src/Font2DTestApplet.java
@@ -777,7 +771,7 @@ demo/plugin/jfc/Notepad/README.txt
demo/plugin/jfc/Notepad/resources/Notepad.properties
demo/plugin/jfc/Notepad/resources/Notepad_fr.properties
demo/plugin/jfc/Notepad/resources/Notepad_sv.properties
-demo/plugin/jfc/Notepad/resources/Notepad_zh.properties
+demo/plugin/jfc/Notepad/resources/Notepad_zh_CN.properties
demo/plugin/jfc/Notepad/resources/copy.gif
demo/plugin/jfc/Notepad/resources/cut.gif
demo/plugin/jfc/Notepad/resources/new.gif
@@ -795,18 +789,15 @@ demo/plugin/jfc/SampleTree/src/SampleData.java
demo/plugin/jfc/SampleTree/src/SampleTree.java
demo/plugin/jfc/SampleTree/src/SampleTreeCellRenderer.java
demo/plugin/jfc/SampleTree/src/SampleTreeModel.java
-demo/plugin/jfc/SimpleExample/README.txt
-demo/plugin/jfc/SimpleExample/SimpleExample.jar
-demo/plugin/jfc/SimpleExample/src/SimpleExample.java
demo/plugin/jfc/Stylepad/README.txt
demo/plugin/jfc/Stylepad/Stylepad.jar
demo/plugin/jfc/Stylepad/resources/Notepad.properties
demo/plugin/jfc/Stylepad/resources/Notepad_fr.properties
demo/plugin/jfc/Stylepad/resources/Notepad_sv.properties
-demo/plugin/jfc/Stylepad/resources/Notepad_zh.properties
+demo/plugin/jfc/Stylepad/resources/Notepad_zh_CN.properties
demo/plugin/jfc/Stylepad/resources/Stylepad.properties
demo/plugin/jfc/Stylepad/resources/Stylepad_sv.properties
-demo/plugin/jfc/Stylepad/resources/Stylepad_zh.properties
+demo/plugin/jfc/Stylepad/resources/Stylepad_zh_CN.properties
demo/plugin/jfc/Stylepad/resources/alice.gif
demo/plugin/jfc/Stylepad/resources/bold.gif
demo/plugin/jfc/Stylepad/resources/bullets.gif
@@ -838,7 +829,6 @@ demo/plugin/jfc/SwingApplet/src/SwingApplet.java
demo/plugin/jfc/SwingSet2/README.txt
demo/plugin/jfc/SwingSet2/SwingSet2.html
demo/plugin/jfc/SwingSet2/SwingSet2.jar
-demo/plugin/jfc/SwingSet2/SwingSet2Plugin.html
demo/plugin/jfc/SwingSet2/src/AquaTheme.java
demo/plugin/jfc/SwingSet2/src/BezierAnimationPanel.java
demo/plugin/jfc/SwingSet2/src/ButtonDemo.java
@@ -920,7 +910,6 @@ man/man1/serialver.1
src.zip
@dirrm include/linux
@dirrm include
-@unexec ${RMDIR} %D/lib 2>/dev/null || ${TRUE}
@dirrm demo/plugin/jfc/TableExample/src
@dirrm demo/plugin/jfc/TableExample
@dirrm demo/plugin/jfc/SwingSet2/src
@@ -930,8 +919,6 @@ src.zip
@dirrm demo/plugin/jfc/Stylepad/src
@dirrm demo/plugin/jfc/Stylepad/resources
@dirrm demo/plugin/jfc/Stylepad
-@dirrm demo/plugin/jfc/SimpleExample/src
-@dirrm demo/plugin/jfc/SimpleExample
@dirrm demo/plugin/jfc/SampleTree/src
@dirrm demo/plugin/jfc/SampleTree/images
@dirrm demo/plugin/jfc/SampleTree
@@ -1008,8 +995,6 @@ src.zip
@dirrm demo/jfc/Stylepad/src
@dirrm demo/jfc/Stylepad/resources
@dirrm demo/jfc/Stylepad
-@dirrm demo/jfc/SimpleExample/src
-@dirrm demo/jfc/SimpleExample
@dirrm demo/jfc/SampleTree/src
@dirrm demo/jfc/SampleTree/images
@dirrm demo/jfc/SampleTree
@@ -1076,4 +1061,3 @@ src.zip
@dirrm demo/applets/Animator
@dirrm demo/applets
@dirrm demo
-@unexec ${RMDIR} %D 2>/dev/null || ${TRUE}
diff --git a/lang/sun-jdk14/distinfo b/lang/sun-jdk14/distinfo
index 511ff93764e..89825ccee03 100644
--- a/lang/sun-jdk14/distinfo
+++ b/lang/sun-jdk14/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2002/05/14 18:00:55 jschauma Exp $
+$NetBSD: distinfo,v 1.2 2003/01/29 11:13:29 jlam Exp $
-SHA1 (j2sdk-1_4_0-linux-i386.bin) = 0805e8b6794c95323dbf33b862075b760fc40693
-Size (j2sdk-1_4_0-linux-i386.bin) = 40618207 bytes
+SHA1 (j2sdk-1_4_1_01-linux-i586.bin) = 24afb3c549071db467697384189784d262f1f574
+Size (j2sdk-1_4_1_01-linux-i586.bin) = 42129700 bytes
diff --git a/lang/sun-jdk14/files/common b/lang/sun-jdk14/files/common
new file mode 100644
index 00000000000..58d6c93a042
--- /dev/null
+++ b/lang/sun-jdk14/files/common
@@ -0,0 +1,36 @@
+# $NetBSD: common,v 1.1 2003/01/29 11:13:29 jlam Exp $
+
+.systemPrefs
+COPYRIGHT
+LICENSE
+README
+bin/ControlPanel
+bin/java
+bin/keytool
+bin/kinit
+bin/klist
+bin/ktab
+bin/orbd
+bin/policytool
+bin/rmid
+bin/rmiregistry
+bin/servertool
+bin/tnameserv
+jre
+man/ja
+man/ja_JP.eucJP/man1/java.1
+man/ja_JP.eucJP/man1/keytool.1
+man/ja_JP.eucJP/man1/orbd.1
+man/ja_JP.eucJP/man1/policytool.1
+man/ja_JP.eucJP/man1/rmid.1
+man/ja_JP.eucJP/man1/rmiregistry.1
+man/ja_JP.eucJP/man1/servertool.1
+man/ja_JP.eucJP/man1/tnameserv.1
+man/man1/java.1
+man/man1/keytool.1
+man/man1/orbd.1
+man/man1/policytool.1
+man/man1/rmid.1
+man/man1/rmiregistry.1
+man/man1/servertool.1
+man/man1/tnameserv.1
diff --git a/lang/sun-jre14/DESCR b/lang/sun-jre14/DESCR
index 210df9b0755..e2fea1a57df 100644
--- a/lang/sun-jre14/DESCR
+++ b/lang/sun-jre14/DESCR
@@ -1,2 +1 @@
-This is the Linux port of the Sun Java(tm) Development Kit, version 1.4.0.
-This version runs only on Linux and NetBSD-1.6*-i386.
+This is the Linux port of the Sun Java(tm) Development Kit, version 1.4.1.
diff --git a/lang/sun-jre14/MESSAGE b/lang/sun-jre14/MESSAGE
index 10b30da97ab..7a821a8d7b0 100644
--- a/lang/sun-jre14/MESSAGE
+++ b/lang/sun-jre14/MESSAGE
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.5 2002/10/13 07:29:36 jlam Exp $
+$NetBSD: MESSAGE,v 1.6 2003/01/29 11:13:30 jlam Exp $
In order to invoke the JVM, the data segment size set by your shell's
'ulimit' builtin must be at least 131204 -- please refer to your shell's
@@ -9,7 +9,7 @@ You may want to read
${PREFIX}/README
-for details about running this jdk. In a nutshell you may want to set the
+for details about running this JDK. In a nutshell you may want to set the
following in your shell environment:
JAVA_HOME to ${PREFIX}
diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile
index 39edb349249..c37ca84c5dd 100644
--- a/lang/sun-jre14/Makefile
+++ b/lang/sun-jre14/Makefile
@@ -1,14 +1,48 @@
-# $NetBSD: Makefile,v 1.3 2002/10/13 07:45:34 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/29 11:13:30 jlam Exp $
-# MASTER_SITES is very special, and must end in "=":
-DISTNAME= j2re-1_4_0-linux-i386
-PKGNAME= sun-jre14-0
-PKGREVISION= 1
-MASTER_SITES= http://java.sun.com/Download4?config-file=j2re-1_4_0.config&platform=linux-i386&protocol=HTTP+download&download-name=
+DISTNAME= j2re-1_4_1_01-linux-i586
+PKGNAME= sun-jre14-1.0.1
+WRKSRC= ${WRKDIR}/j2re1.4.1_01
+MASTER_SITES= # empty
-COMMENT= Sun's Java(tm) Runtime Environment 1.4.0
+COMMENT= Sun's Java(tm) 2 Runtime Environment 1.4.1
-WRKSRC= ${WRKDIR}/j2re1.4.0
+USE_PKGINSTALL= yes
+OWN_DIRS= ${PREFIX}
+OWN_DIRS+= ${PREFIX}/lib
+OWN_DIRS+= ${PREFIX}/lib/applet
+OWN_DIRS+= ${PREFIX}/lib/images
+OWN_DIRS+= ${PREFIX}/lib/images/cursors
+OWN_DIRS+= ${PREFIX}/lib/security
+SFILES= content-types.properties flavormap.properties
+SFILES+= font.properties font.properties.Redhat6.1
+SFILES+= font.properties.ja font.properties.ja.Redhat6.1
+SFILES+= font.properties.ja.Redhat6.2 font.properties.ja.Turbo
+SFILES+= font.properties.ja.Turbo6.0 font.properties.zh.Turbo
+SFILES+= images/cursors/cursors.properties i386/jvm.cfg
+SFILES+= logging.properties psfont.properties.ja
+SFILES+= psfontj2d.properties security/java.security
+SUPPORT_FILES= # empty
+.for FILE in ${SFILES}
+SUPPORT_FILES+= ${PREFIX}/lib/${FILE}.default ${PREFIX}/lib/${FILE}
+.endfor
+
+do-configure:
+ cd ${WRKSRC}/lib; for file in ${SFILES}; do \
+ ${MV} -f $$file $$file.default; \
+ done
+
+_FETCH_MESSAGE= \
+ ${ECHO} "======================================================================"; \
+ ${ECHO} ; \
+ ${ECHO} " The file ${DISTNAME}${EXTRACT_SUFX} containing the"; \
+ ${ECHO} " Java(tm) 2 Runtime Environment, Standard Edition must be fetched"; \
+ ${ECHO} " into:"; \
+ ${ECHO} " ${DISTDIR}"; \
+ ${ECHO} " from:"; \
+ ${ECHO} " ${DOWNLOAD}"; \
+ ${ECHO} ; \
+ ${ECHO} "======================================================================"
.include "../../lang/sun-jre14/Makefile.common"
diff --git a/lang/sun-jre14/Makefile.common b/lang/sun-jre14/Makefile.common
index 2a625ee6349..a5ad38bbfe0 100644
--- a/lang/sun-jre14/Makefile.common
+++ b/lang/sun-jre14/Makefile.common
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.6 2002/11/07 00:22:54 jlam Exp $
+# $NetBSD: Makefile.common,v 1.7 2003/01/29 11:13:30 jlam Exp $
CATEGORIES= lang
EXTRACT_SUFX= .bin
MAINTAINER= jschauma@netbsd.org
HOMEPAGE= http://java.sun.com/
+DOWNLOAD= http://java.sun.com/j2se/1.4.1/download.html
-FETCH_BEFORE_ARGS=-o ${DISTNAME}${EXTRACT_SUFX}
EXTRACT_CMD= ${ECHO} yes | ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} >/dev/null
LICENSE= jdk13-license
@@ -18,17 +18,15 @@ NO_BIN_ON_FTP= ${RESTRICTED}
.include "../../mk/bsd.prefs.mk"
-JVM_HOME= ${LOCALBASE}/java/sun-1.4.0
+JVM_HOME= ${LOCALBASE}/java/sun-1.4
.if ${OPSYS} == "NetBSD"
DEPENDS+= suse_compat-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_compat
DEPENDS+= suse_x11-[0-9]*:../../emulators/${SUSE_DIR_PREFIX}_x11
.endif
-USE_BUILDLINK2= # defined
-NO_CONFIGURE= # defined
-NO_BUILD= # defined
-NO_MTREE= # defined, since we change PREFIX
+USE_BUILDLINK2= yes
+NO_MTREE= yes # since we change PREFIX
LDD= ${TRUE}
ONLY_FOR_PLATFORM= NetBSD-1.5Z[A-Z]-i386 NetBSD-1.[6-9]*-i386
@@ -39,6 +37,8 @@ post-fetch:
${CHMOD} +x ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}; \
fi
+do-build: # nothing
+
do-install:
${INSTALL_PROGRAM_DIR} ${PREFIX}
cd ${WRKSRC} && ${PAX} -rw . ${PREFIX}
diff --git a/lang/sun-jre14/PLIST b/lang/sun-jre14/PLIST
index 2a819b7a630..9f106e53b77 100644
--- a/lang/sun-jre14/PLIST
+++ b/lang/sun-jre14/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2002/10/13 07:45:35 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/01/29 11:13:30 jlam Exp $
+.systemPrefs/.system.lock
+.systemPrefs/.systemRootModFile
CHANGES
COPYRIGHT
ControlPanel.html
@@ -9,13 +11,16 @@ bin/ControlPanel
bin/java
bin/java_vm
bin/keytool
+bin/kinit
+bin/klist
+bin/ktab
bin/orbd
bin/policytool
bin/rmid
bin/rmiregistry
bin/servertool
bin/tnameserv
-javaws-1_0_1_02-linux-int.zip
+javaws-1_2_0_01-linux-i586-i.zip
lib/audio/soundbank.gm
lib/charsets.jar
lib/cmm/CIEXYZ.pf
@@ -23,19 +28,20 @@ lib/cmm/GRAY.pf
lib/cmm/LINEAR_RGB.pf
lib/cmm/PYCC.pf
lib/cmm/sRGB.pf
-lib/content-types.properties
+lib/content-types.properties.default
lib/ext/dnsns.jar
lib/ext/ldapsec.jar
lib/ext/localedata.jar
lib/ext/sunjce_provider.jar
-lib/flavormap.properties
-lib/font.properties
-lib/font.properties.Redhat6.1
-lib/font.properties.ja
-lib/font.properties.ja.Redhat6.1
-lib/font.properties.ja.Redhat6.2
-lib/font.properties.ja.Turbo
-lib/font.properties.zh.Turbo
+lib/flavormap.properties.default
+lib/font.properties.default
+lib/font.properties.Redhat6.1.default
+lib/font.properties.ja.default
+lib/font.properties.ja.Redhat6.1.default
+lib/font.properties.ja.Redhat6.2.default
+lib/font.properties.ja.Turbo.default
+lib/font.properties.ja.Turbo6.0.default
+lib/font.properties.zh.Turbo.default
lib/fonts/LucidaBrightDemiBold.ttf
lib/fonts/LucidaBrightDemiItalic.ttf
lib/fonts/LucidaBrightItalic.ttf
@@ -53,7 +59,7 @@ lib/i386/awt_robot
lib/i386/client/Xusage.txt
lib/i386/client/libjsig.so
lib/i386/client/libjvm.so
-lib/i386/jvm.cfg
+lib/i386/jvm.cfg.default
lib/i386/libJdbcOdbc.so
lib/i386/libawt.so
lib/i386/libcmm.so
@@ -81,7 +87,8 @@ lib/i386/native_threads/libhpi.so
lib/i386/server/Xusage.txt
lib/i386/server/libjsig.so
lib/i386/server/libjvm.so
-lib/images/cursors/cursors.properties
+lib/im/indicim.jar
+lib/images/cursors/cursors.properties.default
lib/images/cursors/invalid32x32.gif
lib/images/cursors/motif_CopyDrop32x32.gif
lib/images/cursors/motif_CopyNoDrop32x32.gif
@@ -106,14 +113,14 @@ lib/locale/zh.GBK/LC_MESSAGES/sunw_java_plugin.mo
lib/locale/zh/LC_MESSAGES/sunw_java_plugin.mo
lib/locale/zh_TW.BIG5/LC_MESSAGES/sunw_java_plugin.mo
lib/locale/zh_TW/LC_MESSAGES/sunw_java_plugin.mo
-lib/logging.properties
-lib/psfont.properties.ja
-lib/psfontj2d.properties
+lib/logging.properties.default
+lib/psfont.properties.ja.default
+lib/psfontj2d.properties.default
lib/rt.jar
lib/security/US_export_policy.jar
lib/security/cacerts
lib/security/java.policy
-lib/security/java.security
+lib/security/java.security.default
lib/security/local_policy.jar
lib/sunrsasign.jar
lib/zi/Africa/Abidjan
@@ -263,7 +270,6 @@ lib/zi/America/Rankin_Inlet
lib/zi/America/Recife
lib/zi/America/Regina
lib/zi/America/Rio_Branco
-lib/zi/America/Rosario
lib/zi/America/Santiago
lib/zi/America/Santo_Domingo
lib/zi/America/Sao_Paulo
@@ -332,17 +338,20 @@ lib/zi/Asia/Krasnoyarsk
lib/zi/Asia/Kuala_Lumpur
lib/zi/Asia/Kuching
lib/zi/Asia/Kuwait
-lib/zi/Asia/Macao
+lib/zi/Asia/Macau
lib/zi/Asia/Magadan
+lib/zi/Asia/Makassar
lib/zi/Asia/Manila
lib/zi/Asia/Muscat
lib/zi/Asia/Nicosia
lib/zi/Asia/Novosibirsk
lib/zi/Asia/Omsk
+lib/zi/Asia/Oral
lib/zi/Asia/Phnom_Penh
lib/zi/Asia/Pontianak
lib/zi/Asia/Pyongyang
lib/zi/Asia/Qatar
+lib/zi/Asia/Qyzylorda
lib/zi/Asia/Rangoon
lib/zi/Asia/Riyadh
lib/zi/Asia/Riyadh87
@@ -360,7 +369,6 @@ lib/zi/Asia/Tbilisi
lib/zi/Asia/Tehran
lib/zi/Asia/Thimphu
lib/zi/Asia/Tokyo
-lib/zi/Asia/Ujung_Pandang
lib/zi/Asia/Ulaanbaatar
lib/zi/Asia/Urumqi
lib/zi/Asia/Vientiane
@@ -533,9 +541,9 @@ man/man1/rmid.1
man/man1/rmiregistry.1
man/man1/servertool.1
man/man1/tnameserv.1
-plugin/i386/ns4/javaplugin140.so
-plugin/i386/ns600/libjavaplugin_oji140.so
-plugin/i386/ns610/libjavaplugin_oji140.so
+plugin/i386/ns4/javaplugin.so
+plugin/i386/ns600/libjavaplugin_oji.so
+plugin/i386/ns610/libjavaplugin_oji.so
@dirrm plugin/i386/ns610
@dirrm plugin/i386/ns600
@dirrm plugin/i386/ns4
@@ -559,7 +567,6 @@ plugin/i386/ns610/libjavaplugin_oji140.so
@dirrm lib/zi/America
@dirrm lib/zi/Africa
@dirrm lib/zi
-@dirrm lib/security
@dirrm lib/locale/zh_TW/LC_MESSAGES
@dirrm lib/locale/zh_TW.BIG5/LC_MESSAGES
@dirrm lib/locale/zh_TW.BIG5
@@ -585,8 +592,7 @@ plugin/i386/ns610/libjavaplugin_oji140.so
@dirrm lib/locale/de/LC_MESSAGES
@dirrm lib/locale/de
@dirrm lib/locale
-@dirrm lib/images/cursors
-@dirrm lib/images
+@dirrm lib/im
@dirrm lib/i386/server
@dirrm lib/i386/native_threads
@dirrm lib/i386/client
@@ -595,8 +601,5 @@ plugin/i386/ns610/libjavaplugin_oji140.so
@dirrm lib/ext
@dirrm lib/cmm
@dirrm lib/audio
-@exec ${MKDIR} %D/lib/applet
-@unexec ${RMDIR} %D/lib/applet 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib 2>/dev/null || ${TRUE}
@dirrm bin
-@unexec ${RMDIR} -p %D 2>/dev/null || ${TRUE}
+@dirrm .systemPrefs
diff --git a/lang/sun-jre14/buildlink2.mk b/lang/sun-jre14/buildlink2.mk
index 796c4829da9..40174862491 100644
--- a/lang/sun-jre14/buildlink2.mk
+++ b/lang/sun-jre14/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/10/13 09:08:15 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2003/01/29 11:13:30 jlam Exp $
.if !defined(SUN_JRE14_BUILDLINK2_MK)
SUN_JRE14_BUILDLINK2_MK= # defined
@@ -16,7 +16,7 @@ BUILDLINK_FILES_CMD.sun-jre14= \
EVAL_PREFIX+= BUILDLINK_JAVA_PREFIX.sun-jre14=sun-jre14
BUILDLINK_JAVA_PREFIX.sun-jre14_DEFAULT= \
- ${BUILDLINK_PREFIX.sun-jre14}/java/sun-1.4.0
+ ${BUILDLINK_PREFIX.sun-jre14}/java/sun-1.4.1
UNLIMIT_RESOURCES+= datasize # must be at least 131204
BUILDLINK_TARGETS+= sun-jre14-buildlink
diff --git a/lang/sun-jre14/distinfo b/lang/sun-jre14/distinfo
index c520eb764db..a7d79f326d3 100644
--- a/lang/sun-jre14/distinfo
+++ b/lang/sun-jre14/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2002/05/14 18:00:56 jschauma Exp $
+$NetBSD: distinfo,v 1.2 2003/01/29 11:13:30 jlam Exp $
-SHA1 (j2re-1_4_0-linux-i386.bin) = 9cfecb00065e5b6b21fa3e747cd5ef40d7a2f313
-Size (j2re-1_4_0-linux-i386.bin) = 21826430 bytes
+SHA1 (j2re-1_4_1_01-linux-i586.bin) = d65557e9be05ad551065225b967cea42d7ad04e4
+Size (j2re-1_4_1_01-linux-i586.bin) = 22839295 bytes
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-11 04:44:48 +0000