Yes, I know it's taboo to post diffs for -stable but I was asked to do
so by the maintainer. We got a small packaging bug that's been fixed in
current and this back-port might help a few people.
http://marc.info/?l=openbsd-ports&m=120061961321077&w=2
The big *if* is if this will get enough testing for a commit. If you're
using -stable in production, and think you have something to gain from
updating, then please post your test results.
Note to Kurt: you'll need to remove my lazy Makefile hack
ACCEPT_JRL_LICENSE=yes
I haven't been keeping up with the Sun licensing nonsense on java, so
I'm sure you added the license check for good reason.
kind regards,
JCR
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/jdk/1.5/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- Makefile 27 Jul 2007 19:29:51 -0000 1.42
+++ Makefile 19 Jan 2008 05:30:48 -0000
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.42 2007/07/27 19:29:51 kurt Exp $
+# $OpenBSD: Makefile,v 1.47 2007/11/30 14:57:23 kurt Exp $
SHARED_ONLY= Yes
ONLY_FOR_ARCHS= amd64 i386
COMMENT-main= "Java2(TM) Standard Edition Dev Kit v${V}"
COMMENT-jre= "Java2(TM) Standard Edition Runtime Environment v${V}"
-V= 1.5.0.12
+V= 1.5.0.13
PKGNAME= jdk-${V}
PKGNAME-main= jdk-${V}
PKGNAME-jre= jre-${V}
@@ -18,15 +18,15 @@
MAINTAINER= Kurt Miller <[EMAIL PROTECTED]>
-JRLSRC= jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar
-JRLBIN= jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar
-PATCHSET= bsd-jdk15-patches-6.tar.bz2
+JRLSRC= jdk-1_5_0_13-fcs-src-b05-jrl-25_sep_2007.jar
+JRLBIN= jdk-1_5_0_13-fcs-bin-b05-jrl-25_sep_2007.jar
+PATCHSET= bsd-jdk15-patches-7.tar.bz2
DISTFILES= ${JRLSRC} \
${JRLBIN} \
${PATCHSET}
-MASTER_SITES= http://www.java.net/download/tiger/tiger_u12/
+MASTER_SITES= http://www.java.net/download/tiger/tiger_u13/
# Java Research License
# http://www.java.net/jrl.csp
@@ -67,11 +67,11 @@
# Error message for distfile.
FETCH_MANUALLY= "You must manually fetch the distribution files, place"
FETCH_MANUALLY+= "them in ${FULLDISTDIR} and then run make again."
-FETCH_MANUALLY+= "Get the 'Update 12 Source under the JRL license' file:"
+FETCH_MANUALLY+= "Get the 'Update 13 Source under the JRL license' file:"
FETCH_MANUALLY+= " ${JRLSRC} and"
FETCH_MANUALLY+= " the 'Source Binaries needed for Source Build' file:"
FETCH_MANUALLY+= " ${JRLBIN}"
-FETCH_MANUALLY+= "from http://download.java.net/tiger/tiger_u12/";
+FETCH_MANUALLY+= "from http://download.java.net/tiger/tiger_u13/";
FETCH_MANUALLY+= "Get the BSD patchset file:"
FETCH_MANUALLY+= " ${PATCHSET}"
FETCH_MANUALLY+= "from http://www.eyesbeyond.com/freebsddom/java/jdk15.html";
@@ -91,15 +91,15 @@
BUILD_DEPENDS+= :jdk-1.5*:devel/jdk/1.5
MAKE_ENV+= ALT_BOOTDIR="${LOCALBASE}/${JDKHOME}"
.else
-DISTFILES+= jdk-1_5_0_12-solaris-i586.tar.Z \
+DISTFILES+= jdk-1_5_0_13-solaris-i586.tar.Z \
xalan-j_2_7_0-bin.tar.gz
-FETCH_MANUALLY+= "Get 'JDK 5.0 Update 12' for 'Solaris x86 packages' file:"
-FETCH_MANUALLY+= " jdk-1_5_0_12-solaris-i586.tar.Z"
+FETCH_MANUALLY+= "Get 'JDK 5.0 Update 13' for 'Solaris x86 packages' file:"
+FETCH_MANUALLY+= " jdk-1_5_0_13-solaris-i586.tar.Z"
FETCH_MANUALLY+= "from http://java.sun.com/javase/downloads/index_jdk5.jsp or"
-FETCH_MANUALLY+= "http://java.sun.com/products/archive/j2se/5.0_12/index.html";
+FETCH_MANUALLY+= "http://java.sun.com/products/archive/j2se/5.0_13/index.html";
FETCH_MANUALLY+= "Get the Apache Xalan Java file:"
FETCH_MANUALLY+= " xalan-j_2_7_0-bin.tar.gz"
-FETCH_MANUALLY+= "from http://www.apache.org/dist/xml/xalan-j/";
+FETCH_MANUALLY+= "from http://archive.apache.org/dist/xml/xalan-j/";
BUILD_DEPENDS+= :kaffe->=1.1.7p1:lang/kaffe \
::lang/jikes
ALT_BOOTDIR2= ${LOCALBASE}/kaffe
@@ -120,7 +120,7 @@
. endif
.else
#no plugin - no messages
-MESSAGE= /dev/null
+MESSAGE= ${PKGDIR}/MESSAGE-no_web
MAKE_ENV+= DONT_BUILD_DEPLOY="YES"
.endif
@@ -143,7 +143,20 @@
JDKIMAGEDIR_G= ${OUTPUTDIR}/j2sdk-debug-image
JREIMAGEDIR= ${OUTPUTDIR}/j2re-image
+.include <bsd.own.mk>
+ACCEPT_JRL_LICENSE=yes
+ACCEPT_JRL_LICENSE ?= No
+
+.if ${ACCEPT_JRL_LICENSE:L} != "yes"
+BROKEN += \n
+BROKEN += You must read and accept Sun's JRL license located\n
+BROKEN += at ${FILESDIR}/JavaResearchLicense.txt\n
+BROKEN += To indicate your acceptance of the JRL add ACCEPT_JRL_LICENSE=Yes\n
+BROKEN += to /etc/mk.conf and restart the build
+.endif
+
post-extract:
+ @rm -rf ${WRKDIR}/tmp
@mkdir ${WRKDIR}/tmp && \
${CC} ${CFLAGS} -o ${WRKDIR}/tmp/x_x2zip ${FILESDIR}/x_x2zip.c
.for jar in ${JRLSRC} ${JRLBIN}
@@ -165,7 +178,6 @@
pre-patch:
@cp -f ${FILESDIR}/cacerts ${WRKDIR}/j2se/src/share/lib/security
@cd ${WRKDIR} && \
- ${CHMOD} -R u+w * && \
${PATCH} -p0 -z .orig.bsd --quiet < ${WRKDIR}/jdk15.patches
.if !${FLAVOR:L:Mnative_bootstrap}
@@ -190,5 +202,8 @@
cd ${JDKIMAGEDIR_G} && tar -cf - * | tar -C ${PREFIX}/${JDKHOME} -xf -
${INSTALL_DATA_DIR} ${PREFIX}/${JREHOME}
cd ${JREIMAGEDIR} && tar -cf - * | tar -C ${PREFIX}/${JREHOME} -xf -
+ cd ${WRKDIR} && \
+ ${INSTALL_DATA} JavaResearchLicense.txt ${PREFIX}/${JDKHOME}/LICENSE && \
+ ${INSTALL_DATA} JavaResearchLicense.txt ${PREFIX}/${JREHOME}/LICENSE
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/jdk/1.5/distinfo,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- distinfo 27 Jul 2007 19:29:51 -0000 1.9
+++ distinfo 25 Oct 2007 20:51:41 -0000 1.10
@@ -1,25 +1,25 @@
-MD5 (bsd-jdk15-patches-6.tar.bz2) = knfTYkuYeVg8HcdMeYMh4g==
-MD5 (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = gJlvvy23nZ+kp14XvB9lUQ==
-MD5 (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = 3rIEdA0vinmbqGWMjHaOvg==
-MD5 (jdk-1_5_0_12-solaris-i586.tar.Z) = rwugf98AMgfvk4eXDgcPxQ==
+MD5 (bsd-jdk15-patches-7.tar.bz2) = 7o3tGqTQzVcyJwSb51wpPA==
+MD5 (jdk-1_5_0_13-fcs-bin-b05-jrl-25_sep_2007.jar) = evyl3T4gBv9x76N34dPddQ==
+MD5 (jdk-1_5_0_13-fcs-src-b05-jrl-25_sep_2007.jar) = hEB0YNQY8SsjKtPZ/cIDJg==
+MD5 (jdk-1_5_0_13-solaris-i586.tar.Z) = rySpKkxyTRZqcTmXrLWFwg==
MD5 (xalan-j_2_7_0-bin.tar.gz) = 1SbQhIyIYHzk46Ck7bddUA==
-RMD160 (bsd-jdk15-patches-6.tar.bz2) = gHNWj1M7Exs+x7QapxbvxXlnAu0=
-RMD160 (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = JIS7Af7pJCoHujKZ6/wHSUMJu7Y=
-RMD160 (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = g+HSakTWRDxGsu1n50qFXeaIPUA=
-RMD160 (jdk-1_5_0_12-solaris-i586.tar.Z) = 37WFBYZs+Xu56MN0kgGjKFQRq1Y=
+RMD160 (bsd-jdk15-patches-7.tar.bz2) = VIdc+HAVrJpj281OFSVMeutItsg=
+RMD160 (jdk-1_5_0_13-fcs-bin-b05-jrl-25_sep_2007.jar) = Lnew14QNuFUeyP+BeSo2GPYePNc=
+RMD160 (jdk-1_5_0_13-fcs-src-b05-jrl-25_sep_2007.jar) = 5PhFYQhGz8JsC/BNEu6s9BnfuQI=
+RMD160 (jdk-1_5_0_13-solaris-i586.tar.Z) = Xl2gOTkOKdQaeOuQq+Mm8JOIfh8=
RMD160 (xalan-j_2_7_0-bin.tar.gz) = VCV7ypsrLPuG/Wl08Oj27CD31H8=
-SHA1 (bsd-jdk15-patches-6.tar.bz2) = H3odhVGOpdzieQ5UVvaqDPlhc2g=
-SHA1 (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = qTwQzGqJO375KZ3f4IPlNsi62Hk=
-SHA1 (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = 6IaWOGkhZk/lq45I6+G80E3u0yI=
-SHA1 (jdk-1_5_0_12-solaris-i586.tar.Z) = tnryaDF+gCm2eDKUaNff/bYCl5Y=
+SHA1 (bsd-jdk15-patches-7.tar.bz2) = PKDAzAbDT2jaJY6H58xQk4E7YPc=
+SHA1 (jdk-1_5_0_13-fcs-bin-b05-jrl-25_sep_2007.jar) = v7ALwpMu0PK5TDLgStL5rRRhX4U=
+SHA1 (jdk-1_5_0_13-fcs-src-b05-jrl-25_sep_2007.jar) = sObAhlgSuZmwIpey5bkHF4pLtuc=
+SHA1 (jdk-1_5_0_13-solaris-i586.tar.Z) = y5yz8VCI3vN0B9QHB1MdvWA/2AM=
SHA1 (xalan-j_2_7_0-bin.tar.gz) = z4jlU+j6W2nfk7rgbtsplS2sWWo=
-SHA256 (bsd-jdk15-patches-6.tar.bz2) = b5wiXbhfY6C5xB8Oq1DD4zlNvhY/bMjZNvKv52AQzdE=
-SHA256 (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = iGxXpi9mkZVCaahNTNCjLI1h604ExAKJM+Dpv64s+Zk=
-SHA256 (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = i5Or5QDVipstdm3tb5BB6LxFe3heZ1Hg49HYMI7SOj8=
-SHA256 (jdk-1_5_0_12-solaris-i586.tar.Z) = XhNS915ZIkkk0y8+TXHMFZrTABe/oq9J1Mrs88+3BTs=
+SHA256 (bsd-jdk15-patches-7.tar.bz2) = LFuD2iMjTiFfUJl6bCyn3pAJUYKN93eiEInBjnZwI3A=
+SHA256 (jdk-1_5_0_13-fcs-bin-b05-jrl-25_sep_2007.jar) = nBT5dvtOiwRK7zCH033/eUg+oe+JKOtRYuS1ZCoOmc4=
+SHA256 (jdk-1_5_0_13-fcs-src-b05-jrl-25_sep_2007.jar) = 3w9BySjlJr5OXNfsSHCuWvNTf7LLSK+p1MBE9ZAEoOA=
+SHA256 (jdk-1_5_0_13-solaris-i586.tar.Z) = sUH/QvwuXRUmT0+tm0CT/UkWh+IwBWGw9Xla7Sn9PUA=
SHA256 (xalan-j_2_7_0-bin.tar.gz) = h4yOtu7hVRrkMMLboFQmMphW/8BBOyAX3S1O5kjFxfc=
-SIZE (bsd-jdk15-patches-6.tar.bz2) = 777561
-SIZE (jdk-1_5_0_12-fcs-bin-b04-jrl-02_may_2007.jar) = 2211514
-SIZE (jdk-1_5_0_12-fcs-src-b04-jrl-02_may_2007.jar) = 57752561
-SIZE (jdk-1_5_0_12-solaris-i586.tar.Z) = 86054664
+SIZE (bsd-jdk15-patches-7.tar.bz2) = 778641
+SIZE (jdk-1_5_0_13-fcs-bin-b05-jrl-25_sep_2007.jar) = 2211512
+SIZE (jdk-1_5_0_13-fcs-src-b05-jrl-25_sep_2007.jar) = 57749554
+SIZE (jdk-1_5_0_13-solaris-i586.tar.Z) = 86065051
SIZE (xalan-j_2_7_0-bin.tar.gz) = 13516702
Index: files/JavaResearchLicense.txt
===================================================================
RCS file: files/JavaResearchLicense.txt
diff -N files/JavaResearchLicense.txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/JavaResearchLicense.txt 7 Nov 2007 17:04:36 -0000 1.1
@@ -0,0 +1,168 @@
+JAVA RESEARCH LICENSE Version 1.6
+
+
+I. DEFINITIONS.
+
+"Licensee" means You and any other party that has entered into and has
+in effect a version of this License.
+
+"Modifications" means any change or addition to the Technology.
+
+"Sun" means Sun Microsystems, Inc. and its successors and assignees.
+
+"Research Use" means research, evaluation, or development for the
+purpose of advancing knowledge, teaching, learning, or customizing the
+Technology or Modifications for personal use. Research Use expressly
+excludes use or distribution for direct or indirect commercial
+(including strategic) gain or advantage.
+
+"Technology" means the source code and object code of the technology
+made available by Sun pursuant to this License.
+
+"Technology Site" means the website designated by Sun for accessing
+the Technology.
+
+"You" means the individual executing this License or the legal entity
+or entities represented by the individual executing this License.
+
+II. PURPOSE.
+
+Sun is licensing the Technology under this Java Research License (the
+"License") to promote research, education, innovation, and development
+using the Technology. This License is not intended to permit or
+enable access to the Technology for active consultation as part of
+creating an independent implementation of the Technology.
+
+COMMERCIAL USE AND DISTRIBUTION OF TECHNOLOGY AND MODIFICATIONS IS
+PERMITTED ONLY UNDER A SUN COMMERCIAL LICENSE.
+
+III. RESEARCH USE RIGHTS.
+
+A. License Grant. Subject to the conditions contained herein, Sun
+grants to You a non-exclusive, non-transferable, worldwide, and
+royalty-free license to do the following for Your Research Use only:
+
+1. Reproduce, create Modifications of, and use the Technology
+alone, or with Modifications;
+
+2. Share source code of the Technology alone, or with
+Modifications, with other Licensees; and
+
+3. Distribute object code of the Technology, alone, or with
+Modifications, to any third parties for Research Use only, under a
+license of Your choice that is consistent with this License; and
+publish papers and books discussing the Technology which may include
+relevant excerpts that do not in the aggregate constitute a
+significant portion of the Technology.
+
+B. Residual Rights. If You examine the Technology after accepting
+this License and remember anything about it later, You are not
+"tainted" in a way that would prevent You from creating or
+contributing to an independent implementation, but this License grants
+You no rights to Sun's copyrights or patents for use in such an
+implementation.
+
+C. No Implied Licenses. Other than the rights granted herein, Sun
+retains all rights, title, and interest in Technology, and You retain
+all rights, title, and interest in Your Modifications and associated
+specifications, subject to the terms of this License.
+
+D. Third Party Software. Portions of the Technology may be
+provided with licenses or other notices from third parties that govern
+the use of those portions. Any licenses granted hereunder do not alter
+any rights and obligations You may have under such licenses, however,
+the disclaimer of warranty and limitation of liability provisions in
+this License will apply to all Technology in this distribution.
+
+IV. INTELLECTUAL PROPERTY REQUIREMENTS
+
+As a condition to Your License, You agree to comply with the following
+restrictions and responsibilities:
+
+A. License and Copyright Notices. You must include a copy of this
+Java Research License in a Readme file for any Technology or
+Modifications you distribute. You must also include the following
+statement, "Use and distribution of this technology is subject to the
+Java Research License included herein", (a) once prominently in the
+source code tree and/or specifications for Your source code
+distributions, and (b) once in the same file as Your copyright or
+proprietary notices for Your binary code distributions. You must cause
+any files containing Your Modification to carry prominent notice
+stating that You changed the files. You must not remove or alter any
+copyright or other proprietary notices in the Technology.
+
+B. Licensee Exchanges. Any Technology and Modifications You
+receive from any Licensee are governed by this License.
+
+V. GENERAL TERMS.
+
+A. Disclaimer Of Warranties.
+
+THE TECHNOLOGY IS PROVIDED "AS IS", WITHOUT WARRANTIES OF ANY KIND,
+EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, WARRANTIES
+THAT THE TECHNOLOGY IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A
+PARTICULAR PURPOSE, OR NON-INFRINGING OF THIRD PARTY RIGHTS. YOU
+AGREE THAT YOU BEAR THE ENTIRE RISK IN CONNECTION WITH YOUR USE AND
+DISTRIBUTION OF ANY AND ALL TECHNOLOGY UNDER THIS LICENSE.
+
+B. Infringement; Limitation Of Liability.
+
+1. If any portion of, or functionality implemented by, the
+Technology becomes the subject of a claim or threatened claim of
+infringement ("Affected Materials"), Sun may, in its unrestricted
+discretion, suspend Your rights to use and distribute the Affected
+Materials under this License. Such suspension of rights will be
+effective immediately upon Sun's posting of notice of suspension on
+the Technology Site.
+
+2. IN NO EVENT WILL SUN BE LIABLE FOR ANY DIRECT, INDIRECT,
+PUNITIVE, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES IN CONNECTION
+WITH OR ARISING OUT OF THIS LICENSE (INCLUDING, WITHOUT LIMITATION,
+LOSS OF PROFITS, USE, DATA, OR ECONOMIC ADVANTAGE OF ANY SORT),
+HOWEVER IT ARISES AND ON ANY THEORY OF LIABILITY (including
+negligence), WHETHER OR NOT SUN HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE. LIABILITY UNDER THIS SECTION V.B.2 SHALL BE SO LIMITED
+AND EXCLUDED, NOTWITHSTANDING FAILURE OF THE ESSENTIAL PURPOSE OF ANY
+REMEDY.
+
+C. Termination.
+
+1. You may terminate this License at any time by notifying Sun in a
+writing addressed to Sun Microsystems, Inc., 4150 Network Circle,
+Santa Clara, California 95054, Attn.: Legal Department/Products and
+Technology Law.
+
+2. All Your rights will terminate under this License if You fail to
+comply with any of its material terms or conditions and do not cure
+such failure within thirty (30) days after becoming aware of such
+noncompliance.
+
+3. Upon termination, You must discontinue all uses and distribution
+under this agreement, and all provisions of this Section V ("General
+Terms") shall survive termination.
+
+D. Miscellaneous.
+
+1. Trademark. You agree to comply with Sun's Trademark & Logo
+Usage Requirements, as modified from time to time, available at
+http://www.sun.com/policies/trademarks/. Except as expressly provided
+in this License, You are granted no rights in or to any Sun trademarks
+now or hereafter used or licensed by Sun.
+
+2. Integration. This License represents the complete agreement of
+the parties concerning the subject matter hereof.
+
+3. Severability. If any provision of this License is held
+unenforceable, such provision shall be reformed to the extent
+necessary to make it enforceable unless to do so would defeat the
+intent of the parties, in which case, this License shall terminate.
+
+4. Governing Law. This License is governed by the laws of the
+United States and the State of California, as applied to contracts
+entered into and performed in California between California residents.
+In no event shall this License be construed against the drafter.
+
+5. Export Control. As further described at
+http://www.sun.com/its, you agree to comply with the U.S. export
+controls and trade laws of other countries that apply to Technology
+and Modifications.
Index: pkg/DESCR-jre
===================================================================
RCS file: /cvs/ports/devel/jdk/1.5/pkg/DESCR-jre,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pkg/DESCR-jre 15 May 2006 18:11:23 -0000 1.5
+++ pkg/DESCR-jre 25 Oct 2007 20:51:41 -0000 1.6
@@ -13,7 +13,7 @@
Bootstrap the jdk using a previously built and installed
devel/jdk/1.5 package. NOTE: if this flavor is used without a
previously installed devel/jdk/1.5 package, the port will
- build the jdk twice!
+ just build the jdk with default (kaffe) bootstrap and stop.
no_web
The Mozilla plugin and Java Web Start (javaws) are not built.
Index: pkg/DESCR-main
===================================================================
RCS file: /cvs/ports/devel/jdk/1.5/pkg/DESCR-main,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pkg/DESCR-main 22 Nov 2006 19:42:54 -0000 1.1
+++ pkg/DESCR-main 25 Oct 2007 20:51:41 -0000 1.2
@@ -10,7 +10,7 @@
Bootstrap the jdk using a previously built and installed
devel/jdk/1.5 package. NOTE: if this flavor is used without a
previously installed devel/jdk/1.5 package, the port will
- build the jdk twice!
+ just build the jdk with default (kaffe) bootstrap and stop.
no_web
The Mozilla plugin and Java Web Start (javaws) are not built.
Index: pkg/MESSAGE-amd64
===================================================================
RCS file: /cvs/ports/devel/jdk/1.5/pkg/MESSAGE-amd64,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pkg/MESSAGE-amd64 15 May 2006 18:11:23 -0000 1.1
+++ pkg/MESSAGE-amd64 25 Oct 2007 20:51:41 -0000 1.2
@@ -1 +1,4 @@
-NOTE: The plugin does not work on amd64 yet.
+Use and distribution of this technology is subject to the Java Research
+License included herein.
+
+NOTE: The plugin does not work on amd64.
Index: pkg/MESSAGE-main
===================================================================
RCS file: /cvs/ports/devel/jdk/1.5/pkg/MESSAGE-main,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pkg/MESSAGE-main 22 Nov 2006 19:42:54 -0000 1.1
+++ pkg/MESSAGE-main 25 Oct 2007 20:51:41 -0000 1.2
@@ -1,3 +1,6 @@
+Use and distribution of this technology is subject to the Java Research
+License included herein.
+
To use the Java plugin with Mozilla or Mozilla-firefox you must create
a symbolic link (do not copy or hard link) from
Index: pkg/MESSAGE-no_web
===================================================================
RCS file: pkg/MESSAGE-no_web
diff -N pkg/MESSAGE-no_web
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/MESSAGE-no_web 25 Oct 2007 20:51:41 -0000 1.1
@@ -0,0 +1,2 @@
+Use and distribution of this technology is subject to the Java Research
+License included herein.
Index: pkg/PFRAG.no-no_web-jre
===================================================================
RCS file: /cvs/ports/devel/jdk/1.5/pkg/PFRAG.no-no_web-jre,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pkg/PFRAG.no-no_web-jre 27 Jul 2007 19:29:52 -0000 1.5
+++ pkg/PFRAG.no-no_web-jre 25 Oct 2007 20:51:41 -0000 1.6
@@ -1,10 +1,12 @@
[EMAIL PROTECTED] $OpenBSD: PFRAG.no-no_web-jre,v 1.5 2007/07/27 19:29:52 kurt Exp $
[EMAIL PROTECTED] $OpenBSD: PFRAG.no-no_web-jre,v 1.6 2007/10/25 20:51:41 kurt Exp $
${JREHOME}/bin/ControlPanel
${JREHOME}/bin/java_vm
${JREHOME}/bin/javaws
${JREHOME}/javaws/
${JREHOME}/javaws/javaws
+${JREHOME}/lib/deploy/
${JREHOME}/lib/deploy.jar
+${JREHOME}/lib/deploy/ffjcext.zip
${JREHOME}/lib/${MACHINE_ARCH}/libdeploy.so
${JREHOME}/lib/${MACHINE_ARCH}/libjavaplugin_jni.so
${JREHOME}/lib/${MACHINE_ARCH}/libjavaplugin_nscp.so
Index: pkg/PFRAG.no-no_web-main
===================================================================
RCS file: /cvs/ports/devel/jdk/1.5/pkg/PFRAG.no-no_web-main,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pkg/PFRAG.no-no_web-main 27 Jul 2007 19:29:52 -0000 1.5
+++ pkg/PFRAG.no-no_web-main 25 Oct 2007 20:51:41 -0000 1.6
@@ -1,4 +1,4 @@
[EMAIL PROTECTED] $OpenBSD: PFRAG.no-no_web-main,v 1.5 2007/07/27 19:29:52 kurt Exp $
[EMAIL PROTECTED] $OpenBSD: PFRAG.no-no_web-main,v 1.6 2007/10/25 20:51:41 kurt Exp $
${JDKHOME}/bin/ControlPanel
${JDKHOME}/bin/HtmlConverter
${JDKHOME}/bin/javaws
@@ -758,7 +758,9 @@
${JDKHOME}/jre/bin/javaws_g
${JDKHOME}/jre/javaws/
${JDKHOME}/jre/javaws/javaws
+${JDKHOME}/jre/lib/deploy/
${JDKHOME}/jre/lib/deploy.jar
+${JDKHOME}/jre/lib/deploy/ffjcext.zip
${JDKHOME}/jre/lib/deploy_g.jar
${JDKHOME}/jre/lib/${MACHINE_ARCH}/libdeploy.so
${JDKHOME}/jre/lib/${MACHINE_ARCH}/libdeploy_g.so
Index: pkg/PLIST-jre
===================================================================
RCS file: /cvs/ports/devel/jdk/1.5/pkg/PLIST-jre,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pkg/PLIST-jre 27 Jul 2007 19:29:52 -0000 1.11
+++ pkg/PLIST-jre 25 Oct 2007 20:51:41 -0000 1.12
@@ -1,4 +1,4 @@
[EMAIL PROTECTED] $OpenBSD: PLIST-jre,v 1.11 2007/07/27 19:29:52 kurt Exp $
[EMAIL PROTECTED] $OpenBSD: PLIST-jre,v 1.12 2007/10/25 20:51:41 kurt Exp $
@option no-default-conflict
@conflict jre->=1.5,<1.6
@pkgpath devel/jdk/1.5,-jre,native_bootstrap
@@ -35,8 +35,6 @@
${JREHOME}/lib/cmm/PYCC.pf
${JREHOME}/lib/cmm/sRGB.pf
${JREHOME}/lib/content-types.properties
-${JREHOME}/lib/deploy/
-${JREHOME}/lib/deploy/ffjcext.zip
${JREHOME}/lib/ext/
${JREHOME}/lib/ext/dnsns.jar
${JREHOME}/lib/ext/localedata.jar
@@ -254,6 +252,7 @@
${JREHOME}/lib/zi/America/Indiana/Knox
${JREHOME}/lib/zi/America/Indiana/Marengo
${JREHOME}/lib/zi/America/Indiana/Petersburg
+${JREHOME}/lib/zi/America/Indiana/Tell_City
${JREHOME}/lib/zi/America/Indiana/Vevay
${JREHOME}/lib/zi/America/Indiana/Vincennes
${JREHOME}/lib/zi/America/Indiana/Winamac
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/jdk/1.5/pkg/PLIST-main,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pkg/PLIST-main 27 Jul 2007 19:29:52 -0000 1.7
+++ pkg/PLIST-main 25 Oct 2007 20:51:41 -0000 1.8
@@ -1,4 +1,4 @@
[EMAIL PROTECTED] $OpenBSD: PLIST-main,v 1.7 2007/07/27 19:29:52 kurt Exp $
[EMAIL PROTECTED] $OpenBSD: PLIST-main,v 1.8 2007/10/25 20:51:41 kurt Exp $
@option no-default-conflict
@conflict jdk->=1.5,<1.6
@pkgpath devel/jdk/1.5,native_bootstrap
@@ -1043,8 +1043,6 @@
${JDKHOME}/jre/lib/cmm/PYCC.pf
${JDKHOME}/jre/lib/cmm/sRGB.pf
${JDKHOME}/jre/lib/content-types.properties
-${JDKHOME}/jre/lib/deploy/
-${JDKHOME}/jre/lib/deploy/ffjcext.zip
${JDKHOME}/jre/lib/ext/
${JDKHOME}/jre/lib/ext/dnsns.jar
${JDKHOME}/jre/lib/ext/localedata.jar
@@ -1295,6 +1293,7 @@
${JDKHOME}/jre/lib/zi/America/Indiana/Knox
${JDKHOME}/jre/lib/zi/America/Indiana/Marengo
${JDKHOME}/jre/lib/zi/America/Indiana/Petersburg
+${JDKHOME}/jre/lib/zi/America/Indiana/Tell_City
${JDKHOME}/jre/lib/zi/America/Indiana/Vevay
${JDKHOME}/jre/lib/zi/America/Indiana/Vincennes
${JDKHOME}/jre/lib/zi/America/Indiana/Winamac
