* 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
* Add a x-generate-plist target to easy the creation of pkg-plist
* Add an "WWW" entry on pkg-descr that points to the correspoding
  project on rubyforge.

PR:		ports/101973
Submitted by:	Rui Lopes <rgl_AT_ruilopes dot com>
Approved by:	maintainer (Jonathan Weiss)
Security:	http://weblog.rubyonrails.org/2006/8/10/rails-1-1-6-backports-and-full-disclosure
Security:	http://www.vuxml.org/freebsd/90064567-28b1-11db-844d-000c6ec775d9.html

4 files changed, 25 insertions, 11 deletions

diff --git a/www/rubygem-actionwebservice/Makefile b/www/rubygem-actionwebservice/Makefile
index 223392b4e147..e99a24de805d 100644
--- a/www/rubygem-actionwebservice/Makefile
+++ b/www/rubygem-actionwebservice/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	actionwebservice
-PORTVERSION=	1.1.2
+PORTVERSION=	1.1.6
 CATEGORIES=	www rubygems
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE}
 MASTER_SITE_SUBDIR=	aws
@@ -13,10 +13,23 @@ MASTER_SITE_SUBDIR=	aws
 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"
 .include <bsd.port.post.mk>
diff --git a/www/rubygem-actionwebservice/distinfo b/www/rubygem-actionwebservice/distinfo
index 88f10fee7796..e52e5b208e98 100644
--- a/www/rubygem-actionwebservice/distinfo
+++ b/www/rubygem-actionwebservice/distinfo
@@ -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 --git a/www/rubygem-actionwebservice/pkg-descr b/www/rubygem-actionwebservice/pkg-descr
index 3acd2d3aeca2..9c7cae78debd 100644
--- a/www/rubygem-actionwebservice/pkg-descr
+++ b/www/rubygem-actionwebservice/pkg-descr
@@ -13,7 +13,8 @@ Features
 * 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 --git a/www/rubygem-actionwebservice/pkg-plist b/www/rubygem-actionwebservice/pkg-plist
index ec09e50cc0b1..0ad758ce014a 100644
--- a/www/rubygem-actionwebservice/pkg-plist
+++ b/www/rubygem-actionwebservice/pkg-plist
@@ -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%%