Changeset 121627 for trunk/dports/aqua


Ignore:
Timestamp:
Jul 2, 2014, 7:25:50 PM (5 years ago)
Author:
mojca@…
Message:

qt5-mac: remove trailing spaces

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/qt5-mac/Portfile

    r121554 r121627  
    7676}
    7777
    78 if { ${subport} eq ${name} || ${subport} eq "${name}-docs" } {   
     78if { ${subport} eq ${name} || ${subport} eq "${name}-docs" } {
    7979    # use the qt5 group; set 'building_qt5' so that the portgroup
    8080    # does not include certain parts
     
    8282    PortGroup           qt5 1.0
    8383    PortGroup           xcodeversion 1.0
    84    
     84
    8585    conflicts           qt3 qt3-mac qt4-mac
    8686
    8787    minimum_xcodeversions   {10 3.2}
    88    
     88
    8989    pre-configure {
    9090        # See https://bugreports.qt-project.org/browse/QTBUG-34902
     
    9595        }
    9696    }
    97    
     97
    9898    # More testing is required to see if this is necessary.
    9999    use_parallel_build no
    100    
     100
    101101    # header file QtCore/private/qmachparser_p.h is included only if "defined(QT_BUILD_INTERNAL) && defined(Q_OF_MACH_O)"
    102102    #     code from header is used only "ifdef Q_OF_MACH_O"
     
    104104    #     assume the header include code is correct
    105105    patchfiles-append patch-tst_qpluginloader.diff
    106    
     106
    107107    # When testing, ensure that a universal object file is not inadvertently created.
    108108    patchfiles-append patch-machtest.diff
     
    113113    # Function template is only instantiated for same first and second arguments.
    114114    patchfiles-append patch-tst_qarraydata.diff
    115    
     115
    116116    # see http://stackoverflow.com/questions/14506151/invalid-symbol-redefinition-in-inline-asm-on-llvm
    117117    patchfiles-append patch-tst_benchlibcallgrind.diff
     
    119119    # During testing, NSStringFromRect requires NSRect.
    120120    patchfiles-append patch-tst_qaccessibilitymac_helpers.diff
    121    
     121
    122122    # --prefix is not recognized.
    123123    configure.pre_args-delete       --prefix=${prefix}
    124    
     124
    125125    # --disable-dependency-tracking is not recognized.
    126126    configure.universal_args-delete --disable-dependency-tracking
    127    
     127
    128128    if {${configure.sdkroot} ne ""} {
    129129        configure.args-append \
    130130            -sdk [string tolower [join [lrange [split [lindex [split ${configure.sdkroot} "/"] end] "."] 0 end-1] "."]]
    131131    }
    132    
     132
    133133    configure.args-append                      \
    134134        -prefix         ${qt_dir}              \
     
    146146        -testsdir       ${qt_tests_dir}        \
    147147        -hostdatadir    ${qt_host_data_dir}
    148    
     148
    149149    # Configure options:
    150150    configure.args-append \
     
    154154        -shared           \
    155155        -process
    156    
     156
    157157    # Third Party Libraries:
    158158    configure.args-append \
     
    162162        -no-xinput2       \
    163163        -no-xcb-xlib
    164    
     164
    165165    # configure options that don't show up in configure --help
    166166    configure.args-append \
    167167        -no-libudev       \
    168168        -no-egl
    169    
     169
    170170    # Additional options:
    171171    configure.args-append    \
     
    192192        -no-system-proxies   \
    193193        -framework
    194    
     194
    195195    foreach driver { db2 ibase mysql oci odbc psql sqlite sqlite2 tds } {
    196196        configure.args-append -no-sql-${driver}
    197197    }
    198    
     198
    199199    if { ![variant_isset universal] } {
    200200        configure.args-append "-platform ${qt_qmake_spec}"
     
    203203        set merger_configure_args(x86_64) "-platform ${qt_qmake_spec_64}"
    204204    }
    205    
     205
    206206    # configure options that don't show up in configure --help
    207207    configure.args-append \
    208208        -no-openvg
    209    
     209
    210210    # Qt builds part of the system using environment provided my MacPorts.
    211211    # It builds the rest using its own internal environment.
     
    253253    # see https://bugreports.qt-project.org/browse/QTBUG-35514
    254254    build.target
    255    
     255
    256256    if { [variant_isset universal] } {
    257257        merger-post-destroot {
    258258            foreach arch ${universal_archs_to_use} {
    259259                set dir ${destroot}-${arch}
    260                
     260
    261261                reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_frameworks_dir}/pkgconfig/Qt5WebKit.pc
    262                
     262
    263263                foreach prlfl [glob ${dir}${qt_frameworks_dir}/*.framework/*.prl] {
    264264                    reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${prlfl}
    265265                }
    266                
     266
    267267                foreach prlfl [glob ${dir}${qt_frameworks_dir}/*.prl] {
    268268                    reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${prlfl}
    269269                }
    270                
     270
    271271                foreach prlfl [glob ${dir}${qt_frameworks_dir}/*.framework/*.prl] {
    272272                    reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${prlfl}
    273273                }
    274                
     274
    275275                reinplace "s|${worksrcpath}-${arch}|${worksrcpath}|g" ${dir}${qt_mkspecs_dir}/modules/qt_lib_bootstrap_private.pri
    276                
     276
    277277                reinplace \
    278278                    "s|^set(_qt5_corelib_extra_includes \"\${_qt5Core_install_prefix}/share/qt5//mkspecs/macx-clang.*\")$|set(_qt5_corelib_extra_includes \"\${_qt5Core_install_prefix}/share/qt5//mkspecs/macx-clang-32\" \"\${_qt5Core_install_prefix}/share/qt5//mkspecs/macx-clang\")|" \
     
    280280            }
    281281        }
    282        
     282
    283283        post-destroot {
    284284            # delete preprocessor comments surrounding QT_CPU_FEATURES.i386 and QT_CPU_FEATURES.x86_64
     
    287287            reinplace "/^#endif.*$/d"  ${destroot}${qt_mkspecs_dir}/qmodule.pri
    288288        }
    289        
     289
    290290        # The file ${prefix}/share/qt5/mkspecs/qconfig.pri is still not properly merged
    291291        # The solution is ???.
    292292    }
    293    
     293
    294294    post-destroot {
    295295        # move items out of the Frameworks directory that are more appropriate to lib directory
     
    313313            file rename ${f} ${destroot}${qt_libs_dir}/
    314314        }
    315        
     315
    316316        # move items out of the bin directory that are more appropriate to the Applications directory
    317317        xinstall -m 775 -d ${destroot}${qt_apps_dir}
     
    320320        }
    321321    }
    322    
     322
    323323    variant harfbuzz description {(experimental) Use HarfBuzz-NG to do text shaping} {
    324324        depends_lib-append port:harfbuzz
     
    327327            -system-harfbuzz
    328328    }
    329    
     329
    330330    variant tests description {Enable tests} {
    331331        configure.args-replace {-nomake tests} {-make tests}
    332332    }
    333    
     333
    334334    variant examples description {Build examples} {
    335335        configure.args-replace {-nomake examples} {-make examples}
    336336    }
    337    
     337
    338338    variant debug description {Build both release and debug library} {
    339339        configure.args-replace -release -debug-and-release
     
    345345        path:${prefix}/bin/qdoc:${name} \
    346346        path:${qt_plugins_dir}/sqldrivers/libqsqlite.dylib:${name}-sqlite3-plugin
    347    
     347
    348348    supported_archs   noarch
    349    
     349
    350350    build.target      docs
    351351    destroot.target   install_docs
    352        
     352
    353353    post-extract {
    354354        # For the most part, generated makefiles use ${prefix}/bin/qdoc.
     
    360360        xinstall -d -m 755 ${worksrcpath}/qttools/bin/
    361361        ln -s ${prefix}/bin/qhelpgenerator ${worksrcpath}/qttools/bin/
    362        
     362
    363363        # Without this file, the makefile ${worksrcpath}/qtwebkit/Source/WebCore/Makefile.WebCore.Target
    364364        #    keeps generating itself over and over again.
    365         # This file is only created when the library is being built, however.   
     365        # This file is only created when the library is being built, however.
    366366        xinstall -d -m 755 ${worksrcpath}/qtwebkit/Source/WebCore/generated
    367367        touch ${worksrcpath}/qtwebkit/Source/WebCore/generated/InspectorBackendCommands.qrc
     
    373373subport ${name}-sqlite3-plugin {
    374374    PortGroup           qmake5 1.0
    375    
     375
    376376    depends_lib-append port:sqlite3
    377    
     377
    378378    # for single architecture, easier to use
    379379    #    worksrcdir ${worksrcdir}/qtbase/src/plugins/sqldrivers/sqlite,
     
    382382    build.dir     ${configure.dir}
    383383    destroot.dir  ${configure.dir}
    384    
     384
    385385    configure.args-append "INCLUDEPATH+=${prefix}/include" "LIBS+=\"-L${prefix}/lib -lsqlite3\""
    386386}
     
    388388subport ${name}-psql84-plugin {
    389389    PortGroup           qmake5 1.0
    390    
     390
    391391    depends_lib-append port:postgresql84
    392    
     392
    393393    # for single architecture, easier to use
    394394    #    worksrcdir ${worksrcdir}/qtbase/src/plugins/sqldrivers/psql,
     
    397397    build.dir     ${configure.dir}
    398398    destroot.dir  ${configure.dir}
    399    
     399
    400400    configure.args-append "INCLUDEPATH+=${prefix}/include/postgresql84" "LIBS+=\"-L${prefix}/lib/postgresql84 -lpq\""
    401401}
     
    403403subport ${name}-mysql56-plugin {
    404404    PortGroup           qmake5 1.0
    405    
     405
    406406    depends_lib-append port:mysql56
    407    
     407
    408408    # for single architecture, easier to use
    409409    #    worksrcdir ${worksrcdir}/qtbase/src/plugins/sqldrivers/mysql,
     
    412412    build.dir     ${configure.dir}
    413413    destroot.dir  ${configure.dir}
    414    
     414
    415415    configure.args-append "INCLUDEPATH+=${prefix}/include/mysql56/mysql" "LIBS+=\"-L${prefix}/lib/mysql56/mysql -lmysqlclient_r\""
    416416}
Note: See TracChangeset for help on using the changeset viewer.