sysutils/lsof won't build on recent -current

[Peter Jeremy]

At the risk of crying wolf a second time...

On a recent (last weekend) -current, when I try to build lsof, I get:
===>  Building for lsof-4.76.1.1
(cd lib; make DEBUG="-O" CFGF="-pipe -g -march=athlon-xp -DHASEFFNLINK=i_effnlink -DHASF_VNODE -DHASCPUMASK_T -DHASSBSTATE -DHAS_KVM_VNODE -DHAS_UFS1_2 -DHAS_NO_SI_UDEV -DHAS_SI_PRIV -DHAS_SYS_SX_H -DFREEBSDV=7000 -DHASFDESCFS=2 -DHASPSEUDOFS -DHASNULLFS -DHAS9660FS -DHAS_NO_ISO_DEV -DHASIPv6 -DLSOF_VSTR=\"7.0-CURRENT\"")
cc  -pipe -g -march=athlon-xp -DHASEFFNLINK=i_effnlink -DHASF_VNODE -DHASCPUMASK_T -DHASSBSTATE -DHAS_KVM_VNODE -DHAS_UFS1_2 -DHAS_NO_SI_UDEV -DHAS_SI_PRIV -DHAS_SYS_SX_H -DFREEBSDV=7000 -DHASFDESCFS=2 -DHASPSEUDOFS -DHASNULLFS -DHAS9660FS -DHAS_NO_ISO_DEV -DHASIPv6 -DLSOF_VSTR="7.0-CURRENT" -I/usr/src/sys -O -c ckkv.c
In file included from /usr/src/sys/sys/proc.h:54,
                 from /usr/src/sys/sys/buf.h:257,
                 from /usr/src/sys/ufs/ufs/ufsmount.h:36,
                 from ../dlsof.h:152,
                 from ../lsof.h:190,
                 from ckkv.c:43:
/usr/src/sys/sys/signalvar.h:323: error: conflicting types for 'psignal'
/usr/include/signal.h:105: error: previous declaration of 'psignal' was here
/usr/src/sys/sys/signalvar.h:323: error: conflicting types for 'psignal'
/usr/include/signal.h:105: error: previous declaration of 'psignal' was here
In file included from /usr/src/sys/ufs/ufs/ufsmount.h:36,
                 from ../dlsof.h:152,
                 from ../lsof.h:190,
                 from ckkv.c:43:
/usr/src/sys/sys/buf.h: In function `BUF_REFCNT':
/usr/src/sys/sys/buf.h:366: error: `panicstr' undeclared (first use in this function)
/usr/src/sys/sys/buf.h:366: error: (Each undeclared identifier is reported only once
/usr/src/sys/sys/buf.h:366: error: for each function it appears in.)
*** Error code 1

The conflicting psignal() is because lsof is trying to have both
userland and kernel versions of psignal() in scope.  Presumably there
is a masking macro that has been lost somewhere.  I'm not sure about
the panicstr error.  Has anyone else seen this?

Note that lsof also gives an 'Unsupported FreeBSD version:
6.1-PRERELEASE' warning on -stable, though it builds otherwise.

-- 
Peter Jeremy