DragonFly support and fix detection of modular Xorg.

5 files changed, 120 insertions, 2 deletions

diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile
index 7048e1d866a..d4f7c1b5a0f 100644
--- a/sysutils/lavaps/Makefile
+++ b/sysutils/lavaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/06/08 20:08:23 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2007/06/30 19:18:47 joerg Exp $
 #
 
 DISTNAME=	lavaps-1.20
@@ -20,5 +20,11 @@ CONFIGURE_ARGS+=	--with-additional-includes=-I${LOCALBASE:Q}/include \
 		--with-tk-ver=8.3.2 \
 		--with-tcltk-lib-suffix-type=nodot
 
+BUILDLINK_DEPMETHOD.libXt?=	build
+
 .include "../../x11/tk83/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/lavaps/distinfo b/sysutils/lavaps/distinfo
index ed5f302ea44..2caf88dfc5d 100644
--- a/sysutils/lavaps/distinfo
+++ b/sysutils/lavaps/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 13:40:54 agc Exp $
+$NetBSD: distinfo,v 1.6 2007/06/30 19:18:47 joerg Exp $
 
 SHA1 (lavaps-1.20.tar.gz) = 36411710a29bcb751f23ae35a2782a5286ec0f2e
 RMD160 (lavaps-1.20.tar.gz) = 7577052acb3452a7588b767cd43554f035ee45f8
@@ -6,3 +6,6 @@ Size (lavaps-1.20.tar.gz) = 160724 bytes
 SHA1 (patch-aa) = 8c1c15dd3ccfbe35c29804561a74e47d86d114ab
 SHA1 (patch-ab) = e26b086f85868502a1816aded296b7e0da3bda88
 SHA1 (patch-ac) = 1a4b569d95568ad2b4047d656eb70bda16cba453
+SHA1 (patch-ad) = bb4468ebe420c6b1f06d96966248f15b395d74fb
+SHA1 (patch-ae) = 075f9943110c68aa01acfddaac006d9840de93ff
+SHA1 (patch-af) = 5482aac0382cd55aedda2d2436c3386a2221a6da
diff --git a/sysutils/lavaps/patches/patch-ad b/sysutils/lavaps/patches/patch-ad
new file mode 100644
index 00000000000..dc4702595d8
--- /dev/null
+++ b/sysutils/lavaps/patches/patch-ad
@@ -0,0 +1,34 @@
+$NetBSD: patch-ad,v 1.1 2007/06/30 19:18:47 joerg Exp $
+
+--- configure.orig	2001-10-30 21:27:30.000000000 +0000
++++ configure
+@@ -1561,9 +1561,10 @@ if test "$ac_x_libraries" = NO; then
+ cat > conftest.$ac_ext <<EOF
+ #line 1563 "configure"
+ #include "confdefs.h"
++#include <X11/Intrinsic.h>
+ 
+ int main() {
+-${x_direct_test_function}()
++XtMalloc(0);
+ ; return 0; }
+ EOF
+ if { (eval echo configure:1570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -2632,7 +2633,7 @@ case "${platform}" in
+ 	PLATFORM_SUBDIRS=""
+ 	echo "$ac_t""yes---AIX" 1>&6
+ 	;;
+-*-*-*bsd*)
++*-*-*bsd* | *-*-dragonfly*)
+ 	TCLTK_INCLUDES="-I/usr/local/include/tk$TK_DOTTED_HI_VERS -I/usr/local/include/tcl$TCL_DOTTED_HI_VERS -L/usr/local/lib"
+ 	if test x$TCLTK_LIB_SUFFIX_TYPE = xunspecified
+ 	then
+@@ -2908,6 +2909,8 @@ for ac_option
+ do
+   case "\$ac_option" in
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
+     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
+     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
+   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
diff --git a/sysutils/lavaps/patches/patch-ae b/sysutils/lavaps/patches/patch-ae
new file mode 100644
index 00000000000..f07e83ffdd9
--- /dev/null
+++ b/sysutils/lavaps/patches/patch-ae
@@ -0,0 +1,19 @@
+$NetBSD: patch-ae,v 1.1 2007/06/30 19:18:47 joerg Exp $
+
+--- change_tracking.hh.orig	2001-04-19 15:51:34.000000000 +0000
++++ change_tracking.hh
+@@ -47,11 +47,11 @@ template <class T, class SUM>
+ class sum_change_tracking : public change_tracking<T> {
+ protected:
+ 	static SUM s_;
+-	void update_sum() { s_.sum_ += change_; }
++	void update_sum() { s_.sum_ += this->change_; }
+ public:
+ 	sum_change_tracking() {};
+-	sum_change_tracking(T first) : change_tracking<T>(first) { update_sum(frst); };
+-	~sum_change_tracking() { tick_incr(-last_); };
++	sum_change_tracking(T first) : change_tracking<T>(first) { update_sum(this->frst); };
++	~sum_change_tracking() { tick_incr(-this->last_); };
+ 
+ 
+ 	void tick_set(T current) { change_tracking<T>::tick_set(current); update_sum(); };
diff --git a/sysutils/lavaps/patches/patch-af b/sysutils/lavaps/patches/patch-af
new file mode 100644
index 00000000000..6316fb1186f
--- /dev/null
+++ b/sysutils/lavaps/patches/patch-af
@@ -0,0 +1,56 @@
+$NetBSD: patch-af,v 1.1 2007/06/30 19:18:47 joerg Exp $
+
+--- process_scan_bsd.cc.orig	2007-06-30 18:48:04.000000000 +0000
++++ process_scan_bsd.cc
+@@ -42,7 +42,13 @@ extern "C" {
+ #include <sys/param.h>
+ #include <sys/sysctl.h> // KERN_PROC_ALL
+ #include <sys/types.h>
++#ifdef __DragonFly__
++#define template
++#endif
+ #include <sys/user.h>
++#ifdef __DragonFly__
++#undef template
++#endif
+ #include <fcntl.h>
+ #include <kvm.h>
+ #include <unistd.h>
+@@ -78,7 +84,11 @@ public:
+ 	virtual void life(process_model *pm);
+ 
+ 	virtual int cur_pid() { return int(cur_kp_->kp_proc.p_pid); }
++#ifdef __DragonFly__
++	virtual int cur_uid() { return int(cur_kp_->kp_eproc.e_ucred.cr_ruid); }
++#else
+ 	virtual int cur_uid() { return int(cur_kp_->kp_eproc.e_pcred.p_ruid); }
++#endif
+ };
+ 
+ 
+@@ -256,7 +266,11 @@ process_scan_bsd::birth()
+ {
+ 	process_model *pm = new process_model(int(cur_kp_->kp_proc.p_pid));
+ 	// fill in init-time only bits:
++#ifdef __DragonFly__
++	pm->set_uid(int(cur_kp_->kp_eproc.e_ucred.cr_ruid));
++#else
+ 	pm->set_uid(int(cur_kp_->kp_eproc.e_pcred.p_ruid));
++#endif
+ 	pm->set_nice(cur_kp_->kp_proc.p_nice);
+ 	pm->set_start_time(0);  // xxx: not in bsd?
+ 	life(pm);
+@@ -267,8 +281,13 @@ void
+ process_scan_bsd::life(process_model *pm)
+ {
+ 	// OS-specific bits:
++#ifdef __DragonFly__
++	pm->set_utime(ticks_to_msec(cur_kp_->kp_eproc.e_uticks));
++	pm->set_stime(ticks_to_msec(cur_kp_->kp_eproc.e_sticks));
++#else
+ 	pm->set_utime(ticks_to_msec(cur_kp_->kp_proc.p_uticks));
+ 	pm->set_stime(ticks_to_msec(cur_kp_->kp_proc.p_sticks));
++#endif
+ 	// xxx: skip p_iticks
+ 
+ 	int size, resident;