[PC-BSD Commits] r1921 - in pbibuild/modules/javajdk16: . overlay-dir

svn at pcbsd.org svn at pcbsd.org
Tue May 20 08:24:51 PDT 2008


Author: kris
Date: 2008-05-20 08:24:50 -0700 (Tue, 20 May 2008)
New Revision: 1921

Modified:
   pbibuild/modules/javajdk16/overlay-dir/LICENSE
   pbibuild/modules/javajdk16/pbi.conf
Log:

Updated the javajdk16 license to the correct one



Modified: pbibuild/modules/javajdk16/overlay-dir/LICENSE
===================================================================
--- pbibuild/modules/javajdk16/overlay-dir/LICENSE	2008-05-19 20:57:43 UTC (rev 1920)
+++ pbibuild/modules/javajdk16/overlay-dir/LICENSE	2008-05-20 15:24:50 UTC (rev 1921)
@@ -1,195 +1,171 @@
-FREEBSD FOUNDATION
+JAVA RESEARCH LICENSE
+Version 1.6
 
-Diablo Version 1.5.0-0 ("Software")
 
-END USER LICENSE AGREEMENT
+I.    DEFINITIONS.
 
-You may install this Software only if you are currently a licensee
-of FreeBSD (including substantially similar versions of FreeBSD) for
-your own internal use only with your copy(ies) of FreeBSD (including
-substantially similar versions of FreeBSD).  If you are an OEM - a person
-who will bundle the Software with other software before distributing the
-bundled product to end users - you must read and "accept" the provisions
-of the OEM License Agreement.  You must read the License Agreement and
-enter "YES" below to continue your install.  By doing so, you agree to
-be bound by all of the terms of this License Agreement.
+"Licensee" means You and any other party that has entered into and has
+in effect a version of this License.
 
-IMPORTANT - READ CAREFULLY: This End User License Agreement ("Agreement")
-is a legal agreement between you (in your capacity as an individual
-and as an agent for your company, institution, or other entity) and the
-FreeBSD Foundation ("Foundation").  Accessing, downloading, installing,
-using or copying of the Software (as hereafter defined) by you or a third
-party on your behalf indicates your agreement to be bound by the terms
-and conditions of this Agreement.  If you do not agree to these terms and
-conditions, do not access, download, install, use or copy the Software.
-In the absence of this Agreement, you have no rights in the Software.
-1.	LICENSE GRANT.
+"Modifications" means any change or addition to the Technology.
 
-	(a)	Subject to all third party intellectual property claims
-	and without warranty of any nature, Foundation hereby grants to
-	you, and you hereby accept, a non-exclusive license for use in
-	(x) general purpose servers and (y) general purpose desktop and
-	laptop personal computers ("License") to:  (i) download, install
-	and use the Software in binary executable form on one or more
-	computers for use by a total number of end users not to exceed
-	the number of your end users who are authorized to use FreeBSD;
-	provided that you agree to implement reasonable controls to ensure
-	that your use of the Software does not exceed such maximum number
-	of end users; and (ii) download and/or use one or more copies of
-	any related materials provided by Foundation ("Related Materials")
-	in electronic format and/or one copies of the Related Materials
-	in hard copy format subject to the following terms and conditions:
+"Sun" means Sun Microsystems, Inc. and its successors and assignees.
 
-		(i)	other than as set forth in paragraph 1(a) above,
-		you may not make or distribute copies of the Software,
-		or electronically transfer the Software from one computer
-		to another or over a network;
+"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.
 
-		(ii)	 you may not decompile, reverse engineer,
-		disassemble or otherwise reduce the Software to a
-		human-perceivable form;
+"Technology" means the source code and object code of the technology
+made available by Sun pursuant to this License.
 
-		(iii)	you may not rent, lease or sublease the Software;
+"Technology Site" means the website designated by Sun for accessing
+the Technology.
 
-		(iv)	you may not modify the Software or create
-		derivative works based upon the Software; and
+"You" means the individual executing this License or the legal entity
+or entities represented by the individual executing this License.
 
-		(v)	in the event that you breach any of the terms
-		of this Agreement, Foundation may terminate the License
-		and you must destroy all copies of the Software and
-		Related Materials.
+II.     PURPOSE.
 
-	(b)	you may make one copy of the Software in machine-readable
-	form solely for back-up purposes; provided, however, that you
-	must reproduce on such copy all copyright notices and proprietary
-	legends on the original copy of the software.
+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.
 
