Wed Feb 10 10:50:19 2016 UTC ()
Add paratype to default-allowed licenses, since it is basically ofl-v1.1.


(wiz)
diff -r1.74 -r1.75 pkgsrc/mk/license.mk
diff -r1.44 -r1.45 pkgsrc/pkgtools/pkg_install/files/lib/license.c
cvs diff -r1.74 -r1.75 pkgsrc/mk/license.mk (expand / switch to unified diff)

--- pkgsrc/mk/license.mk 2015/09/13 11:22:22 1.74
+++ pkgsrc/mk/license.mk 2016/02/10 10:50:18 1.75
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: license.mk,v 1.74 2015/09/13 11:22:22 leot Exp $ 1# $NetBSD: license.mk,v 1.75 2016/02/10 10:50:18 wiz Exp $
2# 2#
3# This file handles everything about the LICENSE variable. It is 3# This file handles everything about the LICENSE variable. It is
4# included automatically by bsd.pkg.mk. 4# included automatically by bsd.pkg.mk.
5# 5#
6# XXX There should be one place to set the default list and for users 6# XXX There should be one place to set the default list and for users
7# to set the ACCEPTABLE_LICENSES list, used by both source builds and 7# to set the ACCEPTABLE_LICENSES list, used by both source builds and
8# binary installs# 8# binary installs#
9# 9#
10# XXX: Some of this content arguably belongs in the pkgsrc guide 10# XXX: Some of this content arguably belongs in the pkgsrc guide
11# instead. 11# instead.
12# 12#
13# === User-settable variables === 13# === User-settable variables ===
14# 14#
@@ -121,26 +121,27 @@ DEFAULT_ACCEPTABLE_LICENSES= \ @@ -121,26 +121,27 @@ DEFAULT_ACCEPTABLE_LICENSES= \
121 ibm-public-license-1.0 \ 121 ibm-public-license-1.0 \
122 ipafont \ 122 ipafont \
123 isc \ 123 isc \
124 lppl-1.0 lppl-1.2 lppl-1.3c \ 124 lppl-1.0 lppl-1.2 lppl-1.3c \
125 lucent \ 125 lucent \
126 miros \ 126 miros \
127 mit \ 127 mit \
128 mpl-1.0 mpl-1.1 mpl-2.0 \ 128 mpl-1.0 mpl-1.1 mpl-2.0 \
129 mplusfont \ 129 mplusfont \
130 ofl-v1.0 ofl-v1.1 \ 130 ofl-v1.0 ofl-v1.1 \
131 openssl \ 131 openssl \
132 original-bsd modified-bsd 2-clause-bsd \ 132 original-bsd modified-bsd 2-clause-bsd \
133 osl \ 133 osl \
 134 paratype \
134 php \ 135 php \
135 png-license \ 136 png-license \
136 postgresql-license \ 137 postgresql-license \
137 public-domain \ 138 public-domain \
138 python-software-foundation \ 139 python-software-foundation \
139 qpl-v1.0 \ 140 qpl-v1.0 \
140 sgi-free-software-b-v2.0 \ 141 sgi-free-software-b-v2.0 \
141 sleepycat-public \ 142 sleepycat-public \
142 unlicense \ 143 unlicense \
143 w3c \ 144 w3c \
144 x11 \ 145 x11 \
145 zlib \ 146 zlib \
146 zpl-2.0 \ 147 zpl-2.0 \
cvs diff -r1.44 -r1.45 pkgsrc/pkgtools/pkg_install/files/lib/license.c (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/files/lib/license.c 2015/09/13 11:25:52 1.44
+++ pkgsrc/pkgtools/pkg_install/files/lib/license.c 2016/02/10 10:50:18 1.45
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: license.c,v 1.44 2015/09/13 11:25:52 leot Exp $ */ 1/* $NetBSD: license.c,v 1.45 2016/02/10 10:50:18 wiz Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>. 4 * Copyright (c) 2009 Joerg Sonnenberger <joerg@NetBSD.org>.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 10 *
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in 14 * notice, this list of conditions and the following disclaimer in
@@ -65,26 +65,27 @@ const char *default_acceptable_licenses  @@ -65,26 +65,27 @@ const char *default_acceptable_licenses
65 "ibm-public-license-1.0 " 65 "ibm-public-license-1.0 "
66 "info-zip " 66 "info-zip "
67 "ipafont " 67 "ipafont "
68 "isc " 68 "isc "
69 "lppl-1.0 lppl-1.2 lppl-1.3c " 69 "lppl-1.0 lppl-1.2 lppl-1.3c "
70 "lucent " 70 "lucent "
71 "miros " 71 "miros "
72 "mit " 72 "mit "
73 "mpl-1.0 mpl-1.1 mpl-2.0 " 73 "mpl-1.0 mpl-1.1 mpl-2.0 "
74 "mplusfont " 74 "mplusfont "
75 "ofl-v1.0 ofl-v1.1 " 75 "ofl-v1.0 ofl-v1.1 "
76 "openssl " 76 "openssl "
77 "original-bsd modified-bsd 2-clause-bsd " 77 "original-bsd modified-bsd 2-clause-bsd "
 78 "paratype "
78 "php " 79 "php "
79 "png-license " 80 "png-license "
80 "postgresql-license " 81 "postgresql-license "
81 "public-domain " 82 "public-domain "
82 "python-software-foundation " 83 "python-software-foundation "
83 "qpl-v1.0 " 84 "qpl-v1.0 "
84 "sgi-free-software-b-v2.0 " 85 "sgi-free-software-b-v2.0 "
85 "sleepycat-public " 86 "sleepycat-public "
86 "unlicense " 87 "unlicense "
87 "vera-ttf-license " 88 "vera-ttf-license "
88 "w3c " 89 "w3c "
89 "x11 " 90 "x11 "
90 "zlib " 91 "zlib "