CVS commit: pkgsrc/pkgtools/pkg_install/files

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Dec  2 10:45:48 UTC 2020

Modified Files:
        pkgsrc/pkgtools/pkg_install/files/admin: check.c main.c
        pkgsrc/pkgtools/pkg_install/files/create: pl.c

Log Message:
pkg_install: Merge some changes from NetBSD src/

No effective change intended, just ifdefs for bootstrapping.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/pkgtools/pkg_install/files/admin/check.c
cvs rdiff -u -r1.68 -r1.69 pkgsrc/pkgtools/pkg_install/files/admin/main.c
cvs rdiff -u -r1.15 -r1.16 pkgsrc/pkgtools/pkg_install/files/create/pl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/pkg_install/files/admin/check.c
diff -u pkgsrc/pkgtools/pkg_install/files/admin/check.c:1.11 pkgsrc/pkgtools/pkg_install/files/admin/check.c:1.12
--- pkgsrc/pkgtools/pkg_install/files/admin/check.c:1.11        Wed Dec  2 10:22:39 2020
+++ pkgsrc/pkgtools/pkg_install/files/admin/check.c     Wed Dec  2 10:45:47 2020
@@ -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.

Index: pkgsrc/pkgtools/pkg_install/files/admin/main.c
diff -u pkgsrc/pkgtools/pkg_install/files/admin/main.c:1.68 pkgsrc/pkgtools/pkg_install/files/admin/main.c:1.69
--- pkgsrc/pkgtools/pkg_install/files/admin/main.c:1.68 Wed Jul  1 10:03:20 2020
+++ pkgsrc/pkgtools/pkg_install/files/admin/main.c      Wed Dec  2 10:45:47 2020
@@ -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.

Index: pkgsrc/pkgtools/pkg_install/files/create/pl.c
diff -u pkgsrc/pkgtools/pkg_install/files/create/pl.c:1.15 pkgsrc/pkgtools/pkg_install/files/create/pl.c:1.16
--- pkgsrc/pkgtools/pkg_install/files/create/pl.c:1.15  Sun Apr 10 19:01:19 2016
+++ pkgsrc/pkgtools/pkg_install/files/create/pl.c       Wed Dec  2 10:45:47 2020
@@ -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