Ticket #3489: NewOptionalPackages.diff

File NewOptionalPackages.diff, 5.8 KB (added by scottmc, 15 years ago)

  • build/jam/OptionalPackageDependencies

     
    33# For transitive dependencies dependants should be listed before their
    44# dependencies.
    55
     6OptionalPackageDependencies Subversion : OpenSSL APR-util Neon LibIconv SQLite ;
    67OptionalPackageDependencies APR-util : APR ;
    78OptionalPackageDependencies BeHappy : BeBook NetSurf ;
    89OptionalPackageDependencies Development : DevelopmentBase Perl ;
    … …  
    1011OptionalPackageDependencies LibLayout : DevelopmentBase ;
    1112OptionalPackageDependencies NetSurf : OpenSSL ;
    1213OptionalPackageDependencies OpenSSH : OpenSSL ;
    13 OptionalPackageDependencies Subversion : OpenSSL ;
     14

  • build/jam/OptionalPackages

     
    2626#   DevelopmentMin      - development headers, libs, tools, from sources only
    2727#   Firefox
    2828#   KeymapSwitcher
     29#   LibIconv
    2930#   LibLayout
    3031#   Links
     32#   Neon
    3133#   NetSurf
    3234#   OpenSound
    3335#   OpenSSH
    … …  
    3537#   P7zip
    3638#   Pe
    3739#   Perl
     40#   Python
     41#   SQLite
    3842#   Rsync
    3943#   Subversion
    4044#   Tar
    … …  
    5155    if $(TARGET_ARCH) != x86 {
    5256        Echo "No optional package APR available for $(TARGET_ARCH)" ;
    5357    } else {
    54         local baseURL = http://haiku-files.org/files/optional-packages ;
    55         InstallOptionalHaikuImagePackage apr-0.9.17-gcc2-2008-05-20
    56             : $(baseURL)/apr-0.9.17-gcc2-2008-05-20.zip
     58        local baseURL = http://www.haiku-ports.de/packages/dev-libs/apr ;
     59        InstallOptionalHaikuImagePackage apr-1.3.3-gcc2-haiku-2009-05-08
     60            : $(baseURL)/apr-1.3.3-gcc2-haiku-2009-05-08.zip
    5761            :
    5862        ;
    5963    }
    … …  
    6569    if $(TARGET_ARCH) != x86 {
    6670        Echo "No optional package APR-util available for $(TARGET_ARCH)" ;
    6771    } else {
    68         local baseURL = http://haiku-files.org/files/optional-packages ;
    69         InstallOptionalHaikuImagePackage apr-util-0.9.15-gcc2-2008-05-15
    70             : $(baseURL)/apr-util-0.9.15-gcc2-2008-05-15.zip
     72        local baseURL = http://www.haiku-ports.de/packages/dev-libs/apr-util ;
     73        InstallOptionalHaikuImagePackage apr-util-1.3.4-gcc2-haiku-2009-05-08
     74            : $(baseURL)/apr-util-1.3.4-gcc2-haiku-2009-05-08.zip
    7175            :
    7276        ;
    7377    }
    … …  
    347351}
    348352
    349353
     354# LibIconv
     355if [ IsOptionalHaikuImagePackageAdded LibIconv ] {
     356    if $(TARGET_ARCH) != x86 {
     357        Echo "No optional package LibIconv available for $(TARGET_ARCH)" ;
     358    } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
     359        Echo "No optional package LibIconv available for gcc4" ;
     360    } else {
     361        local baseURL = http://www.haiku-ports.de/packages/dev-libs/libiconv ;
     362        InstallOptionalHaikuImagePackage libiconv-1.13-gcc2-haiku-2009-05-22
     363            : $(baseURL)/libiconv-1.13-gcc2-haiku-2009-05-22.zip
     364            :
     365        ;
     366    }
     367}
     368
     369
    350370# LibLayout library
    351371if [ IsOptionalHaikuImagePackageAdded LibLayout ] {
    352372    if $(TARGET_ARCH) != x86 {
    … …  
    380400}
    381401
    382402
     403# Neon
     404if [ IsOptionalHaikuImagePackageAdded Neon ] {
     405    if $(TARGET_ARCH) != x86 {
     406        Echo "No optional package Neon available for $(TARGET_ARCH)" ;
     407    } else {
     408        local baseURL = http://www.haiku-ports.de/packages/net-misc/neon ;
     409        InstallOptionalHaikuImagePackage neon-0.28.4-gcc2-haiku-2009-05-23
     410            : $(baseURL)/neon-0.28.4-gcc2-haiku-2009-05-23.zip
     411            :
     412        ;
     413    }
     414}
     415
     416
    383417# NetSurf web browser
    384418if [ IsOptionalHaikuImagePackageAdded NetSurf ] {
    385419    if $(TARGET_ARCH) != x86 {
    … …  
    421455                "variable to be set!" ;
    422456        }
    423457
    424         local baseURL = http://haiku-files.org/files/optional-packages ;
    425         InstallOptionalHaikuImagePackage openssh-5.0p1-gcc2-2008-05-04-1
    426             : $(baseURL)/openssh-5.0p1-gcc2-2008-05-04-1.zip
     458        local baseURL = http://www.haiku-ports.de/packages/net-misc/openssh ;
     459        InstallOptionalHaikuImagePackage openssh-5.2p1-gcc2-haiku-2009-05-18
     460            : $(baseURL)/openssh-5.2p1-gcc2-haiku-2009-05-18.zip
    427461            :
    428462        ;
    429463
    … …  
    453487    } else if $(HAIKU_GCC_VERSION[1]) >= 4 && $(isHybridBuild) = 0 {
    454488        Echo "No optional package P7zip available for gcc4" ;
    455489    } else {
    456         InstallOptionalHaikuImagePackage p7zip-4.65-gcc2-haiku-2009-05-20
    457             : http://haiku-files.org/files/optional-packages/p7zip-4.65-gcc2-haiku-2009-05-20.zip
     490        local baseURL = http://www.haiku-ports.de/packages/app-arch/p7zip ;
     491        InstallOptionalHaikuImagePackage p7zip-4.65-gcc2-haiku-2009-05-23
     492            : $(baseURL)/p7zip-4.65-gcc2-haiku-2009-05-23.zip
    458493            :
    459494        ;
    460495
    … …  
    510545    }
    511546}
    512547
     548# Python
     549if [ IsOptionalHaikuImagePackageAdded Python ] {
     550    if $(TARGET_ARCH) != x86 {
     551        Echo "No optional package Python available for $(TARGET_ARCH)" ;
     552    } else {
     553        local baseURL = http://www.haiku-ports.de/packages/dev-lang/python ;
     554        InstallOptionalHaikuImagePackage python-2.6.2-gcc2-haiku-2009-05-14
     555            : $(baseURL)/python-2.6.2-gcc2-haiku-2009-05-14.zip
     556            :
     557        ;
     558    }
     559}
    513560
     561
     562# SQLite
     563if [ IsOptionalHaikuImagePackageAdded SQLite ] {
     564    if $(TARGET_ARCH) != x86 {
     565        Echo "No optional package SQLite available for $(TARGET_ARCH)" ;
     566    } else if $(HAIKU_GCC_VERSION[1]) >= 4 {
     567        Echo "No optional package SQLite available for gcc4" ;
     568    } else {
     569        local baseURL = http://www.haiku-ports.de/packages/dev-db/sqlite ;
     570        InstallOptionalHaikuImagePackage sqlite-3.6.14-gcc2-haiku-2009-05-10
     571            : $(baseURL)/sqlite-3.6.14-gcc2-haiku-2009-05-10.zip
     572            :
     573        ;
     574    }
     575}
     576
     577
    514578# Rsync
    515579if [ IsOptionalHaikuImagePackageAdded Rsync ] {
    516580    if $(TARGET_ARCH) != x86 {
    … …  
    530594    if $(TARGET_ARCH) != x86 {
    531595        Echo "No optional package Subversion available for $(TARGET_ARCH)" ;
    532596    } else {
    533         InstallOptionalHaikuImagePackage Subversion
    534             : http://haiku.mlotz.ch/subversion-1.4.6-haiku-20080628.zip
    535             : home
     597        local baseURL = http://www.haiku-ports.de/packages/dev-util/subversion ;
     598        InstallOptionalHaikuImagePackage subversion-1.6.2-gcc2-haiku-2009-05-20
     599            : $(baseURL)/subversion-1.6.2-gcc2-haiku-2009-05-20.zip
     600            :
    536601        ;
    537602    }
    538603}