From owner-p4-projects@FreeBSD.ORG  Wed Nov  9 01:08:45 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 413AD16A421; Wed,  9 Nov 2005 01:08:45 +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 F02F516A41F
	for <perforce@freebsd.org>; Wed,  9 Nov 2005 01:08:44 +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 BA9F043D45
	for <perforce@freebsd.org>; Wed,  9 Nov 2005 01:08:44 +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 jA918ivj055143
	for <perforce@freebsd.org>; Wed, 9 Nov 2005 01:08:44 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jA918iAn055140
	for perforce@freebsd.org; Wed, 9 Nov 2005 01:08:44 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Wed, 9 Nov 2005 01:08:44 GMT
Message-Id: <200511090108.jA918iAn055140@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 86498 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: Wed, 09 Nov 2005 01:08:46 -0000

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

Change 86498 by soc-andrew@soc-andrew_serv on 2005/11/09 01:07:48

	Allow the ports tree to be installed

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/500_install_os.lua#4 edit
.. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/431_ports.lua#1 add
.. //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/Makefile#5 edit

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/contrib/bsdinstaller/backend/lua/install/500_install_os.lua#4 (text+ko) ====

@@ -83,6 +83,18 @@
 	--
 	App.state.target:cmds_install_srcs(cmds, App.conf.install_items)
 
+	if App.conf.install_ports == true then
+		cmds:add{
+		    cmdline = "${root}${TAR} -x " ..
+			"-f ${root}usr/${uname}/ports/ports.tgz "..
+			"-C ${root}${base}/usr",
+		    replacements = {
+			base = base,
+			uname = posix.uname("%r")
+		    }
+		}
+	end
+
 	--
 	-- Remove any databases that might have been copied over but
 	-- will no longer be accurate, e.g. the installed-package database.

==== //depot/projects/soc2005/bsdinstaller/src/libexec/bsdinstaller/inst/Makefile#5 (text+ko) ====

@@ -10,7 +10,7 @@
 		900_reboot.lua main.lua
 
 # Local scripts
-FILES+=		430_select_dists.lua
+FILES+=		430_select_dists.lua 431_ports.lua
 
 FILESDIR=       ${INST_DIR}/install