Ticket #36090: root.diff

File root.diff, 4.5 KB (added by cjones051073 (Chris Jones), 12 years ago)
  • Portfile

    old new  
    338338    }
    339339}
    340340
    341 variant gcc45 conflicts gcc46 gcc47 clang31 description {Compile using MacPorts gcc 4.5} {
     341variant gcc45 conflicts gcc46 gcc47 gcc48 clang31 description {Compile using MacPorts gcc 4.5} {
    342342    configure.compiler      macports-gcc-4.5
    343343    depends_lib-append      port:gcc45
    344344}
    345345
    346 variant gcc46 conflicts gcc45 gcc47 clang31 description {Compile using MacPorts gcc 4.6} {
     346variant gcc46 conflicts gcc45 gcc47 gcc48 clang31 description {Compile using MacPorts gcc 4.6} {
    347347    configure.compiler      macports-gcc-4.6
    348348    depends_lib-append      port:gcc46
    349349}
    350350
    351 variant gcc47 conflicts gcc45 gcc46 clang31 description {Compile using MacPorts gcc 4.7} {
     351variant gcc47 conflicts gcc45 gcc46 gcc48 clang31 description {Compile using MacPorts gcc 4.7} {
    352352    configure.compiler      macports-gcc-4.7
    353353    depends_lib-append      port:gcc47
    354354}
    355355
     356variant gcc48 conflicts gcc45 gcc46 gcc47 clang31 description {Compile using MacPorts gcc 4.8} {
     357    configure.compiler      macports-gcc-4.8
     358    depends_lib-append      port:gcc48
     359}
     360
    356361variant clang31 conflicts gcc47 gcc46 gcc45 description {Compile using MacPorts clang 3.1} {
    357362     configure.compiler      macports-clang-3.1
    358363     depends_lib-append      port:clang-3.1
    359364     configure.args-append   --with-llvm-config="${prefix}/bin/llvm-config-mp-3.1"
    360365}
    361366
     367if {[variant_isset qt_mac]} {
     368    PortGroup qt4 1.0
     369}
     370
     371variant qt_mac description {Builds port with Qt support via Mac UI} {
     372    post-patch {
     373        # fix where "qglobal.h" is found in all files that use or reference it
     374        foreach tpf { configure graf2d/qt/src/TGQt.cxx } {
     375            reinplace "s@Qt/qglobal\\.h@QtCore/qglobal\\.h@g" \
     376                ${worksrcpath}/${tpf}
     377        }
     378        reinplace "/qttestdir/s@Qt@QtCore@g" ${worksrcpath}/configure
     379
     380        # fix library search extensions to include ".la"
     381        # for Qt framework libraries (only)
     382        reinplace "s@\\(\\.so \\.sl \\.dylib \\.dll\\.a\\)@\\1 \\.la@g" \
     383            ${worksrcpath}/configure
     384    }
     385
     386    configure.args-delete   --disable-qt
     387    configure.args-delete   --disable-qtgsi
     388    configure.args-append   --enable-qt --enable-qtgsi \
     389                            --with-qt-incdir="${prefix}/include" \
     390                            --with-qt-libdir="${prefix}/lib"
     391    depends_lib-append      port:qt4-mac
     392
     393    post-configure {
     394        # patch up the Makefile.config to handle the QTLIB frameworks correctly
     395        reinplace "/QTLIB\[ \]/s@:= @:= -F${qt_libs_dir} @" \
     396            ${worksrcpath}/config/Makefile.config
     397        reinplace "/QTLIB\[ \]/s@\\(Qt\[^ \]*\\).la@-framework \\1@g" \
     398            ${worksrcpath}/config/Makefile.config
     399    }
     400}
     401
    362402livecheck.type              regex
    363403livecheck.url               [lindex ${master_sites} 0]
    364404livecheck.regex             ${name}_v(\[0-9a-z.\]+)\\.source
     
    405445#                             --with-qt-libdir="${prefix}/lib"
    406446#     depends_lib-append      port:qt4-x11
    407447# }
    408 
    409 # if {[variant_isset qt_mac]} {
    410 #     PortGroup qt4 1.0
    411 # }
    412 
    413 # variant qt_mac conflicts qt_x11 description {Builds port with Qt support via Mac UI} {
    414 #     post-patch {
    415 #         # fix where "qglobal.h" is found in all files that use or reference it
    416 #         foreach tpf { configure graf2d/qt/src/TGQt.cxx } {
    417 #             reinplace "s@Qt/qglobal\\.h@QtCore/qglobal\\.h@g" \
    418 #                 ${worksrcpath}/${tpf}
    419 #         }
    420 #         reinplace "/qttestdir/s@Qt@QtCore@g" ${worksrcpath}/configure
    421 
    422 #         # fix library search extensions to include ".la"
    423 #         # for Qt framework libraries (only)
    424 #         reinplace "s@\\(\\.so \\.sl \\.dylib \\.dll\\.a\\)@\\1 \\.la@g" \
    425 #             ${worksrcpath}/configure
    426 #     }
    427 
    428 #     configure.args-delete   --disable-qt
    429 #     configure.args-delete   --disable-qtgsi
    430 #     configure.args-append   --enable-qt --enable-qtgsi \
    431 #                             --with-qt-incdir="${prefix}/include" \
    432 #                             --with-qt-libdir="${prefix}/lib"
    433 #     depends_lib-append      port:qt4-mac
    434 
    435 #     post-configure {
    436 #         # patch up the Makefile.config to handle the QTLIB frameworks correctly
    437 #         reinplace "/QTLIB\[ \]/s@:= @:= -F${qt_libs_dir} @" \
    438 #             ${worksrcpath}/config/Makefile.config
    439 #         reinplace "/QTLIB\[ \]/s@\\(Qt\[^ \]*\\).la@-framework \\1@g" \
    440 #             ${worksrcpath}/config/Makefile.config
    441 #     }
    442 # }