23 files changed, 25 insertions, 40 deletions

diff --git a/irc/anope/Makefile b/irc/anope/Makefile
index df027b00f02f..8264ebd94c26 100644
--- a/irc/anope/Makefile
+++ b/irc/anope/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	anope
 PORTVERSION=	1.8.2
 CATEGORIES=	irc
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/Anope%20${PORTVERSION}
 
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	A set of IRC services for IRC networks
diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index 9c473fe4278c..43f7d36ec806 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	BitchX
 PORTVERSION=	1.1.0.1
 PORTREVISION=	4
 CATEGORIES+=	irc
-MASTER_SITES=	SF
+MASTER_SITES=	SF/bitchx/ircii-pana/ircii-pana-1.1
 DISTNAME=	ircii-pana-1.1-final
 
 MAINTAINER?=	beech@FreeBSD.org
diff --git a/irc/dancer/Makefile b/irc/dancer/Makefile
index 0dafbde72768..48e1d9702fc9 100644
--- a/irc/dancer/Makefile
+++ b/irc/dancer/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	dancer
 PORTVERSION=	4.16
 PORTREVISION=	1
 CATEGORIES=	irc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An IRC bot written in C for UNIX, Windows, and AmigaOS
diff --git a/irc/gruftistats/Makefile b/irc/gruftistats/Makefile
index 5c914e43176e..ddf718d2359d 100644
--- a/irc/gruftistats/Makefile
+++ b/irc/gruftistats/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gruftistats
 PORTVERSION=	0.2.4
 PORTREVISION=	1
 CATEGORIES=	irc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gruftistats
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Produces a web page of statistics and quotes from IRC channel logs
diff --git a/irc/hybserv/Makefile b/irc/hybserv/Makefile
index c2da60312b81..988222ced723 100644
--- a/irc/hybserv/Makefile
+++ b/irc/hybserv/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	hybserv
 PORTVERSION=	1.9.3
 CATEGORIES=	irc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	hybserv2
+MASTER_SITES=	SF/${PORTNAME}2/${PORTNAME}2/Hybserv%20${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HybServ2 IRCD Services
diff --git a/irc/ircd-hybrid-ru/Makefile b/irc/ircd-hybrid-ru/Makefile
index d10f851b9e78..c12bd694a7d7 100644
--- a/irc/ircd-hybrid-ru/Makefile
+++ b/irc/ircd-hybrid-ru/Makefile
@@ -8,9 +8,9 @@
 PORTNAME=	ircd
 PORTVERSION=	7.2.2
 CATEGORIES=	irc russian
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF/${PORTNAME}-hybrid-ru/${PORTNAME}-hybrid-ru/${PORTNAME}-hybrid-ru-${PORTVERSION} \
 		ftp://rusunix.org/pub/FreeBSD/distfiles/
-MASTER_SITE_SUBDIR=	ircd-hybrid-ru
+
 PKGNAMESUFFIX=	-hybrid-ru
 DISTNAME=	ircd-hybrid-ru-${PORTVERSION}
 
diff --git a/irc/ircproxy/Makefile b/irc/ircproxy/Makefile
index 9269db8590be..ac905634a4fa 100644
--- a/irc/ircproxy/Makefile
+++ b/irc/ircproxy/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	ircproxy
 PORTVERSION=	1.3.3c
 PORTREVISION=	1
 CATEGORIES=	irc
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jonas@night-light.net
 COMMENT=	An IRC proxy/bouncer daemon
diff --git a/irc/iroffer-lamm/Makefile b/irc/iroffer-lamm/Makefile
index dd1ac81f6fce..cf1e4342f39b 100644
--- a/irc/iroffer-lamm/Makefile
+++ b/irc/iroffer-lamm/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	iroffer
 PORTVERSION=	1.4.3.2
 CATEGORIES=	irc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	iroffer-lamm
+MASTER_SITES=	SF/${PORTNAME}-lamm/${PORTNAME}1.4-lamm/${PORTNAME}1.4.b03-lamm.b02
 PKGNAMESUFFIX=	-lamm${PKGNAMESUFFIX2}
 DISTNAME=	iroffer1.4.b03-lamm.b02
 EXTRACT_SUFX=	.tgz
diff --git a/irc/kmyirc/Makefile b/irc/kmyirc/Makefile
index 8d495abd3d04..5316b8f07e38 100644
--- a/irc/kmyirc/Makefile
+++ b/irc/kmyirc/Makefile
@@ -8,8 +8,7 @@ PORTNAME=		kmyirc
 PORTVERSION=		0.2.9
 PORTREVISION=	8
 CATEGORIES=		irc kde
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}-alpha/${PORTVERSION}
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Easy to use IRC client for KDE
diff --git a/irc/kwirc/Makefile b/irc/kwirc/Makefile
index dc158c67f8f0..afaafc549b7d 100644
--- a/irc/kwirc/Makefile
+++ b/irc/kwirc/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	kwirc
 PORTVERSION=	0.1.0
 PORTREVISION=	7
 CATEGORIES=	irc kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20_sexybaby_
 
 MAINTAINER=	markus@FreeBSD.org
 COMMENT=	IRC client for KDE
diff --git a/irc/lostirc/Makefile b/irc/lostirc/Makefile
index 383a7e4b2015..7767b8eabdef 100644
--- a/irc/lostirc/Makefile
+++ b/irc/lostirc/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	6
 CATEGORIES=	irc
 MASTER_SITES=	SF \
 		http://demian.dyndns.org/src/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple and minimal IRC client for X
