From owner-p4-projects@FreeBSD.ORG Sat Nov 17 01:22:01 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECAEA16A468; Sat, 17 Nov 2007 01:22:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B040416A4DE for ; Sat, 17 Nov 2007 01:22:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9B38813C44B for ; Sat, 17 Nov 2007 01:22:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lAH1M0pl097995 for ; Sat, 17 Nov 2007 01:22:00 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lAH1LtR6097988 for perforce@freebsd.org; Sat, 17 Nov 2007 01:21:55 GMT (envelope-from jb@freebsd.org) Date: Sat, 17 Nov 2007 01:21:55 GMT Message-Id: <200711170121.lAH1LtR6097988@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 129146 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2007 01:22:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=129146 Change 129146 by jb@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