CVS commit: pkgsrc/security/sfs

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Mon Mar 12 00:29:24 UTC 2018

Modified Files:
        pkgsrc/security/sfs: distinfo
        pkgsrc/security/sfs/patches: patch-bv

Log Message:
Fix (mis)use of __NetBSD_Prereq__ per PR 38051.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/sfs/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/sfs/patches/patch-bv

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

Modified files:

Index: pkgsrc/security/sfs/distinfo
diff -u pkgsrc/security/sfs/distinfo:1.8 pkgsrc/security/sfs/distinfo:1.9
--- pkgsrc/security/sfs/distinfo:1.8    Sun Sep 10 01:49:40 2017
+++ pkgsrc/security/sfs/distinfo        Mon Mar 12 00:29:24 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2017/09/10 01:49:40 dholland Exp $
+$NetBSD: distinfo,v 1.9 2018/03/12 00:29:24 dholland Exp $
 
 SHA1 (sfs-0.7.2.tar.gz) = 3619afc9b785e4aa41f7cdf202c5b233a6b5fe08
 RMD160 (sfs-0.7.2.tar.gz) = 30cd5e21c4f63292ef0f5671720f6036d08e5ff1
@@ -53,5 +53,5 @@ SHA1 (patch-br) = 411b894e043d105402ab7d
 SHA1 (patch-bs) = a426787d1b2a74a92a091046c1c9fdf7696a87f4
 SHA1 (patch-bt) = 41b1359d716493aadd861818c9a377247191ecec
 SHA1 (patch-bu) = 42924f5d59315b99d3d397eedde977366ec0ad96
-SHA1 (patch-bv) = d77635ff12f3b6324fc76fbad7ad8a314c2cb12e
+SHA1 (patch-bv) = 36e4df6ad019ce5f553ce85924250aed0c6e8023
 SHA1 (patch-rpcc_genheader.C) = c6e7bfc4035bd15568fda3050a63157b372ebf06

Index: pkgsrc/security/sfs/patches/patch-bv
diff -u pkgsrc/security/sfs/patches/patch-bv:1.1 pkgsrc/security/sfs/patches/patch-bv:1.2
--- pkgsrc/security/sfs/patches/patch-bv:1.1    Sat Feb 16 22:03:49 2008
+++ pkgsrc/security/sfs/patches/patch-bv        Mon Mar 12 00:29:24 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-bv,v 1.1 2008/02/16 22:03:49 apb Exp $
+$NetBSD: patch-bv,v 1.2 2018/03/12 00:29:24 dholland Exp $
 
 --- nfsconf.h.orig     2002-09-19 06:15:18.000000000 +0200
 +++ nfsconf.h
@@ -6,7 +6,7 @@ $NetBSD: patch-bv,v 1.1 2008/02/16 22:03
  #define SYS_MOUNT(hostname, type, dir, mntflags, args)        \
      vfsmount (type, dir, mntflags, args)
  
-+#elif defined(__NetBSD__) && __NetBSD_Prereq__(4,99,24)
++#elif defined(__NetBSD__) && __NetBSD_Version__ >= 499002400
 + /* The fifth arg appeared in NetBSD between 4.99.23 and 4.99.24 */
 +#define SYS_MOUNT(hostname, type, dir, mntflags, args)        \
 +    mount (type, dir, mntflags, args, sizeof(*(args)))