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

[74655] trunk/base/src/port/port.tcl
by jmr＠macports.org 26 Dec '10

26 Dec '10

Revision: 74655 http://trac.macports.org/changeset/74655 Author: jmr(a)macports.org Date: 2010-12-26 10:35:31 -0800 (Sun, 26 Dec 2010) Log Message: ----------- add 'logfile' action to print location of port log file(s) Modified Paths: -------------- trunk/base/src/port/port.tcl Modified: trunk/base/src/port/port.tcl =================================================================== --- trunk/base/src/port/port.tcl 2010-12-26 18:35:21 UTC (rev 74654) +++ trunk/base/src/port/port.tcl 2010-12-26 18:35:31 UTC (rev 74655) @@ -3546,6 +3546,15 @@ puts $portfile } + logfile { + set logfile [file join [macports::getportlogpath $portdir] "main.log"] + if {[file isfile $logfile]} { + puts $logfile + } else { + ui_error "Log file not found for port in $portdir" + } + } + gohome { set homepage "" @@ -3790,6 +3799,7 @@ cd [list action_portcmds [ACTION_ARGS_PORTS]] \ url [list action_portcmds [ACTION_ARGS_PORTS]] \ file [list action_portcmds [ACTION_ARGS_PORTS]] \ + logfile [list action_portcmds [ACTION_ARGS_PORTS]] \ gohome [list action_portcmds [ACTION_ARGS_PORTS]] \ \ fetch [list action_target [ACTION_ARGS_PORTS]] \

1 0

[74654] trunk/dports/python/py27-sip/Portfile
by macsforever2000＠macports.org 26 Dec '10

26 Dec '10

Revision: 74654 http://trac.macports.org/changeset/74654 Author: macsforever2000(a)macports.org Date: 2010-12-26 10:35:21 -0800 (Sun, 26 Dec 2010) Log Message: ----------- py27-sip: Update to version 4.12. Modified Paths: -------------- trunk/dports/python/py27-sip/Portfile Modified: trunk/dports/python/py27-sip/Portfile =================================================================== --- trunk/dports/python/py27-sip/Portfile 2010-12-26 18:34:35 UTC (rev 74653) +++ trunk/dports/python/py27-sip/Portfile 2010-12-26 18:35:21 UTC (rev 74654) @@ -4,8 +4,7 @@ PortSystem 1.0 name py27-sip -version 4.11.2 -revision 1 +version 4.12 categories python devel maintainers nomaintainer platforms macosx @@ -27,9 +26,9 @@ http://www.gtlib.gatech.edu/pub/gentoo/distfiles/ distname sip-${version} -checksums md5 d799804ca0a88bd76c6c2cdf8935c3cb \ - sha1 586a86a55553617e39b1df8376166d03d697184c \ - rmd160 755e4610f9e3359df0a7a9f009ad16a5592341f0 +checksums md5 8a0998fbaf34bdab2c15af3d4fa3bc0e \ + sha1 6ab3232d44afc2c58dc347103653313fda4e0d33 \ + rmd160 7aee4657ac9e244d993a366d21581a4148b72659 dist_subdir python

1 0

[74653] trunk/dports/editors/ecb/Portfile
by ryandesign＠macports.org 26 Dec '10

26 Dec '10

Revision: 74653 http://trac.macports.org/changeset/74653 Author: ryandesign(a)macports.org Date: 2010-12-26 10:34:35 -0800 (Sun, 26 Dec 2010) Log Message: ----------- ecb: no need to eval an xinstall that just makes a single directory Modified Paths: -------------- trunk/dports/editors/ecb/Portfile Modified: trunk/dports/editors/ecb/Portfile =================================================================== --- trunk/dports/editors/ecb/Portfile 2010-12-26 18:19:12 UTC (rev 74652) +++ trunk/dports/editors/ecb/Portfile 2010-12-26 18:34:35 UTC (rev 74653) @@ -35,7 +35,7 @@ build.args CEDET=${lispdir} destroot { - eval xinstall -d ${destroot}${lispdir} + xinstall -d ${destroot}${lispdir} eval xinstall -m 0644 [glob -directory ${worksrcpath} *.el *.elc] \ ${destroot}${lispdir}

