CVS commit: pkgsrc/sysutils/conky

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

Module Name:    pkgsrc
Committed By:   kamil
Date:           Fri Jun 30 00:23:03 UTC 2017

Modified Files:
        pkgsrc/sysutils/conky: distinfo
        pkgsrc/sysutils/conky/patches: patch-src_netbsd.h

Log Message:
Fix build of conky on NetBSD 8.99.1

Address <sys/user.h> removal fallout.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/sysutils/conky/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/sysutils/conky/patches/patch-src_netbsd.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/conky/distinfo
diff -u pkgsrc/sysutils/conky/distinfo:1.6 pkgsrc/sysutils/conky/distinfo:1.7
--- pkgsrc/sysutils/conky/distinfo:1.6  Mon Apr 11 01:49:27 2016
+++ pkgsrc/sysutils/conky/distinfo      Fri Jun 30 00:23:03 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2016/04/11 01:49:27 riastradh Exp $
+$NetBSD: distinfo,v 1.7 2017/06/30 00:23:03 kamil Exp $
 
 SHA1 (conky-1.9.0.tar.bz2) = 2069cbdb8e7224fcbf3c6b1ddebf64a51634b4cc
 RMD160 (conky-1.9.0.tar.bz2) = 2df0e60d4236ed667bdae876e11ba28d05914e25
@@ -12,6 +12,6 @@ SHA1 (patch-src_conky.c) = e4c9173661cca
 SHA1 (patch-src_core.c) = a64ff7cb05d7b6b62aea41e486c0a719e2c93faf
 SHA1 (patch-src_fs.c) = 104fd3788f319689026702d6a149410184072e24
 SHA1 (patch-src_netbsd.c) = 6dd3544c02fffe8ab03ecb9560c84f4016345ee6
-SHA1 (patch-src_netbsd.h) = 25f9c66eede8e4aaef475d6afcbf79440ec8d7bb
+SHA1 (patch-src_netbsd.h) = dee5c466ab5cc267f1da94848b0a8b598303dfe4
 SHA1 (patch-src_read__tcp.c) = 32fca1b7fdfdb2568b056705c7129807e281b0cc
 SHA1 (patch-src_text__object.h) = 7f7e3684e21f9618a8ede37525f4a48f47a92050

Index: pkgsrc/sysutils/conky/patches/patch-src_netbsd.h
diff -u pkgsrc/sysutils/conky/patches/patch-src_netbsd.h:1.1.1.1 pkgsrc/sysutils/conky/patches/patch-src_netbsd.h:1.2
--- pkgsrc/sysutils/conky/patches/patch-src_netbsd.h:1.1.1.1    Sun May 13 08:42:20 2012
+++ pkgsrc/sysutils/conky/patches/patch-src_netbsd.h    Fri Jun 30 00:23:03 2017
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_netbsd.h,v 1.1.1.1 2012/05/13 08:42:20 imil Exp $
+$NetBSD: patch-src_netbsd.h,v 1.2 2017/06/30 00:23:03 kamil Exp $
 
 Many fixes and addons for conky to work on NetBSD.
 
 --- src/netbsd.h.orig  2010-03-25 17:42:39.000000000 +0000
 +++ src/netbsd.h
-@@ -12,6 +12,8 @@
+@@ -12,10 +12,11 @@
  #include <kvm.h>
  #include <nlist.h>
  
@@ -13,7 +13,11 @@ Many fixes and addons for conky to work 
  #include <sys/time.h>
  #include <sys/sysctl.h>
  #include <sys/types.h>
-@@ -27,10 +29,20 @@
+-#include <sys/user.h>
+ #include <sys/socket.h>
+ #include <sys/swap.h>
+ #include <sys/sched.h>
+@@ -27,10 +28,20 @@
  
  #include <machine/param.h>