From e52af6a9e146b58b3a3bc522676d40b560e99a4c Mon Sep 17 00:00:00 2001
From: Rene Gollent <anevilyak@gmail.com>
Date: Sun, 28 Jul 2013 22:09:20 -0400
Subject: [PATCH] Add LibLayout and BePDF x86-64 packages.

Thanks to Chris Roberts for contributing the former.
---
 build/jam/OptionalPackages | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 7bb06f9e3d..28a8a10a10 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -295,9 +295,7 @@ if [ IsOptionalHaikuImagePackageAdded BeOSCompatibility ] {
 
 # BePDF
 if [ IsOptionalHaikuImagePackageAdded BePDF ] {
-	if $(TARGET_ARCH) != x86 {
-		Echo "No optional package BePDF available for $(TARGET_ARCH)" ;
-	} else {
+	if $(TARGET_ARCH) = x86 {
 		if $(HAIKU_GCC_VERSION[1]) >= 4 {
 			InstallOptionalHaikuImagePackage
 				bepdf-1.1.1b4-x86-gcc4-2012-08-11.zip
@@ -309,6 +307,14 @@ if [ IsOptionalHaikuImagePackageAdded BePDF ] {
 		}
 		AddSymlinkToHaikuImage home config settings deskbar Applications
 			: /boot/apps/BePDF/BePDF ;
+	} else if $(TARGET_ARCH) = x86_64 {
+		InstallOptionalHaikuImagePackage
+			bepdf-1.1.1b4-x86_64-2013-07-28.zip
+			: $(baseURL)/bepdf-1.1.1b4-x86_64-2013-07-28.zip ;
+		AddSymlinkToHaikuImage home config settings deskbar Applications
+			: /boot/apps/BePDF/BePDF ;
+	} else {
+		Echo "No optional package BePDF available for $(TARGET_ARCH)" ;
 	}
 }
 
@@ -1429,14 +1435,19 @@ if [ IsOptionalHaikuImagePackageAdded LibIconv ] {
 
 # LibLayout library
 if [ IsOptionalHaikuImagePackageAdded LibLayout ] {
-	if $(TARGET_ARCH) != x86 {
-		Echo "No optional package LibLayout available for $(TARGET_ARCH)" ;
-	} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
-		InstallOptionalHaikuImagePackage liblayout-1.4.1-r1a4-x86-gcc4-2012-08-30.zip
-			: $(baseURL)/liblayout-1.4.1-r1a4-x86-gcc4-2012-08-30.zip ;
+	if $(TARGET_ARCH) = x86 {
+		if $(HAIKU_GCC_VERSION[1]) >= 4 {
+			InstallOptionalHaikuImagePackage liblayout-1.4.1-r1a4-x86-gcc4-2012-08-30.zip
+				: $(baseURL)/liblayout-1.4.1-r1a4-x86-gcc4-2012-08-30.zip ;
+		} else {
+			InstallOptionalHaikuImagePackage liblayout-1.4.0-gcc2-2009-03-08.zip
+				: $(baseURL)/liblayout-1.4.0-gcc2-2009-03-08.zip ;
+		}
+	} else if $(TARGET_ARCH) = x86_64 {
+			InstallOptionalHaikuImagePackage liblayout-1.4.1-x86_64-2013-07-28.zip
+				: $(baseURL)/liblayout-1.4.1-x86_64-2013-07-28.zip ;
 	} else {
-		InstallOptionalHaikuImagePackage liblayout-1.4.0-gcc2-2009-03-08.zip
-			: $(baseURL)/liblayout-1.4.0-gcc2-2009-03-08.zip ;
+		Echo "No optional package LibLayout available for $(TARGET_ARCH)" ;
 	}
 }