1 0

[74652] trunk/dports/lang/pypy
by jmr＠macports.org 26 Dec '10

26 Dec '10

Revision: 74652 http://trac.macports.org/changeset/74652 Author: jmr(a)macports.org Date: 2010-12-26 10:19:12 -0800 (Sun, 26 Dec 2010) Log Message: ----------- pypy: update to 1.4.1 Modified Paths: -------------- trunk/dports/lang/pypy/Portfile trunk/dports/lang/pypy/files/darwin.py.diff Modified: trunk/dports/lang/pypy/Portfile =================================================================== --- trunk/dports/lang/pypy/Portfile 2010-12-26 18:05:23 UTC (rev 74651) +++ trunk/dports/lang/pypy/Portfile 2010-12-26 18:19:12 UTC (rev 74652) @@ -4,7 +4,7 @@ PortSystem 1.0 name pypy -version 1.4 +version 1.4.1 categories lang python devel license MIT/PSF maintainers jmr openmaintainer @@ -19,11 +19,11 @@ homepage http://pypy.org/ master_sites http://pypy.org/download/ use_bzip2 yes -distfiles ${name}-${version}-src${extract.suffix} +distname ${name}-${version}-src -checksums md5 6c7e5a3fab4b3f6357aab84927420b49 \ - sha1 22cb3d9d4ecf6a8d1094708df7cfe5633f848d22 \ - rmd160 06a3f2a5a8d9d817158420b5a8283758fe58b134 +checksums md5 ebbbb156b1eb842e9e65d909ed5f9f6d \ + sha1 922a8815377fe2e0c015338fa8b28ae16bf8c840 \ + rmd160 9f54887650fc8411c6f779cb56c0ee8cfa78efa1 depends_build port:pkgconfig depends_lib port:libffi \ @@ -42,11 +42,15 @@ } build.dir ${worksrcpath}/pypy/translator/goal -# next release (after 1.4) should use pypy to build if it's already installed -build.cmd ${prefix}/bin/python2.6 +# use pypy to build if it's already installed +if {[file executable ${prefix}/lib/pypy/pypy-c]} { + build.cmd ${prefix}/lib/pypy/pypy-c +} else { + build.cmd ${prefix}/bin/python2.6 +} build.args --batch --cc=${configure.cc} --opt=jit \ --make-jobs=${build.jobs} \ - --cflags=\"${configure.cc_archflags} ${configure.cppflags} ${configure.ldflags}\" + --cflags='${configure.cc_archflags} ${configure.cppflags} ${configure.ldflags}' build.target translate.py build.post_args targetpypystandalone.py Modified: trunk/dports/lang/pypy/files/darwin.py.diff =================================================================== --- trunk/dports/lang/pypy/files/darwin.py.diff 2010-12-26 18:05:23 UTC (rev 74651) +++ trunk/dports/lang/pypy/files/darwin.py.diff 2010-12-26 18:19:12 UTC (rev 74652) @@ -11,7 +11,7 @@ standalone_only = ('-mdynamic-no-pic',) shared_only = () -@@ -29,21 +29,19 @@ +@@ -31,21 +31,19 @@ def _preprocess_include_dirs(self, include_dirs): res_incl_dirs = list(include_dirs) @@ -37,7 +37,7 @@ def check___thread(self): # currently __thread is not supported by Darwin gccs -@@ -78,13 +76,13 @@ +@@ -80,12 +78,12 @@ class Darwin_i386(Darwin): name = "darwin_i386" @@ -54,4 +54,3 @@ cflags = ('-arch', 'x86_64', '-O3', '-fomit-frame-pointer', - '-mmacosx-version-min=10.4') + '-mmacosx-version-min=__MDT__') - default_cc = 'gcc-4.0'

1 0

[74651] trunk/dports/editors/ecb/Portfile
by ryandesign＠macports.org 26 Dec '10

26 Dec '10

Revision: 74651 http://trac.macports.org/changeset/74651 Author: ryandesign(a)macports.org Date: 2010-12-26 10:05:23 -0800 (Sun, 26 Dec 2010) Log Message: ----------- ecb is noarch Modified Paths: -------------- trunk/dports/editors/ecb/Portfile Modified: trunk/dports/editors/ecb/Portfile =================================================================== --- trunk/dports/editors/ecb/Portfile 2010-12-26 18:03:38 UTC (rev 74650) +++ trunk/dports/editors/ecb/Portfile 2010-12-26 18:05:23 UTC (rev 74651) @@ -5,9 +5,12 @@ name ecb version 2.40 +revision 1 categories editors platforms darwin maintainers nomaintainer +supported_archs noarch + description Emacs Code Browser long_description \

1 0

[74650] trunk/dports/editors/ecb/Portfile
by ryandesign＠macports.org 26 Dec '10

26 Dec '10

Revision: 74650 http://trac.macports.org/changeset/74650 Author: ryandesign(a)macports.org Date: 2010-12-26 10:03:38 -0800 (Sun, 26 Dec 2010) Log Message: ----------- ecb: change cedet-devel dependency to cedet Modified Paths: -------------- trunk/dports/editors/ecb/Portfile Modified: trunk/dports/editors/ecb/Portfile =================================================================== --- trunk/dports/editors/ecb/Portfile 2010-12-26 18:03:16 UTC (rev 74649) +++ trunk/dports/editors/ecb/Portfile 2010-12-26 18:03:38 UTC (rev 74650) @@ -23,7 +23,7 @@ sha1 9d790b10572711cbcd032b306dfa2245950835f0 \ rmd160 f0ccbbb4f8303f2557ce32c93a65de12226116b9 -depends_lib port:emacs port:cedet-devel +depends_lib port:emacs port:cedet use_configure no

1 0

[74649] trunk/dports/editors/cedet-devel/Portfile
by ryandesign＠macports.org 26 Dec '10

26 Dec '10

Revision: 74649 http://trac.macports.org/changeset/74649 Author: ryandesign(a)macports.org Date: 2010-12-26 10:03:16 -0800 (Sun, 26 Dec 2010) Log Message: ----------- cedet-devel: replaced_by cedet Modified Paths: -------------- trunk/dports/editors/cedet-devel/Portfile Modified: trunk/dports/editors/cedet-devel/Portfile =================================================================== --- trunk/dports/editors/cedet-devel/Portfile 2010-12-26 17:59:22 UTC (rev 74648) +++ trunk/dports/editors/cedet-devel/Portfile 2010-12-26 18:03:16 UTC (rev 74649) @@ -4,8 +4,8 @@ PortSystem 1.0 name cedet-devel -set my_name cedet -version 1.0pre7 +replaced_by cedet +version 1.0 categories editors platforms darwin maintainers nomaintainer @@ -18,56 +18,11 @@ and is optimized to use Emacs' parsing capabilities. homepage http://cedet.sourceforge.net/ -master_sites sourceforge:$my_name -distname $my_name-$version +distfiles -checksums md5 e9862e293d27ae03c74f510a2a40c1eb \ - sha1 b48bfe50df43b6941e9ffd40256c10d58b14b832 \ - rmd160 4f90db2ad9c63a3d8ff6ac9e3a1c83f99fb2b777 - -depends_lib port:emacs - -use_configure no - -use_parallel_build yes - -destroot { - set lispdir $prefix/share/emacs/site-lisp - - set packages { - common - ede - speedbar - eieio - semantic - cogre - contrib - srecode - } - - proc destroot_package package_dir { - global destroot worksrcpath - upvar lispdir lispdir - - xinstall -d $destroot$lispdir/$package_dir - foreach f [glob -directory $worksrcpath/$package_dir *] { - if {[file isdirectory $f]} { - set p [file tail $f] - - if {$p ne "." && $p ne ".."} { - destroot_package $package_dir/$p - } - } else { - set ext [file extension $f] - - if {$ext eq ".el" || $ext eq ".elc"} { - xinstall -m 644 $f $destroot$lispdir/$package_dir - } - } - } - } - - foreach p $packages { - destroot_package $p - } +pre-configure { + ui_error "${name} has been renamed to ${replaced_by}. Please install ${replaced_by} instead." + return -code error "obsolete port" } + +livecheck.type none

