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

propchange - r32344 svn:log
by wsiegrist＠apple.com 02 Jun '08

02 Jun '08

Author: wsiegrist(a)apple.com (original author: gwright(a)macports.org) Revision: 32344 Property Name: svn:log @@ -1,3 +1,4 @@ Install the C++ wrappers (we've built them for some time anyway). This makes the gmp-cxx-wrappers port obsolete. The cmp-cxx-wrappers was an old hack from the days when gmp's C++ support was broken. +

1 0

[37292] trunk/dports/benchmarks/ubench
by jmr＠macports.org 02 Jun '08

02 Jun '08

Revision: 37292 http://trac.macosforge.org/projects/macports/changeset/37292 Author: jmr(a)macports.org Date: 2008-06-02 08:12:13 -0700 (Mon, 02 Jun 2008) Log Message: ----------- ubench: de-lint, add modeline Modified Paths: -------------- trunk/dports/benchmarks/ubench/Portfile Added Paths: ----------- trunk/dports/benchmarks/ubench/files/patch-cpubench.c.diff trunk/dports/benchmarks/ubench/files/patch-membench.c.diff Removed Paths: ------------- trunk/dports/benchmarks/ubench/files/patch-cpubench.c trunk/dports/benchmarks/ubench/files/patch-membench.c Modified: trunk/dports/benchmarks/ubench/Portfile =================================================================== --- trunk/dports/benchmarks/ubench/Portfile 2008-06-02 15:07:07 UTC (rev 37291) +++ trunk/dports/benchmarks/ubench/Portfile 2008-06-02 15:12:13 UTC (rev 37292) @@ -1,6 +1,8 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 # $Id$ PortSystem 1.0 + name ubench version 0.32 categories benchmarks @@ -19,7 +21,7 @@ master_sites http://www.phystech.com/ftp/ \ ftp://ftp.phystech.com/pub/ checksums md5 b03ddb52867a80890999b56cda8e69b7 -patchfiles patch-cpubench.c patch-membench.c \ +patchfiles patch-cpubench.c.diff patch-membench.c.diff \ patch-configure.diff build.target destroot.destdir INSTALLDIR=${destroot}${prefix}/bin Deleted: trunk/dports/benchmarks/ubench/files/patch-cpubench.c =================================================================== --- trunk/dports/benchmarks/ubench/files/patch-cpubench.c 2008-06-02 15:07:07 UTC (rev 37291) +++ trunk/dports/benchmarks/ubench/files/patch-cpubench.c 2008-06-02 15:12:13 UTC (rev 37292) @@ -1,10 +0,0 @@ ---- cpubench.c.orig 2005-04-04 00:47:31.000000000 -0400 -+++ cpubench.c 2005-04-04 00:47:48.000000000 -0400 -@@ -32,6 +32,7 @@ - #include <limits.h> - #include <math.h> - #include <time.h> -+#include <stdlib.h> - - #if defined HPUX || defined _AIX - extern char *sys_errlist[]; Copied: trunk/dports/benchmarks/ubench/files/patch-cpubench.c.diff (from rev 37276, trunk/dports/benchmarks/ubench/files/patch-cpubench.c) =================================================================== --- trunk/dports/benchmarks/ubench/files/patch-cpubench.c.diff (rev 0) +++ trunk/dports/benchmarks/ubench/files/patch-cpubench.c.diff 2008-06-02 15:12:13 UTC (rev 37292) @@ -0,0 +1,10 @@ +--- cpubench.c.orig 2005-04-04 00:47:31.000000000 -0400 ++++ cpubench.c 2005-04-04 00:47:48.000000000 -0400 +@@ -32,6 +32,7 @@ + #include <limits.h> + #include <math.h> + #include <time.h> ++#include <stdlib.h> + + #if defined HPUX || defined _AIX + extern char *sys_errlist[]; Deleted: trunk/dports/benchmarks/ubench/files/patch-membench.c =================================================================== --- trunk/dports/benchmarks/ubench/files/patch-membench.c 2008-06-02 15:07:07 UTC (rev 37291) +++ trunk/dports/benchmarks/ubench/files/patch-membench.c 2008-06-02 15:12:13 UTC (rev 37292) @@ -1,10 +0,0 @@ ---- membench.c.orig 2005-04-04 00:45:43.000000000 -0400 -+++ membench.c 2005-04-04 00:45:53.000000000 -0400 -@@ -33,6 +33,7 @@ - #include <errno.h> - #include <string.h> - #include <time.h> -+#include <limits.h> - - #if defined HPUX || defined _AIX - extern char *sys_errlist[]; Copied: trunk/dports/benchmarks/ubench/files/patch-membench.c.diff (from rev 37276, trunk/dports/benchmarks/ubench/files/patch-membench.c) =================================================================== --- trunk/dports/benchmarks/ubench/files/patch-membench.c.diff (rev 0) +++ trunk/dports/benchmarks/ubench/files/patch-membench.c.diff 2008-06-02 15:12:13 UTC (rev 37292) @@ -0,0 +1,10 @@ +--- membench.c.orig 2005-04-04 00:45:43.000000000 -0400 ++++ membench.c 2005-04-04 00:45:53.000000000 -0400 +@@ -33,6 +33,7 @@ + #include <errno.h> + #include <string.h> + #include <time.h> ++#include <limits.h> + + #if defined HPUX || defined _AIX + extern char *sys_errlist[];

1 0

[37291] trunk/dports/benchmarks/ubench
by jmr＠macports.org 02 Jun '08

02 Jun '08

Revision: 37291 http://trac.macosforge.org/projects/macports/changeset/37291 Author: jmr(a)macports.org Date: 2008-06-02 08:07:07 -0700 (Mon, 02 Jun 2008) Log Message: ----------- ubench: enable building 64-bit and universal Modified Paths: -------------- trunk/dports/benchmarks/ubench/Portfile Added Paths: ----------- trunk/dports/benchmarks/ubench/files/patch-configure.diff Modified: trunk/dports/benchmarks/ubench/Portfile =================================================================== --- trunk/dports/benchmarks/ubench/Portfile 2008-06-02 15:05:26 UTC (rev 37290) +++ trunk/dports/benchmarks/ubench/Portfile 2008-06-02 15:07:07 UTC (rev 37291) @@ -19,9 +19,27 @@ master_sites http://www.phystech.com/ftp/ \ ftp://ftp.phystech.com/pub/ checksums md5 b03ddb52867a80890999b56cda8e69b7 -patchfiles patch-cpubench.c patch-membench.c +patchfiles patch-cpubench.c patch-membench.c \ + patch-configure.diff build.target destroot.destdir INSTALLDIR=${destroot}${prefix}/bin post-destroot { xinstall -m 444 ${worksrcpath}/ubench.8 ${destroot}${prefix}/share/man/man8 } + +variant use_64_bit conflicts universal description {Build a 64-bit executable} { + pre-fetch { + if {${os.platform} != "darwin"} { + return -code error "The use_64_bit variant only works on Darwin" + } elseif {${os.major} < 8} { + return -code error "The use_64_bit variant needs Darwin 8 or later" + } + } + if {${os.arch} == "i386"} { + configure.cflags-append -arch x86_64 + } elseif {${os.arch} == "powerpc"} { + configure.cflags-append -arch ppc64 + } else { + ui_warn "Unknown arch: ${os.arch}" + } +} Added: trunk/dports/benchmarks/ubench/files/patch-configure.diff =================================================================== --- trunk/dports/benchmarks/ubench/files/patch-configure.diff (rev 0) +++ trunk/dports/benchmarks/ubench/files/patch-configure.diff 2008-06-02 15:07:07 UTC (rev 37291) @@ -0,0 +1,17 @@ +--- configure.orig 2000-08-06 04:53:16.000000000 +1000 ++++ configure 2008-06-02 23:11:47.000000000 +1000 +@@ -113,10 +113,10 @@ + ;; + *) + cat <<! >> Makefile +-CC = cc +-CFLAGS = +-LDFLAGS = -lm +-INCLUDES = -I. ++CC = $CC ++CFLAGS = $CFLAGS ++LDFLAGS += $LDFLAGS -lm ++INCLUDES += $CPPFLAGS -I. + + ! + ;;

1 0

[37290] trunk/base/src/port/port.tcl
by raimue＠macports.org 02 Jun '08

02 Jun '08

Revision: 37290 http://trac.macosforge.org/projects/macports/changeset/37290 Author: raimue(a)macports.org Date: 2008-06-02 08:05:26 -0700 (Mon, 02 Jun 2008) Log Message: ----------- port/port.tcl: Add a new option --line to port search. This works a little bit like the old output of port search in 1.6.1, but uses tabs to separate fields instead of hardcoded spaces (easy parsing with awk or similar). Modified Paths: -------------- trunk/base/src/port/port.tcl Modified: trunk/base/src/port/port.tcl =================================================================== --- trunk/base/src/port/port.tcl 2008-06-02 14:20:29 UTC (rev 37289) +++ trunk/base/src/port/port.tcl 2008-06-02 15:05:26 UTC (rev 37290) @@ -2016,7 +2016,7 @@ proc action_search { action portlist opts } { - global private_options + global private_options global_options set status 0 if {![llength $portlist] && [info exists private_options(ports_no_args)] && $private_options(ports_no_args) == "yes"} { ui_error "You must specify a search pattern" @@ -2089,14 +2089,19 @@ if {[macports::ui_isset ports_quiet]} { puts $portinfo(name) } else { - puts -nonewline $joiner + if {[info exists global_options(ports_search_line)] + && $global_options(ports_search_line) == "yes"} { + puts "$portinfo(name)\t$portinfo(version)\t$portinfo(categories)\t$portinfo(description)" + } else { + puts -nonewline $joiner - puts -nonewline "$portinfo(name) @$portinfo(version)" - if {[info exists portinfo(categories)]} { - puts -nonewline " ([join $portinfo(categories) ", "])" + puts -nonewline "$portinfo(name) @$portinfo(version)" + if {[info exists portinfo(categories)]} { + puts -nonewline " ([join $portinfo(categories) ", "])" + } + puts "" + puts [wrap [join $portinfo(description)] 80 [string repeat " " 4]] } - puts "" - puts [wrap [join $portinfo(description)] 80 [string repeat " " 4]] } set joiner "\n" @@ -2105,7 +2110,10 @@ if { !$portfound } { ui_msg "No match for $portname found" } elseif {[llength $res] > 1} { - ui_msg "\nFound [llength $res] ports." + if {![info exists global_options(ports_search_line)] + || $global_options(ports_search_line) != "yes"} { + ui_msg "\nFound [llength $res] ports." + } } set separator "--\n" @@ -2564,6 +2572,7 @@ {index 0} {line 0} {long_description 0} {maintainer 0} {maintainers 0} {name 0} {platform 0} {platforms 0} {portdir 0} {revision 0} {variant 0} {variants 0} {version 0}} + search {{line 0}} selfupdate {{nosync 0} {pretend 0}} uninstall {{follow-dependents 0}} variants {{index 0}}

1 0

[37289] trunk/dports/ruby/rb-mysql/Portfile
by febeling＠macports.org 02 Jun '08

02 Jun '08

Revision: 37289 http://trac.macosforge.org/projects/macports/changeset/37289 Author: febeling(a)macports.org Date: 2008-06-02 07:20:29 -0700 (Mon, 02 Jun 2008) Log Message: ----------- Inform configure phase using mysql_config binaries, because of occasional build issues. Closes #15462. Modified Paths: -------------- trunk/dports/ruby/rb-mysql/Portfile Modified: trunk/dports/ruby/rb-mysql/Portfile =================================================================== --- trunk/dports/ruby/rb-mysql/Portfile 2008-06-02 12:38:18 UTC (rev 37288) +++ trunk/dports/ruby/rb-mysql/Portfile 2008-06-02 14:20:29 UTC (rev 37289) @@ -3,7 +3,7 @@ PortSystem 1.0 PortGroup ruby 1.0 -revision 0 +revision 1 ruby.setup {mysql mysql-ruby} 2.7.5 extconf.rb {README.html README_ja.html} @@ -20,15 +20,12 @@ depends_lib port:mysql5 depends_build port:ruby -configure.args --with-mysql-include=${prefix}/include/mysql5/mysql \ - --with-mysql-lib=${prefix}/lib/mysql5/mysql +configure.args --with-mysql-config=${prefix}/bin/mysql_config5 -variant mysql4 { +variant mysql4 description "Build using MySQL 4.1 client library" { depends_lib-delete port:mysql5 - configure.args-delete --with-mysql-include=${prefix}/include/mysql5/mysql \ - --with-mysql-lib=${prefix}/lib/mysql5/mysql + configure.args-delete --with-mysql-config=${prefix}/bin/mysql_config5 depends_lib-append port:mysql4 - configure.args-append --with-mysql-include=${prefix}/include/mysql \ - --with-mysql-lib=${prefix}/lib/mysql + configure.args-append --with-mysql-config=${prefix}/bin/mysql_config }

1 0

[MacPorts] Notification: CommittersTipsAndTricks modified
by MacPorts 02 Jun '08

02 Jun '08

Changed page "CommittersTipsAndTricks" by raimue(a)macports.org from 91.11.241.196* Page URL: <http://trac.macports.org/wiki/CommittersTipsAndTricks> Diff URL: <http://trac.macports.org/wiki/CommittersTipsAndTricks?action=diff&version=5> Revision 5 Comment: New version of the trac-patch script Changes on attached CommittersTipsAndTricks.diff file. * The IP shown here might not mean anything if the user is behind a proxy. -- MacPorts <http://www.macports.org/> Ports system for Mac OS

1 0

[37288] trunk/dports/benchmarks/nbench-byte
by jmr＠macports.org 02 Jun '08

02 Jun '08

Revision: 37288 http://trac.macosforge.org/projects/macports/changeset/37288 Author: jmr(a)macports.org Date: 2008-06-02 05:38:18 -0700 (Mon, 02 Jun 2008) Log Message: ----------- nbench-byte: add a use_64_bit variant Modified Paths: -------------- trunk/dports/benchmarks/nbench-byte/Portfile trunk/dports/benchmarks/nbench-byte/files/patch-Makefile.diff Modified: trunk/dports/benchmarks/nbench-byte/Portfile =================================================================== --- trunk/dports/benchmarks/nbench-byte/Portfile 2008-06-02 11:02:40 UTC (rev 37287) +++ trunk/dports/benchmarks/nbench-byte/Portfile 2008-06-02 12:38:18 UTC (rev 37288) @@ -39,3 +39,27 @@ ui_msg "${prefix}/share/nbench/NNET.DAT to be in the same directory" ui_msg "that you start nbench from." } + +variant use_64_bit description {Build a 64-bit executable} { + pre-fetch { + if {${os.platform} != "darwin"} { + return -code error "The use_64_bit variant only works on Darwin" + } elseif {${os.major} < 8} { + return -code error "The use_64_bit variant needs Darwin 8 or later" + } + } + if {${os.arch} == "i386"} { + build.env-append CFLAGS="-arch x86_64" + } elseif {${os.arch} == "powerpc"} { + build.env-append CFLAGS="-arch ppc64" + } else { + ui_warn "Unknown arch: ${os.arch}" + } +} + +platform darwin 8 { + build.args-append CC=/usr/bin/gcc-4.0 +} +platform darwin 9 { + build.args-append CC=/usr/bin/gcc-4.0 +} Modified: trunk/dports/benchmarks/nbench-byte/files/patch-Makefile.diff =================================================================== --- trunk/dports/benchmarks/nbench-byte/files/patch-Makefile.diff 2008-06-02 11:02:40 UTC (rev 37287) +++ trunk/dports/benchmarks/nbench-byte/files/patch-Makefile.diff 2008-06-02 12:38:18 UTC (rev 37288) @@ -1,13 +1,26 @@ ---- Makefile.old Wed Jan 14 06:32:54 2004 -+++ Makefile Wed Jan 14 06:33:14 2004 -@@ -64,8 +64,8 @@ +--- Makefile.orig 2004-12-30 13:23:30.000000000 +1100 ++++ Makefile 2008-06-02 21:22:06.000000000 +1000 +@@ -19,10 +19,10 @@ + # You should leave -static in the CFLAGS so that your sysinfo can be + # compiled into the executable. + +-CC = gcc ++#CC = gcc + + # generic options for gcc +-CFLAGS = -s -static -Wall -O3 ++#CFLAGS = -s -static -Wall -O3 + + # if your gcc lets you do it, then try this one + #CFLAGS = -s -static -Wall -O3 -fomit-frame-pointer -funroll-loops +@@ -74,8 +74,8 @@ #LINKFLAGS = -s # for a Mac with OsX and the Darwin environment -#CC = cc -#CFLAGS = -O3 -DOSX -+CC = cc -+CFLAGS = -O3 -DOSX ++CC ?= cc ++CFLAGS += -O3 -DOSX # For debugging using cc #CC = cc

1 0

[MacPorts] Notification: howto/SetupDovecot modified
by MacPorts 02 Jun '08

02 Jun '08

Changed page "howto/SetupDovecot" by raimue(a)macports.org from 91.11.241.196* Page URL: <http://trac.macports.org/wiki/howto/SetupDovecot> Diff URL: <http://trac.macports.org/wiki/howto/SetupDovecot?action=diff&version=12> Revision 12 Comment: typo Changes on attached howto/SetupDovecot.diff file. * The IP shown here might not mean anything if the user is behind a proxy. -- MacPorts <http://www.macports.org/> Ports system for Mac OS

1 0

[MacPorts] Notification: howto/SetupDovecot modified
by MacPorts 02 Jun '08

02 Jun '08

Changed page "howto/SetupDovecot" by martin.osx(a)krischik.com from 194.41.152.138* Page URL: <http://trac.macports.org/wiki/howto/SetupDovecot> Diff URL: <http://trac.macports.org/wiki/howto/SetupDovecot?action=diff&version=11> Revision 11 Comment: start stop Changes on attached howto/SetupDovecot.diff file. * The IP shown here might not mean anything if the user is behind a proxy. -- MacPorts <http://www.macports.org/> Ports system for Mac OS

1 0

[MacPorts] Notification: howto/SetupDovecot modified
by MacPorts 02 Jun '08

02 Jun '08

Changed page "howto/SetupDovecot" by martin.osx(a)krischik.com from 194.41.152.138* Page URL: <http://trac.macports.org/wiki/howto/SetupDovecot> Diff URL: <http://trac.macports.org/wiki/howto/SetupDovecot?action=diff&version=10> Revision 10 Comment: Changes on attached howto/SetupDovecot.diff file. * The IP shown here might not mean anything if the user is behind a proxy. -- MacPorts <http://www.macports.org/> Ports system for Mac OS

1 0