PERFORCE change 129146 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=129146

Change 129146 by jb at jb_freebsd1 on 2007/11/17 01:21:53

	IF7

Affected files ...

.. //depot/projects/dtrace7/src/lib/libc/net/Makefile.inc#2 integrate
.. //depot/projects/dtrace7/src/release/Makefile#2 integrate

Differences ...

==== //depot/projects/dtrace7/src/lib/libc/net/Makefile.inc#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from @(#)Makefile.inc	8.2 (Berkeley) 9/5/93
-# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.69 2007/06/12 22:32:52 ache Exp $
+# $FreeBSD: src/lib/libc/net/Makefile.inc,v 1.69.2.1 2007/11/16 07:18:12 ru Exp $
 
 # machine-independent net sources
 .PATH: ${.CURDIR}/net
@@ -12,7 +12,7 @@
 	getproto.c getprotoent.c getprotoname.c getservent.c \
 	if_indextoname.c if_nameindex.c if_nametoindex.c \
 	ip6opt.c linkaddr.c map_v4v6.c name6.c ntoh.c \
-	nsdispatch.c nslexer.c nsparser.c nss_compat.c \
+	nsdispatch.c nslexer.c nsparser.y nss_compat.c \
 	rcmd.c rcmdsh.c recv.c rthdr.c sctp_sys_calls.c send.c \
         sockatmark.c sourcefilter.c vars.c
 
@@ -34,12 +34,9 @@
 YFLAGS+=-p_nsyy
 LFLAGS+=-P_nsyy
 
-CLEANFILES+=nsparser.c nslexer.c nsparser.h
+CLEANFILES+=nslexer.c
 
-nsparser.h: nsparser.c
-	mv y.tab.h ${.TARGET}
-
-nslexer.c: nslexer.l nsparser.h
+nslexer.c: nslexer.l
 	${LEX} ${LFLAGS} -o/dev/stdout ${.IMPSRC} | \
 		sed -e '/YY_BUF_SIZE/s/16384/1024/' >${.TARGET}
 

==== //depot/projects/dtrace7/src/release/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.924.2.1 2007/10/11 06:22:30 kensmith Exp $
+# $FreeBSD: src/release/Makefile,v 1.924.2.2 2007/11/16 13:33:38 kensmith Exp $
 #
 # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
 #     [RELEASETAG=tag]
@@ -192,6 +192,7 @@
 .undef MAKE_FLOPPIES
 .if ${TARGET_ARCH} == "i386"
 MAKE_FLOPPIES=		true
+SEPARATE_LIVEFS=
 SPLIT_MFSROOT=
 .if ${TARGET} == "pc98"
 SMALLFLOPPYSIZE=	1200