[pkgsrc/pkg_install-renovation]: pkgsrc/pkgtools/pkg_install/files Merge lice...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fc7be329b873
branches:  pkg_install-renovation
changeset: 541549:fc7be329b873
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri May 23 15:57:04 2008 +0000

description:
Merge license changes from the HEAD.

diffstat:

 pkgtools/pkg_install/files/admin/admin.h |   7 -------
 pkgtools/pkg_install/files/admin/check.c |  11 ++---------
 pkgtools/pkg_install/files/admin/main.c  |  11 ++---------
 pkgtools/pkg_install/files/info/show.c   |  11 ++---------
 pkgtools/pkg_install/files/lib/fexec.c   |   9 +--------
 pkgtools/pkg_install/files/lib/pkgdb.c   |  11 ++---------
 pkgtools/pkg_install/files/lib/version.c |  10 ++--------
 pkgtools/pkg_install/files/lib/version.h |   8 +-------
 8 files changed, 12 insertions(+), 66 deletions(-)

diffs (224 lines):

diff -r 0eb43e4529c0 -r fc7be329b873 pkgtools/pkg_install/files/admin/admin.h
--- a/pkgtools/pkg_install/files/admin/admin.h  Fri May 23 15:51:22 2008 +0000
+++ b/pkgtools/pkg_install/files/admin/admin.h  Fri May 23 15:57:04 2008 +0000
@@ -10,13 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff -r 0eb43e4529c0 -r fc7be329b873 pkgtools/pkg_install/files/admin/check.c
--- a/pkgtools/pkg_install/files/admin/check.c  Fri May 23 15:51:22 2008 +0000
+++ b/pkgtools/pkg_install/files/admin/check.c  Fri May 23 15:57:04 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: check.c,v 1.2.4.1 2008/05/23 15:51:22 joerg Exp $      */
+/*     $NetBSD: check.c,v 1.2.4.2 2008/05/23 15:57:04 joerg Exp $      */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -8,7 +8,7 @@
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
-__RCSID("$NetBSD: check.c,v 1.2.4.1 2008/05/23 15:51:22 joerg Exp $");
+__RCSID("$NetBSD: check.c,v 1.2.4.2 2008/05/23 15:57:04 joerg Exp $");
 #endif
 
 /*-
@@ -26,13 +26,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff -r 0eb43e4529c0 -r fc7be329b873 pkgtools/pkg_install/files/admin/main.c
--- a/pkgtools/pkg_install/files/admin/main.c   Fri May 23 15:51:22 2008 +0000
+++ b/pkgtools/pkg_install/files/admin/main.c   Fri May 23 15:57:04 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.42.2.3 2008/05/23 15:51:22 joerg Exp $      */
+/*     $NetBSD: main.c,v 1.42.2.4 2008/05/23 15:57:04 joerg Exp $      */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -8,7 +8,7 @@
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
-__RCSID("$NetBSD: main.c,v 1.42.2.3 2008/05/23 15:51:22 joerg Exp $");
+__RCSID("$NetBSD: main.c,v 1.42.2.4 2008/05/23 15:57:04 joerg Exp $");
 #endif
 
 /*-
@@ -27,13 +27,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff -r 0eb43e4529c0 -r fc7be329b873 pkgtools/pkg_install/files/info/show.c
--- a/pkgtools/pkg_install/files/info/show.c    Fri May 23 15:51:22 2008 +0000
+++ b/pkgtools/pkg_install/files/info/show.c    Fri May 23 15:57:04 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: show.c,v 1.21 2008/02/07 23:40:52 joerg Exp $  */
+/*     $NetBSD: show.c,v 1.21.4.1 2008/05/23 15:57:04 joerg Exp $      */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: show.c,v 1.11 1997/10/08 07:47:38 charnier Exp";
 #else
-__RCSID("$NetBSD: show.c,v 1.21 2008/02/07 23:40:52 joerg Exp $");
+__RCSID("$NetBSD: show.c,v 1.21.4.1 2008/05/23 15:57:04 joerg Exp $");
 #endif
 #endif
 
@@ -49,13 +49,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff -r 0eb43e4529c0 -r fc7be329b873 pkgtools/pkg_install/files/lib/fexec.c
--- a/pkgtools/pkg_install/files/lib/fexec.c    Fri May 23 15:51:22 2008 +0000
+++ b/pkgtools/pkg_install/files/lib/fexec.c    Fri May 23 15:57:04 2008 +0000
@@ -13,13 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -65,7 +58,7 @@
 #include "lib.h"
 
 #ifndef lint
-__RCSID("$NetBSD: fexec.c,v 1.9 2007/09/18 15:44:18 joerg Exp $");
+__RCSID("$NetBSD: fexec.c,v 1.9.8.1 2008/05/23 15:57:04 joerg Exp $");
 #endif
 
 static int     vfcexec(const char *, int, const char *, va_list);
diff -r 0eb43e4529c0 -r fc7be329b873 pkgtools/pkg_install/files/lib/pkgdb.c
--- a/pkgtools/pkg_install/files/lib/pkgdb.c    Fri May 23 15:51:22 2008 +0000
+++ b/pkgtools/pkg_install/files/lib/pkgdb.c    Fri May 23 15:57:04 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pkgdb.c,v 1.29 2008/01/29 15:39:31 hubertf Exp $       */
+/*     $NetBSD: pkgdb.c,v 1.29.4.1 2008/05/23 15:57:04 joerg Exp $     */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -8,7 +8,7 @@
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
-__RCSID("$NetBSD: pkgdb.c,v 1.29 2008/01/29 15:39:31 hubertf Exp $");
+__RCSID("$NetBSD: pkgdb.c,v 1.29.4.1 2008/05/23 15:57:04 joerg Exp $");
 #endif
 
 /*-
@@ -26,13 +26,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *        This product includes software developed by the NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
diff -r 0eb43e4529c0 -r fc7be329b873 pkgtools/pkg_install/files/lib/version.c
--- a/pkgtools/pkg_install/files/lib/version.c  Fri May 23 15:51:22 2008 +0000
+++ b/pkgtools/pkg_install/files/lib/version.c  Fri May 23 15:57:04 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.c,v 1.4 2003/09/23 07:13:54 grant Exp $        */
+/*     $NetBSD: version.c,v 1.4.38.1 2008/05/23 15:57:04 joerg Exp $   */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -8,7 +8,7 @@
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
-__RCSID("$NetBSD: version.c,v 1.4 2003/09/23 07:13:54 grant Exp $");
+__RCSID("$NetBSD: version.c,v 1.4.38.1 2008/05/23 15:57:04 joerg Exp $");
 #endif
 
 /*
@@ -22,12 +22,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Thomas Klausner for
- *      the NetBSD Project.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r 0eb43e4529c0 -r fc7be329b873 pkgtools/pkg_install/files/lib/version.h
--- a/pkgtools/pkg_install/files/lib/version.h  Fri May 23 15:51:22 2008 +0000
+++ b/pkgtools/pkg_install/files/lib/version.h  Fri May 23 15:57:04 2008 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.102.2.1 2008/05/11 20:20:38 joerg Exp $  */
+/*     $NetBSD: version.h,v 1.102.2.2 2008/05/23 15:57:04 joerg Exp $  */
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -11,12 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by Thomas Klausner for
- *      the NetBSD Project.
- * 4. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES