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

[69322] contrib/port-depgraph/port-depgraph
by ryandesign＠macports.org 30 Jun '10

30 Jun '10

Revision: 69322 http://trac.macports.org/changeset/69322 Author: ryandesign(a)macports.org Date: 2010-06-30 02:41:28 -0700 (Wed, 30 Jun 2010) Log Message: ----------- port-depgraph: tweak the formatting of the edge lines a little Modified Paths: -------------- contrib/port-depgraph/port-depgraph Modified: contrib/port-depgraph/port-depgraph =================================================================== --- contrib/port-depgraph/port-depgraph 2010-06-30 09:35:37 UTC (rev 69321) +++ contrib/port-depgraph/port-depgraph 2010-06-30 09:41:28 UTC (rev 69322) @@ -82,9 +82,9 @@ } if {!$verbose} { - puts [format {"%s" -> "%s" [ style=%s ] } $portName $aPort $style] + puts [format {"%s" -> "%s" [style="%s"]} $portName $aPort $style] } else { - puts [format {"%s" -> "%s" [ label="%s",style="%s",color="%s" ]} $portName $aPort $aBy $style $color] + puts [format {"%s" -> "%s" [style="%s", label="%s", color="%s"]} $portName $aPort $style $aBy $color] } print_dependencies portDependencies $aPort $verbose

1 0

[69321] trunk/dports/graphics
by ryandesign＠macports.org 30 Jun '10

30 Jun '10

Revision: 69321 http://trac.macports.org/changeset/69321 Author: ryandesign(a)macports.org Date: 2010-06-30 02:35:37 -0700 (Wed, 30 Jun 2010) Log Message: ----------- graphviz-devel, graphviz-gui-devel: update to 2.27.20100630.0445 Modified Paths: -------------- trunk/dports/graphics/graphviz-devel/Portfile trunk/dports/graphics/graphviz-gui-devel/Portfile Modified: trunk/dports/graphics/graphviz-devel/Portfile =================================================================== --- trunk/dports/graphics/graphviz-devel/Portfile 2010-06-30 09:24:28 UTC (rev 69320) +++ trunk/dports/graphics/graphviz-devel/Portfile 2010-06-30 09:35:37 UTC (rev 69321) @@ -8,7 +8,7 @@ conflicts graphviz set my_name graphviz # keep version in sync between graphviz-devel and graphviz-gui-devel -version 2.27.20100623.0445 +version 2.27.20100630.0445 categories graphics maintainers ryandesign license CPLv1.0 @@ -32,9 +32,9 @@ programs (for non-interactive use) can use the +no_x11 \ variant to build graphviz without its display routines. -checksums md5 184d00360581174234e824696af146c8 \ - sha1 98089f3d5d158366b9d84c34d312d9fc1845a200 \ - rmd160 a9794348cfb2c4a350c1a047e44b2dc987dfeb4e +checksums md5 ba55b341ab1c90d69ed8a5d90c2a1045 \ + sha1 2abc0a94166d45a2a1d0549673e6eed05f33c6b3 \ + rmd160 1dc2548a48b6b7e1202da3b6a53250b99f3a20d0 # graphviz needs Xcode 3.1+ to avoid the libGL error when building the smyrna variant # graphviz-gui needs Xcode 3.1.2+; see #18811 Modified: trunk/dports/graphics/graphviz-gui-devel/Portfile =================================================================== --- trunk/dports/graphics/graphviz-gui-devel/Portfile 2010-06-30 09:24:28 UTC (rev 69320) +++ trunk/dports/graphics/graphviz-gui-devel/Portfile 2010-06-30 09:35:37 UTC (rev 69321) @@ -9,7 +9,7 @@ conflicts graphviz-gui graphviz-oldgui set my_name graphviz # keep version in sync between graphviz-devel and graphviz-gui-devel -version 2.27.20100623.0445 +version 2.27.20100630.0445 categories graphics aqua maintainers ryandesign license CPLv1.0 @@ -25,9 +25,9 @@ long_description ${description}. -checksums md5 184d00360581174234e824696af146c8 \ - sha1 98089f3d5d158366b9d84c34d312d9fc1845a200 \ - rmd160 a9794348cfb2c4a350c1a047e44b2dc987dfeb4e +checksums md5 ba55b341ab1c90d69ed8a5d90c2a1045 \ + sha1 2abc0a94166d45a2a1d0549673e6eed05f33c6b3 \ + rmd160 1dc2548a48b6b7e1202da3b6a53250b99f3a20d0 depends_lib port:graphviz-devel

1 0

[69320] trunk/dports/devel/pure-csv/Portfile
by ryandesign＠macports.org 30 Jun '10

30 Jun '10

Revision: 69320 http://trac.macports.org/changeset/69320 Author: ryandesign(a)macports.org Date: 2010-06-30 02:24:28 -0700 (Wed, 30 Jun 2010) Log Message: ----------- pure-csv: update to 0.9 Modified Paths: -------------- trunk/dports/devel/pure-csv/Portfile Modified: trunk/dports/devel/pure-csv/Portfile =================================================================== --- trunk/dports/devel/pure-csv/Portfile 2010-06-30 07:52:27 UTC (rev 69319) +++ trunk/dports/devel/pure-csv/Portfile 2010-06-30 09:24:28 UTC (rev 69320) @@ -3,7 +3,7 @@ PortSystem 1.0 PortGroup pure 1.0 -pure.setup csv 0.8 +pure.setup csv 0.9 categories devel platforms darwin maintainers ryandesign @@ -16,6 +16,6 @@ and writing functions are loosely based on \ Python's CSV module -checksums md5 d338d84804e8dd101f517c5b86373152 \ - sha1 08e1261ea0ea454fafeb273f7937c5668caa17b0 \ - rmd160 ac374e73c1ca8f0222ee836bcd5501dea122b71f +checksums md5 28555df9c7e9903dc4ea3a06e774b18f \ + sha1 ea00766218ab6bb36cf378b18c44bed452c0b9d0 \ + rmd160 86b2c5d18eef804a3772881214e8bdf1342b89a2

1 0

[69319] branches/release_1_9/base/src/registry2.0
by jmr＠macports.org 30 Jun '10

30 Jun '10

Revision: 69319 http://trac.macports.org/changeset/69319 Author: jmr(a)macports.org Date: 2010-06-30 00:52:27 -0700 (Wed, 30 Jun 2010) Log Message: ----------- merge r69318 from trunk: fix uninstall --follow-dependencies when there's no portfile in the registry Revision Links: -------------- http://trac.macports.org/changeset/69318 Modified Paths: -------------- branches/release_1_9/base/src/registry2.0/portuninstall.tcl Property Changed: ---------------- branches/release_1_9/base/src/registry2.0/receipt_sqlite.tcl Modified: branches/release_1_9/base/src/registry2.0/portuninstall.tcl =================================================================== --- branches/release_1_9/base/src/registry2.0/portuninstall.tcl 2010-06-30 07:48:21 UTC (rev 69318) +++ branches/release_1_9/base/src/registry2.0/portuninstall.tcl 2010-06-30 07:52:27 UTC (rev 69319) @@ -108,18 +108,18 @@ } elseif { [llength $ilist] == 1 } { if {$use_reg2} { set port [lindex $ilist 0] - if {$v == ""} { - set v "[$port version]_[$port revision][$port variants]" - } + set version [$port version] + set revision [$port revision] + set variants [$port variants] } else { set version [lindex [lindex $ilist 0] 1] set revision [lindex [lindex $ilist 0] 2] set variants [lindex [lindex $ilist 0] 3] set active [lindex [lindex $ilist 0] 4] - if {$v == ""} { - set v "${version}_${revision}${variants}" - } } + if {$v == ""} { + set v "${version}_${revision}${variants}" + } } else { throw registry::invalid "Registry error: $portname not registered as installed" } Property changes on: branches/release_1_9/base/src/registry2.0/receipt_sqlite.tcl ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src/registry1.0/receipt_sqlite.tcl:37343-46937 /branches/gsoc09-logging/base/src/registry1.0/receipt_sqlite.tcl:51231-60371 /branches/universal-sanity/base/src/registry1.0/receipt_sqlite.tcl:51872-52323 /branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/registry2.0/receipt_sqlite.tcl:67304-67305,67307,67384,67449,67451,67487,67593,67595,67763,67792,67838,68058,68281,68286,68288,68413,68416,68463,68593,68620,68675-68676,68680,68683-68684,68691,68697,68746,68749,68764,68779,68806,68816-68817,68849,68851,68864 /users/perry/base-bugs_and_notes/src/registry1.0/receipt_sqlite.tcl:45682-46060 /users/perry/base-select/src/registry1.0/receipt_sqlite.tcl:44044-44692 + /branches/gsoc08-privileges/base/src/registry1.0/receipt_sqlite.tcl:37343-46937 /branches/gsoc09-logging/base/src/registry1.0/receipt_sqlite.tcl:51231-60371 /branches/universal-sanity/base/src/registry1.0/receipt_sqlite.tcl:51872-52323 /branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src/registry2.0/receipt_sqlite.tcl:67304-67305,67307,67384,67449,67451,67487,67593,67595,67763,67792,67838,68058,68281,68286,68288,68413,68416,68463,68593,68620,68675-68676,68680,68683-68684,68691,68697,68746,68749,68764,68779,68806,68816-68817,68849,68851,68864,68872,68902,68910,68913,68919,68950,68952,68965,69105,69316,69318 /users/perry/base-bugs_and_notes/src/registry1.0/receipt_sqlite.tcl:45682-46060 /users/perry/base-select/src/registry1.0/receipt_sqlite.tcl:44044-44692

