Use MASTER_SITE_RUBY.

7 files changed, 14 insertions, 52 deletions

diff --git a/lang/ruby-man/Makefile b/lang/ruby-man/Makefile
index 21407379cfc7..f0f238a2cf33 100644
--- a/lang/ruby-man/Makefile
+++ b/lang/ruby-man/Makefile
@@ -8,12 +8,8 @@
 PORTNAME=	ruby-man
 PORTVERSION=	1.4.6
 CATEGORIES+=	lang ruby
-MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/doc/ \
-		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/doc/ \
-		ftp://ftp.iij.ad.jp/pub/lang/ruby/doc/ \
-		ftp://blade.nagaokaut.ac.jp/pub/lang/ruby/doc/ \
-		ftp://ftp.krnet.ne.jp/pub/ruby/doc/ \
-		ftp://mirror.nucba.ac.jp/mirror/ruby/doc/
+MASTER_SITES=	${MASTER_SITE_RUBY}
+MASTER_SITE_SUBDIR=	doc
 DISTNAME=	${PORTNAME}-${PORTVERSION}${LANGSUFFIX}
 
 MAINTAINER=	olgeni@uli.it
diff --git a/lang/ruby-tcltklib/Makefile b/lang/ruby-tcltklib/Makefile
index d179c08eb2d6..69aaf6ed7a94 100644
--- a/lang/ruby-tcltklib/Makefile
+++ b/lang/ruby-tcltklib/Makefile
@@ -8,12 +8,8 @@
 PORTNAME=	rubytk
 PORTVERSION=	1.4.6
 CATEGORIES+=	x11-toolkits ruby
-MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
-		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \
-		ftp://ftp.iij.ad.jp/pub/lang/ruby/${BRANCH_NAME}/ \
-		ftp://blade.nagaokaut.ac.jp/pub/lang/ruby/${BRANCH_NAME}/ \
-		ftp://ftp.krnet.ne.jp/pub/ruby/${BRANCH_NAME}/ \
-		ftp://mirror.nucba.ac.jp/mirror/ruby/${BRANCH_NAME}/
+MASTER_SITES=	${MASTER_SITE_RUBY}
+MASTER_SITE_SUBDIR=	1.4
 DISTNAME=	ruby-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
@@ -34,8 +30,6 @@ CONFIGURE_ARGS=	--with-tcllib="${TCL_LIB}" --with-tklib="${TK_LIB}" \
 		--with-X11-dir="${X11BASE}"
 PLIST_SUB+=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 
-BRANCH_NAME=	1.4
-
 RUBY_VER?=	1.4
 RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
 
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index e9383d26166c..794ac7c996f2 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -8,12 +8,8 @@
 PORTNAME=	ruby
 PORTVERSION=	1.4.6
 CATEGORIES=	lang ruby ipv6
-MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
-		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \
-		ftp://ftp.iij.ad.jp/pub/lang/ruby/${BRANCH_NAME}/ \
-		ftp://blade.nagaokaut.ac.jp/pub/lang/ruby/${BRANCH_NAME}/ \
-		ftp://ftp.krnet.ne.jp/pub/ruby/${BRANCH_NAME}/ \
-		ftp://mirror.nucba.ac.jp/mirror/ruby/${BRANCH_NAME}/
+MASTER_SITES=	${MASTER_SITE_RUBY}
+MASTER_SITE_SUBDIR=	1.4
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	yasuf@bsdclub.org
@@ -27,8 +23,6 @@ PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 RUBY_VER?=	1.4
 RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
 
-BRANCH_NAME=	1.4
-
 DOCDIR=		${PREFIX}/share/doc/ruby
 EXAMPLESDIR=	${PREFIX}/share/examples/ruby
 
diff --git a/lang/ruby14-irb/Makefile b/lang/ruby14-irb/Makefile
index 5cc7d029fcfa..37b0269b9f16 100644
--- a/lang/ruby14-irb/Makefile
+++ b/lang/ruby14-irb/Makefile
@@ -8,12 +8,8 @@
 PORTNAME=	irb
 PORTVERSION=	0.6.1
 CATEGORIES=	lang ruby
-MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/contrib/ \
-		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/contrib/ \
-		ftp://ftp.iij.ad.jp/pub/lang/ruby/contrib/ \
-		ftp://blade.nagaokaut.ac.jp/pub/lang/ruby/contrib/ \
-		ftp://ftp.krnet.ne.jp/pub/ruby/contrib/ \
-		ftp://mirror.nucba.ac.jp/mirror/ruby/contrib/
+MASTER_SITES=	${MASTER_SITE_RUBY}
+MASTER_SITE_SUBDIR=	contrib
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	ruby
 
diff --git a/lang/ruby14-tcltklib/Makefile b/lang/ruby14-tcltklib/Makefile
index d179c08eb2d6..69aaf6ed7a94 100644
--- a/lang/ruby14-tcltklib/Makefile
+++ b/lang/ruby14-tcltklib/Makefile
@@ -8,12 +8,8 @@
 PORTNAME=	rubytk
 PORTVERSION=	1.4.6
 CATEGORIES+=	x11-toolkits ruby
-MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
-		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \
-		ftp://ftp.iij.ad.jp/pub/lang/ruby/${BRANCH_NAME}/ \
-		ftp://blade.nagaokaut.ac.jp/pub/lang/ruby/${BRANCH_NAME}/ \
-		ftp://ftp.krnet.ne.jp/pub/ruby/${BRANCH_NAME}/ \
-		ftp://mirror.nucba.ac.jp/mirror/ruby/${BRANCH_NAME}/
+MASTER_SITES=	${MASTER_SITE_RUBY}
+MASTER_SITE_SUBDIR=	1.4
 DISTNAME=	ruby-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
@@ -34,8 +30,6 @@ CONFIGURE_ARGS=	--with-tcllib="${TCL_LIB}" --with-tklib="${TK_LIB}" \
 		--with-X11-dir="${X11BASE}"
 PLIST_SUB+=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 
-BRANCH_NAME=	1.4
-
 RUBY_VER?=	1.4
 RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
 
diff --git a/lang/ruby14/Makefile b/lang/ruby14/Makefile
index e9383d26166c..794ac7c996f2 100644
--- a/lang/ruby14/Makefile
+++ b/lang/ruby14/Makefile
@@ -8,12 +8,8 @@
 PORTNAME=	ruby
 PORTVERSION=	1.4.6
 CATEGORIES=	lang ruby ipv6
-MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
-		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \
-		ftp://ftp.iij.ad.jp/pub/lang/ruby/${BRANCH_NAME}/ \
-		ftp://blade.nagaokaut.ac.jp/pub/lang/ruby/${BRANCH_NAME}/ \
-		ftp://ftp.krnet.ne.jp/pub/ruby/${BRANCH_NAME}/ \
-		ftp://mirror.nucba.ac.jp/mirror/ruby/${BRANCH_NAME}/
+MASTER_SITES=	${MASTER_SITE_RUBY}
+MASTER_SITE_SUBDIR=	1.4
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	yasuf@bsdclub.org
@@ -27,8 +23,6 @@ PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 RUBY_VER?=	1.4
 RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
 
-BRANCH_NAME=	1.4
-
 DOCDIR=		${PREFIX}/share/doc/ruby
 EXAMPLESDIR=	${PREFIX}/share/examples/ruby
 
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index e9383d26166c..794ac7c996f2 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -8,12 +8,8 @@
 PORTNAME=	ruby
 PORTVERSION=	1.4.6
 CATEGORIES=	lang ruby ipv6
-MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
-		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \
-		ftp://ftp.iij.ad.jp/pub/lang/ruby/${BRANCH_NAME}/ \
-		ftp://blade.nagaokaut.ac.jp/pub/lang/ruby/${BRANCH_NAME}/ \
-		ftp://ftp.krnet.ne.jp/pub/ruby/${BRANCH_NAME}/ \
-		ftp://mirror.nucba.ac.jp/mirror/ruby/${BRANCH_NAME}/
+MASTER_SITES=	${MASTER_SITE_RUBY}
+MASTER_SITE_SUBDIR=	1.4
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	yasuf@bsdclub.org
@@ -27,8 +23,6 @@ PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 RUBY_VER?=	1.4
 RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
 
-BRANCH_NAME=	1.4
-
 DOCDIR=		${PREFIX}/share/doc/ruby
 EXAMPLESDIR=	${PREFIX}/share/examples/ruby