From owner-p4-projects@FreeBSD.ORG  Tue Apr 18 09:35:05 2006
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 048FD16A40A; Tue, 18 Apr 2006 09:35:05 +0000 (UTC)
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 8249016A404
	for <perforce@freebsd.org>; Tue, 18 Apr 2006 09:35:04 +0000 (UTC)
	(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 5D6E643D6E
	for <perforce@freebsd.org>; Tue, 18 Apr 2006 09:35:02 +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 k3I9Z2Fr004863
	for <perforce@freebsd.org>; Tue, 18 Apr 2006 09:35:02 GMT
	(envelope-from soc-andrew@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3I9Z2qa004853
	for perforce@freebsd.org; Tue, 18 Apr 2006 09:35:02 GMT
	(envelope-from soc-andrew@freebsd.org)
Date: Tue, 18 Apr 2006 09:35:02 GMT
Message-Id: <200604180935.k3I9Z2qa004853@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 95489 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: Tue, 18 Apr 2006 09:35:05 -0000

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

Change 95489 by soc-andrew@soc-andrew_serv on 2006/04/18 09:34:03

	Add more packages to install. Not all are in the ports tree yet. They have all been submitted though
	Fix the installPackage target when the package file dosn't exist

Affected files ...

.. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#43 edit

Differences ...

==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#43 (text+ko) ====

@@ -836,6 +836,16 @@
 		ROOT=${RD}/bsdinstaller/root
 	@cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=lua50-pty \
 		ROOT=${RD}/bsdinstaller/root
+	@cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=lua50-filename \
+		ROOT=${RD}/bsdinstaller/root
+	@cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=lua50-app \
+		ROOT=${RD}/bsdinstaller/root
+	@cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=libaura \
+		ROOT=${RD}/bsdinstaller/root
+	@cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=libdfui \
+		ROOT=${RD}/bsdinstaller/root
+	@cd ${.CURDIR} && $(MAKE) installPackage PACKAGE=lua50-dfui \
+		ROOT=${RD}/bsdinstaller/root
 
 	@touch ${RD}/bsdinstaller/root/etc/fstab
 	@echo "sendmail_enable=\"NONE\"" > ${RD}/bsdinstaller/root/etc/rc.conf
@@ -1303,7 +1313,7 @@
 .if !defined(PACKAGE)
 	@echo "PACKAGE undefined in installPackage" && exit 1
 .endif
-	rm ${RD}/${PACKAGE}.tbz
+	rm -f ${RD}/${PACKAGE}.tbz
 	( /usr/bin/fetch -ARr -o ${RD}/${PACKAGE}.tbz \
 		${PACKAGE_SITE}/${PACKAGE_DIR}/${PACKAGE}.tbz && \
 		pkg_add -Rf -P ${ROOT}/usr/local \