<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/adf553665ce43ef43028ccc65280ba4199fdedf4">https://github.com/macports/macports-ports/commit/adf553665ce43ef43028ccc65280ba4199fdedf4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit adf553665ce43ef43028ccc65280ba4199fdedf4
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Mon Feb 27 10:51:57 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> qt3-mac: whitespace only
</span>---
aqua/qt3-mac/Portfile | 173 +++++++++++++++++++++++++++-----------------------
1 file changed, 92 insertions(+), 81 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/qt3-mac/Portfile b/aqua/qt3-mac/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4f4d3f4..a7d9f99 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qt3-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qt3-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,82 +1,92 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name qt3-mac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts qt3 qt4-mac qt4-mac-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.3.8b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories aqua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license {QPL-1 GPL-2 GPL-3}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers blair openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Qt Tool Kit (Native Aqua Version)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description This is Qt, TrollTech's C++ toolkit for writing \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cross-platform GUI applications.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://qt.nokia.com/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites trolltech
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname qt-mac-free-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 307eebaa3ee3653595116ad6de36167c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 b366c077179c2e95c04c35da013a282f6b270ada \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a71ec4140371c88bf5e29c1c2886f02d643a4a57
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs i386 ppc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.violate_mtree yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:zlib port:libpng port:libmng
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name qt3-mac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts qt3 qt4-mac qt4-mac-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.3.8b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories aqua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license {QPL-1 GPL-2 GPL-3}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers blair openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Qt Tool Kit (Native Aqua Version)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description This is Qt, TrollTech's C++ toolkit for writing \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cross-platform GUI applications.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://qt.nokia.com/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites trolltech
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname qt-mac-free-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 307eebaa3ee3653595116ad6de36167c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 b366c077179c2e95c04c35da013a282f6b270ada \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a71ec4140371c88bf5e29c1c2886f02d643a4a57
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs i386 ppc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.violate_mtree \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:libmng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span>
variant mysql4 conflicts mysql5 description "add MySQL 4 support" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mysql4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -no-sql-mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -qt-sql-mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -L${prefix}/lib/mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${prefix}/include/mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -plugin-sql-mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:mysql4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete -no-sql-mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -qt-sql-mysql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${prefix}/lib/mysql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${prefix}/include/mysql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -plugin-sql-mysql
</span> }
variant mysql5 conflicts mysql4 description "add MySQL 5 support" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:bin/mysql_config5:mysql5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -no-sql-mysql
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -qt-sql-mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -L${prefix}/lib/mysql5/mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -I${prefix}/include/mysql5/mysql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -plugin-sql-mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:bin/mysql_config5:mysql5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete -no-sql-mysql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -qt-sql-mysql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${prefix}/lib/mysql5/mysql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -I${prefix}/include/mysql5/mysql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -plugin-sql-mysql
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cmd "echo yes | ./configure"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env QMAKESPEC='' QTDIR='' DYLD_LIBRARY_PATH=''
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args -v -prefix '${prefix}' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -docdir '${prefix}/share/doc/${name}/html' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -datadir '${prefix}/share/qt3' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -headerdir '${prefix}/include/qt3' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -plugindir '${prefix}/lib/qt3-plugins' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -release -shared -fast -thread -stl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -qt-gif -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -no-sql-sqlite -no-nis -no-cups -ipv6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -largefile \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -system-zlib -system-libpng -system-libjpeg \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -system-libmng \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '-I${prefix}/include' '-L${prefix}/lib'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cmd "echo yes | ./configure"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env DYLD_LIBRARY_PATH='' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKESPEC='' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QTDIR=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args -v -prefix '${prefix}' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -docdir '${prefix}/share/doc/${name}/html' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -datadir '${prefix}/share/qt3' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -headerdir '${prefix}/include/qt3' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -plugindir '${prefix}/lib/qt3-plugins' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -release -shared -fast -thread -stl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -qt-gif -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -no-sql-sqlite -no-nis -no-cups -ipv6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -largefile \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -system-zlib -system-libpng -system-libjpeg \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -system-libmng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-I${prefix}/include' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-L${prefix}/lib'
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env QMAKESPEC='' QTDIR='' DYLD_LIBRARY_PATH="${worksrcpath}/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target symlinks src-qmake src-moc sub-src sub-tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env DYLD_LIBRARY_PATH="${worksrcpath}/lib" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMAKESPEC='' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QTDIR=''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target symlinks src-qmake src-moc sub-src sub-tools
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.destdir INSTALL_ROOT='${destroot}'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.destdir INSTALL_ROOT='${destroot}'
</span> post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "ranlib -s ${destroot}${prefix}/lib/libdesignercore.a"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "ranlib -s ${destroot}${prefix}/lib/libeditor.a"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "ranlib -s ${destroot}${prefix}/lib/libqassistantclient.a"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "ranlib -s ${destroot}${prefix}/lib/libdesignercore.a"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "ranlib -s ${destroot}${prefix}/lib/libeditor.a"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "ranlib -s ${destroot}${prefix}/lib/libqassistantclient.a"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-src-qt_install.pri \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-mkspecs-qmake.conf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-qmake_Makefile.unix.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qt3-leopard.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace_support.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-kernel_qpngio.cpp.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dlcompat.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-src-qt_install.pri \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-mkspecs-qmake.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-qmake_Makefile.unix.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt3-leopard.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace_support.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-kernel_qpngio.cpp.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dlcompat.diff
</span> configure.args-append -ldl
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|__CC__|${configure.cc}| ${worksrcpath}/mkspecs/macx-g++/qmake.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace s|__CC__|${configure.cc}| ${worksrcpath}/mkspecs/macx-g++/qmake.conf
</span> reinplace s|__CXX__|${configure.cxx}| ${worksrcpath}/mkspecs/macx-g++/qmake.conf \
${worksrcpath}/config.tests/mac/mac_version.test
if {[variant_isset universal]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,23 +100,24 @@ platform darwin {
</span> reinplace s/-pipe// ${worksrcpath}/mkspecs/macx-g++/qmake.conf
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "sh ${filespath}/fix_install_names.sh '${prefix}' '${destroot}' '${frameworks_dir}'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set appPath ${destroot}${applications_dir}/Qt3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${appPath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach app {assistant designer linguist qtconfig} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "mv -v ${destroot}${prefix}/bin/${app}.app \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${appPath}/${app}.app"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- regexp {[0-9.]+} $version baseversion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set majorver [lindex [split ${baseversion} .] 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set minorver [join [lrange [split ${baseversion} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach libname "libqt libqt.${majorver} libqt.${minorver}" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists "${destroot}${prefix}/lib/${libname}.dylib"]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s libqt-mt.${baseversion}.dylib "${destroot}${prefix}/lib/${libname}.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "sh ${filespath}/fix_install_names.sh '${prefix}' '${destroot}' '${frameworks_dir}'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set appPath ${destroot}${applications_dir}/Qt3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${appPath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach app {assistant designer linguist qtconfig} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "mv -v ${destroot}${prefix}/bin/${app}.app \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${appPath}/${app}.app"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ regexp {[0-9.]+} $version baseversion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set majorver [lindex [split ${baseversion} .] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set minorver [join [lrange [split ${baseversion} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach libname "libqt libqt.${majorver} libqt.${minorver}" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists "${destroot}${prefix}/lib/${libname}.dylib"]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s libqt-mt.${baseversion}.dylib "${destroot}${prefix}/lib/${libname}.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.universal_args-delete --disable-dependency-tracking
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.universal_args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-dependency-tracking
</span></pre><pre style='margin:0'>
</pre>