Bring up to date with latest changes

OK sthen@

1 files changed, 13 insertions, 9 deletions

diff --git a/share/man/man5/ruby-module.5 b/share/man/man5/ruby-module.5
index 7926e77a8db..c2fe6e18c8e 100644
--- a/share/man/man5/ruby-module.5
+++ b/share/man/man5/ruby-module.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ruby-module.5,v 1.14 2014/10/17 17:09:50 jasper Exp $
+.\"	$OpenBSD: ruby-module.5,v 1.15 2015/07/18 04:59:41 jeremy Exp $
 .\"
 .\" Copyright (c) 2008 Marc Espie, Jeremy Evans
 .\"
@@ -24,7 +24,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 17 2014 $
+.Dd $Mdocdate: July 18 2015 $
 .Dt RUBY-MODULE 5
 .Os
 .Sh NAME
@@ -160,7 +160,7 @@ The "ruby gem"
 should be used for pure ruby gems without C extensions.
 This adds
 .Ev PKG_ARCH
-= * and adds ruby18, ruby19, ruby20, ruby21, rbx, and jruby
+= * and adds ruby18, ruby19, ruby20, ruby21, ruby22, rbx, and jruby
 .Ev FLAVOR Ns s
 to the port, so the same port can build packages for multiple versions of ruby.
 .It
@@ -178,7 +178,7 @@ the appropriate libraries and
 .Ev MODRUBY_WANTLIB
 to
 .Ev WANTLIB .
-It also adds ruby18, ruby19, ruby20, ruby21, and rbx
+It also adds ruby18, ruby19, ruby20, ruby21, ruby22, and rbx
 .Ev FLAVOR Ns s
 to the port.
 If the C extension in the gem requires specific arguments to extconf.rb, set those
@@ -199,7 +199,7 @@ should use this format:
 .Pp
 .Dl category/ruby-foo,${MODRUBY_FLAVOR}
 .Pp
-Use of a ruby19, ruby20, ruby21, rbx, or jruby
+Use of a ruby19, ruby20, ruby21, ruby22, rbx, or jruby
 .Ev FLAVOR
 causes the
 .Ev FULLPKGNAME
@@ -208,18 +208,18 @@ to use the
 instead of ruby as the package prefix.
 Specifying
 .Ev MODRUBY_FLAVOR
-is necessary so that if a ruby 1.9 package is being built for the current
-port, it depends on the ruby 1.9 package of the
+is necessary so that if a ruby x.y package is being built for the current
+port, it depends on the ruby x.y package of the
 dependencies.
 .Pp
-The ports system defaults to using ruby 2.0 if the version of ruby is not
+The ports system defaults to using ruby 2.2 if the version of ruby is not
 specified.
 If you want to specify a version for a gem/extconf port, use a specific
 .Ev FLAVOR ,
 such as ruby18 to use ruby 1.8.
 If you want to specify a version for a non-gem/extconf port, set
 .Ev MODRUBY_REV
-for the version of ruby you want to use (1.8, 1.9, 2.0, 2.1, jruby, rbx).
+for the version of ruby you want to use (1.8, 1.9, 2.0, 2.1, 2.2, jruby, rbx).
 .Pp
 If you do not want the ports system to automatically set up
 .Ev FLAVOR Ns s
@@ -276,5 +276,9 @@ so always manually check the result of make update-plist and manually test that
 you can build the other
 .Ev FLAVOR Ns s
 before committing.
+Additionally, for gems with C extensions, make update-plist may add back the
+extension source files, which shouldn't be included in the files, so make sure
+to double check that all files added by make update-plist should be included
+in the package.
 .Sh SEE ALSO
 .Xr port-modules 5