head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.50
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.48
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.46
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.44
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.42
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.40
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.38
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.36
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.34
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.32
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.30
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.28
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.26
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.24
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.22
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.20
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.18
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.16
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.3.0.14
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.3.0.12
	pkgsrc-2005Q3-base:1.3
	pkgsrc-2005Q2:1.3.0.10
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.3.0.8
	pkgsrc-2005Q1-base:1.3
	pkgsrc-2004Q4:1.3.0.6
	pkgsrc-2004Q4-base:1.3
	pkgsrc-2004Q3:1.3.0.4
	pkgsrc-2004Q3-base:1.3
	pkgsrc-2004Q2:1.3.0.2
	pkgsrc-2004Q2-base:1.3
	pkgsrc-2004Q1:1.2.0.12
	pkgsrc-2004Q1-base:1.2
	pkgsrc-2003Q4:1.2.0.10
	pkgsrc-2003Q4-base:1.2
	netbsd-1-6-1:1.2.0.6
	netbsd-1-6-1-base:1.2
	netbsd-1-6:1.2.0.8
	netbsd-1-6-RELEASE-base:1.2
	pkgviews:1.2.0.4
	pkgviews-base:1.2
	buildlink2:1.2.0.2
	buildlink2-base:1.2
	netbsd-1-5-PATCH003:1.2
	netbsd-1-5-PATCH001:1.2
	netbsd-1-5-RELEASE:1.1
	netbsd-1-4-PATCH003:1.1;
locks; strict;
comment	@# @;


1.3
date	2004.04.02.12.20.24;	author jmmv;	state dead;
branches;
next	1.2;

1.2
date	2000.11.29.21.02.05;	author tron;	state Exp;
branches;
next	1.1;

1.1
date	2000.07.30.02.45.41;	author jlam;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Finish move of libgtop and libgtop2 to the sysutils category, which were
living in devel.
@
text
@$NetBSD: patch-aq,v 1.2 2000/11/29 21:02:05 tron Exp $

--- sysdeps/freebsd/procmap.c.orig	Thu May 27 20:56:48 1999
+++ sysdeps/freebsd/procmap.c	Wed Nov 29 21:57:15 2000
@@@@ -32,9 +32,13 @@@@
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/resource.h>
+#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000)
 #include <vm/vm_object.h>
 #include <vm/vm_prot.h>
 #include <vm/vm_map.h>
+#else
+#include <uvm/uvm_extern.h>
+#endif
 
 #include <sys/vnode.h>
 #include <sys/mount.h>
@@@@ -46,9 +50,12 @@@@
 #include <sys/user.h>
 #endif
 #include <sys/sysctl.h>
+#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000)
 #include <vm/vm.h>
+#endif
 
-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
+#if defined(__NetBSD__) && \
+	(__NetBSD_Version__ >= 104000000) && (__NetBSD_Version < 105020000)
 /* Fixme ... */
 #undef _KERNEL
 #define _UVM_UVM_AMAP_I_H_ 1
@@@@ -214,11 +221,13 @@@@
 #endif
 
 #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
+#if defined(UVM_VNODE_VALID)
 		if (!vnode.v_uvm.u_flags & UVM_VNODE_VALID)
 			continue;
 
 		if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) ||
 		    !vnode.v_data) continue;
+#endif
 
 		if (kvm_read (server->machine.kd,
 			      (unsigned long) vnode.v_data,
@


1.2
log
@Make this compile again under NetBSD-1.5L by "#ifdef"-ing checks which
are not required any more after UBC has been integrated. The information
for the fix was provided by Chuck Silvers in private e-mail.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@Make this compile now that <vm/vm*.h> has gone away in -current.
Should fix part of pkg/10497.
@
text
@d3 2
a4 2
--- sysdeps/freebsd/procmap.c.orig	Thu May 27 14:56:48 1999
+++ sysdeps/freebsd/procmap.c	Sat Jul 29 22:09:34 2000
d33 14
@