1 0

[74648] trunk/dports/editors
by ryandesign＠macports.org 26 Dec '10

26 Dec '10

Revision: 74648 http://trac.macports.org/changeset/74648 Author: ryandesign(a)macports.org Date: 2010-12-26 09:59:22 -0800 (Sun, 26 Dec 2010) Log Message: ----------- cedet: new port, version 1.0, copied from cedet-devel 1.0pre7, which it will replace Modified Paths: -------------- trunk/dports/editors/cedet/Portfile Added Paths: ----------- trunk/dports/editors/cedet/ Modified: trunk/dports/editors/cedet/Portfile =================================================================== --- trunk/dports/editors/cedet-devel/Portfile 2010-12-24 12:40:22 UTC (rev 74629) +++ trunk/dports/editors/cedet/Portfile 2010-12-26 17:59:22 UTC (rev 74648) @@ -3,12 +3,13 @@ PortSystem 1.0 -name cedet-devel -set my_name cedet -version 1.0pre7 +name cedet +version 1.0 categories editors platforms darwin maintainers nomaintainer +supported_archs noarch + description Infrastructure for parser based text analysis in Emacs long_description \ @@ -18,12 +19,10 @@ and is optimized to use Emacs' parsing capabilities. homepage http://cedet.sourceforge.net/ -master_sites sourceforge:$my_name -distname $my_name-$version +master_sites sourceforge -checksums md5 e9862e293d27ae03c74f510a2a40c1eb \ - sha1 b48bfe50df43b6941e9ffd40256c10d58b14b832 \ - rmd160 4f90db2ad9c63a3d8ff6ac9e3a1c83f99fb2b777 +checksums sha1 bc3c7c22465f79df603fb6bb5684442a439f198e \ + rmd160 a3703cb76f21468a1d218a091599441ca9aa5d11 depends_lib port:emacs

1 0

[74647] trunk/dports/devel/depot_tools/Portfile
by snc＠macports.org 26 Dec '10

26 Dec '10

Revision: 74647 http://trac.macports.org/changeset/74647 Author: snc(a)macports.org Date: 2010-12-26 09:33:44 -0800 (Sun, 26 Dec 2010) Log Message: ----------- depot_tools: update to 70181 Modified Paths: -------------- trunk/dports/devel/depot_tools/Portfile Modified: trunk/dports/devel/depot_tools/Portfile =================================================================== --- trunk/dports/devel/depot_tools/Portfile 2010-12-26 17:30:22 UTC (rev 74646) +++ trunk/dports/devel/depot_tools/Portfile 2010-12-26 17:33:44 UTC (rev 74647) @@ -4,7 +4,7 @@ PortSystem 1.0 name depot_tools -version 67904 +version 70181 categories devel maintainers snc openmaintainer description Manages interaction with the Chromium development process

1 0

[74646] trunk/dports/aqua/qtiplot
by macsforever2000＠macports.org 26 Dec '10

26 Dec '10

