Hi,

with current -current sources trying "build.sh ... distribution"
fails in usr.sbin/ipf/ipresend:

    compile  ipresend/sock.o
In file included from /u/NetBSD/arch/i386/dest/usr/include/machine/intr.h:3,
                 from /u/NetBSD/src/sys/sys/mutex.h:187,
                 from /u/NetBSD/src/sys/sys/file.h:43,
                 from /u/NetBSD/src/dist/ipf/ipsend/sock.c:43:
/u/NetBSD/arch/i386/dest/usr/include/x86/intr.h:45:25: error: machine/pic.h: No such file or directo
ry
In file included from /u/NetBSD/arch/i386/dest/usr/include/machine/intr.h:3,
                 from /u/NetBSD/src/sys/sys/mutex.h:187,
                 from /u/NetBSD/src/sys/sys/file.h:43,
                 from /u/NetBSD/src/dist/ipf/ipsend/sock.c:43:
/u/NetBSD/arch/i386/dest/usr/include/x86/intr.h:78: error: field 'is_evcnt' has incomplete type
In file included from /u/NetBSD/arch/i386/dest/usr/include/machine/intr.h:3,
                 from /u/NetBSD/src/sys/sys/mutex.h:187,
                 from /u/NetBSD/src/sys/sys/file.h:43,
                 from /u/NetBSD/src/dist/ipf/ipsend/sock.c:43:
/u/NetBSD/arch/i386/dest/usr/include/x86/intr.h:227: error: field 'softintr_slock' has incomplete ty
pe
In file included from /u/NetBSD/src/sys/sys/file.h:44,
                 from /u/NetBSD/src/dist/ipf/ipsend/sock.c:43:
/u/NetBSD/src/sys/sys/condvar.h:71: error: expected '=', ',', ';', 'asm' or '__attribute__' before '
cv_has_waiters'

*** Failed target:  sock.o
*** Failed command: /u/NetBSD/arch/i386/TOOLS/bin/i386--netbsdelf-gcc -O2 -pipe -mfpmath=sse -msse2 
-march=pentium-m -fstack-protector -Wstack-protector --param ssp-buffer-size=1 -Wall -Wstrict-protot
ypes -Wmissing-prototypes -Wpointer-arith -Wno-sign-compare -Wno-traditional -Werror -I/u/NetBSD/src
/dist/ipf -I/u/NetBSD/src/dist/ipf/tools -I/u/NetBSD/src/sys -I/u/NetBSD/src/sys/dist/ipf -I/u/NetBS
D/src/sys/dist/ipf/netinet -DSTATETOP -D__UIO_EXPOSE -DINET -DINET6 -nostdinc -isystem /u/NetBSD/arc
h/i386/dest/usr/include -D_FORTIFY_SOURCE=2 -c /u/NetBSD/src/dist/ipf/ipsend/sock.c
*** Error code 1

Stop.
nbmake: stopped in /u/NetBSD/src/usr.sbin/ipf/ipresend

*** Failed target:  dependall

Copying pic.h (by patching the Makefiles as below) to usr/include/machine
doesn't make things better...

cvs diff -u Makefile 
Index: Makefile
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/include/Makefile,v
retrieving revision 1.34
diff -u -r1.34 Makefile
--- Makefile    9 Feb 2007 21:55:05 -0000       1.34
+++ Makefile    8 Oct 2007 22:17:44 -0000
@@ -17,7 +17,7 @@
        limits.h lock.h \
        math.h mcontext.h mutex.h mtrr.h multiboot.h \
        npx.h \
-       param.h pcb.h pccons.h pio.h pmap.h pmc.h proc.h profile.h psl.h \
+       param.h pcb.h pccons.h pic.h pio.h pmap.h pmc.h proc.h profile.h psl.h \
        pte.h ptrace.h \
        reg.h rwlock.h \
        segments.h setjmp.h signal.h specialreg.h spkr.h stdarg.h \

cvs diff -u Makefile
Index: Makefile
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/include/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile    16 Apr 2007 19:16:37 -0000      1.10
+++ Makefile    8 Oct 2007 22:18:24 -0000
@@ -12,6 +12,7 @@
        intr.h intrdefs.h \
        lock.h \
        math.h mutex.h mtrr.h \
+       pic.h \
        pio.h \
        psl.h \
        rwlock.h \


I'm giving up for tonight ;-)

Kurt