36 files changed, 42 insertions, 37 deletions

diff --git a/news/PicMonger/Makefile b/news/PicMonger/Makefile
index b36eac4c62e8..53a1e89210f6 100644
--- a/news/PicMonger/Makefile
+++ b/news/PicMonger/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	PicMonger
 PORTVERSION=	0.9.6
 PORTREVISION=	7
 CATEGORIES=	news graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=picmonger
+MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An automated USENET (NNTP) picture decoding client
diff --git a/news/fidogate-ds/Makefile b/news/fidogate-ds/Makefile
index c7715a15a71e..cb1957b8347b 100644
--- a/news/fidogate-ds/Makefile
+++ b/news/fidogate-ds/Makefile
@@ -8,8 +8,7 @@ PORTNAME=		fidogate
 PORTVERSION=		5.1.7
 PORTREVISION=		1
 CATEGORIES=		news mail
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	rusfidogate
+MASTER_SITES=		SF/rus${PORTNAME}/${PORTNAME}-stable/${PORTNAME}%20${PORTVERSION}ds
 PKGNAMESUFFIX=		-ds
 DISTNAME=		fidogate${PORTVERSION}ds
 
diff --git a/news/golded+/Makefile b/news/golded+/Makefile
index 04fe823f01c1..da0aa94ea5c1 100644
--- a/news/golded+/Makefile
+++ b/news/golded+/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	golded+
 PORTVERSION=	1.1.5.a${SNAPDATE}
 CATEGORIES=	news mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=golded-plus
+MASTER_SITES=	SF/golded-plus/golded-plus-src/Snapshot%20of%20the%201.1.5
 DISTNAME=	gps${SNAPDATE:S,^200,,}
 SNAPDATE=	20070503
 EXTRACT_SUFX=	.tb2
diff --git a/news/grn/Makefile b/news/grn/Makefile
index 534277503470..aa7ca3dd3537 100644
--- a/news/grn/Makefile
+++ b/news/grn/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	grn
 PORTVERSION=	0.0.28
 PORTREVISION=	6
 CATEGORIES=	news gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/pre-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A NNTP client for Gnome
diff --git a/news/husky-base-devel/Makefile b/news/husky-base-devel/Makefile
index 6cb6ae7071de..70cb3abacf19 100644
--- a/news/husky-base-devel/Makefile
+++ b/news/husky-base-devel/Makefile
@@ -9,7 +9,9 @@ PORTNAME=	base
 PORTVERSION=	1.4
 PORTREVISION=	1
 CATEGORIES=	news mail
-DISTFILES=	huskybase-${PORTVERSION}-tar.gz
+MASTER_SITES=	SF/husky/huskybase/1.4%20RC4
+DISTNAME=	huskybase-${PORTVERSION}
+EXTRACT_SUFX=	-tar.gz
 
 MAINTAINER=	os@rsu.ru
 COMMENT=	Common files for Husky Fidosoft Project. Development version
diff --git a/news/husky-base-devel/Makefile.inc b/news/husky-base-devel/Makefile.inc
index fa5e08aab1ee..a22052479400 100644
--- a/news/husky-base-devel/Makefile.inc
+++ b/news/husky-base-devel/Makefile.inc
@@ -4,8 +4,6 @@
 
 PKGNAMEPREFIX=	husky-
 PKGNAMESUFFIX=	-devel
-MASTER_SITES?=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	husky
 DIST_SUBDIR=	husky
 
 WRKSRC?=	${WRKDIR}/${PORTNAME}
diff --git a/news/husky-base/Makefile b/news/husky-base/Makefile
index 9eabecbaf4de..d291c8d82271 100644
--- a/news/husky-base/Makefile
+++ b/news/husky-base/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	base
 PORTVERSION=	1.0
 PORTREVISION=	1
 CATEGORIES=	news mail
+MASTER_SITES=	SF/husky/huskybase/${PORTVERSION}
 DISTNAME=	huskybase-${PORTVERSION}-src
 
 MAINTAINER=	fjoe@FreeBSD.org
diff --git a/news/husky-base/Makefile.inc b/news/husky-base/Makefile.inc
index 96e98ea5787e..04ad15031ae4 100644
--- a/news/husky-base/Makefile.inc
+++ b/news/husky-base/Makefile.inc
@@ -3,8 +3,6 @@
 #
 
 PKGNAMEPREFIX=	husky-
-MASTER_SITES?=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	husky
 DIST_SUBDIR=	husky
 
 WRKSRC?=	${WRKDIR}/${PORTNAME}