1 0

[69318] trunk/base/src/registry2.0/portuninstall.tcl
by jmr＠macports.org 30 Jun '10

30 Jun '10

Revision: 69318 http://trac.macports.org/changeset/69318 Author: jmr(a)macports.org Date: 2010-06-30 00:48:21 -0700 (Wed, 30 Jun 2010) Log Message: ----------- fix uninstall --follow-dependencies when there's no portfile in the registry Modified Paths: -------------- trunk/base/src/registry2.0/portuninstall.tcl Modified: trunk/base/src/registry2.0/portuninstall.tcl =================================================================== --- trunk/base/src/registry2.0/portuninstall.tcl 2010-06-30 06:41:38 UTC (rev 69317) +++ trunk/base/src/registry2.0/portuninstall.tcl 2010-06-30 07:48:21 UTC (rev 69318) @@ -108,18 +108,18 @@ } elseif { [llength $ilist] == 1 } { if {$use_reg2} { set port [lindex $ilist 0] - if {$v == ""} { - set v "[$port version]_[$port revision][$port variants]" - } + set version [$port version] + set revision [$port revision] + set variants [$port variants] } else { set version [lindex [lindex $ilist 0] 1] set revision [lindex [lindex $ilist 0] 2] set variants [lindex [lindex $ilist 0] 3] set active [lindex [lindex $ilist 0] 4] - if {$v == ""} { - set v "${version}_${revision}${variants}" - } } + if {$v == ""} { + set v "${version}_${revision}${variants}" + } } else { throw registry::invalid "Registry error: $portname not registered as installed" }

1 0

[69317] branches/release_1_9/base/doc/macports.conf.5
by jmr＠macports.org 30 Jun '10

30 Jun '10

Revision: 69317 http://trac.macports.org/changeset/69317 Author: jmr(a)macports.org Date: 2010-06-29 23:41:38 -0700 (Tue, 29 Jun 2010) Log Message: ----------- merge r69316 from trunk: update portdbformat entry in macports.conf.5 Revision Links: -------------- http://trac.macports.org/changeset/69316 Modified Paths: -------------- branches/release_1_9/base/doc/macports.conf.5 Modified: branches/release_1_9/base/doc/macports.conf.5 =================================================================== --- branches/release_1_9/base/doc/macports.conf.5 2010-06-30 06:40:08 UTC (rev 69316) +++ branches/release_1_9/base/doc/macports.conf.5 2010-06-30 06:41:38 UTC (rev 69317) @@ -62,10 +62,11 @@ .Ic Default: ${prefix}/var/macports .It Va portdbformat -Storage type to use for the MacPorts registry. Currently the only supported format is "flat". +Storage type to use for the MacPorts registry. The preferred format is "sqlite", with "flat" +also available as a legacy format. .br .Ic Default: -flat +sqlite .It Va portinstalltype Sets the mode in which ports are installed by MacPorts. Supported values are 'direct' or 'image'. The 'direct' mode is often used on systems that do not support 'image' due to limitations in their

