Update with bsd.ruby.mk.

2 files changed, 58 insertions, 75 deletions

diff --git a/mail/rubygem-tmail/Makefile b/mail/rubygem-tmail/Makefile
index ca3cea1881d2..229700020b9b 100644
--- a/mail/rubygem-tmail/Makefile
+++ b/mail/rubygem-tmail/Makefile
@@ -9,26 +9,17 @@ PORTNAME=	tmail
 PORTVERSION=	0.8.12
 CATEGORIES=	mail ruby
 MASTER_SITES=	http://www1.u-netsurf.ne.jp/~brew/mine/soft/
-PKGNAMEPREFIX=	ruby-
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby \
-		${RUBY_SITELIBDIR}/amstd/info.rb:${PORTSDIR}/devel/ruby-amstd
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby \
-		${RUBY_SITELIBDIR}/amstd/info.rb:${PORTSDIR}/devel/ruby-amstd \
-		${RUBY_SITELIBDIR}/racc/parser.rb:${PORTSDIR}/devel/ruby-racc-runtime \
+RUN_DEPENDS=	${RUBY_SITELIBDIR}/racc/parser.rb:${PORTSDIR}/devel/ruby-racc-runtime \
 		${RUBY_SITEARCHLIBDIR}/strscan.so:${PORTSDIR}/devel/ruby-strscan
 
-PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
-
-RUBY?=		${LOCALBASE}/bin/ruby
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
-
-RUBY_SITELIBDIR?=	${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER}
-RUBY_SITEARCHLIBDIR?=	${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER}/${RUBY_ARCH}
+USE_RUBY=	yes
+USE_RUBY_AMSTD=	yes
+USE_RUBY_SETUP=	yes
 
 post-patch:
 	${PERL} -i -ne '/\btmail\b/ and print' \
@@ -36,23 +27,15 @@ post-patch:
 	for d in cparse strscanso; do ${RM} -rf ${WRKSRC}/ext/$$d; done
 	for d in amstd raccrt strscan; do ${RM} -rf ${WRKSRC}/lib/$$d; done
 
