[pkgsrc/trunk]: pkgsrc/sysutils/radmind Newer Linuxen (Arch here) have moved ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e7aaee30bbdd
branches:  trunk
changeset: 389048:e7aaee30bbdd
user:      hauke <hauke%pkgsrc.org@localhost>
date:      Tue Dec 18 14:16:17 2018 +0000

description:
Newer Linuxen (Arch here) have moved makedev(3) from <sys/types.h> to
a Linux-only <sys/sysmacros.h>. Conditionally #include that in
transcript.c and update.c.

While here, comment the patches.

diffstat:

 sysutils/radmind/Makefile                     |   4 +-
 sysutils/radmind/distinfo                     |  28 +++++++++++++-------------
 sysutils/radmind/patches/patch-Makefile.in    |   4 ++-
 sysutils/radmind/patches/patch-command.h      |   4 ++-
 sysutils/radmind/patches/patch-config.h.in    |   4 ++-
 sysutils/radmind/patches/patch-configure      |   4 ++-
 sysutils/radmind/patches/patch-configure.ac   |   4 ++-
 sysutils/radmind/patches/patch-ktcheck.c      |   4 ++-
 sysutils/radmind/patches/patch-largefile.h    |   4 ++-
 sysutils/radmind/patches/patch-lcksum.c       |   4 ++-
 sysutils/radmind/patches/patch-libsnet_snet.c |   4 ++-
 sysutils/radmind/patches/patch-ra.sh          |   4 ++-
 sysutils/radmind/patches/patch-retr.c         |   4 ++-
 sysutils/radmind/patches/patch-transcript.c   |  21 +++++++++++++++++--
 sysutils/radmind/patches/patch-update.c       |  21 +++++++++++++++++--
 15 files changed, 85 insertions(+), 33 deletions(-)

diffs (249 lines):

diff -r d7dae763d6b0 -r e7aaee30bbdd sysutils/radmind/Makefile
--- a/sysutils/radmind/Makefile Tue Dec 18 13:27:54 2018 +0000
+++ b/sysutils/radmind/Makefile Tue Dec 18 14:16:17 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2016/04/14 11:17:31 hauke Exp $
+# $NetBSD: Makefile,v 1.38 2018/12/18 14:16:17 hauke Exp $
 #
 
 DISTNAME=      radmind-1.14.1
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=radmind/}
 
diff -r d7dae763d6b0 -r e7aaee30bbdd sysutils/radmind/distinfo
--- a/sysutils/radmind/distinfo Tue Dec 18 13:27:54 2018 +0000
+++ b/sysutils/radmind/distinfo Tue Dec 18 14:16:17 2018 +0000
@@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.21 2016/04/14 11:17:31 hauke Exp $
+$NetBSD: distinfo,v 1.22 2018/12/18 14:16:17 hauke Exp $
 
 SHA1 (radmind-1.14.1.tar.gz) = 26f37f1c002384a9c609e688d6cee2fa15b6d0d2
 RMD160 (radmind-1.14.1.tar.gz) = 6b925083ef9dce2de21ebb0ffef287b1ffe9173d
 SHA512 (radmind-1.14.1.tar.gz) = bccf9681a6899be3b500065237dd1e04cd83ffb6f9be0e355412e7b0c556325f7d13435cec65a8a5e156e4411da915744f01a615472f6361d52c4d54d8be20eb
 Size (radmind-1.14.1.tar.gz) = 403553 bytes
-SHA1 (patch-Makefile.in) = 3602966fb8f7c5118fa378a6646b81dbf0d69ab7
+SHA1 (patch-Makefile.in) = 7667b83fe2984eaa2487c75a3f82eede0cda06e2
 SHA1 (patch-command.c) = 26e93be15a5a1113b8f75eb6eaf1d77892947bc7
-SHA1 (patch-command.h) = c050593ab68538e99bd79030e50e803d17027cdb
-SHA1 (patch-config.h.in) = a5e157b47fb28d33e2a28fecc9367ff410c6fda5
-SHA1 (patch-configure) = ecf336c9b77b1622a0190a67c268012cedd074b5
-SHA1 (patch-configure.ac) = 1d009458df88fba1a25425306a46cad7d2b51737
-SHA1 (patch-ktcheck.c) = 1dff9d5d0a169b2f544f66fc79a42d22f8a5f54d
-SHA1 (patch-largefile.h) = 574e908d716d50aab84fccdd699c8b03c56b6e05
-SHA1 (patch-lcksum.c) = 2d8a8285eb70988a32b41f77d4683ef5ca127883
-SHA1 (patch-libsnet_snet.c) = 2268af5ada0b8e1c212dbd258b1a1632f2ff7613
-SHA1 (patch-ra.sh) = 7bdaec355d9fbe98f0cb7e8f49d928f4c2dfd823
-SHA1 (patch-retr.c) = 69cdf4260583313f0a9f95dfe5597ee03897a313
-SHA1 (patch-transcript.c) = b309079b7a272547f4c8843b925dd29479cc7e1d
-SHA1 (patch-update.c) = e27b377378aae6d51cdbb3b9e9f04e5dd33ee211
+SHA1 (patch-command.h) = 03daa77363c681ef625cf429071f02245689e1e9
+SHA1 (patch-config.h.in) = 89bce7b9d256e81ebb6ce1319183cb346260bcde
+SHA1 (patch-configure) = 8d4c7daab7923da97efe94383278ecd30249e142
+SHA1 (patch-configure.ac) = 12968655962adc00ce095866151d11747ac9b565
+SHA1 (patch-ktcheck.c) = 83c03e417fc93863a8575b0cb2f93e09cba1d937
+SHA1 (patch-largefile.h) = 806f12878aa628f30355b82ac23a5c92740f42a1
+SHA1 (patch-lcksum.c) = 7b7b4da338bb13f2508c5b22307263eaedb32347
+SHA1 (patch-libsnet_snet.c) = 29484ae6775a1fe9d02980a84503762b55a093e9
+SHA1 (patch-ra.sh) = 05ba697814bf4833a9c38f881e43639067afba29
+SHA1 (patch-retr.c) = 8798a4467fad905aac5061ff1c9759c29f9b7f74
+SHA1 (patch-transcript.c) = 2fab20d210317b0e0ba52102359588670ba5f941
+SHA1 (patch-update.c) = 2b951451fc1b91492eb0efe16d28e21c5e8d0470
diff -r d7dae763d6b0 -r e7aaee30bbdd sysutils/radmind/patches/patch-Makefile.in
--- a/sysutils/radmind/patches/patch-Makefile.in        Tue Dec 18 13:27:54 2018 +0000
+++ b/sysutils/radmind/patches/patch-Makefile.in        Tue Dec 18 14:16:17 2018 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-Makefile.in,v 1.1 2014/01/08 11:54:04 hauke Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2018/12/18 14:16:18 hauke Exp $
+
+Patch pkgsrc variables
 
 --- Makefile.in.orig   2010-12-13 03:43:49.000000000 +0000
 +++ Makefile.in
diff -r d7dae763d6b0 -r e7aaee30bbdd sysutils/radmind/patches/patch-command.h
--- a/sysutils/radmind/patches/patch-command.h  Tue Dec 18 13:27:54 2018 +0000
+++ b/sysutils/radmind/patches/patch-command.h  Tue Dec 18 14:16:17 2018 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-command.h,v 1.1 2014/01/08 11:54:04 hauke Exp $
+$NetBSD: patch-command.h,v 1.2 2018/12/18 14:16:18 hauke Exp $
+
+Fix for Radmind bug #221, accomodating for 64 bit time_t
 
 --- command.h.orig     2010-12-13 03:42:49.000000000 +0000
 +++ command.h
diff -r d7dae763d6b0 -r e7aaee30bbdd sysutils/radmind/patches/patch-config.h.in
--- a/sysutils/radmind/patches/patch-config.h.in        Tue Dec 18 13:27:54 2018 +0000
+++ b/sysutils/radmind/patches/patch-config.h.in        Tue Dec 18 14:16:17 2018 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-config.h.in,v 1.1 2014/01/08 11:54:04 hauke Exp $
+$NetBSD: patch-config.h.in,v 1.2 2018/12/18 14:16:18 hauke Exp $
+
+Fix for Radmind bug #221, accomodating for 64 bit time_t
 
 --- config.h.in.orig   2010-12-13 03:42:49.000000000 +0000
 +++ config.h.in
diff -r d7dae763d6b0 -r e7aaee30bbdd sysutils/radmind/patches/patch-configure
--- a/sysutils/radmind/patches/patch-configure  Tue Dec 18 13:27:54 2018 +0000
+++ b/sysutils/radmind/patches/patch-configure  Tue Dec 18 14:16:17 2018 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-configure,v 1.1 2014/01/08 11:54:04 hauke Exp $
+$NetBSD: patch-configure,v 1.2 2018/12/18 14:16:18 hauke Exp $
+
+Fix for Radmind bug #221, accomodating for 64 bit time_t
 
 This patch was generated by downgrading devel/autoconf to 2.61,
 and diffing the autoconf generated 'configure' script
