<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/2e00fe3a7c340b6c8a7ed2a54f5f88fa0a6efd8a">https://github.com/macports/macports-ports/commit/2e00fe3a7c340b6c8a7ed2a54f5f88fa0a6efd8a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2e00fe3a7c340b6c8a7ed2a54f5f88fa0a6efd8a
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Mon Feb 27 11:44:02 2017 +0100
<span style='display:block; white-space:pre;color:#404040;'> qt3[-mac]: various cleanups
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * remove conflict with qt4-mac and (no longer existing) qt4-mac-devel
</span><span style='display:block; white-space:pre;color:#404040;'> * disable builds of qt3-mac on > 10.6
</span><span style='display:block; white-space:pre;color:#404040;'> * disable livecheck (there will be no newer versions released anyway)
</span><span style='display:block; white-space:pre;color:#404040;'> * use newer checksums
</span><span style='display:block; white-space:pre;color:#404040;'> * fix homepage and master_sites
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> qt3-mac is broken:
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/30679 (doesn't work on > 10.6)
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/39249 (compatibility with latest libpng)
</span>---
aqua/qt3-mac/Portfile | 23 +++++++++++++++++------
x11/qt3/Portfile | 14 ++++++++------
2 files changed, 25 insertions(+), 12 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 a7d9f99..12de686 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;'>@@ -2,8 +2,11 @@
</span>
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# broken compatibility with libpng, see:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# * https://trac.macports.org/ticket/39249
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> name qt3-mac
<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:#e0ffe0;'>+conflicts qt3
</span> version 3.3.8b
revision 5
categories aqua
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,12 +15,11 @@ maintainers blair openmaintainer
</span> description Qt Tool Kit (Native Aqua Version)
long_description This is Qt, TrollTech's C++ toolkit for writing \
cross-platform GUI applications.
<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:#e0ffe0;'>+homepage http://www.qt.io/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://download.qt.io/archive/qt/3/
</span> distname qt-mac-free-${version}
<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:#e0ffe0;'>+checksums rmd160 a71ec4140371c88bf5e29c1c2886f02d643a4a57 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 32a2945995c672b221b0e3431748850a575a4620abd2cc26ba98e188b1282922
</span> platforms darwin
supported_archs i386 ppc
destroot.violate_mtree \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,6 +79,13 @@ post-destroot {
</span> }
platform darwin {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} > 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${name} requires Mac OS X 10.6 or older."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible OS version"
</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> patchfiles patch-src-qt_install.pri \
patch-mkspecs-qmake.conf \
patch-qmake_Makefile.unix.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,3 +130,5 @@ platform darwin {
</span>
configure.universal_args-delete \
--disable-dependency-tracking
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type none
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/qt3/Portfile b/x11/qt3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c5e2f14..5f0953f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/qt3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/qt3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortSystem 1.0
</span> PortGroup conflicts_build 1.0
name qt3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts qt3-mac qt4-mac qt4-mac-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts qt3-mac
</span> version 3.3.8
revision 15
categories x11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,13 @@ distfiles ${distname}.tar.bz2:qt3 \
</span> qt-upstream-patches-0004.tar.bz2:fink
use_bzip2 yes
checksums ${distname}.tar.bz2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 cf3c43a7dfde5bfb76f8001102fe6e85 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 cf3c43a7dfde5bfb76f8001102fe6e85 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 7b8e4e35f49014eac4fcfe91b7ec0a45c5569cf4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e8c3f703d00a4e2ab9ba63fd474caa8a9d0aa3d7f1d5451dd162bec9d778a449 \
</span> qt-upstream-patches-0004.tar.bz2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 1f27d5222813a0a29fe53fd8669e2239
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ md5 1f27d5222813a0a29fe53fd8669e2239
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 9c59caee3229d0cfe2a14a7e67f73a1c3b86a154 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0db4fd5f314b1c93139f5d08305c1c25d75c4078289402d173f1dea24a43da66
</span>
depends_lib port:libGLU \
port:mesa \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -194,6 +198,4 @@ variant psql description {Enable PostgreSQL 8.3 SQL Driver} {
</span> -plugin-sql-psql
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://ftp.silug.org/mirrors/ftp.trolltech.com/qt/source/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex {qt-x11-free-(\d+(?:\.\d+)*)}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type none
</span></pre><pre style='margin:0'>
</pre>