From 8ffd9082160ed9a3b7b74010dd79eeed9af0d66d Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Thu, 29 Apr 2010 12:23:30 +0000 Subject: [PATCH] * updated Beam to work with newer version of openssl * cleanup with respect to 80-chars width git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36527 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/OptionalPackages | 95 ++++++++++++++++++++++++-------------- 1 file changed, 61 insertions(+), 34 deletions(-) diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index c5224f3bf0..acca8f22c4 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -76,6 +76,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1 # Yasm - the assembler utility local baseURL = http://haiku-files.org/files/optional-packages ; +local baseSourceURL = http://haiku-files.org/files/sources ; # ABI-compliance-checker if [ IsOptionalHaikuImagePackageAdded ABI-compliance-checker ] { @@ -110,7 +111,8 @@ if [ IsOptionalHaikuImagePackageAdded APR-util ] { if $(TARGET_ARCH) != x86 { Echo "No optional package APR-util available for $(TARGET_ARCH)" ; } else { - InstallOptionalHaikuImagePackage apr-util-1.3.9-r1a2-x86-gcc2-2010-04-22.zip + InstallOptionalHaikuImagePackage + apr-util-1.3.9-r1a2-x86-gcc2-2010-04-22.zip : $(baseURL)/apr-util-1.3.9-r1a2-x86-gcc2-2010-04-22.zip : : true @@ -144,12 +146,11 @@ if [ IsOptionalHaikuImagePackageAdded Beam ] { } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { Echo "No optional package Beam available for gcc4" ; } else { - InstallOptionalHaikuImagePackage Beam-1.2alpha.zip - : $(baseURL)/Beam-1.2alpha-x86-gcc2-2009-09-29.zip - : apps + InstallOptionalHaikuImagePackage Beam-1.2alpha-x86-gcc2-2010-04-29.zip + : $(baseURL)/Beam-1.2alpha-x86-gcc2-2010-04-29.zip ; AddSymlinkToHaikuImage home config be Applications - : /boot/apps/beam-1.2alpha-haiku/Beam ; + : /boot/apps/Beam/Beam ; } } @@ -210,7 +211,8 @@ if [ IsOptionalHaikuImagePackageAdded BePDF ] { } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { Echo "No optional package BePDF available for gcc4" ; } else { - InstallOptionalHaikuImagePackage BePDF-1.1.1b2-r1a1-x86-gcc2-2009-09-03.zip + InstallOptionalHaikuImagePackage + BePDF-1.1.1b2-r1a1-x86-gcc2-2009-09-03.zip : $(baseURL)/BePDF-1.1.1b2-r1a1-x86-gcc2-2009-09-03.zip : apps ; @@ -235,7 +237,7 @@ if [ IsOptionalHaikuImagePackageAdded BeZillaBrowser ] { ; if $(HAIKU_INCLUDE_SOURCES) = 1 { InstallSourceArchive BeZillaBrowser-2010-01-21-src.7z - : http://www.haiku-files.org/files/sources/2010/BeZillaBrowser-2010-01-21-src.7z + : $(baseSourceURL)/2010/BeZillaBrowser-2010-01-21-src.7z ; } } else { @@ -249,7 +251,7 @@ if [ IsOptionalHaikuImagePackageAdded BeZillaBrowser ] { ; if $(HAIKU_INCLUDE_SOURCES) = 1 { InstallSourceArchive BeZillaBrowser-2010-01-21-src.7z - : http://www.haiku-files.org/files/sources/2010/BeZillaBrowser-2010-01-21-src.7z + : $(baseSourceURL)/2010/BeZillaBrowser-2010-01-21-src.7z ; } } @@ -283,7 +285,8 @@ if [ IsOptionalHaikuImagePackageAdded Bzip ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Bzip available for $(TARGET_ARCH)" ; } else { - InstallOptionalHaikuImagePackage bzip2-1.0.5-r1a2-x86-gcc2-2010-04-21.zip + InstallOptionalHaikuImagePackage + bzip2-1.0.5-r1a2-x86-gcc2-2010-04-21.zip : $(baseURL)/bzip2-1.0.5-r1a2-x86-gcc2-2010-04-21.zip : : true @@ -298,7 +301,8 @@ if [ IsOptionalHaikuImagePackageAdded CDRecord ] { if $(TARGET_ARCH) != x86 { Echo "No optional package CDRecord available for $(TARGET_ARCH)" ; } else { - InstallOptionalHaikuImagePackage cdrecord-2.01.01a63-r1a1-x86-gcc2-2009-08-28.zip + InstallOptionalHaikuImagePackage + cdrecord-2.01.01a63-r1a1-x86-gcc2-2009-08-28.zip : $(baseURL)/cdrecord-2.01.01a63-r1a1-x86-gcc2-2009-08-28.zip : ; @@ -350,7 +354,8 @@ if [ IsOptionalHaikuImagePackageAdded CMake ] { if $(TARGET_ARCH) != x86 { Echo "No optional package CMake available for $(TARGET_ARCH)" ; } else { - InstallOptionalHaikuImagePackage cmake-2.8.0-r1a2-x86-gcc2-2010-04-22.zip + InstallOptionalHaikuImagePackage + cmake-2.8.0-r1a2-x86-gcc2-2010-04-22.zip : $(baseURL)/cmake-2.8.0-r1a2-x86-gcc2-2010-04-22.zip : : true @@ -364,7 +369,8 @@ if [ IsOptionalHaikuImagePackageAdded Curl ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Curl available for $(TARGET_ARCH)" ; } else { - InstallOptionalHaikuImagePackage curl-7.20.1-r1a2-x86-gcc2-2010-04-22.zip + InstallOptionalHaikuImagePackage + curl-7.20.1-r1a2-x86-gcc2-2010-04-22.zip : $(baseURL)/curl-7.20.1-r1a2-x86-gcc2-2010-04-22.zip : : @@ -379,7 +385,8 @@ if [ IsOptionalHaikuImagePackageAdded CVS ] { if $(TARGET_ARCH) != x86 { Echo "No optional package CVS available for $(TARGET_ARCH)" ; } else { - InstallOptionalHaikuImagePackage cvs-1.12.13-r1a1-x86-gcc2-2009-08-30.zip + InstallOptionalHaikuImagePackage + cvs-1.12.13-r1a1-x86-gcc2-2009-08-30.zip : $(baseURL)/cvs-1.12.13-r1a1-x86-gcc2-2009-08-30.zip : : true @@ -416,7 +423,8 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] && $(TARGET_ARCH) = x86 { # gcc and binutils if $(HAIKU_GCC_VERSION[1]) = 2 || $(isHybridBuild) { - InstallOptionalHaikuImagePackage gcc-2.95.3-r1a2-x86-gcc2-2010-04-20-1.zip + InstallOptionalHaikuImagePackage + gcc-2.95.3-r1a2-x86-gcc2-2010-04-20-1.zip : $(baseURL)/gcc-2.95.3-r1a2-x86-gcc2-2010-04-20-1.zip ; } @@ -576,7 +584,8 @@ if [ IsOptionalHaikuImagePackageAdded Expat ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Expat available for $(TARGET_ARCH)" ; } else { - InstallOptionalHaikuImagePackage expat-2.0.1-r1a2-x86-gcc2-2010-04-22.zip + InstallOptionalHaikuImagePackage + expat-2.0.1-r1a2-x86-gcc2-2010-04-22.zip : $(baseURL)/expat-2.0.1-r1a2-x86-gcc2-2010-04-22.zip : : true @@ -607,7 +616,8 @@ if [ IsOptionalHaikuImagePackageAdded Git ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Git available for $(TARGET_ARCH)" ; } else { - InstallOptionalHaikuImagePackage git-1.7.0.5-r1a2-x86-gcc2-2010-04-22.zip + InstallOptionalHaikuImagePackage + git-1.7.0.5-r1a2-x86-gcc2-2010-04-22.zip : $(baseURL)/git-1.7.0.5-r1a2-x86-gcc2-2010-04-22.zip : : true @@ -667,7 +677,8 @@ if [ IsOptionalHaikuImagePackageAdded LibIconv ] { if $(TARGET_ARCH) != x86 { Echo "No optional package LibIconv available for $(TARGET_ARCH)" ; } else { - InstallOptionalHaikuImagePackage libiconv-1.13.1-r1a2-x86-gcc2-2010-04-21.zip + InstallOptionalHaikuImagePackage + libiconv-1.13.1-r1a2-x86-gcc2-2010-04-21.zip : $(baseURL)/libiconv-1.13.1-r1a2-x86-gcc2-2010-04-21.zip : : @@ -697,7 +708,8 @@ if [ IsOptionalHaikuImagePackageAdded LibXML2 ] { if $(TARGET_ARCH) != x86 { Echo "No optional package LibXML2 available for $(TARGET_ARCH)" ; } else { - InstallOptionalHaikuImagePackage libxml2-2.7.7-r1a2-x86-gcc2-2010-04-22.zip + InstallOptionalHaikuImagePackage + libxml2-2.7.7-r1a2-x86-gcc2-2010-04-22.zip : $(baseURL)/libxml2-2.7.7-r1a2-x86-gcc2-2010-04-22.zip : : @@ -712,7 +724,8 @@ if [ IsOptionalHaikuImagePackageAdded LibXSLT ] { if $(TARGET_ARCH) != x86 { Echo "No optional package LibXSLT available for $(TARGET_ARCH)" ; } else { - InstallOptionalHaikuImagePackage libxslt-1.1.26-r1a2-x86-gcc2-2010-04-22.zip + InstallOptionalHaikuImagePackage + libxslt-1.1.26-r1a2-x86-gcc2-2010-04-22.zip : $(baseURL)/libxslt-1.1.26-r1a2-x86-gcc2-2010-04-22.zip : : true @@ -749,7 +762,8 @@ if [ IsOptionalHaikuImagePackageAdded Mercurial ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Mercurial available for $(TARGET_ARCH)" ; } else { - InstallOptionalHaikuImagePackage mercurial-1.5-r1a2-x86-gcc2-2010-04-27.zip + InstallOptionalHaikuImagePackage + mercurial-1.5-r1a2-x86-gcc2-2010-04-27.zip : $(baseURL)/mercurial-1.5-r1a2-x86-gcc2-2010-04-27.zip : : true @@ -776,7 +790,8 @@ if [ IsOptionalHaikuImagePackageAdded Neon ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Neon available for $(TARGET_ARCH)" ; } else { - InstallOptionalHaikuImagePackage neon-0.29.3-r1a2-x86-gcc2-2010-04-22.zip + InstallOptionalHaikuImagePackage + neon-0.29.3-r1a2-x86-gcc2-2010-04-22.zip : $(baseURL)/neon-0.29.3-r1a2-x86-gcc2-2010-04-22.zip : : true @@ -830,7 +845,7 @@ if [ IsOptionalHaikuImagePackageAdded NetSurf ] { : /boot/apps/netsurf/NetSurf ; if $(HAIKU_INCLUDE_SOURCES) = 1 { InstallSourceArchive netsurf-r9862.7z - : http://www.haiku-files.org/files/sources/2010/netsurf-r9862.7z + : $(baseSourceURL)/2010/netsurf-r9862.7z ; } } @@ -844,11 +859,13 @@ if [ IsOptionalHaikuImagePackageAdded OCaml ] { } else if $(HAIKU_GCC_VERSION[1]) >= 4 && ! $(isHybridBuild) { Echo "No optional package OCaml available for gcc4" ; } else { - InstallOptionalHaikuImagePackage ocaml-3.11.1-r1a1-x86-gcc2-2009-09-06.zip + InstallOptionalHaikuImagePackage + ocaml-3.11.1-r1a1-x86-gcc2-2009-09-06.zip : http://jerome.duval.free.fr/obos/ocaml-3.11.1-r1a1-x86-gcc2-2009-09-06.zip : ; - InstallOptionalHaikuImagePackage camlp5-5.12-r1a1-x86-gcc2-2009-09-06.zip + InstallOptionalHaikuImagePackage + camlp5-5.12-r1a1-x86-gcc2-2009-09-06.zip : http://jerome.duval.free.fr/obos/camlp5-5.12-r1a1-x86-gcc2-2009-09-06.zip : ; @@ -880,7 +897,8 @@ if [ IsOptionalHaikuImagePackageAdded OpenSSH ] { "variable to be set!" ; } - InstallOptionalHaikuImagePackage openssh-5.5p1-r1a2-x86-gcc2-2010-04-22.zip + InstallOptionalHaikuImagePackage + openssh-5.5p1-r1a2-x86-gcc2-2010-04-22.zip : $(baseURL)/openssh-5.5p1-r1a2-x86-gcc2-2010-04-22.zip : ; @@ -917,7 +935,8 @@ if [ IsOptionalHaikuImagePackageAdded P7zip ] { : ; } else { - InstallOptionalHaikuImagePackage p7zip-9.04-r1a2-x86-gcc2-2010-04-22c.zip + InstallOptionalHaikuImagePackage + p7zip-9.04-r1a2-x86-gcc2-2010-04-22c.zip : $(baseURL)/p7zip-9.04-r1a2-x86-gcc2-2010-04-22c.zip : ; @@ -941,7 +960,8 @@ if [ IsOptionalHaikuImagePackageAdded PCRE ] { : $(baseURL)/pcre-7.9-x86-gcc4-2009-09-30.zip ; } else { - InstallOptionalHaikuImagePackage libpcre-8.02-x86-gcc2-2010-04-16.zip + InstallOptionalHaikuImagePackage + libpcre-8.02-x86-gcc2-2010-04-16.zip : $(baseURL)/libpcre-8.02-x86-gcc2-2010-04-16.zip ; } @@ -959,7 +979,8 @@ if [ IsOptionalHaikuImagePackageAdded Pe ] { : $(baseURL)/Pe-2.4.2-x86-gcc4-2009-08-04.zip ; } else { - InstallOptionalHaikuImagePackage Pe-2.4.2-r593-r1a1-x86-gcc2-2009-09-08.zip + InstallOptionalHaikuImagePackage + Pe-2.4.2-r593-r1a1-x86-gcc2-2009-09-08.zip : $(baseURL)/Pe-2.4.2-r593-r1a1-x86-gcc2-2009-09-08.zip ; } @@ -977,7 +998,8 @@ if [ IsOptionalHaikuImagePackageAdded Perl ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Perl available for $(TARGET_ARCH)" ; } else { - InstallOptionalHaikuImagePackage perl-5.10.1-r1a2-x86-gcc2-2010-04-25.zip + InstallOptionalHaikuImagePackage + perl-5.10.1-r1a2-x86-gcc2-2010-04-25.zip : $(baseURL)/perl-5.10.1-r1a2-x86-gcc2-2010-04-25.zip : : true @@ -992,7 +1014,8 @@ if [ IsOptionalHaikuImagePackageAdded Python ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Python available for $(TARGET_ARCH)" ; } else { - InstallOptionalHaikuImagePackage python-2.6.5-r1a2-x86-gcc2-2010-04-25.zip + InstallOptionalHaikuImagePackage + python-2.6.5-r1a2-x86-gcc2-2010-04-25.zip : $(baseURL)/python-2.6.5-r1a2-x86-gcc2-2010-04-25.zip : : true @@ -1007,7 +1030,8 @@ if [ IsOptionalHaikuImagePackageAdded Rsync ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Rsync available for $(TARGET_ARCH)" ; } else { - InstallOptionalHaikuImagePackage rsync-3.0.7-r1a2-x86-gcc2-2010-04-22.zip + InstallOptionalHaikuImagePackage + rsync-3.0.7-r1a2-x86-gcc2-2010-04-22.zip : $(baseURL)/rsync-3.0.7-r1a2-x86-gcc2-2010-04-22.zip : ; @@ -1034,7 +1058,8 @@ if [ IsOptionalHaikuImagePackageAdded SQLite ] { if $(TARGET_ARCH) != x86 { Echo "No optional package SQLite available for $(TARGET_ARCH)" ; } else { - InstallOptionalHaikuImagePackage sqlite-3.6.23-r1a2-x86-gcc2-2010-04-22.zip + InstallOptionalHaikuImagePackage + sqlite-3.6.23-r1a2-x86-gcc2-2010-04-22.zip : $(baseURL)/sqlite-3.6.23-r1a2-x86-gcc2-2010-04-22.zip : : @@ -1049,7 +1074,8 @@ if [ IsOptionalHaikuImagePackageAdded Subversion ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Subversion available for $(TARGET_ARCH)" ; } else { - InstallOptionalHaikuImagePackage subversion-1.6.9-x86-gcc2-2010-04-08.zip + InstallOptionalHaikuImagePackage + subversion-1.6.9-x86-gcc2-2010-04-08.zip : $(baseURL)/subversion-1.6.9-x86-gcc2-2010-04-08.zip : : true @@ -1312,7 +1338,8 @@ if [ IsOptionalHaikuImagePackageAdded XZ-Utils ] { if $(TARGET_ARCH) != x86 { Echo "No optional package XZ-Utils available for $(TARGET_ARCH)" ; } else { - InstallOptionalHaikuImagePackage xz-utils-4.999.9-r1a2-x86-gcc4-2010-04-25.zip + InstallOptionalHaikuImagePackage + xz-utils-4.999.9-r1a2-x86-gcc4-2010-04-25.zip : $(baseURL)/xz-utils-4.999.9-r1a2-x86-gcc4-2010-04-25.zip : :