CVS commit: pkgsrc/sysutils/bsdinstall

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Wed Jan  4 18:35:56 UTC 2023

Modified Files:
        pkgsrc/sysutils/bsdinstall: Makefile
Added Files:
        pkgsrc/sysutils/bsdinstall: distinfo
        pkgsrc/sysutils/bsdinstall/patches: patch-bsdinstall.c

Log Message:
sysutils/bsdinstall: fix building on Linux.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/bsdinstall/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/bsdinstall/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/bsdinstall/patches/patch-bsdinstall.c

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

Modified files:

Index: pkgsrc/sysutils/bsdinstall/Makefile
diff -u pkgsrc/sysutils/bsdinstall/Makefile:1.6 pkgsrc/sysutils/bsdinstall/Makefile:1.7
--- pkgsrc/sysutils/bsdinstall/Makefile:1.6     Thu Jan 28 13:38:53 2016
+++ pkgsrc/sysutils/bsdinstall/Makefile Wed Jan  4 18:35:56 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2016/01/28 13:38:53 jperkin Exp $
+# $NetBSD: Makefile,v 1.7 2023/01/04 18:35:56 vins Exp $
 
 DISTNAME=      bsdinstall-20160108
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  # empty
 DISTFILES=     # empty

Added files:

Index: pkgsrc/sysutils/bsdinstall/distinfo
diff -u /dev/null pkgsrc/sysutils/bsdinstall/distinfo:1.1
--- /dev/null   Wed Jan  4 18:35:56 2023
+++ pkgsrc/sysutils/bsdinstall/distinfo Wed Jan  4 18:35:56 2023
@@ -0,0 +1,3 @@
+$NetBSD: distinfo,v 1.1 2023/01/04 18:35:56 vins Exp $
+
+SHA1 (patch-bsdinstall.c) = 48a8bbc8d0adc634fd6836218971758985824a00

Index: pkgsrc/sysutils/bsdinstall/patches/patch-bsdinstall.c
diff -u /dev/null pkgsrc/sysutils/bsdinstall/patches/patch-bsdinstall.c:1.1
--- /dev/null   Wed Jan  4 18:35:56 2023
+++ pkgsrc/sysutils/bsdinstall/patches/patch-bsdinstall.c       Wed Jan  4 18:35:56 2023
@@ -0,0 +1,38 @@
+$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;