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

[69234] trunk/dports/python
by michaelld＠macports.org 29 Jun '10

29 Jun '10

Revision: 69234 http://trac.macports.org/changeset/69234 Author: michaelld(a)macports.org Date: 2010-06-28 23:22:54 -0700 (Mon, 28 Jun 2010) Log Message: ----------- Correct use of qt4-mac dependency; bump py25-pyqt4 to same as py26-pyqt4. Modified Paths: -------------- trunk/dports/python/py-pyqt4/Portfile trunk/dports/python/py25-pyqt4/Portfile trunk/dports/python/py26-pyqt4/Portfile Modified: trunk/dports/python/py-pyqt4/Portfile =================================================================== --- trunk/dports/python/py-pyqt4/Portfile 2010-06-29 06:16:52 UTC (rev 69233) +++ trunk/dports/python/py-pyqt4/Portfile 2010-06-29 06:22:54 UTC (rev 69234) @@ -4,7 +4,7 @@ name py-pyqt4 version 4.4.3 -revision 1 +revision 2 platforms macosx categories python devel maintainers gmail.com:tim.stoop @@ -23,7 +23,7 @@ sha1 6d1f3a717e551cd762b0adbd9c50f213c3ce8cbe \ rmd160 da91bedccfb6b1e3cbc69f527dd57ead83eb647e -depends_lib port:py-sip path:bin/qmake-mac:qt4-mac +depends_lib port:py-sip port:qt4-mac #patchfiles patch-configure.py Modified: trunk/dports/python/py25-pyqt4/Portfile =================================================================== --- trunk/dports/python/py25-pyqt4/Portfile 2010-06-29 06:16:52 UTC (rev 69233) +++ trunk/dports/python/py25-pyqt4/Portfile 2010-06-29 06:22:54 UTC (rev 69234) @@ -4,7 +4,8 @@ PortSystem 1.0 name py25-pyqt4 -version 4.7.2 +version 4.7.3 + categories python devel platforms macosx maintainers saispo openmaintainer @@ -20,11 +21,11 @@ distname PyQt-mac-gpl-${version} dist_subdir python -checksums md5 4a1a7b90251c5e83dea5294566827d3d \ - sha1 49dbbc000180ce6203a7f2989731b3156036a7a2 \ - rmd160 0f9eb7757d9cd0af042d7da8be6962f4f393327a +checksums md5 55ecd293b4a0e337b9c7e10479c53d96 \ + sha1 704403842dc609db614469308896454ebe7b5a50 \ + rmd160 76e0f7f7ffbaa9238a8001ae0cc384bb23558f08 -depends_lib port:py25-sip path:bin/qmake-mac:qt4-mac +depends_lib port:py25-sip port:qt4-mac set pyversion 2.5 set qt_dir ${prefix}/libexec/qt4-mac Modified: trunk/dports/python/py26-pyqt4/Portfile =================================================================== --- trunk/dports/python/py26-pyqt4/Portfile 2010-06-29 06:16:52 UTC (rev 69233) +++ trunk/dports/python/py26-pyqt4/Portfile 2010-06-29 06:22:54 UTC (rev 69234) @@ -5,6 +5,7 @@ name py26-pyqt4 version 4.7.3 +revision 1 categories python devel platforms macosx maintainers saispo openmaintainer @@ -24,7 +25,7 @@ sha1 704403842dc609db614469308896454ebe7b5a50 \ rmd160 76e0f7f7ffbaa9238a8001ae0cc384bb23558f08 -depends_lib port:py26-sip path:bin/qmake-mac:qt4-mac +depends_lib port:py26-sip port:qt4-mac set pyversion 2.6 set qt_dir ${prefix}/libexec/qt4-mac

1 0

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

29 Jun '10

