diff options
author | joerg <joerg@pkgsrc.org> | 2008-05-23 15:57:04 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2008-05-23 15:57:04 +0000 |
commit | 321d2aee703edbb52a173447178dc34be7f7b662 (patch) | |
tree | a989f95f6a08a9d9d873e8ce2310c3fa3cd9cc28 /pkgtools/pkg_install/files/lib/pkgdb.c | |
parent | 8756343821bb1d99eba7381c0360a5ddc47812f8 (diff) | |
download | pkgsrc-321d2aee703edbb52a173447178dc34be7f7b662.tar.gz |
Merge license changes from the HEAD.
Diffstat (limited to 'pkgtools/pkg_install/files/lib/pkgdb.c')
-rw-r--r-- | pkgtools/pkg_install/files/lib/pkgdb.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgtools/pkg_install/files/lib/pkgdb.c b/pkgtools/pkg_install/files/lib/pkgdb.c index ec8b9e7cd29..dafff849a30 100644 --- a/pkgtools/pkg_install/files/lib/pkgdb.c +++ b/pkgtools/pkg_install/files/lib/pkgdb.c @@ -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 @@ __RCSID("$NetBSD: pkgdb.c,v 1.29 2008/01/29 15:39:31 hubertf Exp $"); * 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 |