18 files changed, 16 insertions, 70 deletions

diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 8d2f713a0f1f..bb63907077b5 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -67,7 +67,6 @@ MASTER_SITE_APACHE+= \
 	ftp://ftp.forthnet.gr/pub/www/apache/%SUBDIR%/ \
 	ftp://xenia.sote.hu/pub/mirrors/www.apache.org/%SUBDIR%/ \
 	ftp://ftp.heanet.ie/mirrors/www.apache.org/dist/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/apache/&,} \
 	ftp://ftp.sunet.se/pub/www/servers/apache/dist/%SUBDIR%/ \
 	http://mirrors.ircam.fr/pub/apache/%SUBDIR%/
 .endif
@@ -147,7 +146,6 @@ MASTER_SITE_DEBIAN_NON_US+= \
 	ftp://ftp.is.debian.org/debian-non-US/%SUBDIR%/ \
 	ftp://ftp.it.debian.org/debian-non-US/%SUBDIR%/ \
 	ftp://ftp.jp.debian.org/debian-non-US/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,linux/debian/debian-non-US/&,} \
 	ftp://ftp.nl.debian.org/debian-non-US/%SUBDIR%/ \
 	ftp://ftp.no.debian.org/debian-non-US/%SUBDIR%/ \
 	ftp://ftp.pl.debian.org/debian-non-US/%SUBDIR%/ \
@@ -577,7 +575,6 @@ MASTER_SITE_GNOME+= \
 	ftp://ftp.dti.ad.jp/pub/X/gnome/%SUBDIR%/ \
 	http://linorg.usp.br/gnome/%SUBDIR%/ \
 	http://mirror.aarnet.edu.au/pub/gnome/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,X/gnome/&,} \
 	ftp://ftp.kddlabs.co.jp/pub/GNOME/%SUBDIR%/ \
 	ftp://ftp.mirrorservice.org/sites/ftp.gnome.org/pub/GNOME/%SUBDIR%/ \
 	ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/%SUBDIR%/ \
@@ -603,7 +600,6 @@ MASTER_SITE_GNU+= \
 	http://mirrors.kernel.org/gnu/%SUBDIR%/ \
 	ftp://ftp.kddlabs.co.jp/GNU/%SUBDIR%/ \
 	ftp://ftp.dti.ad.jp/pub/GNU/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,GNU/&,} \
 	ftp://ftp.mirrorservice.org/sites/ftp.gnu.org/gnu/%SUBDIR%/ \
 	ftp://ftp.informatik.hu-berlin.de/pub/gnu/gnu/%SUBDIR%/ \
 	ftp://ftp.informatik.rwth-aachen.de/pub/mirror/ftp.gnu.org/pub/gnu/%SUBDIR%/ \
@@ -762,7 +758,6 @@ MASTER_SITE_KDE+= \
 	http://kde-mirror.freenux.org/%SUBDIR%/ \
 	http://ftp.fi.muni.cz/pub/kde/%SUBDIR%/ \
 	ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/ftp.kde.org/pub/kde/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,X/kde/&,} \
 	ftp://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/%SUBDIR%/ \
 	http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/%SUBDIR%/
 .endif
@@ -821,7 +816,6 @@ MASTER_SITE_MOZILLA+= \
 	ftp://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/ \
 	ftp://ftp.fh-wolfenbuettel.de/pub/www/mozilla/%SUBDIR%/ \
 	ftp://ftp.informatik.rwth-aachen.de/pub/mirror/ftp.mozilla.org/pub/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/mozilla/&,} \
 	http://ftp.twaren.net/Unix/Mozilla/%SUBDIR%/
 .endif
 
@@ -888,7 +882,6 @@ MASTER_SITE_NETBSD+= \
 	ftp://sunsite.uio.no/bsd/unix/NetBSD/packages/distfiles/%SUBDIR%/ \
 	ftp://ftp.sunet.se/pub/NetBSD/packages/distfiles/%SUBDIR%/ \
 	ftp://ftp.demon.co.uk/pub/mirrors/NetBSD/packages/distfiles/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,NetBSD/packages/distfiles/&,} \
 	ftp://ftp.dti.ad.jp/pub/NetBSD/packages/distfiles/%SUBDIR%/ \
 	ftp://ftp.funet.fi/pub/NetBSD/packages/distfiles/%SUBDIR%/
 .endif
