- py-scgi and ap-scgi update 1.13 to 1.14

  (remove PKGREVISION)
- Add licenses/cnri-license for above two packages

3 files changed, 62 insertions, 4 deletions

diff --git a/licenses/cnri-license b/licenses/cnri-license
new file mode 100644
index 00000000000..def09c2a34b
--- /dev/null
+++ b/licenses/cnri-license
@@ -0,0 +1,58 @@
+CNRI OPEN SOURCE LICENSE AGREEMENT
+
+IMPORTANT: PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.  BY
+COPYING, INSTALLING OR OTHERWISE USING SCGI-1.10 SOFTWARE, YOU ARE
+DEEMED TO HAVE AGREED TO THE TERMS AND CONDITIONS OF THIS LICENSE
+AGREEMENT.
+
+1. This LICENSE AGREEMENT is between Corporation for National
+   Research Initiatives, having an office at 1895 Preston White
+   Drive, Reston, VA 20191 ("CNRI"), and the Individual or
+   Organization ("Licensee") copying, installing or otherwise using
+   scgi-1.10 software in source or binary form and its associated
+   documentation ("scgi-1.10").
+
+2. Subject to the terms and conditions of this License Agreement,
+   CNRI hereby grants Licensee a nonexclusive, royalty-free, world-
+   wide license to reproduce, analyze, test, perform and/or display
+   publicly, prepare derivative works, distribute, and otherwise use
+   scgi-1.10 alone or in any derivative version, provided, however,
+   that CNRI's License Agreement and CNRI's notice of copyright,
+   i.e., "Copyright (c) 2004 Corporation for National Research
+   Initiatives; All Rights Reserved" are retained in scgi-1.10 alone
+   or in any derivative version prepared by Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on
+   or incorporates scgi-1.10 or any part thereof, and wants to make
+   the derivative work available to others as provided herein, then
+   Licensee hereby agrees to include in any such work a brief
+   summary of the changes made to scgi-1.10.
+
+4. CNRI is making scgi-1.10 available to Licensee on an "AS IS"
+   basis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+   IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO
+   AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY
+   OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF SCGI-1.10
+   WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF SCGI-
+   1.10 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
+   AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING SCGI-
+   1.10, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE
+   POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a
+   material breach of its terms and conditions.
+
+7. This License Agreement shall be governed by and interpreted in
+   all respects by the law of the State of Virginia, excluding
+   Virginia's conflict of law provisions.  Nothing in this License
+   Agreement shall be deemed to create any relationship of agency,
+   partnership, or joint venture between CNRI and Licensee.  This
+   License Agreement does not grant permission to use CNRI
+   trademarks or trade name in a trademark sense to endorse or
+   promote products or services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using scgi-1.10, Licensee
+   agrees to be bound by the terms and conditions of this License
+   Agreement.
diff --git a/www/ap-scgi/Makefile b/www/ap-scgi/Makefile
index 9858583a062..bb4698b2a66 100644
--- a/www/ap-scgi/Makefile
+++ b/www/ap-scgi/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2014/06/11 12:57:23 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2014/11/24 04:45:05 mef Exp $
 #
 
 PKGNAME=	${APACHE_PKG_PREFIX}-${DISTNAME}
-PKGREVISION=	2
 
 COMMENT=	Simple Common Gateway Interface for Apache
+LICENSE=	cnri-license
 
 DEPENDS+=	${PYPKGPREFIX}-scgi-[0-9]*:../../www/py-scgi
 
diff --git a/www/py-scgi/Makefile b/www/py-scgi/Makefile
index 79744db824c..05c2a57a600 100644
--- a/www/py-scgi/Makefile
+++ b/www/py-scgi/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2014/05/09 07:37:26 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2014/11/24 04:45:05 mef Exp $
 
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 
 COMMENT=	Simple Common Gateway Interface
+LICENSE=	cnri-license
 
 DEPENDS+=	${PYPKGPREFIX}-quixote-[0-9]*:../../devel/py-quixote