From 6b1789577abf5f62292b5535e13a71a804b38a6a Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Fri, 3 May 2013 15:47:11 +0200
Subject: [PATCH] Update/add packages for readline, cvs, doxygen, python,

... and timgmsoundfont.
---
 build/jam/OptionalPackageDependencies |  1 +
 build/jam/OptionalPackages            | 23 +++++++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/build/jam/OptionalPackageDependencies b/build/jam/OptionalPackageDependencies
index 03e246eb5a..b34141d358 100644
--- a/build/jam/OptionalPackageDependencies
+++ b/build/jam/OptionalPackageDependencies
@@ -30,6 +30,7 @@ OptionalPackageDependencies NetSurf : OpenSSL Curl LibXML2 LibIconv Libmng ;
 OptionalPackageDependencies OpenSSH : OpenSSL ;
 OptionalPackageDependencies Paladin : CCache Fastdep ;
 OptionalPackageDependencies Pe : PCRE ;
+OptionalPackageDependencies Readline : NCurses ;
 OptionalPackageDependencies SDLLibs : XiphLibs libmad libmikmod Libmng libmodplug physfs ;
 OptionalPackageDependencies Subversion : APR-util Neon LibIconv LibXML2 OpenSSL SQLite ;
 OptionalPackageDependencies Transmission : LibEvent Curl OpenSSL LibIconv ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 6a24c4d5bc..49e71ade46 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -68,6 +68,7 @@
 #	Pe						- the powerful native Programmer's Editor
 #	Perl					- the scripting language
 #	Python					- the scripting language
+#	Readline				- the GNU Readline library
 #	Rsync					- remote directory synchronization
 #	Ruby					- the programming language
 #	Sed						- the ultimate stream editor
@@ -449,7 +450,7 @@ if [ IsOptionalHaikuImagePackageAdded CVS ] {
 				: : true ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				$(hpkgBaseURL)/cvs-1.12.13.1-2-x86_gcc2.hpkg ;
+				$(hpkgBaseURL)/cvs-1.12.13.1-4-x86_gcc2.hpkg ;
 		}
 	}
 }
@@ -587,7 +588,7 @@ if [ IsOptionalHaikuImagePackageAdded Doxygen ] {
 				: : true ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				$(hpkgBaseURL)/doxygen-1.6.3-1-gcc2_x86.hpkg ;
+				$(hpkgBaseURL)/doxygen-1.6.3-2-x86_gcc2.hpkg ;
 		}
 	}
 }
@@ -1219,12 +1220,26 @@ if [ IsOptionalHaikuImagePackageAdded Python ] {
 				: : true ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				$(hpkgBaseURL)/python-2.6.6-1-x86_gcc2.hpkg ;
+				$(hpkgBaseURL)/python-2.6.8-2-x86_gcc2.hpkg ;
 		}
 	}
 }
 
 
+# Readline
+if [ IsOptionalHaikuImagePackageAdded Readline ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package Readline available for $(TARGET_ARCH)" ;
+	} else {
+		if $(HAIKU_GCC_VERSION[1]) >= 4 {
+			Echo "No optional package Readline available for gcc 4" ;
+		} else {
+			InstallOptionalHaikuImagePackage
+				$(hpkgBaseURL)/readline-6.2-2-x86_gcc2.hpkg ;
+		}
+	}
+}
+
 # Rsync
 if [ IsOptionalHaikuImagePackageAdded Rsync ] {
 	if $(TARGET_ARCH) != x86 {
@@ -1337,7 +1352,7 @@ if [ IsOptionalHaikuImagePackageAdded Tar ] {
 # TimGMSoundFont
 if [ IsOptionalHaikuImagePackageAdded TimGMSoundFont ] {
 	InstallOptionalHaikuImagePackage
-		$(hpkgBaseURL)/TimGMSoundFont-2010-06-16.hpkg
+		$(hpkgBaseURL)/timgmsoundfont-2004_01_24-2-any.hpkg
 		: system ;
 }