diff options
| author | wiz <wiz@pkgsrc.org> | 2020-12-02 10:45:47 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2020-12-02 10:45:47 +0000 |
| commit | 47fac774b8ba1e225f8952173dff524fcd2825e9 (patch) | |
| tree | a351cae580784cb0fa8c515ad7a745c97fd33823 /pkgtools | |
| parent | 972ba11acfbbebf9d5adc9e1bb2859a090c1de77 (diff) | |
| download | pkgsrc-47fac774b8ba1e225f8952173dff524fcd2825e9.tar.gz | |
pkg_install: Merge some changes from NetBSD src/
No effective change intended, just ifdefs for bootstrapping.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/files/admin/check.c | 8 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/admin/main.c | 8 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/create/pl.c | 8 |
3 files changed, 18 insertions, 6 deletions
diff --git a/pkgtools/pkg_install/files/admin/check.c b/pkgtools/pkg_install/files/admin/check.c index 20630c2139e..208c01b6211 100644 --- a/pkgtools/pkg_install/files/admin/check.c +++ b/pkgtools/pkg_install/files/admin/check.c @@ -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 --git a/pkgtools/pkg_install/files/admin/main.c b/pkgtools/pkg_install/files/admin/main.c index 7bd43f771d4..305bab9454c 100644 --- a/pkgtools/pkg_install/files/admin/main.c +++ b/pkgtools/pkg_install/files/admin/main.c @@ -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 --git a/pkgtools/pkg_install/files/create/pl.c b/pkgtools/pkg_install/files/create/pl.c index 654ec9b322e..df62148d3cb 100644 --- a/pkgtools/pkg_install/files/create/pl.c +++ b/pkgtools/pkg_install/files/create/pl.c @@ -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 |