Revision: 493
http://vcs.pcre.org/viewvc?view=rev&revision=493
Author: ph10
Date: 2010-03-02 11:37:21 +0000 (Tue, 02 Mar 2010)
Log Message:
-----------
Updated licensing terms in pcregexp.pas
Modified Paths:
--------------
code/trunk/ChangeLog
code/trunk/pcregexp.pas
Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog 2010-03-02 11:26:55 UTC (rev 492)
+++ code/trunk/ChangeLog 2010-03-02 11:37:21 UTC (rev 493)
@@ -8,6 +8,9 @@
2. Added the option --libs-cpp to pcre-config, but only when C++ support is
configured.
+
+3. Updated the licensing terms in the pcregexp.pas file, as agreed with the
+ original author of that file, following a query about its status.
Version 8.01 19-Jan-2010
Modified: code/trunk/pcregexp.pas
===================================================================
--- code/trunk/pcregexp.pas 2010-03-02 11:26:55 UTC (rev 492)
+++ code/trunk/pcregexp.pas 2010-03-02 11:37:21 UTC (rev 493)
@@ -7,8 +7,33 @@
The current PCRE version is: 3.7
- This software must be distributed as Freeware.
+ This software may be distributed under the terms of the modified BSD license
+ Copyright (c) 2001, Alexander Tokarev
+ All rights reserved.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * 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.
+ * Neither the name of the <ORGANIZATION> nor the names of its contributors
+ may be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
+
The PCRE library is written by: Philip Hazel <ph10@???>
Copyright (c) 1997-2004 University of Cambridge