diff --git a/news/husky-bsopack/Makefile b/news/husky-bsopack/Makefile
index c50b2b1b17da..22c4a0d2295f 100644
--- a/news/husky-bsopack/Makefile
+++ b/news/husky-bsopack/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	bsopack
 PORTVERSION=	0.2.4
 PORTREVISION=	1
 CATEGORIES=	news mail
+MASTER_SITES=	SF/husky/${PORTNAME}/0.2-release
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	fjoe@FreeBSD.org
diff --git a/news/husky-fidoconf-devel/Makefile b/news/husky-fidoconf-devel/Makefile
index 7c6ffedaa632..399b61cf1b61 100644
--- a/news/husky-fidoconf-devel/Makefile
+++ b/news/husky-fidoconf-devel/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	fidoconf
 DISTVERSION=	1.4-rc5
 CATEGORIES=	news mail
+MASTER_SITES=	SF/husky/fidoconfig/1.4-RC5
 
 MAINTAINER=	os@rsu.ru
 COMMENT=	Configuration library for Husky Fidosoft Project. Development version
diff --git a/news/husky-fidoconf/Makefile b/news/husky-fidoconf/Makefile
index a1f054e27840..3cb5399dc9e8 100644
--- a/news/husky-fidoconf/Makefile
+++ b/news/husky-fidoconf/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	fidoconf
 PORTVERSION=	0.14.4
 PORTREVISION=	1
 CATEGORIES=	news mail
+MASTER_SITES=	SF/husky/fidoconfig/0.14-release
 DISTNAME=	${PORTNAME}_${PORTVERSION}-src
 
 MAINTAINER=	fjoe@FreeBSD.org
diff --git a/news/husky-hpt-devel/Makefile b/news/husky-hpt-devel/Makefile
index ee2efaebabde..64a149b481d1 100644
--- a/news/husky-hpt-devel/Makefile
+++ b/news/husky-hpt-devel/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	hpt
 DISTVERSION=	1.4-rc5
 CATEGORIES=	news mail
+MASTER_SITES=	SF/husky/${PORTNAME}/1.4-RC5
 
 MAINTAINER=	os@rsu.ru
 COMMENT=	Highly Portable Tosser (full-featured FTN tosser). Development version
diff --git a/news/husky-hpt/Makefile b/news/husky-hpt/Makefile
index b237efb44326..b667cbddcd4b 100644
--- a/news/husky-hpt/Makefile
+++ b/news/husky-hpt/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	hpt
 PORTVERSION=	1.2.4
 PORTREVISION=	1
 CATEGORIES=	news mail
+MASTER_SITES=	SF/husky/${PORTNAME}/1.2-release
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	fjoe@FreeBSD.org
diff --git a/news/husky-hptkill/Makefile b/news/husky-hptkill/Makefile
index 47d38cbedcf8..bfc8eb5c0469 100644
--- a/news/husky-hptkill/Makefile
+++ b/news/husky-hptkill/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	hptkill
 PORTVERSION=	1.10.4
 PORTREVISION=	1
 CATEGORIES=	news mail
+MASTER_SITES=	SF/husky/${PORTNAME}/1.10-release
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	fjoe@FreeBSD.org
diff --git a/news/husky-hptsqfix/Makefile b/news/husky-hptsqfix/Makefile
index 2b55f27e9355..4147cfe89f07 100644
--- a/news/husky-hptsqfix/Makefile
+++ b/news/husky-hptsqfix/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	hptsqfix
 PORTVERSION=	1.2.4
 PORTREVISION=	1
 CATEGORIES=	news mail
+MASTER_SITES=	SF/husky/${PORTNAME}/1.2-release
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	fjoe@FreeBSD.org
diff --git a/news/husky-hpucode/Makefile b/news/husky-hpucode/Makefile
index 3c7ea80e63d7..7dae7fef34b7 100644
--- a/news/husky-hpucode/Makefile
+++ b/news/husky-hpucode/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	hpucode
 PORTVERSION=	1.2.4
 PORTREVISION=	1
 CATEGORIES=	news mail
+MASTER_SITES=	SF/husky/${PORTNAME}/1.2-release
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	fjoe@FreeBSD.org
diff --git a/news/husky-htick-devel/Makefile b/news/husky-htick-devel/Makefile
index 5652bd22cbbe..a1653c496f56 100644
--- a/news/husky-htick-devel/Makefile
+++ b/news/husky-htick-devel/Makefile
@@ -8,6 +8,8 @@
 PORTNAME=	htick
 DISTVERSION=	1.4-rc5
 CATEGORIES=	news mail
