[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files pkg_install: Merge some cha...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/01cac62febe8
branches:  trunk
changeset: 442873:01cac62febe8
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Dec 02 10:45:47 2020 +0000

description:
pkg_install: Merge some changes from NetBSD src/

No effective change intended, just ifdefs for bootstrapping.

diffstat:

 pkgtools/pkg_install/files/admin/check.c |  8 ++++++--
 pkgtools/pkg_install/files/admin/main.c  |  8 ++++++--
 pkgtools/pkg_install/files/create/pl.c   |  8 ++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diffs (69 lines):

diff -r a5041aac8b94 -r 01cac62febe8 pkgtools/pkg_install/files/admin/check.c
--- a/pkgtools/pkg_install/files/admin/check.c  Wed Dec 02 10:34:57 2020 +0000
+++ b/pkgtools/pkg_install/files/admin/check.c  Wed Dec 02 10:45:47 2020 +0000
@@ -1,5 +1,8 @@
-/*     $NetBSD: check.c,v 1.11 2020/12/02 10:22:39 wiz Exp $   */
+/*     $NetBSD: check.c,v 1.12 2020/12/02 10:45:47 wiz Exp $   */
 
+#ifdef HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#else
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -7,7 +10,8 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: check.c,v 1.11 2020/12/02 10:22:39 wiz Exp $");
+#endif
+__RCSID("$NetBSD: check.c,v 1.12 2020/12/02 10:45:47 wiz Exp $");
 
 /*-
  * Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
diff -r a5041aac8b94 -r 01cac62febe8 pkgtools/pkg_install/files/admin/main.c
--- a/pkgtools/pkg_install/files/admin/main.c   Wed Dec 02 10:34:57 2020 +0000
+++ b/pkgtools/pkg_install/files/admin/main.c   Wed Dec 02 10:45:47 2020 +0000
@@ -1,5 +1,8 @@
-/*     $NetBSD: main.c,v 1.68 2020/07/01 10:03:20 jperkin Exp $        */
+/*     $NetBSD: main.c,v 1.69 2020/12/02 10:45:47 wiz Exp $    */
 
+#ifdef HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#else
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -7,7 +10,8 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: main.c,v 1.68 2020/07/01 10:03:20 jperkin Exp $");
+#endif
+__RCSID("$NetBSD: main.c,v 1.69 2020/12/02 10:45:47 wiz Exp $");
 
 /*-
  * Copyright (c) 1999-2019 The NetBSD Foundation, Inc.
diff -r a5041aac8b94 -r 01cac62febe8 pkgtools/pkg_install/files/create/pl.c
--- a/pkgtools/pkg_install/files/create/pl.c    Wed Dec 02 10:34:57 2020 +0000
+++ b/pkgtools/pkg_install/files/create/pl.c    Wed Dec 02 10:45:47 2020 +0000
@@ -1,5 +1,8 @@
-/*     $NetBSD: pl.c,v 1.15 2016/04/10 19:01:19 joerg Exp $    */
+/*     $NetBSD: pl.c,v 1.16 2020/12/02 10:45:47 wiz Exp $      */
 
+#ifdef HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#else
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -7,7 +10,8 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: pl.c,v 1.15 2016/04/10 19:01:19 joerg Exp $");
+#endif
+__RCSID("$NetBSD: pl.c,v 1.16 2020/12/02 10:45:47 wiz Exp $");
 
 /*
  * FreeBSD install - a package for the installation and maintainance