-do-configure:
-	@cd ${WRKSRC}; \
-	${SETENV} ${CONFIGURE_ENV} ${RUBY} setup.rb config
-
-do-build:
-	@cd ${WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${RUBY} setup.rb setup
-
 do-install:
-	@cd ${WRKSRC}; \
-	${SETENV} ${MAKE_ENV} ${RUBY} setup.rb install
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/ruby/tmail
-	${CP} -R ${WRKSRC}/sample/ ${PREFIX}/share/examples/ruby/tmail/
-	${MKDIR} ${PREFIX}/share/doc/ruby/tmail/ja
-	${CP} -R ${WRKSRC}/README.en ${WRKSRC}/doc.en/ ${PREFIX}/share/doc/ruby/tmail/
-	${CP} -R ${WRKSRC}/README.ja ${WRKSRC}/doc.ja/ ${PREFIX}/share/doc/ruby/tmail/ja/
+	${MKDIR} ${RUBY_EXAMPLESDIR}/tmail
+	${CP} -R ${WRKSRC}/sample/ ${RUBY_EXAMPLESDIR}/tmail/
+	${MKDIR} ${RUBY_DOCDIR}/tmail/ja
+	${CP} -R ${WRKSRC}/README.en ${WRKSRC}/doc.en/ ${RUBY_DOCDIR}/tmail/
+	${CP} -R ${WRKSRC}/README.ja ${WRKSRC}/doc.ja/ ${RUBY_DOCDIR}/tmail/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/mail/rubygem-tmail/pkg-plist b/mail/rubygem-tmail/pkg-plist
index 830d169d0cff..b44dbfd0966e 100644
--- a/mail/rubygem-tmail/pkg-plist
+++ b/mail/rubygem-tmail/pkg-plist
@@ -1,45 +1,45 @@
-lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/tmail/mails.so
-@dirrm lib/ruby/site_ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/tmail
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/encode.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/info.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/mailp.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/port.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/field.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/loader.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/mails.rb
-lib/ruby/site_ruby/%%RUBY_VER%%/tmail/tmail.rb
-@dirrm lib/ruby/site_ruby/%%RUBY_VER%%/tmail
-share/examples/ruby/tmail/from-check.rb
-share/examples/ruby/tmail/hf2class.rb
-share/examples/ruby/tmail/multipart.rb
-share/examples/ruby/tmail/parse-bench.rb
-share/examples/ruby/tmail/parse-test.rb
-share/examples/ruby/tmail/sendmail.rb
-share/examples/ruby/tmail/m/normal
-share/examples/ruby/tmail/m/simple
-share/examples/ruby/tmail/m/multipart
-share/examples/ruby/tmail/m/sendtest
-@dirrm share/examples/ruby/tmail/m
-@dirrm share/examples/ruby/tmail
-share/doc/ruby/tmail/README.en
-share/doc/ruby/tmail/bugs.html
-share/doc/ruby/tmail/changes.html
-share/doc/ruby/tmail/concept.html
-share/doc/ruby/tmail/field.html
-share/doc/ruby/tmail/index.html
-share/doc/ruby/tmail/item.html
-share/doc/ruby/tmail/loader.html
-share/doc/ruby/tmail/port.html
-share/doc/ruby/tmail/tmail.html
-share/doc/ruby/tmail/ja/README.ja
-share/doc/ruby/tmail/ja/bugs.html
-share/doc/ruby/tmail/ja/changes.html
-share/doc/ruby/tmail/ja/concept.html
-share/doc/ruby/tmail/ja/field.html
-share/doc/ruby/tmail/ja/index.html
-share/doc/ruby/tmail/ja/item.html
-share/doc/ruby/tmail/ja/loader.html
-share/doc/ruby/tmail/ja/port.html
-share/doc/ruby/tmail/ja/tmail.html
-@dirrm share/doc/ruby/tmail/ja
-@dirrm share/doc/ruby/tmail
+%%RUBY_SITEARCHLIBDIR%%/tmail/mails.so
+@dirrm %%RUBY_SITEARCHLIBDIR%%/tmail
+%%RUBY_SITELIBDIR%%/tmail/encode.rb
+%%RUBY_SITELIBDIR%%/tmail/info.rb
+%%RUBY_SITELIBDIR%%/tmail/mailp.rb
+%%RUBY_SITELIBDIR%%/tmail/port.rb
+%%RUBY_SITELIBDIR%%/tmail/field.rb
+%%RUBY_SITELIBDIR%%/tmail/loader.rb
+%%RUBY_SITELIBDIR%%/tmail/mails.rb
+%%RUBY_SITELIBDIR%%/tmail/tmail.rb
+@dirrm %%RUBY_SITELIBDIR%%/tmail
+%%RUBY_EXAMPLESDIR%%/tmail/from-check.rb
+%%RUBY_EXAMPLESDIR%%/tmail/hf2class.rb
+%%RUBY_EXAMPLESDIR%%/tmail/multipart.rb
+%%RUBY_EXAMPLESDIR%%/tmail/parse-bench.rb
+%%RUBY_EXAMPLESDIR%%/tmail/parse-test.rb
+%%RUBY_EXAMPLESDIR%%/tmail/sendmail.rb
+%%RUBY_EXAMPLESDIR%%/tmail/m/normal
+%%RUBY_EXAMPLESDIR%%/tmail/m/simple
+%%RUBY_EXAMPLESDIR%%/tmail/m/multipart
+%%RUBY_EXAMPLESDIR%%/tmail/m/sendtest
+@dirrm %%RUBY_EXAMPLESDIR%%/tmail/m
+@dirrm %%RUBY_EXAMPLESDIR%%/tmail
+%%RUBY_DOCDIR%%/tmail/README.en
+%%RUBY_DOCDIR%%/tmail/bugs.html
+%%RUBY_DOCDIR%%/tmail/changes.html
+%%RUBY_DOCDIR%%/tmail/concept.html
+%%RUBY_DOCDIR%%/tmail/field.html
+%%RUBY_DOCDIR%%/tmail/index.html
+%%RUBY_DOCDIR%%/tmail/item.html
+%%RUBY_DOCDIR%%/tmail/loader.html
+%%RUBY_DOCDIR%%/tmail/port.html
+%%RUBY_DOCDIR%%/tmail/tmail.html
+%%RUBY_DOCDIR%%/tmail/ja/README.ja
+%%RUBY_DOCDIR%%/tmail/ja/bugs.html
+%%RUBY_DOCDIR%%/tmail/ja/changes.html
+%%RUBY_DOCDIR%%/tmail/ja/concept.html
+%%RUBY_DOCDIR%%/tmail/ja/field.html
+%%RUBY_DOCDIR%%/tmail/ja/index.html
+%%RUBY_DOCDIR%%/tmail/ja/item.html
+%%RUBY_DOCDIR%%/tmail/ja/loader.html
+%%RUBY_DOCDIR%%/tmail/ja/port.html
+%%RUBY_DOCDIR%%/tmail/ja/tmail.html
+@dirrm %%RUBY_DOCDIR%%/tmail/ja
+@dirrm %%RUBY_DOCDIR%%/tmail