Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 315F21A9217 for ; Wed, 2 Dec 2020 10:45:50 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 6E75E850DE; Wed, 2 Dec 2020 10:45:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A9CA7850DC for ; Wed, 2 Dec 2020 10:45:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id SaQn_HsFyAtp for ; Wed, 2 Dec 2020 10:45:48 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 20152850C6 for ; Wed, 2 Dec 2020 10:45:48 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 192F9FA9D; Wed, 2 Dec 2020 10:45:48 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1606905948250310" MIME-Version: 1.0 Date: Wed, 2 Dec 2020 10:45:48 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/pkgtools/pkg_install/files To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20201202104548.192F9FA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1606905948250310 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_1606905948250310 Content-Disposition: inline Content-Length: 2582 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 #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 #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 #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 --_----------=_1606905948250310--