June 2010 - macports-changes - lists.macosforge.org

[69274] trunk/dports/aqua/mumble/Portfile
by michaelld＠macports.org 29 Jun '10

29 Jun '10

Revision: 69274 http://trac.macports.org/changeset/69274 Author: michaelld(a)macports.org Date: 2010-06-29 00:22:28 -0700 (Tue, 29 Jun 2010) Log Message: ----------- Corrected use of qt4-mac dependency. Modified Paths: -------------- trunk/dports/aqua/mumble/Portfile Modified: trunk/dports/aqua/mumble/Portfile =================================================================== --- trunk/dports/aqua/mumble/Portfile 2010-06-29 07:21:41 UTC (rev 69273) +++ trunk/dports/aqua/mumble/Portfile 2010-06-29 07:22:28 UTC (rev 69274) @@ -5,6 +5,7 @@ name mumble version 1.2.2 +revision 1 categories aqua audio license GPL maintainers snc openmaintainer @@ -27,7 +28,7 @@ livecheck.regex "${name}-(\\d+\\.\\d+\\.\\d+)${extract.suffix}" depends_lib \ - path:bin/qmake-mac:qt4-mac \ + port:qt4-mac \ port:openssl \ port:portaudio \ port:ice-cpp \ @@ -38,7 +39,7 @@ port:boost configure.env QMAKESPEC=${prefix}/libexec/qt4-mac/mkspecs/macx-g++ -configure.cmd ${prefix}/bin/qmake-mac +configure.cmd ${prefix}/libexec/qt4-mac/bin/qmake configure.pre_args CONFIG+=\" configure.post_args \" DEFINES+=NO_UPDATE_CHECK main.pro configure.args release no-dbus no-universal no-server

1 0

[69273] trunk/dports/science/qfsm/Portfile
by michaelld＠macports.org 29 Jun '10

29 Jun '10

Revision: 69273 http://trac.macports.org/changeset/69273 Author: michaelld(a)macports.org Date: 2010-06-29 00:21:41 -0700 (Tue, 29 Jun 2010) Log Message: ----------- Added qt_mac and qt_x11 variants. Corrected use of qt4-* dependency. Modified Paths: -------------- trunk/dports/science/qfsm/Portfile Modified: trunk/dports/science/qfsm/Portfile =================================================================== --- trunk/dports/science/qfsm/Portfile 2010-06-29 07:20:40 UTC (rev 69272) +++ trunk/dports/science/qfsm/Portfile 2010-06-29 07:21:41 UTC (rev 69273) @@ -6,6 +6,7 @@ name qfsm version 0.52.0 +revision 1 categories science maintainers ecronin openmaintainer description A graphical tool for designing finite state machines @@ -22,22 +23,24 @@ sha1 6820603155270d0abdc5a302a647e9588f92a2dc \ rmd160 c60d6b49e1eaaffdf258f468e7e897479524baff -depends_lib-append path:bin/qmake-mac:qt4-mac - -set qmake_path ${prefix}/bin/qmake - post-patch { reinplace "s|SET(CMAKE_INSTALL_PREFIX \"/usr\")|SET(CMAKE_INSTALL_PREFIX \"${prefix}\")|g" ${worksrcpath}/CMakeLists.txt } -configure.args \ - -DQT_LIBRARY_DIR=${frameworks_dir} \ - -DQT_QMAKE_EXECUTABLE=${qmake_path}-mac +variant qt_mac conflicts qt_x11 description {build with qt4-mac} { + depends_lib-append port:qt4-mac + configure.args \ + -DQT_LIBRARY_DIR=${prefix}/libexec/qt4-mac/lib \ + -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake +} -variant x11 description {build with qt4-x11} { - depends_lib-delete path:bin/qmake-mac:qt4-mac - configure.args-delete -DQT_QMAKE_EXECUTABLE=${qmake_path}-mac - +variant qt_x11 conflicts qt_mac description {build with qt4-x11} { depends_lib-append port:qt4-x11 - configure.args-append -DQT_QMAKE_EXECUTABLE=${qmake_path}-x11 + configure.args \ + -DQT_LIBRARY_DIR=${prefix}/libexec/qt4-x11/lib \ + -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-x11/bin/qmake } + +if {![variant_isset qt_mac] && ![variant_isset qt_x11]} { + default_variants +qt_mac +}

1 0

[69272] trunk/dports/science/stellarium/Portfile
by michaelld＠macports.org 29 Jun '10

29 Jun '10

Revision: 69272 http://trac.macports.org/changeset/69272 Author: michaelld(a)macports.org Date: 2010-06-29 00:20:40 -0700 (Tue, 29 Jun 2010) Log Message: ----------- Corrected use of qt4-mac dependency. Modified Paths: -------------- trunk/dports/science/stellarium/Portfile Modified: trunk/dports/science/stellarium/Portfile =================================================================== --- trunk/dports/science/stellarium/Portfile 2010-06-29 07:20:21 UTC (rev 69271) +++ trunk/dports/science/stellarium/Portfile 2010-06-29 07:20:40 UTC (rev 69272) @@ -1,3 +1,4 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; truncate-lines: t -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4 # $Id$ PortSystem 1.0 @@ -4,6 +5,7 @@ name stellarium version 0.10.5 +revision 1 categories science platforms darwin maintainers raimue \ @@ -23,7 +25,7 @@ rmd160 dc4e942a4767e7afac62e766f4c11888fafe1c45 depends_build port:cmake -depends_lib path:bin/qmake-mac:qt4-mac \ +depends_lib port:qt4-mac \ port:freetype \ port:zlib \ port:libiconv \

1 0

[69271] trunk/dports/science/emergent/Portfile
by michaelld＠macports.org 29 Jun '10

29 Jun '10

Revision: 69271 http://trac.macports.org/changeset/69271 Author: michaelld(a)macports.org Date: 2010-06-29 00:20:21 -0700 (Tue, 29 Jun 2010) Log Message: ----------- Corrected use of qt4-mac dependency. Modified Paths: -------------- trunk/dports/science/emergent/Portfile Modified: trunk/dports/science/emergent/Portfile =================================================================== --- trunk/dports/science/emergent/Portfile 2010-06-29 07:18:52 UTC (rev 69270) +++ trunk/dports/science/emergent/Portfile 2010-06-29 07:20:21 UTC (rev 69271) @@ -4,6 +4,7 @@ name emergent version 5.0.0 +revision 1 categories science platforms darwin maintainers nomaintainer @@ -28,5 +29,4 @@ use_parallel_build yes depends_build bin:cmake:cmake -depends_lib port:readline path:bin/qmake-mac:qt4-mac port:Coin port:Quarter port:gsl port:ode - +depends_lib port:readline port:qt4-mac port:Coin port:Quarter port:gsl port:ode

1 0

[69270] trunk/dports/science/root
by michaelld＠macports.org 29 Jun '10

29 Jun '10

Revision: 69270 http://trac.macports.org/changeset/69270 Author: michaelld(a)macports.org Date: 2010-06-29 00:18:52 -0700 (Tue, 29 Jun 2010) Log Message: ----------- Bump to 5.26.00b . Add variants for qt4-mac and qt4-x11 (fixes ticket #23748). Corrected use of qt4-* dependency. Explicit compilation as 32-bit or 64-bit. Hack to get around issues finding Qt libraries. Modified Paths: -------------- trunk/dports/science/root/Portfile Added Paths: ----------- trunk/dports/science/root/files/ trunk/dports/science/root/files/patch-config-Makefile.config.diff trunk/dports/science/root/files/patch-configure.diff Modified: trunk/dports/science/root/Portfile =================================================================== --- trunk/dports/science/root/Portfile 2010-06-29 07:14:14 UTC (rev 69269) +++ trunk/dports/science/root/Portfile 2010-06-29 07:18:52 UTC (rev 69270) @@ -1,3 +1,4 @@ +# -*- coding: utf-8; mode: tcl; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; truncate-lines: t -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4 # $Id$ PortSystem 1.0 @@ -3,5 +4,5 @@ name root -version 5.26.00 +version 5.26.00b revision 2 categories science @@ -17,9 +18,9 @@ distname ${name}_v${version}.source master_sites ftp://root.cern.ch/root/ -checksums md5 0665462b9c9a153e20d2efcde6cf427c \ - sha1 318c5adf7f54f8206d9173d2fb0dc196a0e87192 \ - rmd160 bf7f91abd76ec86f69eb80506291cb8d4f87614e +checksums md5 46d524a37f4c67cb4a6921d3d7721f8a \ + sha1 70db6f9cf6acc29bcf0060a4c2e1f9e24c26702a \ + rmd160 057ce1151a534f00a445ec69392e7a7a3bd55ca8 worksrcdir root @@ -28,6 +29,9 @@ port:xpm \ port:zlib +# patches to allow 'configure' to find Qt framework libraries and 'moc' +patchfiles patch-configure.diff + pre-configure { build.args CC=${configure.cc} \ CXX=${configure.cxx} \ @@ -39,6 +43,12 @@ reinplace "s|/usr/include |${prefix}/include /usr/include |g" ${worksrcpath}/configure reinplace "s|\"/usr/lib\"|\"${prefix}/lib/\" \"/usr/lib\"g|" ${worksrcpath}/configure + # the build type (32 or 64 bit) -must- be for first argument + if {${build_arch} == "i386" || ${build_arch} == "ppc"} { + configure.pre_args macosx --prefix=${prefix} + } else { + configure.pre_args macos64 --prefix=${prefix} + } } configure.args --with-cc=${configure.cc} \ @@ -49,21 +59,21 @@ --libdir="${prefix}/lib/root" \ --testdir="${prefix}/share/root/test" \ --tutdir="${prefix}/share/root/tutorials" \ - --disable-qt \ --etcdir=${prefix}/etc/root \ --disable-builtin-afterimage \ --disable-builtin-freetype \ --disable-builtin-glew \ - --disable-opengl \ --disable-builtin-ftgl \ --disable-builtin-pcre \ --disable-builtin-zlib \ --disable-fftw3 \ --disable-krb5 \ --disable-ldap \ + --disable-mysql \ --disable-odbc \ + --disable-opengl \ --disable-pythia8 \ - --disable-mysql \ + --disable-qt \ --disable-roofit \ --disable-ssl \ --disable-xml \ @@ -153,15 +163,29 @@ depends_lib-append port:libxml2 } -variant qt description {Builds port with qt support} { +variant qt_x11 conflicts qt_mac description {Builds port with Qt support via X11 UI} { configure.args-delete --disable-qt configure.args-append --enable-qt \ --with-qt-incdir="${prefix}/libexec/qt4-x11/include/" \ - --with-qt-libdir="${prefix}/libexec/qt4-x11/lib" - + --with-qt-libdir="${prefix}/libexec/qt4-x11/lib" \ + --with-mocdir="${prefix}/bin" depends_lib-append port:qt4-x11 } +variant qt_mac conflicts qt_x11 description {Builds port with Qt support via Mac UI} { + configure.args-delete --disable-qt + configure.args-append --enable-qt \ + --with-qt-incdir="${prefix}/libexec/qt4-mac/include/" \ + --with-qt-libdir="${prefix}/libexec/qt4-mac/lib" \ + --with-mocdir="${prefix}/bin" + depends_lib-append port:qt4-mac + + post-configure { + # patch up the Makefile.config to handle the QTLIB frameworks correctly + system "cd ${worksrcpath} && patch -p0 < ${filespath}/patch-config-Makefile.config.diff" + } +} + variant mysql description {Builds port with mysql support} { configure.args-delete --disable-mysql configure.args-append --enable-mysql \ Added: trunk/dports/science/root/files/patch-config-Makefile.config.diff =================================================================== --- trunk/dports/science/root/files/patch-config-Makefile.config.diff (rev 0) +++ trunk/dports/science/root/files/patch-config-Makefile.config.diff 2010-06-29 07:18:52 UTC (rev 69270) @@ -0,0 +1,11 @@ +--- config/Makefile.config_orig 2010-06-25 21:17:25.000000000 -0600 ++++ config/Makefile.config 2010-06-25 21:18:05.000000000 -0600 +@@ -96,7 +96,7 @@ + BUILDQT := yes + BUILDQTGSI := yes + QTLIBDIR := -L/opt/local/libexec/qt4-mac/lib +-QTLIB := QtCore.la QtGui.la Qt3Support.la QtOpenGL.la QtSvg.la QtXml.la QtWebKit.la QtNetwork.la ++QTLIB := -F/opt/local/libexec/qt4-mac/lib -framework QtCore -framework QtGui -framework Qt3Support -framework QtOpenGL -framework QtSvg -framework QtXml -framework QtWebKit -framework QtNetwork -framework ApplicationServices -framework Carbon -framework AppKit -L/opt/local/libexec/qt4-mac/lib -lpng -lz -lm + QTINCDIR := $(filter-out /usr/include, /opt/local/libexec/qt4-mac/include/ /opt/local/libexec/qt4-mac/include//Qt /opt/local/libexec/qt4-mac/include//Qt3Support /opt/local/libexec/qt4-mac/include//QtAssistant /opt/local/libexec/qt4-mac/include//QtCore /opt/local/libexec/qt4-mac/include//QtDBus /opt/local/libexec/qt4-mac/include//QtDesigner /opt/local/libexec/qt4-mac/include//QtGui /opt/local/libexec/qt4-mac/include//QtHelp /opt/local/libexec/qt4-mac/include//QtMultimedia /opt/local/libexec/qt4-mac/include//QtNetwork /opt/local/libexec/qt4-mac/include//QtOpenGL /opt/local/libexec/qt4-mac/include//QtScript /opt/local/libexec/qt4-mac/include//QtScriptTools /opt/local/libexec/qt4-mac/include//QtSql /opt/local/libexec/qt4-mac/include//QtSvg /opt/local/libexec/qt4-mac/include//QtTest /opt/local/libexec/qt4-mac/include//QtUiTools /opt/local/libexec/qt4-mac/include//QtWebKit /opt/local/libexec/qt4-mac/include//QtXml /opt/local/libexec/qt4-mac/include//QtXmlPatterns) + QTVERS := 4 + QTMOCEXE := /opt/local/bin/moc Added: trunk/dports/science/root/files/patch-configure.diff =================================================================== --- trunk/dports/science/root/files/patch-configure.diff (rev 0) +++ trunk/dports/science/root/files/patch-configure.diff 2010-06-29 07:18:52 UTC (rev 69270) @@ -0,0 +1,19 @@ +--- configure_orig 2010-06-25 21:01:29.000000000 -0600 ++++ configure 2010-06-25 21:01:36.000000000 -0600 +@@ -388,7 +388,7 @@ + done + slibs="" + for i in $lib ; do +- for ext in .so .sl .dylib .dll.a ; do # .dll.a for cygwin gcc ++ for ext in .so .sl .dylib .dll.a .la ; do # .dll.a for cygwin gcc + slibs="$slibs $i$ext" + done + done +@@ -1420,6 +1420,7 @@ + --with-ldap-libdir=*) ldaplibdir=$optarg ; enable_ldap="yes" ;; + --with-mysql-incdir=*) mysqlincdir=$optarg ; enable_mysql="yes" ;; + --with-mysql-libdir=*) mysqllibdir=$optarg ; enable_mysql="yes" ;; ++ --with-mocdir=*) mocdir=$optarg ;; + --with-monalisa-incdir=*)monalisaincdir=$optarg; enable_monalisa="yes";; + --with-monalisa-libdir=*)monalisalibdir=$optarg; enable_monalisa="yes";; + --with-odbc-incdir=*) odbcincdir=$optarg ; enable_odbc="yes" ;;

1 0

[69269] trunk/dports/editors/sigil/Portfile
by michaelld＠macports.org 29 Jun '10

29 Jun '10

Revision: 69269 http://trac.macports.org/changeset/69269 Author: michaelld(a)macports.org Date: 2010-06-29 00:14:14 -0700 (Tue, 29 Jun 2010) Log Message: ----------- Corrected use of qt4-mac dependency. Modified Paths: -------------- trunk/dports/editors/sigil/Portfile Modified: trunk/dports/editors/sigil/Portfile =================================================================== --- trunk/dports/editors/sigil/Portfile 2010-06-29 07:13:41 UTC (rev 69268) +++ trunk/dports/editors/sigil/Portfile 2010-06-29 07:14:14 UTC (rev 69269) @@ -6,7 +6,7 @@ name sigil version 0.1.9 -revision 0 +revision 1 platforms darwin categories editors maintainers macports.org:krischik @@ -29,7 +29,7 @@ depends_build bin:cmake:cmake \ bin:gmake:gmake -depends_lib path:bin/qmake-mac:qt4-mac +depends_lib port:qt4-mac configure.env PATH="${prefix}/libexec/qt4-mac/bin:$env(PATH)" configure.cmd "cmake"

1 0

[69268] trunk/dports/_resources/port1.0/group/kde4-1.0.tcl
by michaelld＠macports.org 29 Jun '10

29 Jun '10

Revision: 69268 http://trac.macports.org/changeset/69268 Author: michaelld(a)macports.org Date: 2010-06-29 00:13:41 -0700 (Tue, 29 Jun 2010) Log Message: ----------- Corrected use of qt4-mac dependency. Modified Paths: -------------- trunk/dports/_resources/port1.0/group/kde4-1.0.tcl Modified: trunk/dports/_resources/port1.0/group/kde4-1.0.tcl =================================================================== --- trunk/dports/_resources/port1.0/group/kde4-1.0.tcl 2010-06-29 07:12:56 UTC (rev 69267) +++ trunk/dports/_resources/port1.0/group/kde4-1.0.tcl 2010-06-29 07:13:41 UTC (rev 69268) @@ -61,7 +61,7 @@ # overrides depends_build, removing "port:automoc" to prevent a # cyclic dependency depends_build-append port:automoc -depends_lib-append path:libexec/${qt}:${qt} +depends_lib-append port:${qt} switch ${os.platform}_${os.major} { darwin_8 {

1 0

[69267] trunk/dports/graphics/qwtplot3d/Portfile
by michaelld＠macports.org 29 Jun '10

29 Jun '10

Revision: 69267 http://trac.macports.org/changeset/69267 Author: michaelld(a)macports.org Date: 2010-06-29 00:12:56 -0700 (Tue, 29 Jun 2010) Log Message: ----------- In the version reinplace, use ${version} instead of hard-coding. Modified Paths: -------------- trunk/dports/graphics/qwtplot3d/Portfile Modified: trunk/dports/graphics/qwtplot3d/Portfile =================================================================== --- trunk/dports/graphics/qwtplot3d/Portfile 2010-06-29 07:11:59 UTC (rev 69266) +++ trunk/dports/graphics/qwtplot3d/Portfile 2010-06-29 07:12:56 UTC (rev 69267) @@ -57,7 +57,7 @@ } patch { - reinplace "s|0.2.6|0.2.7|g" ${worksrcpath}/qwtplot3d.pro + reinplace "s|0.2.6|${version}|g" ${worksrcpath}/qwtplot3d.pro } destroot {

1 0

[69266] trunk/dports/gis/cgal/Portfile
by michaelld＠macports.org 29 Jun '10

29 Jun '10

Revision: 69266 http://trac.macports.org/changeset/69266 Author: michaelld(a)macports.org Date: 2010-06-29 00:11:59 -0700 (Tue, 29 Jun 2010) Log Message: ----------- Added description to demos variant (per link request). Modified Paths: -------------- trunk/dports/gis/cgal/Portfile Modified: trunk/dports/gis/cgal/Portfile =================================================================== --- trunk/dports/gis/cgal/Portfile 2010-06-29 07:10:51 UTC (rev 69265) +++ trunk/dports/gis/cgal/Portfile 2010-06-29 07:11:59 UTC (rev 69266) @@ -61,7 +61,7 @@ configure.universal_args } -variant demos { +variant demos description {Create demos} { depends_lib-append port:qt4-mac configure.args-append -DWITH_examples=TRUE

1 0

[69265] trunk/dports/security/Vidalia/Portfile
by michaelld＠macports.org 29 Jun '10

29 Jun '10

Revision: 69265 http://trac.macports.org/changeset/69265 Author: michaelld(a)macports.org Date: 2010-06-29 00:10:51 -0700 (Tue, 29 Jun 2010) Log Message: ----------- Add variants to use qt4-mac or qt4-x11 correctly. Modified Paths: -------------- trunk/dports/security/Vidalia/Portfile Modified: trunk/dports/security/Vidalia/Portfile =================================================================== --- trunk/dports/security/Vidalia/Portfile 2010-06-29 07:06:50 UTC (rev 69264) +++ trunk/dports/security/Vidalia/Portfile 2010-06-29 07:10:51 UTC (rev 69265) @@ -6,6 +6,7 @@ name Vidalia version 0.2.9 +revision 1 categories security net aqua maintainers mnick openmaintainer description Vidalia is a controller GUI for the Tor software @@ -23,26 +24,30 @@ sha1 cf65dc982b97365664f66fe7c2d265342156cf37 \ rmd160 45df9f968a041a8ed70b974ebcb59b8b0e5d1153 -depends_lib-append port:tor path:bin/qmake-mac:qt4-mac +depends_lib-append port:tor -set qmake_path ${prefix}/bin/qmake - -configure.args \ - -DQT_LIBRARY_DIR=${frameworks_dir} \ - -DQT_QMAKE_EXECUTABLE=${qmake_path}-mac - destroot { file copy ${worksrcpath}/src/vidalia/Vidalia.app ${destroot}${applications_dir}/Vidalia.app } -variant x11 description {build with qt4-x11} { - depends_lib-delete path:bin/qmake-mac:qt4-mac - configure.args-delete -DQT_QMAKE_EXECUTABLE=${qmake_path}-mac - +variant qt_mac conflicts qt_x11 description {build with qt4-mac} { + depends_lib-append port:qt4-mac + configure.args \ + -DQT_LIBRARY_DIR=${prefix}/libexec/qt4-mac/lib \ + -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake +} + +variant qt_x11 conflicts qt_mac description {build with qt4-x11} { depends_lib-append port:qt4-x11 - configure.args-append -DQT_QMAKE_EXECUTABLE=${qmake_path}-x11 + configure.args \ + -DQT_LIBRARY_DIR=${prefix}/libexec/qt4-x11/lib \ + -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-x11/bin/qmake } +if {![variant_isset qt_mac] && ![variant_isset qt_x11]} { + default_variants +qt_mac +} + livecheck.type regexm livecheck.url ${homepage} livecheck.regex stable release is:\n<a href=\"https://trac.vidalia-project.net/milestone/Vidalia%20(\[\\d\.\]+)\">

1 0