Revision: 69233 http://trac.macports.org/changeset/69233 Author: michaelld(a)macports.org Date: 2010-06-28 23:16:52 -0700 (Mon, 28 Jun 2010) Log Message: ----------- Correct use of qt4-mac dependency, and qmake issue. Modified Paths: -------------- trunk/dports/aqua/djview/Portfile Modified: trunk/dports/aqua/djview/Portfile =================================================================== --- trunk/dports/aqua/djview/Portfile 2010-06-29 06:15:14 UTC (rev 69232) +++ trunk/dports/aqua/djview/Portfile 2010-06-29 06:16:52 UTC (rev 69233) @@ -5,6 +5,7 @@ name djview version 4.5 +revision 1 categories aqua graphics www maintainers nomaintainer platforms darwin @@ -32,7 +33,7 @@ depends_lib \ port:djvulibre \ - path:bin/qmake-mac:qt4-mac + port:qt4-mac configure.env QTDIR=${prefix}/libexec/qt4-mac @@ -41,6 +42,14 @@ --disable-desktopfiles \ QMAKESPEC=macx-g++ +universal_variant no + +post-configure { + # fix issue with qmake adding an extra -arch sometimes + reinplace "s|-arch ${build_arch} -arch|-arch ${build_arch}|" \ + ${worksrcpath}/src/Makefile +} + destroot { xinstall -m 755 -d ${destroot}${applications_dir} copy ${worksrcpath}/src/djview.app ${destroot}${applications_dir}

1 0

[69232] trunk/dports/aqua/qtoctave-mac/Portfile
by michaelld＠macports.org 29 Jun '10

29 Jun '10

Revision: 69232 http://trac.macports.org/changeset/69232 Author: michaelld(a)macports.org Date: 2010-06-28 23:15:14 -0700 (Mon, 28 Jun 2010) Log Message: ----------- Correct use of qt4-mac dependency. Modified Paths: -------------- trunk/dports/aqua/qtoctave-mac/Portfile Modified: trunk/dports/aqua/qtoctave-mac/Portfile =================================================================== --- trunk/dports/aqua/qtoctave-mac/Portfile 2010-06-29 06:05:11 UTC (rev 69231) +++ trunk/dports/aqua/qtoctave-mac/Portfile 2010-06-29 06:15:14 UTC (rev 69232) @@ -2,7 +2,7 @@ PortSystem 1.0 name qtoctave-mac version 0.8.2 -revision 1 +revision 2 categories aqua math platforms darwin maintainers and.damore openmaintainer @@ -15,7 +15,7 @@ distname qtoctave-${version} master_sites http://forja.rediris.es/frs/download.php/1383/ depends_lib port:octave \ - path:bin/qmake-mac:qt4-mac + port:qt4-mac depends_build bin:cmake:cmake checksums md5 56d0d7bece168b7df6a6b30d448266f4 \ @@ -27,4 +27,3 @@ configure.pre_args -DCMAKE_INSTALL_PREFIX=${prefix} configure.args -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake \ -G \"Unix Makefiles\" . -

1 0

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

29 Jun '10

Revision: 69231 http://trac.macports.org/changeset/69231 Author: michaelld(a)macports.org Date: 2010-06-28 23:05:11 -0700 (Mon, 28 Jun 2010) Log Message: ----------- Correct qt4-mac dependency for gui variant. Modified Paths: -------------- trunk/dports/devel/cmake/Portfile Modified: trunk/dports/devel/cmake/Portfile =================================================================== --- trunk/dports/devel/cmake/Portfile 2010-06-29 05:57:42 UTC (rev 69230) +++ trunk/dports/devel/cmake/Portfile 2010-06-29 06:05:11 UTC (rev 69231) @@ -6,7 +6,7 @@ name cmake version 2.8.1 -revision 2 +revision 3 categories devel maintainers css description Cross-platform make @@ -45,7 +45,7 @@ } variant gui description {Qt4 based cmake-gui} { - depends_lib-append path:libexec/qt4-mac:qt4-mac + depends_lib-append port:qt4-mac patchfiles-append patch-CMakeLists.txt.diff configure.args-append --qt-gui --qt-qmake=${prefix}/libexec/qt4-mac/bin/qmake }

1 0

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

29 Jun '10

