Module Name: src
Committed By: christos
Date: Sun Jan 12 21:31:04 UTC 2020
Modified Files:
src/external/bsd/pkg_install/dist/admin: check.c main.c
src/external/bsd/pkg_install/dist/create: pl.c
src/external/bsd/pkg_install/lib: config.h
Log Message:
Handle HAVE_NBTOOL_CONFIG_H
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/admin/check.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pkg_install/dist/admin/main.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/create/pl.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/lib/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/pkg_install/dist/admin/check.c
diff -u src/external/bsd/pkg_install/dist/admin/check.c:1.2 src/external/bsd/pkg_install/dist/admin/check.c:1.3
--- src/external/bsd/pkg_install/dist/admin/check.c:1.2 Thu Apr 20 09:18:23 2017
+++ src/external/bsd/pkg_install/dist/admin/check.c Sun Jan 12 16:31:03 2020
@@ -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.
Index: src/external/bsd/pkg_install/dist/admin/main.c
diff -u src/external/bsd/pkg_install/dist/admin/main.c:1.4 src/external/bsd/pkg_install/dist/admin/main.c:1.5
--- src/external/bsd/pkg_install/dist/admin/main.c:1.4 Sun Oct 13 17:56:14 2019
+++ src/external/bsd/pkg_install/dist/admin/main.c Sun Jan 12 16:31:03 2020
@@ -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.
Index: src/external/bsd/pkg_install/dist/create/pl.c
diff -u src/external/bsd/pkg_install/dist/create/pl.c:1.2 src/external/bsd/pkg_install/dist/create/pl.c:1.3
--- src/external/bsd/pkg_install/dist/create/pl.c:1.2 Thu Apr 20 09:18:23 2017
+++ src/external/bsd/pkg_install/dist/create/pl.c Sun Jan 12 16:31:03 2020
@@ -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
Index: src/external/bsd/pkg_install/lib/config.h
diff -u src/external/bsd/pkg_install/lib/config.h:1.2 src/external/bsd/pkg_install/lib/config.h:1.3
--- src/external/bsd/pkg_install/lib/config.h:1.2 Fri Apr 23 16:56:01 2010
+++ src/external/bsd/pkg_install/lib/config.h Sun Jan 12 16:31:03 2020
@@ -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 "jo...@netbsd.org"
@@ -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
