[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files/lib Sync default-accepted l...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b20557abdacb
branches:  trunk
changeset: 559062:b20557abdacb
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon May 18 10:01:37 2009 +0000

description:
Sync default-accepted licenses with pkgsrc/mk/licenses.mk.
Bump version to 20090518.

diffstat:

 pkgtools/pkg_install/files/lib/license.c |  12 +++++++-----
 pkgtools/pkg_install/files/lib/version.h |   4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diffs (46 lines):

diff -r fe5a2d828e28 -r b20557abdacb pkgtools/pkg_install/files/lib/license.c
--- a/pkgtools/pkg_install/files/lib/license.c  Mon May 18 10:01:00 2009 +0000
+++ b/pkgtools/pkg_install/files/lib/license.c  Mon May 18 10:01:37 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: license.c,v 1.1 2009/04/25 21:31:14 joerg Exp $        */
+/*     $NetBSD: license.c,v 1.2 2009/05/18 10:01:37 wiz Exp $  */
 
 /*-
  * Copyright (c) 2009 Joerg Sonnenberger <joerg%NetBSD.org@localhost>.
@@ -47,13 +47,15 @@
 
 const char *default_acceptable_licenses =
     "public-domain "
-    "gnu-gpl-v2 "
-    "gnu-lgpl-v2 gnu-lgpl-v2.1 "
+    "gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 "
+    "gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 "
     "gnu-gpl-v3 gnu-lgpl-v3 "
-    "original-bsd modified-bsd x11 "
-    "apache-2.0 "
+    "original-bsd modified-bsd "
+    "x11 "
+    "apache-1.1 apache-2.0 "
     "artistic artistic-2.0 "
     "cddl-1.0 "
+    "cpl-1.0 "
     "open-font-license ";
 
 #ifdef DEBUG
diff -r fe5a2d828e28 -r b20557abdacb pkgtools/pkg_install/files/lib/version.h
--- a/pkgtools/pkg_install/files/lib/version.h  Mon May 18 10:01:00 2009 +0000
+++ b/pkgtools/pkg_install/files/lib/version.h  Mon May 18 10:01:37 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.127 2009/05/13 03:33:50 joerg Exp $      */
+/*     $NetBSD: version.h,v 1.128 2009/05/18 10:01:37 wiz Exp $        */
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -27,6 +27,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION "20090513"
+#define PKGTOOLS_VERSION "20090518"
 
 #endif /* _INST_LIB_VERSION_H_ */