Update with bsd.ruby.mk. :>

4 files changed, 92 insertions, 104 deletions

diff --git a/textproc/ruby-html-parser/Makefile b/textproc/ruby-html-parser/Makefile
index 84824836762b..5851fb3d1782 100644
--- a/textproc/ruby-html-parser/Makefile
+++ b/textproc/ruby-html-parser/Makefile
@@ -9,32 +9,27 @@ PORTNAME=	html-parser
 PORTVERSION=	19990912.p1
 CATEGORIES=	textproc ruby
 MASTER_SITES=	http://www.jin.gr.jp/~nahi/Ruby/html-parser/
-PKGNAMEPREFIX=	ruby-
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
-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=	formatter.rb	html-parser.rb	sgml-parser.rb
 
 do-install:
 .for f in ${MODULES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/lib/ruby/site_ruby/${RUBY_VER}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_SITELIBDIR}
 .endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ruby/html-parser
-	${INSTALL_DATA} ${WRKSRC}/README.html ${PREFIX}/share/doc/ruby/html-parser/
+	${MKDIR} ${RUBY_DOCDIR}/html-parser
+	${INSTALL_DATA} ${WRKSRC}/README.html ${RUBY_DOCDIR}/html-parser/
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+.include <bsd.port.post.mk>
diff --git a/textproc/ruby-html-parser/pkg-plist b/textproc/ruby-html-parser/pkg-plist
index 8f7bb694a3a3..e7b29450ca02 100644
--- a/textproc/ruby-html-parser/pkg-plist
+++ b/textproc/ruby-html-parser/pkg-plist
@@ -1,5 +1,5 @@
-lib/ruby/site_ruby/%%RUBY_VER%%/formatter.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/html-parser.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/sgml-parser.rb
-share/doc/ruby/html-parser/README.html
-@dirrm share/doc/ruby/html-parser
+%%RUBY_SITELIBDIR%%/formatter.rb
+%%RUBY_SITELIBDIR%%/html-parser.rb
+%%RUBY_SITELIBDIR%%/sgml-parser.rb
+%%RUBY_DOCDIR%%/html-parser/README.html
+@dirrm %%RUBY_DOCDIR%%/html-parser
diff --git a/textproc/ruby-xmlparser/Makefile b/textproc/ruby-xmlparser/Makefile
index ecdf84375f81..284b4837a5da 100644
--- a/textproc/ruby-xmlparser/Makefile
+++ b/textproc/ruby-xmlparser/Makefile
@@ -11,31 +11,26 @@ CATEGORIES=	textproc ruby
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.bekkoame.ne.jp/~yoshidam/
 MASTER_SITE_SUBDIR=	knu
-PKGNAMEPREFIX=	ruby-
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby \
-		${PERL_ARCHLIB}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-Parser
+BUILD_DEPENDS=	${PERL_ARCHLIB}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-Parser
 LIB_DEPENDS=	expat.1:${PORTSDIR}/textproc/expat
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby \
-		${PERL_ARCHLIB}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-Parser
+RUN_DEPENDS=	${PERL_ARCHLIB}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-Parser
 # to utilize encoding maps included in p5-XML-Parser
 
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
 .if !defined(NOPORTDOCS)
-BUILD_DEPENDS+=	rd2:${PORTSDIR}/textproc/ruby-rdtool
+USE_RUBY_RD=	yes
 .endif
 
 PERL_ARCHLIB=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/mach
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 INSTALL_TARGET=	site-install
-PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
-
-RUBY?=		${LOCALBASE}/bin/ruby
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
 
 EXAMPLES_EN=	dtd/ext1.dtd	dtd/ext2.dtd	dtd/extdtd.rb	dtd/extdtd.xml \
 		namespaces/namespace1.rb	namespaces/namespace1.xml \
@@ -54,34 +49,32 @@ post-patch:
 	${PERL} -i -pe 's,%%PERL_ARCHLIB%%,${PERL_ARCHLIB},g' ${WRKSRC}/extconf.rb
 	${PERL} -i -pe 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/lib/wget.rb
 
-do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb
-
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/ruby/xmlparser/dtd
-	${MKDIR} ${PREFIX}/share/examples/ruby/xmlparser/namespaces
-	${MKDIR} ${PREFIX}/share/examples/ruby/xmlparser/ja
+	${MKDIR} ${RUBY_EXAMPLESDIR}/xmlparser/dtd
+	${MKDIR} ${RUBY_EXAMPLESDIR}/xmlparser/namespaces
+	${MKDIR} ${RUBY_EXAMPLESDIR}/xmlparser/ja
 .for f in ${EXAMPLES_EN}
 	${INSTALL_DATA} ${WRKSRC}/samples/${f} \
