CVS commit: pkgsrc/security/sfs

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

Module Name:    pkgsrc
Committed By:   dholland
Date:           Sun Sep 10 01:49:41 UTC 2017

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

Log Message:
Fix one set of C++ build errors, but I don't know what to do about the
next set.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/sfs/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/sfs/patches/patch-ac

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.7 pkgsrc/security/sfs/distinfo:1.8
--- pkgsrc/security/sfs/distinfo:1.7    Wed Nov  4 01:18:09 2015
+++ pkgsrc/security/sfs/distinfo        Sun Sep 10 01:49:40 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2015/11/04 01:18:09 agc Exp $
+$NetBSD: distinfo,v 1.8 2017/09/10 01:49:40 dholland Exp $
 
 SHA1 (sfs-0.7.2.tar.gz) = 3619afc9b785e4aa41f7cdf202c5b233a6b5fe08
 RMD160 (sfs-0.7.2.tar.gz) = 30cd5e21c4f63292ef0f5671720f6036d08e5ff1
@@ -6,7 +6,7 @@ SHA512 (sfs-0.7.2.tar.gz) = 5b46d67053bd
 Size (sfs-0.7.2.tar.gz) = 1283652 bytes
 SHA1 (patch-aa) = 32bf5ca41bf588bdd4f2471c727822aac2906472
 SHA1 (patch-ab) = 812135658ed2e8e08991eea092a19f843e102f40
-SHA1 (patch-ac) = b5cbcecc97495ced32f03b105c118aaadc006159
+SHA1 (patch-ac) = 11b25ad26d35f51c718bc02b895e668a585c20b8
 SHA1 (patch-ad) = 3da13512ed3f6d4b60959cb88807dffcf26cb74e
 SHA1 (patch-ae) = 80222c0384e5d746d1fce66231c0f35e32a572fd
 SHA1 (patch-af) = 7e6b1fa9c2ed27e119179332f62c17439ff18cbf

Index: pkgsrc/security/sfs/patches/patch-ac
diff -u pkgsrc/security/sfs/patches/patch-ac:1.2 pkgsrc/security/sfs/patches/patch-ac:1.3
--- pkgsrc/security/sfs/patches/patch-ac:1.2    Tue Oct 15 14:48:38 2013
+++ pkgsrc/security/sfs/patches/patch-ac        Sun Sep 10 01:49:40 2017
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2013/10/15 14:48:38 joerg Exp $
+$NetBSD: patch-ac,v 1.3 2017/09/10 01:49:40 dholland Exp $
+
+Catch up to C++ standards drift.
 
 --- async/ihash.h.orig 2002-05-28 10:29:16.000000000 +0000
 +++ async/ihash.h
@@ -35,3 +37,28 @@ $NetBSD: patch-ac,v 1.2 2013/10/15 14:48
        ;
      return v;
    };
+@@ -288,20 +288,20 @@ public:
+   shash () {}
+   shash (const E &e, const H &h) : eq (e), hash (h) {}
+ 
+-  void insert (V *elm) { insert_val (elm, hash (*elm)); }
++  void insert (V *elm) { this->insert_val (elm, hash (*elm)); }
+ 
+   V *operator[] (const V &k) const {
+     V *v;
+-    for (v = lookup_val (hash (k));
++    for (v = this->lookup_val (hash (k));
+        v && !eq (k, *v);
+-       v = next_val (v))
++       v = this->next_val (v))
+       ;
+     return v;
+   }
+ 
+   V *nextkeq (V *v) {
+     const V &k = *v;
+-    while ((v = next_val (v)) && !eq (k, *v))
++    while ((v = this->next_val (v)) && !eq (k, *v))
+       ;
+     return v;
+   };