Received: by mail.netbsd.org (Postfix, from userid 605) id 50D3184D82; Fri, 23 Jun 2017 18:57:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D5DCC84CE3 for ; Fri, 23 Jun 2017 18:57:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id JpK_Iyef2Bx0 for ; Fri, 23 Jun 2017 18:57:13 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 6344C84C6C for ; Fri, 23 Jun 2017 18:57:13 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 598ACFAE8; Fri, 23 Jun 2017 18:57:13 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1498244233235370" MIME-Version: 1.0 Date: Fri, 23 Jun 2017 18:57:13 +0000 From: "Kamil Rytarowski" Subject: CVS commit: pkgsrc/sysutils/whowatch To: pkgsrc-changes@NetBSD.org Reply-To: kamil@netbsd.org X-Mailer: log_accum Message-Id: <20170623185713.598ACFAE8@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1498244233235370 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: kamil Date: Fri Jun 23 18:57:13 UTC 2017 Modified Files: pkgsrc/sysutils/whowatch: distinfo pkgsrc/sysutils/whowatch/patches: patch-proctree.c Log Message: Correct build failure of whowatch on NetBSD 8.99.1 Address removal fallout. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/whowatch/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/whowatch/patches/patch-proctree.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1498244233235370 Content-Disposition: inline Content-Length: 2092 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/whowatch/distinfo diff -u pkgsrc/sysutils/whowatch/distinfo:1.7 pkgsrc/sysutils/whowatch/distinfo:1.8 --- pkgsrc/sysutils/whowatch/distinfo:1.7 Wed Nov 4 01:32:38 2015 +++ pkgsrc/sysutils/whowatch/distinfo Fri Jun 23 18:57:13 2017 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2015/11/04 01:32:38 agc Exp $ +$NetBSD: distinfo,v 1.8 2017/06/23 18:57:13 kamil Exp $ SHA1 (whowatch-1.4.tar.gz) = 0d60c8ddb56b9bf9d2f3e1452832ccb2c862ff0c RMD160 (whowatch-1.4.tar.gz) = da2ee1d52e2a1d5292713259e66b4e7dd39b8dfd @@ -9,4 +9,4 @@ SHA1 (patch-ab) = f66829eaf7d148df10c2ca SHA1 (patch-ac) = 9482d1b1759858a83b1efeaa5fc9dd9ec49043c7 SHA1 (patch-ad) = 41a9e710b8bbe427c715da5d82e77bf32a2f7a34 SHA1 (patch-ae) = ebb4f046df6ce950a320216f2d9f5238340a10b1 -SHA1 (patch-proctree.c) = 54bd828dac7f3f6dfd51f869e812e0c5a3a989fd +SHA1 (patch-proctree.c) = 9357a2b6e9a67c80f413921491a47b1a82f0e0a7 Index: pkgsrc/sysutils/whowatch/patches/patch-proctree.c diff -u pkgsrc/sysutils/whowatch/patches/patch-proctree.c:1.1 pkgsrc/sysutils/whowatch/patches/patch-proctree.c:1.2 --- pkgsrc/sysutils/whowatch/patches/patch-proctree.c:1.1 Wed Aug 8 18:37:07 2012 +++ pkgsrc/sysutils/whowatch/patches/patch-proctree.c Fri Jun 23 18:57:13 2017 @@ -1,11 +1,24 @@ -$NetBSD: patch-proctree.c,v 1.1 2012/08/08 18:37:07 marino Exp $ +$NetBSD: patch-proctree.c,v 1.2 2017/06/23 18:57:13 kamil Exp $ Add DragonFly support (kernel proc can return pid of -1, skip) kinfo structure is unique on DragonFly + is freebsdism in this usage-context, it's now absent in NetBSD 8.99.1 + --- proctree.c.orig 2000-06-06 09:03:28.000000000 +0000 +++ proctree.c -@@ -170,8 +170,14 @@ int update_tree(void del(void*)) +@@ -16,8 +16,10 @@ + #ifdef HAVE_PROCESS_SYSCTL + #include + #include ++#if defined(__FreeBSD__) || defined(__DragonFly__) + #include + #endif ++#endif + + #include "proctree.h" + +@@ -170,8 +172,14 @@ int update_tree(void del(void*)) #ifdef HAVE_PROCESS_SYSCTL el = get_all_info(&pi); for(i = 0; i < el; i++) { --_----------=_1498244233235370--