>Number:         10497
>Category:       pkg
>Synopsis:       devel/libgtop needs additional patches for the trunk
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Jul 02 13:16:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Martin Husemann
>Release:        trunk, cvs updated June 30, 2000
>Organization:
	
>Environment:
	
System: NetBSD rumolt.teuto.de 1.5B NetBSD 1.5B (RUMOLT) #0: Sat Jul 1 16:40:36 MEST 2000 martin@rumolt.teuto.de:/usr/src/sys-i4b/arch/i386/compile/RUMOLT i386


>Description:

pgksrc/devel/libgtop needs additional patches for the trunk (and additionaly
some autoconfig magic to make filesystem sizes work again, but I didn't figure
that out)

>How-To-Repeat:
Use -current, try to compile pkgsrc/devel/libgtop

>Fix:
*** sysdeps/freebsd/mem.c.orig	Sun Feb 13 16:47:58 2000
--- sysdeps/freebsd/mem.c	Sun Jul  2 21:52:44 2000
***************
*** 27,40 ****
  
  #include <glibtop_suid.h>
  
  #include <sys/sysctl.h>
  #include <sys/vmmeter.h>
- #include <vm/vm_param.h>
  
  #if defined(__NetBSD__)  && (__NetBSD_Version__ >= 104000000)
  #include <uvm/uvm_extern.h>
  #endif
  
  static const unsigned long _glibtop_sysdeps_mem =
  (1L << GLIBTOP_MEM_TOTAL) + (1L << GLIBTOP_MEM_USED) +
  (1L << GLIBTOP_MEM_FREE) +
--- 27,41 ----
  
  #include <glibtop_suid.h>
  
  #include <sys/sysctl.h>
  #include <sys/vmmeter.h>
  
  #if defined(__NetBSD__)  && (__NetBSD_Version__ >= 104000000)
  #include <uvm/uvm_extern.h>
+ #else
+ #include <vm/vm_param.h>
  #endif
  
  static const unsigned long _glibtop_sysdeps_mem =
  (1L << GLIBTOP_MEM_TOTAL) + (1L << GLIBTOP_MEM_USED) +
  (1L << GLIBTOP_MEM_FREE) +
*** sysdeps/freebsd/procmap.c.orig	Thu May 27 20:56:48 1999
--- sysdeps/freebsd/procmap.c	Sun Jul  2 21:54:32 2000
***************
*** 30,42 ****
--- 30,44 ----
  
  #include <kvm.h>
  #include <sys/param.h>
  #include <sys/proc.h>
  #include <sys/resource.h>
+ #if !defined(__NetBSD__) || (__NetBSD_Version__ < 104000000)
  #include <vm/vm_object.h>
  #include <vm/vm_prot.h>
  #include <vm/vm_map.h>
+ #endif
  
  #include <sys/vnode.h>
  #include <sys/mount.h>
  #include <ufs/ufs/quota.h>
  #include <ufs/ufs/inode.h>
***************
*** 44,61 ****
  #include <sys/ucred.h>
  #if (!defined __OpenBSD__) && (!defined __bsdi__)
  #include <sys/user.h>
  #endif
  #include <sys/sysctl.h>
- #include <vm/vm.h>
  
  #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
- /* Fixme ... */
- #undef _KERNEL
- #define _UVM_UVM_AMAP_I_H_ 1
- #define _UVM_UVM_MAP_I_H_ 1
  #include <uvm/uvm.h>
  #endif
  
  static const unsigned long _glibtop_sysdeps_proc_map =
  (1L << GLIBTOP_PROC_MAP_TOTAL) + (1L << GLIBTOP_PROC_MAP_NUMBER) +
  (1L << GLIBTOP_PROC_MAP_SIZE);
--- 46,60 ----
  #include <sys/ucred.h>
  #if (!defined __OpenBSD__) && (!defined __bsdi__)
  #include <sys/user.h>
  #endif
  #include <sys/sysctl.h>
  
  #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
  #include <uvm/uvm.h>
+ #else
+ #include <vm/vm.h>
  #endif
  
  static const unsigned long _glibtop_sysdeps_proc_map =
  (1L << GLIBTOP_PROC_MAP_TOTAL) + (1L << GLIBTOP_PROC_MAP_NUMBER) +
  (1L << GLIBTOP_PROC_MAP_SIZE);
*** sysdeps/freebsd/procmem.c.orig	Thu May 27 20:56:49 1999
--- sysdeps/freebsd/procmem.c	Sun Jul  2 21:53:44 2000
***************
*** 29,58 ****
  
  #include <kvm.h>
  #include <sys/param.h>
  #include <sys/proc.h>
  #include <sys/resource.h>
  #include <vm/vm_object.h>
  #include <vm/vm_map.h>
  
  #include <sys/vnode.h>
  #include <ufs/ufs/quota.h>
  #include <ufs/ufs/inode.h>
  
  #include <sys/ucred.h>
  #if (!defined __OpenBSD__) && (!defined __bsdi__)
  #include <sys/user.h>
  #endif
  #include <sys/sysctl.h>
- #include <vm/vm.h>
  
  #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
- /* Fixme ... */
- #undef _KERNEL
- #define _UVM_UVM_AMAP_I_H_ 1
- #define _UVM_UVM_MAP_I_H_ 1
  #include <uvm/uvm.h>
  #endif
  
  static const unsigned long _glibtop_sysdeps_proc_mem =
  (1L << GLIBTOP_PROC_MEM_SIZE) +
  (1L << GLIBTOP_PROC_MEM_VSIZE) +
--- 29,58 ----
  
  #include <kvm.h>
  #include <sys/param.h>
  #include <sys/proc.h>
  #include <sys/resource.h>
+ 
+ #if !defined(__NetBSD__)  || (__NetBSD_Version__ < 104000000)
  #include <vm/vm_object.h>
  #include <vm/vm_map.h>
+ #endif
  
  #include <sys/vnode.h>
  #include <ufs/ufs/quota.h>
  #include <ufs/ufs/inode.h>
  
  #include <sys/ucred.h>
  #if (!defined __OpenBSD__) && (!defined __bsdi__)
  #include <sys/user.h>
  #endif
  #include <sys/sysctl.h>
  
  #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
  #include <uvm/uvm.h>
+ #else
+ #include <vm/vm.h>
  #endif
  
  static const unsigned long _glibtop_sysdeps_proc_mem =
  (1L << GLIBTOP_PROC_MEM_SIZE) +
  (1L << GLIBTOP_PROC_MEM_VSIZE) +

>Release-Note:
>Audit-Trail:
>Unformatted: