Update with bsd.ruby.mk.

Do not add a trailing version number to the name of the installed
directory.

3 files changed, 113 insertions, 112 deletions

diff --git a/japanese/ruby-man/pkg-plist b/japanese/ruby-man/pkg-plist
index 6dc3384176da..1dd27ddee26f 100644
--- a/japanese/ruby-man/pkg-plist
+++ b/japanese/ruby-man/pkg-plist
@@ -1,56 +1,56 @@
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Array.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Bignum.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Class.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Compar.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Cont.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Data.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Dir.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/ENV.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Enum.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Errno.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Exception.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/File.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/FileTest.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Fixnum.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Float.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/GC.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Hash.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/IO.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Integer.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Kernel.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Marshal.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Match.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Math.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Module.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/NilClass.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Numeric.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/ObSpace.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Object.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Prec.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Proc.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Process.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Range.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Regexp.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/String.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Struct.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/Time.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/bundle.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/classes.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/dbm.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/ftplib.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/function.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/getopts.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/glossary.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/index.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/kconv.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/options.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/parsearg.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/preface.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/socket.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/syntax.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/template.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/thread.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/variable.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%/yacc.html
-@dirrm share/doc/ruby/ruby-man-%%RUBY_VER%%%%LANGSUFFIX%%
-@unexec rmdir %D/share/doc/ruby 2>/dev/null || true
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Array.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Bignum.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Class.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Compar.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Cont.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Data.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Dir.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/ENV.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Enum.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Errno.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Exception.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/File.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/FileTest.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Fixnum.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Float.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/GC.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Hash.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/IO.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Integer.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Kernel.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Marshal.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Match.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Math.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Module.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/NilClass.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Numeric.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/ObSpace.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Object.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Prec.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Proc.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Process.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Range.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Regexp.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/String.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Struct.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/Time.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/bundle.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/classes.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/dbm.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/ftplib.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/function.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/getopts.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/glossary.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/index.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/kconv.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/options.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/parsearg.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/preface.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/socket.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/syntax.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/template.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/thread.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/variable.html
+%%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%/yacc.html
+@dirrm %%RUBY_DOCDIR%%/ruby-man%%LANGSUFFIX%%
+@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
diff --git a/lang/ruby-man/Makefile b/lang/ruby-man/Makefile
index f0f238a2cf33..fab80c8ab25f 100644
--- a/lang/ruby-man/Makefile
+++ b/lang/ruby-man/Makefile
@@ -16,17 +16,18 @@ MAINTAINER=	olgeni@uli.it
 
 DIST_SUBDIR=	ruby
 
-PLIST_SUB=	RUBY_VER="${RUBY_VER}" LANGSUFFIX="${LANGSUFFIX}"
+PLIST_SUB=	LANGSUFFIX="${LANGSUFFIX}"
 
-RUBY_VER?=	1.4
-WRKSRC=		${WRKDIR}/${PORTNAME}-${RUBY_VER}${LANGSUFFIX}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}${LANGSUFFIX}
 
 NO_BUILD=	yes
 
