diff options
| author | kamil <kamil@pkgsrc.org> | 2017-06-23 19:16:58 +0000 |
|---|---|---|
| committer | kamil <kamil@pkgsrc.org> | 2017-06-23 19:16:58 +0000 |
| commit | 7c25f931a72f73689783f3397788c4b2d63ce722 (patch) | |
| tree | 24bca177b909202fa51afc8706fc99d265316cb5 /sysutils | |
| parent | f4751815259cb3efb898c64b2d5ce9fd6354740b (diff) | |
| download | pkgsrc-7c25f931a72f73689783f3397788c4b2d63ce722.tar.gz | |
Correct lavaps build failure on NetBSD 8.99.1
Address <sys/user.h> removal fallout.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/lavaps/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/lavaps/patches/patch-af | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/sysutils/lavaps/distinfo b/sysutils/lavaps/distinfo index c34199c6396..198348d1463 100644 --- a/sysutils/lavaps/distinfo +++ b/sysutils/lavaps/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2015/11/04 01:32:19 agc Exp $ +$NetBSD: distinfo,v 1.13 2017/06/23 19:16:58 kamil Exp $ SHA1 (lavaps-2.7.tar.gz) = 5fb788359e22f80842423f211d42d8ebe2c58236 RMD160 (lavaps-2.7.tar.gz) = 286530bca67f9d324c0edfc2def6d6b2a6f24255 @@ -9,7 +9,7 @@ SHA1 (patch-ab) = 2bfc2059afab1a8a4fa16aa91ba6d2f9425c573d SHA1 (patch-ac) = 8d6f43933eecc72cc75ffec1489cbf316a21c5fe SHA1 (patch-ad) = 520a4cc7bbafcca8cab50d0f92aed2a333e4da72 SHA1 (patch-ae) = 82b0d0161eeef941f868b20282b9a7743be89461 -SHA1 (patch-af) = de66e431cdf61697d16df1f6e21d5f65390b845f +SHA1 (patch-af) = 98f1815495e5a132a038596cc116670ba4806adb SHA1 (patch-ag) = dffad352c3812bd473ce37eed39413bbd77c3f8c SHA1 (patch-ah) = a2f8439e44674438cde037c41cbcc14897f42f86 SHA1 (patch-src_const__str.hh) = 952fa949abbd5585a8511dc130a3a347f079df7b diff --git a/sysutils/lavaps/patches/patch-af b/sysutils/lavaps/patches/patch-af index 8d6f0bce674..36888fbef66 100644 --- a/sysutils/lavaps/patches/patch-af +++ b/sysutils/lavaps/patches/patch-af @@ -1,22 +1,24 @@ -$NetBSD: patch-af,v 1.2 2008/07/21 02:55:34 dholland Exp $ +$NetBSD: patch-af,v 1.3 2017/06/23 19:16:58 kamil Exp $ ---- src/process_scan_bsd.cc~ 2003-11-30 20:04:48.000000000 -0500 -+++ src/process_scan_bsd.cc 2008-07-20 21:50:04.000000000 -0400 -@@ -56,7 +56,13 @@ extern "C" { +--- src/process_scan_bsd.cc.orig 2003-12-01 01:04:48.000000000 +0000 ++++ src/process_scan_bsd.cc +@@ -56,7 +56,15 @@ extern "C" { #include <sys/param.h> #include <sys/sysctl.h> // KERN_PROC_ALL #include <sys/types.h> +#ifdef __DragonFly__ +#define template +#endif ++#if defined(__FreeBSD__) || defined(__DragonFly__) #include <sys/user.h> ++#endif +#ifdef __DragonFly__ +#undef template +#endif #include <fcntl.h> #include <kvm.h> #include <unistd.h> -@@ -226,6 +232,13 @@ int process_scan_bsd::extract_uid() { re +@@ -226,6 +234,13 @@ int process_scan_bsd::extract_uid() { re int process_scan_bsd::extract_nice() { return int(cur_kp_->kp_proc.p_nice); } int process_scan_bsd::extract_utime_msec() { return time_value_t_to_msec(kur_kp_->times.user_time) + time_value_t_to_msec(cur_kp_->tasks_info.user_time); } int process_scan_bsd::extract_stime_msec() { return time_value_t_to_msec(kur_kp_->times.system _time) + time_value_t_to_msec(cur_kp_->tasks_info.system_time); } |