Ticket #3489: New.OptionalPackages.diff

File New.OptionalPackages.diff, 8.7 KB (added by scottmc, 15 years ago)

improved patch, fixed path for nano. Still testing, so hold off on applying till the results are in.

  • build/jam/OptionalPackageDependencies

     
    33# For transitive dependencies dependants should be listed before their
    44# dependencies.
    55
     6OptionalPackageDependencies Subversion : APR-util Neon LibIconv LibXML2 OpenSSL 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

     
    2020#   BeOSCompatibility
    2121#   BePDF
    2222#   Bluetooth
     23#   CDRecord
    2324#   CVS
    2425#   Development         - more complete dev environment (including autotools)
    2526#   DevelopmentBase     - basic development environment (gcc, headers, libs,...)
    2627#   DevelopmentMin      - development headers, libs, tools, from sources only
    2728#   Firefox
    2829#   KeymapSwitcher
     30#   LibIconv
    2931#   LibLayout
     32#   LibXML2
    3033#   Links
     34#   Nano
     35#   Neon
    3136#   NetSurf
    3237#   OpenSound
    3338#   OpenSSH
    … …  
    3540#   P7zip
    3641#   Pe
    3742#   Perl
     43#   Python
    3844#   Rsync
     45#   SQLite
    3946#   Subversion
    4047#   Tar
    4148#   UserlandFS
    … …  
    5158    if $(TARGET_ARCH) != x86 {
    5259        Echo "No optional package APR available for $(TARGET_ARCH)" ;
    5360    } 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
     61        local baseURL = http://www.haiku-ports.de/packages/dev-libs/apr ;
     62        InstallOptionalHaikuImagePackage apr-1.3.3-gcc2-haiku-2009-05-27
     63            : $(baseURL)/apr-1.3.3-gcc2-haiku-2009-05-27.zip
    5764            :
    5865        ;
    5966    }
    … …  
    6572    if $(TARGET_ARCH) != x86 {
    6673        Echo "No optional package APR-util available for $(TARGET_ARCH)" ;
    6774    } 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
     75        local baseURL = http://www.haiku-ports.de/packages/dev-libs/apr-util ;
     76        InstallOptionalHaikuImagePackage apr-util-1.3.4-gcc2-haiku-2009-05-27
     77            : $(baseURL)/apr-util-1.3.4-gcc2-haiku-2009-05-27.zip
    7178            :
    7279        ;
    7380    }
    … …  
    179186}
    180187
    181188
     189# CDRecord
     190if [ IsOptionalHaikuImagePackageAdded CDRecord ] {
     191    if $(TARGET_ARCH) != x86 {
     192        Echo "No optional package CDRecord available for $(TARGET_ARCH)" ;
     193    } else {
     194        local baseURL = http://www.haiku-ports.de/packages ;
     195        InstallOptionalHaikuImagePackage cdrecord-2.01.01a59-gcc2-haiku-2009-05-26
     196            : $(baseURL)/app-cdr/cdrtools/cdrecord-2.01.01a59-gcc2-haiku-2009-05-26.zip
     197            :
     198        ;
     199    }
     200}
     201
     202
    182203# CVS
    183204if [ IsOptionalHaikuImagePackageAdded CVS ] {
    184205    if $(TARGET_ARCH) != x86 {
    … …  
    242263    local baseURL = http://haiku-files.org/files/optional-packages ;
    243264    InstallOptionalHaikuImagePackage bison-2.4-gcc2-2008-11-09
    244265        : $(baseURL)/bison-2.4-gcc2-2008-11-09.zip ;
    245     InstallOptionalHaikuImagePackage flex-2.5.35-gcc2-2008-11-09
    246         : $(baseURL)/flex-2.5.35-gcc2-2008-11-09.zip ;
    247     InstallOptionalHaikuImagePackage jam-haiku-gcc2-2008-03-27-2
    248         : $(baseURL)/jam-haiku-gcc2-2008-03-27-2.zip ;
    249266    InstallOptionalHaikuImagePackage m4-1.4.12-gcc2-2008-11-04
    250267        : $(baseURL)/m4-1.4.12-gcc2-2008-11-04.zip ;
     268    local baseURL = http://www.haiku-ports.de/packages ;       
     269    InstallOptionalHaikuImagePackage flex-2.5.35-gcc2-haiku-2009-05-26
     270        : $(baseURL)/sys-devel/flex/flex-2.5.35-gcc2-haiku-2009-05-26.zip ;
     271    InstallOptionalHaikuImagePackage jam-gcc2-haiku-2009-05-26
     272        : $(baseURL)/dev-util/jam/jam-gcc2-haiku-2009-05-26.zip ;
     273
    251274}
    252275
    253276
    … …  
    359382    if $(TARGET_ARCH) != x86 {
    360383        Echo "No optional package Firefox available for $(TARGET_ARCH)" ;
    361384    } else if $(HAIKU_GCC_VERSION[1]) >= 4 && $(isHybridBuild) = 0 {
     385        local baseURL = http://haiku-files.org/files/optional-packages ;
    362386        InstallOptionalHaikuImagePackage BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01
    363             : http://haiku-files.org/files/optional-packages/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip
     387            : $(baseURL)/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip
    364388            : apps
    365389        ;
    366390        AddSymlinkToHaikuImage home config be Applications
    … …  
    396420}
    397421
    398422
     423# LibIconv
     424if [ IsOptionalHaikuImagePackageAdded LibIconv ] {
     425    if $(TARGET_ARCH) != x86 {
     426        Echo "No optional package LibIconv available for $(TARGET_ARCH)" ;
     427    } else {
     428        local baseURL = http://www.haiku-ports.de/packages/dev-libs/libiconv ;
     429        InstallOptionalHaikuImagePackage libiconv-1.13-gcc2-haiku-2009-05-27
     430            : $(baseURL)/libiconv-1.13-gcc2-haiku-2009-05-27.zip
     431            :
     432        ;
     433    }
     434}
     435
     436
    399437# LibLayout library
    400438if [ IsOptionalHaikuImagePackageAdded LibLayout ] {
    401439    if $(TARGET_ARCH) != x86 {
    … …  
    412450}
    413451
    414452
     453# LibXML2
     454if [ IsOptionalHaikuImagePackageAdded LibXML2 ] {
     455    if $(TARGET_ARCH) != x86 {
     456        Echo "No optional package LibXML2 available for $(TARGET_ARCH)" ;
     457    } else {
     458        local baseURL = http://www.haiku-ports.de/packages/dev-libs/libxml2 ;
     459        InstallOptionalHaikuImagePackage libxml2-2.7.3-gcc2-haiku-2009-05-27
     460            : $(baseURL)/libxml2-2.7.3-gcc2-haiku-2009-05-27.zip
     461            :
     462        ;
     463    }
     464}
     465
     466
    415467# Links web browser
    416468if [ IsOptionalHaikuImagePackageAdded Links ] {
    417469    if $(TARGET_ARCH) != x86 {
    … …  
    429481}
    430482
    431483
     484# Nano
     485if [ IsOptionalHaikuImagePackageAdded Nano ] {
     486    if $(TARGET_ARCH) != x86 {
     487        Echo "No optional package Nano available for $(TARGET_ARCH)" ;
     488    } else {
     489        local baseURL = http://www.haiku-ports.de/packages ;
     490        InstallOptionalHaikuImagePackage nano-2.0.9-gcc2-haiku-2009-05-27
     491            : $(baseURL)/app-editors/nano/nano-2.0.9-gcc2-haiku-2009-05-27.zip
     492            :
     493        ;
     494    }
     495}
     496
     497
     498# Neon
     499if [ IsOptionalHaikuImagePackageAdded Neon ] {
     500    if $(TARGET_ARCH) != x86 {
     501        Echo "No optional package Neon available for $(TARGET_ARCH)" ;
     502    } else {
     503        local baseURL = http://www.haiku-ports.de/packages/net-misc/neon ;
     504        InstallOptionalHaikuImagePackage neon-0.28.4-gcc2-haiku-2009-05-23
     505            : $(baseURL)/neon-0.28.4-gcc2-haiku-2009-05-23.zip
     506            :
     507        ;
     508    }
     509}
     510
     511
    432512# NetSurf web browser
    433513if [ IsOptionalHaikuImagePackageAdded NetSurf ] {
    434514    if $(TARGET_ARCH) != x86 {
    … …  
    470550                "variable to be set!" ;
    471551        }
    472552
    473         local baseURL = http://haiku-files.org/files/optional-packages ;
    474         InstallOptionalHaikuImagePackage openssh-5.0p1-gcc2-2008-05-04-1
    475             : $(baseURL)/openssh-5.0p1-gcc2-2008-05-04-1.zip
     553        local baseURL = http://www.haiku-ports.de/packages/net-misc/openssh ;
     554        InstallOptionalHaikuImagePackage openssh-5.2p1-gcc2-haiku-2009-05-27
     555            : $(baseURL)/openssh-5.2p1-gcc2-haiku-2009-05-27.zip
    476556            :
    477557        ;
    478558
    … …  
    502582    } else if $(HAIKU_GCC_VERSION[1]) >= 4 && $(isHybridBuild) = 0 {
    503583        Echo "No optional package P7zip available for gcc4" ;
    504584    } else {
    505         InstallOptionalHaikuImagePackage p7zip-4.65-gcc2-haiku-2009-05-20
    506             : http://haiku-files.org/files/optional-packages/p7zip-4.65-gcc2-haiku-2009-05-20.zip
     585        local baseURL = http://www.haiku-ports.de/packages/app-arch/p7zip ;
     586        InstallOptionalHaikuImagePackage p7zip-4.65-gcc2-haiku-2009-05-24
     587            : $(baseURL)/p7zip-4.65-gcc2-haiku-2009-05-24.zip
    507588            :
    508589        ;
    509590
    … …  
    560641}
    561642
    562643
     644# Python
     645if [ IsOptionalHaikuImagePackageAdded Python ] {
     646    if $(TARGET_ARCH) != x86 {
     647        Echo "No optional package Python available for $(TARGET_ARCH)" ;
     648    } else {
     649        local baseURL = http://www.haiku-ports.de/packages/dev-lang/python ;
     650        InstallOptionalHaikuImagePackage python-2.6.2-gcc2-haiku-2009-05-27
     651            : $(baseURL)/python-2.6.2-gcc2-haiku-2009-05-27.zip
     652            :
     653        ;
     654    }
     655}
     656
     657
     658# SQLite
     659if [ IsOptionalHaikuImagePackageAdded SQLite ] {
     660    if $(TARGET_ARCH) != x86 {
     661        Echo "No optional package SQLite available for $(TARGET_ARCH)" ;
     662    } else {
     663        local baseURL = http://www.haiku-ports.de/packages/dev-db/sqlite ;
     664        InstallOptionalHaikuImagePackage sqlite-3.6.14-gcc2-haiku-2009-05-10
     665            : $(baseURL)/sqlite-3.6.14-gcc2-haiku-2009-05-10.zip
     666            :
     667        ;
     668    }
     669}
     670
     671
    563672# Rsync
    564673if [ IsOptionalHaikuImagePackageAdded Rsync ] {
    565674    if $(TARGET_ARCH) != x86 {
    … …  
    579688    if $(TARGET_ARCH) != x86 {
    580689        Echo "No optional package Subversion available for $(TARGET_ARCH)" ;
    581690    } else {
    582         InstallOptionalHaikuImagePackage Subversion
    583             : http://haiku.mlotz.ch/subversion-1.4.6-haiku-20080628.zip
    584             : home
     691        local baseURL = http://www.haiku-ports.de/packages/dev-util/subversion ;
     692        InstallOptionalHaikuImagePackage subversion-1.6.2-gcc2-haiku-2009-05-20
     693            : $(baseURL)/subversion-1.6.2-gcc2-haiku-2009-05-20.zip
     694            :
    585695        ;
    586696    }
    587697}