Update with bsd.ruby.mk. :>

4 files changed, 65 insertions, 70 deletions

diff --git a/lang/ruby-perl/Makefile b/lang/ruby-perl/Makefile
index 93daea1a9bb7..fd843f5e8e72 100644
--- a/lang/ruby-perl/Makefile
+++ b/lang/ruby-perl/Makefile
@@ -9,31 +9,22 @@ PORTNAME=	perl
 PORTVERSION=	0.2.5
 CATEGORIES=	lang ruby perl5
 MASTER_SITES=	http://www.bekkoame.ne.jp/~yoshidam/
-PKGNAMEPREFIX=	ruby-
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
-
-INSTALL_TARGET=	site-install
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
-
 USE_PERL5=	yes
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
 
-RUBY?=		${LOCALBASE}/bin/ruby
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
+WRKSRC=		${WRKDIR}/${PORTNAME}
+INSTALL_TARGET=	site-install
 
 EXAMPLES=	htmlparse.rb	http.rb		perllib.rb	ping.rb \
 		test.rb		xmlparser.rb
 
 do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb
 	@cd ${WRKSRC}/Ruby; \
 	${PERL} Makefile.PL
 
@@ -45,12 +36,14 @@ post-install:
 	@cd ${WRKSRC}/Ruby; \
 	${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/ruby/perl
+	${MKDIR} ${RUBY_EXAMPLESDIR}/perl
 .for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/samples/${f} ${PREFIX}/share/examples/ruby/perl/
+	${INSTALL_DATA} ${WRKSRC}/samples/${f} ${RUBY_EXAMPLESDIR}/perl/
 .endfor
-	${MKDIR} ${PREFIX}/share/doc/ruby/perl/ja
-	${INSTALL_DATA} ${WRKSRC}/README.ja ${PREFIX}/share/doc/ruby/perl/ja/
+	${MKDIR} ${RUBY_DOCDIR}/perl/ja
+	${INSTALL_DATA} ${WRKSRC}/README.ja ${RUBY_DOCDIR}/perl/ja/
 .endif
 
-.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-perl/pkg-plist b/lang/ruby-perl/pkg-plist
index 159092d0ea78..7e71fcb77b31 100644
--- a/lang/ruby-perl/pkg-plist
+++ b/lang/ruby-perl/pkg-plist
@@ -1,14 +1,14 @@
-lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/perl.so
-share/examples/ruby/perl/htmlparse.rb
-share/examples/ruby/perl/http.rb
-share/examples/ruby/perl/perllib.rb
-share/examples/ruby/perl/ping.rb
-share/examples/ruby/perl/test.rb
-share/examples/ruby/perl/xmlparser.rb
-@dirrm share/examples/ruby/perl
-share/doc/ruby/perl/ja/README.ja
-@dirrm share/doc/ruby/perl/ja
-@dirrm share/doc/ruby/perl
+%%RUBY_SITEARCHLIBDIR%%/perl.so
+%%RUBY_EXAMPLESDIR%%/perl/htmlparse.rb
+%%RUBY_EXAMPLESDIR%%/perl/http.rb
+%%RUBY_EXAMPLESDIR%%/perl/perllib.rb
+%%RUBY_EXAMPLESDIR%%/perl/ping.rb
+%%RUBY_EXAMPLESDIR%%/perl/test.rb
+%%RUBY_EXAMPLESDIR%%/perl/xmlparser.rb
+@dirrm %%RUBY_EXAMPLESDIR%%/perl
+%%RUBY_DOCDIR%%/perl/ja/README.ja
+@dirrm %%RUBY_DOCDIR%%/perl/ja
+@dirrm %%RUBY_DOCDIR%%/perl
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Ruby.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ruby/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Ruby/Ruby.bs
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