-	(c)	Subject to the terms and conditions of this Agreement,
-	you may create a hyperlink between an Internet website owned and
-	controlled by you and the Foundation's website, which hyperlink
-	describes in a fair and accurate manner where the Software
-	may be obtained, provided that you do not frame the Website or
-	otherwise give the false impression that Foundation is somehow
-	associated with, or otherwise endorses or sponsors your website.
-	Any goodwill associated with such hyperlink shall inure to
-	the sole and exclusive benefit of Foundation.  Other than the
-	creation of such hyperlink, nothing in this Agreement shall be
-	construed as conferring upon you any right to make any reference
-	to Foundation or to its trademarks, service marks or any other
-	indicia of origin owned by Foundation, or to indicate in any
-	way that your products or services are in any way sponsored,
-	approved, endorsed by or affiliated with Foundation.
+COMMERCIAL USE AND DISTRIBUTION OF TECHNOLOGY AND MODIFICATIONS IS
+PERMITTED ONLY UNDER A SUN COMMERCIAL LICENSE.
 
-2.	RIGHTS RESERVED.
+III.     RESEARCH USE RIGHTS.
 
-	(a)	This License does not grant you any right to enhancements
-	or updates to, or support or maintenance for, the Software or
-	any modifications made by Foundation;
+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:
 
-	(b)	Foundation is free to license the Software on terms
-	different from those contained herein;
+1.    Reproduce, create Modifications of,  and use the Technology
+alone, or with Modifications;
 
-	(c)	Foundation and its licensors hereby expressly reserve
-	all rights in the Software which are not expressly granted to
-	you under the License; and, without limiting the generality of
-	the foregoing, Foundation and its licensors retain all title,
-	copyright, and other intellectual property and proprietary rights
-	in the Software and any copies thereof, and you do not acquire
-	any rights, express or implied, other than those expressly set
-	forth in this Agreement.
+2.    Share source code of the Technology alone, or with
+Modifications, with other Licensees; and
 
-3.	COPYRIGHT.  You hereby acknowledge and agree that the Software
-is protected by United States copyright law and international treaty
-provisions.  You must reproduce all copyright notices, trademark notices
-and other proprietary notices of Foundation and its licensors on any
-copies of the Software and Related Materials and you must not remove
-such notices;
+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.
 
-4.	MAINTENANCE AND SUPPORT.  Foundation is under no obligation
-whatsoever to provide maintenance or support for the Software or
-to notify you of bug fixes, patches, or upgrades to the features,
-functionality or performance of the Software ("Enhancements") (if any),
-whether developed by Foundation or others.  If, in its sole discretion,
-Foundation makes an Enhancement available to you and does not enter into a
-separate written license agreement with you relating to such Enhancement,
-then that Enhancement will be deemed incorporated into the Software and
-subject to this Agreement.
+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.
 
