From 49da4a2d47649eb78d923de9f23795ab4a1b0e46 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sun, 28 Apr 2013 19:21:12 +0200
Subject: [PATCH] Update cmake and libsolv packages

---
 build/jam/OptionalBuildFeatures | 10 +++++-----
 build/jam/OptionalPackages      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/jam/OptionalBuildFeatures b/build/jam/OptionalBuildFeatures
index f17e648a0b..cffb52519c 100644
--- a/build/jam/OptionalBuildFeatures
+++ b/build/jam/OptionalBuildFeatures
@@ -222,7 +222,7 @@ if $(TARGET_ARCH) != x86 {
 	Echo "Libsolv not available for $(TARGET_ARCH)." ;
 } else if $(HAIKU_GCC_VERSION[1]) = 2 {
 	HAIKU_LIBSOLV_PACKAGE
-		= libsolv-0.3.0_haiku_2013_04_18-1-x86_gcc2.hpkg ;
+		= libsolv-0.3.0_haiku_2013_04_18-2-x86_gcc2.hpkg ;
 } else {
 	Echo "Libsolv not available for gcc4." ;
 }
@@ -236,16 +236,16 @@ if $(HAIKU_LIBSOLV_PACKAGE) {
 
 	# extract headers and libraries
 	HAIKU_LIBSOLV_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_LIBSOLV_DIR)
-		: include/ : $(HAIKU_LIBSOLV_PACKAGE_FILE) : extracted-libsolv
+		: develop/headers/ : $(HAIKU_LIBSOLV_PACKAGE_FILE) : extracted-libsolv
 	] ;
 
 	HAIKU_LIBSOLV_LIBS = [ ExtractArchive $(HAIKU_LIBSOLV_DIR)
 		:
-		lib/libsolv.so
-		lib/libsolvext.so
+		develop/lib/libsolv.so
+		develop/lib/libsolvext.so
 		: $(HAIKU_LIBSOLV_PACKAGE_FILE)
 		: extracted-libsolv
 	] ;
 
-	HAIKU_LIBSOLV_HEADERS = [ FDirName $(HAIKU_LIBSOLV_DIR) include ] ;
+	HAIKU_LIBSOLV_HEADERS = [ FDirName $(HAIKU_LIBSOLV_DIR) develop/headers ] ;
 }
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 41c49fc74b..766f53b161 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -410,7 +410,7 @@ if [ IsOptionalHaikuImagePackageAdded CMake ] {
 				: : true ;
 		} else {
 			InstallOptionalHaikuImagePackage
-				$(hpkgBaseURL)/cmake-2.8.5-2-gcc2_x86.hpkg
+				$(hpkgBaseURL)/cmake-2.8.5-3-x86_gcc2.hpkg
 				: common packages ;
 		}
 	}