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

[72842] trunk/dports/archivers
by ryandesign＠macports.org 28 Oct '10

28 Oct '10

Revision: 72842 http://trac.macports.org/changeset/72842 Author: ryandesign(a)macports.org Date: 2010-10-28 11:54:56 -0700 (Thu, 28 Oct 2010) Log Message: ----------- xz and xz-devel conflict Modified Paths: -------------- trunk/dports/archivers/xz/Portfile trunk/dports/archivers/xz-devel/Portfile Modified: trunk/dports/archivers/xz/Portfile =================================================================== --- trunk/dports/archivers/xz/Portfile 2010-10-28 18:13:44 UTC (rev 72841) +++ trunk/dports/archivers/xz/Portfile 2010-10-28 18:54:56 UTC (rev 72842) @@ -23,7 +23,7 @@ depends_lib port:libiconv port:gettext -conflicts lzmautils +conflicts xz-devel lzmautils configure.args --with-libiconv-prefix=${prefix} --with-libintl-prefix=${prefix} Modified: trunk/dports/archivers/xz-devel/Portfile =================================================================== --- trunk/dports/archivers/xz-devel/Portfile 2010-10-28 18:13:44 UTC (rev 72841) +++ trunk/dports/archivers/xz-devel/Portfile 2010-10-28 18:54:56 UTC (rev 72842) @@ -23,7 +23,7 @@ depends_lib port:libiconv port:gettext -conflicts lzmautils +conflicts xz lzmautils patchfiles patch-sysctl-darwin.diff

1 0

[72841] trunk/dports/python
by blair＠macports.org 28 Oct '10

28 Oct '10

Revision: 72841 http://trac.macports.org/changeset/72841 Author: blair(a)macports.org Date: 2010-10-28 11:13:44 -0700 (Thu, 28 Oct 2010) Log Message: ----------- Add a build depends on py2*-distribute to py2*-anyjson. Resolves #26981. Modified Paths: -------------- trunk/dports/python/py25-anyjson/Portfile trunk/dports/python/py26-anyjson/Portfile Modified: trunk/dports/python/py25-anyjson/Portfile =================================================================== --- trunk/dports/python/py25-anyjson/Portfile 2010-10-28 18:09:58 UTC (rev 72840) +++ trunk/dports/python/py25-anyjson/Portfile 2010-10-28 18:13:44 UTC (rev 72841) @@ -21,6 +21,8 @@ sha1 9e0adb75ac2d316c7da4755ef078b4c78fe7abf5 \ rmd160 7826be0e8133daf182cfe1c039b879612ce67f29 +depends_build-append port:py25-distribute + # Depend upon cjson so that the best JSON module can be used. depends_lib-append port:py25-cjson Modified: trunk/dports/python/py26-anyjson/Portfile =================================================================== --- trunk/dports/python/py26-anyjson/Portfile 2010-10-28 18:09:58 UTC (rev 72840) +++ trunk/dports/python/py26-anyjson/Portfile 2010-10-28 18:13:44 UTC (rev 72841) @@ -21,6 +21,8 @@ sha1 9e0adb75ac2d316c7da4755ef078b4c78fe7abf5 \ rmd160 7826be0e8133daf182cfe1c039b879612ce67f29 +depends_build-append port:py26-distribute + # Depend upon cjson so that the best JSON module can be used. depends_lib-append port:py26-cjson

1 0

[72840] trunk/dports/python/py25-liblzma/Portfile
by blair＠macports.org 28 Oct '10

28 Oct '10