1 0

[69316] trunk/base/doc/macports.conf.5
by jmr＠macports.org 30 Jun '10

30 Jun '10

Revision: 69316 http://trac.macports.org/changeset/69316 Author: jmr(a)macports.org Date: 2010-06-29 23:40:08 -0700 (Tue, 29 Jun 2010) Log Message: ----------- update portdbformat entry in macports.conf.5 Modified Paths: -------------- trunk/base/doc/macports.conf.5 Modified: trunk/base/doc/macports.conf.5 =================================================================== --- trunk/base/doc/macports.conf.5 2010-06-30 05:37:23 UTC (rev 69315) +++ trunk/base/doc/macports.conf.5 2010-06-30 06:40:08 UTC (rev 69316) @@ -62,10 +62,11 @@ .Ic Default: ${prefix}/var/macports .It Va portdbformat -Storage type to use for the MacPorts registry. Currently the only supported format is "flat". +Storage type to use for the MacPorts registry. The preferred format is "sqlite", with "flat" +also available as a legacy format. .br .Ic Default: -flat +sqlite .It Va portinstalltype Sets the mode in which ports are installed by MacPorts. Supported values are 'direct' or 'image'. The 'direct' mode is often used on systems that do not support 'image' due to limitations in their

1 0

[69315] trunk/dports/aqua
by michaelld＠macports.org 30 Jun '10

30 Jun '10

Revision: 69315 http://trac.macports.org/changeset/69315 Author: michaelld(a)macports.org Date: 2010-06-29 22:37:23 -0700 (Tue, 29 Jun 2010) Log Message: ----------- Corrected select group. Modified Paths: -------------- trunk/dports/aqua/qt4-mac/Portfile trunk/dports/aqua/qt4-mac-devel/Portfile Modified: trunk/dports/aqua/qt4-mac/Portfile =================================================================== --- trunk/dports/aqua/qt4-mac/Portfile 2010-06-30 05:16:09 UTC (rev 69314) +++ trunk/dports/aqua/qt4-mac/Portfile 2010-06-30 05:37:23 UTC (rev 69315) @@ -223,13 +223,13 @@ } # install the appropriate select file - xinstall -m 755 -d ${destroot}${prefix}/etc/select/${select_port} + xinstall -m 755 -d ${destroot}${prefix}/etc/select/${select_group} if {[variant_isset no_debug]} { xinstall -c -m 644 ${filespath}/${select_name}-no-debug \ - ${destroot}${prefix}/etc/select/${select_port}/${select_name} + ${destroot}${prefix}/etc/select/${select_group}/${select_name} } else { xinstall -c -m 644 ${filespath}/${select_name} \ - ${destroot}${prefix}/etc/select/${select_port}/${select_name} + ${destroot}${prefix}/etc/select/${select_group}/${select_name} } } Modified: trunk/dports/aqua/qt4-mac-devel/Portfile =================================================================== --- trunk/dports/aqua/qt4-mac-devel/Portfile 2010-06-30 05:16:09 UTC (rev 69314) +++ trunk/dports/aqua/qt4-mac-devel/Portfile 2010-06-30 05:37:23 UTC (rev 69315) @@ -222,13 +222,13 @@ } # install the appropriate select file - xinstall -m 755 -d ${destroot}${prefix}/etc/select/${select_port} + xinstall -m 755 -d ${destroot}${prefix}/etc/select/${select_group} if {[variant_isset no_debug]} { xinstall -c -m 644 ${filespath}/${select_name}-no-debug \ - ${destroot}${prefix}/etc/select/${select_port}/${select_name} + ${destroot}${prefix}/etc/select/${select_group}/${select_name} } else { xinstall -c -m 644 ${filespath}/${select_name} \ - ${destroot}${prefix}/etc/select/${select_port}/${select_name} + ${destroot}${prefix}/etc/select/${select_group}/${select_name} } }

