2 files changed, 40 insertions, 48 deletions

diff --git a/print/ruby-clibpdf/Makefile b/print/ruby-clibpdf/Makefile
index 2dcb2abaa041..b3ee58ca408d 100644
--- a/print/ruby-clibpdf/Makefile
+++ b/print/ruby-clibpdf/Makefile
@@ -9,25 +9,19 @@ PORTNAME=	clibpdf
 PORTVERSION=	19991016
 CATEGORIES=	print ruby
 MASTER_SITES=	http://www2s.biglobe.ne.jp/~Nori/ruby/
-PKGNAMEPREFIX=	ruby-
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ClibPDF-ALPHA-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
 LIB_DEPENDS=	cpdf.0:${PORTSDIR}/print/clibpdf
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
 
-INSTALL_TARGET=	site-install
-CONFIGURE_ARGS=	--with-opt-dir="${LOCALBASE}"
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
 
 WRKSRC=		${WRKDIR}/ClibPDF-${PORTVERSION}
-PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
-
-RUBY?=		${LOCALBASE}/bin/ruby
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
+INSTALL_TARGET=	site-install
 
 EXAMPLES_EN=	Arcs.rb		DomainDemo.rb	MarkerTest.rb	Minimal.rb \
 		beziertest.rb	charwidth.rb	cover.rb	dashtest.rb \
@@ -42,26 +36,24 @@ DOCS_JA=	ChangeLog.ja	README.ja	TODO.ja
 post-extract:
 	${RM} ${WRKSRC}/examples/*.pdf
 
-do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS}
-
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/ruby/clibpdf/ja
+	${MKDIR} ${RUBY_EXAMPLESDIR}/clibpdf/ja
 .for f in ${EXAMPLES_EN}
-	${INSTALL_DATA} ${WRKSRC}/examples/${f} ${PREFIX}/share/examples/ruby/clibpdf/
+	${INSTALL_DATA} ${WRKSRC}/examples/${f} ${RUBY_EXAMPLESDIR}/clibpdf/
 .endfor
 .for f in ${EXAMPLES_JA}
-	${INSTALL_DATA} ${WRKSRC}/examples/${f} ${PREFIX}/share/examples/ruby/clibpdf/ja/
+	${INSTALL_DATA} ${WRKSRC}/examples/${f} ${RUBY_EXAMPLESDIR}/clibpdf/ja/
 .endfor
-	${MKDIR} ${PREFIX}/share/doc/ruby/clibpdf/ja
+	${MKDIR} ${RUBY_DOCDIR}/clibpdf/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/clibpdf/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/clibpdf/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/clibpdf/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/clibpdf/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/print/ruby-clibpdf/pkg-plist b/print/ruby-clibpdf/pkg-plist
index de2f92d06aef..4822ac9dc10e 100644
--- a/print/ruby-clibpdf/pkg-plist
+++ b/print/ruby-clibpdf/pkg-plist
@@ -1,27 +1,27 @@
-lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/ClibPDF.so
-share/doc/ruby/clibpdf/README
-share/doc/ruby/clibpdf/ja/ChangeLog.ja
-share/doc/ruby/clibpdf/ja/README.ja
-share/doc/ruby/clibpdf/ja/TODO.ja
-@dirrm share/doc/ruby/clibpdf/ja
-@dirrm share/doc/ruby/clibpdf
-share/examples/ruby/clibpdf/Arcs.rb
-share/examples/ruby/clibpdf/DomainDemo.rb
-share/examples/ruby/clibpdf/MarkerTest.rb
-share/examples/ruby/clibpdf/Minimal.rb
-share/examples/ruby/clibpdf/beziertest.rb
-share/examples/ruby/clibpdf/charwidth.rb
-share/examples/ruby/clibpdf/cover.rb
-share/examples/ruby/clibpdf/dashtest.rb
-share/examples/ruby/clibpdf/filltest.rb
-share/examples/ruby/clibpdf/fontlist.rb
-share/examples/ruby/clibpdf/helloworld.rb
-share/examples/ruby/clibpdf/linkpdfpage.rb
-share/examples/ruby/clibpdf/outline.rb
-share/examples/ruby/clibpdf/textalign.rb
-share/examples/ruby/clibpdf/textboxfit.rb
-share/examples/ruby/clibpdf/timeaxis.rb
-share/examples/ruby/clibpdf/weather.rb
-share/examples/ruby/clibpdf/ja/jpntest.rb
-@dirrm share/examples/ruby/clibpdf/ja
-@dirrm share/examples/ruby/clibpdf
+%%RUBY_SITEARCHLIBDIR%%/ClibPDF.so
+%%RUBY_DOCDIR%%/clibpdf/README
+%%RUBY_DOCDIR%%/clibpdf/ja/ChangeLog.ja
+%%RUBY_DOCDIR%%/clibpdf/ja/README.ja
+%%RUBY_DOCDIR%%/clibpdf/ja/TODO.ja
+@dirrm %%RUBY_DOCDIR%%/clibpdf/ja
+@dirrm %%RUBY_DOCDIR%%/clibpdf
+%%RUBY_EXAMPLESDIR%%/clibpdf/Arcs.rb
+%%RUBY_EXAMPLESDIR%%/clibpdf/DomainDemo.rb
+%%RUBY_EXAMPLESDIR%%/clibpdf/MarkerTest.rb
+%%RUBY_EXAMPLESDIR%%/clibpdf/Minimal.rb
+%%RUBY_EXAMPLESDIR%%/clibpdf/beziertest.rb
+%%RUBY_EXAMPLESDIR%%/clibpdf/charwidth.rb
+%%RUBY_EXAMPLESDIR%%/clibpdf/cover.rb
+%%RUBY_EXAMPLESDIR%%/clibpdf/dashtest.rb
+%%RUBY_EXAMPLESDIR%%/clibpdf/filltest.rb
+%%RUBY_EXAMPLESDIR%%/clibpdf/fontlist.rb
+%%RUBY_EXAMPLESDIR%%/clibpdf/helloworld.rb
+%%RUBY_EXAMPLESDIR%%/clibpdf/linkpdfpage.rb
+%%RUBY_EXAMPLESDIR%%/clibpdf/outline.rb
+%%RUBY_EXAMPLESDIR%%/clibpdf/textalign.rb
+%%RUBY_EXAMPLESDIR%%/clibpdf/textboxfit.rb
+%%RUBY_EXAMPLESDIR%%/clibpdf/timeaxis.rb
+%%RUBY_EXAMPLESDIR%%/clibpdf/weather.rb
+%%RUBY_EXAMPLESDIR%%/clibpdf/ja/jpntest.rb
+@dirrm %%RUBY_EXAMPLESDIR%%/clibpdf/ja
+@dirrm %%RUBY_EXAMPLESDIR%%/clibpdf