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

[70814] trunk/dports/python/py26-jinja2/Portfile
by jmr＠macports.org 22 Aug '10

22 Aug '10

Revision: 70814 http://trac.macports.org/changeset/70814 Author: jmr(a)macports.org Date: 2010-08-21 22:43:35 -0700 (Sat, 21 Aug 2010) Log Message: ----------- py26-jinja2: depend on MarkupSafe for speedups Modified Paths: -------------- trunk/dports/python/py26-jinja2/Portfile Modified: trunk/dports/python/py26-jinja2/Portfile =================================================================== --- trunk/dports/python/py26-jinja2/Portfile 2010-08-22 04:50:13 UTC (rev 70813) +++ trunk/dports/python/py26-jinja2/Portfile 2010-08-22 05:43:35 UTC (rev 70814) @@ -6,6 +6,7 @@ name py26-jinja2 version 2.5.2 +revision 1 categories-append devel license BSD maintainers jmr openmaintainer @@ -26,11 +27,9 @@ sha1 d68a2dbc7e8e280e350c52090d472024a87642a2 \ rmd160 b69c4505bc14f1fc8c4af67c2baa5b02fc17d99f -depends_lib port:py26-distribute +depends_lib port:py26-distribute \ + port:py26-markupsafe -build.cmd-append --with-speedups -destroot.cmd-append --with-speedups - livecheck.type regex livecheck.url http://pypi.python.org/pypi/Jinja2/ livecheck.regex {Jinja2 ([0-9\.]+)}

1 0

[70813] contrib/mpvim/syntax/portfile.vim
by ram＠macports.org 22 Aug '10

22 Aug '10

Revision: 70813 http://trac.macports.org/changeset/70813 Author: ram(a)macports.org Date: 2010-08-21 21:50:13 -0700 (Sat, 21 Aug 2010) Log Message: ----------- recognise supported_archs Modified Paths: -------------- contrib/mpvim/syntax/portfile.vim Modified: contrib/mpvim/syntax/portfile.vim =================================================================== --- contrib/mpvim/syntax/portfile.vim 2010-08-22 04:47:18 UTC (rev 70812) +++ contrib/mpvim/syntax/portfile.vim 2010-08-22 04:50:13 UTC (rev 70813) @@ -33,7 +33,7 @@ syn keyword PortfileOptional PortGroup epoch revision worksrcdir distname platform syn keyword PortfileOptional use_automake use_autoconf use_configure syn keyword PortfileOptional patch_sites distfiles dist_subdir license conflicts -syn keyword PortfileOptional replaced_by +syn keyword PortfileOptional replaced_by supported_archs syn keyword PortfileOptional checksums nextgroup=PortfileChecksums skipwhite syn region PortfileChecksums matchgroup=Normal start="" skip="\\$" end="$" contained contains=PortfileChecksumsType

1 0

[70812] trunk/dports/science/lscsoft-deps/Portfile
by ram＠macports.org 22 Aug '10

22 Aug '10

Revision: 70812 http://trac.macports.org/changeset/70812 Author: ram(a)macports.org Date: 2010-08-21 21:47:18 -0700 (Sat, 21 Aug 2010) Log Message: ----------- science/lscsoft-deps: bump version Modified Paths: -------------- trunk/dports/science/lscsoft-deps/Portfile Modified: trunk/dports/science/lscsoft-deps/Portfile =================================================================== --- trunk/dports/science/lscsoft-deps/Portfile 2010-08-22 04:47:11 UTC (rev 70811) +++ trunk/dports/science/lscsoft-deps/Portfile 2010-08-22 04:47:18 UTC (rev 70812) @@ -3,7 +3,7 @@ PortSystem 1.0 name lscsoft-deps -version 20090911 +version 20100821 categories science maintainers ram platforms darwin

1 0

[70811] trunk/dports/science/lscsoft-deps/Portfile
by ram＠macports.org 22 Aug '10

22 Aug '10

Revision: 70811 http://trac.macports.org/changeset/70811 Author: ram(a)macports.org Date: 2010-08-21 21:47:11 -0700 (Sat, 21 Aug 2010) Log Message: ----------- science/lscsoft-deps: specify noarch Modified Paths: -------------- trunk/dports/science/lscsoft-deps/Portfile Modified: trunk/dports/science/lscsoft-deps/Portfile =================================================================== --- trunk/dports/science/lscsoft-deps/Portfile 2010-08-22 04:47:03 UTC (rev 70810) +++ trunk/dports/science/lscsoft-deps/Portfile 2010-08-22 04:47:11 UTC (rev 70811) @@ -7,6 +7,7 @@ categories science maintainers ram platforms darwin +supported_archs noarch description LSCSoft dependencies meta-port long_description This is a meta-port that depends on all the ports \

