Author: scottmc Date: 2010-11-02 16:18:59 +0100 (Tue, 02 Nov 2010) New Revision: 39273 Changeset: http://dev.haiku-os.org/changeset/39273 Modified: haiku/trunk/build/jam/OptionalLibPackages haiku/trunk/build/jam/OptionalPackages Log: Fix indentation for box2d Fix url for libevent Changed baselibURL to baseLibURL Modified: haiku/trunk/build/jam/OptionalLibPackages =================================================================== --- haiku/trunk/build/jam/OptionalLibPackages 2010-11-02 15:06:24 UTC (rev 39272) +++ haiku/trunk/build/jam/OptionalLibPackages 2010-11-02 15:18:59 UTC (rev 39273) @@ -27,7 +27,7 @@ # XiphLibs -local baselibURL = http://haiku-files.org/files/optional-packages/lib ; +local baseLibURL = http://haiku-files.org/files/optional-packages/lib ; local baseSourceURL = http://haiku-files.org/files/releases/r1alpha2/sources ; @@ -39,23 +39,23 @@ } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage allegro-4.4.1.1-x86-gcc4-2010-10-30.zip - : $(baselibURL)/allegro-4.4.1.1-x86-gcc4-2010-10-30.zip ; + : $(baseLibURL)/allegro-4.4.1.1-x86-gcc4-2010-10-30.zip ; InstallOptionalHaikuImagePackage dumb-0.9.3-x86-gcc4-2010-10-30.zip - : $(baselibURL)/dumb-0.9.3-x86-gcc4-2010-10-30.zip ; + : $(baseLibURL)/dumb-0.9.3-x86-gcc4-2010-10-30.zip ; InstallOptionalHaikuImagePackage jgmod-0.99-x86-gcc4-2010-10-30.zip - : $(baselibURL)/jgmod-0.99-x86-gcc4-2010-10-30.zip ; + : $(baseLibURL)/jgmod-0.99-x86-gcc4-2010-10-30.zip ; } else { InstallOptionalHaikuImagePackage allegro-4.4.1.1-x86-gcc2-2010-10-30.zip - : $(baselibURL)/allegro-4.4.1.1-x86-gcc2-2010-10-30.zip ; + : $(baseLibURL)/allegro-4.4.1.1-x86-gcc2-2010-10-30.zip ; InstallOptionalHaikuImagePackage dumb-0.9.3-x86-gcc2-2010-10-30.zip - : $(baselibURL)/dumb-0.9.3-x86-gcc2-2010-10-30.zip ; + : $(baseLibURL)/dumb-0.9.3-x86-gcc2-2010-10-30.zip ; InstallOptionalHaikuImagePackage jgmod-0.99-x86-gcc2-2010-10-30.zip - : $(baselibURL)/jgmod-0.99-x86-gcc2-2010-10-30.zip ; + : $(baseLibURL)/jgmod-0.99-x86-gcc2-2010-10-30.zip ; } } @@ -66,12 +66,12 @@ Echo "No optional package box2d available for $(TARGET_ARCH)" ; } else { if $(HAIKU_GCC_VERSION[1]) >= 4 || $(isHybridBuild) { - InstallOptionalHaikuImagePackage - box2d-2.1.2-x86-gcc4-2010-10-30.zip - : $(baselibURL)/box2d-2.1.2-x86-gcc4-2010-10-30.zip - : - : true - ; + InstallOptionalHaikuImagePackage + box2d-2.1.2-x86-gcc4-2010-10-30.zip + : $(baseLibURL)/box2d-2.1.2-x86-gcc4-2010-10-30.zip + : + : true + ; } else { Echo "No optional package box2d available for $(TARGET_ARCH)-gcc2" ; } @@ -86,14 +86,14 @@ } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage fribidi-0.19.2-x86-gcc4-2010-10-30.zip - : $(baselibURL)/fribidi-0.19.2-x86-gcc4-2010-10-30.zip + : $(baseLibURL)/fribidi-0.19.2-x86-gcc4-2010-10-30.zip : : true ; } else { InstallOptionalHaikuImagePackage fribidi-0.19.2-x86-gcc2-2010-10-29.zip - : $(baselibURL)/fribidi-0.19.2-x86-gcc2-2010-10-29.zip + : $(baseLibURL)/fribidi-0.19.2-x86-gcc2-2010-10-29.zip : : true ; @@ -108,14 +108,14 @@ } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage lcms-2.0a-x86-gcc4-2010-10-30.zip - : $(baselibURL)/lcms-2.0a-x86-gcc4-2010-10-30.zip + : $(baseLibURL)/lcms-2.0a-x86-gcc4-2010-10-30.zip : : true ; } else { InstallOptionalHaikuImagePackage lcms-2.0a-x86-gcc2-2010-10-29.zip - : $(baselibURL)/lcms-2.0a-x86-gcc2-2010-10-29.zip + : $(baseLibURL)/lcms-2.0a-x86-gcc2-2010-10-29.zip : : true ; @@ -130,14 +130,14 @@ } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage libart_lgpl-2.3.21-x86-gcc4-2010-10-30.zip - : $(baselibURL)/libart_lgpl-2.3.21-x86-gcc4-2010-10-30.zip + : $(baseLibURL)/libart_lgpl-2.3.21-x86-gcc4-2010-10-30.zip : : true ; } else { InstallOptionalHaikuImagePackage libart_lgpl-2.3.21-x86-gcc2-2010-10-29.zip - : $(baselibURL)/libart_lgpl-2.3.21-x86-gcc2-2010-10-29.zip + : $(baseLibURL)/libart_lgpl-2.3.21-x86-gcc2-2010-10-29.zip : : true ; @@ -152,14 +152,14 @@ } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage libmad-0.15.1-x86-gcc4-2010-10-30.zip - : $(baselibURL)/libmad-0.15.1-x86-gcc4-2010-10-30.zip + : $(baseLibURL)/libmad-0.15.1-x86-gcc4-2010-10-30.zip : : true ; } else { InstallOptionalHaikuImagePackage libmad-0.15.1-x86-gcc2-2010-10-29.zip - : $(baselibURL)/libmad-0.15.1-x86-gcc2-2010-10-29.zip + : $(baseLibURL)/libmad-0.15.1-x86-gcc2-2010-10-29.zip : : true ; @@ -174,14 +174,14 @@ } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage libmikmod-3.1.11-x86-gcc4-2010-10-30.zip - : $(baselibURL)/libmikmod-3.1.11-x86-gcc4-2010-10-30.zip + : $(baseLibURL)/libmikmod-3.1.11-x86-gcc4-2010-10-30.zip : : true ; } else { InstallOptionalHaikuImagePackage libmikmod-3.1.11-x86-gcc2-2010-10-29.zip - : $(baselibURL)/libmikmod-3.1.11-x86-gcc2-2010-10-29.zip + : $(baseLibURL)/libmikmod-3.1.11-x86-gcc2-2010-10-29.zip : : true ; @@ -196,14 +196,14 @@ } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage libmodplug-0.8.7-x86-gcc4-2010-10-30.zip - : $(baselibURL)/libmodplug-0.8.7-x86-gcc4-2010-10-30.zip + : $(baseLibURL)/libmodplug-0.8.7-x86-gcc4-2010-10-30.zip : : true ; } else { InstallOptionalHaikuImagePackage libmodplug-0.8.7-x86-gcc2-2010-10-29.zip - : $(baselibURL)/libmodplug-0.8.7-x86-gcc2-2010-10-29.zip + : $(baseLibURL)/libmodplug-0.8.7-x86-gcc2-2010-10-29.zip : : true ; @@ -218,14 +218,14 @@ } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage libpaper-1.1.24-x86-gcc4-2010-10-30.zip - : $(baselibURL)/libpaper-1.1.24-x86-gcc4-2010-10-30.zip + : $(baseLibURL)/libpaper-1.1.24-x86-gcc4-2010-10-30.zip : : true ; } else { InstallOptionalHaikuImagePackage libpaper-1.1.24-x86-gcc2-2010-10-29.zip - : $(baselibURL)/libpaper-1.1.24-x86-gcc2-2010-10-29.zip + : $(baseLibURL)/libpaper-1.1.24-x86-gcc2-2010-10-29.zip : : true ; @@ -240,14 +240,14 @@ } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage physfs-2.0.1-x86-gcc4-2010-10-30.zip - : $(baselibURL)/physfs-2.0.1-x86-gcc4-2010-10-30.zip + : $(baseLibURL)/physfs-2.0.1-x86-gcc4-2010-10-30.zip : : true ; } else { InstallOptionalHaikuImagePackage physfs-2.0.1-x86-gcc2-2010-10-29.zip - : $(baselibURL)/physfs-2.0.1-x86-gcc2-2010-10-29.zip + : $(baseLibURL)/physfs-2.0.1-x86-gcc2-2010-10-29.zip : : true ; @@ -262,77 +262,77 @@ } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage libsdl-1.2-hg-x86-gcc4-2010-10-30.zip - : $(baselibURL)/libsdl-1.2-hg-x86-gcc4-2010-10-30.zip ; + : $(baseLibURL)/libsdl-1.2-hg-x86-gcc4-2010-10-30.zip ; InstallOptionalHaikuImagePackage guilib-1.2.1-x86-gcc4-2010-10-30.zip - : $(baselibURL)/guilib-1.2.1-x86-gcc4-2010-10-30.zip ; + : $(baseLibURL)/guilib-1.2.1-x86-gcc4-2010-10-30.zip ; InstallOptionalHaikuImagePackage sdl-gfx-2.0.20-x86-gcc4-2010-10-30.zip - : $(baselibURL)/sdl-gfx-2.0.20-x86-gcc4-2010-10-30.zip ; + : $(baseLibURL)/sdl-gfx-2.0.20-x86-gcc4-2010-10-30.zip ; InstallOptionalHaikuImagePackage sdl-image-1.2.10-x86-gcc2-2010-10-30.zip - : $(baselibURL)/sdl-image-1.2.10-x86-gcc4-2010-10-30.zip ; + : $(baseLibURL)/sdl-image-1.2.10-x86-gcc4-2010-10-30.zip ; InstallOptionalHaikuImagePackage sdl-mixer-1.2.11-x86-gcc2-2010-10-30.zip - : $(baselibURL)/sdl-mixer-1.2.11-x86-gcc4-2010-10-30.zip ; + : $(baseLibURL)/sdl-mixer-1.2.11-x86-gcc4-2010-10-30.zip ; InstallOptionalHaikuImagePackage sdl-net-1.2.7-x86-gcc2-2010-10-30.zip - : $(baselibURL)/sdl-net-1.2.7-x86-gcc4-2010-10-30.zip ; + : $(baseLibURL)/sdl-net-1.2.7-x86-gcc4-2010-10-30.zip ; InstallOptionalHaikuImagePackage sdl-sound-1.0.3-x86-gcc2-2010-10-30.zip - : $(baselibURL)/sdl-sound-1.0.3-x86-gcc4-2010-10-30.zip ; + : $(baseLibURL)/sdl-sound-1.0.3-x86-gcc4-2010-10-30.zip ; InstallOptionalHaikuImagePackage sdl-rtf-0.1.0-x86-gcc4-2010-10-30.zip - : $(baselibURL)/sdl-rtf-0.1.0-x86-gcc4-2010-10-30.zip ; + : $(baseLibURL)/sdl-rtf-0.1.0-x86-gcc4-2010-10-30.zip ; InstallOptionalHaikuImagePackage sdl-ttf-2.0.10-x86-gcc4-2010-10-30.zip - : $(baselibURL)/sdl-ttf-2.0.10-x86-gcc4-2010-10-30.zip ; + : $(baseLibURL)/sdl-ttf-2.0.10-x86-gcc4-2010-10-30.zip ; InstallOptionalHaikuImagePackage sge-030809-x86-gcc4-2010-10-30.zip - : $(baselibURL)/sge-030809-x86-gcc4-2010-10-30.zip ; + : $(baseLibURL)/sge-030809-x86-gcc4-2010-10-30.zip ; InstallOptionalHaikuImagePackage smjpeg-0.2.1-x86-gcc4-2010-10-30.zip - : $(baselibURL)/smjpeg-0.2.1-x86-gcc4-2010-10-30.zip ; + : $(baseLibURL)/smjpeg-0.2.1-x86-gcc4-2010-10-30.zip ; InstallOptionalHaikuImagePackage smpeg-0.4.5-x86-gcc4-2010-10-29.zip - : $(baselibURL)/smpeg-0.4.5-x86-gcc4-2010-10-29.zip ; + : $(baseLibURL)/smpeg-0.4.5-x86-gcc4-2010-10-29.zip ; } else { InstallOptionalHaikuImagePackage libsdl-1.2-hg-x86-gcc2-2010-10-29.zip - : $(baselibURL)/libsdl-1.2-hg-x86-gcc2-2010-10-29.zip ; + : $(baseLibURL)/libsdl-1.2-hg-x86-gcc2-2010-10-29.zip ; InstallOptionalHaikuImagePackage guilib-1.2.1-x86-gcc2-2010-10-29.zip - : $(baselibURL)/guilib-1.2.1-x86-gcc2-2010-10-29.zip ; + : $(baseLibURL)/guilib-1.2.1-x86-gcc2-2010-10-29.zip ; InstallOptionalHaikuImagePackage sdl-gfx-2.0.20-x86-gcc2-2010-10-29.zip - : $(baselibURL)/sdl-gfx-2.0.20-x86-gcc2-2010-10-29.zip ; + : $(baseLibURL)/sdl-gfx-2.0.20-x86-gcc2-2010-10-29.zip ; InstallOptionalHaikuImagePackage sdl-image-1.2.10-x86-gcc2-2010-10-29.zip - : $(baselibURL)/sdl-image-1.2.10-x86-gcc2-2010-10-29.zip ; + : $(baseLibURL)/sdl-image-1.2.10-x86-gcc2-2010-10-29.zip ; InstallOptionalHaikuImagePackage sdl-mixer-1.2.11-x86-gcc2-2010-10-29.zip - : $(baselibURL)/sdl-mixer-1.2.11-x86-gcc2-2010-10-29.zip ; + : $(baseLibURL)/sdl-mixer-1.2.11-x86-gcc2-2010-10-29.zip ; InstallOptionalHaikuImagePackage sdl-net-1.2.7-x86-gcc2-2010-10-29.zip - : $(baselibURL)/sdl-net-1.2.7-x86-gcc2-2010-10-29.zip ; + : $(baseLibURL)/sdl-net-1.2.7-x86-gcc2-2010-10-29.zip ; InstallOptionalHaikuImagePackage sdl-sound-1.0.3-x86-gcc2-2010-10-29.zip - : $(baselibURL)/sdl-sound-1.0.3-x86-gcc2-2010-10-29.zip ; + : $(baseLibURL)/sdl-sound-1.0.3-x86-gcc2-2010-10-29.zip ; InstallOptionalHaikuImagePackage sdl-rtf-0.1.0-x86-gcc2-2010-10-29.zip - : $(baselibURL)/sdl-rtf-0.1.0-x86-gcc2-2010-10-29.zip ; + : $(baseLibURL)/sdl-rtf-0.1.0-x86-gcc2-2010-10-29.zip ; InstallOptionalHaikuImagePackage sdl-ttf-2.0.10-x86-gcc2-2010-10-29.zip - : $(baselibURL)/sdl-ttf-2.0.10-x86-gcc2-2010-10-29.zip ; + : $(baseLibURL)/sdl-ttf-2.0.10-x86-gcc2-2010-10-29.zip ; InstallOptionalHaikuImagePackage sge-030809-x86-gcc2-2010-10-29.zip - : $(baselibURL)/sge-030809-x86-gcc2-2010-10-29.zip ; + : $(baseLibURL)/sge-030809-x86-gcc2-2010-10-29.zip ; InstallOptionalHaikuImagePackage smjpeg-0.2.1-x86-gcc2-2010-10-29.zip - : $(baselibURL)/smjpeg-0.2.1-x86-gcc2-2010-10-29.zip ; + : $(baseLibURL)/smjpeg-0.2.1-x86-gcc2-2010-10-29.zip ; InstallOptionalHaikuImagePackage smpeg-0.4.5-x86-gcc2-2010-10-29.zip - : $(baselibURL)/smpeg-0.4.5-x86-gcc2-2010-10-29.zip ; + : $(baseLibURL)/smpeg-0.4.5-x86-gcc2-2010-10-29.zip ; } } @@ -344,47 +344,47 @@ } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage flac-1.2.1-x86-gcc4-2010-10-30.zip - : $(baselibURL)/flac-1.2.1-x86-gcc4-2010-10-30.zip ; + : $(baseLibURL)/flac-1.2.1-x86-gcc4-2010-10-30.zip ; InstallOptionalHaikuImagePackage libao-1.0.0-x86-gcc4-2010-10-30.zip - : $(baselibURL)/libao-1.0.0-x86-gcc4-2010-10-30.zip ; + : $(baseLibURL)/libao-1.0.0-x86-gcc4-2010-10-30.zip ; InstallOptionalHaikuImagePackage libogg-1.2.0-x86-gcc4-2010-10-30.zip - : $(baselibURL)/libogg-1.2.0-x86-gcc4-2010-10-30.zip ; + : $(baseLibURL)/libogg-1.2.0-x86-gcc4-2010-10-30.zip ; InstallOptionalHaikuImagePackage libtheora-1.1.1-x86-gcc4-2010-10-30.zip - : $(baselibURL)/libtheora-1.1.1-x86-gcc4-2010-10-30.zip ; + : $(baseLibURL)/libtheora-1.1.1-x86-gcc4-2010-10-30.zip ; InstallOptionalHaikuImagePackage libvorbis-1.3.1-x86-gcc4-2010-10-30.zip - : $(baselibURL)/libvorbis-1.3.1-x86-gcc4-2010-10-30.zip ; + : $(baseLibURL)/libvorbis-1.3.1-x86-gcc4-2010-10-30.zip ; InstallOptionalHaikuImagePackage speex-1.2-git-x86-gcc4-2010-10-30.zip - : $(baselibURL)/speex-1.2-git-x86-gcc4-2010-10-30.zip ; + : $(baseLibURL)/speex-1.2-git-x86-gcc4-2010-10-30.zip ; InstallOptionalHaikuImagePackage vorbis-tools-1.4.0-x86-gcc4-2010-10-30.zip - : $(baselibURL)/vorbis-tools-1.4.0-x86-gcc4-2010-10-30.zip ; + : $(baseLibURL)/vorbis-tools-1.4.0-x86-gcc4-2010-10-30.zip ; } else { InstallOptionalHaikuImagePackage flac-1.2.1-x86-gcc2-2010-10-29.zip - : $(baselibURL)/flac-1.2.1-x86-gcc2-2010-10-29.zip ; + : $(baseLibURL)/flac-1.2.1-x86-gcc2-2010-10-29.zip ; InstallOptionalHaikuImagePackage libao-1.0.0-x86-gcc2-2010-10-29.zip - : $(baselibURL)/libao-1.0.0-x86-gcc2-2010-10-29.zip ; + : $(baseLibURL)/libao-1.0.0-x86-gcc2-2010-10-29.zip ; InstallOptionalHaikuImagePackage libogg-1.2.0-x86-gcc2-2010-10-29.zip - : $(baselibURL)/libogg-1.2.0-x86-gcc2-2010-10-29.zip ; + : $(baseLibURL)/libogg-1.2.0-x86-gcc2-2010-10-29.zip ; InstallOptionalHaikuImagePackage libtheora-1.1.1-x86-gcc2-2010-10-29.zip - : $(baselibURL)/libtheora-1.1.1-x86-gcc2-2010-10-29.zip ; + : $(baseLibURL)/libtheora-1.1.1-x86-gcc2-2010-10-29.zip ; InstallOptionalHaikuImagePackage libvorbis-1.3.1-x86-gcc2-2010-10-29.zip - : $(baselibURL)/libvorbis-1.3.1-x86-gcc2-2010-10-29.zip ; + : $(baseLibURL)/libvorbis-1.3.1-x86-gcc2-2010-10-29.zip ; InstallOptionalHaikuImagePackage speex-1.2-git-x86-gcc2-2010-10-29.zip - : $(baselibURL)/speex-1.2-git-x86-gcc2-2010-10-29.zip ; + : $(baseLibURL)/speex-1.2-git-x86-gcc2-2010-10-29.zip ; InstallOptionalHaikuImagePackage vorbis-tools-1.4.0-x86-gcc2-2010-10-29.zip - : $(baselibURL)/vorbis-tools-1.4.0-x86-gcc2-2010-10-29.zip ; + : $(baseLibURL)/vorbis-tools-1.4.0-x86-gcc2-2010-10-29.zip ; } } Modified: haiku/trunk/build/jam/OptionalPackages =================================================================== --- haiku/trunk/build/jam/OptionalPackages 2010-11-02 15:06:24 UTC (rev 39272) +++ haiku/trunk/build/jam/OptionalPackages 2010-11-02 15:18:59 UTC (rev 39273) @@ -94,6 +94,7 @@ # Yasm - the assembler utility local baseURL = http://haiku-files.org/files/optional-packages ; +local baseLibURL = http://haiku-files.org/files/optional-packages ; local baseSourceURL = http://haiku-files.org/files/releases/r1alpha2/sources ; # ABI-compliance-checker @@ -935,14 +936,14 @@ if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage libevent-1.4.13-x86-gcc4-2010-10-30.zip - : $(baseURL)/libevent-1.4.13-x86-gcc4-2010-10-30.zip + : $(baseLibURL)/libevent-1.4.13-x86-gcc4-2010-10-30.zip : : true ; } else { InstallOptionalHaikuImagePackage libevent-1.4.13-x86-gcc2-2010-10-29.zip - : $(baseURL)/libevent-1.4.13-x86-gcc2-2010-10-29.zip + : $(baseLibURL)/libevent-1.4.13-x86-gcc2-2010-10-29.zip : : true ;