CVS commit: pkgsrc/sysutils/dtpstree

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

Module Name:    pkgsrc
Committed By:   kamil
Date:           Sat Jul  8 12:06:56 UTC 2017

Modified Files:
        pkgsrc/sysutils/dtpstree: Makefile distinfo
        pkgsrc/sysutils/dtpstree/patches: patch-dtpstree.cpp
Added Files:
        pkgsrc/sysutils/dtpstree/patches: patch-configure.ac

Log Message:
dtpstree: Fix build on NetBSD 8.99.1

Address <sys/user.h> removal.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/dtpstree/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/dtpstree/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/dtpstree/patches/patch-configure.ac
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/dtpstree/patches/patch-dtpstree.cpp

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

Modified files:

Index: pkgsrc/sysutils/dtpstree/Makefile
diff -u pkgsrc/sysutils/dtpstree/Makefile:1.5 pkgsrc/sysutils/dtpstree/Makefile:1.6
--- pkgsrc/sysutils/dtpstree/Makefile:1.5       Thu Jan 19 18:52:25 2017
+++ pkgsrc/sysutils/dtpstree/Makefile   Sat Jul  8 12:06:56 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/01/19 18:52:25 agc Exp $
+# $NetBSD: Makefile,v 1.6 2017/07/08 12:06:56 kamil Exp $
 #
 
 DISTNAME=      dtpstree-1.0.3
@@ -17,10 +17,15 @@ ONLY_FOR_PLATFORM=  DragonFly-*-* FreeBSD
 
 GNU_CONFIGURE= yes
 USE_LANGUAGES= c c++
-USE_TOOLS+=    gmake
+USE_TOOLS+=    gmake bash aclocal autoconf automake
 MAKE_FILE=     GNUmakefile
 
+REPLACE_BASH+= autogen.sh
+
 .include "options.mk"
 
+pre-configure:
+       ${RUN} cd ${WRKSRC} && ./autogen.sh
+
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/dtpstree/distinfo
diff -u pkgsrc/sysutils/dtpstree/distinfo:1.3 pkgsrc/sysutils/dtpstree/distinfo:1.4
--- pkgsrc/sysutils/dtpstree/distinfo:1.3       Wed Nov  4 01:32:12 2015
+++ pkgsrc/sysutils/dtpstree/distinfo   Sat Jul  8 12:06:56 2017
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 01:32:12 agc Exp $
+$NetBSD: distinfo,v 1.4 2017/07/08 12:06:56 kamil Exp $
 
 SHA1 (dtpstree-1.0.3.tar.xz) = 0faf99b3220247f3656282ac6f059478a4210a75
 RMD160 (dtpstree-1.0.3.tar.xz) = 37ff4213515400a9a70725366c4783de863f6f05
 SHA512 (dtpstree-1.0.3.tar.xz) = c0b3490bb253890824f36698db8442e2f1565d6c44921f353c45ee1c9314f1fbc69f3d537ef7a005911e4a5052c9df34330d4937fb9c41f790aaacb15d1d750c
 Size (dtpstree-1.0.3.tar.xz) = 47784 bytes
-SHA1 (patch-dtpstree.cpp) = d913c217f27364caf005b407ac1c46a88defc8c6
+SHA1 (patch-configure.ac) = 8e9fa4c70d264147a399714ab4a98d08ec40ac92
+SHA1 (patch-dtpstree.cpp) = 2ddec4f347fd4abc7ef116806e4d5e9e9f4123d5

Index: pkgsrc/sysutils/dtpstree/patches/patch-dtpstree.cpp
diff -u pkgsrc/sysutils/dtpstree/patches/patch-dtpstree.cpp:1.1 pkgsrc/sysutils/dtpstree/patches/patch-dtpstree.cpp:1.2
--- pkgsrc/sysutils/dtpstree/patches/patch-dtpstree.cpp:1.1     Tue Apr 30 22:34:31 2013
+++ pkgsrc/sysutils/dtpstree/patches/patch-dtpstree.cpp Sat Jul  8 12:06:56 2017
@@ -1,6 +1,6 @@
-$NetBSD: patch-dtpstree.cpp,v 1.1 2013/04/30 22:34:31 joerg Exp $
+$NetBSD: patch-dtpstree.cpp,v 1.2 2017/07/08 12:06:56 kamil Exp $
 
---- dtpstree.cpp.orig  2013-04-30 19:54:40.000000000 +0000
+--- dtpstree.cpp.orig  2010-08-05 08:01:47.000000000 +0000
 +++ dtpstree.cpp
 @@ -21,6 +21,7 @@
  
@@ -10,3 +10,13 @@ $NetBSD: patch-dtpstree.cpp,v 1.1 2013/0
  #include <cstdarg>
  #include <cstdio>
  #include <cstdlib>
+@@ -55,7 +56,9 @@
+ #include <pwd.h>
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <sys/user.h>
++#endif
+ #include <sys/utsname.h>
+ #include <unistd.h>
+ #include <vis.h>

Added files:

Index: pkgsrc/sysutils/dtpstree/patches/patch-configure.ac
diff -u /dev/null pkgsrc/sysutils/dtpstree/patches/patch-configure.ac:1.1
--- /dev/null   Sat Jul  8 12:06:56 2017
+++ pkgsrc/sysutils/dtpstree/patches/patch-configure.ac Sat Jul  8 12:06:56 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-configure.ac,v 1.1 2017/07/08 12:06:56 kamil Exp $
+
+--- configure.ac.orig  2010-08-14 03:50:04.000000000 +0000
++++ configure.ac
+@@ -100,7 +100,9 @@ AC_DEFUN([DT_INCLUDES_KVM], [#ifdef HAVE
+ #include <kvm.h>
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <sys/user.h>
++#endif
+ AC_INCLUDES_DEFAULT])
+ AC_DEFUN([DT_CHECK_MEMBERS_KVM],
+       [m4_foreach_w([dt_member_suffix], [pid ppid ruid comm],