Update with bsd.ruby.mk.

2 files changed, 24 insertions, 31 deletions

diff --git a/security/ruby-tcpwrap/Makefile b/security/ruby-tcpwrap/Makefile
index 13fde84eee96..4023f21b6d56 100644
--- a/security/ruby-tcpwrap/Makefile
+++ b/security/ruby-tcpwrap/Makefile
@@ -9,52 +9,45 @@ PORTNAME=	tcpwrap
 PORTVERSION=	0.1
 CATEGORIES=	security ruby
 MASTER_SITES=	http://www.ruby-lang.org/~shugo/ruby-tcpwrap/
-PKGNAMEPREFIX=	ruby-
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby \
-		${LOCALBASE}/lib/libident.a:${PORTSDIR}/security/libident
+BUILD_DEPENDS=	${LOCALBASE}/lib/libident.a:${PORTSDIR}/security/libident
 .if !exists(/usr/include/tcpd.h)
 LIB_DEPENDS=	wrap.7:${PORTSDIR}/security/tcp_wrapper
 .endif
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
 
-INSTALL_TARGET=	site-install
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
+
+WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
 CONFIGURE_ARGS=	--with-ident-dir="${LOCALBASE}"
 .if !exists(/usr/include/tcpd.h)
 CONFIGURE_ARGS+=	--with-libwrap-dir="/usr"
 .else
 CONFIGURE_ARGS+=	--with-libwrap-dir="${LOCALBASE}"
 .endif
-
-WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
-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
 
 DOCS_EN=	README.en	doc/tcpwrap.html.en
 DOCS_JA=	README.ja	doc/tcpwrap.html.ja
 
-do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS}
-
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/ruby/tcpwrap
-	${INSTALL_DATA} ${WRKSRC}/sample/echod.rb ${PREFIX}/share/examples/ruby/tcpwrap/
-	${MKDIR} ${PREFIX}/share/doc/ruby/tcpwrap/ja
+	${MKDIR} ${RUBY_EXAMPLESDIR}/tcpwrap
+	${INSTALL_DATA} ${WRKSRC}/sample/echod.rb ${RUBY_EXAMPLESDIR}/tcpwrap/
+	${MKDIR} ${RUBY_DOCDIR}/tcpwrap/ja
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/tcpwrap/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/tcpwrap/
 .endfor
 .for f in ${DOCS_JA}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/tcpwrap/ja/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/tcpwrap/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/security/ruby-tcpwrap/pkg-plist b/security/ruby-tcpwrap/pkg-plist
index e248781c92a2..1d24e1535ddd 100644
--- a/security/ruby-tcpwrap/pkg-plist
+++ b/security/ruby-tcpwrap/pkg-plist
@@ -1,9 +1,9 @@
-lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/tcpwrap.so
-share/examples/ruby/tcpwrap/echod.rb
-@dirrm share/examples/ruby/tcpwrap
-share/doc/ruby/tcpwrap/README.en
-share/doc/ruby/tcpwrap/tcpwrap.html.en
-share/doc/ruby/tcpwrap/ja/README.ja
-share/doc/ruby/tcpwrap/ja/tcpwrap.html.ja
-@dirrm share/doc/ruby/tcpwrap/ja
-@dirrm share/doc/ruby/tcpwrap
+%%RUBY_SITEARCHLIBDIR%%/tcpwrap.so
+%%RUBY_EXAMPLESDIR%%/tcpwrap/echod.rb
+@dirrm %%RUBY_EXAMPLESDIR%%/tcpwrap
+%%RUBY_DOCDIR%%/tcpwrap/README.en
+%%RUBY_DOCDIR%%/tcpwrap/tcpwrap.html.en
+%%RUBY_DOCDIR%%/tcpwrap/ja/README.ja
+%%RUBY_DOCDIR%%/tcpwrap/ja/tcpwrap.html.ja
+@dirrm %%RUBY_DOCDIR%%/tcpwrap/ja
+@dirrm %%RUBY_DOCDIR%%/tcpwrap