-		${PREFIX}/share/examples/ruby/xmlparser/${f}
+		${RUBY_EXAMPLESDIR}/xmlparser/${f}
 .endfor
 .for f in ${EXAMPLES_JA}
 	${INSTALL_DATA} ${WRKSRC}/samples/${f} \
-		${PREFIX}/share/examples/ruby/xmlparser/ja/${f}
+		${RUBY_EXAMPLESDIR}/xmlparser/ja/${f}
 .endfor
 .for f in ${RD_DOCS}
 	@cd ${WRKSRC}/lib; \
-	rd2 ${f} > ${f:S/.rb$/.html/}
+	${RUBY_RD} ${f} > ${f:S/.rb$/.html/}
 .endfor
-	${MKDIR} ${PREFIX}/share/doc/ruby/xmlparser/ja
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ruby/xmlparser/
-	${INSTALL_DATA} ${WRKSRC}/README.ja ${PREFIX}/share/doc/ruby/xmlparser/ja/
+	${MKDIR} ${RUBY_DOCDIR}/xmlparser/ja
+	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/xmlparser/
+	${INSTALL_DATA} ${WRKSRC}/README.ja ${RUBY_DOCDIR}/xmlparser/ja/
 .for f in ${RD_DOCS:S/.rb$/.html/}
