Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1565806320203690"
MIME-Version: 1.0
Date: Wed, 14 Aug 2019 18:12:00 +0000
From: "Brook Milligan" <brook@netbsd.org>
Subject: CVS commit: pkgsrc
To: pkgsrc-changes@NetBSD.org
Reply-To: brook@netbsd.org
Message-Id: <20190814181200.DAB11FBF4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	brook
Date:		Wed Aug 14 18:12:00 UTC 2019

Modified Files:
	pkgsrc/biology/py-biopython: Makefile
	pkgsrc/mk: license.mk
Added Files:
	pkgsrc/licenses: biopython
Removed Files:
	pkgsrc/licenses: biopython-license

Log Message:
Add the biopython license to DEFAULT_ACCEPTABLE_LICENSES.

The biopython license is _very_ similar, but not identical, to many
other open source licenses used throughout pkgsrc.  The gratuitous
differences are being addressed by the project through an effort to
relicense all files to the 3-clause BSD license.  In the meantime,
Debian has accepted that the current biopython license meets the DFSG
and includes the package in their main distribution.  Consequently,
rename the license file and add it to DEFAULT_ACCEPTABLE_LICENSES.

See http://mail-index.netbsd.org/pkgsrc-changes/2019/08/13/msg195804.html.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/biology/py-biopython/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/licenses/biopython
cvs rdiff -u -r1.1 -r0 pkgsrc/licenses/biopython-license
cvs rdiff -u -r1.100 -r1.101 pkgsrc/mk/license.mk

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


--_----------=_1565806320203690
Content-Disposition: inline
Content-Length: 2922
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/biology/py-biopython/Makefile
diff -u pkgsrc/biology/py-biopython/Makefile:1.1 pkgsrc/biology/py-biopython/Makefile:1.2
--- pkgsrc/biology/py-biopython/Makefile:1.1	Fri Aug  9 21:52:34 2019
+++ pkgsrc/biology/py-biopython/Makefile	Wed Aug 14 18:12:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/08/09 21:52:34 brook Exp $
+# $NetBSD: Makefile,v 1.2 2019/08/14 18:12:00 brook Exp $
 
 DISTNAME=	biopython-1.74
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -8,7 +8,7 @@ MASTER_SITES=	http://biopython.org/DIST/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://biopython.org/
 COMMENT=	Python libraries for computational molecular biology
-LICENSE=	biopython-license
+LICENSE=	biopython
 
 USE_TOOLS+=	pax
 

Index: pkgsrc/mk/license.mk
diff -u pkgsrc/mk/license.mk:1.100 pkgsrc/mk/license.mk:1.101
--- pkgsrc/mk/license.mk:1.100	Tue Aug 13 04:27:18 2019
+++ pkgsrc/mk/license.mk	Wed Aug 14 18:12:00 2019
@@ -1,4 +1,4 @@
-# $NetBSD: license.mk,v 1.100 2019/08/13 04:27:18 maya Exp $
+# $NetBSD: license.mk,v 1.101 2019/08/14 18:12:00 brook Exp $
 #
 # This file handles everything about the LICENSE variable. It is
 # included automatically by bsd.pkg.mk.
@@ -170,6 +170,8 @@ DEFAULT_ACCEPTABLE_LICENSES= \
 # The following licenses meet the DFSG (but are not formally approved
 # by FSF/OSI) as evidenced by inclusion in Debian main.
 #
+# used in https://sources.debian.org/copyright/license/python-biopython/
+DEFAULT_ACCEPTABLE_LICENSES+=	biopython
 # \todo reference to package
 DEFAULT_ACCEPTABLE_LICENSES+=	happy
 # used in https://sources.debian.org/copyright/license/lsof/

Added files:

Index: pkgsrc/licenses/biopython
diff -u /dev/null pkgsrc/licenses/biopython:1.1
--- /dev/null	Wed Aug 14 18:12:00 2019
+++ pkgsrc/licenses/biopython	Wed Aug 14 18:12:00 2019
@@ -0,0 +1,20 @@
+Biopython License Agreement
+---------------------------
+
+Permission to use, copy, modify, and distribute this software and its
+documentation with or without modifications and for any purpose and
+without fee is hereby granted, provided that any copyright notices
+appear in all copies and that both those copyright notices and this
+permission notice appear in supporting documentation, and that the
+names of the contributors or copyright holders not be used in
+advertising or publicity pertaining to distribution of the software
+without specific prior permission.
+
+THE CONTRIBUTORS AND COPYRIGHT HOLDERS OF THIS SOFTWARE DISCLAIM ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL THE
+CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT
+OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
+OR PERFORMANCE OF THIS SOFTWARE.


--_----------=_1565806320203690--