@@ -1037,8 +1030,7 @@ MASTER_SITE_PHP+= \
 	http://uk3.php.net/%SUBDIR%/ \
 	http://us2.php.net/%SUBDIR%/ \
 	http://br.php.net/%SUBDIR%/ \
-	http://cn.php.net/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/php/&,}
+	http://cn.php.net/%SUBDIR%/
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_PYTHON)
@@ -1083,31 +1075,6 @@ MASTER_SITE_REDHAT_LINUX+= \
 	ftp://ftp.kddlabs.co.jp/pub/Linux/packages/RedHat/redhat/linux/%SUBDIR%/
 .endif
 
-#
-# RingServers in Japan
-#
-#
-# Note: If you know which of the RingServers is nearest to you,
-# please specify it in your /etc/make.conf. (The server list is
-# available at http://www.ring.gr.jp/)
-#
-# You can choose either http or ftp to access to a server:
-#
-#	http://<server>/archives/%SUBDIR%/
-#	ftp://<server>/pub/%SUBDIR%/
-#
-# {www,ftp}.dnsbalance.ring.gr.jp redirects requests to one of the
-# least busy servers at the moment at the DNS lookup level. (safe to
-# use with "fetch -A")
-#
-# {www,ftp}.t.ring.gr.jp redirects requests to one of the nearest
-# servers at the DNS lookup level. (safe to use with "fetch -A")
-#
-.if !defined(IGNORE_MASTER_SITE_RINGSERVER)
-MASTER_SITE_RINGSERVER+= \
-	http://ring.nict.go.jp/archives/%SUBDIR%/
-.endif
-
 .if !defined(IGNORE_MASTER_SITE_RUBY)
 MASTER_SITE_RUBY+= \
 	http://cache.ruby-lang.org/pub/ruby/%SUBDIR%/ \
@@ -1115,7 +1082,6 @@ MASTER_SITE_RUBY+= \
 	ftp://ftp.SpringDaemons.com/pub/ruby/ruby/%SUBDIR%/ \
 	http://www.ibiblio.org/pub/languages/ruby/%SUBDIR%/ \
 	ftp://xyz.lcs.mit.edu/pub/ruby/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,lang/ruby/&,} \
 	ftp://ftp.fu-berlin.de/unix/languages/ruby/%SUBDIR%/ \
 	ftp://ftp.easynet.be/ruby/ruby/%SUBDIR%/ \
 	ftp://ftp.ntua.gr/pub/lang/ruby/%SUBDIR%/ \
@@ -1136,8 +1102,7 @@ MASTER_SITE_SAMBA+= \
 	http://ftp.samba.org/pub/%SUBDIR%/ \
 	ftp://ca.samba.org/pub/%SUBDIR%/ \
 	ftp://de.samba.org/pub/%SUBDIR%/ \
-	ftp://ftp.easynet.be/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/samba/&,}
+	ftp://ftp.easynet.be/%SUBDIR%/
 .endif
 
 # List:	http://download.savannah.gnu.org/mirmon/
@@ -1241,7 +1206,6 @@ MASTER_SITE_TEX_CTAN+= \
 	ftp://ftp.kddlabs.co.jp/CTAN/%SUBDIR%/ \
 	ftp://ctan.tug.org/tex-archive/%SUBDIR%/ \
 	ftp://ftp.dante.de/tex-archive/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/CTAN/&,} \
 	ftp://ftp.chg.ru/pub/TeX/CTAN/%SUBDIR%/ \
 	ftp://mirror.macomnet.net/pub/CTAN/%SUBDIR%/ \
 	ftp://ftp.funet.fi/pub/TeX/CTAN/%SUBDIR%/