-	${INSTALL_DATA} ${WRKSRC}/lib/${f} ${PREFIX}/share/doc/ruby/xmlparser/
+	${INSTALL_DATA} ${WRKSRC}/lib/${f} ${RUBY_DOCDIR}/xmlparser/
 .endfor
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+.include <bsd.port.post.mk>
diff --git a/textproc/ruby-xmlparser/pkg-plist b/textproc/ruby-xmlparser/pkg-plist
index da766587cfc3..9749b30f1ada 100644
--- a/textproc/ruby-xmlparser/pkg-plist
+++ b/textproc/ruby-xmlparser/pkg-plist
@@ -1,60 +1,60 @@
-lib/ruby/site_ruby/%%RUBY_VER%%/sax.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/saxdriver.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/wget.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/xmldigest.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/xmlencoding-ja.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/xmlparser.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/xmltree.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/xmltreebuilder-ja.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/xmltreebuilder.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/xmltreevisitor.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/xmlparser.so
-share/examples/ruby/xmlparser/dtd/ext1.dtd
-share/examples/ruby/xmlparser/dtd/ext2.dtd
-share/examples/ruby/xmlparser/dtd/extdtd.rb
-share/examples/ruby/xmlparser/dtd/extdtd.xml
-share/examples/ruby/xmlparser/namespaces/namespace1.rb
-share/examples/ruby/xmlparser/namespaces/namespace1.xml
-share/examples/ruby/xmlparser/namespaces/namespace2.rb
-share/examples/ruby/xmlparser/namespaces/namespace2.xml
-share/examples/ruby/xmlparser/ja/buildertest.rb
-share/examples/ruby/xmlparser/ja/buildertest2.rb
-share/examples/ruby/xmlparser/ja/digesttest2.rb
-share/examples/ruby/xmlparser/ja/document.dtd
-share/examples/ruby/xmlparser/ja/gtktree.rb
-share/examples/ruby/xmlparser/ja/index_euc.xml
-share/examples/ruby/xmlparser/ja/index_jis.xml
-share/examples/ruby/xmlparser/ja/index_noenc.xml
-share/examples/ruby/xmlparser/ja/index_sjis.xml
-share/examples/ruby/xmlparser/ja/index_u16.xml
-share/examples/ruby/xmlparser/ja/index_u8.xml
-share/examples/ruby/xmlparser/ja/treetest.rb
-share/examples/ruby/xmlparser/ja/videolist.dtd
-share/examples/ruby/xmlparser/ja/videolist.rb
-share/examples/ruby/xmlparser/ja/videolist.xml
-share/examples/ruby/xmlparser/ja/visitor.rb
-share/examples/ruby/xmlparser/ja/xmlcheck.rb
-share/examples/ruby/xmlparser/ja/xmlevent.rb
-share/examples/ruby/xmlparser/ja/xmlgrep.rb
-share/examples/ruby/xmlparser/ja/xmliter.rb
-share/examples/ruby/xmlparser/ja/xpointer.rb
-share/examples/ruby/xmlparser/ja/xpointertest.rb
-share/examples/ruby/xmlparser/digesttest.rb
-share/examples/ruby/xmlparser/idattrtest.rb
-share/examples/ruby/xmlparser/my-html.rb
-share/examples/ruby/xmlparser/saxtest.rb
-share/examples/ruby/xmlparser/visitortest.rb
-share/examples/ruby/xmlparser/writer.rb
-share/examples/ruby/xmlparser/xmlcomments.rb
-share/examples/ruby/xmlparser/xmlstats.rb
-@dirrm share/examples/ruby/xmlparser/ja
-@dirrm share/examples/ruby/xmlparser/namespaces
-@dirrm share/examples/ruby/xmlparser/dtd
-@dirrm share/examples/ruby/xmlparser
-share/doc/ruby/xmlparser/ja/README.ja
-share/doc/ruby/xmlparser/README
-share/doc/ruby/xmlparser/xmltree.html
-share/doc/ruby/xmlparser/xmltreebuilder.html
-share/doc/ruby/xmlparser/xmltreevisitor.html
-@dirrm share/doc/ruby/xmlparser/ja
-@dirrm share/doc/ruby/xmlparser
+%%RUBY_SITELIBDIR%%/sax.rb
+%%RUBY_SITELIBDIR%%/saxdriver.rb
+%%RUBY_SITELIBDIR%%/wget.rb
+%%RUBY_SITELIBDIR%%/xmldigest.rb
+%%RUBY_SITELIBDIR%%/xmlencoding-ja.rb
+%%RUBY_SITELIBDIR%%/xmlparser.rb
+%%RUBY_SITELIBDIR%%/xmltree.rb
+%%RUBY_SITELIBDIR%%/xmltreebuilder-ja.rb
+%%RUBY_SITELIBDIR%%/xmltreebuilder.rb
+%%RUBY_SITELIBDIR%%/xmltreevisitor.rb
+%%RUBY_SITEARCHLIBDIR%%/xmlparser.so
+%%RUBY_EXAMPLESDIR%%/xmlparser/dtd/ext1.dtd
+%%RUBY_EXAMPLESDIR%%/xmlparser/dtd/ext2.dtd
+%%RUBY_EXAMPLESDIR%%/xmlparser/dtd/extdtd.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/dtd/extdtd.xml
+%%RUBY_EXAMPLESDIR%%/xmlparser/namespaces/namespace1.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/namespaces/namespace1.xml
+%%RUBY_EXAMPLESDIR%%/xmlparser/namespaces/namespace2.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/namespaces/namespace2.xml
+%%RUBY_EXAMPLESDIR%%/xmlparser/ja/buildertest.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/ja/buildertest2.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/ja/digesttest2.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/ja/document.dtd
+%%RUBY_EXAMPLESDIR%%/xmlparser/ja/gtktree.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/ja/index_euc.xml
+%%RUBY_EXAMPLESDIR%%/xmlparser/ja/index_jis.xml
+%%RUBY_EXAMPLESDIR%%/xmlparser/ja/index_noenc.xml
+%%RUBY_EXAMPLESDIR%%/xmlparser/ja/index_sjis.xml
+%%RUBY_EXAMPLESDIR%%/xmlparser/ja/index_u16.xml
+%%RUBY_EXAMPLESDIR%%/xmlparser/ja/index_u8.xml
+%%RUBY_EXAMPLESDIR%%/xmlparser/ja/treetest.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/ja/videolist.dtd
+%%RUBY_EXAMPLESDIR%%/xmlparser/ja/videolist.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/ja/videolist.xml
+%%RUBY_EXAMPLESDIR%%/xmlparser/ja/visitor.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/ja/xmlcheck.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/ja/xmlevent.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/ja/xmlgrep.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/ja/xmliter.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/ja/xpointer.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/ja/xpointertest.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/digesttest.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/idattrtest.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/my-html.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/saxtest.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/visitortest.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/writer.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/xmlcomments.rb
+%%RUBY_EXAMPLESDIR%%/xmlparser/xmlstats.rb
+@dirrm %%RUBY_EXAMPLESDIR%%/xmlparser/ja
+@dirrm %%RUBY_EXAMPLESDIR%%/xmlparser/namespaces
+@dirrm %%RUBY_EXAMPLESDIR%%/xmlparser/dtd
+@dirrm %%RUBY_EXAMPLESDIR%%/xmlparser
+%%RUBY_DOCDIR%%/xmlparser/ja/README.ja
+%%RUBY_DOCDIR%%/xmlparser/README
+%%RUBY_DOCDIR%%/xmlparser/xmltree.html
+%%RUBY_DOCDIR%%/xmlparser/xmltreebuilder.html
+%%RUBY_DOCDIR%%/xmlparser/xmltreevisitor.html
+@dirrm %%RUBY_DOCDIR%%/xmlparser/ja
+@dirrm %%RUBY_DOCDIR%%/xmlparser