CVS commit: pkgsrc/sysutils/mesure

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Fri Jun 23 19:13:15 UTC 2017

Modified Files:
        pkgsrc/sysutils/mesure: distinfo
        pkgsrc/sysutils/mesure/patches: patch-ab

Log Message:
Correct mesure build on NetBSD 8.99.1

Address <sys/user.h> removal fallout.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/mesure/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/mesure/patches/patch-ab

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

Modified files:

Index: pkgsrc/sysutils/mesure/distinfo
diff -u pkgsrc/sysutils/mesure/distinfo:1.4 pkgsrc/sysutils/mesure/distinfo:1.5
--- pkgsrc/sysutils/mesure/distinfo:1.4 Wed Nov  4 01:32:21 2015
+++ pkgsrc/sysutils/mesure/distinfo     Fri Jun 23 19:13:15 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 01:32:21 agc Exp $
+$NetBSD: distinfo,v 1.5 2017/06/23 19:13:15 kamil Exp $
 
 SHA1 (mesure-0.5.tar.gz) = 587f4cb2132b748cd127b0307269e658756a6ae3
 RMD160 (mesure-0.5.tar.gz) = 8c8a60fe903bdb220f427f444b3fc80b840f5b38
 SHA512 (mesure-0.5.tar.gz) = 231a946193d86c8167848cf7bc7cfff7075ee87bd0c4978bec6c181fdf463d5a60aa7bb7c31ed465a46fb5fe30d03c36751f0bc7d223365185b250b495ba1cc0
 Size (mesure-0.5.tar.gz) = 13374 bytes
 SHA1 (patch-aa) = 4f3692cf816c208178730ba3033700b840690c27
-SHA1 (patch-ab) = 9a350289e763bdf60cae78eb6e827181b6d1d9c8
+SHA1 (patch-ab) = 6d1ff5d4451433bde583bd1821076f7c4adf3500
 SHA1 (patch-src_main.c) = c82f325885c371715540a924dc7e90fafe6a70dd

Index: pkgsrc/sysutils/mesure/patches/patch-ab
diff -u pkgsrc/sysutils/mesure/patches/patch-ab:1.1 pkgsrc/sysutils/mesure/patches/patch-ab:1.2
--- pkgsrc/sysutils/mesure/patches/patch-ab:1.1 Sat Mar 25 17:14:40 2006
+++ pkgsrc/sysutils/mesure/patches/patch-ab     Fri Jun 23 19:13:15 2017
@@ -1,21 +1,23 @@
-$NetBSD: patch-ab,v 1.1 2006/03/25 17:14:40 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2017/06/23 19:13:15 kamil Exp $
 
---- src/mem.c.orig     2006-03-25 16:59:45.000000000 +0000
+--- src/mem.c.orig     2005-08-10 07:06:16.000000000 +0000
 +++ src/mem.c
-@@ -7,10 +7,10 @@
+@@ -7,10 +7,12 @@
  #include <sys/fcntl.h>
  #include <stdio.h>
  #include <unistd.h>
 -#if !__linux__
 +#if !defined(__linux__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
  #include <sys/user.h>
++#endif
  #include <kvm.h>
 -#if __FreeBSD__ || __APPLE__
 +#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__DragonFly__)
  #define KVM_NO_FILES O_RDONLY
  #endif
  #endif
-@@ -26,7 +26,7 @@ mem_get_value()
+@@ -26,7 +28,7 @@ mem_get_value()
  {
        long total=0;
  
@@ -24,7 +26,7 @@ $NetBSD: patch-ab,v 1.1 2006/03/25 17:14
        FILE *fd;
        char var[1024];
        long val,memtotal,memfree;
-@@ -56,7 +56,7 @@ mem_get_value()
+@@ -56,7 +58,7 @@ mem_get_value()
        total*=1024;
  
  #else