3 files changed, 21 insertions, 29 deletions

diff --git a/devel/ruby-filelock/Makefile b/devel/ruby-filelock/Makefile
index ffd5c7b5e3f0..5d1a1d0c2287 100644
--- a/devel/ruby-filelock/Makefile
+++ b/devel/ruby-filelock/Makefile
@@ -9,39 +9,31 @@ PORTNAME=	filelock
 PORTVERSION=	0.2
 CATEGORIES=	devel ruby
 MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/contrib/
-PKGNAMEPREFIX=	ruby-
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
 
 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}
-
 DOCS=		README
 EXAMPLES=	test.rb	tst1.rb	tst2.rb	tst3.rb	tst4.rb
 
-do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS}
-
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/ruby/filelock
+	${MKDIR} ${RUBY_EXAMPLESDIR}/filelock
 .for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/samples/${f} ${PREFIX}/share/examples/ruby/filelock/
+	${INSTALL_DATA} ${WRKSRC}/samples/${f} ${RUBY_EXAMPLESDIR}/filelock/
 .endfor
-	${MKDIR} ${PREFIX}/share/doc/ruby/filelock
+	${MKDIR} ${RUBY_DOCDIR}/filelock
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/filelock/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/filelock/
 .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-filelock/pkg-descr b/devel/ruby-filelock/pkg-descr
index 47d3df5877b5..b690784e8da6 100644
--- a/devel/ruby-filelock/pkg-descr
+++ b/devel/ruby-filelock/pkg-descr
@@ -9,4 +9,4 @@ To be portable, a small C extension is used to minimize the time
 between existence check of a lockfile and its creation.
 
 Author:	Clemens Hintze <c.hintze@gmx.net>
-WWW:	http://www.ruby-lang.org/en/raa-list.rhtml?name=filelock
\ No newline at end of file
+WWW:	http://www.ruby-lang.org/en/raa-list.rhtml?name=filelock
diff --git a/devel/ruby-filelock/pkg-plist b/devel/ruby-filelock/pkg-plist
index f49eb045ce60..b234a95c6dbf 100644
--- a/devel/ruby-filelock/pkg-plist
+++ b/devel/ruby-filelock/pkg-plist
@@ -1,10 +1,10 @@
-lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/_filelock.so
-lib/ruby/site_ruby/%%RUBY_VER%%/filelock.rb
-share/examples/ruby/filelock/test.rb
-share/examples/ruby/filelock/tst1.rb
-share/examples/ruby/filelock/tst2.rb
-share/examples/ruby/filelock/tst3.rb
-share/examples/ruby/filelock/tst4.rb
-@dirrm share/examples/ruby/filelock
-share/doc/ruby/filelock/README
-@dirrm share/doc/ruby/filelock
+%%RUBY_SITEARCHLIBDIR%%/_filelock.so
+%%RUBY_SITELIBDIR%%/filelock.rb
+%%RUBY_EXAMPLESDIR%%/filelock/test.rb
+%%RUBY_EXAMPLESDIR%%/filelock/tst1.rb
+%%RUBY_EXAMPLESDIR%%/filelock/tst2.rb
+%%RUBY_EXAMPLESDIR%%/filelock/tst3.rb
+%%RUBY_EXAMPLESDIR%%/filelock/tst4.rb
+@dirrm %%RUBY_EXAMPLESDIR%%/filelock
+%%RUBY_DOCDIR%%/filelock/README
+@dirrm %%RUBY_DOCDIR%%/filelock