Subject: pkg/9310: lsof package doesn't build under -current
To: None <gnats-bugs@gnats.netbsd.org>
From: maximum entropy <entropy@zippy.bernstein.com>
List: netbsd-bugs
Date: 01/28/2000 02:33:37
>Number:         9310
>Category:       pkg
>Synopsis:       lsof package doesn't build under -current
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager (NetBSD software packages system bug manager)
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Jan 28 02:33:00 2000
>Last-Modified:
>Originator:     maximum entropy
>Organization:
	
>Release:        <NetBSD-current source date>20000128
>Environment:
	
System: NetBSD zippy.bernstein.com 1.4Q NetBSD 1.4Q (ZIPPY) #0: Fri Jan 28 02:37:46 EST 2000 root@zippy.bernstein.com:/usr/src/sys/arch/i386/compile/ZIPPY i386


>Description:
	
lsof package doesn't build under -current>How-To-Repeat:
	<code/input/activities to reproduce the problem (multiple lines)>
cd /usr/pkgsrc/sysutils/lsof
make cleandir
make
>How-To-Repeat:
>Fix:
	

Replace /usr/pkgsrc/sysutils/lsof/patches/patch-ab with the following
patch.  Only the first section is new (#include <sys/buf.h>).

After replacing the patch, run "make makepatchsum".

--- dialects/n+obsd/dlsof.h.orig	Fri Oct 22 09:22:37 1999
+++ dialects/n+obsd/dlsof.h	Fri Jan 28 05:22:27 2000
@@ -134,6 +134,7 @@
 # endif	/*defined(DIRENT_BLKSIZ) */
 
 #undef KERNEL
+#include <sys/buf.h>
 #include <ufs/mfs/mfsnode.h>
 
 # if	defined(HASNFSPROTO)
@@ -182,16 +183,28 @@
 #undef	KERNEL
 #undef	_KERNEL
 
+#include <vm/vm.h>
+
 # if	defined(UVM)
+#  
+# ifndef FALSE
 #define	FALSE	0
 #define	TRUE	1
+# endif
 #include <uvm/uvm.h>
 # endif	/* defined(UVM) */
 
-#include <vm/vm.h>
+# ifndef FALSE
+#define	FALSE	0
+#define TRUE	1
+# endif
 #include <vm/vm_map.h>
 #include <vm/vm_object.h>
 #include <vm/vm_pager.h>
+
+#undef	TRUE
+#undef	FALSE
+#include <sys/sysctl.h>
 
 # if	defined(OPENBSDV)
 #  if	OPENBSDV==2030 && defined(__sparc__)

>Audit-Trail:
>Unformatted: