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

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

29 Jun '10

Revision: 69244 http://trac.macports.org/changeset/69244 Author: michaelld(a)macports.org Date: 2010-06-28 23:44:43 -0700 (Mon, 28 Jun 2010) Log Message: ----------- Correct use of qt4-mac files. Modified Paths: -------------- trunk/dports/gis/qgis/Portfile Modified: trunk/dports/gis/qgis/Portfile =================================================================== --- trunk/dports/gis/qgis/Portfile 2010-06-29 06:43:18 UTC (rev 69243) +++ trunk/dports/gis/qgis/Portfile 2010-06-29 06:44:43 UTC (rev 69244) @@ -5,6 +5,7 @@ PortGroup cmake 1.0 name qgis version 1.4.0 +revision 1 categories gis maintainers vince description QGIS is a user-friendly GIS based on Qt 4 @@ -135,7 +136,7 @@ configure.args-append \ "-DSIP_BINARY_PATH=${Python_FRM}/Versions/${Pyverpath}/bin/sip" configure.args-append "-DSIP_INCLUDE_DIR=${Python_FRM}/Headers" -configure.args-append "-DQT_QMAKE_EXECUTABLE=${prefix}/bin/qmake-mac" +configure.args-append "-DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake" configure.args-append "-DCMAKE_BUILD_TYPE=Release" # This is a fake but don't ask me why it is needed

1 0

[69243] trunk/dports/comms/cutecom-qt4-mac/Portfile
by michaelld＠macports.org 29 Jun '10

29 Jun '10

Revision: 69243 http://trac.macports.org/changeset/69243 Author: michaelld(a)macports.org Date: 2010-06-28 23:43:18 -0700 (Mon, 28 Jun 2010) Log Message: ----------- Correct use of qt4-mac dependency. Modified Paths: -------------- trunk/dports/comms/cutecom-qt4-mac/Portfile Modified: trunk/dports/comms/cutecom-qt4-mac/Portfile =================================================================== --- trunk/dports/comms/cutecom-qt4-mac/Portfile 2010-06-29 06:42:14 UTC (rev 69242) +++ trunk/dports/comms/cutecom-qt4-mac/Portfile 2010-06-29 06:43:18 UTC (rev 69243) @@ -4,6 +4,7 @@ name cutecom-qt4-mac version 0.20.0 +revision 1 categories comms maintainers jwbacon(a)tds.net distname cutecom-${version} @@ -18,7 +19,7 @@ platforms darwin depends_build port:cmake -depends_lib path:bin/qmake-mac:qt4-mac +depends_lib port:qt4-mac patchfiles patch-qcppdialogimpl.cpp \ patch-qcppdialogimpl.h \

1 0

[69242] trunk/dports/textproc/doxygen/Portfile
by michaelld＠macports.org 29 Jun '10

29 Jun '10

Revision: 69242 http://trac.macports.org/changeset/69242 Author: michaelld(a)macports.org Date: 2010-06-28 23:42:14 -0700 (Mon, 28 Jun 2010) Log Message: ----------- Correct use of qt4-mac dependency. Modified Paths: -------------- trunk/dports/textproc/doxygen/Portfile Modified: trunk/dports/textproc/doxygen/Portfile =================================================================== --- trunk/dports/textproc/doxygen/Portfile 2010-06-29 06:41:27 UTC (rev 69241) +++ trunk/dports/textproc/doxygen/Portfile 2010-06-29 06:42:14 UTC (rev 69242) @@ -4,7 +4,7 @@ name doxygen version 1.6.3 -revision 1 +revision 2 categories textproc devel maintainers css description Documentation system for several programming languages @@ -71,9 +71,9 @@ variant wizard description {Include the GUI wizard based on Qt} { configure.env-append QTDIR=${prefix}/libexec/qt4-mac - configure.env-append QMAKE=${prefix}/bin/qmake-mac + configure.env-append QMAKE=${prefix}/libexec/qt4-mac/bin/qmake build.env-append QTDIR=${prefix}/libexec/qt4-mac - depends_lib-append path:bin/qmake-mac:qt4-mac + depends_lib-append port:qt4-mac configure.args-append --with-doxywizard # on Macs, qmake builds .app directories @@ -81,15 +81,15 @@ post-patch { reinplace "s|/Developer/qt-4.4.3|${prefix}/libexec/qt4-mac|g" ${worksrcpath}/addon/doxywizard/Makefile.doxywizard - reinplace "s|/Developer/qt/bin/moc|${prefix}/bin/moc-mac|g" ${worksrcpath}/addon/doxywizard/Makefile.doxywizard + reinplace "s|/Developer/qt/bin/moc|${prefix}/libexec/qt4-mac/bin/moc|g" ${worksrcpath}/addon/doxywizard/Makefile.doxywizard reinplace "s|-arch ppc -arch i386|-arch ${build_arch}|g" ${worksrcpath}/addon/doxywizard/Makefile.doxywizard - reinplace "s|/Developer/qt/bin/qmake|${prefix}/bin/qmake-mac|g" ${worksrcpath}/addon/doxywizard/Makefile.doxywizard + reinplace "s|/Developer/qt/bin/qmake|${prefix}/libexec/qt4-mac/bin/qmake|g" ${worksrcpath}/addon/doxywizard/Makefile.doxywizard # give doxywizard the more mac-like name of DoxyWizard reinplace "/^TARGET\[\[:space:\]\]/s%=.*%= DoxyWizard%" ${worksrcpath}/addon/doxywizard/doxywizard.pro.in reinplace "/^macx-g++\[\[:space:\]\]{/,/}/d" ${worksrcpath}/addon/doxywizard/doxywizard.pro.in reinplace "s|__APPLICATIONS_DIR__|${applications_dir}|" ${worksrcpath}/addon/doxywizard/Makefile.in reinplace "s|\$(INSTALL)|\$(DESTDIR)\$(INSTALL)|g" ${worksrcpath}/addon/doxywizard/Makefile.in - reinplace "s|QMAKE=qmake|QMAKE=${prefix}/bin/qmake-mac|g" ${worksrcpath}/addon/doxywizard/Makefile.in + reinplace "s|QMAKE=qmake|QMAKE=${prefix}/libexec/qt4-mac/bin/qmake|g" ${worksrcpath}/addon/doxywizard/Makefile.in } post-destroot {

1 0

[69241] trunk/dports/audio/liblastfm/Portfile
by michaelld＠macports.org 29 Jun '10

29 Jun '10

Revision: 69241 http://trac.macports.org/changeset/69241 Author: michaelld(a)macports.org Date: 2010-06-28 23:41:27 -0700 (Mon, 28 Jun 2010) Log Message: ----------- Correct use of qt4-mac dependency and qmake issue. Modified Paths: -------------- trunk/dports/audio/liblastfm/Portfile Modified: trunk/dports/audio/liblastfm/Portfile =================================================================== --- trunk/dports/audio/liblastfm/Portfile 2010-06-29 06:36:22 UTC (rev 69240) +++ trunk/dports/audio/liblastfm/Portfile 2010-06-29 06:41:27 UTC (rev 69241) @@ -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 @@ -4,7 +5,7 @@ name liblastfm version 0.3.0 -revision 2 +revision 3 categories audio maintainers nomaintainer description A set of libraries allowing use of the Last.fm site services. @@ -19,18 +20,28 @@ sha1 1dabd8d67f4a36aebad29608c6f89b895472c25a \ rmd160 39098fe55f88c3831ab5b1380c1e978c2ef55aac -depends_build port:ruby path:bin/qmake-mac:qt4-mac +depends_build port:ruby port:qt4-mac depends_lib port:libsamplerate port:fftw-3-single -set qt qt4-mac -set qtdir ${prefix}/libexec/${qt} +set qtdir ${prefix}/libexec/qt4-mac +universal_variant no + configure.env PATH=${qtdir}/bin:$env(PATH) configure.pre_args --prefix ${prefix} configure.args --release +post-configure { + # create Makefile's, then patch them to remove a flaw made by qmake + foreach tMf {src/Makefile src/fingerprint/Makefile \ + tests/Makefile demos/Makefile} { + system "cd ${worksrcpath} && make ${tMf}" + reinplace "s|-arch ${build_arch} -arch|-arch ${build_arch}|" ${worksrcpath}/${tMf} + } +} + build.env PATH=${qtdir}/bin:$env(PATH) # fix build failure on Snow Leopard

1 0

[69240] trunk/dports/office/rednotebook/Portfile
by blb＠macports.org 29 Jun '10

29 Jun '10

Revision: 69240 http://trac.macports.org/changeset/69240 Author: blb(a)macports.org Date: 2010-06-28 23:36:22 -0700 (Mon, 28 Jun 2010) Log Message: ----------- office/rednotebook - fix livecheck Modified Paths: -------------- trunk/dports/office/rednotebook/Portfile Modified: trunk/dports/office/rednotebook/Portfile =================================================================== --- trunk/dports/office/rednotebook/Portfile 2010-06-29 06:36:18 UTC (rev 69239) +++ trunk/dports/office/rednotebook/Portfile 2010-06-29 06:36:22 UTC (rev 69240) @@ -35,3 +35,5 @@ ${destroot}${prefix}/share/doc/${name} } +livecheck.type freshmeat +

1 0

[69239] trunk/dports/audio/hydrogen/Portfile
by michaelld＠macports.org 29 Jun '10

29 Jun '10

Revision: 69239 http://trac.macports.org/changeset/69239 Author: michaelld(a)macports.org Date: 2010-06-28 23:36:18 -0700 (Mon, 28 Jun 2010) Log Message: ----------- Correct use of qt4-mac dependency. Modified Paths: -------------- trunk/dports/audio/hydrogen/Portfile Modified: trunk/dports/audio/hydrogen/Portfile =================================================================== --- trunk/dports/audio/hydrogen/Portfile 2010-06-29 06:35:31 UTC (rev 69238) +++ trunk/dports/audio/hydrogen/Portfile 2010-06-29 06:36:18 UTC (rev 69239) @@ -6,6 +6,7 @@ name hydrogen epoch 1 version 0.9.4 +revision 1 categories audio platforms macosx maintainers xenith.org:xenith @@ -23,7 +24,7 @@ depends_build port:scons -depends_lib path:bin/qmake-mac:qt4-mac \ +depends_lib port:qt4-mac \ port:flac \ port:libsndfile \ port:libtar

1 0

[69238] trunk/dports/devel/qgit/Portfile
by michaelld＠macports.org 29 Jun '10

29 Jun '10

Revision: 69238 http://trac.macports.org/changeset/69238 Author: michaelld(a)macports.org Date: 2010-06-28 23:35:31 -0700 (Mon, 28 Jun 2010) Log Message: ----------- Correct use of qt4-mac dependency. Modified Paths: -------------- trunk/dports/devel/qgit/Portfile Modified: trunk/dports/devel/qgit/Portfile =================================================================== --- trunk/dports/devel/qgit/Portfile 2010-06-29 06:34:32 UTC (rev 69237) +++ trunk/dports/devel/qgit/Portfile 2010-06-29 06:35:31 UTC (rev 69238) @@ -4,7 +4,7 @@ name qgit version 2.2 -revision 1 +revision 2 categories devel maintainers free.fr:ocroquette description A graphical interface to git repositories @@ -20,7 +20,7 @@ master_sites sourceforge checksums md5 f863efa000aa1549f803c6ad743decd6 -depends_lib path:bin/qmake-mac:qt4-mac port:git-core +depends_lib port:qt4-mac port:git-core patchfiles patch_src_namespace_def.cpp.diff patch_src_qgit.cpp.diff

1 0

[69237] trunk/dports/devel/qca/Portfile
by michaelld＠macports.org 29 Jun '10

29 Jun '10

Revision: 69237 http://trac.macports.org/changeset/69237 Author: michaelld(a)macports.org Date: 2010-06-28 23:34:32 -0700 (Mon, 28 Jun 2010) Log Message: ----------- Correct use of qt4-mac dependency. Modified Paths: -------------- trunk/dports/devel/qca/Portfile Modified: trunk/dports/devel/qca/Portfile =================================================================== --- trunk/dports/devel/qca/Portfile 2010-06-29 06:29:06 UTC (rev 69236) +++ trunk/dports/devel/qca/Portfile 2010-06-29 06:34:32 UTC (rev 69237) @@ -3,6 +3,7 @@ PortSystem 1.0 name qca version 2.0.2 +revision 1 set branch [join [lrange [split ${version} .] 0 1] .] set major [lindex [split ${version} .] 0] categories devel crypto security @@ -24,7 +25,7 @@ sha1 5a414c3296cd37d1ec34182be0d089c5073f55a8 \ rmd160 18b0f497709f9700227644977946735d2ec3c623 -depends_lib path:bin/qmake-mac:qt4-mac +depends_lib port:qt4-mac configure.args --qtdir=${prefix}/libexec/qt4-mac \ --no-framework

1 0

[69236] trunk/dports/www/ajp-wsgi
by blb＠macports.org 29 Jun '10

29 Jun '10

Revision: 69236 http://trac.macports.org/changeset/69236 Author: blb(a)macports.org Date: 2010-06-28 23:29:06 -0700 (Mon, 28 Jun 2010) Log Message: ----------- www/ajp-wsgi - update to 1.0.2, remove python24 variant since that is quite old these days, patch for python25 no longer needed Modified Paths: -------------- trunk/dports/www/ajp-wsgi/Portfile Removed Paths: ------------- trunk/dports/www/ajp-wsgi/files/ Modified: trunk/dports/www/ajp-wsgi/Portfile =================================================================== --- trunk/dports/www/ajp-wsgi/Portfile 2010-06-29 06:23:36 UTC (rev 69235) +++ trunk/dports/www/ajp-wsgi/Portfile 2010-06-29 06:29:06 UTC (rev 69236) @@ -2,8 +2,7 @@ PortSystem 1.0 name ajp-wsgi -version 1.0 -revision 1 +version 1.0.2 categories www maintainers blb description WSGI server/gateway implementing AJP @@ -20,9 +19,9 @@ master_sites ${homepage}/dist/ use_bzip2 yes -checksums md5 bce919cac8d964dfecfc4f407002d52b \ - sha1 1c17de9dbd8057b0754850b261a798bfcd874cab \ - rmd160 a18856043b83dcdcee4ab41f79de4ae13bc19022 +checksums md5 68a9c049c662aa243c2e5966a75b130e \ + sha1 2edb4a708ab81d9cc8f0c0dd9e309ca62015d4d5 \ + rmd160 0bcf03ab21f3840d80c6831570327cccaabf8d63 configure.args configure.py configure.pre_args @@ -38,36 +37,20 @@ ${destroot}${prefix}/share/examples/${name} } -variant python24 conflicts python25 python26 description {Use with Python 2.4} { - depends_lib-append port:python24 - configure.cmd ${prefix}/bin/python2.4 -} - -variant python25 conflicts python24 python26 description {Use with Python 2.5} { +variant python25 conflicts python26 description {Use with Python 2.5} { depends_lib-append port:python25 configure.cmd ${prefix}/bin/python2.5 } -variant python26 conflicts python24 python25 description {Use with Python 2.6} { +variant python26 conflicts python25 description {Use with Python 2.6} { depends_lib-append port:python26 configure.cmd ${prefix}/bin/python2.6 } -if {![variant_isset python24] && ![variant_isset python25] && ![variant_isset python26]} { +if {![variant_isset python25] && ![variant_isset python26]} { default_variants +python26 } -platform macosx { - if {[variant_isset python25]} { - # work around funky LINKFORSHARED with python25 - patchfiles-append patch-Makefile.in.py25mac.diff - post-patch { - reinplace "s|@@@FRAMEWORKS_DIR@@@|${frameworks_dir}|g" \ - ${worksrcpath}/Makefile.in - } - } -} - livecheck.type regex livecheck.url "${master_sites}?C=M;O=D" livecheck.regex "${name}-(\[0-9.\]+)${extract.suffix}"

1 0

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

29 Jun '10

Revision: 69235 http://trac.macports.org/changeset/69235 Author: michaelld(a)macports.org Date: 2010-06-28 23:23:36 -0700 (Mon, 28 Jun 2010) Log Message: ----------- Correct use of qt4-mac dependency. Modified Paths: -------------- trunk/dports/aqua/qtpfsgui/Portfile Modified: trunk/dports/aqua/qtpfsgui/Portfile =================================================================== --- trunk/dports/aqua/qtpfsgui/Portfile 2010-06-29 06:22:54 UTC (rev 69234) +++ trunk/dports/aqua/qtpfsgui/Portfile 2010-06-29 06:23:36 UTC (rev 69235) @@ -4,6 +4,7 @@ name qtpfsgui version 1.9.3 +revision 1 categories aqua graphics maintainers gmail.com:clubjuggler openmaintainer description GUI for HDR imaging workflow @@ -14,7 +15,8 @@ master_sites sourceforge patchfiles patch-app-path.diff -depends_lib path:bin/qmake-mac:qt4-mac port:exiv2 port:openexr port:ilmbase port:fftw-3-single port:tiff +depends_lib port:qt4-mac port:exiv2 port:openexr \ + port:ilmbase port:fftw-3-single port:tiff checksums md5 5a6421391e373c912e4a793e131151c8 \ sha1 adf037c54f55be50d931fa484cca169c01d0384d \

1 0