Changeset 66285


Ignore:
Timestamp:
Apr 8, 2010, 8:09:09 AM (10 years ago)
Author:
jmr@…
Message:

adapt portfiles to removal of platforms as variants

Location:
trunk/dports
Files:
36 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/devel/boost/Portfile

    r63530 r66285  
    190190        }
    191191
    192         if {![variant_isset powerpc]} {
     192        if {${os.arch} != "powerpc"} {
    193193            build.args-append   --disable-long-double
    194194        }
  • trunk/dports/devel/codeblocks-devel/Portfile

    r57378 r66285  
    4343
    4444platform macosx {}
    45 if { [variant_isset macosx] && ![variant_isset x11] } { default_variants +aqua }
    46 if { [variant_isset puredarwin] } { default_variants +x11 }
    47 if { [variant_isset freebsd] } { default_variants +x11 }
     45if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx"))
     46     && ![variant_isset x11] } {
     47    default_variants +aqua
     48} else {
     49    default_variants +x11
     50}
    4851
    49 variant aqua requires macosx description "Use the wxMac port of wxWidgets" {
     52if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx")) } {
     53variant aqua conflicts x11 description "Use the wxMac port of wxWidgets" {
    5054        depends_lib port:wxWidgets
    5155
     
    9094    }
    9195}
     96}
    9297
    93 variant x11 conflicts aqua description "Use the wxGTK port of wxWidgets" {
     98variant x11 description "Use the wxGTK port of wxWidgets" {
    9499        depends_lib port:wxgtk
    95100}
  • trunk/dports/devel/codeblocks/Portfile

    r50980 r66285  
    3636
    3737platform macosx {}
    38 if { [variant_isset macosx] && ![variant_isset x11] } { default_variants +aqua }
    39 if { [variant_isset puredarwin] } { default_variants +x11 }
    40 if { [variant_isset freebsd] } { default_variants +x11 }
     38if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx"))
     39     && ![variant_isset x11] } {
     40    default_variants +aqua
     41} else {
     42    default_variants +x11
     43}
    4144
    42 variant aqua requires macosx description "Use the wxMac port of wxWidgets" {
     45if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx")) } {
     46variant aqua conflicts x11 description "Use the wxMac port of wxWidgets" {
    4347        depends_lib port:wxWidgets
    4448
     
    8387    }
    8488}
     89}
    8590
    86 variant x11 conflicts aqua description "Use the wxGTK port of wxWidgets" {
     91variant x11 description "Use the wxGTK port of wxWidgets" {
    8792        depends_lib port:wxgtk
    8893
  • trunk/dports/devel/nu/Portfile

    r57375 r66285  
    3737livecheck.regex     {Nu-([\d.]+).tgz}
    3838
    39 platform darwin 8 {
    40     # set up the variant for pre-build
    41 }
    42 
    4339variant universal {
    4440    patchfiles-delete patch-libffi-single-arch
     
    5551
    5652pre-build {
    57     if {[variant_isset darwin_8]} {
     53    if {${os.platform} == "darwin" && ${os.major} == 8} {
    5854        ui_info "$UI_PREFIX Building libffi"
    5955        system "cd ${worksrcpath}/libffi && rake"
  • trunk/dports/devel/wxstedit/Portfile

    r50980 r66285  
    3939
    4040platform macosx {}
    41 if { [variant_isset macosx] && ![variant_isset x11] } { default_variants +aqua }
    42 if { [variant_isset puredarwin] } { default_variants +x11 }
    43 if { [variant_isset freebsd] } { default_variants +x11 }
     41if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx"))
     42     && ![variant_isset x11] } {
     43    default_variants +aqua
     44} else {
     45    default_variants +x11
     46}
    4447
    45 variant aqua requires macosx description "Use the wxMac port of wxWidgets" {
     48if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx")) } {
     49variant aqua conflicts x11 description "Use the wxMac port of wxWidgets" {
    4650depends_lib             port:wxWidgets
    4751}
     52}
    4853
    49 variant x11 conflicts aqua description "Use the wxGTK port of wxWidgets" {
     54variant x11 description "Use the wxGTK port of wxWidgets" {
    5055depends_lib             port:wxgtk
    5156}
  • trunk/dports/games/liquidwar/Portfile

    r64520 r66285  
    3434}
    3535
    36 platform darwin 10 {}
    37 if {[variant_isset darwin_10]} {
     36if {$build_arch == "x86_64} {
    3837    # Allegro does not compile 64-bit due to NS* stuff, so we have to do i386
    3938    configure.build_arch i386
     39} elseif {$build_arch == "ppc64"} {
     40    configure.build_arch ppc
    4041}
    4142
  • trunk/dports/graphics/Coin/Portfile

    r65707 r66285  
    3838}
    3939
    40 variant aqua requires darwin {
     40if {${os.platform} == "darwin"} {
     41variant aqua {
    4142        configure.args-delete   --disable-framework --enable-darwin-x11
    4243        configure.args-append   --with-framework=${destroot}/Library/Frameworks  --without-x
     
    4445                                port:xorg-libXext \
    4546                                port:xorg-libXt
     47}
    4648}
    4749
  • trunk/dports/graphics/cairo-devel/Portfile

    r63990 r66285  
    9797
    9898platform macosx {}
    99 variant quartz requires macosx {
     99if {([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx"))} {
     100variant quartz {
    100101    configure.args-delete \
    101102        --disable-quartz \
     
    106107        --enable-quartz-font \
    107108        --enable-quartz-image
     109}
    108110}
    109111
  • trunk/dports/graphics/cairo/Portfile

    r63991 r66285  
    9797
    9898platform macosx {}
    99 variant quartz requires macosx {
     99if {([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx"))} {
     100variant quartz {
    100101    configure.args-delete \
    101102        --disable-quartz \
     
    106107        --enable-quartz-font \
    107108        --enable-quartz-image
     109}
    108110}
    109111
  • trunk/dports/graphics/wxLua/Portfile

    r50980 r66285  
    4545
    4646platform macosx {}
    47 if { [variant_isset macosx] && ![variant_isset x11] } { default_variants +aqua }
    48 if { [variant_isset puredarwin] } { default_variants +x11 }
    49 if { [variant_isset freebsd] } { default_variants +x11 }
     47if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx"))
     48     && ![variant_isset x11] } {
     49    default_variants +aqua
     50} else {
     51    default_variants +x11
     52}
    5053
    51 variant aqua requires macosx description "Use the wxMac port of wxWidgets" {
     54if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx")) } {
     55variant aqua conflicts x11 description "Use the wxMac port of wxWidgets" {
    5256
    5357depends_lib-append      port:wxWidgets
     
    8286
    8387}
     88}
    8489
    85 variant x11 conflicts aqua description "Use the wxGTK port of wxWidgets" {
     90variant x11 description "Use the wxGTK port of wxWidgets" {
    8691
    8792depends_lib-append      port:wxgtk
  • trunk/dports/java/unicodeconverter-java/Portfile

    r32256 r66285  
    4646                ${destroot}${prefix}/share/doc/${name}
    4747        # Build a nice .app
    48         if {[variant_isset darwin]} {
     48        if {${os.platform} == "darwin"} {
    4949                set ucAppPath ${destroot}/Applications/MacPorts/UnicodeConverter.app
    5050                # Build paths
     
    6969        }
    7070}
    71 
    72 # So it gets set, when applicable
    73 platform darwin {
    74 }
    75 
  • trunk/dports/lang/apple-gcc33/Portfile

    r61327 r66285  
    5454livecheck.url   ${master_sites}
    5555
    56 platform i386 {}
    57 
    5856pre-fetch {
    59         if {[variant_isset i386]} {
     57        if {${os.arch} == "i386"} {
    6058                return -code error "${name} is not supported on Intel Macs!"
    6159        }
  • trunk/dports/lang/clisp/Portfile

    r61269 r66285  
    5050}
    5151
    52 platform darwin {
    53     # placeholder for use with variant_isset
    54 }
    55 
    5652platform darwin 7 {
    5753    depends_lib-delete      port:libsigsegv
  • trunk/dports/lang/g95/Portfile

    r65977 r66285  
    2020                http://ftp.g95.org/v${version}/:g95
    2121
    22 platform darwin 10 {}
    23 if {[variant_isset darwin_10]||${build_arch}=="ppc64"||${build_arch}=="x86_64"} {
     22if {(${os.platform} == "darwin" && ${os.major} == 10)||${build_arch}=="ppc64"||${build_arch}=="x86_64"} {
    2423    default_variants +gcc42
    2524}
     
    7877    file mkdir ${workpath}/gcc-${version_gcc}/${name}
    7978    reinplace "s|tjmp %%edx|tjmp *%%edx|" ${workpath}/gcc-${version_gcc}/gcc/config/i386/i386.c
    80     if {![variant_isset darwin_8]} {
     79    if {${os.major} != 8} {
    8180        reinplace "s|i686|i386|" ${workpath}/gcc-${version_gcc}/gcc/config/i386/darwin.h
    8281        set gcc_configargs "--with-as=/usr/bin/as --with-ld=/usr/bin/ld --with-nm=/usr/bin/nm"
  • trunk/dports/lang/php4/Portfile

    r64763 r66285  
    116116
    117117variant apache conflicts apache2 apache20 no_web description {Add Apache 1 web server module} {
    118     if { ! [variant_isset macosx] } {
     118    if { ! [variant_isset macosx] && (![info exists os.subplatform] || ${os.subplatform} != "macosx") } {
    119119        depends_lib-append \
    120120            port:apache
     
    330330        # with the options specified in the apache, apache2 and apache20 variants.
    331331        if { [variant_isset apache] } {
    332             if { ![variant_isset macosx] } {
     332            if { ![variant_isset macosx] && (![info exists os.subplatform] || ${os.subplatform} != "macosx") } {
    333333                configure.args-delete \
    334334                    --with-apxs=${prefix}/sbin/apxs
  • trunk/dports/lang/php5-devel/Portfile

    r64459 r66285  
    115115# in sync with those in the relevant part of the post-destroot phase.
    116116variant apache conflicts apache2 no_web description {Add Apache 1 web server module} {
    117     if { ! [variant_isset macosx] } {
     117    if { ! [variant_isset macosx] && (![info exists os.subplatform] || ${os.subplatform} != "macosx") } {
    118118        depends_lib-append \
    119119            port:apache
     
    265265        # with the options specified in the apache and apache2 variants.
    266266        if { [variant_isset apache] } {
    267             if { ![variant_isset macosx] } {
     267            if { ![variant_isset macosx] && (![info exists os.subplatform] || ${os.subplatform} != "macosx") } {
    268268                configure.args-delete \
    269269                    --with-apxs=${prefix}/sbin/apxs
  • trunk/dports/lang/php5/Portfile

    r64457 r66285  
    113113# in sync with those in the relevant part of the post-destroot phase.
    114114variant apache conflicts apache2 no_web description {Add Apache 1 web server module} {
    115     if { ! [variant_isset macosx] } {
     115    if { ! [variant_isset macosx] && (![info exists os.subplatform] || ${os.subplatform} != "macosx") } {
    116116        depends_lib-append \
    117117            port:apache
     
    262262        # with the options specified in the apache and apache2 variants.
    263263        if { [variant_isset apache] } {
    264             if { ![variant_isset macosx] } {
     264            if { ![variant_isset macosx] && (![info exists os.subplatform] || ${os.subplatform} != "macosx") } {
    265265                configure.args-delete \
    266266                    --with-apxs=${prefix}/sbin/apxs
  • trunk/dports/lang/php52/Portfile

    r64763 r66285  
    129129# in sync with those in the relevant part of the post-destroot phase.
    130130variant apache conflicts apache2 no_web description {Add Apache 1 web server module} {
    131     if { ! [variant_isset macosx] } {
     131    if { ! [variant_isset macosx] && (![info exists os.subplatform] || ${os.subplatform} != "macosx") } {
    132132        depends_lib-append \
    133133            port:apache
     
    412412        # with the options specified in the apache and apache2 variants.
    413413        if { [variant_isset apache] } {
    414             if { ![variant_isset macosx] } {
     414            if { ![variant_isset macosx] && (![info exists os.subplatform] || ${os.subplatform} != "macosx") } {
    415415                configure.args-delete \
    416416                    --with-apxs=${prefix}/sbin/apxs
  • trunk/dports/math/fftw-single/Portfile

    r30237 r66285  
    4141        configure.args-delete   --disable-fortran
    4242        configure.args-append   --enable-fortran
    43         if {[variant_isset darwin]} {
     43        if {${os.platform} == "darwin"} {
    4444                patchfiles-append       patch-configure_darwin
    4545        }
  • trunk/dports/math/maxima/Portfile

    r63245 r66285  
    4747                --enable-sbcl
    4848
    49 variant clisp conflicts darwin i386 description {Use CLISP instead of SBCL for Lisp} {
     49if {${os.platform} != "darwin" && ${os.arch} != "i386"} {
     50variant clisp description {Use CLISP instead of SBCL for Lisp} {
    5051    depends_lib-delete  port:sbcl
    5152    depends_lib-append  port:clisp
    5253    configure.args-delete --enable-sbcl
    5354    configure.args-append --enable-clisp
     55}
    5456}
    5557
  • trunk/dports/net/nefu/Portfile

    r32777 r66285  
    6060
    6161        # nefu start/stop rc script (if non-Darwin)
    62         if {![variant_isset darwin]} {
     62        if {${os.platform} != "darwin"} {
    6363                xinstall -d -m 0755 ${destroot}${prefix}/etc/rc.d
    6464                xinstall -m 0755 ${filespath}/nefu.sh.in \
  • trunk/dports/net/radmind/Portfile

    r33806 r66285  
    5757
    5858        # radmind start/stop rc script (if non-Darwin)
    59         if {![variant_isset darwin]} {
     59        if {${os.platform} != "darwin"} {
    6060                xinstall -d -m 0755 ${destroot}${prefix}/etc/rc.d
    6161                xinstall -m 0755 ${filespath}/radmind.sh.in \
  • trunk/dports/net/tuntaposx/Portfile

    r58583 r66285  
    6262}
    6363
    64 platform darwin 10 {}
    65 if {[variant_isset darwin_10]} {
     64if {${os.platform} == "darwin" && ${os.major} == 10} {
    6665    # Kernel can be 32-bit or 64-bit, so build both
    6766    default_variants +universal
  • trunk/dports/print/ghostscript-fonts-hiragino/Portfile

    r63690 r66285  
    2222
    2323destroot {
    24     if {[variant_isset darwin_8]} {
     24    if {${os.platform} == "darwin" && ${os.major} == 8} {
    2525        set FontList {"/System/Library/Fonts/ヒラギノ角ゴ Pro W3.otf"  HiraKakuPro-W3     Adobe-Japan1 {GothicBBB-Medium}
    2626                      "/System/Library/Fonts/ヒラギノ角ゴ Pro W6.otf"  HiraKakuPro-W6     Adobe-Japan1 {FutoGoB101-Bold}
     
    4242                      "/System/Library/Fonts/ヒラギノ明朝 ProN W3.otf" HiraMinProN-W3     Adobe-Japan1 {}
    4343                      "/System/Library/Fonts/ヒラギノ明朝 ProN W6.otf" HiraMinProN-W6     Adobe-Japan1 {}}
    44         if {[variant_isset darwin_10]} {
     44        if {${os.platform} == "darwin" && ${os.major} == 10} {
    4545            lappend FontList \
    4646                      "/Library/Fonts/Hiragino Sans GB W3.otf"         HiraginoSansGB-W3  Adobe-GB1    {} \
     
    276276}
    277277
    278 platform darwin 8 {}
    279 platform darwin 10 {}
    280 
    281278variant no_alias description "Do not use Hiragino as an alternative to Morisawa's standard 5 fonts" {}
    282279
  • trunk/dports/sysutils/anacron/Portfile

    r30254 r66285  
    4949
    5050        # Create startup rc script (if non-Darwin)
    51         if {![variant_isset darwin]} {
     51        if {${os.platform} != "darwin"} {
    5252                xinstall -d -m 0755 ${destroot}${prefix}/etc/rc.d
    5353                xinstall -m 755 -c ${filespath}/anacron.sh \
  • trunk/dports/sysutils/apt/Portfile

    r50980 r66285  
    111111                        ${worksrcpath}/dselect/update
    112112        # Hack for lack of post-patch-append
    113         if {[variant_isset freebsd]} {
     113        if {${os.platform} == "freebsd"} {
    114114                reinplace "s|make -s|gmake -s|g" ${worksrcpath}/configure
    115115        }
  • trunk/dports/sysutils/cfengine/Portfile

    r40551 r66285  
    9595        }
    9696        # Create startup rc script (if non-Darwin)
    97         if {![variant_isset darwin]} {
     97        if {${os.platform} != "darwin"} {
    9898                xinstall -d -m 0755 ${destroot}${prefix}/etc/rc.d
    9999                xinstall -m 0755 ${filespath}/${name}.sh.in \
  • trunk/dports/textproc/pdftk/Portfile

    r57749 r66285  
    7676}
    7777
    78 variant with_gcc41 conflicts with_gcc42 i386 description {Build using gcc41 (PowerPC only)} {
     78if {${os.arch} == "powerpc"} {
     79variant with_gcc41 conflicts with_gcc42 description {Build using gcc41 (PowerPC only)} {
    7980    depends_lib-append  port:gcc41
    8081    set versuff         -mp-4.1
     82}
    8183}
    8284
     
    8688}
    8789
    88 platform i386 {}
    89 
    90 if { ![variant_isset with_gcc41] && ![variant_isset with_gcc42] } {
     90if { (![variant_exists with_gcc41] || ![variant_isset with_gcc41]) && ![variant_isset with_gcc42] } {
    9191    default_variants    +with_gcc42
    9292}
  • trunk/dports/www/mod_jk/Portfile

    r66242 r66285  
    4242}
    4343if { ![file isdirectory ${javahome}] } {
    44         if { [variant_isset darwin] } {
     44        if { ${os.platform} == "darwin" } {
    4545                if { [file isdirectory "/System/Library/Frameworks/JavaVM.framework/Home"] } {
    4646                        set javahome "/System/Library/Frameworks/JavaVM.framework/Home"
  • trunk/dports/www/mod_jk2/Portfile

    r41808 r66285  
    4141}
    4242if { ![file isdirectory ${javahome}] } {
    43         if { [variant_isset darwin] } {
     43        if { ${os.platform} == "darwin" } {
    4444                if { [file isdirectory "/System/Library/Frameworks/JavaVM.framework/Home"] } {
    4545                        set javahome "/System/Library/Frameworks/JavaVM.framework/Home"
  • trunk/dports/www/privoxy/Portfile

    r64353 r66285  
    5353        xinstall -m 755 -d ${destroot}${prefix}/var/run
    5454        # Install and fixup startup script (if non-Darwin)
    55         if {![variant_isset darwin]} {
     55        if {${os.platform} != "darwin"} {
    5656                xinstall -m 755 -d ${destroot}${prefix}/etc/rc.d
    5757                xinstall -m 755 -W ${worksrcpath} privoxy-generic.init \
  • trunk/dports/www/zope/Portfile

    r57012 r66285  
    9292
    9393        # Create startup rc script (if non-Darwin)
    94         if {![variant_isset darwin]} {
     94        if {${os.platform} != "darwin"} {
    9595                xinstall -o root -m 0755 -d ${destroot}${prefix}/etc/rc.d
    9696                xinstall -o root -m 0755 ${filespath}/zope.sh.in \
  • trunk/dports/x11/gecko-sharp/Portfile

    r50984 r66285  
    2020                lib:mono:gtk-sharp
    2121
    22 variant macosx_framework requires darwin description {Build as a framework} {
     22if {${os.platform} == "darwin"} {
     23variant macosx_framework description {Build as a framework} {
    2324        prefix /Library/Frameworks/Mono.framework/Versions/${version}
    2425}
     26}
  • trunk/dports/x11/libhangul/Portfile

    r30259 r66285  
    1818
    1919post-patch {
    20         reinplace "s|__PLATFORM__|ppc|g" \
    21                 ${worksrcpath}/test/hangul.c
    22 
    23 if { [variant_isset i386] } {
    24         reinplace "s|__PLATFORM__|i386|g" \
    25                 ${worksrcpath}/test/hangul.c
     20    if { ${os.arch} == "powerpc" } {
     21            reinplace "s|__PLATFORM__|ppc|g" \
     22                    ${worksrcpath}/test/hangul.c
     23    } else {
     24        reinplace "s|__PLATFORM__|${os.arch}|g" \
     25                    ${worksrcpath}/test/hangul.c
     26    }
    2627}
    27 }
  • trunk/dports/x11/pango-devel/Portfile

    r64195 r66285  
    5151
    5252platform macosx {}
    53 variant quartz requires macosx {
     53if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx"))} {
     54variant quartz {
    5455    # Although this variant does nothing, pango will automatically build
    5556    # itself differently depending on whether or not cairo is installed with
     
    6768        }
    6869    }
     70}
    6971}
    7072
     
    8587   
    8688    set cairo_quartz_pc ${prefix}/lib/pkgconfig/cairo-quartz.pc
    87     if {[variant_isset quartz]} {
     89    if {[variant_exists quartz] && [variant_isset quartz]} {
    8890        if {![file exists ${cairo_quartz_pc}]} {
    8991            ui_error "To install pango with the quartz variant, cairo must be installed with the quartz variant."
  • trunk/dports/x11/pango/Portfile

    r63977 r66285  
    5252
    5353platform macosx {}
    54 variant quartz requires macosx {
     54if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx"))} {
     55variant quartz {
    5556    # Although this variant does nothing, pango will automatically build
    5657    # itself differently depending on whether or not cairo is installed with
    5758    # the quartz variant. Therefore this variant is necessary to be able to
    5859    # distinguish whether an installed pango has quartz support or not.
     60}
    5961}
    6062
     
    7577   
    7678    set cairo_quartz_pc ${prefix}/lib/pkgconfig/cairo-quartz.pc
    77     if {[variant_isset quartz]} {
     79    if {[variant_exists quartz] && [variant_isset quartz]} {
    7880        if {![file exists ${cairo_quartz_pc}]} {
    7981            ui_error "To install pango with the quartz variant, cairo must be installed with the quartz variant."
Note: See TracChangeset for help on using the changeset viewer.