Revision: 74646 http://trac.macports.org/changeset/74646 Author: macsforever2000(a)macports.org Date: 2010-12-26 09:30:22 -0800 (Sun, 26 Dec 2010) Log Message: ----------- qtiplot: patch fix and fix for new qt4-mac. (#26960) Modified Paths: -------------- trunk/dports/aqua/qtiplot/Portfile Added Paths: ----------- trunk/dports/aqua/qtiplot/files/patch-ApplicationWindow.diff Modified: trunk/dports/aqua/qtiplot/Portfile =================================================================== --- trunk/dports/aqua/qtiplot/Portfile 2010-12-26 17:08:33 UTC (rev 74645) +++ trunk/dports/aqua/qtiplot/Portfile 2010-12-26 17:30:22 UTC (rev 74646) @@ -6,6 +6,7 @@ name qtiplot version 0.9.8.3 +revision 1 categories aqua science maintainers jonas openmaintainer @@ -14,27 +15,43 @@ present 2D and 3D data and has various data analysis functions \ like curve fitting. Plotting of 3D data can be rendered using \ OpenGL using the Qwt3D libraries.\ - It's a full-featured data analysis and plotting package available \ + It is a full-featured data analysis and plotting package available \ on Linux, Windows and Mac OS X platforms that supports python scripting. platforms darwin homepage http://soft.proindependent.com/qtiplot.html master_sites http://download.berlios.de/qtiplot/ -use_bzip2 yes -depends_lib-append port:muparser \ +distfiles ${distname}.zip \ + QTeXEngine-0.2-opensource.zip \ + liborigin2-13092010.zip + +depends_lib-append path:bin/qmake-mac:qt4-mac \ + port:muparser \ port:boost \ port:gsl \ port:libpng \ port:zlib -checksums md5 317f45128eef208b2d6b9c28a2e3fa6e \ - sha1 e5ffdd25f1f69611f3f39a0b22e8c23959ab51e1 \ - rmd160 864e45bd9e74f3dd7526c84d387ab88438c1ee70 +checksums qtiplot-0.9.8.3.zip \ + md5 c90e9dc08e03dc1cd0db19dfe8941f0c \ + sha1 35dec539fb20b8c7ca121cca11f7b800b4ff0c6b \ + rmd160 2b0fd5b710d2752a1a413f83cbee9daf1e88edbf \ + QTeXEngine-0.2-opensource.zip \ + md5 fc2fe7f3fdb9e06c00d1f5c3c3e68920 \ + sha1 b484a4da7a0f3103e188539bfa6c1910dc9b55ca \ + rmd160 76ff1f2f96cd6df0ea5e6965013e0db452c55f09 \ + liborigin2-13092010.zip \ + md5 e2b41c4d8a1e2d357dd2b5b331d31375 \ + sha1 3f17d5a8c484ddb864a29a91a94d677b0b3b18d7 \ + rmd160 df7f4bafc1b9815c5921c09b435f431d8a1947e6 -patchfiles patch-qtiplot-qtiplot.pro \ - patch-qtiplot-src-scripting-scripting.pri +patchfiles patch-ApplicationWindow.diff +use_zip yes + +universal_variant no + use_parallel_build yes pre-configure { @@ -52,7 +69,19 @@ # till upstream catches up, we use a local copy of qwt puts $confFD "QWT_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwt/src" puts $confFD "QWT_LIBS = \$\$QTI_ROOT/3rdparty/qwt/lib/libqwt.a" + puts $confFD "QWT3D_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/qwtplot3d/include" + puts $confFD "unix:QWT3D_LIBS = \$\$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a" puts $confFD "LIBPNG_LIBS = -lpng" + puts $confFD "TEX_ENGINE_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/QTeXEngine/src" + puts $confFD "TEX_ENGINE_LIBS = \$\$QTI_ROOT/3rdparty/QTeXEngine/libQTeXEngine.a" + if {[variant_isset origin]} { + puts $confFD "LIBORIGIN_INCLUDEPATH = \$\$QTI_ROOT/3rdparty/liborigin2" + puts $confFD "LIBORIGIN_LIBS = \$\$QTI_ROOT/3rdparty/liborigin2/liborigin2.a" + } + + # linking to deprecated library + reinplace "s|<QAssistantClient>|\"qassistantclient.h\"|g" ${worksrcpath}/qtiplot/src/core/ApplicationWindow.cpp + # target specific configuration puts $confFD "contains( TARGET, qtiplot ) \{" puts $confFD "SCRIPTING_LANGS += muParser"; # currently you can't build without @@ -71,6 +100,28 @@ import sys, os.path\\ sys.path.append(os.path.dirname(__file__)) " ${worksrcpath}/qtiplot/qtiplotrc.py + + if {[variant_isset origin]} { + # prepare liborigin2 + copy ${workpath}/liborigin2 ${worksrcpath}/3rdparty/liborigin2 + reinplace "s|INCLUDEPATH += ../boost|INCLUDEPATH += ${prefix}/include|g" ${worksrcpath}/3rdparty/liborigin2/liborigin2.pro + reinplace "s|lboost_thread|lboost_thread-mt|g" ${worksrcpath}/3rdparty/liborigin2/liborigin2.pro + reinplace "s|liborigin|liborigin2|g" ${worksrcpath}/qtiplot/src/origin/origin.pri + } + + # prepare qtexengine + copy ${workpath}/QTeXEngine ${worksrcpath}/3rdparty/QTexEngine + + # add 3rdparty to compilation + reinplace "s|3rdparty/qwtplot3d \|3rdparty/qwtplot3d 3rdparty/QTeXEngine \|g" \ + ${worksrcpath}/qtiplot.pro + if {[variant_isset origin]} { + reinplace "s|3rdparty/QTeXEngine \|3rdparty/QTeXEngine 3rdparty/liborigin2 \|g" \ + ${worksrcpath}/qtiplot.pro + } + + # use system-wide libraries + reinplace "s|#unix|unix|g" ${worksrcpath}/qtiplot/qtiplot.pro } configure.pre_args "PREFIX=${prefix}" @@ -102,6 +153,11 @@ ${plugin_dir} } +variant origin description "add support for originlab files" { + depends_lib-append port:treehh + patchfiles-append patch-importOPJ.cpp.diff +} + variant python25 conflicts python26 description "add support for python26 scripting" { depends_lib-append port:python25 \ port:py25-sip \ Added: trunk/dports/aqua/qtiplot/files/patch-ApplicationWindow.diff =================================================================== --- trunk/dports/aqua/qtiplot/files/patch-ApplicationWindow.diff (rev 0) +++ trunk/dports/aqua/qtiplot/files/patch-ApplicationWindow.diff 2010-12-26 17:30:22 UTC (rev 74646) @@ -0,0 +1,46 @@ +--- qtiplot/src/core/ApplicationWindow.cpp.orig 2010-10-12 08:53:20.000000000 +0200 ++++ qtiplot/src/core/ApplicationWindow.cpp 2010-11-10 22:19:52.000000000 +0100 +@@ -171,7 +171,7 @@ + #include <QVarLengthArray> + #include <QList> + #include <QUrl> +-#include <QAssistantClient> ++//#include <QAssistantClient> + #include <QFontComboBox> + #include <QSpinBox> + #include <QMdiArea> +@@ -352,7 +352,7 @@ + insertTranslatedStrings(); + disableToolbars(); + +- assistant = new QAssistantClient( QString(), this ); ++ //assistant = new QAssistantClient( QString(), this ); + + actionNextWindow = new QAction(QIcon(":/next.png"), tr("&Next","next window"), this); + actionNextWindow->setShortcut( tr("F5","next window shortcut") ); +@@ -11169,10 +11169,10 @@ + } + + QStringList cmdLst = QStringList() << "-profile" << profilePath; +- QAssistantClient *assist = new QAssistantClient( QString(), 0); +- assist->setArguments( cmdLst ); +- assist->showPage(helpPath); +- connect(assist, SIGNAL(assistantClosed()), qApp, SLOT(quit()) ); ++ //QAssistantClient *assist = new QAssistantClient( QString(), 0); ++ //assist->setArguments( cmdLst ); ++ //assist->showPage(helpPath); ++ //connect(assist, SIGNAL(assistantClosed()), qApp, SLOT(quit()) ); + } + + void ApplicationWindow::showHelp() +@@ -11203,8 +11203,8 @@ + } + + QStringList cmdLst = QStringList() << "-profile" << profilePath; +- assistant->setArguments( cmdLst ); +- assistant->showPage(helpFilePath); ++ //assistant->setArguments( cmdLst ); ++ //assistant->showPage(helpFilePath); + } + + void ApplicationWindow::showPlotWizard()

1 0