[pkgsrc/trunk]: pkgsrc/sysutils/bsdinstall bsdinstall: Apply patch directly t...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/247a8d868007
branches:  trunk
changeset: 391241:247a8d868007
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Jan 06 14:21:16 2023 +0000

description:
bsdinstall: Apply patch directly to sources.

Packages that have unpacked sources that are in the bootstrap path must never
have patches as it causes bootstrap issues with requiring digest and nbpatch.

diffstat:

 sysutils/bsdinstall/distinfo                   |   3 --
 sysutils/bsdinstall/files/bsdinstall.c         |  12 ++++++--
 sysutils/bsdinstall/patches/patch-bsdinstall.c |  38 --------------------------
 3 files changed, 9 insertions(+), 44 deletions(-)

diffs (90 lines):

diff -r ef3d4d6df3bf -r 247a8d868007 sysutils/bsdinstall/distinfo
--- a/sysutils/bsdinstall/distinfo      Fri Jan 06 10:58:07 2023 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-$NetBSD: distinfo,v 1.1 2023/01/04 18:35:56 vins Exp $
-
-SHA1 (patch-bsdinstall.c) = 48a8bbc8d0adc634fd6836218971758985824a00
diff -r ef3d4d6df3bf -r 247a8d868007 sysutils/bsdinstall/files/bsdinstall.c
--- a/sysutils/bsdinstall/files/bsdinstall.c    Fri Jan 06 10:58:07 2023 +0000
+++ b/sysutils/bsdinstall/files/bsdinstall.c    Fri Jan 06 14:21:16 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bsdinstall.c,v 1.3 2015/11/18 12:12:49 jperkin Exp $   */
+/*     $NetBSD: bsdinstall.c,v 1.4 2023/01/06 14:21:16 jperkin Exp $   */
 /*     NetBSD: xinstall.c,v 1.114 2009/11/12 10:10:49 tron Exp */
 
 /*
@@ -73,9 +73,9 @@
 #include <fcntl.h>
 #include <libgen.h>
 #include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #if defined(HAVE_NBCOMPAT_H)
+#include <nbcompat/string.h>
+#include <nbcompat/unistd.h>
 #include <nbcompat/grp.h>
 #include <nbcompat/paths.h>
 #include <nbcompat/pwd.h>
@@ -83,6 +83,8 @@
 #include <nbcompat/util.h>
 #include <nbcompat/vis.h>
 #else
+#include <string.h>
+#include <unistd.h>
 #include <grp.h>
 #include <paths.h>
 #include <pwd.h>
@@ -110,6 +112,10 @@
 #define STRIP_ARGS_MAX 32
 #define BACKUP_SUFFIX ".old"
 
+#ifndef MAXBSIZE
+#define MAXBSIZE (64 * 1024)
+#endif
+
 extern void *setmode(const char *p);
 
 static int     dobackup, dodir, dostrip, dolink, dopreserve, dorename, dounpriv;
diff -r ef3d4d6df3bf -r 247a8d868007 sysutils/bsdinstall/patches/patch-bsdinstall.c
--- a/sysutils/bsdinstall/patches/patch-bsdinstall.c    Fri Jan 06 10:58:07 2023 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-$NetBSD: patch-bsdinstall.c,v 1.1 2023/01/04 18:35:56 vins Exp $
-
-Portability fixes for non-BSD systems.
-
---- bsdinstall.c.orig  2023-01-04 18:13:49.292371298 +0000
-+++ bsdinstall.c
-@@ -73,9 +73,9 @@ __RCSID("NetBSD: xinstall.c,v 1.114 2009
- #include <fcntl.h>
- #include <libgen.h>
- #include <stdio.h>
--#include <string.h>
--#include <unistd.h>
- #if defined(HAVE_NBCOMPAT_H)
-+#include <nbcompat/string.h>
-+#include <nbcompat/unistd.h>
- #include <nbcompat/grp.h>
- #include <nbcompat/paths.h>
- #include <nbcompat/pwd.h>
-@@ -83,6 +83,8 @@ __RCSID("NetBSD: xinstall.c,v 1.114 2009
- #include <nbcompat/util.h>
- #include <nbcompat/vis.h>
- #else
-+#include <string.h>
-+#include <unistd.h>
- #include <grp.h>
- #include <paths.h>
- #include <pwd.h>
-@@ -110,6 +112,10 @@ __RCSID("NetBSD: xinstall.c,v 1.114 2009
- #define STRIP_ARGS_MAX 32
- #define BACKUP_SUFFIX ".old"
- 
-+#ifndef MAXBSIZE
-+#define MAXBSIZE (64 * 1024)
-+#endif
-+
- extern void *setmode(const char *p);
- 
- static int    dobackup, dodir, dostrip, dolink, dopreserve, dorename, dounpriv;