From beb4fe752833be8f474a9b9502becf4c69a92af6 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Thu, 16 Sep 2010 02:34:38 +0000
Subject: [PATCH] Updated BeAE and added a gcc4 build. Added BurnItNow, both a
 gcc2 and gcc4 build. Added Bazaar, both a gcc2 and gcc4 build.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38665 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/OptionalPackageDependencies |  1 +
 build/jam/OptionalPackages            | 53 +++++++++++++++++++++++++--
 2 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies
index d2e1c2c335..4c6bef7f92 100644
--- a/build/jam/OptionalPackageDependencies
+++ b/build/jam/OptionalPackageDependencies
@@ -7,6 +7,7 @@
 OptionalPackageDependencies APR-util : APR Expat ;
 OptionalPackageDependencies Beam : LibIconv LibLayout OpenSSL PCRE ;
 OptionalPackageDependencies BeHappy : BeBook NetSurf ;
+OptionalPackageDependencies BurnItNow : CDRecord ;
 OptionalPackageDependencies CDRecord : LibIconv ;
 OptionalPackageDependencies Curl : OpenSSL ;
 OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index dc1b80f9bb..1f5b3d47e7 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -16,6 +16,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
 #	ABI-compliance-checker	- tool for checking ABI compatibility between libs
 #	APR						- support libraries used for example by Subversion
 #	APR-util				- Apache portable runtime utility library
+#	Bazaar					- the distributed version control system
 #	BeAE					- open source Audio Editor
 #	Beam					- powerful native e-mail client
 #	BeBook					- the classic BeOS API documentation
@@ -24,6 +25,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
 #	BePDF					- native PDF reader
 #	BeZillaBrowser			- fork of Mozilla's 1.8 branch.
 #	Bluetooth				- experimental Haiku components for Bluetooth
+#	BurnItNow				- CD burning app
 #	Bzip					- file archiving utility
 #	CCache					- fast compiler cache
 #	CDRecord				- the command line CD writing tools
@@ -139,15 +141,38 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] {
 }
 
 
+# Bazaar
+if [ IsOptionalHaikuImagePackageAdded Bazaar ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package BeAE available for $(TARGET_ARCH)" ;
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+		InstallOptionalHaikuImagePackage bzr-2.2.0-gcc4-2010-09-15.zip
+			: $(baseURL)/bzr-2.2.0-x86-gcc4-2010-09-15.zip
+			:
+ 		;
+	} else {
+		InstallOptionalHaikuImagePackage bzr-2.2.0-x86-gcc2-2010-09-15.zip
+			: $(baseURL)/bzr-2.2.0-x86-gcc2-2010-09-16.zip
+			:
+		;
+	}
+}
+
+
 # BeAE
 if [ IsOptionalHaikuImagePackageAdded BeAE ] {
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package BeAE available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
-		Echo "No optional package BeAE available for gcc4" ;
+		InstallOptionalHaikuImagePackage beae-22-x86-gcc4-2010-09-15.zip
+			: $(baseURL)/beae-22-x86-gcc4-2010-09-15.zip
+			:
+ 		;
+		AddSymlinkToHaikuImage home config be Applications
+			: /boot/apps/BeAE/BeAE ;
 	} else {
-		InstallOptionalHaikuImagePackage beae-20-x86-gcc2-2010-09-09.zip
-			: $(baseURL)/beae-20-x86-gcc2-2010-09-09.zip
+		InstallOptionalHaikuImagePackage beae-22-x86-gcc2-2010-09-15.zip
+			: $(baseURL)/beae-22-x86-gcc2-2010-09-15.zip
 			:
 		;
 		AddSymlinkToHaikuImage home config be Applications
@@ -297,6 +322,28 @@ if [ IsOptionalHaikuImagePackageAdded Bluetooth ] {
 }
 
 
+# BurnItNow
+if [ IsOptionalHaikuImagePackageAdded BurnItNow ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package BurnItNow available for $(TARGET_ARCH)" ;
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) {
+		InstallOptionalHaikuImagePackage burnitnow-39-x86-gcc4-2010-09-15.zip
+			: $(baseURL)/burnitnow-39-x86-gcc4-2010-09-15.zip
+			:
+ 		;
+		AddSymlinkToHaikuImage home config be Applications
+			: /boot/apps/BurnItNow/BurnItNow ;
+	} else {
+		InstallOptionalHaikuImagePackage burnitnow-39-x86-gcc2-2010-09-15.zip
+			: $(baseURL)/burnitnow-39-x86-gcc2-2010-09-15.zip
+			:
+		;
+		AddSymlinkToHaikuImage home config be Applications
+			: /boot/apps/BurnItNow/BurnItNow ;
+	}
+}
+
+
 # Bzip
 if [ IsOptionalHaikuImagePackageAdded Bzip ] {
 	if $(TARGET_ARCH) != x86 {