2 files changed, 42 insertions, 40 deletions

diff --git a/lang/ruby-usersguide/Makefile b/lang/ruby-usersguide/Makefile
index 582bb23d554a..afa38ec16521 100644
--- a/lang/ruby-usersguide/Makefile
+++ b/lang/ruby-usersguide/Makefile
@@ -17,13 +17,13 @@ MAINTAINER=	knu@FreeBSD.org
 SHORTNAME=	${PORTNAME:S/usersguide/uguide/}
 VERSION?=	20000904
 
-PLIST_SUB=	RUBY_VER="${RUBY_VER}" LANGSUFFIX="${LANGSUFFIX}"
+PLIST_SUB=	LANGSUFFIX="${LANGSUFFIX}"
 
 WRKSRC=		${WRKDIR}/${SHORTNAME}
 
 NO_BUILD=	yes
 
-DOCDIR=		${PREFIX}/share/doc/ruby/${PORTNAME}${LANGSUFFIX}
+DOCDIR=		${RUBY_DOCDIR}/${PORTNAME}${LANGSUFFIX}
 
 post-extract:
 	if [ -f ${WRKSRC}/ansi.com ]; then ${RM} ${WRKSRC}/ansi.com; fi
@@ -33,4 +33,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/* ${DOCDIR}
 	${LN} -fs uguide00.html ${DOCDIR}/index.html
 
-.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-usersguide/pkg-plist b/lang/ruby-usersguide/pkg-plist
index d1a5f1f569e1..9f38f0a0477e 100644
--- a/lang/ruby-usersguide/pkg-plist
+++ b/lang/ruby-usersguide/pkg-plist
@@ -1,37 +1,37 @@
-share/doc/ruby/ruby-usersguide/README.txt
-share/doc/ruby/ruby-usersguide/a2l.gif
-share/doc/ruby/ruby-usersguide/a2r.gif
-share/doc/ruby/ruby-usersguide/a2u.gif
-share/doc/ruby/ruby-usersguide/eval.rb
-share/doc/ruby/ruby-usersguide/index.html
-share/doc/ruby/ruby-usersguide/install.html
-share/doc/ruby/ruby-usersguide/uguide.css
-share/doc/ruby/ruby-usersguide/uguide00.html
-share/doc/ruby/ruby-usersguide/uguide01.html
-share/doc/ruby/ruby-usersguide/uguide02.html
-share/doc/ruby/ruby-usersguide/uguide03.html
-share/doc/ruby/ruby-usersguide/uguide04.html
-share/doc/ruby/ruby-usersguide/uguide05.html
-share/doc/ruby/ruby-usersguide/uguide06.html
-share/doc/ruby/ruby-usersguide/uguide07.html
-share/doc/ruby/ruby-usersguide/uguide08.html
-share/doc/ruby/ruby-usersguide/uguide09.html
-share/doc/ruby/ruby-usersguide/uguide10.html
-share/doc/ruby/ruby-usersguide/uguide11.html
-share/doc/ruby/ruby-usersguide/uguide12.html
-share/doc/ruby/ruby-usersguide/uguide13.html
-share/doc/ruby/ruby-usersguide/uguide14.html
-share/doc/ruby/ruby-usersguide/uguide15.html
-share/doc/ruby/ruby-usersguide/uguide16.html
-share/doc/ruby/ruby-usersguide/uguide17.html
-share/doc/ruby/ruby-usersguide/uguide18.html
-share/doc/ruby/ruby-usersguide/uguide19.html
-share/doc/ruby/ruby-usersguide/uguide20.html
-share/doc/ruby/ruby-usersguide/uguide21.html
-share/doc/ruby/ruby-usersguide/uguide22.html
-share/doc/ruby/ruby-usersguide/uguide23.html
-share/doc/ruby/ruby-usersguide/uguide24.html
-share/doc/ruby/ruby-usersguide/uguide25.html
-share/doc/ruby/ruby-usersguide/uguide26.html
-@dirrm share/doc/ruby/ruby-usersguide
-@unexec rmdir %D/share/doc/ruby 2>/dev/null || true
+%%RUBY_DOCDIR%%/ruby-usersguide/README.txt
+%%RUBY_DOCDIR%%/ruby-usersguide/a2l.gif
+%%RUBY_DOCDIR%%/ruby-usersguide/a2r.gif
+%%RUBY_DOCDIR%%/ruby-usersguide/a2u.gif
+%%RUBY_DOCDIR%%/ruby-usersguide/eval.rb
+%%RUBY_DOCDIR%%/ruby-usersguide/index.html
+%%RUBY_DOCDIR%%/ruby-usersguide/install.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide.css
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide00.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide01.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide02.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide03.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide04.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide05.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide06.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide07.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide08.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide09.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide10.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide11.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide12.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide13.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide14.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide15.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide16.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide17.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide18.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide19.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide20.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide21.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide22.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide23.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide24.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide25.html
+%%RUBY_DOCDIR%%/ruby-usersguide/uguide26.html
+@dirrm %%RUBY_DOCDIR%%/ruby-usersguide
+@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true