Wed Dec 2 10:45:48 2020 UTC ()
pkg_install: Merge some changes from NetBSD src/

No effective change intended, just ifdefs for bootstrapping.


(wiz)
diff -r1.11 -r1.12 pkgsrc/pkgtools/pkg_install/files/admin/check.c
diff -r1.68 -r1.69 pkgsrc/pkgtools/pkg_install/files/admin/main.c
diff -r1.15 -r1.16 pkgsrc/pkgtools/pkg_install/files/create/pl.c
cvs diff -r1.11 -r1.12 pkgsrc/pkgtools/pkg_install/files/admin/check.c (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/files/admin/check.c 2020/12/02 10:22:39 1.11
+++ pkgsrc/pkgtools/pkg_install/files/admin/check.c 2020/12/02 10:45:47 1.12
@@ -1,23 +1,27 @@ @@ -1,23 +1,27 @@
1/* $NetBSD: check.c,v 1.11 2020/12/02 10:22:39 wiz Exp $ */ 1/* $NetBSD: check.c,v 1.12 2020/12/02 10:45:47 wiz Exp $ */
2 2
 3#ifdef HAVE_NBTOOL_CONFIG_H
 4#include "nbtool_config.h"
 5#else
3#if HAVE_CONFIG_H 6#if HAVE_CONFIG_H
4#include "config.h" 7#include "config.h"
5#endif 8#endif
6#include <nbcompat.h> 9#include <nbcompat.h>
7#if HAVE_SYS_CDEFS_H 10#if HAVE_SYS_CDEFS_H
8#include <sys/cdefs.h> 11#include <sys/cdefs.h>
9#endif 12#endif
10__RCSID("$NetBSD: check.c,v 1.11 2020/12/02 10:22:39 wiz Exp $"); 13#endif
 14__RCSID("$NetBSD: check.c,v 1.12 2020/12/02 10:45:47 wiz Exp $");
11 15
12/*- 16/*-
13 * Copyright (c) 1999-2008 The NetBSD Foundation, Inc. 17 * Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
14 * All rights reserved. 18 * All rights reserved.
15 * 19 *
16 * This code is derived from software contributed to The NetBSD Foundation 20 * This code is derived from software contributed to The NetBSD Foundation
17 * by Hubert Feyrer <hubert@feyrer.de>. 21 * by Hubert Feyrer <hubert@feyrer.de>.
18 * 22 *
19 * Redistribution and use in source and binary forms, with or without 23 * Redistribution and use in source and binary forms, with or without
20 * modification, are permitted provided that the following conditions 24 * modification, are permitted provided that the following conditions
21 * are met: 25 * are met:
22 * 1. Redistributions of source code must retain the above copyright 26 * 1. Redistributions of source code must retain the above copyright
23 * notice, this list of conditions and the following disclaimer. 27 * notice, this list of conditions and the following disclaimer.
cvs diff -r1.68 -r1.69 pkgsrc/pkgtools/pkg_install/files/admin/main.c (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/files/admin/main.c 2020/07/01 10:03:20 1.68
+++ pkgsrc/pkgtools/pkg_install/files/admin/main.c 2020/12/02 10:45:47 1.69
@@ -1,23 +1,27 @@ @@ -1,23 +1,27 @@
1/* $NetBSD: main.c,v 1.68 2020/07/01 10:03:20 jperkin Exp $ */ 1/* $NetBSD: main.c,v 1.69 2020/12/02 10:45:47 wiz Exp $ */
2 2
 3#ifdef HAVE_NBTOOL_CONFIG_H
 4#include "nbtool_config.h"
 5#else
3#if HAVE_CONFIG_H 6#if HAVE_CONFIG_H
4#include "config.h" 7#include "config.h"
5#endif 8#endif
6#include <nbcompat.h> 9#include <nbcompat.h>
7#if HAVE_SYS_CDEFS_H 10#if HAVE_SYS_CDEFS_H
8#include <sys/cdefs.h> 11#include <sys/cdefs.h>
9#endif 12#endif
10__RCSID("$NetBSD: main.c,v 1.68 2020/07/01 10:03:20 jperkin Exp $"); 13#endif
 14__RCSID("$NetBSD: main.c,v 1.69 2020/12/02 10:45:47 wiz Exp $");
11 15
12/*- 16/*-
13 * Copyright (c) 1999-2019 The NetBSD Foundation, Inc. 17 * Copyright (c) 1999-2019 The NetBSD Foundation, Inc.
14 * All rights reserved. 18 * All rights reserved.
15 * 19 *
16 * This code is derived from software contributed to The NetBSD Foundation 20 * This code is derived from software contributed to The NetBSD Foundation
17 * by Hubert Feyrer <hubert@feyrer.de> and 21 * by Hubert Feyrer <hubert@feyrer.de> and
18 * by Joerg Sonnenberger <joerg@NetBSD.org>. 22 * by Joerg Sonnenberger <joerg@NetBSD.org>.
19 * 23 *
20 * Redistribution and use in source and binary forms, with or without 24 * Redistribution and use in source and binary forms, with or without
21 * modification, are permitted provided that the following conditions 25 * modification, are permitted provided that the following conditions
22 * are met: 26 * are met:
23 * 1. Redistributions of source code must retain the above copyright 27 * 1. Redistributions of source code must retain the above copyright
cvs diff -r1.15 -r1.16 pkgsrc/pkgtools/pkg_install/files/create/pl.c (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_install/files/create/pl.c 2016/04/10 19:01:19 1.15
+++ pkgsrc/pkgtools/pkg_install/files/create/pl.c 2020/12/02 10:45:47 1.16
@@ -1,23 +1,27 @@ @@ -1,23 +1,27 @@
1/* $NetBSD: pl.c,v 1.15 2016/04/10 19:01:19 joerg Exp $ */ 1/* $NetBSD: pl.c,v 1.16 2020/12/02 10:45:47 wiz Exp $ */
2 2
 3#ifdef HAVE_NBTOOL_CONFIG_H
 4#include "nbtool_config.h"
 5#else
3#if HAVE_CONFIG_H 6#if HAVE_CONFIG_H
4#include "config.h" 7#include "config.h"
5#endif 8#endif
6#include <nbcompat.h> 9#include <nbcompat.h>
7#if HAVE_SYS_CDEFS_H 10#if HAVE_SYS_CDEFS_H
8#include <sys/cdefs.h> 11#include <sys/cdefs.h>
9#endif 12#endif
10__RCSID("$NetBSD: pl.c,v 1.15 2016/04/10 19:01:19 joerg Exp $"); 13#endif
 14__RCSID("$NetBSD: pl.c,v 1.16 2020/12/02 10:45:47 wiz Exp $");
11 15
12/* 16/*
13 * FreeBSD install - a package for the installation and maintainance 17 * FreeBSD install - a package for the installation and maintainance
14 * of non-core utilities. 18 * of non-core utilities.
15 * 19 *
16 * Redistribution and use in source and binary forms, with or without 20 * Redistribution and use in source and binary forms, with or without
17 * modification, are permitted provided that the following conditions 21 * modification, are permitted provided that the following conditions
18 * are met: 22 * are met:
19 * 1. Redistributions of source code must retain the above copyright 23 * 1. Redistributions of source code must retain the above copyright
20 * notice, this list of conditions and the following disclaimer. 24 * notice, this list of conditions and the following disclaimer.
21 * 2. Redistributions in binary form must reproduce the above copyright 25 * 2. Redistributions in binary form must reproduce the above copyright
22 * notice, this list of conditions and the following disclaimer in the 26 * notice, this list of conditions and the following disclaimer in the
23 * documentation and/or other materials provided with the distribution. 27 * documentation and/or other materials provided with the distribution.