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.

10 files changed, 5 insertions, 20 deletions

diff --git a/lang/ruby-man/Makefile b/lang/ruby-man/Makefile
index fab80c8ab25f..ab77764c78c3 100644
--- a/lang/ruby-man/Makefile
+++ b/lang/ruby-man/Makefile
@@ -28,6 +28,4 @@ do-install:
 	${MKDIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.html ${DOCDIR}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/ruby-perl/Makefile b/lang/ruby-perl/Makefile
index 73b12d6179d5..9c892dd0cb9a 100644
--- a/lang/ruby-perl/Makefile
+++ b/lang/ruby-perl/Makefile
@@ -45,6 +45,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.ja ${RUBY_DOCDIR}/perl/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/lang/ruby-python/Makefile b/lang/ruby-python/Makefile
index dea3dc6c14d3..0ccefbaed5d2 100644
--- a/lang/ruby-python/Makefile
+++ b/lang/ruby-python/Makefile
@@ -35,6 +35,4 @@ post-install:
 		${RUBY_DOCDIR}/python/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/lang/ruby-tcltklib/Makefile b/lang/ruby-tcltklib/Makefile
index 27b126fe5455..2de946cc6b25 100644
--- a/lang/ruby-tcltklib/Makefile
+++ b/lang/ruby-tcltklib/Makefile
@@ -50,7 +50,6 @@ TCL_DIR=	`echo "${TCL_LIB}" | ${SED} 's/\([0-9]\)\([0-9]\)/\1.\2/'`
 TK_DIR=		`echo "${TK_LIB}"  | ${SED} 's/\([0-9]\)\([0-9]\)/\1.\2/'`
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
 
 .if defined(PKGNAMEPREFIX)
 PKGNAMEPREFIX:=	${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX}
diff --git a/lang/ruby-usersguide/Makefile b/lang/ruby-usersguide/Makefile
index e782caf4c790..d5b8f4f1cb66 100644
--- a/lang/ruby-usersguide/Makefile
+++ b/lang/ruby-usersguide/Makefile
@@ -34,6 +34,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/* ${DOCDIR}
 	${LN} -fs uguide00.html ${DOCDIR}/index.html
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 9caefa4adf95..b6aa10235043 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -26,7 +26,6 @@ EMACSLISPDIR=	${PREFIX}/share/emacs/site-lisp
 XEMACSLISPDIR=	${PREFIX}/lib/xemacs/site-lisp
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
 
 .if !empty(RUBY_SUFFIX)
 CONFIGURE_ARGS+=	--program-suffix="${RUBY_SUFFIX}"
diff --git a/lang/ruby14-irb/Makefile b/lang/ruby14-irb/Makefile
index e8722864d324..417094a2655f 100644
--- a/lang/ruby14-irb/Makefile
+++ b/lang/ruby14-irb/Makefile
@@ -38,6 +38,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README* ${RUBY_DOCDIR}/irb
 .endif
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/ruby14-tcltklib/Makefile b/lang/ruby14-tcltklib/Makefile
index c2bcd743a0bb..0dc77650f4ba 100644
--- a/lang/ruby14-tcltklib/Makefile
+++ b/lang/ruby14-tcltklib/Makefile
@@ -52,7 +52,6 @@ TCL_DIR=	`echo "${TCL_LIB}" | ${SED} 's/\([0-9]\)\([0-9]\)/\1.\2/'`
 TK_DIR=		`echo "${TK_LIB}"  | ${SED} 's/\([0-9]\)\([0-9]\)/\1.\2/'`
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
 
 .if defined(PKGNAMEPREFIX)
 PKGNAMEPREFIX:=	${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX}
diff --git a/lang/ruby14/Makefile b/lang/ruby14/Makefile
index 2b20345a654c..0a333c7e5995 100644
--- a/lang/ruby14/Makefile
+++ b/lang/ruby14/Makefile
@@ -28,7 +28,6 @@ EMACSLISPDIR=	${PREFIX}/share/emacs/site-lisp
 XEMACSLISPDIR=	${PREFIX}/lib/xemacs/site-lisp
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
 
 .if !empty(RUBY_SUFFIX)
 CONFIGURE_ARGS+=	--program-suffix="${RUBY_SUFFIX}"
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index 9caefa4adf95..b6aa10235043 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -26,7 +26,6 @@ EMACSLISPDIR=	${PREFIX}/share/emacs/site-lisp
 XEMACSLISPDIR=	${PREFIX}/lib/xemacs/site-lisp
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
 
 .if !empty(RUBY_SUFFIX)
 CONFIGURE_ARGS+=	--program-suffix="${RUBY_SUFFIX}"