From owner-p4-projects@FreeBSD.ORG  Tue Dec 23 06:11:47 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BD28316A4F0; Tue, 23 Dec 2003 06:11:46 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8B95A16A4CF
	for <perforce@freebsd.org>; Tue, 23 Dec 2003 06:11:46 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 19DD543D31
	for <perforce@freebsd.org>; Tue, 23 Dec 2003 06:11:45 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBNEBi0B009617
	for <perforce@freebsd.org>; Tue, 23 Dec 2003 06:11:44 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBNEBiXK009609
	for perforce@freebsd.org; Tue, 23 Dec 2003 06:11:44 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Date: Tue, 23 Dec 2003 06:11:44 -0800 (PST)
Message-Id: <200312231411.hBNEBiXK009609@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 44239 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Dec 2003 14:11:47 -0000

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

Change 44239 by cvance@cvance_sony on 2003/12/23 06:11:40

	Integ from MAC branch to get release build fixes

Affected files ...

.. //depot/projects/trustedbsd/sebsd/release/Makefile#9 integrate

Differences ...

==== //depot/projects/trustedbsd/sebsd/release/Makefile#9 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.822 2003/10/31 13:15:07 ru Exp $
+# $FreeBSD: src/release/Makefile,v 1.824 2003/11/15 03:58:12 kuriyama Exp $
 #
 # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
 #     [RELEASETAG=tag]
@@ -347,10 +347,9 @@
 		${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} co ${CVSCMDARGS} ${CVS_SRCARGS} ${RELEASESRCMODULE}
 .endif
 .if defined(LOCAL_PATCHES) && !empty(LOCAL_PATCHES)
-	cd ${CHROOTDIR}/usr/${RELEASESRCMODULE}
 .for p in ${LOCAL_PATCHES}
 .if exists(${p})
-	patch ${PATCH_FLAGS} < ${p}
+	patch -d ${CHROOTDIR}/usr/${RELEASESRCMODULE} ${PATCH_FLAGS} < ${p}
 .endif
 .endfor
 .endif
@@ -697,7 +696,10 @@
 	    ${RD}/trees/base/etc/services | \
 	    sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \
 	    > ${RD}/mfsfd/stand/etc/services
+	grep 'operator' ${RD}/trees/base/etc/group \
+	    > ${RD}/mfsfd/stand/etc/group
 	ln ${RD}/mfsfd/stand/etc/services ${RD}/mfsfd/etc/services
+	ln ${RD}/mfsfd/stand/etc/group ${RD}/mfsfd/etc/group
 	ln ${RD}/mfsfd/stand/etc/netconfig ${RD}/mfsfd/etc/netconfig
 	cp ${RD}/trees/base/COPYRIGHT ${RD}/mfsfd/stand/help/COPYRIGHT.hlp
 .if !defined(NODOC)