From owner-p4-projects@FreeBSD.ORG  Thu Dec 15 01:59:56 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0660516A422; Thu, 15 Dec 2005 01:59:56 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 C3C3C16A41F
	for <perforce@freebsd.org>; Thu, 15 Dec 2005 01:59:55 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9501B43D6B
	for <perforce@freebsd.org>; Thu, 15 Dec 2005 01:59:53 +0000 (GMT)
	(envelope-from soc-andrew@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBF1xrNn019149
	for <perforce@freebsd.org>; Thu, 15 Dec 2005 01:59:53 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBF1xrYw019146
	for perforce@freebsd.org; Thu, 15 Dec 2005 01:59:53 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Thu, 15 Dec 2005 01:59:53 GMT
Message-Id: <200512150159.jBF1xrYw019146@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-andrew@freebsd.org using -f
From: soc-andrew <soc-andrew@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 88216 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Thu, 15 Dec 2005 01:59:56 -0000

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

Change 88216 by soc-andrew@soc-andrew_serv on 2005/12/15 01:59:00

	Update the patch needed to be applyed to RELENG_6 to build a BSD Installer release

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/scripts/RELENG_6_release_Makefile.patch#2 edit

Differences ...

==== //depot/projects/soc2005/bsdinstaller/scripts/RELENG_6_release_Makefile.patch#2 (text+ko) ====

@@ -1,15 +1,23 @@
 Index: release/Makefile
 ===================================================================
 RCS file: /cvsroot/src/release/Makefile,v
-retrieving revision 1.853.2.16
-diff -u -3 -p -u -r1.853.2.16 Makefile
---- release/Makefile	5 May 2005 00:53:29 -0000	1.853.2.16
-+++ release/Makefile	2 Jul 2005 06:41:02 -0000
-@@ -443,6 +443,7 @@ release rerelease:
+retrieving revision 1.887.2.3
+diff -u -3 -p -u -r1.887.2.3 Makefile
+--- release/Makefile	16 Nov 2005 08:03:33 -0000	1.887.2.3
++++ release/Makefile	15 Dec 2005 01:56:14 -0000
+@@ -447,6 +447,7 @@ release rerelease:
+ 	echo "_RELTARGET=\$${1:-doRELEASE}"	>> ${_MK}
  .for var in \
  	AUTO_KEYBOARD_DETECT \
++	BSDINSTALLER \
  	BUILDNAME \
-+	BSDINSTALLER \
  	CD_PACKAGE_TREE \
  	DISTRIBUTIONS \
- 	DOC_LANG \
+@@ -458,7 +459,6 @@ release rerelease:
+ 	HTTP_PROXY \
+ 	KERNELS \
+ 	KERNEL_FLAGS \
+-	MAKE_FLOPPIES \
+ 	MAKE_ISOS \
+ 	NOCDROM \
+ 	NODOC \