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

[MacPorts] CommittersTipsAndTricks modified
by MacPorts 27 Oct '10

27 Oct '10

Changed page "CommittersTipsAndTricks" by ryandesign(a)macports.org from 70.253.88.34* Page URL: <https://trac.macports.org/wiki/CommittersTipsAndTricks> Diff URL: <https://trac.macports.org/wiki/CommittersTipsAndTricks?action=diff&version=…> Revision 39 -------8<------8<------8<------8<------8<------8<------8<------8<-------- Index: CommittersTipsAndTricks ========================================================================= --- CommittersTipsAndTricks (version: 38) +++ CommittersTipsAndTricks (version: 39) @@ -275,7 +275,7 @@ rmd160 6cacbcf37581b5e19fe9fe674dd7b0722f1a19de }}} -You can then copy/paste the result into the Portfile. +You can then copy/paste the result into the Portfile. You should probably then manually tweak the whitespace of these lines to match the existing whitespace of the portfile to keep things consistent. === A bash script for checksums === -------8<------8<------8<------8<------8<------8<------8<------8<-------- * The IP shown here might not mean anything if the user or the server is behind a proxy. -- MacPorts <http://www.macports.org/> Ports system for Mac OS This is an automated message. Someone at http://www.macports.org/ added your email address to be notified of changes on CommittersTipsAndTricks. If it was not you, please report to .

1 0

[MacPorts] CommittersTipsAndTricks modified
by MacPorts 27 Oct '10

27 Oct '10

Changed page "CommittersTipsAndTricks" by snc(a)macports.org from 74.219.234.106* Page URL: <https://trac.macports.org/wiki/CommittersTipsAndTricks> Diff URL: <https://trac.macports.org/wiki/CommittersTipsAndTricks?action=diff&version=…> Revision 38 -------8<------8<------8<------8<------8<------8<------8<------8<-------- Index: CommittersTipsAndTricks ========================================================================= --- CommittersTipsAndTricks (version: 37) +++ CommittersTipsAndTricks (version: 38) @@ -321,6 +321,6 @@ It can happen that port maintainer search queries with "port info" deliver ambiguous results. In case you need to make sure that only a specific maintainer handle is found use this {{{ -port info --name --maintainer maintainer:'maintainer:(\s|^)HANDLE(\s|$)' +port info --name --maintainer 'maintainer:(\s|^)HANDLE(\s|$)' }}} which will now find only those ports which HANDLE(a)macports.org maintains. -------8<------8<------8<------8<------8<------8<------8<------8<-------- * The IP shown here might not mean anything if the user or the server is behind a proxy. -- MacPorts <http://www.macports.org/> Ports system for Mac OS This is an automated message. Someone at http://www.macports.org/ added your email address to be notified of changes on CommittersTipsAndTricks. If it was not you, please report to .

1 0

[MacPorts] CommittersTipsAndTricks modified
by MacPorts 27 Oct '10

27 Oct '10

Changed page "CommittersTipsAndTricks" by mk(a)macports.org from 93.233.75.191* Page URL: <https://trac.macports.org/wiki/CommittersTipsAndTricks> Diff URL: <https://trac.macports.org/wiki/CommittersTipsAndTricks?action=diff&version=…> Revision 37 Comment: unambiguous maintainer search -------8<------8<------8<------8<------8<------8<------8<------8<-------- Index: CommittersTipsAndTricks ========================================================================= --- CommittersTipsAndTricks (version: 36) +++ CommittersTipsAndTricks (version: 37) @@ -316,3 +316,11 @@ {{{ -o honor state files older than Portfile }}} + +== Searching for ports of a specific maintainer == + +It can happen that port maintainer search queries with "port info" deliver ambiguous results. In case you need to make sure that only a specific maintainer handle is found use this +{{{ +port info --name --maintainer maintainer:'maintainer:(\s|^)HANDLE(\s|$)' +}}} +which will now find only those ports which HANDLE(a)macports.org maintains. -------8<------8<------8<------8<------8<------8<------8<------8<-------- * The IP shown here might not mean anything if the user or the server is behind a proxy. -- MacPorts <http://www.macports.org/> Ports system for Mac OS This is an automated message. Someone at http://www.macports.org/ added your email address to be notified of changes on CommittersTipsAndTricks. If it was not you, please report to .

1 0

[72809] trunk/dports/devel/qscintilla/Portfile
by michaelld＠macports.org 27 Oct '10

27 Oct '10