Revision: 69230 http://trac.macports.org/changeset/69230 Author: blb(a)macports.org Date: 2010-06-28 22:57:42 -0700 (Mon, 28 Jun 2010) Log Message: ----------- www/ajp-wsgi - whitespace Modified Paths: -------------- trunk/dports/www/ajp-wsgi/Portfile Modified: trunk/dports/www/ajp-wsgi/Portfile =================================================================== --- trunk/dports/www/ajp-wsgi/Portfile 2010-06-29 05:52:46 UTC (rev 69229) +++ trunk/dports/www/ajp-wsgi/Portfile 2010-06-29 05:57:42 UTC (rev 69230) @@ -1,12 +1,12 @@ # $Id$ -PortSystem 1.0 -name ajp-wsgi -version 1.0 -revision 1 -categories www -maintainers blb -description WSGI server/gateway implementing AJP +PortSystem 1.0 +name ajp-wsgi +version 1.0 +revision 1 +categories www +maintainers blb +description WSGI server/gateway implementing AJP long_description \ ajp-wsgi is a WSGI server/gateway that implements AJP 1.3 to \ communicate with a web server. It is written in C and embeds a Python \ @@ -14,17 +14,17 @@ transport code is in C, ajp-wsgi is significantly faster than flup's \ pure-Python ajp server. -platforms darwin +platforms darwin -homepage http://www.saddi.com/software/ajp-wsgi -master_sites ${homepage}/dist/ -use_bzip2 yes +homepage http://www.saddi.com/software/ajp-wsgi +master_sites ${homepage}/dist/ +use_bzip2 yes -checksums md5 bce919cac8d964dfecfc4f407002d52b \ - sha1 1c17de9dbd8057b0754850b261a798bfcd874cab \ - rmd160 a18856043b83dcdcee4ab41f79de4ae13bc19022 +checksums md5 bce919cac8d964dfecfc4f407002d52b \ + sha1 1c17de9dbd8057b0754850b261a798bfcd874cab \ + rmd160 a18856043b83dcdcee4ab41f79de4ae13bc19022 -configure.args configure.py +configure.args configure.py configure.pre_args destroot {

1 0

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

29 Jun '10

Revision: 69229 http://trac.macports.org/changeset/69229 Author: michaelld(a)macports.org Date: 2010-06-28 22:52:46 -0700 (Mon, 28 Jun 2010) Log Message: ----------- Correct use of qt4-mac; added aspell use; correct location of aspell and use of -lz. Modified Paths: -------------- trunk/dports/editors/tea/Portfile Modified: trunk/dports/editors/tea/Portfile =================================================================== --- trunk/dports/editors/tea/Portfile 2010-06-29 05:31:26 UTC (rev 69228) +++ trunk/dports/editors/tea/Portfile 2010-06-29 05:52:46 UTC (rev 69229) @@ -1,3 +1,4 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; truncate-lines: t; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4 # $Id$ PortSystem 1.0 @@ -4,6 +5,7 @@ name tea version 25.1.0 +revision 1 description TEA is the powerful text editor for GNU/Linux and *BSD. long_description ${description} maintainers nomaintainer @@ -16,7 +18,8 @@ sha1 49d3c2d5058652f527ea82f6fe1e0c69f6d8433f \ rmd160 1c2dc1173038a5a0334dff3c6fd56501bb28dd20 -depends_lib path:bin/qmake-mac:qt4-mac +depends_lib port:qt4-mac \ + port:aspell use_bzip2 yes @@ -26,6 +29,11 @@ build.args CC=${configure.cc} +post-patch { + reinplace "s|/usr|${prefix}|" ${worksrcpath}/src.pro + reinplace "s|-laspell|-laspell -lz|" ${worksrcpath}/src.pro +} + destroot { copy ${worksrcpath}/bin/tea.app ${destroot}${applications_dir} }

1 0

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

29 Jun '10

Revision: 69228 http://trac.macports.org/changeset/69228 Author: michaelld(a)macports.org Date: 2010-06-28 22:31:26 -0700 (Mon, 28 Jun 2010) Log Message: ----------- Corrected depends for qt4-mac; added variant for python26. Modified Paths: -------------- trunk/dports/aqua/qtiplot/Portfile Modified: trunk/dports/aqua/qtiplot/Portfile =================================================================== --- trunk/dports/aqua/qtiplot/Portfile 2010-06-29 05:30:02 UTC (rev 69227) +++ trunk/dports/aqua/qtiplot/Portfile 2010-06-29 05:31:26 UTC (rev 69228) @@ -5,7 +5,7 @@ name qtiplot version 0.9.7.9 -revision 1 +revision 2 categories aqua science maintainers jonas openmaintainer @@ -22,7 +22,7 @@ master_sites http://download.berlios.de/qtiplot/ use_bzip2 yes -depends_lib path:bin/qmake-mac:qt4-mac \ +depends_lib port:qt4-mac \ port:muparser \ port:boost \ port:gsl \ @@ -57,7 +57,7 @@ # target specific configuration puts $confFD "contains( TARGET, qtiplot ) \{" puts $confFD "SCRIPTING_LANGS += muParser"; # currently you can't build without - if {[variant_isset python25]} { + if {[variant_isset python25] || [variant_isset python26]} { puts $confFD "SCRIPTING_LANGS += Python" } puts $confFD "DEFINES += SCRIPTING_CONSOLE" @@ -103,9 +103,14 @@ ${plugin_dir} } -variant python25 description "add support for python scripting" { +variant python25 conflicts python26 description "add support for python26 scripting" { depends_lib-append port:python25 \ port:py25-sip \ port:py25-pyqt4 } +variant python26 conflicts python25 description "add support for python26 scripting" { + depends_lib-append port:python26 \ + port:py26-sip \ + port:py26-pyqt4 +}