Revision: 72840 http://trac.macports.org/changeset/72840 Author: blair(a)macports.org Date: 2010-10-28 11:09:58 -0700 (Thu, 28 Oct 2010) Log Message: ----------- Don't have a Python 2.5 port depend upon a 2.4 package for building. Modified Paths: -------------- trunk/dports/python/py25-liblzma/Portfile Modified: trunk/dports/python/py25-liblzma/Portfile =================================================================== --- trunk/dports/python/py25-liblzma/Portfile 2010-10-28 17:56:39 UTC (rev 72839) +++ trunk/dports/python/py25-liblzma/Portfile 2010-10-28 18:09:58 UTC (rev 72840) @@ -17,5 +17,5 @@ distname pyliblzma-${version} checksums md5 8e5596bc60e784c74f10e94820655336 -depends_build port:py-setuptools port:liblzma +depends_build port:py25-distribute port:liblzma patchfiles patch-liblzma.h pyliblzma-python25.diff

1 0

[72839] branches/release_1_9/base/src/port1.0/portfetch.tcl
by jmr＠macports.org 28 Oct '10

28 Oct '10

Revision: 72839 http://trac.macports.org/changeset/72839 Author: jmr(a)macports.org Date: 2010-10-28 10:56:39 -0700 (Thu, 28 Oct 2010) Log Message: ----------- merge r72835 from trunk: use stable xz port Revision Links: -------------- http://trac.macports.org/changeset/72835 Modified Paths: -------------- branches/release_1_9/base/src/port1.0/portfetch.tcl Modified: branches/release_1_9/base/src/port1.0/portfetch.tcl =================================================================== --- branches/release_1_9/base/src/port1.0/portfetch.tcl 2010-10-28 15:36:45 UTC (rev 72838) +++ branches/release_1_9/base/src/port1.0/portfetch.tcl 2010-10-28 17:56:39 UTC (rev 72839) @@ -148,7 +148,7 @@ } use_xz { set extract.suffix .tar.xz - depends_extract-append bin:xz:xz-devel + depends_extract-append bin:xz:xz } use_zip { set extract.suffix .zip

1 0

[72838] trunk/dports/math/pspp-devel/Portfile
by snc＠macports.org 28 Oct '10

28 Oct '10

Revision: 72838 http://trac.macports.org/changeset/72838 Author: snc(a)macports.org Date: 2010-10-28 08:36:45 -0700 (Thu, 28 Oct 2010) Log Message: ----------- pspp-devel: update to 0.7.6. tentatively allow parallel build Modified Paths: -------------- trunk/dports/math/pspp-devel/Portfile Modified: trunk/dports/math/pspp-devel/Portfile =================================================================== --- trunk/dports/math/pspp-devel/Portfile 2010-10-28 14:13:45 UTC (rev 72837) +++ trunk/dports/math/pspp-devel/Portfile 2010-10-28 15:36:45 UTC (rev 72838) @@ -4,10 +4,9 @@ PortSystem 1.0 name pspp-devel -set buildstamp 20101016040502 -set buildhash gc8e5d5 -version 0.7.5 -revision 17 +set buildstamp 20101028040501 +set buildhash g8dfe93 +version 0.7.6 categories math license GPLv3+ maintainers snc @@ -36,8 +35,8 @@ port:libglade2 \ port:libtool -checksums sha1 7be3736d82c5df017a95dc56d4283ad12765e506 \ - rmd160 a79501dd69253122b9132f3185ebf58b6a2c6e51 +checksums sha1 67f59843739d5f13f98f04460215a841e969b412 \ + rmd160 30045bf686a7e3c1560c82b5766dcbf0213e2302 #configure.optflags -O0 #configure.cflags-append -g @@ -50,7 +49,7 @@ --with-packager-version=${version}-${buildstamp} \ --with-packager-bug-reports=${maintainers} -use_parallel_build no +use_parallel_build yes test.run yes test.target check

1 0

[72837] trunk/dports/textproc/lv/Portfile
by takanori＠macports.org 28 Oct '10

28 Oct '10