Revision: 72809 http://trac.macports.org/changeset/72809 Author: michaelld(a)macports.org Date: 2010-10-27 13:24:41 -0700 (Wed, 27 Oct 2010) Log Message: ----------- qscintilla: +universal now -really- works, for both the library and plugin. When using QMake's "CONFIG +=", have to translate between MacPorts' arch type "i386" -> Qt type "x86"; the other types are the same, so there's probably a better way to do this ... but it works. Modified Paths: -------------- trunk/dports/devel/qscintilla/Portfile Modified: trunk/dports/devel/qscintilla/Portfile =================================================================== --- trunk/dports/devel/qscintilla/Portfile 2010-10-27 20:10:09 UTC (rev 72808) +++ trunk/dports/devel/qscintilla/Portfile 2010-10-27 20:24:41 UTC (rev 72809) @@ -6,7 +6,7 @@ name qscintilla version 2.4.5 -revision 2 +revision 3 categories devel maintainers adfernandes openmaintainer description QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor control. @@ -42,12 +42,26 @@ universal_variant yes post-patch { - # allow for universal building, if desired - if { [variant_isset universal] } { - reinplace "s@CONFIG += qt @CONFIG += qt ${universal_archs} @" ${worksrcpath}/Qt4/qscintilla.pro + 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 { + ppc ppc + i386 x86 + ppc64 ppc64 + x86_64 x86_64 + } + set arch_types "" + foreach arch ${universal_archs} { + lappend arch_types $macports_to_qt_build_arch($arch) + } + set ARCHES [join ${arch_types} " "] + reinplace "s@CONFIG += @CONFIG += ${ARCHES} @" \ + ${worksrcpath}/Qt4/qscintilla.pro + reinplace "s@CONFIG += @CONFIG += ${ARCHES} @" \ + ${worksrcpath}/designer-Qt4/designer.pro } - + # fix up 'Platform.h's, to avoid a conflict with the port 'tidy's # 'platform.h'. reinplace "/INCLUDEPATH/s@ \\. @ . .. @" \ @@ -55,7 +69,6 @@ foreach fixfile [exec grep -lr \"Platform\.h\" ${worksrcpath}] { reinplace "s@\"Platform\.h\"@\"include/Platform\.h\"@g" ${fixfile} } - } configure.cmd "cd ${worksrcpath}/Qt4; ${qt_qmake_cmd} qscintilla.pro; \

1 0

[72808] trunk/dports/gnome/anjuta/Portfile
by devans＠macports.org 27 Oct '10

27 Oct '10

Revision: 72808 http://trac.macports.org/changeset/72808 Author: devans(a)macports.org Date: 2010-10-27 13:10:09 -0700 (Wed, 27 Oct 2010) Log Message: ----------- anjuta: change dependency on glade3 to path dependency that can be satisfied by either glade3 or glade3-devel, both now build +universal. Modified Paths: -------------- trunk/dports/gnome/anjuta/Portfile Modified: trunk/dports/gnome/anjuta/Portfile =================================================================== --- trunk/dports/gnome/anjuta/Portfile 2010-10-27 20:06:11 UTC (rev 72807) +++ trunk/dports/gnome/anjuta/Portfile 2010-10-27 20:10:09 UTC (rev 72808) @@ -40,7 +40,6 @@ --disable-plugin-subversion # devhelp -> webkit-gtk is not universal -# glade3 -> devhelp -> webkit-gtk is not universal # anjuta is not universal universal_variant no @@ -52,7 +51,7 @@ variant glade description {Enable glade plugin support} { configure.args-delete --disable-plugin-glade - depends_lib-append port:glade3 + depends_lib-append path:lib/pkgconfig/gladeui-1.0.pc:glade3 } variant sourceview description {Enable gtksourceview editor plugin support instead of scintilla} {

1 0

[72807] trunk/dports/gnome/gnome-media/Portfile
by devans＠macports.org 27 Oct '10

27 Oct '10