diff -r d7dae763d6b0 -r e7aaee30bbdd sysutils/radmind/patches/patch-configure.ac
--- a/sysutils/radmind/patches/patch-configure.ac       Tue Dec 18 13:27:54 2018 +0000
+++ b/sysutils/radmind/patches/patch-configure.ac       Tue Dec 18 14:16:17 2018 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-configure.ac,v 1.1 2014/01/08 11:54:04 hauke Exp $
+$NetBSD: patch-configure.ac,v 1.2 2018/12/18 14:16:18 hauke Exp $
+
+Fix for Radmind bug #221, accomodating for 64 bit time_t
 
 --- configure.ac.orig  2010-12-13 03:43:38.000000000 +0000
 +++ configure.ac
diff -r d7dae763d6b0 -r e7aaee30bbdd sysutils/radmind/patches/patch-ktcheck.c
--- a/sysutils/radmind/patches/patch-ktcheck.c  Tue Dec 18 13:27:54 2018 +0000
+++ b/sysutils/radmind/patches/patch-ktcheck.c  Tue Dec 18 14:16:17 2018 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-ktcheck.c,v 1.1 2014/01/08 11:54:04 hauke Exp $
+$NetBSD: patch-ktcheck.c,v 1.2 2018/12/18 14:16:18 hauke Exp $
+
+Fix for Radmind bug #221, accomodating for 64 bit time_t
 
 --- ktcheck.c.orig     2010-12-13 03:42:49.000000000 +0000
 +++ ktcheck.c
diff -r d7dae763d6b0 -r e7aaee30bbdd sysutils/radmind/patches/patch-largefile.h
--- a/sysutils/radmind/patches/patch-largefile.h        Tue Dec 18 13:27:54 2018 +0000
+++ b/sysutils/radmind/patches/patch-largefile.h        Tue Dec 18 14:16:17 2018 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-largefile.h,v 1.1 2014/01/08 11:54:04 hauke Exp $
+$NetBSD: patch-largefile.h,v 1.2 2018/12/18 14:16:18 hauke Exp $
+
+Fix for Radmind bug #221, accomodating for 64 bit time_t
 
 --- largefile.h.orig   2010-12-13 03:42:49.000000000 +0000
 +++ largefile.h
diff -r d7dae763d6b0 -r e7aaee30bbdd sysutils/radmind/patches/patch-lcksum.c
--- a/sysutils/radmind/patches/patch-lcksum.c   Tue Dec 18 13:27:54 2018 +0000
+++ b/sysutils/radmind/patches/patch-lcksum.c   Tue Dec 18 14:16:17 2018 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-lcksum.c,v 1.1 2014/01/08 11:54:04 hauke Exp $
+$NetBSD: patch-lcksum.c,v 1.2 2018/12/18 14:16:18 hauke Exp $
+
+Fix for Radmind bug #221, accomodating for 64 bit time_t
 
 --- lcksum.c.orig      2010-12-13 03:42:49.000000000 +0000
 +++ lcksum.c
diff -r d7dae763d6b0 -r e7aaee30bbdd sysutils/radmind/patches/patch-libsnet_snet.c
--- a/sysutils/radmind/patches/patch-libsnet_snet.c     Tue Dec 18 13:27:54 2018 +0000
+++ b/sysutils/radmind/patches/patch-libsnet_snet.c     Tue Dec 18 14:16:17 2018 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-libsnet_snet.c,v 1.1 2014/01/08 11:54:04 hauke Exp $
+$NetBSD: patch-libsnet_snet.c,v 1.2 2018/12/18 14:16:18 hauke Exp $
+
+Remove stale extern declaration
 
 --- libsnet/snet.c.orig        2010-12-13 03:43:00.000000000 +0000
 +++ libsnet/snet.c
diff -r d7dae763d6b0 -r e7aaee30bbdd sysutils/radmind/patches/patch-ra.sh
--- a/sysutils/radmind/patches/patch-ra.sh      Tue Dec 18 13:27:54 2018 +0000
+++ b/sysutils/radmind/patches/patch-ra.sh      Tue Dec 18 14:16:17 2018 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-ra.sh,v 1.1 2014/01/08 11:54:04 hauke Exp $
+$NetBSD: patch-ra.sh,v 1.2 2018/12/18 14:16:18 hauke Exp $
+
+Insert pkgsrc-style defaults file
 
 --- ra.sh.orig 2010-12-13 03:42:49.000000000 +0000
 +++ ra.sh
