Module Name: src
Committed By: tron
Date: Sun Feb 19 17:49:09 UTC 2012
Modified Files:
src/external/bsd/pkg_install/dist/lib: license.c pkg_summary.5
version.h
Log Message:
Resolve conflicts from last import.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/lib/license.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/pkg_summary.5
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/pkg_install/dist/lib/version.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/pkg_install/dist/lib/license.c
diff -u src/external/bsd/pkg_install/dist/lib/license.c:1.2 src/external/bsd/pkg_install/dist/lib/license.c:1.3
--- src/external/bsd/pkg_install/dist/lib/license.c:1.2 Fri Apr 22 08:19:25 2011
+++ src/external/bsd/pkg_install/dist/lib/license.c Sun Feb 19 17:49:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: license.c,v 1.2 2011/04/22 08:19:25 adam Exp $ */
+/* $NetBSD: license.c,v 1.3 2012/02/19 17:49:09 tron Exp $ */
/*-
* Copyright (c) 2009 Joerg Sonnenberger <jo...@netbsd.org>.
@@ -46,8 +46,9 @@
#define HASH_SIZE 521
const char *default_acceptable_licenses =
- "public-domain "
+ "public-domain unlicense "
"gnu-fdl-v1.1 gnu-fdl-v1.2 gnu-fdl-v1.3 "
+ "gnu-gpl-v1 "
"gnu-gpl-v2 gnu-lgpl-v2 gnu-lgpl-v2.1 "
"gnu-gpl-v3 gnu-lgpl-v3 "
"original-bsd modified-bsd 2-clause-bsd "
@@ -57,15 +58,20 @@ const char *default_acceptable_licenses
"cddl-1.0 "
"cpl-1.0 "
"open-font-license "
- "mpl-1.0 mpl-1.1 "
- "png-license "
+ "mpl-1.0 mpl-1.1 mpl-2.0 "
+ "php png-license "
"postgresql-license "
+ "zlib "
"zpl "
"python-software-foundation "
"ipafont "
"isc "
"info-zip "
- "boost-license";
+ "boost-license "
+ "mplusfont "
+ "cc-by-sa-v3.0 "
+ "lppl-1.3c "
+ "epl-v1.0";
#ifdef DEBUG
static size_t hash_collisions;
Index: src/external/bsd/pkg_install/dist/lib/pkg_summary.5
diff -u src/external/bsd/pkg_install/dist/lib/pkg_summary.5:1.3 src/external/bsd/pkg_install/dist/lib/pkg_summary.5:1.4
--- src/external/bsd/pkg_install/dist/lib/pkg_summary.5:1.3 Sun May 17 21:31:59 2009
+++ src/external/bsd/pkg_install/dist/lib/pkg_summary.5 Sun Feb 19 17:49:09 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_summary.5,v 1.3 2009/05/17 21:31:59 joerg Exp $
+.\" $NetBSD: pkg_summary.5,v 1.4 2012/02/19 17:49:09 tron Exp $
.\"
.\" Copyright (c) 2006 The NetBSD Foundation
.\"
@@ -66,6 +66,10 @@ If missing, this package has no dependen
.It Ev DESCRIPTION
(required) A more detailed description of the package.
.\" DIGEST
+.It Ev FILE_CKSUM
+(optional) A checksum type supported by
+.Xr digest 1
+and checksum separated by space character.
.It Ev FILE_NAME
(optional) The name of the binary package file.
If not given,
@@ -126,6 +130,7 @@ For example, the following will list thi
.Pp
.Dl "pkg_info -X -a"
.Sh SEE ALSO
+.Xr digest 1 ,
.Xr pkg_info 1
.Sh HISTORY
The
Index: src/external/bsd/pkg_install/dist/lib/version.h
diff -u src/external/bsd/pkg_install/dist/lib/version.h:1.7 src/external/bsd/pkg_install/dist/lib/version.h:1.8
--- src/external/bsd/pkg_install/dist/lib/version.h:1.7 Fri Feb 18 22:36:00 2011
+++ src/external/bsd/pkg_install/dist/lib/version.h Sun Feb 19 17:49:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: version.h,v 1.7 2011/02/18 22:36:00 aymeric Exp $ */
+/* $NetBSD: version.h,v 1.8 2012/02/19 17:49:09 tron 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 20110215
+#define PKGTOOLS_VERSION 20120128
#endif /* _INST_LIB_VERSION_H_ */
