Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1494507381252200"
MIME-Version: 1.0
Date: Thu, 11 May 2017 12:56:21 +0000
From: "Jonathan Perkin" <jperkin@netbsd.org>
Subject: CVS commit: pkgsrc
To: pkgsrc-changes@NetBSD.org
Reply-To: jperkin@netbsd.org
Message-Id: <20170511125621.9B138FBE4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1494507381252200
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jperkin
Date:		Thu May 11 12:56:21 UTC 2017

Modified Files:
	pkgsrc/mk: license.mk
Added Files:
	pkgsrc/licenses: zsh

Log Message:
Add the zsh license and add it to the default acceptable list (MIT-like).


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/licenses/zsh
cvs rdiff -u -r1.79 -r1.80 pkgsrc/mk/license.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1494507381252200
Content-Disposition: inline
Content-Length: 2345
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=utf-8

Modified files:

Index: pkgsrc/mk/license.mk
diff -u pkgsrc/mk/license.mk:1.79 pkgsrc/mk/license.mk:1.80
--- pkgsrc/mk/license.mk:1.79	Fri Nov 18 09:43:39 2016
+++ pkgsrc/mk/license.mk	Thu May 11 12:56:21 2017
@@ -1,4 +1,4 @@
-# $NetBSD: license.mk,v 1.79 2016/11/18 09:43:39 spz Exp $
+# $NetBSD: license.mk,v 1.80 2017/05/11 12:56:21 jperkin Exp $
 #
 # This file handles everything about the LICENSE variable. It is
 # included automatically by bsd.pkg.mk.
@@ -148,7 +148,8 @@ DEFAULT_ACCEPTABLE_LICENSES= \
 	x11 \
 	zlib \
 	zpl-2.0 \
-	zpl-2.1
+	zpl-2.1 \
+	zsh
 
 # not approved by OSI, derived from BSD
 DEFAULT_ACCEPTABLE_LICENSES+=	info-zip

Added files:

Index: pkgsrc/licenses/zsh
diff -u /dev/null pkgsrc/licenses/zsh:1.1
--- /dev/null	Thu May 11 12:56:21 2017
+++ pkgsrc/licenses/zsh	Thu May 11 12:56:21 2017
@@ -0,0 +1,25 @@
+The Z Shell is copyright (c) 1992-2009 Paul Falstad, Richard Coleman,
+Zoltán Hidvégi, Andrew Main, Peter Stephenson, Sven Wischnowsky, and
+others.  All rights reserved.  Individual authors, whether or not
+specifically named, retain copyright in all changes; in what follows, they
+are referred to as `the Zsh Development Group'.  This is for convenience
+only and this body has no legal status.  The Z shell is distributed under
+the following licence; any provisions made in individual files take
+precedence.
+
+Permission is hereby granted, without written agreement and without
+licence or royalty fees, to use, copy, modify, and distribute this
+software and to distribute modified versions of this software for any
+purpose, provided that the above copyright notice and the following
+two paragraphs appear in all copies of this software.
+
+In no event shall the Zsh Development Group be liable to any party for
+direct, indirect, special, incidental, or consequential damages arising out
+of the use of this software and its documentation, even if the Zsh
+Development Group have been advised of the possibility of such damage.
+
+The Zsh Development Group specifically disclaim any warranties, including,
+but not limited to, the implied warranties of merchantability and fitness
+for a particular purpose.  The software provided hereunder is on an "as is"
+basis, and the Zsh Development Group have no obligation to provide
+maintenance, support, updates, enhancements, or modifications.


--_----------=_1494507381252200--