Revision: 72837 http://trac.macports.org/changeset/72837 Author: takanori(a)macports.org Date: 2010-10-28 07:13:45 -0700 (Thu, 28 Oct 2010) Log Message: ----------- lv: +with_xz: use xz instead of xz-devel since xz 5.0.0 is out Modified Paths: -------------- trunk/dports/textproc/lv/Portfile Modified: trunk/dports/textproc/lv/Portfile =================================================================== --- trunk/dports/textproc/lv/Portfile 2010-10-28 13:49:57 UTC (rev 72836) +++ trunk/dports/textproc/lv/Portfile 2010-10-28 14:13:45 UTC (rev 72837) @@ -61,7 +61,7 @@ variant with_xz description {Experimental support for XZ Utils} { patchfiles-append xz_support.diff - depends_run-append port:xz-devel + depends_run-append port:xz } livecheck.type regex

1 0

[72836] trunk/dports/devel/qscintilla
by michaelld＠macports.org 28 Oct '10

28 Oct '10

Revision: 72836 http://trac.macports.org/changeset/72836 Author: michaelld(a)macports.org Date: 2010-10-28 06:49:57 -0700 (Thu, 28 Oct 2010) Log Message: ----------- qscintilla: Add debug variant, in QMake style. Modified Paths: -------------- trunk/dports/devel/qscintilla/Portfile Added Paths: ----------- trunk/dports/devel/qscintilla/files/ trunk/dports/devel/qscintilla/files/patch-add_debug.diff Modified: trunk/dports/devel/qscintilla/Portfile =================================================================== --- trunk/dports/devel/qscintilla/Portfile 2010-10-28 11:23:09 UTC (rev 72835) +++ trunk/dports/devel/qscintilla/Portfile 2010-10-28 13:49:57 UTC (rev 72836) @@ -42,7 +42,8 @@ universal_variant yes post-patch { - # allow for universal building, if desired + # allow for universal building, if desired, + # by fixing up the QMake .pro files. if {[variant_exists universal] && [variant_isset universal]} { # set universal arch types, depending on what the user has specified array set macports_to_qt_build_arch { @@ -78,12 +79,21 @@ post-configure { # make sure the designer plugin finds the correct Qsci library, by # putting its search path first of all -L paths - reinplace "/LIBS/s@\-L${prefix}/lib@\-L../Qt4@1" \ - ${worksrcpath}/designer-Qt4/Makefile - # make sure the designer plugin finds the correct Qsci includes, by - # putting its search path first of all -I paths - reinplace "/INCPATH/s@\-I@\-I../Qt4 \-I@1" \ - ${worksrcpath}/designer-Qt4/Makefile + if {[variant_isset debug]} { + reinplace "/LIBS/s@\-L${prefix}/lib@\-L../Qt4@1" \ + ${worksrcpath}/designer-Qt4/Makefile.Release + reinplace "/LIBS/s@\-L${prefix}/lib@\-L../Qt4@1" \ + ${worksrcpath}/designer-Qt4/Makefile.Debug + reinplace "/INCPATH/s@\-I@\-I../Qt4 \-I@1" \ + ${worksrcpath}/designer-Qt4/Makefile.Release + reinplace "/INCPATH/s@\-I@\-I../Qt4 \-I@1" \ + ${worksrcpath}/designer-Qt4/Makefile.Debug + } else { + reinplace "/LIBS/s@\-L${prefix}/lib@\-L../Qt4@1" \ + ${worksrcpath}/designer-Qt4/Makefile + reinplace "/INCPATH/s@\-I@\-I../Qt4 \-I@1" \ + ${worksrcpath}/designer-Qt4/Makefile + } } build.cmd "cd ${worksrcpath}/Qt4; make; cd ${worksrcpath}/designer-Qt4; make; echo" @@ -102,8 +112,26 @@ libqscintilla2.5.dylib \ ${qt_dir}/lib/libqscintilla2.5.dylib \ ${worksrcpath}/designer-Qt4/libqscintillaplugin.dylib" + if {[variant_isset debug]} { + system "install_name_tool -id \ + ${qt_dir}/lib/libqscintilla2_debug.5.dylib \ + ${worksrcpath}/Qt4/libqscintilla2_debug.5.dylib" + system "install_name_tool -id \ + ${qt_plugins_dir}/designer/libqscintillaplugin_debug.dylib \ + ${worksrcpath}/designer-Qt4/libqscintillaplugin_debug.dylib" + system "install_name_tool -change \ + libqscintilla2.5.dylib \ + ${qt_dir}/lib/libqscintilla2_debug.5.dylib \ + ${worksrcpath}/designer-Qt4/libqscintillaplugin_debug.dylib" + } } +variant debug \ +description {Produce both release and debug library and plugin} { + # fix up QMake .pro files for +debug, if selected + patchfiles-append patch-add_debug.diff +} + livecheck.type regex livecheck.url ${master_sites} livecheck.regex QScintilla-gpl-$\\d+.\\d+.\\d+$.tar.gz Added: trunk/dports/devel/qscintilla/files/patch-add_debug.diff =================================================================== --- trunk/dports/devel/qscintilla/files/patch-add_debug.diff (rev 0) +++ trunk/dports/devel/qscintilla/files/patch-add_debug.diff 2010-10-28 13:49:57 UTC (rev 72836) @@ -0,0 +1,42 @@ +--- Qt4/qscintilla.pro.orig 2010-10-27 18:33:43.000000000 -0400 ++++ Qt4/qscintilla.pro 2010-10-27 18:34:11.000000000 -0400 +@@ -33,10 +33,16 @@ + + TEMPLATE = lib + TARGET = qscintilla2 +-CONFIG += qt warn_off release dll thread +-INCLUDEPATH = . ../include ../src ++CONFIG += qt warn_off debug_and_release dll thread build_all ++INCLUDEPATH = . .. ../include ../src + DEFINES = QSCINTILLA_MAKE_DLL QT SCI_LEXER + ++!debug_and_release|build_pass { ++ CONFIG(debug, debug|release) { ++ mac:TARGET = $$member(TARGET, 0)_debug ++ } ++} ++ + # Handle both Qt v4 and v3. + target.path = $$[QT_INSTALL_LIBS] + isEmpty(target.path) { +--- designer-Qt4/designer.pro.orig 2010-10-27 18:33:50.000000000 -0400 ++++ designer-Qt4/designer.pro 2010-10-27 18:37:31.000000000 -0400 +@@ -4,7 +4,7 @@ + TEMPLATE = lib + TARGET = qscintillaplugin + +-CONFIG += designer release plugin ++CONFIG += designer debug_and_release plugin build_all + + HEADERS = qscintillaplugin.h + SOURCES = qscintillaplugin.cpp +@@ -13,3 +13,9 @@ + INSTALLS += target + + LIBS += -lqscintilla2 ++ ++!debug_and_release|build_pass { ++ CONFIG(debug, debug|release) { ++ mac:TARGET = $$member(TARGET, 0)_debug ++ } ++}

1 0

[72835] trunk/base/src/port1.0/portfetch.tcl
by afb＠macports.org 28 Oct '10

28 Oct '10

Revision: 72835 http://trac.macports.org/changeset/72835 Author: afb(a)macports.org Date: 2010-10-28 04:23:09 -0700 (Thu, 28 Oct 2010) Log Message: ----------- use stable xz port Modified Paths: -------------- trunk/base/src/port1.0/portfetch.tcl Modified: trunk/base/src/port1.0/portfetch.tcl =================================================================== --- trunk/base/src/port1.0/portfetch.tcl 2010-10-28 11:20:22 UTC (rev 72834) +++ trunk/base/src/port1.0/portfetch.tcl 2010-10-28 11:23:09 UTC (rev 72835) @@ -148,7 +148,7 @@ } use_xz { set extract.suffix .tar.xz - depends_extract-append bin:xz:xz-devel + depends_extract-append bin:xz:xz } use_zip { set extract.suffix .zip

1 0

[72834] trunk/dports/archivers
by afb＠macports.org 28 Oct '10

28 Oct '10

Revision: 72834 http://trac.macports.org/changeset/72834 Author: afb(a)macports.org Date: 2010-10-28 04:20:22 -0700 (Thu, 28 Oct 2010) Log Message: ----------- xz: upgrade to 5.0.0 release (from xz-devel) Modified Paths: -------------- trunk/dports/archivers/xz/Portfile Added Paths: ----------- trunk/dports/archivers/xz/ Removed Paths: ------------- trunk/dports/archivers/xz/files/ Modified: trunk/dports/archivers/xz/Portfile =================================================================== --- trunk/dports/archivers/xz-devel/Portfile 2010-10-27 20:24:41 UTC (rev 72809) +++ trunk/dports/archivers/xz/Portfile 2010-10-28 11:20:22 UTC (rev 72834) @@ -2,8 +2,8 @@ PortSystem 1.0 -name xz-devel -version 4.999.9beta +name xz +version 5.0.0 categories archivers platforms darwin maintainers afb openmaintainer @@ -17,18 +17,19 @@ homepage http://tukaani.org/xz/ master_sites ${homepage} distname xz-${version} -checksums md5 f2073579b6da2fe35d453adee1aaf1b2 \ - sha1 9627de3997ddcdb02f8d327e84b2cf1941ecd230 \ - rmd160 1253ce01746c748c8549effa5041224044919c4e +checksums md5 f3c0706d100ad2b6d63327584d026c50 \ + sha1 bcce697d7f09584f0feb21e35b13a15ba7417a1f \ + rmd160 c336b081bdd056290f18903b0b0c3b657b141d58 depends_lib port:libiconv port:gettext conflicts lzmautils -patchfiles patch-sysctl-darwin.diff - configure.args --with-libiconv-prefix=${prefix} --with-libintl-prefix=${prefix} +# previous version defaulted to static liblzma (through --enable-dynamic=mixed) +configure.args-append --disable-shared + # the internal "check.h" header conflicts with port check's <check.h> configure.cppflags -I${worksrcpath}/src/liblzma/check -I${prefix}/include @@ -45,5 +46,5 @@ } livecheck.url ${homepage} -livecheck.regex XZ Utils (\[0-9.a-z\]*) was released +livecheck.regex xz-(\[0-9.a-z\]*)\.tar\.gz livecheck.type regexm

