25 files changed, 29 insertions, 42 deletions

diff --git a/finance/aqmoney/Makefile b/finance/aqmoney/Makefile
index b813ad426fef..3abf5acf2c76 100644
--- a/finance/aqmoney/Makefile
+++ b/finance/aqmoney/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=		aqmoney
 PORTVERSION=		0.6.3
 CATEGORIES=		finance
-MASTER_SITES=	 	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	 	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Manage your credit institute accounts using openhbci
diff --git a/finance/cbb/Makefile b/finance/cbb/Makefile
index abd330b2d043..d0f1c4fce807 100644
--- a/finance/cbb/Makefile
+++ b/finance/cbb/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	cbb
 PORTVERSION=	0.8.1
 PORTREVISION=	1
 CATEGORIES=	finance deskutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-0.8%20%28stable%29/${PORTVERSION}
 
 MAINTAINER=	kline@thought.org
 COMMENT=	Checkbook balancing tool
diff --git a/finance/eqonomize-kde3/Makefile b/finance/eqonomize-kde3/Makefile
index 5940600d35f7..811a091f38f5 100644
--- a/finance/eqonomize-kde3/Makefile
+++ b/finance/eqonomize-kde3/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	eqonomize
 PORTVERSION=	0.5.1
 PORTREVISION=	1
 CATEGORIES=	finance
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/Eqonomize%21/${PORTVERSION}
 PKGNAMESUFFIX=	-kde3
 
 MAINTAINER=	cm@therek.net
diff --git a/finance/eqonomize-kde4/Makefile b/finance/eqonomize-kde4/Makefile
index 9c0a1339d9b0..a17b4aa89ada 100644
--- a/finance/eqonomize-kde4/Makefile
+++ b/finance/eqonomize-kde4/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	eqonomize
 PORTVERSION=	0.6
 PORTREVISION=	2
 CATEGORIES=	finance
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/Eqonomize%21/${PORTVERSION}
 PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	cm@therek.net
diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile
index 45c1fca9277d..a4622f7729a4 100644
--- a/finance/gnofin/Makefile
+++ b/finance/gnofin/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	gnofin
 PORTVERSION=	0.8.4
 PORTREVISION=	6
 CATEGORIES=	finance deskutils gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Light-weight GNOME based financial management program
diff --git a/finance/gnucash-docs/Makefile b/finance/gnucash-docs/Makefile
index bb295d1399c3..2da8ec4ce4e2 100644
--- a/finance/gnucash-docs/Makefile
+++ b/finance/gnucash-docs/Makefile
@@ -10,11 +10,13 @@ PORTNAME=	gnucash-docs
 PORTVERSION=	2.2.0
 PORTREVISION=	3
 CATEGORIES=	finance gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF/gnucash/${PORTNAME}/${PORTVERSION} \
 		http://www.gnucash.org/pub/gnucash/sources/stable/ \
+
 		ftp://ftp.gnucash.org/pub/gnucash/sources/stable/ \
+
 		http://www.linas.org/pub/
-MASTER_SITE_SUBDIR=	gnucash
+
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Documentation for gnucash
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index b4574fa0b5c6..0850092e7bfb 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -10,9 +10,9 @@ PORTNAME=	gnucash
 PORTVERSION=	2.2.9
 PORTREVISION=	3
 CATEGORIES=	finance gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION} \
 		http://www.gnucash.org/pub/gnucash/sources/stable/
-MASTER_SITE_SUBDIR=	gnucash
+
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	Quicken-like money and finance manager
diff --git a/finance/grisbi/Makefile b/finance/grisbi/Makefile
index 1879a90e9fb4..481e25402f85 100644
--- a/finance/grisbi/Makefile
+++ b/finance/grisbi/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	grisbi
 PORTVERSION=	0.5.9
 PORTREVISION=	4
 CATEGORIES=	finance
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	A personnal accounting application
diff --git a/finance/kexchange/Makefile b/finance/kexchange/Makefile
index 9700bcc66452..90a1cb715288 100644
--- a/finance/kexchange/Makefile
+++ b/finance/kexchange/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	kexchange
 PORTVERSION=	1.0
 PORTREVISION=	7
 CATEGORIES=	finance kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	KDE currency converter
diff --git a/finance/khacc/Makefile b/finance/khacc/Makefile
index 3361c483cea4..f3e26c24955e 100644
--- a/finance/khacc/Makefile
+++ b/finance/khacc/Makefile
@@ -8,8 +8,7 @@ PORTNAME=	khacc
 PORTVERSION=	3.3
 PORTREVISION=	7
 CATEGORIES=	finance
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	qhacc
+MASTER_SITES=	SF/qhacc/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple KDE-based financial manager
diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index 5aade9a7658e..a66b9b49fb36 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	kmymoney2
 PORTVERSION=	0.8.9
 PORTREVISION=	3
 CATEGORIES=	finance
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/KMyMoney/${PORTVERSION}
 
 MAINTAINER=	alecn2002@yandex.ru
 COMMENT=	KDE-based personal finance assistant
diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile
index 5aade9a7658e..a66b9b49fb36 100644
--- a/finance/kmymoney2/Makefile
+++ b/finance/kmymoney2/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	kmymoney2
 PORTVERSION=	0.8.9
 PORTREVISION=	3
 CATEGORIES=	finance
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/KMyMoney/${PORTVERSION}
 
 MAINTAINER=	alecn2002@yandex.ru
 COMMENT=	KDE-based personal finance assistant
diff --git a/finance/ledgersmb/Makefile b/finance/ledgersmb/Makefile
index dcd75a28ab72..c3161decc328 100644
--- a/finance/ledgersmb/Makefile
+++ b/finance/ledgersmb/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	ledger-smb
 PORTVERSION=	1.1.12
 PORTREVISION=	1
 CATEGORIES=	finance perl5
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/ledgersmb/${PORTVERSION}
 
 MAINTAINER=	anarcat@anarcat.ath.cx
 COMMENT=	A double entry accounting system
diff --git a/finance/ledgersmb12/Makefile b/finance/ledgersmb12/Makefile
index edced41ab0bd..bf478664d7aa 100644
--- a/finance/ledgersmb12/Makefile
+++ b/finance/ledgersmb12/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	ledgersmb
 PORTVERSION=	1.2.17
 CATEGORIES=	finance perl5
-MASTER_SITES=	SF/ledger-smb
+MASTER_SITES=	SF/ledger-smb/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	anarcat@anarcat.ath.cx
 COMMENT=	A double entry accounting system
diff --git a/finance/libstocks/Makefile b/finance/libstocks/Makefile
index fa44bb8f6916..ed1160ed2b32 100644
--- a/finance/libstocks/Makefile
+++ b/finance/libstocks/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	libstocks
 PORTVERSION=	0.5.0
 CATEGORIES=	finance devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	A C library which can be used to fetch stocks quotes
diff --git a/finance/myphpmoney/Makefile b/finance/myphpmoney/Makefile
index d8600321e6b4..ac2c9c42e65e 100644
--- a/finance/myphpmoney/Makefile
+++ b/finance/myphpmoney/Makefile
@@ -8,8 +8,7 @@ PORTNAME=		myphpmoney
 PORTVERSION=		1.3.r3
 PORTEPOCH=		1
 CATEGORIES=		finance www
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	myphpmoney
+MASTER_SITES=		SF/${PORTNAME}/MyPhpMoney/1.3RC3
 DISTNAME=		${PORTNAME}-${PORTVERSION:S/.r/RC/}
 
 MAINTAINER=		courou@users.sourceforge.net
diff --git a/finance/openhbci/Makefile b/finance/openhbci/Makefile
index 313bc2ec5e65..2409b382d950 100644
--- a/finance/openhbci/Makefile
+++ b/finance/openhbci/Makefile
@@ -7,8 +7,7 @@
 PORTNAME=		openhbci
 PORTVERSION=		0.9.17.2
 CATEGORIES=		finance
-MASTER_SITES=	 	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	 	SF/${PORTNAME}/${PORTNAME}/0.9.17
 DISTNAME=		openhbci-0.9.17-2
 
 MAINTAINER=		ports@FreeBSD.org
diff --git a/finance/opentaxsolver/Makefile b/finance/opentaxsolver/Makefile
index d84396afcc00..f06f9bcedef2 100644
--- a/finance/opentaxsolver/Makefile
+++ b/finance/opentaxsolver/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	${UPPORTNAME:L}
 PORTVERSION=	6.03
 CATEGORIES=	finance
-MASTER_SITES=	SF/opentaxsolver
+MASTER_SITES=	SF/${PORTNAME}/OTS_2008/v${PORTVERSION}
 DISTNAME=	${UPPORTNAME}2008_${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index e095c1d7ece2..82858df3e892 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	qhacc
 PORTVERSION=	3.5
 PORTREVISION=	5
 CATEGORIES=	finance
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple QT-based financial manager
diff --git a/finance/qtstalker/Makefile b/finance/qtstalker/Makefile
index e398f231d492..029f2dc4c099 100644
--- a/finance/qtstalker/Makefile
+++ b/finance/qtstalker/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	qtstalker
 PORTVERSION=	0.36
 PORTREVISION=	1
 CATEGORIES=	finance kde
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	corky1951@comcast.net
 COMMENT=	Commodity and stock market charting and technical analysis
diff --git a/finance/quantlib/Makefile b/finance/quantlib/Makefile
index abce7e0c1683..64797eb5bde5 100644
--- a/finance/quantlib/Makefile
+++ b/finance/quantlib/Makefile
@@ -9,8 +9,7 @@
 PORTNAME=	quantlib
 PORTVERSION=	0.8.1
 CATEGORIES=	finance
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/QuantLib/older%20releases/${PORTVERSION}
 DISTNAME=	QuantLib-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/finance/sabernetdcs-client/Makefile b/finance/sabernetdcs-client/Makefile
index 6db9173a0e58..b9ba052d85fd 100644
--- a/finance/sabernetdcs-client/Makefile
+++ b/finance/sabernetdcs-client/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	sabernetdcs
 PORTVERSION=	2.0.3
 PORTREVISION=	3
 CATEGORIES=	finance www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	sabernetdcs
+MASTER_SITES=	SF/${PORTNAME}/SaberNet%20DCS/${PORTVERSION}
 PKGNAMESUFFIX=	-client
 DISTNAME=	sndcs-${PORTVERSION}
 
diff --git a/finance/venice/Makefile b/finance/venice/Makefile
index b6f01ef938f2..f44a1d7fa35b 100644
--- a/finance/venice/Makefile
+++ b/finance/venice/Makefile
@@ -10,8 +10,7 @@ PORTVERSION=	0.5.1.a
 PORTREVISION=	3
 DISTVERSION=	0.51alpha
 CATEGORIES=	finance java
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	mov
+MASTER_SITES=	SF/mov/${PORTNAME}/0.51%20alpha
 DISTNAME=	${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/finance/weberp/Makefile b/finance/weberp/Makefile
index 5a42b17362e6..17e6420ee755 100644
--- a/finance/weberp/Makefile
+++ b/finance/weberp/Makefile
@@ -8,8 +8,7 @@
 PORTNAME=	weberp
 PORTVERSION=	3.10
 CATEGORIES=	finance www
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	web-erp
+MASTER_SITES=	SF/web-erp/webERP/${PORTVERSION}
 DISTNAME=	webERP_${PORTVERSION}
 
 MAINTAINER=	wenheping@gmail.com
diff --git a/finance/xtrader/Makefile b/finance/xtrader/Makefile
index 83a8b54104bc..b315e6fb71e2 100644
--- a/finance/xtrader/Makefile
+++ b/finance/xtrader/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	xtrader
 PORTVERSION=	0.99.9
 PORTREVISION=	4
 CATEGORIES=	finance
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF/${PORTNAME}/OldFiles
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Technical analysis program for financial instruments