Update with bsd.ruby.mk.

Install library files under the standard directory. (${RUBY_SITELIBDIR},
${RUBY_SITEARCHLIBDIR})

2 files changed, 35 insertions, 39 deletions

diff --git a/devel/ruby-date2/Makefile b/devel/ruby-date2/Makefile
index f0842292d173..651273408a11 100644
--- a/devel/ruby-date2/Makefile
+++ b/devel/ruby-date2/Makefile
@@ -9,21 +9,15 @@ PORTNAME=	date2
 PORTVERSION=	2
 CATEGORIES=	devel ruby
 MASTER_SITES=	http://www.kt.rim.or.jp/~tadf/
-PKGNAMEPREFIX=	ruby-
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
+USE_RUBY=	yes
 
 NO_BUILD=	yes
 
-PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
-
-RUBY?=		${LOCALBASE}/bin/ruby
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
-
 MODULES=	date2.rb date3.rb holiday.rb odate.rb \
 		parsedate2.rb parsedate2.ry parsedate3.rb \
 		qholiday.rb strftime.rb strptime.rb
@@ -35,23 +29,25 @@ EXAMPLES_JA=	ncal.rb
 
 do-install:
 .for f in ${MODULES}
-	${INSTALL_DATA} ${WRKSRC}/lib/${f} ${PREFIX}/lib/ruby/site_ruby/
+	${INSTALL_DATA} ${WRKSRC}/lib/${f} ${RUBY_SITELIBDIR}
 .endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/ruby/date2/ja
+	${MKDIR} ${RUBY_EXAMPLESDIR}/date2/ja
 .for f in ${EXAMPLES_EN}
-	${INSTALL_DATA} ${WRKSRC}/sample/${f} ${PREFIX}/share/examples/ruby/date2/
+	${INSTALL_DATA} ${WRKSRC}/sample/${f} ${RUBY_EXAMPLESDIR}/date2/
 .endfor
 .for f in ${EXAMPLES_JA}
-	${INSTALL_DATA} ${WRKSRC}/sample/${f} ${PREFIX}/share/examples/ruby/date2/ja/
+	${INSTALL_DATA} ${WRKSRC}/sample/${f} ${RUBY_EXAMPLESDIR}/date2/ja/
 .endfor
-	${MKDIR} ${PREFIX}/share/doc/ruby/date2/ja
+	${MKDIR} ${RUBY_DOCDIR}/date2/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/date2/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/date2/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/date2/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/date2/ja/
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+.include <bsd.port.post.mk>
diff --git a/devel/ruby-date2/pkg-plist b/devel/ruby-date2/pkg-plist
index 99c16d0eb9e6..15ba4268460d 100644
--- a/devel/ruby-date2/pkg-plist
+++ b/devel/ruby-date2/pkg-plist
@@ -1,23 +1,23 @@
-lib/ruby/site_ruby/date2.rb
-lib/ruby/site_ruby/date3.rb
-lib/ruby/site_ruby/holiday.rb
-lib/ruby/site_ruby/odate.rb
-lib/ruby/site_ruby/parsedate2.rb
-lib/ruby/site_ruby/parsedate2.ry
-lib/ruby/site_ruby/parsedate3.rb
-lib/ruby/site_ruby/qholiday.rb
-lib/ruby/site_ruby/strftime.rb
-lib/ruby/site_ruby/strptime.rb
-share/examples/ruby/date2/cal.rb
-share/examples/ruby/date2/daylight.rb
-share/examples/ruby/date2/goodfriday.rb
-share/examples/ruby/date2/ja/ncal.rb
-@dirrm share/examples/ruby/date2/ja
-@dirrm share/examples/ruby/date2
-share/doc/ruby/date2/CHANGES.en
-share/doc/ruby/date2/MANUAL.en
-share/doc/ruby/date2/README.en
-share/doc/ruby/date2/ja/MANUAL
-share/doc/ruby/date2/ja/README
-@dirrm share/doc/ruby/date2/ja
-@dirrm share/doc/ruby/date2
+%%RUBY_SITELIBDIR%%/date2.rb
+%%RUBY_SITELIBDIR%%/date3.rb
+%%RUBY_SITELIBDIR%%/holiday.rb
+%%RUBY_SITELIBDIR%%/odate.rb
+%%RUBY_SITELIBDIR%%/parsedate2.rb
+%%RUBY_SITELIBDIR%%/parsedate2.ry
+%%RUBY_SITELIBDIR%%/parsedate3.rb
+%%RUBY_SITELIBDIR%%/qholiday.rb
+%%RUBY_SITELIBDIR%%/strftime.rb
+%%RUBY_SITELIBDIR%%/strptime.rb
+%%RUBY_EXAMPLESDIR%%/date2/cal.rb
+%%RUBY_EXAMPLESDIR%%/date2/daylight.rb
+%%RUBY_EXAMPLESDIR%%/date2/goodfriday.rb
+%%RUBY_EXAMPLESDIR%%/date2/ja/ncal.rb
+@dirrm %%RUBY_EXAMPLESDIR%%/date2/ja
+@dirrm %%RUBY_EXAMPLESDIR%%/date2
+%%RUBY_DOCDIR%%/date2/CHANGES.en
+%%RUBY_DOCDIR%%/date2/MANUAL.en
+%%RUBY_DOCDIR%%/date2/README.en
+%%RUBY_DOCDIR%%/date2/ja/MANUAL
+%%RUBY_DOCDIR%%/date2/ja/README
+@dirrm %%RUBY_DOCDIR%%/date2/ja
+@dirrm %%RUBY_DOCDIR%%/date2