pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/bsdinstall sysutils/bsdinstall: fix building ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c973ad062d1b
branches:  trunk
changeset: 391186:c973ad062d1b
user:      vins <vins%pkgsrc.org@localhost>
date:      Wed Jan 04 18:35:56 2023 +0000

description:
sysutils/bsdinstall: fix building on Linux.

diffstat:

 sysutils/bsdinstall/Makefile                   |   3 +-
 sysutils/bsdinstall/distinfo                   |   3 ++
 sysutils/bsdinstall/patches/patch-bsdinstall.c |  38 ++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletions(-)

diffs (61 lines):

diff -r 1aeabc77ea5e -r c973ad062d1b sysutils/bsdinstall/Makefile
--- a/sysutils/bsdinstall/Makefile      Wed Jan 04 18:33:21 2023 +0000
+++ b/sysutils/bsdinstall/Makefile      Wed Jan 04 18:35:56 2023 +0000
@@ -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
diff -r 1aeabc77ea5e -r c973ad062d1b sysutils/bsdinstall/distinfo
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/bsdinstall/distinfo      Wed Jan 04 18:35:56 2023 +0000
@@ -0,0 +1,3 @@
+$NetBSD: distinfo,v 1.1 2023/01/04 18:35:56 vins Exp $
+
+SHA1 (patch-bsdinstall.c) = 48a8bbc8d0adc634fd6836218971758985824a00
diff -r 1aeabc77ea5e -r c973ad062d1b sysutils/bsdinstall/patches/patch-bsdinstall.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/bsdinstall/patches/patch-bsdinstall.c    Wed Jan 04 18:35:56 2023 +0000
@@ -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;



Home | Main Index | Thread Index | Old Index