1 0

[69314] trunk/dports/aqua
by michaelld＠macports.org 30 Jun '10

30 Jun '10

Revision: 69314 http://trac.macports.org/changeset/69314 Author: michaelld(a)macports.org Date: 2010-06-29 22:16:09 -0700 (Tue, 29 Jun 2010) Log Message: ----------- Corrected use of select group, and installation of select file. Should fix ticket #25459 . Modified Paths: -------------- trunk/dports/aqua/qt4-mac/Portfile trunk/dports/aqua/qt4-mac-devel/Portfile Modified: trunk/dports/aqua/qt4-mac/Portfile =================================================================== --- trunk/dports/aqua/qt4-mac/Portfile 2010-06-30 04:40:19 UTC (rev 69313) +++ trunk/dports/aqua/qt4-mac/Portfile 2010-06-30 05:16:09 UTC (rev 69314) @@ -8,7 +8,7 @@ set select_branch mac set select_port ${select_group}_select set select_name ${select_group}-${select_branch} -select.group ${select_group} +# select.group ${select_group} name ${select_name} #conflicts kdelibs3 kdelibs4 xmlrpcxx @@ -221,10 +221,9 @@ xinstall -c -m 644 ${worksrcpath}/${doc} \ ${destroot}${qt_dir}/share/doc/${name} } -} -post-activate { # install the appropriate select file + xinstall -m 755 -d ${destroot}${prefix}/etc/select/${select_port} if {[variant_isset no_debug]} { xinstall -c -m 644 ${filespath}/${select_name}-no-debug \ ${destroot}${prefix}/etc/select/${select_port}/${select_name} @@ -232,6 +231,9 @@ xinstall -c -m 644 ${filespath}/${select_name} \ ${destroot}${prefix}/etc/select/${select_port}/${select_name} } +} + +post-activate { # If this is the first qt4-* installed, select it. set current_select [exec ${prefix}/bin/${select_port} -s] if {${current_select} == "none"} { Modified: trunk/dports/aqua/qt4-mac-devel/Portfile =================================================================== --- trunk/dports/aqua/qt4-mac-devel/Portfile 2010-06-30 04:40:19 UTC (rev 69313) +++ trunk/dports/aqua/qt4-mac-devel/Portfile 2010-06-30 05:16:09 UTC (rev 69314) @@ -8,7 +8,7 @@ set select_branch mac-devel set select_port ${select_group}_select set select_name ${select_group}-${select_branch} -select.group ${select_group} +# select.group ${select_group} name ${select_name} #conflicts kdelibs3 kdelibs4 xmlrpcxx @@ -220,10 +220,9 @@ xinstall -c -m 644 ${worksrcpath}/${doc} \ ${destroot}${qt_dir}/share/doc/${name} } -} -post-activate { # install the appropriate select file + xinstall -m 755 -d ${destroot}${prefix}/etc/select/${select_port} if {[variant_isset no_debug]} { xinstall -c -m 644 ${filespath}/${select_name}-no-debug \ ${destroot}${prefix}/etc/select/${select_port}/${select_name} @@ -231,6 +230,9 @@ xinstall -c -m 644 ${filespath}/${select_name} \ ${destroot}${prefix}/etc/select/${select_port}/${select_name} } +} + +post-activate { # If this is the first qt4-* installed, select it. set current_select [exec ${prefix}/bin/${select_port} -s] if {${current_select} == "none"} {

1 0

[69313] trunk/dports/science/root
by michaelld＠macports.org 30 Jun '10

30 Jun '10