+MASTER_SITES=	SF/husky/${PORTNAME}/1.4-RC5
+
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	mail@ozzmosis.com
diff --git a/news/husky-htick/Makefile b/news/husky-htick/Makefile
index 6836432a4e5e..24c6c37fb82b 100644
--- a/news/husky-htick/Makefile
+++ b/news/husky-htick/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	htick
 PORTVERSION=	1.0.4
 PORTREVISION=	2
 CATEGORIES=	news mail
+MASTER_SITES=	SF/husky/${PORTNAME}/1.0-release
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	fjoe@FreeBSD.org
diff --git a/news/husky-msged/Makefile b/news/husky-msged/Makefile
index eb4ddcfc46aa..585f8335737b 100644
--- a/news/husky-msged/Makefile
+++ b/news/husky-msged/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	msged
 PORTVERSION=	6.2RC1
 PORTREVISION=	1
 CATEGORIES=	news mail
+MASTER_SITES=	SF/husky/${PORTNAME}/6.2%20RC1
 DISTNAME=	${PORTNAME}-${PORTVERSION}-stable-src
 EXTRACT_SUFX=	.tgz
 
diff --git a/news/husky-nltools/Makefile b/news/husky-nltools/Makefile
index c10f747546a1..d717a4f0a39c 100644
--- a/news/husky-nltools/Makefile
+++ b/news/husky-nltools/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	nltools
 PORTVERSION=	1.2.4
 PORTREVISION=	1
 CATEGORIES=	news mail
+MASTER_SITES=	SF/husky/${PORTNAME}/1.2-release
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	fjoe@FreeBSD.org
diff --git a/news/husky-smapi-devel/Makefile b/news/husky-smapi-devel/Makefile
index 97a7be0eb83f..c0dc7d799181 100644
--- a/news/husky-smapi-devel/Makefile
+++ b/news/husky-smapi-devel/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	smapi
 DISTVERSION=	2.4-rc5
 CATEGORIES=	news mail
+MASTER_SITES=	SF/husky/${PORTNAME}/2.4-RC5
 
 MAINTAINER=	os@rsu.ru
 COMMENT=	MSGAPI for Husky Fidosoft Project. Development version
diff --git a/news/husky-smapi/Makefile b/news/husky-smapi/Makefile
index f1352a3daca1..ad47bbd88f84 100644
--- a/news/husky-smapi/Makefile
+++ b/news/husky-smapi/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	smapi
 PORTVERSION=	2.2.4
 PORTREVISION=	1
 CATEGORIES=	news mail
+MASTER_SITES=	SF/husky/${PORTNAME}/2.2-release
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	fjoe@FreeBSD.org
diff --git a/news/husky-sqpack/Makefile b/news/husky-sqpack/Makefile
index 011b9097c0d0..2114cdab4279 100644
--- a/news/husky-sqpack/Makefile
+++ b/news/husky-sqpack/Makefile
@@ -9,6 +9,7 @@ PORTNAME=	sqpack
 PORTVERSION=	1.2.4
 PORTREVISION=	1
 CATEGORIES=	news mail
