diff --git a/www/ruby-addressable/Makefile b/www/ruby-addressable/Makefile
index 4988518fefa..36d7039ea2e 100644
--- a/www/ruby-addressable/Makefile
+++ b/www/ruby-addressable/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2009/08/25 21:47:59 bernd Exp $
+# $OpenBSD: Makefile,v 1.5 2009/10/12 22:43:55 pirofti Exp $
 
 COMMENT =	replacement for Ruby's URI implementation
 
 # databases/ruby-datamapper/core (0.9.11) needs 2.0.2
 # test before you update!
-DISTNAME = 	addressable-2.0.2
+DISTNAME = 	addressable-2.1.0
 PKGNAME =	ruby-${DISTNAME}
 CATEGORIES =	www
 
diff --git a/www/ruby-addressable/distinfo b/www/ruby-addressable/distinfo
index 035114f40e8..28d03cc38ce 100644
--- a/www/ruby-addressable/distinfo
+++ b/www/ruby-addressable/distinfo
@@ -1,5 +1,5 @@
-MD5 (addressable-2.0.2.gem) = /xPsMKIX/NjF+W2zw1GnCw==
-RMD160 (addressable-2.0.2.gem) = Xu6W/vSkGP+79oxHjphF2dA9iaU=
-SHA1 (addressable-2.0.2.gem) = jR0xA5NIsuGud+m5LGePDRFa3/o=
-SHA256 (addressable-2.0.2.gem) = OyG6YNGiyePSCihM4fN0uC9meyc8Vbk4jsNVhT5ET1M=
-SIZE (addressable-2.0.2.gem) = 123392
+MD5 (addressable-2.1.0.gem) = LdBcX0RKQInZmPBMoUvIXg==
+RMD160 (addressable-2.1.0.gem) = LeGL0REsItIHsm8No7Qqq2K0Mxs=
+SHA1 (addressable-2.1.0.gem) = VhfNV2f/PG5mTNI266S+zqoePF0=
+SHA256 (addressable-2.1.0.gem) = xsHJMYna+Er2FJu3GeDxmmr/+bp9bbyDIdoqyw31tyo=
+SIZE (addressable-2.1.0.gem) = 129536
diff --git a/www/ruby-addressable/pkg/PLIST b/www/ruby-addressable/pkg/PLIST
index 25dbba70feb..0fa08a88220 100644
--- a/www/ruby-addressable/pkg/PLIST
+++ b/www/ruby-addressable/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2009/08/25 21:47:59 bernd Exp $
+@comment $OpenBSD: PLIST,v 1.4 2009/10/12 22:43:56 pirofti Exp $
 lib/ruby/gems/${MODRUBY_REV}/cache/${DISTNAME}.gem
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/
@@ -14,6 +14,24 @@ lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/IDNA.src/M
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/IDNA/PunycodeBadInput.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/IDNA/PunycodeBigOutput.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/IDNA/PunycodeOverflow.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/Template/
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/Template.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/Template.src/
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/Template.src/M000078.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/Template.src/M000079.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/Template.src/M000080.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/Template.src/M000081.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/Template.src/M000082.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/Template.src/M000083.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/Template.src/M000084.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/Template/InvalidTemplateOperatorError.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/Template/InvalidTemplateValueError.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/Template/MatchData.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/Template/MatchData.src/
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/Template/MatchData.src/M000086.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/Template/MatchData.src/M000088.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/Template/MatchData.src/M000090.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/Template/TemplateOperatorAbortedError.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI/
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.src/
@@ -67,9 +85,9 @@ lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.src/M0
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.src/M000051.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.src/M000052.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.src/M000053.html
-lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.src/M000054.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.src/M000055.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.src/M000056.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.src/M000057.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.src/M000058.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.src/M000059.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.src/M000060.html
@@ -85,23 +103,20 @@ lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.src/M0
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.src/M000070.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.src/M000071.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.src/M000072.html
-lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.src/M000073.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.src/M000074.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.src/M000075.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.src/M000076.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.src/M000077.html
-lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI.src/M000078.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI/CharacterClasses.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI/InvalidOptionError.html
-lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI/InvalidTemplateOperatorError.html
-lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI/InvalidTemplateValueError.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI/InvalidURIError.html
-lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/Addressable/URI/TemplateOperatorAbortedError.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/created.rid
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/README.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/addressable/
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/addressable/idna_rb.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/addressable/template_rb.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/addressable/uri_rb.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/addressable/version_rb.html
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/fr_class_index.html
@@ -122,6 +137,29 @@ lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/IDNA/cdesc-IDNA.yaml
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/IDNA/to_ascii-c.yaml
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/IDNA/to_unicode-c.yaml
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/IDNA/unicode_normalize_kc-c.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/InvalidTemplateOperatorError/
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/InvalidTemplateOperatorError/cdesc-InvalidTemplateOperatorError.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/InvalidTemplateValueError/
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/InvalidTemplateValueError/cdesc-InvalidTemplateValueError.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/MatchData/
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/MatchData/captures-i.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/MatchData/cdesc-MatchData.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/MatchData/inspect-i.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/MatchData/keys-i.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/MatchData/values-i.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/MatchData/variables-i.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/TemplateOperatorAbortedError/
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/TemplateOperatorAbortedError/cdesc-TemplateOperatorAbortedError.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/cdesc-Template.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/expand-i.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/extract-i.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/inspect-i.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/keys-i.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/match-i.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/new-c.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/partial_expand-i.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/Template/variables-i.yaml
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/%2b-i.yaml
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/%3d%3d%3d-i.yaml
@@ -130,14 +168,8 @@ lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/CharacterClasses
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/CharacterClasses/cdesc-CharacterClasses.yaml
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/InvalidOptionError/
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/InvalidOptionError/cdesc-InvalidOptionError.yaml
-lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/InvalidTemplateOperatorError/
-lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/InvalidTemplateOperatorError/cdesc-InvalidTemplateOperatorError.yaml
-lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/InvalidTemplateValueError/
-lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/InvalidTemplateValueError/cdesc-InvalidTemplateValueError.yaml
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/InvalidURIError/
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/InvalidURIError/cdesc-InvalidURIError.yaml
-lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/TemplateOperatorAbortedError/
-lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/TemplateOperatorAbortedError/cdesc-TemplateOperatorAbortedError.yaml
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/absolute%3f-i.yaml
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/authority%3d-i.yaml
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/authority-i.yaml
@@ -149,12 +181,11 @@ lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/dup-i.yaml
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/encode-c.yaml
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/encode_component-c.yaml
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/eql%3f-i.yaml
-lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/expand_template-c.yaml
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/extname-i.yaml
-lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/extract-c.yaml
-lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/extract_mapping-i.yaml
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/fragment%3d-i.yaml
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/fragment-i.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/freeze-i.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/frozen%3f-i.yaml
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/hash-i.yaml
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/heuristic_parse-c.yaml
 lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/Addressable/URI/host%3d-i.yaml
@@ -223,11 +254,13 @@ lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/Rakefile
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/addressable/
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/addressable/idna.rb
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/addressable/template.rb
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/addressable/uri.rb
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/addressable/version.rb
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/spec/
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/spec/addressable/
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/spec/addressable/idna_spec.rb
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/spec/addressable/template_spec.rb
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/spec/addressable/uri_spec.rb
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/spec/data/
 lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/spec/data/rfc3986.txt