1 0

[70810] trunk/dports/science/lscsoft-deps/Portfile
by ram＠macports.org 22 Aug '10

22 Aug '10

Revision: 70810 http://trac.macports.org/changeset/70810 Author: ram(a)macports.org Date: 2010-08-21 21:47:03 -0700 (Sat, 21 Aug 2010) Log Message: ----------- science/lscsoft-deps: whitespace Modified Paths: -------------- trunk/dports/science/lscsoft-deps/Portfile Modified: trunk/dports/science/lscsoft-deps/Portfile =================================================================== --- trunk/dports/science/lscsoft-deps/Portfile 2010-08-22 04:46:57 UTC (rev 70809) +++ trunk/dports/science/lscsoft-deps/Portfile 2010-08-22 04:47:03 UTC (rev 70810) @@ -1,42 +1,42 @@ # $Id$ -PortSystem 1.0 +PortSystem 1.0 -name lscsoft-deps -version 20090911 -categories science -maintainers ram -platforms darwin +name lscsoft-deps +version 20090911 +categories science +maintainers ram +platforms darwin -description LSCSoft dependencies meta-port +description LSCSoft dependencies meta-port long_description This is a meta-port that depends on all the ports \ needed for developing Software used within the LIGO Scientific \ Collaboration. -homepage http://www.lsc-group.phys.uwm.edu/daswg -master_sites ${homepage} +homepage http://www.lsc-group.phys.uwm.edu/daswg +master_sites ${homepage} distfiles -depends_run port:python26 \ - port:python_select \ - port:py26-numpy \ - port:py26-pyrxp \ - port:py26-m2crypto \ - port:py26-cjson \ - port:py26-pyxmpp \ - port:pkgconfig \ - port:fftw-3 \ - port:fftw-3-single \ - port:libframe \ - port:metaio \ - port:gsl \ - port:libxml2 \ - port:cfitsio \ - port:git-core \ - port:autoconf \ - port:automake \ - port:libtool +depends_run port:python26 \ + port:python_select \ + port:py26-numpy \ + port:py26-pyrxp \ + port:py26-m2crypto \ + port:py26-cjson \ + port:py26-pyxmpp \ + port:pkgconfig \ + port:fftw-3 \ + port:fftw-3-single \ + port:libframe \ + port:metaio \ + port:gsl \ + port:libxml2 \ + port:cfitsio \ + port:git-core \ + port:autoconf \ + port:automake \ + port:libtool build {} destroot { @@ -49,7 +49,7 @@ \n\tsudo python_select python26\n" } -use_configure no +use_configure no universal_variant no livecheck.type none

1 0

[70809] trunk/dports/science/lscsoft-deps/Portfile
by ram＠macports.org 22 Aug '10

22 Aug '10

Revision: 70809 http://trac.macports.org/changeset/70809 Author: ram(a)macports.org Date: 2010-08-21 21:46:57 -0700 (Sat, 21 Aug 2010) Log Message: ----------- science/lscsoft-deps: add libtool as a dependency Modified Paths: -------------- trunk/dports/science/lscsoft-deps/Portfile Modified: trunk/dports/science/lscsoft-deps/Portfile =================================================================== --- trunk/dports/science/lscsoft-deps/Portfile 2010-08-22 04:46:48 UTC (rev 70808) +++ trunk/dports/science/lscsoft-deps/Portfile 2010-08-22 04:46:57 UTC (rev 70809) @@ -35,7 +35,8 @@ port:cfitsio \ port:git-core \ port:autoconf \ - port:automake + port:automake \ + port:libtool build {} destroot {

1 0

[70808] trunk/dports/science/lscsoft-deps/Portfile
by ram＠macports.org 22 Aug '10

22 Aug '10

Revision: 70808 http://trac.macports.org/changeset/70808 Author: ram(a)macports.org Date: 2010-08-21 21:46:48 -0700 (Sat, 21 Aug 2010) Log Message: ----------- science/lscsoft-deps: simplify description Modified Paths: -------------- trunk/dports/science/lscsoft-deps/Portfile Modified: trunk/dports/science/lscsoft-deps/Portfile =================================================================== --- trunk/dports/science/lscsoft-deps/Portfile 2010-08-22 04:28:34 UTC (rev 70807) +++ trunk/dports/science/lscsoft-deps/Portfile 2010-08-22 04:46:48 UTC (rev 70808) @@ -11,7 +11,7 @@ description LSCSoft dependencies meta-port long_description This is a meta-port that depends on all the ports \ needed for developing Software used within the LIGO Scientific \ - Collaboration including Glue, LAL, LALStochastic, and LALApps. + Collaboration. homepage http://www.lsc-group.phys.uwm.edu/daswg master_sites ${homepage}

1 0

[70807] trunk/dports/_resources/port1.0/group/xcodeversion-1.0.tcl
by jmr＠macports.org 22 Aug '10

22 Aug '10

Revision: 70807 http://trac.macports.org/changeset/70807 Author: jmr(a)macports.org Date: 2010-08-21 21:28:34 -0700 (Sat, 21 Aug 2010) Log Message: ----------- xcodeversion portgroup: only check on OS X Modified Paths: -------------- trunk/dports/_resources/port1.0/group/xcodeversion-1.0.tcl Modified: trunk/dports/_resources/port1.0/group/xcodeversion-1.0.tcl =================================================================== --- trunk/dports/_resources/port1.0/group/xcodeversion-1.0.tcl 2010-08-22 01:31:02 UTC (rev 70806) +++ trunk/dports/_resources/port1.0/group/xcodeversion-1.0.tcl 2010-08-22 04:28:34 UTC (rev 70807) @@ -43,8 +43,8 @@ options minimum_xcodeversions default minimum_xcodeversions {} -pre-extract { - if {"darwin" == ${os.platform}} { +platform macosx { + pre-extract { set current_xcodeversion [exec defaults read ${developer_dir}/Applications/Xcode.app/Contents/Info CFBundleShortVersionString] foreach {darwin_major minimum_xcodeversion} [join ${minimum_xcodeversions}] { if {${darwin_major} == ${os.major}} {

1 0

[70806] trunk/dports/print/libspectre/Portfile
by devans＠macports.org 22 Aug '10

22 Aug '10

Revision: 70806 http://trac.macports.org/changeset/70806 Author: devans(a)macports.org Date: 2010-08-21 18:31:02 -0700 (Sat, 21 Aug 2010) Log Message: ----------- libspectre: update to version 0.2.6. Modified Paths: -------------- trunk/dports/print/libspectre/Portfile Modified: trunk/dports/print/libspectre/Portfile =================================================================== --- trunk/dports/print/libspectre/Portfile 2010-08-21 22:40:47 UTC (rev 70805) +++ trunk/dports/print/libspectre/Portfile 2010-08-22 01:31:02 UTC (rev 70806) @@ -4,7 +4,7 @@ PortSystem 1.0 name libspectre -version 0.2.3 +version 0.2.6 description Libspectre is a small library for rendering PostScript documents. long_description \ ${description} \ @@ -16,9 +16,9 @@ homepage http://libspectre.freedesktop.org/wiki/ master_sites http://libspectre.freedesktop.org/releases/ -checksums md5 9c5867e970d1bad5f80809bfdb4306c1 \ - sha1 3cf34a8cdf9fa50abc7af8069804abc81731521e \ - rmd160 e749f67bf6ce4ccf99e00f526d50ae3846d5ecae +checksums md5 5c6db35f2097c3a04c48c7f435d4b507 \ + sha1 819475c7e34a1e9bc2e876110fee530b42aecabd \ + rmd160 cb473eeeea513eddf1aee3e144f9c1d47d1f1342 depends_build port:pkgconfig

1 0

[70805] branches/gsoc10-mpwa/mpwa
by jrozner＠macports.org 21 Aug '10

21 Aug '10