@@ -1339,8 +1303,7 @@ MASTER_SITE_XCONTRIB+= \
 	ftp://ftp.sunet.se/pub/X11/ftp.x.org/contrib/%SUBDIR%/ \
 	ftp://ftp.dti.ad.jp/pub/X/XFree86/mirror/X.Org/contrib/%SUBDIR%/ \
 	ftp://ftp.kddlabs.co.jp/X11/ftp.x.org/contrib/%SUBDIR%/ \
-	ftp://ftp2.x.org/contrib/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,X/opengroup/contrib/&,}
+	ftp://ftp2.x.org/contrib/%SUBDIR%/
 .endif
 
 .if !defined(IGNORE_MASTER_SITE_XFCE)
diff --git a/audio/guspat/Makefile b/audio/guspat/Makefile
index 690caa075bb0..9af2d2037621 100644
--- a/audio/guspat/Makefile
+++ b/audio/guspat/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	20000706
 PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	ftp://plamo.linet.gr.jp/pub/Plamo-src/contrib/Sound/timidity/ \
-		RINGSERVER/linux/Plamo/Plamo-src/contrib/Sound/timidity \
 		LOCAL/nork
 DISTFILES=	${PORTNAME}-${PORTVERSION}-required${EXTRACT_SUFX} \
 		${PORTNAME}-${PORTVERSION}-optional${EXTRACT_SUFX}
diff --git a/graphics/gimp-data-extras/Makefile b/graphics/gimp-data-extras/Makefile
index af6f6c8c5ebc..cc27eae46efd 100644
--- a/graphics/gimp-data-extras/Makefile
+++ b/graphics/gimp-data-extras/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/grafik/gimp/%SUBDIR%/ \
 		ftp://ftp.fh-heilbronn.de/mirrors/ftp.gimp.org/%SUBDIR%/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
-		http://www.mirrorservice.org/sites/ftp.gimp.org/pub/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/%SUBDIR%,}
+		http://www.mirrorservice.org/sites/ftp.gimp.org/pub/%SUBDIR%/
 MASTER_SITE_SUBDIR=	gimp/extras/
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index 9d093857f4f8..8a783c8d8483 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -24,8 +24,7 @@ CONFIGURE_ARGS=	--enable-shared --enable-static
 USE_LDCONFIG=	yes
 
 MASTER_SITE_IMAGEMAGICK=	\
-	ftp://ftp.imagemagick.org/pub/%SUBDIR%/ \
-	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/&,}
+	ftp://ftp.imagemagick.org/pub/%SUBDIR%/
 
 OPTIONS_DEFINE= OPENGL UUID DOCS
 UUID_DESC=	UUID support (required by GDAL)
diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile
index f40f29c61058..be7fbd9f3e61 100644
--- a/graphics/povray36/Makefile
+++ b/graphics/povray36/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	3.6.1
 PORTREVISION=	13
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
-		ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/povray/%SUBDIR%,}
+		ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/
 MASTER_SITE_SUBDIR=	Official/Unix
 PKGNAMESUFFIX=	36
 DIST_SUBDIR=	povray36
diff --git a/japanese/skk-tools/Makefile b/japanese/skk-tools/Makefile
index 92067bee8e2e..3f958d045f25 100644
--- a/japanese/skk-tools/Makefile
+++ b/japanese/skk-tools/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	skk-tools
 PORTVERSION=	1.3.3
 PORTEPOCH=	1
 CATEGORIES=	japanese
-MASTER_SITES=	RINGSERVER/elisp/skk/tools \
-		http://openlab.ring.gr.jp/skk/tools/
+MASTER_SITES=	http://openlab.ring.gr.jp/skk/tools/
 DISTNAME=	skktools-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 0d57e6b378b1..e51e627e73b0 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	sendmail
 PORTVERSION=	8.15.1
 CATEGORIES=	mail ipv6
-MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/sendmail/&,}
+MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/
 PKGNAMESUFFIX?=	${TLS_SUFFIX}${SASL_SUFFIX}${LDAP_SUFFIX}${BDB_SUFFIX}${PKGNAMESUFFIX2}
 DISTNAME=	${PORTNAME}.${PORTVERSION}
 
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index 22c3ce221589..1371c421a99d 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=	2.14.0
 PORTREVISION=	16
 CATEGORIES=	mail elisp
 MASTER_SITES=	ftp://ftp.gohome.org/wl/stable/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/elisp/wl/stable/&,} \
 		http://www.jpl.org/elips/wl/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	wl-${PORTVERSION}
diff --git a/misc/gimp-help-en/Makefile b/misc/gimp-help-en/Makefile
index 4ecb8abe06ca..6d61a5d1fe63 100644
--- a/misc/gimp-help-en/Makefile
+++ b/misc/gimp-help-en/Makefile
@@ -8,8 +8,7 @@ CATEGORIES?=	misc graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		http://gimp.mirrors.hoobly.com/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/grafik/gimp/%SUBDIR%/ \
-		http://www.mirrorservice.org/sites/ftp.gimp.org/pub/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/%SUBDIR%,}
+		http://www.mirrorservice.org/sites/ftp.gimp.org/pub/%SUBDIR%/
 MASTER_SITE_SUBDIR=	gimp/help
 PKGNAMEPREFIX?=	${DOCLANG}-
 PKGNAMESUFFIX=	-html
diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index c28700099baf..dbd9b41f22d1 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -57,8 +57,7 @@ CAIRO_CONFIGURE_WITH=	cairo
 .if ${PORT_OPTIONS:MFREETYPE}
 MASTER_SITES+=	http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/:freetype \
 		http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype2/:freetype \
-		http://ftp.sunet.se/pub/text-processing/freetype/freetype2/:freetype \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/freetype/&,}:freetype \
+		http://ftp.sunet.se/pub/text-processing/freetype/freetype2/:freetype
 		ftp://ftp.freetype.org/freetype/freetype2/:freetype
 FREETYPE_VERSION=	2.5.5
 FREETYPE_SRC=	freetype-${FREETYPE_VERSION}.tar.bz2