Revision: 72807 http://trac.macports.org/changeset/72807 Author: devans(a)macports.org Date: 2010-10-27 13:06:11 -0700 (Wed, 27 Oct 2010) Log Message: ----------- gnome-media: to ensure consistent behavior, add path dependency on gladeui-1.0.pc which can be satisfied by either glade3 or glade3-devel, see comments in Portfile. Modified Paths: -------------- trunk/dports/gnome/gnome-media/Portfile Modified: trunk/dports/gnome/gnome-media/Portfile =================================================================== --- trunk/dports/gnome/gnome-media/Portfile 2010-10-27 19:53:38 UTC (rev 72806) +++ trunk/dports/gnome/gnome-media/Portfile 2010-10-27 20:06:11 UTC (rev 72807) @@ -5,7 +5,7 @@ name gnome-media version 2.30.0 -revision 2 +revision 3 set branch [join [lrange [split ${version} .] 0 1] .] description A collection of utilities for simple multimedia handling. long_description \ @@ -27,10 +27,21 @@ depends_build port:pkgconfig \ port:gnome-doc-utils +# +# dependency on libgladeui-1.0 is required to ensure +# that port builds consistently +# if present glade3 ui profiles are installed +# which allows editing of .ui files in glade3 +# if not they are not +# no way to turn this behavior off in configure +# path dependency allows either glade3 or glade3-devel to be used +# + depends_lib port:libcanberra \ port:libunique \ port:gconf \ - port:gst-plugins-base + port:gst-plugins-base \ + path:lib/pkgconfig/gladeui-1.0.pc:glade3 configure.args --disable-schemas-install \ --disable-scrollkeeper \

1 0

[72806] contrib/MacPorts_Framework
by juanger＠macports.org 27 Oct '10

27 Oct '10

Revision: 72806 http://trac.macports.org/changeset/72806 Author: juanger(a)macports.org Date: 2010-10-27 12:53:38 -0700 (Wed, 27 Oct 2010) Log Message: ----------- New method for faster listing of available ports. Modified Paths: -------------- contrib/MacPorts_Framework/MPMacPorts.h contrib/MacPorts_Framework/MPMacPorts.m Modified: contrib/MacPorts_Framework/MPMacPorts.h =================================================================== --- contrib/MacPorts_Framework/MPMacPorts.h 2010-10-27 19:53:33 UTC (rev 72805) +++ contrib/MacPorts_Framework/MPMacPorts.h 2010-10-27 19:53:38 UTC (rev 72806) @@ -99,8 +99,12 @@ */ - (void)selfUpdate:(NSError **)sError; +/*! + @brief Returns an NSDictionary of all the ports in the indices. + @discussion Faster than search:MPPortsAll. Uses mpportlistall + */ +- (NSDictionary *)listAll; - /*! @brief Returns an NSDictionary of ports. Calls [self search:query caseSensiitve:YES]. @param query An NSString containing name or partial name of port being searched. Modified: contrib/MacPorts_Framework/MPMacPorts.m =================================================================== --- contrib/MacPorts_Framework/MPMacPorts.m 2010-10-27 19:53:33 UTC (rev 72805) +++ contrib/MacPorts_Framework/MPMacPorts.m 2010-10-27 19:53:38 UTC (rev 72806) @@ -164,6 +164,27 @@ [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"MacPorts_selfupdate_Finished" object:nil]; } +- (NSDictionary *)listAll{ + + NSMutableDictionary *result, *newResult; + NSEnumerator *enumerator; + id key; + NSError * sError; + + result = [NSMutableDictionary dictionaryWithDictionary: + [interpreter dictionaryFromTclListAsString: + [interpreter evaluateStringAsString:@"return [mportlistall]" + error:&sError]]]; + + newResult = [NSMutableDictionary dictionaryWithCapacity:[result count]]; + enumerator = [result keyEnumerator]; + while (key = [enumerator nextObject]) { + [newResult setObject:[[MPPort alloc] initWithTclListAsString:[result objectForKey:key]] forKey:key]; + } + + + return [NSDictionary dictionaryWithDictionary:newResult]; +} - (NSDictionary *)search:(NSString *)query { return [self search:query caseSensitive:YES];

1 0

[72805] trunk/dports/devel/glade3-devel
by devans＠macports.org 27 Oct '10

27 Oct '10

