Date: Sun, 13 Aug 2006 13:13:15 +0100 (WEST) From: Rui Lopes <rgl@ruilopes.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: jw@innerewut.de Subject: ports/101973: Update port: www/rubygem-rails (and related) to 1.1.6 Message-ID: <20060813121315.5D72B45071@firebird.clustercube.com> Resent-Message-ID: <200608131220.k7DCKGtn035451@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101973
>Category: ports
>Synopsis: Update port: www/rubygem-rails (and related) to 1.1.6
>Confidential: no
>Severity: serious
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Aug 13 12:20:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Rui Lopes
>Release: FreeBSD 6.0-STABLE i386
>Organization:
>Environment:
>Description:
* Update rails and its related ports to match rails 1.1.6:
activesupport = 1.3.1
activerecord = 1.14.4
actionpack = 1.12.5
actionmailer = 1.2.5
actionwebservice = 1.1.6
rails = 1.1.6
This update is needed to fix a serious bug in rails, see:
http://weblog.rubyonrails.org/2006/8/10/rails-1-1-6-backports-and-full-disclosure
http://www.vuxml.org/freebsd/90064567-28b1-11db-844d-000c6ec775d9.html
* Add a x-generate-plist target to easy the creation of pkg-plist, it
can be used like:
cd port
export ROOT=$PWD/ROOT ; mkdir -p $ROOT/lib/ruby/gems/1.8
make PREFIX=$ROOT install x-generate-plist
diff -u pkg-plist temp-pkg-plist
mv temp-pkg-plist pkg-plist
make PREFIX=$ROOT deinstall # ignore any error
make PREFIX=$ROOT install
make PREFIX=$ROOT deinstall # make sure it gives no errors
# (except bin/* binary removal, it will
# work fine without PREFIX ;)
find $ROOT -type f # make sure it gives no output (bin/*
# lines are fine, it will work fine
# without PREFIX ;)
rm -rf ROOT/ work/
# do the normal port package test without PREFIX
* Add an "WWW" entry on pkg-descr that points to the correspoding
project on rubyforge.
>How-To-Repeat:
>Fix:
--- update_rails.patch begins here ---
diff -ruN ports.orig/databases/rubygem-activerecord/Makefile ports/databases/rubygem-activerecord/Makefile
--- ports.orig/databases/rubygem-activerecord/Makefile Sun Aug 13 08:45:45 2006
+++ ports/databases/rubygem-activerecord/Makefile Sun Aug 13 08:20:32 2006
@@ -5,7 +5,7 @@
# $FreeBSD: ports/databases/rubygem-activerecord/Makefile,v 1.8 2006/08/08 11:35:20 jmelo Exp $
PORTNAME= activerecord
-PORTVERSION= 1.14.2
+PORTVERSION= 1.14.4
CATEGORIES= databases rubygems
MASTER_SITES= ${MASTER_SITE_RUBYFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -23,6 +23,19 @@
# to get RUBY_SITEARCHLIBDIR
USE_RUBY= yes
+
+# This target is only meant to be used by the port maintainer.
+x-generate-plist:
+ (${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
+ | ${SED} -E \
+ 's,.*share/nls/.+$$,,g \
+ ;s,^${GEM_CACHE}$$,%%GEM_CACHE%%,g \
+ ;s,${GEM_DOC_DIR}(/.+)?$$,%%GEM_DOC_DIR%%\1,g \
+ ;s,${GEM_LIB_DIR}(/.+)?$$,%%GEM_LIB_DIR%%\1,g \
+ ;s,^${GEM_SPEC}$$,%%GEM_SPEC%%,g \
+ ;s,^${GEMS_BASE_DIR}/(.+)$$,\1,g \
+ ;s,^@dirrm (${SPEC_DIR}|${GEMS_DIR}|lib/ruby).*$$,,g \
+ ' | ${TR} -s '\n') > temp-pkg-plist
.include <bsd.port.pre.mk>
diff -ruN ports.orig/databases/rubygem-activerecord/distinfo ports/databases/rubygem-activerecord/distinfo
--- ports.orig/databases/rubygem-activerecord/distinfo Sun Aug 13 08:45:45 2006
+++ ports/databases/rubygem-activerecord/distinfo Sun Aug 13 08:09:19 2006
@@ -1,3 +1,3 @@
-MD5 (rubygem/activerecord-1.14.2.gem) = 708c952b87d3a73c1cf2d14df781a472
-SHA256 (rubygem/activerecord-1.14.2.gem) = 181dcafb6fccfaf24473fd8869f138daf630bbbeb9afc11f46dbabce6930d177
-SIZE (rubygem/activerecord-1.14.2.gem) = 348672
+MD5 (rubygem/activerecord-1.14.4.gem) = 831a4398031e8177aea8985ebf5a27ac
+SHA256 (rubygem/activerecord-1.14.4.gem) = 290b7e60c9ee959d92d5bdc246e85486bb78a8b6f70b978d8ef6362c42dc07fc
+SIZE (rubygem/activerecord-1.14.4.gem) = 349696
diff -ruN ports.orig/databases/rubygem-activerecord/pkg-descr ports/databases/rubygem-activerecord/pkg-descr
--- ports.orig/databases/rubygem-activerecord/pkg-descr Sun Aug 13 08:45:45 2006
+++ ports/databases/rubygem-activerecord/pkg-descr Sun Aug 13 08:09:33 2006
@@ -5,7 +5,8 @@
the data from database rows as objects and embellish these data objects
with business logic methods.
-WWW: http://www.rubyonrails.com
+WWW: http://www.rubyonrails.org/
+WWW: http://rubyforge.org/projects/activerecord/
- Jonathan Weiss
jw@innerewut.de
diff -ruN ports.orig/databases/rubygem-activerecord/pkg-plist ports/databases/rubygem-activerecord/pkg-plist
--- ports.orig/databases/rubygem-activerecord/pkg-plist Sun Aug 13 08:45:45 2006
+++ ports/databases/rubygem-activerecord/pkg-plist Sun Aug 13 08:20:39 2006
@@ -1,4 +1,4 @@
-%%CACHE_DIR%%/activerecord-%%PORTVERSION%%.gem
+%%GEM_CACHE%%
%%GEM_DOC_DIR%%/rdoc/classes/ActiveRecord/Acts/List/ClassMethods.html
%%GEM_DOC_DIR%%/rdoc/classes/ActiveRecord/Acts/List/ClassMethods.src/M000147.html
%%GEM_DOC_DIR%%/rdoc/classes/ActiveRecord/Acts/List/InstanceMethods.html
@@ -891,7 +891,7 @@
%%GEM_LIB_DIR%%/test/transactions_test.rb
%%GEM_LIB_DIR%%/test/unconnected_test.rb
%%GEM_LIB_DIR%%/test/validations_test.rb
-%%SPEC_DIR%%/activerecord-1.14.2.gemspec
+%%GEM_SPEC%%
@dirrm %%GEM_LIB_DIR%%/test/fixtures/subscribers
@dirrm %%GEM_LIB_DIR%%/test/fixtures/naked/yml
@dirrm %%GEM_LIB_DIR%%/test/fixtures/naked/csv
@@ -926,7 +926,7 @@
@dirrm %%GEM_LIB_DIR%%/lib/active_record
@dirrm %%GEM_LIB_DIR%%/lib
@dirrm %%GEM_LIB_DIR%%/examples
-@dirrm %%GEMS_DIR%%/activerecord-1.14.2
+@dirrm %%GEM_LIB_DIR%%
@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/active_record/wrappers
@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/active_record/vendor
@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/active_record/connection_adapters/abstract
@@ -1012,4 +1012,4 @@
@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActiveRecord
@dirrm %%GEM_DOC_DIR%%/rdoc/classes
@dirrm %%GEM_DOC_DIR%%/rdoc
-@dirrm %%DOC_DIR%%/activerecord-1.14.2
+@dirrm %%GEM_DOC_DIR%%
diff -ruN ports.orig/devel/rubygem-activesupport/Makefile ports/devel/rubygem-activesupport/Makefile
--- ports.orig/devel/rubygem-activesupport/Makefile Sun Aug 13 08:45:45 2006
+++ ports/devel/rubygem-activesupport/Makefile Sun Aug 13 08:14:10 2006
@@ -13,6 +13,19 @@
MAINTAINER= jw@innerewut.de
COMMENT= Utility classes and extension that are required by Rails MVC Framework
+# This target is only meant to be used by the port maintainer.
+x-generate-plist:
+ (${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
+ | ${SED} -E \
+ 's,.*share/nls/.+$$,,g \
+ ;s,^${GEM_CACHE}$$,%%GEM_CACHE%%,g \
+ ;s,${GEM_DOC_DIR}(/.+)?$$,%%GEM_DOC_DIR%%\1,g \
+ ;s,${GEM_LIB_DIR}(/.+)?$$,%%GEM_LIB_DIR%%\1,g \
+ ;s,^${GEM_SPEC}$$,%%GEM_SPEC%%,g \
+ ;s,^${GEMS_BASE_DIR}/(.+)$$,\1,g \
+ ;s,^@dirrm (${SPEC_DIR}|${GEMS_DIR}|lib/ruby).*$$,,g \
+ ' | ${TR} -s '\n') > temp-pkg-plist
+
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
.include <bsd.port.post.mk>
diff -ruN ports.orig/devel/rubygem-activesupport/pkg-descr ports/devel/rubygem-activesupport/pkg-descr
--- ports.orig/devel/rubygem-activesupport/pkg-descr Sun Aug 13 08:45:45 2006
+++ ports/devel/rubygem-activesupport/pkg-descr Sun Aug 13 08:05:36 2006
@@ -3,7 +3,8 @@
Utility classes and extension to the standard library that
were required by Rails, but found of general use.
-WWW: http://www.rubyonrails.com
+WWW: http://www.rubyonrails.org/
+WWW: http://rubyforge.org/projects/activesupport/
- Jonathan Weiss
jw@innerewut.de
diff -ruN ports.orig/devel/rubygem-activesupport/pkg-plist ports/devel/rubygem-activesupport/pkg-plist
--- ports.orig/devel/rubygem-activesupport/pkg-plist Sun Aug 13 08:45:45 2006
+++ ports/devel/rubygem-activesupport/pkg-plist Sun Aug 13 08:15:17 2006
@@ -1,4 +1,4 @@
-%%CACHE_DIR%%/activesupport-%%PORTVERSION%%.gem
+%%GEM_CACHE%%
%%GEM_DOC_DIR%%/rdoc/classes/ActiveSupport/CachingTools/HashCaching.html
%%GEM_DOC_DIR%%/rdoc/classes/ActiveSupport/CachingTools/HashCaching.src/M000031.html
%%GEM_DOC_DIR%%/rdoc/classes/ActiveSupport/CoreExtensions/Array/Conversions.html
@@ -347,7 +347,7 @@
%%GEM_LIB_DIR%%/lib/active_support/vendor/builder/xmlmarkup.rb
%%GEM_LIB_DIR%%/lib/active_support/version.rb
%%GEM_LIB_DIR%%/lib/active_support/whiny_nil.rb
-%%SPEC_DIR%%/activesupport-1.3.1.gemspec
+%%GEM_SPEC%%
@dirrm %%GEM_LIB_DIR%%/lib/active_support/vendor/builder
@dirrm %%GEM_LIB_DIR%%/lib/active_support/vendor
@dirrm %%GEM_LIB_DIR%%/lib/active_support/values
@@ -370,7 +370,7 @@
@dirrm %%GEM_LIB_DIR%%/lib/active_support/core_ext
@dirrm %%GEM_LIB_DIR%%/lib/active_support
@dirrm %%GEM_LIB_DIR%%/lib
-@dirrm %%GEMS_DIR%%/activesupport-1.3.1
+@dirrm %%GEM_LIB_DIR%%
@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/active_support/vendor/builder
@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/active_support/vendor
@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/active_support/values
@@ -445,4 +445,4 @@
@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActiveSupport
@dirrm %%GEM_DOC_DIR%%/rdoc/classes
@dirrm %%GEM_DOC_DIR%%/rdoc
-@dirrm %%DOC_DIR%%/activesupport-1.3.1
+@dirrm %%GEM_DOC_DIR%%
diff -ruN ports.orig/mail/rubygem-actionmailer/Makefile ports/mail/rubygem-actionmailer/Makefile
--- ports.orig/mail/rubygem-actionmailer/Makefile Sun Aug 13 08:45:45 2006
+++ ports/mail/rubygem-actionmailer/Makefile Sun Aug 13 08:28:02 2006
@@ -5,7 +5,7 @@
# $FreeBSD: ports/mail/rubygem-actionmailer/Makefile,v 1.6 2006/08/08 11:35:23 jmelo Exp $
PORTNAME= actionmailer
-PORTVERSION= 1.2.1
+PORTVERSION= 1.2.5
CATEGORIES= mail rubygems
MASTER_SITES= ${MASTER_SITE_RUBYFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -13,8 +13,21 @@
MAINTAINER= jw@innerewut.de
COMMENT= Easy email delivery and testing for Ruby
-BUILD_DEPENDS= ${LOCALBASE}/${SPEC_DIR}/actionpack-1.12.1.gemspec:${PORTSDIR}/www/rubygem-actionpack
+BUILD_DEPENDS= ${LOCALBASE}/${SPEC_DIR}/actionpack-1.12.5.gemspec:${PORTSDIR}/www/rubygem-actionpack
RUN_DEPENDS= ${BUILD_DEPENDS}
+
+# This target is only meant to be used by the port maintainer.
+x-generate-plist:
+ (${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
+ | ${SED} -E \
+ 's,.*share/nls/.+$$,,g \
+ ;s,^${GEM_CACHE}$$,%%GEM_CACHE%%,g \
+ ;s,${GEM_DOC_DIR}(/.+)?$$,%%GEM_DOC_DIR%%\1,g \
+ ;s,${GEM_LIB_DIR}(/.+)?$$,%%GEM_LIB_DIR%%\1,g \
+ ;s,^${GEM_SPEC}$$,%%GEM_SPEC%%,g \
+ ;s,^${GEMS_BASE_DIR}/(.+)$$,\1,g \
+ ;s,^@dirrm (${SPEC_DIR}|${GEMS_DIR}|lib/ruby).*$$,,g \
+ ' | ${TR} -s '\n') > temp-pkg-plist
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
diff -ruN ports.orig/mail/rubygem-actionmailer/distinfo ports/mail/rubygem-actionmailer/distinfo
--- ports.orig/mail/rubygem-actionmailer/distinfo Sun Aug 13 08:45:45 2006
+++ ports/mail/rubygem-actionmailer/distinfo Sun Aug 13 08:11:31 2006
@@ -1,3 +1,3 @@
-MD5 (rubygem/actionmailer-1.2.1.gem) = 890485893b19c2c2d250b058db2bc03d
-SHA256 (rubygem/actionmailer-1.2.1.gem) = 45d8043a69baf5c765184b56666599b1f5b4e13a2d327723fa081dde3cff7898
-SIZE (rubygem/actionmailer-1.2.1.gem) = 81920
+MD5 (rubygem/actionmailer-1.2.5.gem) = 095ce5045eebad4634987119e3f4a1ef
+SHA256 (rubygem/actionmailer-1.2.5.gem) = 24d5d7f0633525f5bcac946fd4c4c267bc7e9ba46d689bbcef35ec720d3ec64b
+SIZE (rubygem/actionmailer-1.2.5.gem) = 81920
diff -ruN ports.orig/mail/rubygem-actionmailer/pkg-descr ports/mail/rubygem-actionmailer/pkg-descr
--- ports.orig/mail/rubygem-actionmailer/pkg-descr Sun Aug 13 08:45:45 2006
+++ ports/mail/rubygem-actionmailer/pkg-descr Sun Aug 13 08:11:03 2006
@@ -7,7 +7,8 @@
such as allowing a weblog to accept new posts from an email (which could even
have been sent from a phone)
-WWW: http://www.rubyonrails.com
+WWW: http://www.rubyonrails.org/
+WWW: http://rubyforge.org/projects/actionmailer/
- Jonathan Weiss
jw@innerewut.de
diff -ruN ports.orig/mail/rubygem-actionmailer/pkg-plist ports/mail/rubygem-actionmailer/pkg-plist
--- ports.orig/mail/rubygem-actionmailer/pkg-plist Sun Aug 13 08:45:45 2006
+++ ports/mail/rubygem-actionmailer/pkg-plist Sun Aug 13 08:28:50 2006
@@ -1,4 +1,4 @@
-%%CACHE_DIR%%/actionmailer-%%PORTVERSION%%.gem
+%%GEM_CACHE%%
%%GEM_DOC_DIR%%/rdoc/classes/ActionMailer/Base.html
%%GEM_DOC_DIR%%/rdoc/classes/ActionMailer/Base.src/M000454.html
%%GEM_DOC_DIR%%/rdoc/classes/ActionMailer/Base.src/M000455.html
@@ -484,6 +484,7 @@
%%GEM_LIB_DIR%%/CHANGELOG
%%GEM_LIB_DIR%%/MIT-LICENSE
%%GEM_LIB_DIR%%/README
+%%GEM_LIB_DIR%%/Rakefile
%%GEM_LIB_DIR%%/install.rb
%%GEM_LIB_DIR%%/lib/action_mailer.rb
%%GEM_LIB_DIR%%/lib/action_mailer/adv_attr_accessor.rb
@@ -519,7 +520,6 @@
%%GEM_LIB_DIR%%/lib/action_mailer/vendor/tmail/tmail.rb
%%GEM_LIB_DIR%%/lib/action_mailer/vendor/tmail/utils.rb
%%GEM_LIB_DIR%%/lib/action_mailer/version.rb
-%%GEM_LIB_DIR%%/rakefile
%%GEM_LIB_DIR%%/test/fixtures/helper_mailer/use_helper.rhtml
%%GEM_LIB_DIR%%/test/fixtures/helper_mailer/use_helper_method.rhtml
%%GEM_LIB_DIR%%/test/fixtures/helper_mailer/use_mail_helper.rhtml
@@ -551,7 +551,7 @@
%%GEM_LIB_DIR%%/test/mail_service_test.rb
%%GEM_LIB_DIR%%/test/quoting_test.rb
%%GEM_LIB_DIR%%/test/tmail_test.rb
-%%SPEC_DIR%%/actionmailer-1.2.1.gemspec
+%%GEM_SPEC%%
@dirrm %%GEM_LIB_DIR%%/test/fixtures/test_mailer
@dirrm %%GEM_LIB_DIR%%/test/fixtures/templates
@dirrm %%GEM_LIB_DIR%%/test/fixtures/path.with.dots
@@ -564,7 +564,7 @@
@dirrm %%GEM_LIB_DIR%%/lib/action_mailer/vendor
@dirrm %%GEM_LIB_DIR%%/lib/action_mailer
@dirrm %%GEM_LIB_DIR%%/lib
-@dirrm %%GEMS_DIR%%/actionmailer-1.2.1
+@dirrm %%GEM_LIB_DIR%%
@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_mailer/vendor/tmail
@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_mailer/vendor/text
@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_mailer/vendor
@@ -628,4 +628,4 @@
@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionMailer
@dirrm %%GEM_DOC_DIR%%/rdoc/classes
@dirrm %%GEM_DOC_DIR%%/rdoc
-@dirrm %%DOC_DIR%%/actionmailer-1.2.1
+@dirrm %%GEM_DOC_DIR%%
diff -ruN ports.orig/www/rubygem-actionpack/Makefile ports/www/rubygem-actionpack/Makefile
--- ports.orig/www/rubygem-actionpack/Makefile Sun Aug 13 08:45:45 2006
+++ ports/www/rubygem-actionpack/Makefile Sun Aug 13 08:23:57 2006
@@ -5,7 +5,7 @@
# $FreeBSD: ports/www/rubygem-actionpack/Makefile,v 1.7 2006/08/08 11:35:25 jmelo Exp $
PORTNAME= actionpack
-PORTVERSION= 1.12.1
+PORTVERSION= 1.12.5
CATEGORIES= www rubygems
MASTER_SITES= ${MASTER_SITE_RUBYFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,6 +15,19 @@
BUILD_DEPENDS= ${LOCALBASE}/${SPEC_DIR}/activesupport-1.3.1.gemspec:${PORTSDIR}/devel/rubygem-activesupport
RUN_DEPENDS= ${BUILD_DEPENDS}
+
+# This target is only meant to be used by the port maintainer.
+x-generate-plist:
+ (${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
+ | ${SED} -E \
+ 's,.*share/nls/.+$$,,g \
+ ;s,^${GEM_CACHE}$$,%%GEM_CACHE%%,g \
+ ;s,${GEM_DOC_DIR}(/.+)?$$,%%GEM_DOC_DIR%%\1,g \
+ ;s,${GEM_LIB_DIR}(/.+)?$$,%%GEM_LIB_DIR%%\1,g \
+ ;s,^${GEM_SPEC}$$,%%GEM_SPEC%%,g \
+ ;s,^${GEMS_BASE_DIR}/(.+)$$,\1,g \
+ ;s,^@dirrm (${SPEC_DIR}|${GEMS_DIR}|lib/ruby).*$$,,g \
+ ' | ${TR} -s '\n') > temp-pkg-plist
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
diff -ruN ports.orig/www/rubygem-actionpack/distinfo ports/www/rubygem-actionpack/distinfo
--- ports.orig/www/rubygem-actionpack/distinfo Sun Aug 13 08:45:45 2006
+++ ports/www/rubygem-actionpack/distinfo Sun Aug 13 08:07:36 2006
@@ -1,3 +1,3 @@
-MD5 (rubygem/actionpack-1.12.1.gem) = 377632f15df44fe70b221d8b87db0e20
-SHA256 (rubygem/actionpack-1.12.1.gem) = 502b3d1767c282365d7211c453df3fec45aba0a69229a4250b9b4d814a11d0f7
-SIZE (rubygem/actionpack-1.12.1.gem) = 526336
+MD5 (rubygem/actionpack-1.12.5.gem) = d0bf5c15b7f530e0dbd28191bb4a54fc
+SHA256 (rubygem/actionpack-1.12.5.gem) = c6a95008d934b096e8d5ff730f85942c8d59fd94bea7f54e9ae74914fd9d5be1
+SIZE (rubygem/actionpack-1.12.5.gem) = 530432
diff -ruN ports.orig/www/rubygem-actionpack/pkg-descr ports/www/rubygem-actionpack/pkg-descr
--- ports.orig/www/rubygem-actionpack/pkg-descr Sun Aug 13 08:45:45 2006
+++ ports/www/rubygem-actionpack/pkg-descr Sun Aug 13 08:06:18 2006
@@ -9,7 +9,8 @@
Each of these packages can be used independently outside of Rails.
-WWW: http://www.rubyonrails.com
+WWW: http://www.rubyonrails.org/
+WWW: http://rubyforge.org/projects/actionpack/
- Jonathan Weiss
jw@innerewut.de
diff -ruN ports.orig/www/rubygem-actionpack/pkg-plist ports/www/rubygem-actionpack/pkg-plist
--- ports.orig/www/rubygem-actionpack/pkg-plist Sun Aug 13 08:45:45 2006
+++ ports/www/rubygem-actionpack/pkg-plist Sun Aug 13 08:25:00 2006
@@ -1,4 +1,4 @@
-%%CACHE_DIR%%/actionpack-%%PORTVERSION%%.gem
+%%GEM_CACHE%%
%%GEM_DOC_DIR%%/rdoc/classes/ActionController/AbstractRequest.html
%%GEM_DOC_DIR%%/rdoc/classes/ActionController/AbstractRequest.src/M000119.html
%%GEM_DOC_DIR%%/rdoc/classes/ActionController/AbstractRequest.src/M000120.html
@@ -31,8 +31,8 @@
%%GEM_DOC_DIR%%/rdoc/classes/ActionController/AbstractRequest.src/M000148.html
%%GEM_DOC_DIR%%/rdoc/classes/ActionController/AbstractRequest.src/M000149.html
%%GEM_DOC_DIR%%/rdoc/classes/ActionController/AbstractRequest.src/M000150.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionController/AbstractRequest.src/M000151.html
%%GEM_DOC_DIR%%/rdoc/classes/ActionController/Base.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionController/Base.src/M000154.html
%%GEM_DOC_DIR%%/rdoc/classes/ActionController/Base.src/M000155.html
%%GEM_DOC_DIR%%/rdoc/classes/ActionController/Base.src/M000156.html
%%GEM_DOC_DIR%%/rdoc/classes/ActionController/Base.src/M000157.html
@@ -117,9 +117,9 @@
%%GEM_DOC_DIR%%/rdoc/classes/ActionController/Integration/Session.src/M000043.html
%%GEM_DOC_DIR%%/rdoc/classes/ActionController/Integration/Session.src/M000044.html
%%GEM_DOC_DIR%%/rdoc/classes/ActionController/IntegrationTest.html
+%%GEM_DOC_DIR%%/rdoc/classes/ActionController/IntegrationTest.src/M000151.html
%%GEM_DOC_DIR%%/rdoc/classes/ActionController/IntegrationTest.src/M000152.html
%%GEM_DOC_DIR%%/rdoc/classes/ActionController/IntegrationTest.src/M000153.html
-%%GEM_DOC_DIR%%/rdoc/classes/ActionController/IntegrationTest.src/M000154.html
%%GEM_DOC_DIR%%/rdoc/classes/ActionController/Layout/ClassMethods.html
%%GEM_DOC_DIR%%/rdoc/classes/ActionController/Layout/ClassMethods.src/M000061.html
%%GEM_DOC_DIR%%/rdoc/classes/ActionController/Macros.html
@@ -466,6 +466,7 @@
%%GEM_LIB_DIR%%/MIT-LICENSE
%%GEM_LIB_DIR%%/README
%%GEM_LIB_DIR%%/RUNNING_UNIT_TESTS
+%%GEM_LIB_DIR%%/Rakefile
%%GEM_LIB_DIR%%/examples/.htaccess
%%GEM_LIB_DIR%%/examples/address_book/index.rhtml
%%GEM_LIB_DIR%%/examples/address_book/layout.rhtml
@@ -480,6 +481,7 @@
%%GEM_LIB_DIR%%/examples/debate/new_topic.rhtml
%%GEM_LIB_DIR%%/examples/debate/topic.rhtml
%%GEM_LIB_DIR%%/examples/debate_controller.cgi
+%%GEM_LIB_DIR%%/filler.txt
%%GEM_LIB_DIR%%/install.rb
%%GEM_LIB_DIR%%/lib/action_controller.rb
%%GEM_LIB_DIR%%/lib/action_controller/assertions.rb
@@ -571,7 +573,6 @@
%%GEM_LIB_DIR%%/lib/action_view/helpers/url_helper.rb
%%GEM_LIB_DIR%%/lib/action_view/partials.rb
%%GEM_LIB_DIR%%/lib/action_view/template_error.rb
-%%GEM_LIB_DIR%%/rakefile
%%GEM_LIB_DIR%%/test/abstract_unit.rb
%%GEM_LIB_DIR%%/test/active_record_unit.rb
%%GEM_LIB_DIR%%/test/activerecord/active_record_assertions_test.rb
@@ -588,6 +589,7 @@
%%GEM_LIB_DIR%%/test/controller/cookie_test.rb
%%GEM_LIB_DIR%%/test/controller/custom_handler_test.rb
%%GEM_LIB_DIR%%/test/controller/fake_controllers.rb
+%%GEM_LIB_DIR%%/test/controller/filter_params_test.rb
%%GEM_LIB_DIR%%/test/controller/filters_test.rb
%%GEM_LIB_DIR%%/test/controller/flash_test.rb
%%GEM_LIB_DIR%%/test/controller/fragment_store_setting_test.rb
@@ -608,12 +610,16 @@
%%GEM_LIB_DIR%%/test/controller/verification_test.rb
%%GEM_LIB_DIR%%/test/controller/webservice_test.rb
%%GEM_LIB_DIR%%/test/fixtures/addresses/list.rhtml
+%%GEM_LIB_DIR%%/test/fixtures/application_root/app/controllers/a_class_that_contains_a_controller/poorly_placed_controller.rb
+%%GEM_LIB_DIR%%/test/fixtures/application_root/app/controllers/module_that_holds_controllers/nested_controller.rb
+%%GEM_LIB_DIR%%/test/fixtures/application_root/app/models/a_class_that_contains_a_controller.rb
%%GEM_LIB_DIR%%/test/fixtures/companies.yml
%%GEM_LIB_DIR%%/test/fixtures/company.rb
%%GEM_LIB_DIR%%/test/fixtures/db_definitions/sqlite.sql
%%GEM_LIB_DIR%%/test/fixtures/developer.rb
%%GEM_LIB_DIR%%/test/fixtures/developers.yml
%%GEM_LIB_DIR%%/test/fixtures/developers_projects.yml
+%%GEM_LIB_DIR%%/test/fixtures/dont_load.rb
%%GEM_LIB_DIR%%/test/fixtures/fun/games/hello_world.rhtml
%%GEM_LIB_DIR%%/test/fixtures/helpers/abc_helper.rb
%%GEM_LIB_DIR%%/test/fixtures/helpers/fun/games_helper.rb
@@ -679,7 +685,7 @@
%%GEM_LIB_DIR%%/test/template/active_record_helper_test.rb
%%GEM_LIB_DIR%%/test/template/asset_tag_helper_test.rb
%%GEM_LIB_DIR%%/test/template/benchmark_helper_test.rb
-%%GEM_LIB_DIR%%/test/template/compiled_templates_tests.rb
+%%GEM_LIB_DIR%%/test/template/compiled_templates_test.rb
%%GEM_LIB_DIR%%/test/template/date_helper_test.rb
%%GEM_LIB_DIR%%/test/template/form_helper_test.rb
%%GEM_LIB_DIR%%/test/template/form_options_helper_test.rb
@@ -693,7 +699,7 @@
%%GEM_LIB_DIR%%/test/template/text_helper_test.rb
%%GEM_LIB_DIR%%/test/template/url_helper_test.rb
%%GEM_LIB_DIR%%/test/testing_sandbox.rb
-%%SPEC_DIR%%/actionpack-1.12.1.gemspec
+%%GEM_SPEC%%
@dirrm %%GEM_LIB_DIR%%/test/template
@dirrm %%GEM_LIB_DIR%%/test/fixtures/test/dot.directory
@dirrm %%GEM_LIB_DIR%%/test/fixtures/test
@@ -714,6 +720,12 @@
@dirrm %%GEM_LIB_DIR%%/test/fixtures/fun/games
@dirrm %%GEM_LIB_DIR%%/test/fixtures/fun
@dirrm %%GEM_LIB_DIR%%/test/fixtures/db_definitions
+@dirrm %%GEM_LIB_DIR%%/test/fixtures/application_root/app/models
+@dirrm %%GEM_LIB_DIR%%/test/fixtures/application_root/app/controllers/module_that_holds_controllers
+@dirrm %%GEM_LIB_DIR%%/test/fixtures/application_root/app/controllers/a_class_that_contains_a_controller
+@dirrm %%GEM_LIB_DIR%%/test/fixtures/application_root/app/controllers
+@dirrm %%GEM_LIB_DIR%%/test/fixtures/application_root/app
+@dirrm %%GEM_LIB_DIR%%/test/fixtures/application_root
@dirrm %%GEM_LIB_DIR%%/test/fixtures/addresses
@dirrm %%GEM_LIB_DIR%%/test/fixtures
@dirrm %%GEM_LIB_DIR%%/test/controller
@@ -737,7 +749,7 @@
@dirrm %%GEM_LIB_DIR%%/examples/debate
@dirrm %%GEM_LIB_DIR%%/examples/address_book
@dirrm %%GEM_LIB_DIR%%/examples
-@dirrm %%GEMS_DIR%%/actionpack-1.12.1
+@dirrm %%GEM_LIB_DIR%%
@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_view/helpers
@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_view
@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_pack
@@ -832,4 +844,4 @@
@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionController
@dirrm %%GEM_DOC_DIR%%/rdoc/classes
@dirrm %%GEM_DOC_DIR%%/rdoc
-@dirrm %%DOC_DIR%%/actionpack-1.12.1
+@dirrm %%GEM_DOC_DIR%%
diff -ruN ports.orig/www/rubygem-actionwebservice/Makefile ports/www/rubygem-actionwebservice/Makefile
--- ports.orig/www/rubygem-actionwebservice/Makefile Sun Aug 13 08:45:45 2006
+++ ports/www/rubygem-actionwebservice/Makefile Sun Aug 13 08:33:01 2006
@@ -5,7 +5,7 @@
# $FreeBSD: ports/www/rubygem-actionwebservice/Makefile,v 1.8 2006/08/08 11:35:26 jmelo Exp $
PORTNAME= actionwebservice
-PORTVERSION= 1.1.2
+PORTVERSION= 1.1.6
CATEGORIES= www rubygems
MASTER_SITES= ${MASTER_SITE_RUBYFORGE}
MASTER_SITE_SUBDIR= aws
@@ -13,9 +13,22 @@
MAINTAINER= jw@innerewut.de
COMMENT= Simple support for publishing Web Service APIs for Rails applications
-BUILD_DEPENDS= ${LOCALBASE}/${SPEC_DIR}/actionpack-1.12.1.gemspec:${PORTSDIR}/www/rubygem-actionpack \
- ${LOCALBASE}/${SPEC_DIR}/activerecord-1.14.2.gemspec:${PORTSDIR}/databases/rubygem-activerecord
+BUILD_DEPENDS= ${LOCALBASE}/${SPEC_DIR}/actionpack-1.12.5.gemspec:${PORTSDIR}/www/rubygem-actionpack \
+ ${LOCALBASE}/${SPEC_DIR}/activerecord-1.14.4.gemspec:${PORTSDIR}/databases/rubygem-activerecord
RUN_DEPENDS= ${BUILD_DEPENDS}
+
+# This target is only meant to be used by the port maintainer.
+x-generate-plist:
+ (${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
+ | ${SED} -E \
+ 's,.*share/nls/.+$$,,g \
+ ;s,^${GEM_CACHE}$$,%%GEM_CACHE%%,g \
+ ;s,${GEM_DOC_DIR}(/.+)?$$,%%GEM_DOC_DIR%%\1,g \
+ ;s,${GEM_LIB_DIR}(/.+)?$$,%%GEM_LIB_DIR%%\1,g \
+ ;s,^${GEM_SPEC}$$,%%GEM_SPEC%%,g \
+ ;s,^${GEMS_BASE_DIR}/(.+)$$,\1,g \
+ ;s,^@dirrm (${SPEC_DIR}|${GEMS_DIR}|lib/ruby).*$$,,g \
+ ' | ${TR} -s '\n') > temp-pkg-plist
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
diff -ruN ports.orig/www/rubygem-actionwebservice/distinfo ports/www/rubygem-actionwebservice/distinfo
--- ports.orig/www/rubygem-actionwebservice/distinfo Sun Aug 13 08:45:45 2006
+++ ports/www/rubygem-actionwebservice/distinfo Sun Aug 13 08:13:28 2006
@@ -1,3 +1,3 @@
-MD5 (rubygem/actionwebservice-1.1.2.gem) = bb61cdf8756eade9f75d2492c8fe75e9
-SHA256 (rubygem/actionwebservice-1.1.2.gem) = 7eb5304b613fe0c2a49ca37f8c05e3af6c5a3f1fbea70270e612b49573ec879e
-SIZE (rubygem/actionwebservice-1.1.2.gem) = 67072
+MD5 (rubygem/actionwebservice-1.1.6.gem) = 007eed546c522692fbe88d47bb0d7934
+SHA256 (rubygem/actionwebservice-1.1.6.gem) = e093589cc3bde3375c4feef4b82cdbde3ea6a2fbeb4103cbaded2dde5ec1f8a1
+SIZE (rubygem/actionwebservice-1.1.6.gem) = 67072
diff -ruN ports.orig/www/rubygem-actionwebservice/pkg-descr ports/www/rubygem-actionwebservice/pkg-descr
--- ports.orig/www/rubygem-actionwebservice/pkg-descr Sun Aug 13 08:45:45 2006
+++ ports/www/rubygem-actionwebservice/pkg-descr Sun Aug 13 08:13:23 2006
@@ -13,7 +13,8 @@
* Type signature hints to improve interoperability with static languages
* Active Record model class support in signatures
-WWW: http://www.rubyonrails.com
+WWW: http://www.rubyonrails.org/
+WWW: http://rubyforge.org/projects/aws/
- Jonathan Weiss
jw@innerewut.de
diff -ruN ports.orig/www/rubygem-actionwebservice/pkg-plist ports/www/rubygem-actionwebservice/pkg-plist
--- ports.orig/www/rubygem-actionwebservice/pkg-plist Sun Aug 13 08:45:45 2006
+++ ports/www/rubygem-actionwebservice/pkg-plist Sun Aug 13 08:33:26 2006
@@ -1,4 +1,4 @@
-%%CACHE_DIR%%/actionwebservice-%%PORTVERSION%%.gem
+%%GEM_CACHE%%
%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.html
%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.src/M000031.html
%%GEM_DOC_DIR%%/rdoc/classes/ActionWebService/API/Method.src/M000032.html
@@ -167,7 +167,7 @@
%%GEM_LIB_DIR%%/test/scaffolded_controller_test.rb
%%GEM_LIB_DIR%%/test/struct_test.rb
%%GEM_LIB_DIR%%/test/test_invoke_test.rb
-%%SPEC_DIR%%/actionwebservice-1.1.2.gemspec
+%%GEM_SPEC%%
@dirrm %%GEM_LIB_DIR%%/test/fixtures/db_definitions
@dirrm %%GEM_LIB_DIR%%/test/fixtures
@dirrm %%GEM_LIB_DIR%%/test/apis
@@ -190,7 +190,7 @@
@dirrm %%GEM_LIB_DIR%%/examples/googlesearch/autoloading
@dirrm %%GEM_LIB_DIR%%/examples/googlesearch
@dirrm %%GEM_LIB_DIR%%/examples
-@dirrm %%GEMS_DIR%%/actionwebservice-1.1.2
+@dirrm %%GEM_LIB_DIR%%
@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/support
@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/protocol/soap_protocol
@dirrm %%GEM_DOC_DIR%%/rdoc/files/lib/action_web_service/protocol
@@ -228,4 +228,4 @@
@dirrm %%GEM_DOC_DIR%%/rdoc/classes/ActionWebService
@dirrm %%GEM_DOC_DIR%%/rdoc/classes
@dirrm %%GEM_DOC_DIR%%/rdoc
-@dirrm %%DOC_DIR%%/actionwebservice-1.1.2
+@dirrm %%GEM_DOC_DIR%%
diff -ruN ports.orig/www/rubygem-rails/Makefile ports/www/rubygem-rails/Makefile
--- ports.orig/www/rubygem-rails/Makefile Sun Aug 13 08:45:45 2006
+++ ports/www/rubygem-rails/Makefile Sun Aug 13 08:35:41 2006
@@ -5,7 +5,7 @@
# $FreeBSD: ports/www/rubygem-rails/Makefile,v 1.9 2006/08/08 11:35:26 jmelo Exp $
PORTNAME= rails
-PORTVERSION= 1.1.2
+PORTVERSION= 1.1.6
CATEGORIES= www rubygems
MASTER_SITES= ${MASTER_SITE_RUBYFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,10 +15,10 @@
BUILD_DEPENDS= rake:${PORTSDIR}/devel/rubygem-rake \
${LOCALBASE}/${SPEC_DIR}/activesupport-1.3.1.gemspec:${PORTSDIR}/devel/rubygem-activesupport \
- ${LOCALBASE}/${SPEC_DIR}/actionpack-1.12.1.gemspec:${PORTSDIR}/www/rubygem-actionpack \
- ${LOCALBASE}/${SPEC_DIR}/actionwebservice-1.1.2.gemspec:${PORTSDIR}/www/rubygem-actionwebservice \
- ${LOCALBASE}/${SPEC_DIR}/actionmailer-1.2.1.gemspec:${PORTSDIR}/mail/rubygem-actionmailer \
- ${LOCALBASE}/${SPEC_DIR}/activerecord-1.14.2.gemspec:${PORTSDIR}/databases/rubygem-activerecord
+ ${LOCALBASE}/${SPEC_DIR}/activerecord-1.14.4.gemspec:${PORTSDIR}/databases/rubygem-activerecord \
+ ${LOCALBASE}/${SPEC_DIR}/actionpack-1.12.5.gemspec:${PORTSDIR}/www/rubygem-actionpack \
+ ${LOCALBASE}/${SPEC_DIR}/actionmailer-1.2.5.gemspec:${PORTSDIR}/mail/rubygem-actionmailer \
+ ${LOCALBASE}/${SPEC_DIR}/actionwebservice-1.1.6.gemspec:${PORTSDIR}/www/rubygem-actionwebservice
RUN_DEPENDS= ${BUILD_DEPENDS}
OPTIONS= FCGI "FastCGI support" Off\
@@ -27,6 +27,19 @@
# to get RUBY_SITEARCHLIBDIR
USE_RUBY= yes
+
+# This target is only meant to be used by the port maintainer.
+x-generate-plist:
+ (${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
+ | ${SED} -E \
+ 's,.*share/nls/.+$$,,g \
+ ;s,^${GEM_CACHE}$$,%%GEM_CACHE%%,g \
+ ;s,${GEM_DOC_DIR}(/.+)?$$,%%GEM_DOC_DIR%%\1,g \
+ ;s,${GEM_LIB_DIR}(/.+)?$$,%%GEM_LIB_DIR%%\1,g \
+ ;s,^${GEM_SPEC}$$,%%GEM_SPEC%%,g \
+ ;s,^${GEMS_BASE_DIR}/(.+)$$,\1,g \
+ ;s,^@dirrm (${SPEC_DIR}|${GEMS_DIR}|lib/ruby).*$$,,g \
+ ' | ${TR} -s '\n') > temp-pkg-plist
.include <bsd.port.pre.mk>
diff -ruN ports.orig/www/rubygem-rails/distinfo ports/www/rubygem-rails/distinfo
--- ports.orig/www/rubygem-rails/distinfo Sun Aug 13 08:45:45 2006
+++ ports/www/rubygem-rails/distinfo Sun Aug 13 07:57:08 2006
@@ -1,3 +1,3 @@
-MD5 (rubygem/rails-1.1.2.gem) = a90166212c33392f6aae98bd4be2e184
-SHA256 (rubygem/rails-1.1.2.gem) = 1ffd33463d5ed4aa4079f46816dd08af3028f361e623be57a6dec9784263f26f
-SIZE (rubygem/rails-1.1.2.gem) = 144896
+MD5 (rubygem/rails-1.1.6.gem) = dee64ab90efedbbe900944fac754d72d
+SHA256 (rubygem/rails-1.1.6.gem) = f78cc3dfe77ceaa3cdd808735dcb81c8d3bdbd8e4d6b72ecc3a1b7fc19f1bd49
+SIZE (rubygem/rails-1.1.6.gem) = 144896
diff -ruN ports.orig/www/rubygem-rails/pkg-descr ports/www/rubygem-rails/pkg-descr
--- ports.orig/www/rubygem-rails/pkg-descr Sun Aug 13 08:45:45 2006
+++ ports/www/rubygem-rails/pkg-descr Sun Aug 13 08:04:15 2006
@@ -9,7 +9,8 @@
to control flow to business logic is written in Ruby - The language of
love for industry heavy-weights.
-WWW: http://www.rubyonrails.com
+WWW: http://www.rubyonrails.org/
+WWW: http://rubyforge.org/projects/rails/
- Jonathan Weiss
jw@innerewut.de
diff -ruN ports.orig/www/rubygem-rails/pkg-plist ports/www/rubygem-rails/pkg-plist
--- ports.orig/www/rubygem-rails/pkg-plist Sun Aug 13 08:45:45 2006
+++ ports/www/rubygem-rails/pkg-plist Sun Aug 13 08:36:10 2006
@@ -1,5 +1,5 @@
bin/rails
-%%CACHE_DIR%%/rails-%%PORTVERSION%%.gem
+%%GEM_CACHE%%
%%GEM_LIB_DIR%%/CHANGELOG
%%GEM_LIB_DIR%%/MIT-LICENSE
%%GEM_LIB_DIR%%/README
@@ -169,7 +169,7 @@
%%GEM_LIB_DIR%%/lib/tasks/tmp.rake
%%GEM_LIB_DIR%%/lib/test_help.rb
%%GEM_LIB_DIR%%/lib/webrick_server.rb
-%%SPEC_DIR%%/rails-1.1.2.gemspec
+%%GEM_SPEC%%
@dirrm %%GEM_LIB_DIR%%/lib/tasks
@dirrm %%GEM_LIB_DIR%%/lib/rails_generator/scripts
@dirrm %%GEM_LIB_DIR%%/lib/rails_generator/generators/components/web_service/templates
@@ -217,4 +217,4 @@
@dirrm %%GEM_LIB_DIR%%/bin/process
@dirrm %%GEM_LIB_DIR%%/bin/performance
@dirrm %%GEM_LIB_DIR%%/bin
-@dirrm %%GEMS_DIR%%/rails-1.1.2
+@dirrm %%GEM_LIB_DIR%%
--- update_rails.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060813121315.5D72B45071>