diff -r d7dae763d6b0 -r e7aaee30bbdd sysutils/radmind/patches/patch-retr.c
--- a/sysutils/radmind/patches/patch-retr.c     Tue Dec 18 13:27:54 2018 +0000
+++ b/sysutils/radmind/patches/patch-retr.c     Tue Dec 18 14:16:17 2018 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-retr.c,v 1.1 2014/01/08 11:54:04 hauke Exp $
+$NetBSD: patch-retr.c,v 1.2 2018/12/18 14:16:18 hauke Exp $
+
+Remove stale extern declaration
 
 --- retr.c.orig        2010-12-13 03:42:49.000000000 +0000
 +++ retr.c
diff -r d7dae763d6b0 -r e7aaee30bbdd sysutils/radmind/patches/patch-transcript.c
--- a/sysutils/radmind/patches/patch-transcript.c       Tue Dec 18 13:27:54 2018 +0000
+++ b/sysutils/radmind/patches/patch-transcript.c       Tue Dec 18 14:16:17 2018 +0000
@@ -1,8 +1,23 @@
-$NetBSD: patch-transcript.c,v 1.1 2014/01/08 11:54:04 hauke Exp $
+$NetBSD: patch-transcript.c,v 1.2 2018/12/18 14:16:18 hauke Exp $
+
+Newer Linuxen (2018 Arch here) have moved makedev(3) and friends
+from <sys/types.h> to <sys/sysmacros.h>
+
+Fix for Radmind bug #221, accomodating for 64 bit time_t
 
 --- transcript.c.orig  2010-12-13 03:42:49.000000000 +0000
 +++ transcript.c
-@@ -271,7 +271,7 @@ transcript_parse( struct transcript *tra
+@@ -6,6 +6,9 @@
+ #include "config.h"
+ 
+ #include <sys/types.h>
++#if defined (__linux__)
++#include <sys/sysmacros.h>
++#endif
+ #include <sys/param.h>
+ #ifdef sun
+ #include <sys/mkdev.h>
+@@ -271,7 +274,7 @@ transcript_parse( struct transcript *tra
        tran->t_pinfo.pi_stat.st_mode = strtol( argv[ 2 ], NULL, 8 );
        tran->t_pinfo.pi_stat.st_uid = atoi( argv[ 3 ] );
        tran->t_pinfo.pi_stat.st_gid = atoi( argv[ 4 ] );
@@ -11,7 +26,7 @@
        tran->t_pinfo.pi_stat.st_size = strtoofft( argv[ 6 ], NULL, 10 );
        if ( tran->t_type != T_NEGATIVE ) {
            if (( cksum ) && ( strcmp( "-", argv [ 7 ] ) == 0  )) {
-@@ -436,12 +436,13 @@ t_print( struct pathinfo *fs, struct tra
+@@ -436,12 +439,13 @@ t_print( struct pathinfo *fs, struct tra
         * but the corresponding transcript is negative, hence, retain
         * the file system's mtime.  Woof!
         */
diff -r d7dae763d6b0 -r e7aaee30bbdd sysutils/radmind/patches/patch-update.c
--- a/sysutils/radmind/patches/patch-update.c   Tue Dec 18 13:27:54 2018 +0000
+++ b/sysutils/radmind/patches/patch-update.c   Tue Dec 18 14:16:17 2018 +0000
@@ -1,8 +1,23 @@
-$NetBSD: patch-update.c,v 1.1 2014/01/08 11:54:04 hauke Exp $
+$NetBSD: patch-update.c,v 1.2 2018/12/18 14:16:18 hauke Exp $
+
+Newer Linuxen (2018 Arch here) have moved makedev(3) and friends
+from <sys/types.h> to <sys/sysmacros.h>
+
+Fix for Radmind bug #221, accomodating for 64 bit time_t
 
 --- update.c.orig      2010-12-13 03:42:49.000000000 +0000
 +++ update.c
-@@ -26,6 +26,7 @@
+@@ -6,6 +6,9 @@
+ #include "config.h"
+ 
+ #include <sys/types.h>
++#if defined (__linux__)
++#include <sys/sysmacros.h>
++#endif
+ #include <sys/stat.h>
+ #include <sys/param.h>
+ #ifdef sun
+@@ -26,6 +29,7 @@
  #include "update.h"
  #include "code.h"
  #include "radstat.h"
@@ -10,7 +25,7 @@
  #include "transcript.h"
  #include "progress.h"
  #include "mkdirs.h"
-@@ -73,7 +74,7 @@ update( char *path, char *displaypath, i
+@@ -73,7 +77,7 @@ update( char *path, char *displaypath, i
  
        mode = strtol( targv[ 2 ], (char **)NULL, 8 );