[src/trunk]: src/external/bsd/pkg_install Handle HAVE_NBTOOL_CONFIG_H

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/74f1b26ccd05
branches:  trunk
changeset: 467077:74f1b26ccd05
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jan 12 21:31:03 2020 +0000

description:
Handle HAVE_NBTOOL_CONFIG_H

diffstat:

 external/bsd/pkg_install/dist/admin/check.c |  8 ++++++--
 external/bsd/pkg_install/dist/admin/main.c  |  8 ++++++--
 external/bsd/pkg_install/dist/create/pl.c   |  8 ++++++--
 external/bsd/pkg_install/lib/config.h       |  2 ++
 4 files changed, 20 insertions(+), 6 deletions(-)

diffs (88 lines):

diff -r e56276686fc9 -r 74f1b26ccd05 external/bsd/pkg_install/dist/admin/check.c
--- a/external/bsd/pkg_install/dist/admin/check.c       Sun Jan 12 21:27:43 2020 +0000
+++ b/external/bsd/pkg_install/dist/admin/check.c       Sun Jan 12 21:31:03 2020 +0000
@@ -1,5 +1,8 @@
-/*     $NetBSD: check.c,v 1.2 2017/04/20 13:18:23 joerg Exp $  */
+/*     $NetBSD: check.c,v 1.3 2020/01/12 21:31:03 christos 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.2 2017/04/20 13:18:23 joerg Exp $");
+#endif
+__RCSID("$NetBSD: check.c,v 1.3 2020/01/12 21:31:03 christos Exp $");
 
 /*-
  * Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
diff -r e56276686fc9 -r 74f1b26ccd05 external/bsd/pkg_install/dist/admin/main.c
--- a/external/bsd/pkg_install/dist/admin/main.c        Sun Jan 12 21:27:43 2020 +0000
+++ b/external/bsd/pkg_install/dist/admin/main.c        Sun Jan 12 21:31:03 2020 +0000
@@ -1,5 +1,8 @@
-/*     $NetBSD: main.c,v 1.4 2019/10/13 21:56:14 joerg Exp $   */
+/*     $NetBSD: main.c,v 1.5 2020/01/12 21:31:03 christos 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.4 2019/10/13 21:56:14 joerg Exp $");
+#endif
+__RCSID("$NetBSD: main.c,v 1.5 2020/01/12 21:31:03 christos Exp $");
 
 /*-
  * Copyright (c) 1999-2019 The NetBSD Foundation, Inc.
diff -r e56276686fc9 -r 74f1b26ccd05 external/bsd/pkg_install/dist/create/pl.c
--- a/external/bsd/pkg_install/dist/create/pl.c Sun Jan 12 21:27:43 2020 +0000
+++ b/external/bsd/pkg_install/dist/create/pl.c Sun Jan 12 21:31:03 2020 +0000
@@ -1,5 +1,8 @@
-/*     $NetBSD: pl.c,v 1.2 2017/04/20 13:18:23 joerg Exp $     */
+/*     $NetBSD: pl.c,v 1.3 2020/01/12 21:31:03 christos 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.2 2017/04/20 13:18:23 joerg Exp $");
+#endif
+__RCSID("$NetBSD: pl.c,v 1.3 2020/01/12 21:31:03 christos Exp $");
 
 /*
  * FreeBSD install - a package for the installation and maintainance
diff -r e56276686fc9 -r 74f1b26ccd05 external/bsd/pkg_install/lib/config.h
--- a/external/bsd/pkg_install/lib/config.h     Sun Jan 12 21:27:43 2020 +0000
+++ b/external/bsd/pkg_install/lib/config.h     Sun Jan 12 21:31:03 2020 +0000
@@ -115,6 +115,7 @@
 /* Defined when to retain only the numeric OS version */
 /* #undef NUMERIC_VERSION_ONLY */
 
+#ifndef HAVE_NBTOOL_CONFIG_H
 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "joerg%NetBSD.org@localhost"
 
@@ -132,6 +133,7 @@
 
 /* Define to the version of this package. */
 #define PACKAGE_VERSION "20090911"
+#endif
 
 /* The size of `int', as computed by sizeof. */
 #define SIZEOF_INT 4