CVS commit: pkgsrc/sysutils/fdtools

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Jan 16 21:49:55 UTC 2023

Modified Files:
        pkgsrc/sysutils/fdtools: Makefile distinfo
Added Files:
        pkgsrc/sysutils/fdtools/patches:
            patch-src_.mkmed-data_src_prjlibs-c_diewarn.h

Log Message:
Provide compatibility defines for skalibs 2.13.0.0 and up.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/fdtools/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/fdtools/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/fdtools/patches/patch-src_.mkmed-data_src_prjlibs-c_diewarn.h

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

Modified files:

Index: pkgsrc/sysutils/fdtools/Makefile
diff -u pkgsrc/sysutils/fdtools/Makefile:1.15 pkgsrc/sysutils/fdtools/Makefile:1.16
--- pkgsrc/sysutils/fdtools/Makefile:1.15       Wed Sep 29 09:53:16 2021
+++ pkgsrc/sysutils/fdtools/Makefile    Mon Jan 16 21:49:55 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/09/29 09:53:16 schmonz Exp $
+# $NetBSD: Makefile,v 1.16 2023/01/16 21:49:55 schmonz Exp $
 
 DISTNAME=              fdtools-2021.04.30
 PKGREVISION=           1
@@ -15,9 +15,7 @@ WRKSRC=                       ${WRKDIR}/misc/${PKGNAME_NOREV
 DJB_SLASHPACKAGE=      YES
 
 CPPFLAGS+=             -I ${PREFIX:Q}/include \
-                       -Dtain_t=tain \
-                       -Dpathexec=mexec -Dpathexec0=mexec0 \
-                       -Dpathexec_run=exec_ae -Dpathexec_env=env_mexec
+                       -Dtain_t=tain
 LDFLAGS+=              -L ${PREFIX:Q}/lib/skalibs
 LDFLAGS.SunOS+=                -lsocket
 

Index: pkgsrc/sysutils/fdtools/distinfo
diff -u pkgsrc/sysutils/fdtools/distinfo:1.8 pkgsrc/sysutils/fdtools/distinfo:1.9
--- pkgsrc/sysutils/fdtools/distinfo:1.8        Tue Oct 26 11:19:35 2021
+++ pkgsrc/sysutils/fdtools/distinfo    Mon Jan 16 21:49:55 2023
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 11:19:35 nia Exp $
+$NetBSD: distinfo,v 1.9 2023/01/16 21:49:55 schmonz Exp $
 
 BLAKE2s (fdtools-2021.04.30.tar.bz2) = 57d882f9d5a8aef7d7e185690577640632b7c8725ce27432a55d5458de0f4918
 SHA512 (fdtools-2021.04.30.tar.bz2) = a023af80b565a72b78bca0cf40dab0de7a6c34dfbe7a9067976d24437fd0113eb253f52212d184b76c507579114cce2adab3637e561efd7872c54cb0e8935262
 Size (fdtools-2021.04.30.tar.bz2) = 42358 bytes
 SHA1 (patch-conf-compile_defaults_host__compile.sh) = d30f146419e30cd717c299b8196918db3095f3e8
 SHA1 (patch-conf-compile_defaults_host__link.sh) = 77e80f0ed9adc0ead6f9afea9b76dbb630ff2ce0
+SHA1 (patch-src_.mkmed-data_src_prjlibs-c_diewarn.h) = 4009baa155da3b0e4038d7868a06b36426e7bd76
 SHA1 (patch-src_.mkmed-data_src_prjlibs-c_standards.h) = f5b1b2b8d7999653994a629037169bc4d3592824
 SHA1 (patch-src_sigsched.c) = ed4cf2111ab65fb80f5cbcfd6aa0c49db12a845a

Added files:

Index: pkgsrc/sysutils/fdtools/patches/patch-src_.mkmed-data_src_prjlibs-c_diewarn.h
diff -u /dev/null pkgsrc/sysutils/fdtools/patches/patch-src_.mkmed-data_src_prjlibs-c_diewarn.h:1.1
--- /dev/null   Mon Jan 16 21:49:55 2023
+++ pkgsrc/sysutils/fdtools/patches/patch-src_.mkmed-data_src_prjlibs-c_diewarn.h       Mon Jan 16 21:49:55 2023
@@ -0,0 +1,49 @@
+$NetBSD: patch-src_.mkmed-data_src_prjlibs-c_diewarn.h,v 1.1 2023/01/16 21:49:55 schmonz Exp $
+
+Provide compatibility defines for skalibs 2.13.0.0 and up.
+
+--- src/.mkmed-data/src/prjlibs-c/diewarn.h.orig       2021-04-30 07:37:06.416933193 +0000
++++ src/.mkmed-data/src/prjlibs-c/diewarn.h
+@@ -1,6 +1,15 @@
+ #ifndef PACKAGE__PROG__PRJLIBS__DIEWARN_H
+ #define PACKAGE__PROG__PRJLIBS__DIEWARN_H
+ 
++#define strerr_die3x(e, x1, x2, x3) \
++strerr_die(e, x1, x2, (x3), 0, 0, 0, 0, 0, 0, 0, 0)
++#define strerr_die4x(e, x1, x2, x3, x4) \
++strerr_die(e, x1, x2, x3, (x4), 0, 0, 0, 0, 0, 0, 0)
++#define strerr_die5x(e, x1, x2, x3, x4, x5) \
++strerr_die(e, x1, x2, x3, x4, (x5), 0, 0, 0, 0, 0, 0)
++#define strerr_die6x(e, x1, x2, x3, x4, x5, x6) \
++strerr_die(e, x1, x2, x3, x4, x5, (x6), 0, 0, 0, 0, 0)
++
+ #define DIE1X(status,x0)          strerr_die3x((status),PROG,": ",(x0))
+ #define DIE2X(status,x0,x1)       strerr_die4x((status),PROG,": ",(x0),(x1))
+ #define DIE3X(status,x0,x1,x2)    strerr_die5x((status),PROG,": ",(x0),(x1),\
+@@ -76,12 +85,26 @@
+ #define WARNTEXT1(op) WARNTEXT_unable(1, op) " "
+ #define WARNTEXT2(op) WARNTEXT_unable(2, op) " "
+ 
++#define strerr_warn2sys(x1, x2) \
++strerr_warnsys(x1, (x2), 0, 0, 0, 0, 0, 0, 0, 0)
++#define strerr_warn4sys(x1, x2, x3, x4) \
++strerr_warnsys(x1, x2, x3, (x4), 0, 0, 0, 0, 0, 0)
++#define strerr_warn6sys(x1, x2, x3, x4, x5, x6) \
++strerr_warnsys(x1, x2, x3, x4, x5, (x6), 0, 0, 0, 0)
++
+ #define WARN0(op)       strerr_warn2sys(PROG, WARNTEXT0(WARNTEXT0_##op))
+ #define WARN1(op,x0)    strerr_warn4sys(PROG, WARNTEXT1(WARNTEXT1_##op), \
+                                         (x0), ": ")
+ #define WARN2(op,x0,x1) strerr_warn6sys(PROG, WARNTEXT2(WARNTEXT2_##op), \
+                                         (x0), WARNSEP2_##op, (x1), ": ")
+ 
++#define strerr_die2sys(e, x1, x2) \
++strerr_diesys(e, x1, (x2), 0, 0, 0, 0, 0, 0, 0, 0)
++#define strerr_die4sys(e, x1, x2, x3, x4) \
++strerr_diesys(e, x1, x2, x3, (x4), 0, 0, 0, 0, 0, 0)
++#define strerr_die6sys(e, x1, x2, x3, x4, x5, x6) \
++strerr_diesys(e, x1, x2, x3, x4, x5, (x6), 0, 0, 0, 0)
++
+ #define DIE0(op)       strerr_die2sys(DIESTAT(#op), PROG, \
+                                       WARNTEXT0(WARNTEXT0_##op))
+ #define DIE1(op,x0)    strerr_die4sys(DIESTAT(#op), PROG, \