Now bsd.ruby.mk is automatically included by bsd.port.mk when USE_RUBY

or USE_LIBRUBY is defined, individual ruby ports no longer need to
include it explicitly.

13 files changed, 12 insertions, 37 deletions

diff --git a/devel/ruby-amstd/Makefile b/devel/ruby-amstd/Makefile
index 6b841345fcea..932b5322ed7e 100644
--- a/devel/ruby-amstd/Makefile
+++ b/devel/ruby-amstd/Makefile
@@ -58,6 +58,4 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/ruby-date2/Makefile b/devel/ruby-date2/Makefile
index 843f93093658..2cde7a1903ff 100644
--- a/devel/ruby-date2/Makefile
+++ b/devel/ruby-date2/Makefile
@@ -48,6 +48,4 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/ruby-filelock/Makefile b/devel/ruby-filelock/Makefile
index f72f7dfbf702..5ab78056d018 100644
--- a/devel/ruby-filelock/Makefile
+++ b/devel/ruby-filelock/Makefile
@@ -35,6 +35,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/ruby-intl/Makefile b/devel/ruby-intl/Makefile
index b63088f1ffa7..db452428a294 100644
--- a/devel/ruby-intl/Makefile
+++ b/devel/ruby-intl/Makefile
@@ -33,6 +33,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.jp ${RUBY_DOCDIR}/intl/ja/
 .endif
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/ruby-locale/Makefile b/devel/ruby-locale/Makefile
index 4690175d9795..abda457e0b67 100644
--- a/devel/ruby-locale/Makefile
+++ b/devel/ruby-locale/Makefile
@@ -30,6 +30,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${RUBY_DOCDIR}/locale/
 .endif
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/ruby-optparse/Makefile b/devel/ruby-optparse/Makefile
index 612402472411..b602fd60e923 100644
--- a/devel/ruby-optparse/Makefile
+++ b/devel/ruby-optparse/Makefile
@@ -40,6 +40,4 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/ruby-property/Makefile b/devel/ruby-property/Makefile
index 3b8428f2c246..5f9e2d9505a1 100644
--- a/devel/ruby-property/Makefile
+++ b/devel/ruby-property/Makefile
@@ -36,6 +36,4 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/ruby-racc/Makefile b/devel/ruby-racc/Makefile
index e4dd3a7cfee2..2b1712cf2220 100644
--- a/devel/ruby-racc/Makefile
+++ b/devel/ruby-racc/Makefile
@@ -73,6 +73,4 @@ do-install:
 .endif
 .endif
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/ruby-runit/Makefile b/devel/ruby-runit/Makefile
index ed67857c9a6b..7fda12e42316 100644
--- a/devel/ruby-runit/Makefile
+++ b/devel/ruby-runit/Makefile
@@ -45,6 +45,4 @@ do-install:
 	${CP} -R ${WRKSRC}/doc_en/ ${RUBY_DOCDIR}/runit/
 .endif
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/ruby-slang/Makefile b/devel/ruby-slang/Makefile
index dea2e66647a9..569e2cd2df61 100644
--- a/devel/ruby-slang/Makefile
+++ b/devel/ruby-slang/Makefile
@@ -36,7 +36,6 @@ DOCS_EN=	README		changes.txt
 DOCS_JA=	README.euc
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
 
 .if defined(PKGNAMEPREFIX)
 PKGNAMEPREFIX:= ${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX}
diff --git a/devel/ruby-strscan/Makefile b/devel/ruby-strscan/Makefile
index 82f324a4c041..78b6d2c5eb21 100644
--- a/devel/ruby-strscan/Makefile
+++ b/devel/ruby-strscan/Makefile
@@ -41,6 +41,4 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/ruby-unit/Makefile b/devel/ruby-unit/Makefile
index ed67857c9a6b..7fda12e42316 100644
--- a/devel/ruby-unit/Makefile
+++ b/devel/ruby-unit/Makefile
@@ -45,6 +45,4 @@ do-install:
 	${CP} -R ${WRKSRC}/doc_en/ ${RUBY_DOCDIR}/runit/
 .endif
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/swigruby/Makefile b/devel/swigruby/Makefile
index 13f6a948ea9a..7eaf5635f7f3 100644
--- a/devel/swigruby/Makefile
+++ b/devel/swigruby/Makefile
@@ -40,6 +40,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>