Revision: 70805 http://trac.macports.org/changeset/70805 Author: jrozner(a)macports.org Date: 2010-08-21 15:40:47 -0700 (Sat, 21 Aug 2010) Log Message: ----------- Fixed redirect for comments and cache expiring Modified Paths: -------------- branches/gsoc10-mpwa/mpwa/app/controllers/categories_controller.rb branches/gsoc10-mpwa/mpwa/app/controllers/comments_controller.rb branches/gsoc10-mpwa/mpwa/app/controllers/ports_controller.rb branches/gsoc10-mpwa/mpwa/app/sweepers/category_sweeper.rb branches/gsoc10-mpwa/mpwa/app/sweepers/port_sweeper.rb branches/gsoc10-mpwa/mpwa/app/sweepers/ticket_sweeper.rb branches/gsoc10-mpwa/mpwa/app/views/ports/show.html.erb branches/gsoc10-mpwa/mpwa/config/routes.rb Added Paths: ----------- branches/gsoc10-mpwa/mpwa/app/sweepers/comment_sweeper.rb Modified: branches/gsoc10-mpwa/mpwa/app/controllers/categories_controller.rb =================================================================== --- branches/gsoc10-mpwa/mpwa/app/controllers/categories_controller.rb 2010-08-21 22:32:44 UTC (rev 70804) +++ branches/gsoc10-mpwa/mpwa/app/controllers/categories_controller.rb 2010-08-21 22:40:47 UTC (rev 70805) @@ -1,5 +1,6 @@ class CategoriesController < ApplicationController caches_page :index + cache_sweeper :category_sweeper, :only => [:create, :update, :destroy] def index @categories = Category.all(:order => 'name ASC') Modified: branches/gsoc10-mpwa/mpwa/app/controllers/comments_controller.rb =================================================================== --- branches/gsoc10-mpwa/mpwa/app/controllers/comments_controller.rb 2010-08-21 22:32:44 UTC (rev 70804) +++ branches/gsoc10-mpwa/mpwa/app/controllers/comments_controller.rb 2010-08-21 22:40:47 UTC (rev 70805) @@ -1,7 +1,5 @@ class CommentsController < ApplicationController - def edit - @comment = Port.find(params[:port_id]).comments.find(params[:id]) - end + cache_sweeper :comment_sweeper, :only => [:create] def create @comment = Port.find(params[:port_id]).comments.build(params[:comment]) @@ -9,27 +7,15 @@ respond_to do |format| if verify_recaptcha if @comment.save - format.html { redirect_to @comment.port } + format.html { redirect_to category_port_path((a)comment.port.category, @comment.port) } end else flash[:error] = "There was an error with the recaptcha code below. Please re-enter the code and click submit." - format.html { redirect_to @comment.port } + format.html { redirect_to category_port_path((a)comment.port.category, @comment.port) } end end end - def update - @comment = Port.find(params[:port_id]).comments.find(params[:id]) - - respond_to do |format| - if @comment.update_attributes(params[:comment]) - format.html { redirect_to((a)comment.port, :notice => 'Comment was successfully updated.') } - else - format.html { render :action => "edit" } - end - end - end - def destroy @comment = Port.find(params[:port_id]).comments.find(params[:id]) @comment.destroy Modified: branches/gsoc10-mpwa/mpwa/app/controllers/ports_controller.rb =================================================================== --- branches/gsoc10-mpwa/mpwa/app/controllers/ports_controller.rb 2010-08-21 22:32:44 UTC (rev 70804) +++ branches/gsoc10-mpwa/mpwa/app/controllers/ports_controller.rb 2010-08-21 22:40:47 UTC (rev 70805) @@ -1,5 +1,6 @@ class PortsController < ApplicationController caches_page :index, :show + cache_sweeper :port_sweeper, :only => [:create, :update, :destroy] def index unless params[:category_id].nil? Modified: branches/gsoc10-mpwa/mpwa/app/sweepers/category_sweeper.rb =================================================================== --- branches/gsoc10-mpwa/mpwa/app/sweepers/category_sweeper.rb 2010-08-21 22:32:44 UTC (rev 70804) +++ branches/gsoc10-mpwa/mpwa/app/sweepers/category_sweeper.rb 2010-08-21 22:40:47 UTC (rev 70805) @@ -15,6 +15,7 @@ private def expire_cache_for(category) - expire_page :action => :index + expire_page categories_path + expire_page category_path(category) end end \ No newline at end of file Added: branches/gsoc10-mpwa/mpwa/app/sweepers/comment_sweeper.rb =================================================================== --- branches/gsoc10-mpwa/mpwa/app/sweepers/comment_sweeper.rb (rev 0) +++ branches/gsoc10-mpwa/mpwa/app/sweepers/comment_sweeper.rb 2010-08-21 22:40:47 UTC (rev 70805) @@ -0,0 +1,12 @@ +class CommentSweeper < ActionController::Caching::Sweeper + observe Comment + + def after_create(comment) + expire_cache_for comment + end + +private + def expire_cache_for(comment) + expire_page category_port_path(comment.port.category, comment.port) + end +end \ No newline at end of file Modified: branches/gsoc10-mpwa/mpwa/app/sweepers/port_sweeper.rb =================================================================== --- branches/gsoc10-mpwa/mpwa/app/sweepers/port_sweeper.rb 2010-08-21 22:32:44 UTC (rev 70804) +++ branches/gsoc10-mpwa/mpwa/app/sweepers/port_sweeper.rb 2010-08-21 22:40:47 UTC (rev 70805) @@ -15,7 +15,7 @@ private def expire_cache_for(port) - expire_page :action => :index - expire_page :action => :show + expire_page category_ports_path(port.category) + expire_page category_port_path(port.category, port) end end \ No newline at end of file Modified: branches/gsoc10-mpwa/mpwa/app/sweepers/ticket_sweeper.rb =================================================================== --- branches/gsoc10-mpwa/mpwa/app/sweepers/ticket_sweeper.rb 2010-08-21 22:32:44 UTC (rev 70804) +++ branches/gsoc10-mpwa/mpwa/app/sweepers/ticket_sweeper.rb 2010-08-21 22:40:47 UTC (rev 70805) @@ -2,20 +2,19 @@ observe Ticket def after_create(ticket) - expire_cache_for ticket.port + expire_cache_for ticket end def after_update(ticket) - expire_cache_for ticket.port + expire_cache_for ticket end def after_destroy(ticket) - expire_cache_for ticket.port + expire_cache_for ticket end private def expire_cache_for(ticket) - expire_page :controller => :port, :action => :index - expire_page :controller => :port, :action => :show + expire_page category_port_path(ticket.port.category, ticket.port) end end \ No newline at end of file Modified: branches/gsoc10-mpwa/mpwa/app/views/ports/show.html.erb =================================================================== --- branches/gsoc10-mpwa/mpwa/app/views/ports/show.html.erb 2010-08-21 22:32:44 UTC (rev 70804) +++ branches/gsoc10-mpwa/mpwa/app/views/ports/show.html.erb 2010-08-21 22:40:47 UTC (rev 70805) @@ -43,21 +43,6 @@ <strong>Portfile:</strong> <%= link_to "#{(a)port.path}/Portfile", "#{$svn_url}/trunk/dports/#{(a)port.path}/Portfile" %> </p> - <% form_for([(a)port.category, @port, @comment]) do |f| %> - <%= f.error_messages %> - - <p> - <%= f.label :body, "<strong>Comment</strong>" %><br /> - <%= f.text_area :body, {:rows => 5, :cols => 80} %> - </p> - <p> - <%= recaptcha_tags :display => {:theme => 'clean'} %> - </p> - <p> - <%= f.submit 'Create' %> - </p> - <% end %> - <div> <h3>Open Tickets</h3> <ul> @@ -67,8 +52,26 @@ </ul> </div> - <% @port.comments.each do |comment| %> - <div><%= h comment.body %></div> - <% end %> + <div> + <h3>Comments</h3> + <% form_for([(a)port.category, @port, @comment]) do |f| %> + <%= f.error_messages %> -</div> + <p> + <%= f.label :body, "<strong>Comment</strong>" %><br /> + <%= f.text_area :body, {:rows => 5, :cols => 80} %> + </p> + <p> + <%= recaptcha_tags :display => {:theme => 'clean'} %> + </p> + <p> + <%= f.submit 'Create' %> + </p> + <% end %> + + <% @port.comments.each do |comment| %> + <div><%= h comment.body %></div> + <% end %> + </div> + +</div> \ No newline at end of file Modified: branches/gsoc10-mpwa/mpwa/config/routes.rb =================================================================== --- branches/gsoc10-mpwa/mpwa/config/routes.rb 2010-08-21 22:32:44 UTC (rev 70804) +++ branches/gsoc10-mpwa/mpwa/config/routes.rb 2010-08-21 22:40:47 UTC (rev 70805) @@ -1,7 +1,7 @@ ActionController::Routing::Routes.draw do |map| map.resources :categories, :only => [:index] do |category| category.resources :ports, :only => [:index, :show] do |port| - port.resources :comments, :except => [:index, :show, :new] + port.resources :comments, :only => [:new, :create] end category.connect '/ports/page/:page', :controller => :ports, :action => :index, :page => :page end

1 0