Sun Oct 25 21:32:49 2009 UTC ()
Add 2-clause-bsd to DEFAULT_ACCEPTABLE_LICENSES.


(wiz)
diff -r1.9 -r1.10 pkgsrc/pkgtools/pkg_install/files/lib/license.c
cvs diff -r1.9 -r1.10 pkgsrc/pkgtools/pkg_install/files/lib/license.c (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/files/lib/license.c 2009/08/02 17:56:45 1.9
+++ pkgsrc/pkgtools/pkg_install/files/lib/license.c 2009/10/25 21:32:48 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: license.c,v 1.9 2009/08/02 17:56:45 joerg Exp $ */ 1/* $NetBSD: license.c,v 1.10 2009/10/25 21:32:48 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
@@ -40,27 +40,27 @@ @@ -40,27 +40,27 @@
40#endif 40#endif
41#include <stdlib.h> 41#include <stdlib.h>
42#include <string.h> 42#include <string.h>
43 43
44#include "lib.h" 44#include "lib.h"
45 45
46#define HASH_SIZE 521 46#define HASH_SIZE 521
47 47
48const char *default_acceptable_licenses = 48const char *default_acceptable_licenses =
49 "public-domain " 49 "public-domain "
50 "gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 " 50 "gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 "
51 "gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 " 51 "gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 "
52 "gnu-gpl-v3 gnu-lgpl-v3 " 52 "gnu-gpl-v3 gnu-lgpl-v3 "
53 "original-bsd modified-bsd " 53 "original-bsd modified-bsd 2-clause-bsd "
54 "x11 mit miros " 54 "x11 mit miros "
55 "apache-1.1 apache-2.0 " 55 "apache-1.1 apache-2.0 "
56 "artistic artistic-2.0 " 56 "artistic artistic-2.0 "
57 "cddl-1.0 " 57 "cddl-1.0 "
58 "cpl-1.0 " 58 "cpl-1.0 "
59 "open-font-license " 59 "open-font-license "
60 "mpl-1.0 mpl-1.1 " 60 "mpl-1.0 mpl-1.1 "
61 "zpl"; 61 "zpl";
62 62
63#ifdef DEBUG 63#ifdef DEBUG
64static size_t hash_collisions; 64static size_t hash_collisions;
65#endif 65#endif
66 66