[140960] trunk/dports

michaelld at macports.org michaelld at macports.org
Tue Oct 6 13:13:45 PDT 2015


Revision: 140960
          https://trac.macports.org/changeset/140960
Author:   michaelld at macports.org
Date:     2015-10-06 13:13:45 -0700 (Tue, 06 Oct 2015)
Log Message:
-----------
qt4 various: change qt_dir to ${prefix}/libexec/qt4 to allow for a parallel install with qt5; rev-bump dependencies tat are known to work with this change. Addresses the primary issue of #44193. Will address secondary issues down the road.

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/qt4-1.0.tcl
    trunk/dports/aqua/djview/Portfile
    trunk/dports/aqua/qt4-mac/Portfile
    trunk/dports/aqua/qt4-mac-mysql55-plugin/Portfile
    trunk/dports/aqua/qt4-mac-postgresql91-plugin/Portfile
    trunk/dports/aqua/qt4-mac-sqlite2-plugin/Portfile
    trunk/dports/aqua/qtiplot/Portfile
    trunk/dports/aqua/qtoctave-mac/Portfile
    trunk/dports/audio/liblastfm/Portfile
    trunk/dports/audio/phonon/Portfile
    trunk/dports/audio/phonon-backend-gstreamer/Portfile
    trunk/dports/devel/automoc/Portfile
    trunk/dports/devel/dbusmenu-qt/Portfile
    trunk/dports/devel/grantlee/Portfile
    trunk/dports/devel/qca/Portfile
    trunk/dports/devel/qca-ossl/Portfile
    trunk/dports/devel/qjson/Portfile
    trunk/dports/devel/qscintilla/Portfile
    trunk/dports/devel/qt4-creator-mac/Portfile
    trunk/dports/devel/soprano/Portfile
    trunk/dports/devel/strigi/Portfile
    trunk/dports/graphics/qwtplot3d/Portfile
    trunk/dports/kde/attica/Portfile
    trunk/dports/math/gnuplot/Portfile
    trunk/dports/math/octave/Portfile
    trunk/dports/python/py-pyqt4/Portfile
    trunk/dports/python/py-pyqwt/Portfile
    trunk/dports/python/py-qscintilla/Portfile
    trunk/dports/science/gnuradio/Portfile
    trunk/dports/science/gqrx/Portfile
    trunk/dports/science/gr-fosphor/Portfile

Modified: trunk/dports/_resources/port1.0/group/qt4-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/qt4-1.0.tcl	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/_resources/port1.0/group/qt4-1.0.tcl	2015-10-06 20:13:45 UTC (rev 140960)
@@ -57,7 +57,7 @@
 
 # standard install directory
 global qt_dir
-set qt_dir              ${prefix}
+set qt_dir              ${prefix}/libexec/qt4
 
 # standard Qt includes directory
 global qt_includes_dir

Modified: trunk/dports/aqua/djview/Portfile
===================================================================
--- trunk/dports/aqua/djview/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/aqua/djview/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -6,6 +6,7 @@
 
 name                djview
 version             4.10
+revision            1
 categories          aqua graphics www
 license             GPL-2+ MIT
 maintainers         nicos openmaintainer

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/aqua/qt4-mac/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -16,7 +16,7 @@
 #conflicts           qt3 qt3-mac qt4-mac-devel
 conflicts           qt3 qt3-mac qt5-mac
 version             4.8.7
-revision            1
+revision            2
 set branch          [join [lrange [split ${version} .] 0 1] .]
 
 categories          aqua

Modified: trunk/dports/aqua/qt4-mac-mysql55-plugin/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac-mysql55-plugin/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/aqua/qt4-mac-mysql55-plugin/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -11,6 +11,7 @@
 
 name                qt4-mac-mysql55-plugin
 version             4.8.7
+revision            1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          aqua databases
 platforms           macosx

Modified: trunk/dports/aqua/qt4-mac-postgresql91-plugin/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac-postgresql91-plugin/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/aqua/qt4-mac-postgresql91-plugin/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -11,6 +11,7 @@
 
 name                qt4-mac-postgresql91-plugin
 version             4.8.7
+revision            1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          aqua databases
 platforms           macosx

Modified: trunk/dports/aqua/qt4-mac-sqlite2-plugin/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac-sqlite2-plugin/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/aqua/qt4-mac-sqlite2-plugin/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -11,6 +11,7 @@
 
 name                qt4-mac-sqlite2-plugin
 version             4.8.7
+revision            1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          aqua databases
 platforms           macosx

Modified: trunk/dports/aqua/qtiplot/Portfile
===================================================================
--- trunk/dports/aqua/qtiplot/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/aqua/qtiplot/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -6,7 +6,7 @@
 
 name                qtiplot
 version             0.9.8.9
-revision            10
+revision            11
 categories          aqua science
 license             GPL-2+
 maintainers         nicos openmaintainer

Modified: trunk/dports/aqua/qtoctave-mac/Portfile
===================================================================
--- trunk/dports/aqua/qtoctave-mac/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/aqua/qtoctave-mac/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -7,7 +7,7 @@
 
 name                    qtoctave-mac
 version                 0.10.1
-revision                1
+revision                2
 categories              aqua math
 license                 GPL-2+
 platforms               darwin

Modified: trunk/dports/audio/liblastfm/Portfile
===================================================================
--- trunk/dports/audio/liblastfm/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/audio/liblastfm/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -7,6 +7,7 @@
 PortGroup           cmake 1.0
 
 github.setup        lastfm liblastfm 1.0.7
+revision            1
 categories          audio
 license             GPL-3
 maintainers         michaelld openmaintainer

Modified: trunk/dports/audio/phonon/Portfile
===================================================================
--- trunk/dports/audio/phonon/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/audio/phonon/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -7,7 +7,7 @@
 
 name                phonon
 version             4.8.3
-revision            1
+revision            2
 categories          audio kde kde4
 license             {LGPL-2.1 LGPL-3}
 maintainers         michaelld openmaintainer

Modified: trunk/dports/audio/phonon-backend-gstreamer/Portfile
===================================================================
--- trunk/dports/audio/phonon-backend-gstreamer/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/audio/phonon-backend-gstreamer/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -7,7 +7,7 @@
 
 name                phonon-backend-gstreamer
 version             4.8.2
-revision            1
+revision            2
 categories          audio kde kde4
 license             {LGPL-2.1 LGPL-3}
 maintainers         michaelld openmaintainer

Modified: trunk/dports/devel/automoc/Portfile
===================================================================
--- trunk/dports/devel/automoc/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/devel/automoc/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -10,7 +10,7 @@
 
 name                automoc
 version             0.9.88
-revision            7
+revision            8
 categories          devel kde kde4
 license             BSD
 maintainers         nomaintainer

Modified: trunk/dports/devel/dbusmenu-qt/Portfile
===================================================================
--- trunk/dports/devel/dbusmenu-qt/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/devel/dbusmenu-qt/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -6,6 +6,7 @@
 
 name                dbusmenu-qt
 version             0.9.2
+revision            1
 categories          devel kde4 kde
 maintainers         nomaintainer
 license             GPL-2

Modified: trunk/dports/devel/grantlee/Portfile
===================================================================
--- trunk/dports/devel/grantlee/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/devel/grantlee/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -6,6 +6,7 @@
 
 name                grantlee
 version             0.3.0
+revision            1
 categories          devel kde kde4
 maintainers         nomaintainer
 description         string template engine based on the Django template system

Modified: trunk/dports/devel/qca/Portfile
===================================================================
--- trunk/dports/devel/qca/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/devel/qca/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -6,7 +6,7 @@
 
 name                qca
 version             2.0.3
-revision            1
+revision            2
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          devel crypto security
 maintainers         michaelld openmaintainer

Modified: trunk/dports/devel/qca-ossl/Portfile
===================================================================
--- trunk/dports/devel/qca-ossl/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/devel/qca-ossl/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -6,7 +6,7 @@
 
 name                qca-ossl
 version             2.0.0-beta3
-revision            4
+revision            5
 categories          devel crypto security
 license             LGPL-2.1+
 maintainers         michaelld openmaintainer

Modified: trunk/dports/devel/qjson/Portfile
===================================================================
--- trunk/dports/devel/qjson/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/devel/qjson/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -6,6 +6,7 @@
 
 name                qjson
 version             0.8.1
+revision            1
 categories          devel kde4 kde
 maintainers         nomaintainer
 license             LGPL-2.1

Modified: trunk/dports/devel/qscintilla/Portfile
===================================================================
--- trunk/dports/devel/qscintilla/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/devel/qscintilla/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -10,6 +10,7 @@
 #       since they contain the python bindings!
 
 version             2.9
+revision            1
 checksums           rmd160 3b3682a578a988466ef35aeab757466ea908934f \
                     sha256 d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417
 

Modified: trunk/dports/devel/qt4-creator-mac/Portfile
===================================================================
--- trunk/dports/devel/qt4-creator-mac/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/devel/qt4-creator-mac/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -13,6 +13,7 @@
 long_description    Qt Creator is a cross-platform integrated development environment (IDE) tailored to the needs of Qt developers.
 
 version             2.8.1
+revision            1
 checksums           rmd160 9348896ff468a90e2c36260621c615c1ee89e82c \
                     sha256 d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9
 

Modified: trunk/dports/devel/soprano/Portfile
===================================================================
--- trunk/dports/devel/soprano/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/devel/soprano/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -6,6 +6,7 @@
 
 name                soprano
 version             2.9.4
+revision            1
 categories          devel
 maintainers         pixilla openmaintainer
 license             GPL-2+ LGPL-2+

Modified: trunk/dports/devel/strigi/Portfile
===================================================================
--- trunk/dports/devel/strigi/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/devel/strigi/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -6,7 +6,7 @@
 
 name            strigi
 version         0.7.8
-revision        2
+revision        3
 categories      devel
 maintainers     nomaintainer
 license         LGPL-2+

Modified: trunk/dports/graphics/qwtplot3d/Portfile
===================================================================
--- trunk/dports/graphics/qwtplot3d/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/graphics/qwtplot3d/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -5,7 +5,7 @@
 
 name                qwtplot3d
 version             0.2.7
-revision            4
+revision            5
 categories          graphics science
 # mostly zlib license, but gl2ps is LGPL
 license             LGPL

Modified: trunk/dports/kde/attica/Portfile
===================================================================
--- trunk/dports/kde/attica/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/kde/attica/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -6,6 +6,7 @@
 
 name                attica
 version             0.4.2
+revision            1
 categories          kde kde4
 maintainers         nicos
 license             LGPL-2.1

Modified: trunk/dports/math/gnuplot/Portfile
===================================================================
--- trunk/dports/math/gnuplot/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/math/gnuplot/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -8,7 +8,7 @@
 
 name                gnuplot
 version             5.0.1
-revision            2
+revision            3
 categories          math science
 # the license has some inconvenient requirements that we're not meeting
 # to be allowed to distribute binaries

Modified: trunk/dports/math/octave/Portfile
===================================================================
--- trunk/dports/math/octave/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/math/octave/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -9,7 +9,7 @@
 name                octave
 
 version             3.8.2
-revision            12
+revision            13
 #conflicts           octave-devel
 categories          math science
 maintainers         michaelld openmaintainer

Modified: trunk/dports/python/py-pyqt4/Portfile
===================================================================
--- trunk/dports/python/py-pyqt4/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/python/py-pyqt4/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -20,7 +20,7 @@
 homepage        http://www.riverbankcomputing.co.uk/software/pyqt/intro
 
 version         4.11.4
-revision        3
+revision        4
 
 set branch      [join [lrange [split ${version} .] 0 1] .]
 set patch       [lindex [split ${version} .] 2]

Modified: trunk/dports/python/py-pyqwt/Portfile
===================================================================
--- trunk/dports/python/py-pyqwt/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/python/py-pyqwt/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -6,7 +6,7 @@
 
 name                py-pyqwt
 version             5.2.0
-revision            10
+revision            11
 
 platforms           macosx
 categories-append   devel

Modified: trunk/dports/python/py-qscintilla/Portfile
===================================================================
--- trunk/dports/python/py-qscintilla/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/python/py-qscintilla/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -12,7 +12,7 @@
 #          will fail with strange error messages.
 
 version             2.9
-revision            1
+revision            2
 checksums           rmd160 3b3682a578a988466ef35aeab757466ea908934f \
                     sha256 d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417
 

Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/science/gnuradio/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -22,7 +22,7 @@
 if {${subport} eq ${name}} {
 
     github.setup    gnuradio gnuradio 3.7.8 v
-    revision        2
+    revision        3
 
     long_description    ${description}: \
         This port is kept up with the GNU Radio release, currently ${version}, which is typically updated every few months.
@@ -44,7 +44,7 @@
 
     name            gnuradio-legacy
     github.setup    gnuradio gnuradio 3.6.5.1 v
-    revision        14
+    revision        15
 
     long_description    ${description}: \
         This port is for GNU Radio ${version}, reflecting the final release in the 3.6 API series.  It is for legacy purposes only\; please consider updating your code to the GNU Radio 3.7 API.
@@ -94,6 +94,7 @@
 
     github.setup        gnuradio gnuradio 8a4904d7f3c5878c42d1c0589e6ef7b1afd4a6be
     version             20151003
+    revision            1
     checksums \
         rmd160 0c2e0eaa8d1bbc612ce82fc6bee722ef2af1fb43 \
         sha256 59539bec7ed0f24caef001bbc4fbedec9965cef2b19cf2b47c98f312dc0e320f
@@ -110,6 +111,7 @@
 
     github.setup        gnuradio gnuradio c8342fd9aed8ed1bcf0062dc02637ad11269642e
     version             20151003
+    revision            1
     checksums \
         rmd160 3ec8c462ecd839c922a849987b7d11afa168f968 \
         sha256 bc0869be7990ffb87142729417e360fdff7e216e74ccb4ebba45d2299aca8562

Modified: trunk/dports/science/gqrx/Portfile
===================================================================
--- trunk/dports/science/gqrx/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/science/gqrx/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -22,6 +22,7 @@
 
     github.setup        csete gqrx 3a51618445ba4c5d10dea50e83ef7db04259d878
     version             20150906
+    revision            1
     checksums           rmd160 d923f5f787bf79bd442473dd86de8a181a850e02 \
                         sha256 c25837960d4c1f07952b1ea644af58030561f7cab6e5f463541c19f849c7cafb
 

Modified: trunk/dports/science/gr-fosphor/Portfile
===================================================================
--- trunk/dports/science/gr-fosphor/Portfile	2015-10-06 19:55:25 UTC (rev 140959)
+++ trunk/dports/science/gr-fosphor/Portfile	2015-10-06 20:13:45 UTC (rev 140960)
@@ -24,7 +24,7 @@
 
 set commit          985c78ffa7ecfc0d4b5b43d2541e68a9e6d94576
 version             20150120
-revision            3
+revision            4
 checksums           rmd160 74200bd632ced6a627a9de92788568dbaaeddaf4 \
                     sha256 624b15ae7d93b6147165c76b7892a3fabb3e4e77f8c55ae59a5328262116d5b5
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151006/3af9ddb9/attachment-0001.html>


More information about the macports-changes mailing list