+MASTER_SITES=	SF/husky/${PORTNAME}/1.2-release
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	fjoe@FreeBSD.org
diff --git a/news/klibido/Makefile b/news/klibido/Makefile
index 01715fd88bac..206311bbfce2 100644
--- a/news/klibido/Makefile
+++ b/news/klibido/Makefile
@@ -9,8 +9,7 @@ PORTNAME=		klibido
 PORTVERSION=		0.2.5
 PORTREVISION=	5
 CATEGORIES=		news
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=		SF
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		A very fast and efficient KDE/QT-based downloader for Usenet binaries
diff --git a/news/mmail/Makefile b/news/mmail/Makefile
index c7c0929d938a..463ca915984d 100644
--- a/news/mmail/Makefile
+++ b/news/mmail/Makefile
@@ -9,9 +9,9 @@
 PORTNAME=	mmail
 PORTVERSION=	0.49
 CATEGORIES=	news
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF/multimail/MultiMail/${PORTVERSION} \
 		${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	multimail \
+
 			system/bbs/mail
 
 MAINTAINER=	chinsan@FreeBSD.org
diff --git a/news/multisuck/Makefile b/news/multisuck/Makefile
index 5c7ef7d6b3ec..073e81d718fd 100644
--- a/news/multisuck/Makefile
+++ b/news/multisuck/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	multisuck
 PORTVERSION=	1.0.4
 CATEGORIES=	news
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi-server/conn news suck
diff --git a/news/newsgrab/Makefile b/news/newsgrab/Makefile
index 8bac9f49cffd..3103ad29a960 100644
--- a/news/newsgrab/Makefile
+++ b/news/newsgrab/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	newsgrab
 PORTVERSION=	0.4.0
 PORTREVISION=	1
 CATEGORIES=	news
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	newsgrab
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/news/newsstar/Makefile b/news/newsstar/Makefile
index 71c65a2499ad..86807d95a1a9 100644
--- a/news/newsstar/Makefile
+++ b/news/newsstar/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	newsstar
 PORTVERSION=	1.3.2
 CATEGORIES=	news
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	anray@FreeBSD.org
 COMMENT=	Transfer news between a local NNTP server (INN, sn, s-news)
diff --git a/news/nget/Makefile b/news/nget/Makefile
index 256160fafca8..49f40255d74d 100644
--- a/news/nget/Makefile
+++ b/news/nget/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	nget
 PORTVERSION=	0.27.1
 PORTREVISION=	1
 CATEGORIES=	news
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	nget
+MASTER_SITES=	SF
 DISTNAME=	nget-${PORTVERSION}+uulib
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/news/noffle/Makefile b/news/noffle/Makefile
index 7ed1457fd3d9..85de2c4e2036 100644
--- a/news/noffle/Makefile
+++ b/news/noffle/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	noffle
 PORTVERSION=	1.1.5
 CATEGORIES=	news
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28devel%29/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	News server for low speed dial-up connections
diff --git a/news/nzbget/Makefile b/news/nzbget/Makefile
index cd825a9c6b79..c23c500dbdd6 100644
--- a/news/nzbget/Makefile
+++ b/news/nzbget/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	nzbget
 PORTVERSION=	0.6.0
 CATEGORIES=	news
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
 
 MAINTAINER=	toxic@doobie.com
 COMMENT=	A binary newsreader supporting NZB files
diff --git a/news/sabnzbdplus/Makefile b/news/sabnzbdplus/Makefile
index 53cf9b1fecb0..008fd8973120 100644
--- a/news/sabnzbdplus/Makefile
+++ b/news/sabnzbdplus/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	sabnzbdplus
 PORTVERSION=	0.4.11
 CATEGORIES=	news
-MASTER_SITES=	SF/sabnzbdplus
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/sabnzbd-${PORTVERSION}
 DISTNAME=	SABnzbd-${PORTVERSION}-src
 
 MAINTAINER=	daniel@netwalk.org
diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index c13c7e236a5b..3ca052dfe48c 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -8,12 +8,15 @@
 PORTNAME=	slrn
 PORTVERSION=	0.9.9p1
 CATEGORIES=	news ipv6
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		ftp://angel.sovam.com/pub/tools/net/news/ \
+
 		ftp://ftp.fu-berlin.de/pub/unix/news/slrn/ \
+
 		ftp://ftp.ntua.gr/pub/lang/slang/slrn/ \
+
 		ftp://ftp.plig.org/pub/slrn/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+
 
 MAINTAINER=	johans@stack.nl
 COMMENT=	SLang-based newsreader
diff --git a/news/trn4/Makefile b/news/trn4/Makefile
index c3af50959a29..3cb58304be4b 100644
--- a/news/trn4/Makefile
+++ b/news/trn4/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	trn
 PORTVERSION=	4.0.b76
 PORTREVISION=	1
 CATEGORIES=	news
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}4/4.0%20test76
 DISTNAME=	trn-4.0-test76
 
 MAINTAINER=	johans@stack.nl
diff --git a/news/yencode/Makefile b/news/yencode/Makefile
index 6a5b4004b827..c64c8b8e6de1 100644
--- a/news/yencode/Makefile
+++ b/news/yencode/Makefile
@@ -10,8 +10,7 @@ PORTNAME=	yencode
 PORTVERSION=	0.46
 PORTREVISION=	5
 CATEGORIES=	news
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A free (GPL) encoder and decoder for the yEnc Usenet file format
diff --git a/news/yydecode/Makefile b/news/yydecode/Makefile
index 3cbf9525eace..d9f1e4cf9209 100644
--- a/news/yydecode/Makefile
+++ b/news/yydecode/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	yydecode
 PORTVERSION=	0.2.10
 CATEGORIES=	news
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	yydecode
+MASTER_SITES=	SF
 
 MAINTAINER=	miki@ceti.pl
 COMMENT=	Tool to decode yEnc encoded files