1 0

[69227] branches/gsoc10-mpwa/app/models/port.rb
by jrozner＠macports.org 29 Jun '10

29 Jun '10

Revision: 69227 http://trac.macports.org/changeset/69227 Author: jrozner(a)macports.org Date: 2010-06-28 22:30:02 -0700 (Mon, 28 Jun 2010) Log Message: ----------- updated active record association from name change Modified Paths: -------------- branches/gsoc10-mpwa/app/models/port.rb Modified: branches/gsoc10-mpwa/app/models/port.rb =================================================================== --- branches/gsoc10-mpwa/app/models/port.rb 2010-06-29 05:28:08 UTC (rev 69226) +++ branches/gsoc10-mpwa/app/models/port.rb 2010-06-29 05:30:02 UTC (rev 69227) @@ -3,6 +3,6 @@ has_many :dependencies, :through => :port_dependencies has_many :comments has_one :category - has_many :supplimental_categories + has_many :supplemental_categories belongs_to :category end

1 0

[69226] trunk/dports/databases/sqliteman/Portfile
by michaelld＠macports.org 29 Jun '10

29 Jun '10

Revision: 69226 http://trac.macports.org/changeset/69226 Author: michaelld(a)macports.org Date: 2010-06-28 22:28:08 -0700 (Mon, 28 Jun 2010) Log Message: ----------- Fix header location of Qscintilla; remove unnecessary explicit dependency on qt4-mac (leave it implicit via Qsci). Modified Paths: -------------- trunk/dports/databases/sqliteman/Portfile Modified: trunk/dports/databases/sqliteman/Portfile =================================================================== --- trunk/dports/databases/sqliteman/Portfile 2010-06-29 05:27:00 UTC (rev 69225) +++ trunk/dports/databases/sqliteman/Portfile 2010-06-29 05:28:08 UTC (rev 69226) @@ -5,6 +5,7 @@ name sqliteman version 1.2.1 +revision 1 description GUI tool for Sqlite3 long_description The best developer's and/or admin's GUI tool for Sqlite3 in the world. \ No joking here (or just a bit only) - it contains the most complete \ @@ -26,13 +27,14 @@ depends_build port:cmake depends_lib port:sqlite3 \ - path:bin/qmake-mac:qt4-mac \ port:qscintilla # qscintilla is not universal universal_variant no configure.cmd cmake -configure.pre_args -DCMAKE_INSTALL_PREFIX=${prefix} +configure.pre_args \ + -DCMAKE_INSTALL_PREFIX=${prefix} \ + -DQSCINTILLA_INCLUDE_DIR:PATH=${prefix}/libexec/qt4-mac/include/Qsci \ + -DQT_ZLIB_LIBRARY:FILEPATH=${prefix}/lib/libz.dylib configure.args -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake -

1 0

[69225] branches/gsoc10-mpwa/app/models/supplemental_category.rb
by jrozner＠macports.org 29 Jun '10

29 Jun '10

Revision: 69225 http://trac.macports.org/changeset/69225 Author: jrozner(a)macports.org Date: 2010-06-28 22:27:00 -0700 (Mon, 28 Jun 2010) Log Message: ----------- fixed name of the model Modified Paths: -------------- branches/gsoc10-mpwa/app/models/supplemental_category.rb Modified: branches/gsoc10-mpwa/app/models/supplemental_category.rb =================================================================== --- branches/gsoc10-mpwa/app/models/supplemental_category.rb 2010-06-29 05:01:46 UTC (rev 69224) +++ branches/gsoc10-mpwa/app/models/supplemental_category.rb 2010-06-29 05:27:00 UTC (rev 69225) @@ -1,3 +1,3 @@ -class SupplimentalCategory < ActiveRecord::Base +class SupplementalCategory < ActiveRecord::Base belongs_to :port end

1 0