diff --git a/irc/muh/Makefile b/irc/muh/Makefile
index e4d168ad7bf1..9dffb98a5fc8 100644
--- a/irc/muh/Makefile
+++ b/irc/muh/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	muh
 PORTVERSION=	2.2a
 CATEGORIES=	irc ipv6
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=muh
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A smart irc-bouncing-tool that remains on IRC all the time
diff --git a/irc/nefarious/Makefile b/irc/nefarious/Makefile
index 3725e4c563c6..bbf39737ed40 100644
--- a/irc/nefarious/Makefile
+++ b/irc/nefarious/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	Nefarious
 PORTVERSION=	1.2.0
 CATEGORIES=	irc
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	evilnet
+MASTER_SITES=	SF/evilnet/${PORTNAME}%20IRCu/${PORTVERSION}
 
 MAINTAINER=	scjamorim@bsd.com.br
 COMMENT=	IRC server used by evilnet based off of Undernet\'s ircu
diff --git a/irc/py-irclib/Makefile b/irc/py-irclib/Makefile
index 0e2c18491a65..63b5a8a8dc60 100644
--- a/irc/py-irclib/Makefile
+++ b/irc/py-irclib/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	irclib
 PORTVERSION=	0.4.8
 CATEGORIES=	irc python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	python-irclib
+MASTER_SITES=	SF/python-${PORTNAME}/python-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	python-irclib-${PORTVERSION}
 
diff --git a/irc/py-supybot-plugins/Makefile b/irc/py-supybot-plugins/Makefile
index 35160a64e478..a8d6d86f8d4d 100644
--- a/irc/py-supybot-plugins/Makefile
+++ b/irc/py-supybot-plugins/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	supybot-plugins
 PORTVERSION=	20060723
 PORTREVISION=	1
 CATEGORIES=	irc python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	supybot
+MASTER_SITES=	SF/supybot/OldFiles
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Supybot-plugins-${PORTVERSION}
 
diff --git a/irc/py-supybot/Makefile b/irc/py-supybot/Makefile
index adcbda069da1..73e3ba9acc45 100644
--- a/irc/py-supybot/Makefile
+++ b/irc/py-supybot/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	supybot
 PORTVERSION=	0.83.4.1
 CATEGORIES=	irc python
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Supybot-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Supybot-${PORTVERSION}
 
diff --git a/irc/solid-ircd/Makefile b/irc/solid-ircd/Makefile
index 33da87adb61e..653cd4656e52 100644
--- a/irc/solid-ircd/Makefile
+++ b/irc/solid-ircd/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	solid-ircd
 PORTVERSION=	3.4.8
 CATEGORIES=	irc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=solidircd
+MASTER_SITES=	SF/solidircd/Solid-Stable/solidircd-stable.${PORTVERSION}
 DISTNAME=	solidircd-stable3.4.8
 
 MAINTAINER=	systemoperator@gmail.com
diff --git a/irc/talksoup/Makefile b/irc/talksoup/Makefile
index 43ba127cc09a..7061797e3c18 100644
--- a/irc/talksoup/Makefile
+++ b/irc/talksoup/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	talksoup
 PORTVERSION=	1.0
 PORTREVISION=	2
 CATEGORIES=	irc gnustep
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}alpha
 DISTNAME=	TalkSoup-${PORTVERSION}alpha
 
 MAINTAINER=	dinoex@FreeBSD.org
diff --git a/irc/tr-ircd/Makefile b/irc/tr-ircd/Makefile
index fa1ce07d11ce..76e27e1e19f1 100644
--- a/irc/tr-ircd/Makefile
+++ b/irc/tr-ircd/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	tr-ircd
 PORTVERSION=	5.7.3
 PORTREVISION=	1
 CATEGORIES=	irc ipv6
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-ircd/trircd-${PORTVERSION}-release
 DISTNAME=	${PORTNAME:S/-//}-release-${PORTVERSION}-r
 
 MAINTAINER=	mm@FreeBSD.org
diff --git a/irc/undernet-ircu/Makefile b/irc/undernet-ircu/Makefile
index 1e3072a86c7f..6122e7ec4a5d 100644
--- a/irc/undernet-ircu/Makefile
+++ b/irc/undernet-ircu/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	undernet-ircu
 PORTVERSION=	2.10.12.12
 CATEGORIES=	irc net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	undernet-ircu
+MASTER_SITES=	SF/${PORTNAME}/ircu/ircu${PORTVERSION}
 DISTNAME=	ircu${PORTVERSION}
 
 MAINTAINER=	weaseal@users.sourceforge.net
diff --git a/irc/xchat-ruby/Makefile b/irc/xchat-ruby/Makefile
index d071217e6071..c1227ff0a912 100644
--- a/irc/xchat-ruby/Makefile
+++ b/irc/xchat-ruby/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=	ruby
 PORTVERSION=	1.2
 CATEGORIES=	irc ruby
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
+MASTER_SITES=	SF/xchat-${PORTNAME}/xchat-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	xchat-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}-src
 
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index 0ff435bf436c..6a961b28d74a 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -10,9 +10,9 @@ PORTNAME=	xchat
 PORTVERSION=	2.8.6
 PORTREVISION=	3
 CATEGORIES=	irc gnome ipv6
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF \
 		http://xchat.org/files/source/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An X11 IRC client using the GTK+ 2 toolkit
diff --git a/irc/znc-extra/Makefile b/irc/znc-extra/Makefile
index d8bbdfbf2521..23be2e94418b 100644
--- a/irc/znc-extra/Makefile
+++ b/irc/znc-extra/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	znc-extra
 PORTVERSION=	0.070
 CATEGORIES=	irc
-MASTER_SITES=	SF/znc
+MASTER_SITES=	SF/znc/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	terry@sucked-in.com
 COMMENT=	ZNC-Extra package for ZNC Bouner