diff --git a/print/freetype/Makefile b/print/freetype/Makefile
index 938af7c2deb5..f1c51f5b9e34 100644
--- a/print/freetype/Makefile
+++ b/print/freetype/Makefile
@@ -9,7 +9,6 @@ MASTER_SITES=	SF \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype1/ \
 		http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype1/ \
 		http://ftp.sunet.se/pub/text-processing/freetype/freetype1/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/freetype/&,} \
 		ftp://ftp.freetype.org/freetype/freetupe1/
 
 MAINTAINER=	doceng@FreeBSD.org
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index 26d89608781e..573b63e49ea1 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -9,7 +9,6 @@ MASTER_SITES=	http://savannah.nongnu.org/download/freetype/ \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \
 		http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype2/ \
 		http://ftp.sunet.se/pub/text-processing/freetype/freetype2/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/freetype/&,} \
 		ftp://ftp.freetype.org/freetype/freetype2/
 DISTNAME=	${PORTNAME:S/2//}-${PORTVERSION}
 
diff --git a/print/ft2demos/Makefile b/print/ft2demos/Makefile
index 2637b0d8534c..6bf2fb3cb5b9 100644
--- a/print/ft2demos/Makefile
+++ b/print/ft2demos/Makefile
@@ -4,8 +4,7 @@
 PORTNAME=	ft2demos
 PORTVERSION=	2.5.5
 CATEGORIES=	print
-MASTER_SITES=	SF/freetype/freetype-demos/${PORTVERSION} \
-		RINGSERVER/graphics/freetype/freetype2
+MASTER_SITES=	SF/freetype/freetype-demos/${PORTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Demo programs for FreeType2
diff --git a/sysutils/am-utils/Makefile b/sysutils/am-utils/Makefile
index 113567920438..361020fc8376 100644
--- a/sysutils/am-utils/Makefile
+++ b/sysutils/am-utils/Makefile
@@ -7,8 +7,7 @@ PORTEPOCH=	1
 CATEGORIES=	sysutils net
 MASTER_SITES=	ftp://ftp.am-utils.org/pub/am-utils/ \
 		ftp://ftp.cs.umn.edu/pub/am-utils/ \
-		ftp://ftp.u-aizu.ac.jp/pub/net/amd/am-utils/ \
-		RINGSERVER/net/am-utils
+		ftp://ftp.u-aizu.ac.jp/pub/net/amd/am-utils/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Berkeley Automounter Suite of Utilities
diff --git a/sysutils/linrename/Makefile b/sysutils/linrename/Makefile
index af32546a2bd5..1cf2352f15c1 100644
--- a/sysutils/linrename/Makefile
+++ b/sysutils/linrename/Makefile
@@ -7,8 +7,7 @@ CATEGORIES=	sysutils
 #MASTER_SITES=	KERNEL_ORG/linux/utils/util-linux/v${PORTVERSION}
 MASTER_SITES=	http://ftp.ntu.edu.tw/ftp/linux/%SUBDIR%/ \
 		http://ftp.sunet.se/pub/Linux/kernel.org/linux/%SUBDIR%/ \
-		http://kernel.org/pub/linux/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,linux/kernel.org/&,}
+		http://kernel.org/pub/linux/%SUBDIR%/
 MASTER_SITE_SUBDIR=	utils/util-linux/v${PORTVERSION:R}
 DISTNAME=	util-linux-${PORTVERSION}
 
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index a18afa66689c..6950c22a5461 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -11,8 +11,7 @@ MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/ \
 		http://mirrors.pmmf.hu/mirror/opera/linux/${OPERA_VER:S/.//}/ \
 		ftp://ftp.task.gda.pl/pub/opera/linux/${OPERA_VER:S/.//}/ \
 		ftp://ftp.planetmirror.com/pub/opera/linux/${OPERA_VER:S/.//}/ \
-		http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}/&,}
+		http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}/
 PKGNAMEPREFIX=	linux-
 DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.i386.linux
 
diff --git a/www/opera-linuxplugins/Makefile b/www/opera-linuxplugins/Makefile
index bce1bc37de20..29b866f4f2eb 100644
--- a/www/opera-linuxplugins/Makefile
+++ b/www/opera-linuxplugins/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES=	ftp://opera.inode.at/${MASTER_SITES_VER_PATH}/ \
 		ftp://opera.ftp.fu-berlin.de/${MASTER_SITES_VER_PATH}/ \
 		http://ftp.ntua.gr/pub/www/Opera/${MASTER_SITES_VER_PATH}/ \
 		http://mirrors.dedipower.com/opera/${MASTER_SITES_VER_PATH}/ \
-		ftp://ftp.tiscali.nl/pub/mirrors/opera/${MASTER_SITES_VER_PATH}/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/${MASTER_SITES_VER_PATH}&,}/
+		ftp://ftp.tiscali.nl/pub/mirrors/opera/${MASTER_SITES_VER_PATH}/
 PKGNAMESUFFIX=	-linuxplugins
 DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.i386.linux
 
diff --git a/www/opera/Makefile b/www/opera/Makefile
index 0127609b1f3c..15df0ece5442 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES=	ftp://ftp.opera.com/pub/opera/${MASTER_SITES_VER_PATH}/ \
 		ftp://opera.ftp.fu-berlin.de/${MASTER_SITES_VER_PATH}/ \
 		http://ftp.ntua.gr/pub/www/Opera/${MASTER_SITES_VER_PATH}/ \
 		http://mirrors.dedipower.com/opera/${MASTER_SITES_VER_PATH}/ \
-		ftp://ftp.tiscali.nl/pub/mirrors/opera/${MASTER_SITES_VER_PATH}/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/${MASTER_SITES_VER_PATH}&,}/
+		ftp://ftp.tiscali.nl/pub/mirrors/opera/${MASTER_SITES_VER_PATH}/
 DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.${ARCH}.freebsd
 
 MAINTAINER=	ak@FreeBSD.org