Update with bsd.ruby.mk. :>

4 files changed, 34 insertions, 44 deletions

diff --git a/net/ruby-snmp/Makefile b/net/ruby-snmp/Makefile
index 851dbf33e82..e85279e0191 100644
--- a/net/ruby-snmp/Makefile
+++ b/net/ruby-snmp/Makefile
@@ -9,27 +9,22 @@ PORTNAME=	snmp
 PORTVERSION=	0.2.1
 CATEGORIES=	net ruby
 MASTER_SITES=	http://w3cic.riken.go.jp/~tsuruoka/
-PKGNAMEPREFIX=	ruby-
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
 LIB_DEPENDS=	snmp.4:${PORTSDIR}/net/ucd-snmp
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
+
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
 
 WRKSRC=		${WRKDIR}/SNMP
 INSTALL_TARGET=	site-install
 CONFIGURE_ARGS=	--with-snmp-dir="${LOCALBASE}"
 
-PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
-
-RUBY?=		${LOCALBASE}/bin/ruby
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
-
 DOCS_EN=	mib_view.html \
 		rubysnmp.html \
 		sampleout.html \
@@ -37,16 +32,14 @@ DOCS_EN=	mib_view.html \
 		snmp_session.html \
 		snmp_var.html
 
-do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS}
-
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/ruby/snmp
+	${MKDIR} ${RUBY_DOCDIR}/snmp
 .for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/snmp/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/snmp/
 .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/net/ruby-snmp/pkg-plist b/net/ruby-snmp/pkg-plist
index 661480ab4dd..3cebc9cb7bb 100644
--- a/net/ruby-snmp/pkg-plist
+++ b/net/ruby-snmp/pkg-plist
@@ -1,8 +1,8 @@
-lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/snmp.so
-share/doc/ruby/snmp/mib_view.html
-share/doc/ruby/snmp/rubysnmp.html
-share/doc/ruby/snmp/sampleout.html
-share/doc/ruby/snmp/snmp_module.html
-share/doc/ruby/snmp/snmp_session.html
-share/doc/ruby/snmp/snmp_var.html
-@dirrm share/doc/ruby/snmp
+%%RUBY_SITEARCHLIBDIR%%/snmp.so
+%%RUBY_DOCDIR%%/snmp/mib_view.html
+%%RUBY_DOCDIR%%/snmp/rubysnmp.html
+%%RUBY_DOCDIR%%/snmp/sampleout.html
+%%RUBY_DOCDIR%%/snmp/snmp_module.html
+%%RUBY_DOCDIR%%/snmp/snmp_session.html
+%%RUBY_DOCDIR%%/snmp/snmp_var.html
+@dirrm %%RUBY_DOCDIR%%/snmp
diff --git a/net/ruby-uri/Makefile b/net/ruby-uri/Makefile
index f5cd2b5130e..46311c3f187 100644
--- a/net/ruby-uri/Makefile
+++ b/net/ruby-uri/Makefile
@@ -9,21 +9,16 @@ PORTNAME=	uri
 PORTVERSION=	4.22
 CATEGORIES=	net ruby
 MASTER_SITES=	http://www02.so-net.ne.jp/%7Egreentea/ruby/uri/
-PKGNAMEPREFIX=	ruby-
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
+USE_RUBY=	yes
 
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
-
-RUBY?=		${LOCALBASE}/bin/ruby
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
 
 MODULES=	uri.rb urireg.rb
 
@@ -32,17 +27,19 @@ EXAMPLES=	in-uri.txt test-uri.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/examples/ruby/uri
+	${MKDIR} ${RUBY_EXAMPLESDIR}/uri
 .for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/examples/ruby/uri/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/uri/
 .endfor
-	${MKDIR} ${PREFIX}/share/doc/ruby/uri
+	${MKDIR} ${RUBY_DOCDIR}/uri
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ruby/uri/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/uri/
 .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/net/ruby-uri/pkg-plist b/net/ruby-uri/pkg-plist
index 099f5a50fdb..6612fe1251a 100644
--- a/net/ruby-uri/pkg-plist
+++ b/net/ruby-uri/pkg-plist
@@ -1,7 +1,7 @@
-lib/ruby/site_ruby/%%RUBY_VER%%/uri.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/urireg.rb
-share/examples/ruby/uri/test-uri.rb
-share/examples/ruby/uri/in-uri.txt
-@dirrm share/examples/ruby/uri
-share/doc/ruby/uri/index.html
-@dirrm share/doc/ruby/uri
+%%RUBY_SITELIBDIR%%/uri.rb
+%%RUBY_SITELIBDIR%%/urireg.rb
+%%RUBY_EXAMPLESDIR%%/uri/test-uri.rb
+%%RUBY_EXAMPLESDIR%%/uri/in-uri.txt
+@dirrm %%RUBY_EXAMPLESDIR%%/uri
+%%RUBY_DOCDIR%%/uri/index.html
+@dirrm %%RUBY_DOCDIR%%/uri