Revision: 69313 http://trac.macports.org/changeset/69313 Author: michaelld(a)macports.org Date: 2010-06-29 21:40:19 -0700 (Tue, 29 Jun 2010) Log Message: ----------- Removed the incorrect usage of /opt/local in a patchfile, by moving to @PREFIX@ and then replacing with ${prefix} in post-configure. Modified Paths: -------------- trunk/dports/science/root/Portfile trunk/dports/science/root/files/patch-config-Makefile.config.diff Modified: trunk/dports/science/root/Portfile =================================================================== --- trunk/dports/science/root/Portfile 2010-06-30 04:18:44 UTC (rev 69312) +++ trunk/dports/science/root/Portfile 2010-06-30 04:40:19 UTC (rev 69313) @@ -5,7 +5,7 @@ name root version 5.26.00b -revision 2 +revision 3 categories science maintainers gmail.com:mattiafrancescomoro license LGPLv2.1 @@ -47,7 +47,7 @@ if {${build_arch} == "i386" || ${build_arch} == "ppc"} { configure.pre_args macosx --prefix=${prefix} } else { - configure.pre_args macos64 --prefix=${prefix} + configure.pre_args macosx64 --prefix=${prefix} } } @@ -182,7 +182,10 @@ post-configure { # patch up the Makefile.config to handle the QTLIB frameworks correctly - system "cd ${worksrcpath} && patch -p0 < ${filespath}/patch-config-Makefile.config.diff" + # first, patch using @PREFIX@ + system "cd ${worksrcpath} && patch -p0 < ${filespath}/patch-config-Makefile.config.diff" + # then replace @PREFIX@ with ${prefix} + reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/config/Makefile.config } } Modified: trunk/dports/science/root/files/patch-config-Makefile.config.diff =================================================================== --- trunk/dports/science/root/files/patch-config-Makefile.config.diff 2010-06-30 04:18:44 UTC (rev 69312) +++ trunk/dports/science/root/files/patch-config-Makefile.config.diff 2010-06-30 04:40:19 UTC (rev 69313) @@ -5,7 +5,7 @@ BUILDQTGSI := yes QTLIBDIR := -L/opt/local/libexec/qt4-mac/lib -QTLIB := QtCore.la QtGui.la Qt3Support.la QtOpenGL.la QtSvg.la QtXml.la QtWebKit.la QtNetwork.la -+QTLIB := -F/opt/local/libexec/qt4-mac/lib -framework QtCore -framework QtGui -framework Qt3Support -framework QtOpenGL -framework QtSvg -framework QtXml -framework QtWebKit -framework QtNetwork -framework ApplicationServices -framework Carbon -framework AppKit -L/opt/local/libexec/qt4-mac/lib -lpng -lz -lm ++QTLIB := -F@PREFIX@/libexec/qt4-mac/lib -framework QtCore -framework QtGui -framework Qt3Support -framework QtOpenGL -framework QtSvg -framework QtXml -framework QtWebKit -framework QtNetwork -framework ApplicationServices -framework Carbon -framework AppKit -L@PREFIX@/libexec/qt4-mac/lib -lpng -lz -lm QTINCDIR := $(filter-out /usr/include, /opt/local/libexec/qt4-mac/include/ /opt/local/libexec/qt4-mac/include//Qt /opt/local/libexec/qt4-mac/include//Qt3Support /opt/local/libexec/qt4-mac/include//QtAssistant /opt/local/libexec/qt4-mac/include//QtCore /opt/local/libexec/qt4-mac/include//QtDBus /opt/local/libexec/qt4-mac/include//QtDesigner /opt/local/libexec/qt4-mac/include//QtGui /opt/local/libexec/qt4-mac/include//QtHelp /opt/local/libexec/qt4-mac/include//QtMultimedia /opt/local/libexec/qt4-mac/include//QtNetwork /opt/local/libexec/qt4-mac/include//QtOpenGL /opt/local/libexec/qt4-mac/include//QtScript /opt/local/libexec/qt4-mac/include//QtScriptTools /opt/local/libexec/qt4-mac/include//QtSql /opt/local/libexec/qt4-mac/include//QtSvg /opt/local/libexec/qt4-mac/include//QtTest /opt/local/libexec/qt4-mac/include//QtUiTools /opt/local/libexec/qt4-mac/include//QtWebKit /opt/local/libexec/qt4-mac/include//QtXml /opt/local/libexec/qt4-mac/include//QtXmlPatterns) QTVERS := 4 QTMOCEXE := /opt/local/bin/moc

1 0