-5.	WARRANTY DISCLAIMER.  THE SOFTWARE IS PROVIDED TO YOU "AS IS"
-WITHOUT WARRANTY OF ANY TYPE OR NATURE, AND FOUNDATION AND ITS LICENSORS
-HEREBY EXPRESSLY DISCLAIM ANY WARRANTIES, EXPRESS OR IMPLIED, INCLUDING,
-BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE, TITLE OR NON-INFRINGEMENT OR ANY WARRANTIES
-ARISING BY USAGE OF TRADE, COURSE OF DEALING OR COURSE OF PERFORMANCE.
-IN ADDITION, FOUNDATION AND ITS LICENSORS EXPRESSLY DISCLAIM ANY LIABILITY
-FOR THE ACCURACY, COMPLETENESS OR USEFULNESS OF THE SOFTWARE AND DO
-NOT WARRANT THAT THE SOFTWARE WILL FUNCTION UNINTERRUPTED, THAT IT
-IS ERROR-FREE OR THAT ANY ERRORS WILL BE CORRECTED.  YOU ASSUME TOTAL
-RESPONSIBILITY AND RISK FOR YOUR USE OF THE SOFTWARE, INCLUDING, BUT
-NOT LIMITED TO ANY DEFECTS OR INACCURACIES THEREIN.
-6.	LIMITATION OF LIABILITY.  IN NO EVENT SHALL FOUNDATION OR ITS
-LICENSORS BE LIABLE FOR ANY INDIRECT, INCIDENTAL, CONSEQUENTIAL, SPECIAL
-OR PUNITIVE DAMAGES OF ANY KIND OR NATURE, INCLUDING, BUT NOT LIMITED
-TO, LOSS OF PROFITS OR LOSS OF DATA, FOR ANY REASON WHATSOEVER, WHETHER
-SUCH LIABILITY IS ASSERTED ON THE BASIS OF CONTRACT, TORT (INCLUDING
-NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE, EVEN IF FOUNDATION HAS
-BEEN ADVISED OF THE POSSIBILITY OF SUCH LOSS OR DAMAGES.  IN NO EVENT
-SHALL FOUNDATION'S LIABILITY FOR DAMAGES ARISING FROM OR IN CONNECTION
-WITH THIS AGREEMENT EXCEED THE GREATER OF $500 OR THE AMOUNT PAID BY
-YOU FOR THE SOFTWARE.  BECAUSE SOME STATES DO NOT ALLOW THE EXCLUSION
-OR LIMITATION OF LIABILITY FOR CONSEQUENTIAL OR INCIDENTAL DAMAGES, THE
-ABOVE LIMITATIONS MAY NOT APPLY TO YOU.  IN THE EVENT THAT APPLICABLE
-LAW DOES NOT ALLOW THE COMPLETE EXCLUSION OR LIMITATION OF LIABILITY OF
-CLAIMS AND DAMAGES AS SET FORTH IN THIS AGREEMENT, FOUNDATION'S LIABILITY
-IS LIMITED TO THE GREATEST EXTENT PERMITTED BY LAW.
+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.
 
-7.	INDEMNIFICATION.  You shall defend, indemnify and hold harmless
-Foundation and its licensors and their respective directors, officers,
-agents, employees and volunteers from and against any and all claims,
-suits, losses, damages, costs, fees and expenses arising out of or in
-connection with this Agreement.  You shall pay all costs incurred by
-Foundation in enforcing this provision, including reasonable attorneys'
-fees and court costs.  You agree that under no circumstances will
-Foundation indemnify you or any other person.
+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.
 
-8.	TERM AND TERMINATION.  The License will continue perpetually
-unless terminated by Foundation in accordance with this Agreement.  If you
-breach any term of this Agreement and failure to cure such breach within
-thirty (30) days after receipt of written notice specifying the breach,
-this Agreement shall automatically terminate.  Upon the termination
-of this Agreement, you shall immediately cease using the Software and
-provide Foundation with written certification of your compliance with
-the foregoing.	The termination of this Agreement shall not relieve you of
-your obligations arising prior to such termination.  Notwithstanding any
-provision in this Agreement to the contrary, Sections 5 through 7 shall
-survive the termination of this Agreement.
+IV.    INTELLECTUAL PROPERTY REQUIREMENTS
 
-9.	EXPORT CONTROLS.  You shall observe all applicable United States
-and foreign laws and regulations (if any) with respect to the export,
-re-export, diversion or transfer of the Software, related technical data
-and direct products thereof, including, but not limited to the Export
-Administration Regulations.
+As a condition to Your License, You agree to comply with the following
+restrictions and responsibilities:
 
-10.	THIRD PARTY SOFTWARE.  You acknowledge and agree that the Software
-includes Java2 Standard Edition (the "Technology") pursuant to Sun
-Community Source License Copyright 1994-2003 Sun Microsystems, Inc.
-All rights reserved.  You also agree to install and use the Software
-on a product which (i) has a principle purpose that is substantially
-different from that of the stand-alone Technology; (ii) represents a
-significant functional and value enhancement to the Technology; (iii)
-operates in conjunction with the Technology; and (iv) is not marketed
-as a technology which replaces or substitutes for the Technology.
+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.
 
-11.	GENERAL.  You shall not assert against Foundation or its licensors
-any claim for infringement or misappropriation of any intellectual
-property rights in any way relating to the Software.  This Agreement shall
-be governed by, construed and enforced in accordance with the laws of the
-State of California, excluding its rules governing conflicts of laws.
-In the event that any provision of this Agreement is deemed illegal
-or unenforceable, Foundation may, but is not obligated to, post on the
-Website a new version of this Agreement which, in Foundation's opinion,
-reasonably preserves the intent of this Agreement.  This Agreement
-is binding upon and shall inure to the benefit of Foundation and
-its successors and assigns.  This Agreement represents the entire
-understanding of the parties, and superceded all previous communications,
-written or oral, relating to the subject of this Agreement.
+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.
+

Modified: pbibuild/modules/javajdk16/pbi.conf
===================================================================
--- pbibuild/modules/javajdk16/pbi.conf	2008-05-19 20:57:43 UTC (rev 1920)
+++ pbibuild/modules/javajdk16/pbi.conf	2008-05-20 15:24:50 UTC (rev 1921)
@@ -32,7 +32,7 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="21"
+BUILDKEY="51"
 
 # If this port has a non-standard port version variable in Makefile, then
 # list the key here such as "OOOVERSION="



More information about the Commits mailing list