From 0d6d8db9ab8e38c8746ae64684d36de73c4ed2d7 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 13 Oct 2010 06:11:51 +0000 Subject: [PATCH] Updated apr-util, cmake, curl, sqlite and subversion optionalpackages. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38961 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index 01416c0a43..9a2bbda966 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -110,14 +110,10 @@ if [ IsOptionalHaikuImagePackageAdded APR ] { if $(TARGET_ARCH) != x86 { Echo "No optional package APR available for $(TARGET_ARCH)" ; } else { - InstallOptionalHaikuImagePackage apr-1.4.2-r1a2-x86-gcc2-2010-04-22-a.zip - : $(baseURL)/apr-1.4.2-r1a2-x86-gcc2-2010-04-22-a.zip + InstallOptionalHaikuImagePackage apr-1.4.2-x86-gcc2-2010-10-13.zip + : $(baseURL)/apr-1.4.2-x86-gcc2-2010-10-13.zip : : true - : true - ; - InstallSourceArchive apr-1.4.2_haiku-2010-04-29.tar.xz - : $(baseSourceURL)/apr-1.4.2_haiku-2010-04-29.tar.xz ; } } @@ -129,14 +125,10 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] { Echo "No optional package APR-util available for $(TARGET_ARCH)" ; } else { InstallOptionalHaikuImagePackage - apr-util-1.3.9-r1a2-x86-gcc2-2010-04-22-a.zip - : $(baseURL)/apr-util-1.3.9-r1a2-x86-gcc2-2010-04-22-a.zip + apr-util-1.3.10-x86-gcc2-2010-10-13.zip + : $(baseURL)/apr-util-1.3.10-x86-gcc2-2010-10-13.zip : : true - : true - ; - InstallSourceArchive apr-util-1.3.9_haiku-2010-04-29.tar.xz - : $(baseSourceURL)/apr-util-1.3.9_haiku-2010-04-29.tar.xz ; } } @@ -433,8 +425,8 @@ if [ IsOptionalHaikuImagePackageAdded CMake ] { Echo "No optional package CMake available for $(TARGET_ARCH)" ; } else { InstallOptionalHaikuImagePackage - cmake-2.8.1-x86-gcc2-2010-09-01.zip - : $(baseURL)/cmake-2.8.1-x86-gcc2-2010-09-01.zip + cmake-2.8.2-x86-gcc2-2010-10-13.zip + : $(baseURL)/cmake-2.8.2-x86-gcc2-2010-10-13.zip : : true ; @@ -448,9 +440,8 @@ if [ IsOptionalHaikuImagePackageAdded Curl ] { Echo "No optional package Curl available for $(TARGET_ARCH)" ; } else { InstallOptionalHaikuImagePackage - curl-7.21.1-x86-gcc2-2010-08-13.zip - : $(baseURL)/curl-7.21.1-x86-gcc2-2010-08-13.zip - : + curl-7.21.2-x86-gcc2-2010-10-13.zip + : $(baseURL)/curl-7.21.2-x86-gcc2-2010-10-13.zip : : true ; @@ -1376,9 +1367,8 @@ if [ IsOptionalHaikuImagePackageAdded SQLite ] { Echo "No optional package SQLite available for $(TARGET_ARCH)" ; } else { InstallOptionalHaikuImagePackage - sqlite-3.6.23-r1a2-x86-gcc2-2010-04-22-a.zip - : $(baseURL)/sqlite-3.6.23-r1a2-x86-gcc2-2010-04-22-a.zip - : + sqlite-3.7.3-x86-gcc2-2010-10-13.zip + : $(baseURL)/sqlite-3.7.3-x86-gcc2-2010-10-13.zip : : true ; @@ -1392,11 +1382,10 @@ if [ IsOptionalHaikuImagePackageAdded Subversion ] { Echo "No optional package Subversion available for $(TARGET_ARCH)" ; } else { InstallOptionalHaikuImagePackage - subversion-1.6.9-r1a2-x86-gcc2-2010-04-28-a.zip - : $(baseURL)/subversion-1.6.9-r1a2-x86-gcc2-2010-04-28-a.zip + subversion-1.6.13-x86-gcc2-2010-10-13.zip + : $(baseURL)/subversion-1.6.13-x86-gcc2-2010-10-13.zip : : true - : true ; } }