1 0

[72833] trunk/dports/devel/cmake/Portfile
by css＠macports.org 28 Oct '10

28 Oct '10

Revision: 72833 http://trac.macports.org/changeset/72833 Author: css(a)macports.org Date: 2010-10-28 04:13:09 -0700 (Thu, 28 Oct 2010) Log Message: ----------- Update the error message for a missing Java header to correctly refer to the Apple Developer Connection site as well as deep links to the correct updates. refs #26934 Modified Paths: -------------- trunk/dports/devel/cmake/Portfile Modified: trunk/dports/devel/cmake/Portfile =================================================================== --- trunk/dports/devel/cmake/Portfile 2010-10-28 06:41:48 UTC (rev 72832) +++ trunk/dports/devel/cmake/Portfile 2010-10-28 11:13:09 UTC (rev 72833) @@ -41,7 +41,8 @@ platform darwin { pre-configure { if {![file exists "/System/Library/Frameworks/JavaVM.framework/Headers/jni.h"]} { - return -code error "\n********************\n${name} requires the Java for Mac OS X Developer Package from Apple.\nPlease download and install this package from http://developer.apple.com/.\n********************" + return -code error "\n********************\n${name} requires the Java for Mac OS X Developer Package from the Apple Developer Connection at http://connect.apple.com.\nFor Mac OS X 10.6: http://adcdownload.apple.com/Java/java_for_mac_os_x_10.6_update_3_developer… Mac OS X 10.5: +http://adcdownload.apple.com/Java/java_for_mac_os_x_10.5_update_8_developer_package/javadeveloper_10.5_9m3263.dmg\n********************" } } post-configure {

1 0