Revision: 72805 http://trac.macports.org/changeset/72805 Author: devans(a)macports.org Date: 2010-10-27 12:53:33 -0700 (Wed, 27 Oct 2010) Log Message: ----------- glade3-devel: update to version 3.7.1, incorporate recent glade3 changes (r72803), add notes re dependents, closes #27015. Revision Links: -------------- http://trac.macports.org/changeset/72803 Modified Paths: -------------- trunk/dports/devel/glade3-devel/Portfile Added Paths: ----------- trunk/dports/devel/glade3-devel/files/ trunk/dports/devel/glade3-devel/files/patch-configure.diff Modified: trunk/dports/devel/glade3-devel/Portfile =================================================================== --- trunk/dports/devel/glade3-devel/Portfile 2010-10-27 19:14:23 UTC (rev 72804) +++ trunk/dports/devel/glade3-devel/Portfile 2010-10-27 19:53:33 UTC (rev 72805) @@ -4,47 +4,76 @@ PortSystem 1.0 name glade3-devel -version 3.5.7 +conflicts glade3 +version 3.7.1 set branch [join [lrange [split ${version} .] 0 1] .] description Glade is a free user interface builder for GTK+ and GNOME. long_description Glade is a free user interface builder for GTK+ \ and GNOME. This is the most recent unstable development \ - release with preliminary support for GtkBuilder. + release. maintainers devans categories devel gnome platforms darwin homepage http://glade.gnome.org/ master_sites gnome:sources/glade3/${branch}/ distname glade3-${version} + use_bzip2 yes -checksums md5 381e290d4a6ae7d6a41fe16b06f15bb3 \ - sha1 2e2c6fcef18ed9a0e6be694cf98aa871dc8fd62f \ - rmd160 4371ee091b1ead10846765e3d39c78ad4d32f84f +checksums md5 35dca20dd51aa1a1fd461d723abba95b \ + sha1 eda613fa67c930818080cb96fb25d1f28de66514 \ + rmd160 28d007c5d47feb665d412d1914cd504bde3960cd + +depends_skip_archcheck devhelp + depends_build port:pkgconfig \ - port:gettext \ + port:intltool \ + port:gnome-doc-utils \ + port:gtk-doc -depends_lib port:gtk2 \ - port:libiconv \ - port:libgnomeui \ - port:py25-gtk \ +depends_lib port:py26-gtk \ port:libxml2 \ - port:rarian + port:libgnomeui depends_run port:hicolor-icon-theme \ port:devhelp +patchfiles patch-configure.diff + configure.args --disable-scrollkeeper -post-activate { - system "scrollkeeper-update" -} +set python_prefix ${frameworks_dir}/Python.framework/Versions/2.6 +configure.python ${prefix}/bin/python2.6 +configure.pkg_config_path ${python_prefix}/lib/pkgconfig variant disable_gnome description {Disable support for GNOME UI widgets} { configure.args-append --disable-gnome depends_lib-delete port:libgnomeui } +# +# ige-mac-integration is broken +# +# disable quartz variant until this is resolved +# + +#variant quartz { +# depends_lib-append port:ige-mac-integration +# depends_run-delete port:devhelp +#} + +post-activate { + system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor" +} + +notes " + This port increments libgladeui-1.9.dylib to libgladeui-1.10.dylib. + Please rebuild the following dependent ports if installed: + + sudo port -n upgrade --force anjuta + sudo port -n upgrade --force gnome-media +" + livecheck.type regex livecheck.url http://ftp.gnome.org/pub/gnome/sources/glade3/${branch}/ livecheck.regex {LATEST-IS-(\d+(?:\.\d+)*)} Added: trunk/dports/devel/glade3-devel/files/patch-configure.diff =================================================================== --- trunk/dports/devel/glade3-devel/files/patch-configure.diff (rev 0) +++ trunk/dports/devel/glade3-devel/files/patch-configure.diff 2010-10-27 19:53:33 UTC (rev 72805) @@ -0,0 +1,14 @@ +--- configure.orig 2010-05-14 15:02:54.000000000 -0700 ++++ configure 2010-10-27 12:24:47.000000000 -0700 +@@ -14034,9 +14034,9 @@ + + + +- PYTHON_PREFIX='${prefix}' ++ PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.prefix;'` + +- PYTHON_EXEC_PREFIX='${exec_prefix}' ++ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print sys.exec_prefix;'` + + +

1 0

[72804] trunk/dports/perl/p5-xml-entities/Portfile
by ricci＠macports.org 27 Oct '10

27 Oct '10

Revision: 72804 http://trac.macports.org/changeset/72804 Author: ricci(a)macports.org Date: 2010-10-27 12:14:23 -0700 (Wed, 27 Oct 2010) Log Message: ----------- upgrade to 1.0000 Modified Paths: -------------- trunk/dports/perl/p5-xml-entities/Portfile Modified: trunk/dports/perl/p5-xml-entities/Portfile =================================================================== --- trunk/dports/perl/p5-xml-entities/Portfile 2010-10-27 19:08:35 UTC (rev 72803) +++ trunk/dports/perl/p5-xml-entities/Portfile 2010-10-27 19:14:23 UTC (rev 72804) @@ -3,7 +3,7 @@ PortSystem 1.0 PortGroup perl5 1.0 -perl5.setup XML-Entities 0.0307 +perl5.setup XML-Entities 1.0000 maintainers narf_tm openmaintainer description Decode strings with XML entities long_description ${description} @@ -11,9 +11,9 @@ platforms darwin -checksums md5 db1b0e8ec8d8c575eb463fde05a43152 \ - sha1 e4b1e6ee1c491aa6b2c63f46d5a1fb359a14d84b \ - rmd160 3545b353d5e2f81f25b020e81f89729ea3431d4e +checksums md5 e25406fec04ea5ea9c346a19b0900bc5 \ + sha1 25eef2dfe4d52237cfb35fd4edbb9744db42346c \ + rmd160 f6e14a7906a175fff19aebd7c6f89215f752d477 depends_lib-append port:p5-libwww-perl \ port:p5-html-parser

