aboutsummaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2009-08-22 00:28:34 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2009-08-22 00:28:34 +0000
commita13d9a603d44e9d2d333d5b2033b95a97545f73b (patch)
treef369b6d8855716c739425d19cebd7b0bd21ad210 /misc
parent0074c5fa8cabe431c6868442326d476bb5ef2047 (diff)
downloadports-a13d9a603d44e9d2d333d5b2033b95a97545f73b.tar.gz
ports-a13d9a603d44e9d2d333d5b2033b95a97545f73b.zip
Notes
Diffstat (limited to 'misc')
-rw-r--r--misc/amanda-server/Makefile3
-rw-r--r--misc/amanda25-server/Makefile3
-rw-r--r--misc/amanda26-server/Makefile3
-rw-r--r--misc/amanda32-server/Makefile3
-rw-r--r--misc/bb/Makefile3
-rw-r--r--misc/bdelta/Makefile3
-rw-r--r--misc/bibletime-kde3/Makefile2
-rw-r--r--misc/bibletime-kde4/Makefile2
-rw-r--r--misc/bidwatcher/Makefile3
-rw-r--r--misc/bottlerocket/Makefile3
-rw-r--r--misc/cdcollect/Makefile2
-rw-r--r--misc/cloc/Makefile2
-rw-r--r--misc/clpbar/Makefile3
-rw-r--r--misc/cmatrix/Makefile3
-rw-r--r--misc/deco/Makefile3
-rw-r--r--misc/diary-hercules/Makefile2
-rw-r--r--misc/fortune-mod-bible/Makefile3
-rw-r--r--misc/freeguide/Makefile3
-rw-r--r--misc/geekcode/Makefile3
-rw-r--r--misc/gkrellmlaunch/Makefile3
-rw-r--r--misc/gkrellshoot/Makefile3
-rw-r--r--misc/gkrellshoot2/Makefile3
-rw-r--r--misc/gwenview-i18n/Makefile3
-rw-r--r--misc/jbidwatcher/Makefile3
-rw-r--r--misc/k3b-i18n/Makefile3
-rw-r--r--misc/kbfx/Makefile3
-rw-r--r--misc/kcd-devel/Makefile3
-rw-r--r--misc/lesspipe/Makefile3
-rw-r--r--misc/libhome/Makefile2
-rw-r--r--misc/libmcal/Makefile3
-rw-r--r--misc/lifelines/Makefile2
-rw-r--r--misc/lingoteach/Makefile3
-rw-r--r--misc/lr/Makefile3
-rw-r--r--misc/lxde-common/Makefile3
-rw-r--r--misc/metalink-checker/Makefile3
-rw-r--r--misc/metalink-editor/Makefile2
-rw-r--r--misc/metalink-tools/Makefile3
-rw-r--r--misc/mtx/Makefile3
-rw-r--r--misc/nagios-base-logos/Makefile3
-rw-r--r--misc/opencyc/Makefile2
-rw-r--r--misc/pauker/Makefile2
-rw-r--r--misc/pdfmap/Makefile2
-rw-r--r--misc/pipe/Makefile3
-rw-r--r--misc/posixtestsuite/Makefile2
-rw-r--r--misc/py-pexpect/Makefile2
-rw-r--r--misc/salias/Makefile3
-rw-r--r--misc/shuffle-db/Makefile3
-rw-r--r--misc/table.el/Makefile3
-rw-r--r--misc/tkman/Makefile3
-rw-r--r--misc/tmux/Makefile2
-rw-r--r--misc/tvbrowser/Makefile2
-rw-r--r--misc/upclient/Makefile4
-rw-r--r--misc/wmcalendar/Makefile3
-rw-r--r--misc/wmweather+/Makefile3
-rw-r--r--misc/xbiso/Makefile3
55 files changed, 55 insertions, 96 deletions
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 5eb57b9c1f44..62ad23ab47e1 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -9,8 +9,7 @@ PORTNAME= amanda
PORTVERSION= 2.6.1p1
PORTEPOCH= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= amanda
+MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION}
PKGNAMESUFFIX?= -server
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index 29457d3729a9..aac49e02ed5a 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -11,8 +11,7 @@ PORTREVISION?= 5
PKGNAMESUFFIX?= -server
PORTEPOCH= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= amanda
+MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION}
MAINTAINER= kuriyama@FreeBSD.org
COMMENT?= The Advanced Maryland Automatic Network Disk Archiver (server)
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index 5eb57b9c1f44..62ad23ab47e1 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -9,8 +9,7 @@ PORTNAME= amanda
PORTVERSION= 2.6.1p1
PORTEPOCH= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= amanda
+MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION}
PKGNAMESUFFIX?= -server
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index 5eb57b9c1f44..62ad23ab47e1 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -9,8 +9,7 @@ PORTNAME= amanda
PORTVERSION= 2.6.1p1
PORTEPOCH= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= amanda
+MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION}
PKGNAMESUFFIX?= -server
MAINTAINER= kuriyama@FreeBSD.org
diff --git a/misc/bb/Makefile b/misc/bb/Makefile
index 0fbd5b6686bf..82406aa3c7a4 100644
--- a/misc/bb/Makefile
+++ b/misc/bb/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bb
PORTVERSION= 1.3.r1
PORTREVISION= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=aa-project
+MASTER_SITES= SF/aa-project/${PORTNAME}/1.3rc1
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/}
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/bdelta/Makefile b/misc/bdelta/Makefile
index 2d62d0533f5a..d4b7250e8054 100644
--- a/misc/bdelta/Makefile
+++ b/misc/bdelta/Makefile
@@ -8,8 +8,7 @@
PORTNAME= bdelta
PORTVERSION= 0.1.0
CATEGORIES= misc devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= deltup
+MASTER_SITES= SF/deltup/${PORTNAME}/${PORTVERSION}
MAINTAINER= novel@FreeBSD.org
COMMENT= An advanced delta creator, patcher, and library
diff --git a/misc/bibletime-kde3/Makefile b/misc/bibletime-kde3/Makefile
index 5f55aeb458d4..6453fc34fd22 100644
--- a/misc/bibletime-kde3/Makefile
+++ b/misc/bibletime-kde3/Makefile
@@ -9,7 +9,7 @@ PORTNAME= bibletime
PORTVERSION= 1.6.5.1
PORTREVISION= 4
CATEGORIES= misc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/BibleTime%20for%20KDE%203.x/BibleTime%201.6.x%20-%20source%20code
PKGNAMESUFFIX= -kde3
MAINTAINER= tabthorpe@FreeBSD.org
diff --git a/misc/bibletime-kde4/Makefile b/misc/bibletime-kde4/Makefile
index 971b83f44142..2aad9d1a9694 100644
--- a/misc/bibletime-kde4/Makefile
+++ b/misc/bibletime-kde4/Makefile
@@ -8,7 +8,7 @@
PORTNAME= bibletime
PORTVERSION= 2.1
CATEGORIES= misc kde
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/BibleTime%202/BibleTime%202%20source%20code
PKGNAMESUFFIX= -kde4
MAINTAINER= tabthorpe@FreeBSD.org
diff --git a/misc/bidwatcher/Makefile b/misc/bidwatcher/Makefile
index 75038d44552b..b4bf3fe56b6b 100644
--- a/misc/bidwatcher/Makefile
+++ b/misc/bidwatcher/Makefile
@@ -10,8 +10,7 @@ PORTNAME= bidwatcher
PORTVERSION= 1.3.17
PORTREVISION?= 8
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
#PATCH_SITES= http://sourceforge.net/tracker/download.php?group_id=2973&atid=302973&file_id=112451&aid=1085302
#PATCHFILES= bidwatcher-1.3.16-SSL_with_libcurl.02.patch
diff --git a/misc/bottlerocket/Makefile b/misc/bottlerocket/Makefile
index 37073d8c9a46..60504b98f8df 100644
--- a/misc/bottlerocket/Makefile
+++ b/misc/bottlerocket/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bottlerocket
PORTVERSION= 0.04c
PORTREVISION= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= futurebsd
+MASTER_SITES= SF/futurebsd/futurebsd/${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Home Automation Software for the X10 FireCracker kit
diff --git a/misc/cdcollect/Makefile b/misc/cdcollect/Makefile
index e8078b84f4cf..127f0d486775 100644
--- a/misc/cdcollect/Makefile
+++ b/misc/cdcollect/Makefile
@@ -9,7 +9,7 @@ PORTNAME= cdcollect
PORTVERSION= 0.6.0
PORTREVISION= 2
CATEGORIES= misc gnome
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}_source
MAINTAINER= avl@FreeBSD.org
COMMENT= A simple CD catalog for GNOME
diff --git a/misc/cloc/Makefile b/misc/cloc/Makefile
index 5ccc5badfa37..ae4384b2e1a9 100644
--- a/misc/cloc/Makefile
+++ b/misc/cloc/Makefile
@@ -8,7 +8,7 @@
PORTNAME= cloc
PORTVERSION= 1.08
CATEGORIES= misc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
EXTRACT_SUFX= .pl
MAINTAINER= miwi@FreeBSD.org
diff --git a/misc/clpbar/Makefile b/misc/clpbar/Makefile
index df960682594f..654dc6b4eace 100644
--- a/misc/clpbar/Makefile
+++ b/misc/clpbar/Makefile
@@ -9,8 +9,7 @@
PORTNAME= clpbar
PORTVERSION= 1.10.9
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/bar-${PORTVERSION}
DISTNAME= bar_${PORTVERSION}
MAINTAINER= miwi@FreeBSD.org
diff --git a/misc/cmatrix/Makefile b/misc/cmatrix/Makefile
index 96de864ebb65..c084a993f351 100644
--- a/misc/cmatrix/Makefile
+++ b/misc/cmatrix/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cmatrix
PORTVERSION= 1.2a
PORTREVISION= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= leeym@FreeBSD.org
COMMENT= Show a scrolling 'Matrix' like screen
diff --git a/misc/deco/Makefile b/misc/deco/Makefile
index 281f039ffdeb..807a173dfd1a 100644
--- a/misc/deco/Makefile
+++ b/misc/deco/Makefile
@@ -9,8 +9,7 @@ PORTNAME= deco
PORTVERSION= 3.9
PORTREVISION= 4
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Deco%20Sources/${PORTVERSION}
DISTNAME= deco39
EXTRACT_SUFX= .tgz
diff --git a/misc/diary-hercules/Makefile b/misc/diary-hercules/Makefile
index 704d2990e0e6..d9f2c27b87b0 100644
--- a/misc/diary-hercules/Makefile
+++ b/misc/diary-hercules/Makefile
@@ -9,7 +9,7 @@ PORTNAME= hercules
PORTVERSION= 0.0.3.2
PORTREVISION= 2
CATEGORIES= misc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/stable%20branch/${PORTVERSION}
PKGNAMEPREFIX= diary-
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/fortune-mod-bible/Makefile b/misc/fortune-mod-bible/Makefile
index 81303a8cc984..5343975a85f1 100644
--- a/misc/fortune-mod-bible/Makefile
+++ b/misc/fortune-mod-bible/Makefile
@@ -9,8 +9,7 @@ PORTNAME= fortune-mod-bible
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fortunebible
+MASTER_SITES= SF/fortunebible/fortunebible/Genesis
DISTNAME= bible
MAINTAINER= doug@polands.org
diff --git a/misc/freeguide/Makefile b/misc/freeguide/Makefile
index a31a5d162877..1868293dc8af 100644
--- a/misc/freeguide/Makefile
+++ b/misc/freeguide/Makefile
@@ -10,8 +10,7 @@ PORTNAME= freeguide
PORTVERSION= 0.10.5
PORTREVISION= 1
CATEGORIES= misc java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= freeguide-tv
+MASTER_SITES= SF/${PORTNAME}-tv/${PORTNAME}-source/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An interactive TV guide which will create personalized TV listings
diff --git a/misc/geekcode/Makefile b/misc/geekcode/Makefile
index e1dbb0847b5d..878d841055a6 100644
--- a/misc/geekcode/Makefile
+++ b/misc/geekcode/Makefile
@@ -8,8 +8,7 @@
PORTNAME= geekcode
PORTVERSION= 1.7.3
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= geekcode
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A Geek Code Generator
diff --git a/misc/gkrellmlaunch/Makefile b/misc/gkrellmlaunch/Makefile
index 4606aa4da108..71d237d1d72b 100644
--- a/misc/gkrellmlaunch/Makefile
+++ b/misc/gkrellmlaunch/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gkrellmlaunch
PORTVERSION= 0.4
PORTREVISION= 5
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= An application launcher plugin for GKrellM
diff --git a/misc/gkrellshoot/Makefile b/misc/gkrellshoot/Makefile
index 2218f2655259..b2f45a8ff70d 100644
--- a/misc/gkrellshoot/Makefile
+++ b/misc/gkrellshoot/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gkrellshoot
PORTVERSION= 0.3.2
PORTREVISION= 6
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= elitetek@tekrealm.net
COMMENT= A screen locking and screen capture plugin for GKrellM
diff --git a/misc/gkrellshoot2/Makefile b/misc/gkrellshoot2/Makefile
index 582e4cb456e5..aec55e406012 100644
--- a/misc/gkrellshoot2/Makefile
+++ b/misc/gkrellshoot2/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gkrellshoot
PORTVERSION= 0.4.4
PORTREVISION= 5
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/GkrellM2.0%20Port/${PORTVERSION}
PKGNAMESUFFIX= 2
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/gwenview-i18n/Makefile b/misc/gwenview-i18n/Makefile
index 2671a120bbbc..0579bab0aff7 100644
--- a/misc/gwenview-i18n/Makefile
+++ b/misc/gwenview-i18n/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gwenview-i18n
PORTVERSION= 1.4.2
PORTREVISION= 2
CATEGORIES= misc kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/-i18n//}
+MASTER_SITES= SF/gwenview/gwenview/${PORTVERSION}
MAINTAINER= markus@FreeBSD.org
COMMENT= Localized messages and documentation for Gwenview
diff --git a/misc/jbidwatcher/Makefile b/misc/jbidwatcher/Makefile
index 70a20a6ac48a..d7fc1b0bbd84 100644
--- a/misc/jbidwatcher/Makefile
+++ b/misc/jbidwatcher/Makefile
@@ -8,8 +8,7 @@
PORTNAME= jbidwatcher
DISTVERSION= 2.0.1
CATEGORIES= misc java
-MASTER_SITES= http://www.jbidwatcher.com/rdl/ \
- SF
+MASTER_SITES= http://www.jbidwatcher.com/rdl/
DISTNAME= JBidwatcher-${DISTVERSION}
EXTRACT_SUFX= .jar
EXTRACT_ONLY=
diff --git a/misc/k3b-i18n/Makefile b/misc/k3b-i18n/Makefile
index 109ca1814464..f84dca1e06d2 100644
--- a/misc/k3b-i18n/Makefile
+++ b/misc/k3b-i18n/Makefile
@@ -9,8 +9,7 @@ PORTNAME= k3b-i18n
PORTVERSION= 1.0.5
PORTREVISION= 1
CATEGORIES?= misc kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/-i18n//}
+MASTER_SITES= SF/k3b/${PORTNAME}/${PORTVERSION}
MAINTAINER= markus@FreeBSD.org
COMMENT= Localized messages and documentation for K3b
diff --git a/misc/kbfx/Makefile b/misc/kbfx/Makefile
index 32190abef324..23f5d61d3e14 100644
--- a/misc/kbfx/Makefile
+++ b/misc/kbfx/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 0.4.9.3.1
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= misc kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=kbfx
+MASTER_SITES= SF/${PORTNAME}/Source%20Packages/${PORTNAME}-${PORTVERSION}
MAINTAINER= makc@FreeBSD.org
COMMENT= A new K-menu for KDE
diff --git a/misc/kcd-devel/Makefile b/misc/kcd-devel/Makefile
index 2ce9142f8e83..93e3d3a96643 100644
--- a/misc/kcd-devel/Makefile
+++ b/misc/kcd-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kcd-devel
PORTVERSION= 7.13.1
PORTREVISION= 1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kcd
+MASTER_SITES= SF/kcd/kcd/${PORTVERSION}
DISTNAME= kcd-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/lesspipe/Makefile b/misc/lesspipe/Makefile
index bd7ec83d2bd9..bcc80a2d9624 100644
--- a/misc/lesspipe/Makefile
+++ b/misc/lesspipe/Makefile
@@ -8,8 +8,7 @@
PORTNAME= lesspipe
PORTVERSION= 1.55
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= lesspipe
+MASTER_SITES= SF
MAINTAINER= slaven@rezic.de
COMMENT= A preprocessor for less
diff --git a/misc/libhome/Makefile b/misc/libhome/Makefile
index ca750cafa30c..771ead472615 100644
--- a/misc/libhome/Makefile
+++ b/misc/libhome/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libhome
PORTVERSION= 0.10.2
CATEGORIES= misc
-MASTER_SITES= ftp://ftp.oav.net/pll/ SF/pll
+MASTER_SITES= ftp://ftp.oav.net/pll/ SF/pll/${PORTNAME}/${PORTVERSION}
MAINTAINER= kiwi@oav.net
COMMENT= Library providing a getpwname() emulation
diff --git a/misc/libmcal/Makefile b/misc/libmcal/Makefile
index af85538fac66..87faeea98045 100644
--- a/misc/libmcal/Makefile
+++ b/misc/libmcal/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libmcal
PORTVERSION= 0.7
PORTREVISION= 2
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} mcaldrivers-0.9.tar.gz
MAINTAINER= thierry@FreeBSD.org
diff --git a/misc/lifelines/Makefile b/misc/lifelines/Makefile
index 28ffef72333d..4a2adf43bdee 100644
--- a/misc/lifelines/Makefile
+++ b/misc/lifelines/Makefile
@@ -9,7 +9,7 @@ PORTNAME= lifelines
PORTVERSION= 3.0.50
PORTREVISION= 3
CATEGORIES= misc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20beta%20versions/${PORTVERSION}
MAINTAINER= matt@gsicomp.on.ca
COMMENT= An advanced genealogical system
diff --git a/misc/lingoteach/Makefile b/misc/lingoteach/Makefile
index dbda2e3f0cfc..b52ec35d7bf6 100644
--- a/misc/lingoteach/Makefile
+++ b/misc/lingoteach/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lingoteach
PORTVERSION= 0.3.9
PORTREVISION= 10
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTFILES= ${PORTNAME}-ui-${PORTVERSION}.tar.gz
.if defined(WITH_SOUND)
DISTFILES+= ${PORTNAME}-sound-${SOUNDV}.tar.gz
diff --git a/misc/lr/Makefile b/misc/lr/Makefile
index a2b0511297d5..b92228781e7c 100644
--- a/misc/lr/Makefile
+++ b/misc/lr/Makefile
@@ -9,8 +9,7 @@
PORTNAME= lr
PORTVERSION= 2.0
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= lazyread
+MASTER_SITES= SF/lazyread/lazyread/lazyread%20${PORTVERSION}
DISTNAME= lazyread-${PORTVERSION}
MAINTAINER= mich@FreeBSD.org
diff --git a/misc/lxde-common/Makefile b/misc/lxde-common/Makefile
index 5614b88b2fbb..6fb2e13d9a6d 100644
--- a/misc/lxde-common/Makefile
+++ b/misc/lxde-common/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lxde-common
PORTVERSION= 0.3.2.1
PORTREVISION= 1
CATEGORIES= misc
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= lxde
+MASTER_SITES= SF/lxde/${PORTNAME}%20%28default%20config%29/LXDE%20Common%20${PORTVERSION}
MAINTAINER= sahne@0x90.at
COMMENT= LXDE Common files
diff --git a/misc/metalink-checker/Makefile b/misc/metalink-checker/Makefile
index 31cce246964b..ff31982f2436 100644
--- a/misc/metalink-checker/Makefile
+++ b/misc/metalink-checker/Makefile
@@ -8,8 +8,7 @@
PORTNAME= metalink
PORTVERSION= 1.3
CATEGORIES= misc
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= metalinks
+MASTER_SITES= SF/${PORTNAME}s/Metalink%20Checker/2007
PKGNAMESUFFIX?= -checker
DISTNAME= checker-${PORTVERSION}
diff --git a/misc/metalink-editor/Makefile b/misc/metalink-editor/Makefile
index e64939c4c8fc..7f0056db31c6 100644
--- a/misc/metalink-editor/Makefile
+++ b/misc/metalink-editor/Makefile
@@ -8,7 +8,7 @@
PORTNAME= metalink
PORTVERSION= 1.2.0
CATEGORIES= misc
-MASTER_SITES= SF/metalinks
+MASTER_SITES= SF/${PORTNAME}s/Metalink%20Editor/${PORTVERSION}
PKGNAMESUFFIX?= -editor
DISTNAME= ${PORTNAME}editor-${PORTVERSION}
diff --git a/misc/metalink-tools/Makefile b/misc/metalink-tools/Makefile
index 412fc2c8f09c..43dda2b95f4c 100644
--- a/misc/metalink-tools/Makefile
+++ b/misc/metalink-tools/Makefile
@@ -9,8 +9,7 @@ PORTNAME= metalink
PORTVERSION= 0.3.3
PORTREVISION= 1
CATEGORIES= misc
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= metalinks
+MASTER_SITES= SF/${PORTNAME}s/Metalink%20commandline/${PORTVERSION}
PKGNAMESUFFIX?= -tools
MAINTAINER= lioux@FreeBSD.org
diff --git a/misc/mtx/Makefile b/misc/mtx/Makefile
index 1d3d2236f6b4..d5ea28a4d883 100644
--- a/misc/mtx/Makefile
+++ b/misc/mtx/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mtx
PORTVERSION= 1.3.11
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mtx
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
MAINTAINER= mbr@FreeBSD.org
COMMENT= Control SCSI media changer devices
diff --git a/misc/nagios-base-logos/Makefile b/misc/nagios-base-logos/Makefile
index 9c241cd62977..2b9396fc0b8a 100644
--- a/misc/nagios-base-logos/Makefile
+++ b/misc/nagios-base-logos/Makefile
@@ -8,8 +8,7 @@
PORTNAME= nagios-base-logos
PORTVERSION= 1.0
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=nagios
+MASTER_SITES= SF/nagios/OldFiles
DISTNAME= imagepak-base
MAINTAINER= demon@FreeBSD.org
diff --git a/misc/opencyc/Makefile b/misc/opencyc/Makefile
index f7b423b172bf..e67277773926 100644
--- a/misc/opencyc/Makefile
+++ b/misc/opencyc/Makefile
@@ -9,7 +9,7 @@ PORTNAME= opencyc
PORTVERSION= 0.7.0
PORTREVISION= 3
CATEGORIES= misc linux
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/pauker/Makefile b/misc/pauker/Makefile
index 0be42ce8bd41..44e00bafa5eb 100644
--- a/misc/pauker/Makefile
+++ b/misc/pauker/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pauker
DISTVERSION= 1.8RC2
PORTREVISION= 1
CATEGORIES= misc java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
EXTRACT_SUFX= .jar
EXTRACT_ONLY=
diff --git a/misc/pdfmap/Makefile b/misc/pdfmap/Makefile
index 3d45fbfef6de..17df67c68088 100644
--- a/misc/pdfmap/Makefile
+++ b/misc/pdfmap/Makefile
@@ -10,7 +10,7 @@ PORTNAME= pdfmap
PORTVERSION= 2.00
PORTREVISION= 2
CATEGORIES= misc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Generate maps in PDF format and place clickable objects on them
diff --git a/misc/pipe/Makefile b/misc/pipe/Makefile
index ad3f4b140236..334278667f1a 100644
--- a/misc/pipe/Makefile
+++ b/misc/pipe/Makefile
@@ -10,8 +10,7 @@ PORTNAME= pipe
PORTVERSION= 2.5
PORTREVISION= 1
CATEGORIES= misc java
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= pipe2
+MASTER_SITES= SF/${PORTNAME}2/Pipe%202/PIPE2%20V${PORTVERSION}
DISTNAME= pipe25_rc5
MAINTAINER= stefan@fh-mainz.de
diff --git a/misc/posixtestsuite/Makefile b/misc/posixtestsuite/Makefile
index 6c1a3cb1b84a..b398b2be79a6 100644
--- a/misc/posixtestsuite/Makefile
+++ b/misc/posixtestsuite/Makefile
@@ -8,7 +8,7 @@
PORTNAME= posixtestsuite
PORTVERSION= 1.5.2
CATEGORIES= misc
-MASTER_SITES= SF/posixtest
+MASTER_SITES= SF/posixtest/posixtest/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Open POSIX Test Suite
diff --git a/misc/py-pexpect/Makefile b/misc/py-pexpect/Makefile
index 741815630ce7..41ecb6c8cc7f 100644
--- a/misc/py-pexpect/Makefile
+++ b/misc/py-pexpect/Makefile
@@ -10,9 +10,7 @@ PORTNAME= pexpect
PORTVERSION= 2.4
CATEGORIES= misc python
MASTER_SITES= CHEESESHOP \
- ${MASTER_SITE_SOURCEFORGE} \
http://dryice.name/computer/FreeBSD/distfiles/
-#MASTER_SITE_SUBDIR= ${PORTNAME}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/salias/Makefile b/misc/salias/Makefile
index 21610382efa2..ea95ccec8207 100644
--- a/misc/salias/Makefile
+++ b/misc/salias/Makefile
@@ -10,8 +10,7 @@ PORTNAME= salias
PORTVERSION= 0.3.1
PORTREVISION= 5
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/C%20${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A command-line tool to alias arguments of other programs
diff --git a/misc/shuffle-db/Makefile b/misc/shuffle-db/Makefile
index 87f5df71a050..f24ed8b061ba 100644
--- a/misc/shuffle-db/Makefile
+++ b/misc/shuffle-db/Makefile
@@ -8,8 +8,7 @@
PORTNAME= shuffle-db
DISTVERSION= 1.0-rc1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/rebuild_db/1.0-rc1
DISTNAME= rebuild_db-${DISTVERSION}
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/misc/table.el/Makefile b/misc/table.el/Makefile
index 13fe2c789479..744ffb3ed5a2 100644
--- a/misc/table.el/Makefile
+++ b/misc/table.el/Makefile
@@ -8,8 +8,7 @@
PORTNAME= table.el
PORTVERSION= 1.5.54
CATEGORIES= misc elisp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= table
+MASTER_SITES= SF/table/table/${PORTVERSION}
DISTNAME= table-${PORTVERSION}.el.gz
EXTRACT_SUFX= # empty
diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile
index 6407d9a3d4b3..262bc5f09231 100644
--- a/misc/tkman/Makefile
+++ b/misc/tkman/Makefile
@@ -9,8 +9,7 @@ PORTNAME= tkman
PORTVERSION= 2.2
PORTREVISION= 2
CATEGORIES= misc tk
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A Tcl/Tk based manual browser
diff --git a/misc/tmux/Makefile b/misc/tmux/Makefile
index dca4f96b7219..8dbdecba5a12 100644
--- a/misc/tmux/Makefile
+++ b/misc/tmux/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tmux
DISTVERSION= 0.9
CATEGORIES= misc
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= wenheping@gmail.com
COMMENT= A Terminal Multiplexer
diff --git a/misc/tvbrowser/Makefile b/misc/tvbrowser/Makefile
index 0001d224cd2c..676c1e0b1a13 100644
--- a/misc/tvbrowser/Makefile
+++ b/misc/tvbrowser/Makefile
@@ -8,7 +8,7 @@
PORTNAME= tvbrowser
PORTVERSION= 2.7.3
CATEGORIES= misc java
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles/${PORTVERSION}
MAINTAINER= lme@FreeBSD.org
COMMENT= A digital TV guide
diff --git a/misc/upclient/Makefile b/misc/upclient/Makefile
index d5d392432c22..8b9defd6393c 100644
--- a/misc/upclient/Makefile
+++ b/misc/upclient/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 5.0.b8
PORTREVISION= 5
CATEGORIES= misc
MASTER_SITES= http://uptimes.hostingwired.com/files/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+ SF/${PORTNAME}/UpClient%205%20beta/5.0b8%20Security%20Update
+
DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/wmcalendar/Makefile b/misc/wmcalendar/Makefile
index e884d1a1ea64..3599d28cc5f6 100644
--- a/misc/wmcalendar/Makefile
+++ b/misc/wmcalendar/Makefile
@@ -9,8 +9,7 @@ PORTNAME= wmcalendar
PORTVERSION= 0.5.2
PORTREVISION= 8
CATEGORIES= misc windowmaker
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= xride@FreeBSD.org
COMMENT= A dockable calendar with interface to iCalendar based calendars
diff --git a/misc/wmweather+/Makefile b/misc/wmweather+/Makefile
index 11b8e074def6..c7f97dc74b9f 100644
--- a/misc/wmweather+/Makefile
+++ b/misc/wmweather+/Makefile
@@ -8,8 +8,7 @@ PORTNAME= wmweather+
PORTVERSION= 2.11
PORTREVISION= 2
CATEGORIES= misc windowmaker geography
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= wmweatherplus
+MASTER_SITES= SF/wmweatherplus/wmweather%2B/wmweather%2B-${PORTVERSION}
MAINTAINER= dougb@FreeBSD.org
COMMENT= Displays current conditions and forecasts with icons and text
diff --git a/misc/xbiso/Makefile b/misc/xbiso/Makefile
index 9a1f6d420259..03649e5984ff 100644
--- a/misc/xbiso/Makefile
+++ b/misc/xbiso/Makefile
@@ -9,8 +9,7 @@
PORTNAME= xbiso
PORTVERSION= 0.6.1
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= XBox xdvdfs iso extraction utility