-DOCDIR=		${PREFIX}/share/doc/ruby/ruby-man-${RUBY_VER}${LANGSUFFIX}
+DOCDIR=		${RUBY_DOCDIR}/ruby-man${LANGSUFFIX}
 
 do-install:
 	${MKDIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.html ${DOCDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+.include <bsd.port.post.mk>
diff --git a/lang/ruby-man/pkg-plist b/lang/ruby-man/pkg-plist
index a89068028ae9..bf7401678001 100644
--- a/lang/ruby-man/pkg-plist
+++ b/lang/ruby-man/pkg-plist
@@ -1,51 +1,51 @@
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Array.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Bignum.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Class.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Compar.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Data.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Dir.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/ENV.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Enum.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Errno.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Exception.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/File.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/FileTest.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Fixnum.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Float.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/GC.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Hash.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/IO.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Integer.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Kernel.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Marshal.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Match.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Math.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Module.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/NilClass.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Numeric.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/ObSpace.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Object.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Prec.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Proc.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Process.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Range.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Regexp.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/String.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Struct.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/Time.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/bundle.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/classes.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/dbm.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/function.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/glossary.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/index.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/kconv.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/options.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/preface.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/socket.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/syntax.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/thread.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/variable.html
-share/doc/ruby/ruby-man-%%RUBY_VER%%/yacc.html
-@dirrm share/doc/ruby/ruby-man-%%RUBY_VER%%
-@unexec rmdir %D/share/doc/ruby 2>/dev/null || true
+%%RUBY_DOCDIR%%/ruby-man/Array.html
+%%RUBY_DOCDIR%%/ruby-man/Bignum.html
+%%RUBY_DOCDIR%%/ruby-man/Class.html
+%%RUBY_DOCDIR%%/ruby-man/Compar.html
+%%RUBY_DOCDIR%%/ruby-man/Data.html
+%%RUBY_DOCDIR%%/ruby-man/Dir.html
+%%RUBY_DOCDIR%%/ruby-man/ENV.html
+%%RUBY_DOCDIR%%/ruby-man/Enum.html
+%%RUBY_DOCDIR%%/ruby-man/Errno.html
+%%RUBY_DOCDIR%%/ruby-man/Exception.html
+%%RUBY_DOCDIR%%/ruby-man/File.html
+%%RUBY_DOCDIR%%/ruby-man/FileTest.html
+%%RUBY_DOCDIR%%/ruby-man/Fixnum.html
+%%RUBY_DOCDIR%%/ruby-man/Float.html
+%%RUBY_DOCDIR%%/ruby-man/GC.html
+%%RUBY_DOCDIR%%/ruby-man/Hash.html
+%%RUBY_DOCDIR%%/ruby-man/IO.html
+%%RUBY_DOCDIR%%/ruby-man/Integer.html
+%%RUBY_DOCDIR%%/ruby-man/Kernel.html
+%%RUBY_DOCDIR%%/ruby-man/Marshal.html
+%%RUBY_DOCDIR%%/ruby-man/Match.html
+%%RUBY_DOCDIR%%/ruby-man/Math.html
+%%RUBY_DOCDIR%%/ruby-man/Module.html
+%%RUBY_DOCDIR%%/ruby-man/NilClass.html
+%%RUBY_DOCDIR%%/ruby-man/Numeric.html
+%%RUBY_DOCDIR%%/ruby-man/ObSpace.html
+%%RUBY_DOCDIR%%/ruby-man/Object.html
+%%RUBY_DOCDIR%%/ruby-man/Prec.html
+%%RUBY_DOCDIR%%/ruby-man/Proc.html
+%%RUBY_DOCDIR%%/ruby-man/Process.html
+%%RUBY_DOCDIR%%/ruby-man/Range.html
+%%RUBY_DOCDIR%%/ruby-man/Regexp.html
+%%RUBY_DOCDIR%%/ruby-man/String.html
+%%RUBY_DOCDIR%%/ruby-man/Struct.html
+%%RUBY_DOCDIR%%/ruby-man/Time.html
+%%RUBY_DOCDIR%%/ruby-man/bundle.html
+%%RUBY_DOCDIR%%/ruby-man/classes.html
+%%RUBY_DOCDIR%%/ruby-man/dbm.html
+%%RUBY_DOCDIR%%/ruby-man/function.html
+%%RUBY_DOCDIR%%/ruby-man/glossary.html
+%%RUBY_DOCDIR%%/ruby-man/index.html
+%%RUBY_DOCDIR%%/ruby-man/kconv.html
+%%RUBY_DOCDIR%%/ruby-man/options.html
+%%RUBY_DOCDIR%%/ruby-man/preface.html
+%%RUBY_DOCDIR%%/ruby-man/socket.html
+%%RUBY_DOCDIR%%/ruby-man/syntax.html
+%%RUBY_DOCDIR%%/ruby-man/thread.html
+%%RUBY_DOCDIR%%/ruby-man/variable.html
+%%RUBY_DOCDIR%%/ruby-man/yacc.html
+@dirrm %%RUBY_DOCDIR%%/ruby-man
+@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true