1 0

[72803] trunk/dports/devel/glade3
by devans＠macports.org 27 Oct '10

27 Oct '10

Revision: 72803 http://trac.macports.org/changeset/72803 Author: devans(a)macports.org Date: 2010-10-27 12:08:35 -0700 (Wed, 27 Oct 2010) Log Message: ----------- glade3: * for compatibility with the other GNOME ports, remove +python25 +python26 variants * configure properly for python26, increment revision * disable broken +quartz variant until issues with ige_mac_integration are resolved (#23356) * skip arch check for devhelp to allow port to build +universal (runtime dep only) * conflicts glade3-devel Modified Paths: -------------- trunk/dports/devel/glade3/Portfile Added Paths: ----------- trunk/dports/devel/glade3/files/ trunk/dports/devel/glade3/files/patch-configure.diff Modified: trunk/dports/devel/glade3/Portfile =================================================================== --- trunk/dports/devel/glade3/Portfile 2010-10-27 18:59:16 UTC (rev 72802) +++ trunk/dports/devel/glade3/Portfile 2010-10-27 19:08:35 UTC (rev 72803) @@ -4,8 +4,9 @@ PortSystem 1.0 name glade3 +conflicts glade3-devel version 3.6.7 -revision 1 +revision 2 set branch [join [lrange [split ${version} .] 0 1] .] description Glade is a free user interface builder for GTK+ and GNOME. long_description Glade is a free user interface builder for GTK+ \ @@ -23,48 +24,44 @@ sha1 7621d5ae486ed42c35bb1d147b5693428481e733 \ rmd160 ab8487a8914b31ba2cb22bf0261b6ad39b0d1629 +depends_skip_archcheck devhelp + depends_build port:pkgconfig \ port:intltool \ port:gnome-doc-utils \ port:gtk-doc -depends_lib port:gtk2 \ +depends_lib port:py26-gtk \ port:libxml2 \ port:libgnomeui depends_run port:hicolor-icon-theme \ port:devhelp +patchfiles patch-configure.diff + configure.args --disable-scrollkeeper -post-activate { - system "scrollkeeper-update" -} +set python_prefix ${frameworks_dir}/Python.framework/Versions/2.6 +configure.python ${prefix}/bin/python2.6 +configure.pkg_config_path ${python_prefix}/lib/pkgconfig variant disable_gnome description {Disable support for GNOME UI widgets} { configure.args-append --disable-gnome depends_lib-delete port:libgnomeui } -variant quartz { - depends_lib-append port:ige-mac-integration - depends_run-delete port:devhelp -} +# +# ige-mac-integration is broken +# +# disable quartz variant until this is resolved +# -variant python25 conflicts python26 description {Use Python 2.5} { - depends_lib-append port:py25-gtk - configure.python ${prefix}/bin/python2.5 -} +#variant quartz { +# depends_lib-append port:ige-mac-integration +# depends_run-delete port:devhelp +#} -variant python26 conflicts python25 description {Use Python 2.6} { - depends_lib-append port:py26-gtk - configure.python ${prefix}/bin/python2.6 -} - -if {![variant_isset python25]} { - default_variants +python26 -} - post-activate { system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor" } Added: trunk/dports/devel/glade3/files/patch-configure.diff =================================================================== --- trunk/dports/devel/glade3/files/patch-configure.diff (rev 0) +++ trunk/dports/devel/glade3/files/patch-configure.diff 2010-10-27 19:08:35 UTC (rev 72803) @@ -0,0 +1,14 @@ +--- configure.orig 2009-06-29 12:51:09.000000000 -0700 ++++ configure 2010-10-27 10:10:04.000000000 -0700 +@@ -24644,9 +24644,9 @@ + + + +- PYTHON_PREFIX='${prefix}' ++ PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.prefix;'` + +- PYTHON_EXEC_PREFIX='${exec_prefix}' ++ PYTHON_EXEC_PREFIX=`$PYTHON -c 'import sys; print sys.exec_prefix;'` + + +

1 0