From c68548820c41ad7830566b381146ecbdb12ed72c Mon Sep 17 00:00:00 2001
From: Akinori MUSHA <knu@FreeBSD.org>
Date: Tue, 26 Sep 2000 08:02:17 +0000
Subject: 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.

---
 x11-toolkits/ruby-fltk/Makefile | 4 +---
 x11-toolkits/ruby-gtk/Makefile  | 4 +---
 x11-toolkits/ruby-gtk2/Makefile | 4 +---
 x11-toolkits/ruby-qt/Makefile   | 4 +---
 x11-toolkits/ruby-qt2/Makefile  | 4 +---
 x11-toolkits/ruby-tk/Makefile   | 1 -
 x11-toolkits/ruby14-tk/Makefile | 1 -
 7 files changed, 5 insertions(+), 17 deletions(-)

(limited to 'x11-toolkits')

diff --git a/x11-toolkits/ruby-fltk/Makefile b/x11-toolkits/ruby-fltk/Makefile
index 25907fdb7023..8d96320d11d7 100644
--- a/x11-toolkits/ruby-fltk/Makefile
+++ b/x11-toolkits/ruby-fltk/Makefile
@@ -38,6 +38,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.jp ${RUBY_DOCDIR}/fltk/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/x11-toolkits/ruby-gtk/Makefile b/x11-toolkits/ruby-gtk/Makefile
index 2b7f8114137e..e992ce9b8c04 100644
--- a/x11-toolkits/ruby-gtk/Makefile
+++ b/x11-toolkits/ruby-gtk/Makefile
@@ -52,6 +52,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/api-ja/* ${RUBY_DOCDIR}/gtk/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/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile
index 2b7f8114137e..e992ce9b8c04 100644
--- a/x11-toolkits/ruby-gtk2/Makefile
+++ b/x11-toolkits/ruby-gtk2/Makefile
@@ -52,6 +52,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/api-ja/* ${RUBY_DOCDIR}/gtk/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/x11-toolkits/ruby-qt/Makefile b/x11-toolkits/ruby-qt/Makefile
index 22e2056580a3..2244913694be 100644
--- a/x11-toolkits/ruby-qt/Makefile
+++ b/x11-toolkits/ruby-qt/Makefile
@@ -54,6 +54,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.jp ${RUBY_DOCDIR}/qt/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/x11-toolkits/ruby-qt2/Makefile b/x11-toolkits/ruby-qt2/Makefile
index 22e2056580a3..2244913694be 100644
--- a/x11-toolkits/ruby-qt2/Makefile
+++ b/x11-toolkits/ruby-qt2/Makefile
@@ -54,6 +54,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README.jp ${RUBY_DOCDIR}/qt/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/x11-toolkits/ruby-tk/Makefile b/x11-toolkits/ruby-tk/Makefile
index a9ffb4226c5c..6cf0fed4418c 100644
--- a/x11-toolkits/ruby-tk/Makefile
+++ b/x11-toolkits/ruby-tk/Makefile
@@ -30,7 +30,6 @@ TCLTKLIB_CATEGORY?=	lang
 .endif
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
 
 .if defined(PKGNAMEPREFIX)
 PKGNAMEPREFIX:=	${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX}
diff --git a/x11-toolkits/ruby14-tk/Makefile b/x11-toolkits/ruby14-tk/Makefile
index 46a1952871bb..49d80e9561db 100644
--- a/x11-toolkits/ruby14-tk/Makefile
+++ b/x11-toolkits/ruby14-tk/Makefile
@@ -32,7 +32,6 @@ TCLTKLIB_CATEGORY?=	lang
 .endif
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
 
 .if defined(PKGNAMEPREFIX)
 PKGNAMEPREFIX:=	${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX}
-- 
cgit v1.2.3