aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/ah-tty/Makefile3
-rw-r--r--sysutils/anacron/Makefile3
-rw-r--r--sysutils/and/Makefile3
-rw-r--r--sysutils/anteater/Makefile3
-rw-r--r--sysutils/apcupsd/Makefile3
-rw-r--r--sysutils/autopsy/Makefile3
-rw-r--r--sysutils/avfs/Makefile3
-rw-r--r--sysutils/bacula-server-devel/Makefile3
-rw-r--r--sysutils/bacula-server/Makefile3
-rw-r--r--sysutils/bacula2-server/Makefile3
-rw-r--r--sysutils/bbapm/Makefile3
-rw-r--r--sysutils/boxbackup-devel/Makefile3
-rw-r--r--sysutils/boxbackup/Makefile3
-rw-r--r--sysutils/bsdadminscripts/Makefile3
-rw-r--r--sysutils/burn/Makefile3
-rw-r--r--sysutils/ccd2iso/Makefile3
-rw-r--r--sysutils/cciss_vol_status/Makefile3
-rw-r--r--sysutils/cdbkup/Makefile3
-rw-r--r--sysutils/clean/Makefile3
-rw-r--r--sysutils/clonehdd/Makefile2
-rw-r--r--sysutils/conky/Makefile3
-rw-r--r--sysutils/cpu/Makefile3
-rw-r--r--sysutils/cramfs/Makefile3
-rw-r--r--sysutils/dcfldd/Makefile3
-rw-r--r--sysutils/deltup/Makefile2
-rw-r--r--sysutils/detox/Makefile3
-rw-r--r--sysutils/dircomp/Makefile2
-rw-r--r--sysutils/diskscrub/Makefile3
-rw-r--r--sysutils/disktype/Makefile3
-rw-r--r--sysutils/eroaster/Makefile3
-rw-r--r--sysutils/evtviewer/Makefile4
-rw-r--r--sysutils/fetchlog/Makefile3
-rw-r--r--sysutils/fileschanged/Makefile3
-rw-r--r--sysutils/fstyp/Makefile2
-rw-r--r--sysutils/fusefs-fur/Makefile2
-rw-r--r--sysutils/fusefs-httpfs/Makefile3
-rw-r--r--sysutils/fusefs-libs/Makefile3
-rw-r--r--sysutils/fusefs-pod/Makefile3
-rw-r--r--sysutils/fusefs-smbnetfs/Makefile3
-rw-r--r--sysutils/fusefs-sshfs/Makefile3
-rw-r--r--sysutils/gag/Makefile2
-rw-r--r--sysutils/gai-leds/Makefile3
-rw-r--r--sysutils/ganglia-monitor-core/Makefile3
-rw-r--r--sysutils/ganglia-webfrontend/Makefile3
-rw-r--r--sysutils/gdmap/Makefile3
-rw-r--r--sysutils/gnome-schedule/Makefile2
-rw-r--r--sysutils/gnomebaker/Makefile3
-rw-r--r--sysutils/gnomefind/Makefile3
-rw-r--r--sysutils/gpkgdep/Makefile3
-rw-r--r--sysutils/hoz/Makefile3
-rw-r--r--sysutils/iextract/Makefile2
-rw-r--r--sysutils/ispman/Makefile3
-rw-r--r--sysutils/jailuser/Makefile3
-rw-r--r--sysutils/jtopen/Makefile3
-rw-r--r--sysutils/kgrubeditor/Makefile2
-rw-r--r--sysutils/kkbswitch/Makefile2
-rw-r--r--sysutils/kldfind/Makefile2
-rw-r--r--sysutils/klineakconfig/Makefile3
-rw-r--r--sysutils/komparator/Makefile3
-rw-r--r--sysutils/kshutdown-kde4/Makefile2
-rw-r--r--sysutils/kshutdown/Makefile2
-rw-r--r--sysutils/lcdproc/Makefile3
-rw-r--r--sysutils/lineak-defaultplugin/Makefile3
-rw-r--r--sysutils/lineak-kdeplugins/Makefile3
-rw-r--r--sysutils/lineak-xosdplugin/Makefile3
-rw-r--r--sysutils/lineakd/Makefile3
-rw-r--r--sysutils/luckybackup/Makefile2
-rw-r--r--sysutils/luma/Makefile3
-rw-r--r--sysutils/lxtask/Makefile3
-rw-r--r--sysutils/metalog/Makefile3
-rw-r--r--sysutils/modules/Makefile3
-rw-r--r--sysutils/msyslog/Makefile4
-rw-r--r--sysutils/mtxorbd/Makefile3
-rw-r--r--sysutils/munin-main/Makefile3
-rw-r--r--sysutils/munin-master/Makefile3
-rw-r--r--sysutils/munin-node/Makefile3
-rw-r--r--sysutils/npadmin/Makefile3
-rw-r--r--sysutils/ntfsprogs/Makefile3
-rw-r--r--sysutils/nvclock/Makefile2
-rw-r--r--sysutils/nvtv/Makefile2
-rw-r--r--sysutils/powerman/Makefile2
-rw-r--r--sysutils/psmisc/Makefile3
-rw-r--r--sysutils/pstack/Makefile3
-rw-r--r--sysutils/pv/Makefile3
-rw-r--r--sysutils/pwg/Makefile3
-rw-r--r--sysutils/pwgen2/Makefile3
-rw-r--r--sysutils/quicksynergy/Makefile2
-rw-r--r--sysutils/radmind/Makefile2
-rw-r--r--sysutils/raincoat/Makefile3
-rw-r--r--sysutils/rdup/Makefile3
-rw-r--r--sysutils/relaxconf/Makefile3
-rw-r--r--sysutils/reoback/Makefile3
-rw-r--r--sysutils/ruby-log4r/Makefile2
-rw-r--r--sysutils/ruby-quota/Makefile3
-rw-r--r--sysutils/scanbuttond/Makefile3
-rw-r--r--sysutils/searchmonkey/Makefile2
-rw-r--r--sysutils/sec/Makefile3
-rw-r--r--sysutils/sensors-applet/Makefile3
-rw-r--r--sysutils/slmon/Makefile2
-rw-r--r--sysutils/smartmontools-devel/Makefile3
-rw-r--r--sysutils/smartmontools/Makefile3
-rw-r--r--sysutils/spassgen/Makefile3
-rw-r--r--sysutils/synergy/Makefile3
-rw-r--r--sysutils/sysupdate/Makefile2
-rw-r--r--sysutils/tentakel/Makefile3
-rw-r--r--sysutils/titlefix/Makefile2
-rw-r--r--sysutils/torsmo/Makefile2
-rw-r--r--sysutils/usbhotkey/Makefile2
-rw-r--r--sysutils/usbutils/Makefile3
-rw-r--r--sysutils/userinfo/Makefile3
-rw-r--r--sysutils/usermin/Makefile5
-rw-r--r--sysutils/usrinfo/Makefile3
-rw-r--r--sysutils/utcount/Makefile3
-rw-r--r--sysutils/webmin/Makefile5
-rw-r--r--sysutils/wmtop/Makefile4
-rw-r--r--sysutils/xcdroast/Makefile4
-rw-r--r--sysutils/xosview/Makefile2
-rw-r--r--sysutils/xstow/Makefile3
-rw-r--r--sysutils/xvidcap/Makefile2
-rw-r--r--sysutils/zidrav/Makefile3
120 files changed, 125 insertions, 215 deletions
diff --git a/sysutils/ah-tty/Makefile b/sysutils/ah-tty/Makefile
index 58c34fe3547e..045d75c72b7b 100644
--- a/sysutils/ah-tty/Makefile
+++ b/sysutils/ah-tty/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ah-tty
PORTVERSION= 0.3.12
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= mich@FreeBSD.org
COMMENT= Ah-tty is an automatic helper for command prompts and shells
diff --git a/sysutils/anacron/Makefile b/sysutils/anacron/Makefile
index 6edb3417d8a9..6b9632e5d0c7 100644
--- a/sysutils/anacron/Makefile
+++ b/sysutils/anacron/Makefile
@@ -9,8 +9,7 @@ PORTNAME= anacron
PORTVERSION= 2.3
PORTREVISION= 4
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= anacron
+MASTER_SITES= SF
MAINTAINER= dz@426.ch
COMMENT= Schedules periodic jobs on systems that are not permanently up
diff --git a/sysutils/and/Makefile b/sysutils/and/Makefile
index cd844f2b5856..47d66b8e41f7 100644
--- a/sysutils/and/Makefile
+++ b/sysutils/and/Makefile
@@ -9,8 +9,7 @@
PORTNAME= and
PORTVERSION= 1.2.2
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Auto Nice Daemon
diff --git a/sysutils/anteater/Makefile b/sysutils/anteater/Makefile
index ae4a264bc22a..4aa809d210a3 100644
--- a/sysutils/anteater/Makefile
+++ b/sysutils/anteater/Makefile
@@ -9,8 +9,7 @@
PORTNAME= anteater
PORTVERSION= 0.4.5
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A MTA log analyzer
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 06560f830c65..77fd87a3586e 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -9,11 +9,10 @@ PORTNAME= apcupsd
PORTVERSION= 3.14.5
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:src_sf/g} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20-%20Stable/${PORTVERSION}:src_sf \
http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/:src_bk \
http://apcupsd.sourceforge.net/manual/:doc_sf \
http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/:doc_bk
-MASTER_SITE_SUBDIR= ${PORTNAME}/:src_sf
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src_sf,src_bk \
${PORTNAME}.pdf:doc_sf,doc_bk
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/sysutils/autopsy/Makefile b/sysutils/autopsy/Makefile
index 7132c708b7c7..527a50706960 100644
--- a/sysutils/autopsy/Makefile
+++ b/sysutils/autopsy/Makefile
@@ -8,8 +8,7 @@
PORTNAME= autopsy
PORTVERSION= 2.08
CATEGORIES= sysutils security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= danfe@FreeBSD.org
COMMENT= Graphical interface to The Sleuth Kit
diff --git a/sysutils/avfs/Makefile b/sysutils/avfs/Makefile
index a17e470ec7f1..b617215f4e8e 100644
--- a/sysutils/avfs/Makefile
+++ b/sysutils/avfs/Makefile
@@ -8,8 +8,7 @@
PORTNAME= avfs
PORTVERSION= 0.9.8
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= avf
+MASTER_SITES= SF/avf/${PORTNAME}/${PORTVERSION}
MAINTAINER= jirnov@gmail.com
COMMENT= A Virtual File System
diff --git a/sysutils/bacula-server-devel/Makefile b/sysutils/bacula-server-devel/Makefile
index 4d1b18297b5a..b40bf83a0f0f 100644
--- a/sysutils/bacula-server-devel/Makefile
+++ b/sysutils/bacula-server-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bacula
DISTVERSION= 2.5.42-b2
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= bacula
+MASTER_SITES= SF/bacula/OldFiles
PKGNAMESUFFIX?= -server-devel
MAINTAINER= dan@langille.org
COMMENT?= The network backup solution (server) - DEVELOPMENT Version
diff --git a/sysutils/bacula-server/Makefile b/sysutils/bacula-server/Makefile
index c3e54ce594f5..66a0a407ab8b 100644
--- a/sysutils/bacula-server/Makefile
+++ b/sysutils/bacula-server/Makefile
@@ -8,8 +8,7 @@
PORTNAME= bacula
DISTVERSION= 3.0.2
CATEGORIES?= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= bacula
+MASTER_SITES= SF/bacula/bacula/${PORTVERSION}
MAINTAINER= dan@langille.org
COMMENT?= The network backup solution (server)
diff --git a/sysutils/bacula2-server/Makefile b/sysutils/bacula2-server/Makefile
index 0d36a533d6ea..9067dfab1fa6 100644
--- a/sysutils/bacula2-server/Makefile
+++ b/sysutils/bacula2-server/Makefile
@@ -8,8 +8,7 @@
PORTNAME= bacula2
DISTVERSION= 2.4.4
CATEGORIES?= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= bacula
+MASTER_SITES= SF/bacula/bacula/${PORTVERSION}
MAINTAINER= v.haisman@sh.cvut.cz
COMMENT?= The network backup solution (server)
diff --git a/sysutils/bbapm/Makefile b/sysutils/bbapm/Makefile
index 5a2cdb453821..8857f022f2b3 100644
--- a/sysutils/bbapm/Makefile
+++ b/sysutils/bbapm/Makefile
@@ -9,8 +9,7 @@ PORTNAME= bbapm
PORTVERSION= 0.0.1
PORTREVISION= 5
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= bbtools
+MASTER_SITES= SF/bbtools/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PATCH_SITES= ${MASTER_SITE_SOURCEFORGE}
PATCH_SITE_SUBDIR= bbtools
diff --git a/sysutils/boxbackup-devel/Makefile b/sysutils/boxbackup-devel/Makefile
index 0fcf74483429..6d00ff746a46 100644
--- a/sysutils/boxbackup-devel/Makefile
+++ b/sysutils/boxbackup-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= boxbackup
PORTVERSION= 0.10
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF
EXTRACT_SUFX= .tgz
MAINTAINER= james@netinertia.co.uk
diff --git a/sysutils/boxbackup/Makefile b/sysutils/boxbackup/Makefile
index 0fcf74483429..6d00ff746a46 100644
--- a/sysutils/boxbackup/Makefile
+++ b/sysutils/boxbackup/Makefile
@@ -9,8 +9,7 @@ PORTNAME= boxbackup
PORTVERSION= 0.10
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF
EXTRACT_SUFX= .tgz
MAINTAINER= james@netinertia.co.uk
diff --git a/sysutils/bsdadminscripts/Makefile b/sysutils/bsdadminscripts/Makefile
index 77b2eaef311f..872aa28e29f4 100644
--- a/sysutils/bsdadminscripts/Makefile
+++ b/sysutils/bsdadminscripts/Makefile
@@ -8,8 +8,7 @@
PORTNAME= bsdadminscripts
PORTVERSION= 6.1.1
CATEGORIES= sysutils ports-mgmt
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
MAINTAINER= kamikaze@bsdforen.de
COMMENT= A collection of administration scripts
diff --git a/sysutils/burn/Makefile b/sysutils/burn/Makefile
index c846fe4a9b87..46825f215ad2 100644
--- a/sysutils/burn/Makefile
+++ b/sysutils/burn/Makefile
@@ -9,8 +9,7 @@ PORTNAME= burn
PORTVERSION= 0.4.1
PORTREVISION= 3
CATEGORIES= sysutils gnustep
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gsburn
+MASTER_SITES= SF/gs${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= GNUstep based CD burning program
diff --git a/sysutils/ccd2iso/Makefile b/sysutils/ccd2iso/Makefile
index da38abe1229a..766184991770 100644
--- a/sysutils/ccd2iso/Makefile
+++ b/sysutils/ccd2iso/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ccd2iso
PORTVERSION= 0.9
PORTREVISION?= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= ${PORTNAME}
MAINTAINER= osa@FreeBSD.org
diff --git a/sysutils/cciss_vol_status/Makefile b/sysutils/cciss_vol_status/Makefile
index 261969d02527..f48da694c669 100644
--- a/sysutils/cciss_vol_status/Makefile
+++ b/sysutils/cciss_vol_status/Makefile
@@ -8,8 +8,7 @@
PORTNAME= cciss_vol_status
PORTVERSION= 1.03
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cciss
+MASTER_SITES= SF/cciss/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= mm@FreeBSD.org
COMMENT= Reports status of logical drives on ciss(4) controllers
diff --git a/sysutils/cdbkup/Makefile b/sysutils/cdbkup/Makefile
index 2c08796c76ad..a53d46be9e61 100644
--- a/sysutils/cdbkup/Makefile
+++ b/sysutils/cdbkup/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cdbkup
PORTVERSION= 1.0
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/release-1-0
DISTNAME= ${PORTNAME}_${PORTVERSION}-1
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/clean/Makefile b/sysutils/clean/Makefile
index dabb98e2296b..6f866c74abaf 100644
--- a/sysutils/clean/Makefile
+++ b/sysutils/clean/Makefile
@@ -7,8 +7,7 @@
PORTNAME= clean
PORTVERSION= 3.4
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= chuck@pkix.net
COMMENT= Automatically remove unwanted files
diff --git a/sysutils/clonehdd/Makefile b/sysutils/clonehdd/Makefile
index a8d8f2203fd6..e1c95bb6a33e 100644
--- a/sysutils/clonehdd/Makefile
+++ b/sysutils/clonehdd/Makefile
@@ -8,7 +8,7 @@
PORTNAME= clonehdd
PORTVERSION= 2.0.3
CATEGORIES= sysutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= bart@tapolsky.net.ua
COMMENT= Tool for clone HDD on FreeBSD
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index 0687605ef16d..9f940bf7fe7c 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -9,8 +9,7 @@ PORTNAME= conky
PORTVERSION= 1.7.1.1
PORTREVISION= 2
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER?= ntarmos@cs.uoi.gr
COMMENT?= An advanced, highly configurable system monitor for X
diff --git a/sysutils/cpu/Makefile b/sysutils/cpu/Makefile
index 68d66f14a824..1f65dae42d37 100644
--- a/sysutils/cpu/Makefile
+++ b/sysutils/cpu/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cpu
PORTVERSION= 1.4.3
PORTREVISION= 2
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cpu
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= perky@FreeBSD.org
COMMENT= Change Password Utility for LDAP
diff --git a/sysutils/cramfs/Makefile b/sysutils/cramfs/Makefile
index e550f5243f39..923a0f9b6d8e 100644
--- a/sysutils/cramfs/Makefile
+++ b/sysutils/cramfs/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cramfs
PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= SOURCEFORGE
-MASTER_SITE_SUBDIR= cramfs
+MASTER_SITES= SF
MAINTAINER= gslin@gslin.org
COMMENT= The compressed ROM filesystem
diff --git a/sysutils/dcfldd/Makefile b/sysutils/dcfldd/Makefile
index e6b5c60d04ae..8de6c924d0a9 100644
--- a/sysutils/dcfldd/Makefile
+++ b/sysutils/dcfldd/Makefile
@@ -8,8 +8,7 @@
PORTNAME= dcfldd
PORTVERSION= 1.3.4
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= dcfldd
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= nobutaka@FreeBSD.org
COMMENT= An enhanced dd tool with MD5 hashing capability
diff --git a/sysutils/deltup/Makefile b/sysutils/deltup/Makefile
index dd4affdf81a8..263ecbe7e736 100644
--- a/sysutils/deltup/Makefile
+++ b/sysutils/deltup/Makefile
@@ -11,10 +11,8 @@ PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://deltup.org/e107_files/downloads/ \
LOCAL/rafan \
- ${MASTER_SITE_SOURCEFORGE} \
http://www.bzip.org/${BZIP2_102}/:bzip2102src \
http://www.bzip.org/${BZIP2_103}/:bzip2103src
-MASTER_SITE_SUBDIR= ${PORTNAME}
DISTFILES+= ${PORTNAME}-${PORTVERSION}.tar.gz ${BZIP2_102_SOURCE}:bzip2102src ${BZIP2_103_SOURCE}:bzip2103src
MAINTAINER= novel@FreeBSD.org
diff --git a/sysutils/detox/Makefile b/sysutils/detox/Makefile
index 4a2f0331e1f0..d4ca52a2802f 100644
--- a/sysutils/detox/Makefile
+++ b/sysutils/detox/Makefile
@@ -8,8 +8,7 @@
PORTNAME= detox
PORTVERSION= 1.1.1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= purgedhalo@users.sourceforge.net
COMMENT= Removes non-standard characters from filenames
diff --git a/sysutils/dircomp/Makefile b/sysutils/dircomp/Makefile
index aafce6635b50..91b74d428263 100644
--- a/sysutils/dircomp/Makefile
+++ b/sysutils/dircomp/Makefile
@@ -9,7 +9,7 @@ PORTNAME= DirComp
PORTVERSION= 1.3.03
PORTREVISION= 3
CATEGORIES= sysutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= beat@FreeBSD.org
COMMENT= Compare two directories
diff --git a/sysutils/diskscrub/Makefile b/sysutils/diskscrub/Makefile
index 526d24f26cd4..262703961e00 100644
--- a/sysutils/diskscrub/Makefile
+++ b/sysutils/diskscrub/Makefile
@@ -8,8 +8,7 @@
PORTNAME= diskscrub
PORTVERSION= 1.9
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= scrub-${PORTVERSION}
MAINTAINER= erik@smluc.org
diff --git a/sysutils/disktype/Makefile b/sysutils/disktype/Makefile
index e5cc065b077b..56641477ccc1 100644
--- a/sysutils/disktype/Makefile
+++ b/sysutils/disktype/Makefile
@@ -8,8 +8,7 @@
PORTNAME= disktype
PORTVERSION= 9
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Disk formatting type autodetector
diff --git a/sysutils/eroaster/Makefile b/sysutils/eroaster/Makefile
index 229e05fae8d8..8bca3592da72 100644
--- a/sysutils/eroaster/Makefile
+++ b/sysutils/eroaster/Makefile
@@ -9,8 +9,7 @@ PORTNAME= eroaster
PORTVERSION= 2.2.0.0.6
PORTREVISION= 7
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= eroaster
+MASTER_SITES= SF/${PORTNAME}/Development/2.2.0-0.6
DISTNAME= ${PORTNAME}-2.2.0-0.6
MAINTAINER= dave@gufi.org
diff --git a/sysutils/evtviewer/Makefile b/sysutils/evtviewer/Makefile
index 6b7cdc6b9c7e..751f022abb1c 100644
--- a/sysutils/evtviewer/Makefile
+++ b/sysutils/evtviewer/Makefile
@@ -8,9 +8,9 @@
PORTNAME= evtViewer
PORTVERSION= 0.4
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}-${PORTVERSION} \
http://contribs.martymac.com/evtViewer/
-MASTER_SITE_SUBDIR= evtviewer
+
EXTRACT_SUFX= .tgz
MAINTAINER= ganael.laplanche@martymac.com
diff --git a/sysutils/fetchlog/Makefile b/sysutils/fetchlog/Makefile
index 20e2693fa7d4..f622d7c0b443 100644
--- a/sysutils/fetchlog/Makefile
+++ b/sysutils/fetchlog/Makefile
@@ -8,8 +8,7 @@
PORTNAME= fetchlog
PORTVERSION= 1.2
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fetchlog
+MASTER_SITES= SF
MAINTAINER= alexander.haderer@loescap.de
COMMENT= Fetch and convert new messages of a logfile
diff --git a/sysutils/fileschanged/Makefile b/sysutils/fileschanged/Makefile
index 2a05a361ff63..a1656a7d1b3b 100644
--- a/sysutils/fileschanged/Makefile
+++ b/sysutils/fileschanged/Makefile
@@ -9,8 +9,7 @@ PORTNAME= fileschanged
PORTVERSION= 0.6.5
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Utility that reports when files have been altered
diff --git a/sysutils/fstyp/Makefile b/sysutils/fstyp/Makefile
index 750091ef38e9..d1c191f48114 100644
--- a/sysutils/fstyp/Makefile
+++ b/sysutils/fstyp/Makefile
@@ -8,7 +8,7 @@
PORTNAME= fstyp
PORTVERSION= 0.1
CATEGORIES= sysutils
-MASTER_SITES= SF http://thegaul.org/src/
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} http://thegaul.org/src/
MAINTAINER= sacchi@gmail.com
COMMENT= Detect which filesystem type a device/partition contains
diff --git a/sysutils/fusefs-fur/Makefile b/sysutils/fusefs-fur/Makefile
index ba6c1a38d0cb..65a3cca61463 100644
--- a/sysutils/fusefs-fur/Makefile
+++ b/sysutils/fusefs-fur/Makefile
@@ -8,7 +8,7 @@
PORTNAME= fur
PORTVERSION= 0.4.6
CATEGORIES= sysutils palm
-MASTER_SITES= SF/synce
+MASTER_SITES= SF/synce/FUR/${PORTVERSION}
PKGNAMEPREFIX= fusefs-
DISTNAME= FUR-${PORTVERSION}
diff --git a/sysutils/fusefs-httpfs/Makefile b/sysutils/fusefs-httpfs/Makefile
index 2ef3a86eeee4..9b1426a76194 100644
--- a/sysutils/fusefs-httpfs/Makefile
+++ b/sysutils/fusefs-httpfs/Makefile
@@ -8,8 +8,7 @@
PORTNAME= httpfs
PORTVERSION= 2.06.08.26
CATEGORIES= sysutils www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_with_static_binaries_${PORTVERSION}
PKGNAMEPREFIX= fusefs-
DISTNAME= ${PORTNAME}_with_static_binaries_${PORTVERSION}
diff --git a/sysutils/fusefs-libs/Makefile b/sysutils/fusefs-libs/Makefile
index 4092355ef6c6..b44d9808be0c 100644
--- a/sysutils/fusefs-libs/Makefile
+++ b/sysutils/fusefs-libs/Makefile
@@ -7,8 +7,7 @@
PORTNAME= fusefs
PORTVERSION= 2.7.4
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fuse
+MASTER_SITES= SF/fuse/fuse-2.X/${PORTVERSION}
PKGNAMESUFFIX= -libs
DISTNAME= fuse-${PORTVERSION}
diff --git a/sysutils/fusefs-pod/Makefile b/sysutils/fusefs-pod/Makefile
index c173974c78eb..0e2189ca717a 100644
--- a/sysutils/fusefs-pod/Makefile
+++ b/sysutils/fusefs-pod/Makefile
@@ -8,8 +8,7 @@ PORTNAME= pod
PORTVERSION= 0.5.2
PORTREVISION= 5
CATEGORIES= sysutils audio
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= fusepod/
+MASTER_SITES= SF/fuse${PORTNAME}/fuse${PORTNAME}/FUSEPod%20v${PORTVERSION}
PKGNAMEPREFIX= fusefs-
DISTNAME= fusepod-${PORTVERSION}
diff --git a/sysutils/fusefs-smbnetfs/Makefile b/sysutils/fusefs-smbnetfs/Makefile
index 5c3f249f9a74..65384337c488 100644
--- a/sysutils/fusefs-smbnetfs/Makefile
+++ b/sysutils/fusefs-smbnetfs/Makefile
@@ -7,8 +7,7 @@
PORTNAME= smbnetfs
PORTVERSION= 0.3.7
CATEGORIES= sysutils net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/SMBNetFS-${PORTVERSION}
PKGNAMEPREFIX= fusefs-
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/sysutils/fusefs-sshfs/Makefile b/sysutils/fusefs-sshfs/Makefile
index 86e72fe2c45f..0d338965af3b 100644
--- a/sysutils/fusefs-sshfs/Makefile
+++ b/sysutils/fusefs-sshfs/Makefile
@@ -7,8 +7,7 @@
PORTNAME= sshfs
PORTVERSION= 2.2
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fuse
+MASTER_SITES= SF/fuse/${PORTNAME}-fuse/${PORTVERSION}
PKGNAMEPREFIX= fusefs-
DISTNAME= ${PORTNAME}-fuse-${PORTVERSION}
diff --git a/sysutils/gag/Makefile b/sysutils/gag/Makefile
index 8ae733ef689f..844b988f5b0d 100644
--- a/sysutils/gag/Makefile
+++ b/sysutils/gag/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gag
PORTVERSION= 4.9
CATEGORIES= sysutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= alepulver@FreeBSD.org
diff --git a/sysutils/gai-leds/Makefile b/sysutils/gai-leds/Makefile
index 05ddb3b99b3c..ed9e613b83d5 100644
--- a/sysutils/gai-leds/Makefile
+++ b/sysutils/gai-leds/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gai-leds
PORTVERSION= 0.6
PORTREVISION= 4
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gai
+MASTER_SITES= SF/gai/GAI%20-%20Applets/${PORTNAME}
MAINTAINER= douglas@douglasthrift.net
COMMENT= A GAI applet that displays the keyboard status leds
diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile
index e0508785e8d8..4b0ce25b6d84 100644
--- a/sysutils/ganglia-monitor-core/Makefile
+++ b/sysutils/ganglia-monitor-core/Makefile
@@ -9,8 +9,7 @@ PORTNAME= monitor-core
PORTVERSION= 3.1.1
PORTREVISION= 3
CATEGORIES= sysutils net parallel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ganglia
+MASTER_SITES= SF/ganglia/ganglia%20monitoring%20core/${PORTVERSION}%20%28Wien%29
PKGNAMEPREFIX= ganglia-
.if defined(CLUSTER)
PKGNAMESUFFIX= -${CLUSTER}
diff --git a/sysutils/ganglia-webfrontend/Makefile b/sysutils/ganglia-webfrontend/Makefile
index 395a85020695..ca1219d39d58 100644
--- a/sysutils/ganglia-webfrontend/Makefile
+++ b/sysutils/ganglia-webfrontend/Makefile
@@ -8,8 +8,7 @@
PORTNAME= webfrontend
PORTVERSION= 3.1.1
CATEGORIES= sysutils net parallel www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ganglia
+MASTER_SITES= SF/ganglia/ganglia%20monitoring%20core/${PORTVERSION}%20%28Wien%29
PKGNAMEPREFIX= ganglia-
DISTNAME= ganglia-${PORTVERSION}
diff --git a/sysutils/gdmap/Makefile b/sysutils/gdmap/Makefile
index da40bb17d3cf..d0064468e139 100644
--- a/sysutils/gdmap/Makefile
+++ b/sysutils/gdmap/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gdmap
PORTVERSION= 0.7.5
PORTREVISION= 4
CATEGORIES= sysutils gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gdmap
+MASTER_SITES= SF
MAINTAINER= delphus@gmail.com
COMMENT= Graphical disk map Utility
diff --git a/sysutils/gnome-schedule/Makefile b/sysutils/gnome-schedule/Makefile
index 2477eb13b95c..996c977c4011 100644
--- a/sysutils/gnome-schedule/Makefile
+++ b/sysutils/gnome-schedule/Makefile
@@ -10,7 +10,7 @@ PORTNAME= gnome-schedule
PORTVERSION= 0.9.0
PORTREVISION= 8
CATEGORIES= sysutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME GUI for configuring a users crontab
diff --git a/sysutils/gnomebaker/Makefile b/sysutils/gnomebaker/Makefile
index 7a5d0544cfa9..844493aa419d 100644
--- a/sysutils/gnomebaker/Makefile
+++ b/sysutils/gnomebaker/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gnomebaker
PORTVERSION= 0.6.4
PORTREVISION= 1
CATEGORIES= sysutils gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gnomebaker
+MASTER_SITES= SF
DIST_SUBDIR= gnome2
MAINTAINER= dominique.goncalves@gmail.com
diff --git a/sysutils/gnomefind/Makefile b/sysutils/gnomefind/Makefile
index 4afa655d161b..f325bb6d4002 100644
--- a/sysutils/gnomefind/Makefile
+++ b/sysutils/gnomefind/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gnomefind
PORTVERSION= 1.0.2
PORTREVISION= 6
CATEGORIES= sysutils gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gnome-find
+MASTER_SITES= SF/gnome-find/gnome-find-stable/${PORTVERSION}
DISTNAME= gnome-find-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/gpkgdep/Makefile b/sysutils/gpkgdep/Makefile
index 7d6df5adb947..ad32cfd62d24 100644
--- a/sysutils/gpkgdep/Makefile
+++ b/sysutils/gpkgdep/Makefile
@@ -8,8 +8,7 @@ PORTNAME= gpkgdep
PORTVERSION= 0.0
PORTREVISION= 9
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gpkgdep
+MASTER_SITES= SF
MAINTAINER= h.eichmann@gmx.de
COMMENT= Shows package dependencies in tree views
diff --git a/sysutils/hoz/Makefile b/sysutils/hoz/Makefile
index af3b9bbcfa2e..2d7d1e0f69b0 100644
--- a/sysutils/hoz/Makefile
+++ b/sysutils/hoz/Makefile
@@ -9,8 +9,7 @@ PORTNAME= hoz
PORTVERSION= 1.65
PORTREVISION= 4
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//}
MAINTAINER= acm@FreeBSD.org
diff --git a/sysutils/iextract/Makefile b/sysutils/iextract/Makefile
index c1bc5cec2309..e3ec79b1e844 100644
--- a/sysutils/iextract/Makefile
+++ b/sysutils/iextract/Makefile
@@ -8,7 +8,7 @@
PORTNAME= IExtract
PORTVERSION= 0.9.20
CATEGORIES= sysutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= corky1951@comcast.net
COMMENT= Extract meta-information from files
diff --git a/sysutils/ispman/Makefile b/sysutils/ispman/Makefile
index 3e6b53f6f0b2..f29cd327f34a 100644
--- a/sysutils/ispman/Makefile
+++ b/sysutils/ispman/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ispman
PORTVERSION= 1.3r2
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.3
DISTNAME= ${PORTNAME}-1.3rc2
MAINTAINER= dsh@vlink.ru
diff --git a/sysutils/jailuser/Makefile b/sysutils/jailuser/Makefile
index 450d39666434..d906917ece21 100644
--- a/sysutils/jailuser/Makefile
+++ b/sysutils/jailuser/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jailuser
PORTVERSION= 1.9
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= jail
+MASTER_SITES= SF/jail/jail/version%20${PORTVERSION}
DISTNAME= jail_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/jtopen/Makefile b/sysutils/jtopen/Makefile
index fb585b8503ac..244c4c916198 100644
--- a/sysutils/jtopen/Makefile
+++ b/sysutils/jtopen/Makefile
@@ -8,8 +8,7 @@
PORTNAME= jtopen
PORTVERSION= 6.2
CATEGORIES= sysutils java
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= jt400
+MASTER_SITES= SF/jt400/JTOpen-full/${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/}
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/kgrubeditor/Makefile b/sysutils/kgrubeditor/Makefile
index 71bc16763edc..e9a6820178e7 100644
--- a/sysutils/kgrubeditor/Makefile
+++ b/sysutils/kgrubeditor/Makefile
@@ -9,7 +9,7 @@ PORTNAME= kgrubeditor
PORTVERSION= 0.8.5
PORTREVISION= 2
CATEGORIES= sysutils kde
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/KGRUBEditor%20${PORTVERSION}
DISTNAME= KGRUBEditor-${PORTVERSION}-src
MAINTAINER= g.veniamin@googlemail.com
diff --git a/sysutils/kkbswitch/Makefile b/sysutils/kkbswitch/Makefile
index 3e9c057f06d9..7c7a8e58b01d 100644
--- a/sysutils/kkbswitch/Makefile
+++ b/sysutils/kkbswitch/Makefile
@@ -9,7 +9,7 @@ PORTNAME= kkbswitch
PORTVERSION= 1.4.3
PORTREVISION= 5
CATEGORIES= sysutils kde
-MASTER_SITES= SF/kkbswitch
+MASTER_SITES= SF
MAINTAINER= citycat4@ngs.ru
COMMENT= Keyboard layout switcher and indicator for KDE 3.x
diff --git a/sysutils/kldfind/Makefile b/sysutils/kldfind/Makefile
index fb368364ab1d..f1084815d849 100644
--- a/sysutils/kldfind/Makefile
+++ b/sysutils/kldfind/Makefile
@@ -8,7 +8,7 @@
PORTNAME= kldfind
PORTVERSION= 0.61
CATEGORIES= sysutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ricardo.areis@gmail.com
COMMENT= Find kernel modules by string
diff --git a/sysutils/klineakconfig/Makefile b/sysutils/klineakconfig/Makefile
index ba455c2c584f..d6710691a129 100644
--- a/sysutils/klineakconfig/Makefile
+++ b/sysutils/klineakconfig/Makefile
@@ -9,8 +9,7 @@ PORTNAME= klineakconfig
PORTVERSION= 0.9
PORTREVISION= 3
CATEGORIES= sysutils kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= lineak
+MASTER_SITES= SF/lineak/Klineakconfig/Klineakconfig-${PORTVERSION}
DIST_SUBDIR= lineak
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/komparator/Makefile b/sysutils/komparator/Makefile
index dd870ef7d15b..02ae89681bb6 100644
--- a/sysutils/komparator/Makefile
+++ b/sysutils/komparator/Makefile
@@ -8,8 +8,7 @@ PORTNAME= komparator
PORTVERSION= 0.5
PORTREVISION= 3
CATEGORIES= sysutils kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= triosoft@triosoft.com.ua
COMMENT= KDE app that searches and synchronizes two directories
diff --git a/sysutils/kshutdown-kde4/Makefile b/sysutils/kshutdown-kde4/Makefile
index dc8fc83f73fe..698231fe5fb1 100644
--- a/sysutils/kshutdown-kde4/Makefile
+++ b/sysutils/kshutdown-kde4/Makefile
@@ -8,7 +8,7 @@ PORTNAME= kshutdown
PORTVERSION= 1.0.4
PORTREVISION= 1
CATEGORIES= sysutils kde
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/KShutdown/${PORTVERSION}%20for%20KDE%203
MAINTAINER= markus@FreeBSD.org
COMMENT= Advanced shutdown utility for KDE
diff --git a/sysutils/kshutdown/Makefile b/sysutils/kshutdown/Makefile
index dc8fc83f73fe..698231fe5fb1 100644
--- a/sysutils/kshutdown/Makefile
+++ b/sysutils/kshutdown/Makefile
@@ -8,7 +8,7 @@ PORTNAME= kshutdown
PORTVERSION= 1.0.4
PORTREVISION= 1
CATEGORIES= sysutils kde
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/KShutdown/${PORTVERSION}%20for%20KDE%203
MAINTAINER= markus@FreeBSD.org
COMMENT= Advanced shutdown utility for KDE
diff --git a/sysutils/lcdproc/Makefile b/sysutils/lcdproc/Makefile
index 089ea70af207..f227150074ac 100644
--- a/sysutils/lcdproc/Makefile
+++ b/sysutils/lcdproc/Makefile
@@ -8,8 +8,7 @@
PORTNAME= lcdproc
PORTVERSION= 0.5.3
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= bsdfan@nurfuerspam.de
COMMENT= A client/server suite for LCD devices
diff --git a/sysutils/lineak-defaultplugin/Makefile b/sysutils/lineak-defaultplugin/Makefile
index e9aa919c04d2..1543f8e5b70c 100644
--- a/sysutils/lineak-defaultplugin/Makefile
+++ b/sysutils/lineak-defaultplugin/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lineak-defaultplugin
PORTVERSION= 0.9
PORTREVISION= 2
CATEGORIES= sysutils deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= lineak
+MASTER_SITES= SF/lineak/lineak_defaultplugin/${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= lineak
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/lineak-kdeplugins/Makefile b/sysutils/lineak-kdeplugins/Makefile
index 7118d70e2d31..7b9bd3509f45 100644
--- a/sysutils/lineak-kdeplugins/Makefile
+++ b/sysutils/lineak-kdeplugins/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lineak-kdeplugins
PORTVERSION= 0.9
PORTREVISION= 3
CATEGORIES= sysutils deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= lineak
+MASTER_SITES= SF/lineak/lineak_kdeplugins/${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= lineak
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/lineak-xosdplugin/Makefile b/sysutils/lineak-xosdplugin/Makefile
index 0ead60354763..a87748bace08 100644
--- a/sysutils/lineak-xosdplugin/Makefile
+++ b/sysutils/lineak-xosdplugin/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lineak-xosdplugin
PORTVERSION= 0.9
PORTREVISION= 4
CATEGORIES= sysutils deskutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=lineak
+MASTER_SITES= SF/lineak/lineak_xosdplugin/${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= lineak
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/lineakd/Makefile b/sysutils/lineakd/Makefile
index 87523402e1b0..78d86d8af563 100644
--- a/sysutils/lineakd/Makefile
+++ b/sysutils/lineakd/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lineakd
PORTVERSION= 0.9
PORTREVISION= 2
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=lineak
+MASTER_SITES= SF/lineak/${PORTNAME}/${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= lineak
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/luckybackup/Makefile b/sysutils/luckybackup/Makefile
index 2e20cffa4820..33c5e95ba756 100644
--- a/sysutils/luckybackup/Makefile
+++ b/sysutils/luckybackup/Makefile
@@ -7,7 +7,7 @@
PORTNAME= luckybackup
PORTVERSION= 0.3.3
CATEGORIES= sysutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/source
MAINTAINER= bsdkaffee@gmail.com
COMMENT= QT4 frontend to the backup utility rsync
diff --git a/sysutils/luma/Makefile b/sysutils/luma/Makefile
index 72147aa6337e..d7c94222ff47 100644
--- a/sysutils/luma/Makefile
+++ b/sysutils/luma/Makefile
@@ -9,9 +9,8 @@ PORTNAME= luma
PORTVERSION= 2.3
PORTREVISION= 3
CATEGORIES= sysutils net-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES= SF
# MASTER_SITES= http://home.tu-clausthal.de/~ifwd/luma/
-MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= alecn2002@yandex.ru
COMMENT= A graphical tool for accessing and managing LDAP servers
diff --git a/sysutils/lxtask/Makefile b/sysutils/lxtask/Makefile
index f3d08c452279..64d4eff61627 100644
--- a/sysutils/lxtask/Makefile
+++ b/sysutils/lxtask/Makefile
@@ -9,8 +9,7 @@ PORTNAME= lxtask
PORTVERSION= 0.1
PORTREVISION= 1
CATEGORIES= sysutils gnome
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= lxde
+MASTER_SITES= SF/lxde/LXTask%20%28task%20manager%29/LXTask%20${PORTVERSION}
MAINTAINER= chinsan@FreeBSD.org
COMMENT= A lightweight desktop-independent task manager
diff --git a/sysutils/metalog/Makefile b/sysutils/metalog/Makefile
index db6f83c8b50b..f419235d1f56 100644
--- a/sysutils/metalog/Makefile
+++ b/sysutils/metalog/Makefile
@@ -9,8 +9,7 @@ PORTNAME= metalog
DISTVERSION= 0.8
PORTEPOCH= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Modern syslogd replacement with PCRE support
diff --git a/sysutils/modules/Makefile b/sysutils/modules/Makefile
index fbd35396f8e2..a7e7c530fe41 100644
--- a/sysutils/modules/Makefile
+++ b/sysutils/modules/Makefile
@@ -8,8 +8,7 @@
PORTNAME= modules
PORTVERSION= 3.1.6
CATEGORIES= sysutils tcl
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Modules/${PORTNAME}-${PORTVERSION}
MAINTAINER= hokan@me.umn.edu
COMMENT= Dynamic modification of a user's environment
diff --git a/sysutils/msyslog/Makefile b/sysutils/msyslog/Makefile
index 5060418b4d35..81d870b32548 100644
--- a/sysutils/msyslog/Makefile
+++ b/sysutils/msyslog/Makefile
@@ -9,9 +9,9 @@ PORTNAME= msyslog
PORTVERSION= 1.08g
PORTREVISION= 2
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-1.X/${PORTVERSION} \
http://www1.corest.com/download/msyslog/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
DISTNAME= ${PORTNAME}-v${PORTVERSION}-src
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/mtxorbd/Makefile b/sysutils/mtxorbd/Makefile
index 904b17dce65f..5c98e6cb811a 100644
--- a/sysutils/mtxorbd/Makefile
+++ b/sysutils/mtxorbd/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mtxorbd
PORTVERSION= 1.0.2
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mtxorb
+MASTER_SITES= SF/mtxorb/${PORTNAME}/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@emorific.com
diff --git a/sysutils/munin-main/Makefile b/sysutils/munin-main/Makefile
index cf8ab9375120..05736397fe60 100644
--- a/sysutils/munin-main/Makefile
+++ b/sysutils/munin-main/Makefile
@@ -8,8 +8,7 @@
PORTNAME= munin
PORTVERSION= 1.2.6
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= munin
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION}
PKGNAMESUFFIX= -main
DISTNAME= ${PORTNAME}_${PORTVERSION:S/.r/rc/}
diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile
index cf8ab9375120..05736397fe60 100644
--- a/sysutils/munin-master/Makefile
+++ b/sysutils/munin-master/Makefile
@@ -8,8 +8,7 @@
PORTNAME= munin
PORTVERSION= 1.2.6
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= munin
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION}
PKGNAMESUFFIX= -main
DISTNAME= ${PORTNAME}_${PORTVERSION:S/.r/rc/}
diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index de23b71f1499..7bb066d9feaf 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -9,8 +9,7 @@ PORTNAME= munin
PORTVERSION= 1.2.6
PORTREVISION= 1
CATEGORIES= sysutils perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= munin
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20stable/${PORTVERSION}
PKGNAMESUFFIX= -node
DISTNAME= ${PORTNAME}_${PORTVERSION:S/.r/rc/}
diff --git a/sysutils/npadmin/Makefile b/sysutils/npadmin/Makefile
index 2577d8fc9aea..2907e380b734 100644
--- a/sysutils/npadmin/Makefile
+++ b/sysutils/npadmin/Makefile
@@ -9,8 +9,7 @@ PORTNAME= npadmin
PORTVERSION= 0.8.7
PORTREVISION= 1
CATEGORIES= sysutils print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= An SNMP based command line network printer management tool
diff --git a/sysutils/ntfsprogs/Makefile b/sysutils/ntfsprogs/Makefile
index 38d709171504..d65837d6bb83 100644
--- a/sysutils/ntfsprogs/Makefile
+++ b/sysutils/ntfsprogs/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ntfsprogs
PORTVERSION= 2.0.0
CATEGORIES= sysutils
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= linux-ntfs
+MASTER_SITES= SF/linux-ntfs/NTFS%20Tools%20and%20Library/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Utilities and library to manipulate NTFS partitions
diff --git a/sysutils/nvclock/Makefile b/sysutils/nvclock/Makefile
index 7fb41f9c9bd0..fcbb83a18933 100644
--- a/sysutils/nvclock/Makefile
+++ b/sysutils/nvclock/Makefile
@@ -9,7 +9,7 @@ PORTNAME= nvclock
DISTVERSION= 0.8b4
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.8%20%28beta4%29
DISTNAME= nvclock${DISTVERSION}
MAINTAINER= danfe@FreeBSD.org
diff --git a/sysutils/nvtv/Makefile b/sysutils/nvtv/Makefile
index f48e9258ce6d..a2d801f20892 100644
--- a/sysutils/nvtv/Makefile
+++ b/sysutils/nvtv/Makefile
@@ -9,7 +9,7 @@ PORTNAME= nvtv
PORTVERSION= 0.4.7
PORTREVISION= 4
CATEGORIES= sysutils
-MASTER_SITES= SF/nv-tv-out
+MASTER_SITES= SF/nv-tv-out/${PORTNAME}-src/${PORTVERSION}
DISTNAME= nvtv-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/powerman/Makefile b/sysutils/powerman/Makefile
index 2d54fb97cf4e..dc16073bed7f 100644
--- a/sysutils/powerman/Makefile
+++ b/sysutils/powerman/Makefile
@@ -7,7 +7,7 @@
PORTNAME= powerman
PORTVERSION= 2.3.5
CATEGORIES= sysutils parallel
-MASTER_SITES= SF/powerman
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= PowerMan is a tool for doing remote power control
diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile
index b79d2427a36a..c345b1861a29 100644
--- a/sysutils/psmisc/Makefile
+++ b/sysutils/psmisc/Makefile
@@ -8,8 +8,7 @@
PORTNAME= psmisc
PORTVERSION= 21.9
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= psmisc
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A port of the Linux pstree, killall and pidof commands
diff --git a/sysutils/pstack/Makefile b/sysutils/pstack/Makefile
index 574cacf09f53..ec7b77d71820 100644
--- a/sysutils/pstack/Makefile
+++ b/sysutils/pstack/Makefile
@@ -10,8 +10,7 @@ PORTNAME= pstack
PORTVERSION= 1.2
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= bsd-pstack
+MASTER_SITES= SF/bsd-${PORTNAME}/bsd-${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Retrieve process/core file stack traces
diff --git a/sysutils/pv/Makefile b/sysutils/pv/Makefile
index 16a4acfc1535..d8ea72a6d14e 100644
--- a/sysutils/pv/Makefile
+++ b/sysutils/pv/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pv
PORTVERSION= 1.1.4
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= pipeviewer
+MASTER_SITES= SF/pipeviewer/pipeviewer/${PORTVERSION}
MAINTAINER= daniel@roe.ch
COMMENT= A pipe throughput monitor
diff --git a/sysutils/pwg/Makefile b/sysutils/pwg/Makefile
index 8bbfb35c405e..7c6a3d7c8f32 100644
--- a/sysutils/pwg/Makefile
+++ b/sysutils/pwg/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pwg
PORTVERSION= 0.2
PORTREVISION= 7
CATEGORIES= sysutils kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A small tool to generate secure, random passwords
diff --git a/sysutils/pwgen2/Makefile b/sysutils/pwgen2/Makefile
index 6a7a22cb91dd..399a52494501 100644
--- a/sysutils/pwgen2/Makefile
+++ b/sysutils/pwgen2/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pwgen
PORTVERSION= 2.06
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= andrey@hm.perm.ru
diff --git a/sysutils/quicksynergy/Makefile b/sysutils/quicksynergy/Makefile
index 4dd990206823..f1052136e8c2 100644
--- a/sysutils/quicksynergy/Makefile
+++ b/sysutils/quicksynergy/Makefile
@@ -9,7 +9,7 @@ PORTNAME= quicksynergy
PORTVERSION= 0.9.0
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Linux/${PORTVERSION}
MAINTAINER= rnoland@FreeBSD.org
COMMENT= A graphical interface for easily configuring Synergy2
diff --git a/sysutils/radmind/Makefile b/sysutils/radmind/Makefile
index 4418a198b1d3..978a8794a692 100644
--- a/sysutils/radmind/Makefile
+++ b/sysutils/radmind/Makefile
@@ -8,7 +8,7 @@
PORTNAME= radmind
PORTVERSION= 1.13.0
CATEGORIES= sysutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= paul@aps.org
COMMENT= Utility for administering filesystem changes
diff --git a/sysutils/raincoat/Makefile b/sysutils/raincoat/Makefile
index 0f6efd648cc6..f20d2562e542 100644
--- a/sysutils/raincoat/Makefile
+++ b/sysutils/raincoat/Makefile
@@ -8,8 +8,7 @@
PORTNAME= raincoat
PORTVERSION= 0.11
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= xbox-linux
+MASTER_SITES= SF/xbox-linux/Other/Raincoat
EXTRACT_SUFX= .tbz2
MAINTAINER= ed@FreeBSD.org
diff --git a/sysutils/rdup/Makefile b/sysutils/rdup/Makefile
index c1df78c096e3..870377c3a6d8 100644
--- a/sysutils/rdup/Makefile
+++ b/sysutils/rdup/Makefile
@@ -9,8 +9,7 @@
PORTNAME= rdup
PORTVERSION= 1.0.0
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
- http://miek.nl/projects/rdup/
+MASTER_SITES= http://miek.nl/projects/rdup/
MAINTAINER= corky1951@comcast.net
COMMENT= A tool to generate an (incremental) backup file list
diff --git a/sysutils/relaxconf/Makefile b/sysutils/relaxconf/Makefile
index 129d104a2d5e..186e5797ccbb 100644
--- a/sysutils/relaxconf/Makefile
+++ b/sysutils/relaxconf/Makefile
@@ -9,8 +9,7 @@ PORTNAME= relaxconf
PORTVERSION= 1.1.1
PORTREVISION= 2
CATEGORIES= sysutils
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= relaxbsd
+MASTER_SITES= SF/relaxbsd/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A set of text menu based utilities for configuring RelaxBSD LiveCD
diff --git a/sysutils/reoback/Makefile b/sysutils/reoback/Makefile
index 0bba7558e45a..31768f30560a 100644
--- a/sysutils/reoback/Makefile
+++ b/sysutils/reoback/Makefile
@@ -8,8 +8,7 @@
PORTNAME= reoback
PORTVERSION= 1.0
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= reoback
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Release%203
EXTRACT_SUFX= _r3.tar.gz
MAINTAINER= hideo@lastamericanempire.com
diff --git a/sysutils/ruby-log4r/Makefile b/sysutils/ruby-log4r/Makefile
index 983c2c9c6b27..a9fa12e316b0 100644
--- a/sysutils/ruby-log4r/Makefile
+++ b/sysutils/ruby-log4r/Makefile
@@ -8,7 +8,7 @@
PORTNAME= log4r
PORTVERSION= 1.0.5
CATEGORIES= sysutils ruby
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Log4r%20${PORTVERSION}
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/sysutils/ruby-quota/Makefile b/sysutils/ruby-quota/Makefile
index 3657303e835e..70ad432413a3 100644
--- a/sysutils/ruby-quota/Makefile
+++ b/sysutils/ruby-quota/Makefile
@@ -8,8 +8,7 @@
PORTNAME= quota
PORTVERSION= 0.5.1
CATEGORIES= sysutils ruby
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ruby-${PORTNAME}
+MASTER_SITES= SF/ruby-${PORTNAME}/ruby-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DISTNAME= ruby-${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= ruby
diff --git a/sysutils/scanbuttond/Makefile b/sysutils/scanbuttond/Makefile
index 34c37871dc18..2c9756938f8c 100644
--- a/sysutils/scanbuttond/Makefile
+++ b/sysutils/scanbuttond/Makefile
@@ -8,8 +8,7 @@
PORTNAME= scanbuttond
PORTVERSION= 0.2.3
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= dthiele@gmx.net
COMMENT= A daemon to monitor and configure modern scanner's buttons
diff --git a/sysutils/searchmonkey/Makefile b/sysutils/searchmonkey/Makefile
index faf2e46deed3..5bff19fb66a1 100644
--- a/sysutils/searchmonkey/Makefile
+++ b/sysutils/searchmonkey/Makefile
@@ -9,7 +9,7 @@ PORTNAME= searchmonkey
PORTVERSION= 0.8.1
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20%5Bstable%5D
MAINTAINER= ports@FreeBSD.org
COMMENT= Search using regexes for file names and text
diff --git a/sysutils/sec/Makefile b/sysutils/sec/Makefile
index a45ab6f721c0..ca4902837eb0 100644
--- a/sysutils/sec/Makefile
+++ b/sysutils/sec/Makefile
@@ -9,8 +9,7 @@
PORTNAME= sec
PORTVERSION= 2.5.1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= simple-evcorr
+MASTER_SITES= SF/simple-evcorr/${PORTNAME}/${PORTVERSION}
MAINTAINER= ecu@ipv42.net
COMMENT= Simple event (logs) correlator
diff --git a/sysutils/sensors-applet/Makefile b/sysutils/sensors-applet/Makefile
index f5d10351e93c..3324739c2c90 100644
--- a/sysutils/sensors-applet/Makefile
+++ b/sysutils/sensors-applet/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sensors-applet
PORTVERSION= 1.6.1
PORTREVISION= 6
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/GNOME%20Sensors%20Applet%20Version%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A GNOME applet displaying hardware sensor values
diff --git a/sysutils/slmon/Makefile b/sysutils/slmon/Makefile
index c942cf4f34ba..e22f39f765c4 100644
--- a/sysutils/slmon/Makefile
+++ b/sysutils/slmon/Makefile
@@ -10,7 +10,7 @@ PORTNAME= slmon
PORTVERSION= 0.5.13
PORTREVISION= 5
CATEGORIES= sysutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/SLmon/${PORTVERSION}
MAINTAINER= pgollucci@FreeBSD.org
COMMENT= S-Lang System Monitor
diff --git a/sysutils/smartmontools-devel/Makefile b/sysutils/smartmontools-devel/Makefile
index 07123e5e9859..205767eee7e3 100644
--- a/sysutils/smartmontools-devel/Makefile
+++ b/sysutils/smartmontools-devel/Makefile
@@ -9,8 +9,7 @@ PORTNAME= smartmontools
PORTVERSION= 5.38
PORTREVISION= 6
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= marck@FreeBSD.org
COMMENT= S.M.A.R.T. disk monitoring tools
diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile
index 07123e5e9859..205767eee7e3 100644
--- a/sysutils/smartmontools/Makefile
+++ b/sysutils/smartmontools/Makefile
@@ -9,8 +9,7 @@ PORTNAME= smartmontools
PORTVERSION= 5.38
PORTREVISION= 6
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= marck@FreeBSD.org
COMMENT= S.M.A.R.T. disk monitoring tools
diff --git a/sysutils/spassgen/Makefile b/sysutils/spassgen/Makefile
index 440de27f04c3..40ad4167becf 100644
--- a/sysutils/spassgen/Makefile
+++ b/sysutils/spassgen/Makefile
@@ -9,8 +9,7 @@ PORTNAME= spassgen
PORTVERSION= 1.5
PORTREVISION= 5
CATEGORIES= sysutils kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= spassgen
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}.0
MAINTAINER= citycat4@ngs.ru
COMMENT= Qt GUI secure password generator
diff --git a/sysutils/synergy/Makefile b/sysutils/synergy/Makefile
index b75e8f681b51..ce557ef01ce2 100644
--- a/sysutils/synergy/Makefile
+++ b/sysutils/synergy/Makefile
@@ -9,8 +9,7 @@ PORTNAME= synergy
PORTVERSION= 1.3.1
PORTREVISION= 7
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}2
+MASTER_SITES= SF/${PORTNAME}2/Sources/${PORTVERSION}
MAINTAINER= kevlo@FreeBSD.org
COMMENT= Mouse and keyboard sharing utility
diff --git a/sysutils/sysupdate/Makefile b/sysutils/sysupdate/Makefile
index 1c40a49406ce..566603e74d50 100644
--- a/sysutils/sysupdate/Makefile
+++ b/sysutils/sysupdate/Makefile
@@ -8,7 +8,7 @@
PORTNAME= sysupdate
PORTVERSION= 0.5.4
CATEGORIES= sysutils
-MASTER_SITES= SF/lvl
+MASTER_SITES= SF/lvl/FreeBSD%20System%20Update/${PORTNAME}.sh%20v${PORTVERSION}
DISTNAME= ${PORTNAME}.sh-${PORTVERSION}
MAINTAINER= tigger@lvlworld.com
diff --git a/sysutils/tentakel/Makefile b/sysutils/tentakel/Makefile
index 990298af5523..40fefdd8c2ba 100644
--- a/sysutils/tentakel/Makefile
+++ b/sysutils/tentakel/Makefile
@@ -8,8 +8,7 @@
PORTNAME= tentakel
PORTVERSION= 2.2
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/titlefix/Makefile b/sysutils/titlefix/Makefile
index 151c64dd02a1..e33dbcf31e7a 100644
--- a/sysutils/titlefix/Makefile
+++ b/sysutils/titlefix/Makefile
@@ -8,7 +8,7 @@
PORTNAME= titlefix
PORTVERSION= 0.5.3
CATEGORIES= sysutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Renames files in a proper English title format
diff --git a/sysutils/torsmo/Makefile b/sysutils/torsmo/Makefile
index 0b3b12aea298..50f4d6a9ce8d 100644
--- a/sysutils/torsmo/Makefile
+++ b/sysutils/torsmo/Makefile
@@ -9,7 +9,7 @@ PORTNAME= torsmo
PORTVERSION= 0.18
PORTREVISION= 7
CATEGORIES= sysutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
MAINTAINER= novel@FreeBSD.org
COMMENT= System monitor that renders text on desktop
diff --git a/sysutils/usbhotkey/Makefile b/sysutils/usbhotkey/Makefile
index 3525cdd720e4..41299f0dc90b 100644
--- a/sysutils/usbhotkey/Makefile
+++ b/sysutils/usbhotkey/Makefile
@@ -9,7 +9,7 @@ PORTNAME= usbhotkey
PORTVERSION= 0.3.1
PORTREVISION= 3
CATEGORIES= sysutils
-MASTER_SITES= SF/usbhotkey
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ntarmos@cs.uoi.gr
COMMENT= A utility to remap USB keyboards under X11
diff --git a/sysutils/usbutils/Makefile b/sysutils/usbutils/Makefile
index c3538ffce15c..3a260d7b19d4 100644
--- a/sysutils/usbutils/Makefile
+++ b/sysutils/usbutils/Makefile
@@ -7,8 +7,7 @@
PORTNAME= usbutils
PORTVERSION= 0.73
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= linux-usb
+MASTER_SITES= SF/linux-usb/${PORTNAME}/${PORTVERSION}
MAINTAINER= brix@FreeBSD.org
COMMENT= Utility for listing USB devices
diff --git a/sysutils/userinfo/Makefile b/sysutils/userinfo/Makefile
index f0e460d27287..1a2c82c66811 100644
--- a/sysutils/userinfo/Makefile
+++ b/sysutils/userinfo/Makefile
@@ -8,8 +8,7 @@
PORTNAME= userinfo
PORTVERSION= 2.2
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= bjk
+MASTER_SITES= SF/bjk/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Show information about local users
diff --git a/sysutils/usermin/Makefile b/sysutils/usermin/Makefile
index 6acf3f1eafe9..39a98e1e335b 100644
--- a/sysutils/usermin/Makefile
+++ b/sysutils/usermin/Makefile
@@ -9,10 +9,9 @@ PORTNAME= usermin
PORTVERSION= 1.410
CATEGORIES= sysutils
MASTER_SITES= http://www.webmin.com/uupdates/:up \
- ${MASTER_SITE_SOURCEFORGE:S/$/:sf/} \
+ SF/webadmin/${PORTNAME}/${PORTVERSION}:sf \
${MASTER_SITE_LOCAL:S/$/:up/}
-MASTER_SITE_SUBDIR= webadmin/:sf \
- olgeni/:up
+MASTER_SITE_SUBDIR= olgeni/:up
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sf ${USERMIN_MODULES:S/gz$/gz:up/}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/sysutils/usrinfo/Makefile b/sysutils/usrinfo/Makefile
index c95d7666c8b6..7cf2c9b3ba55 100644
--- a/sysutils/usrinfo/Makefile
+++ b/sysutils/usrinfo/Makefile
@@ -8,8 +8,7 @@
PORTNAME= usrinfo
PORTVERSION= .10
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER?= aaron@snaphat.com
COMMENT= Displays information about a user using either "<br>" or "\n" breaks
diff --git a/sysutils/utcount/Makefile b/sysutils/utcount/Makefile
index 0f8d13087dbe..3006701c0f85 100644
--- a/sysutils/utcount/Makefile
+++ b/sysutils/utcount/Makefile
@@ -8,8 +8,7 @@
PORTNAME= utcount
PORTVERSION= 0.1
CATEGORIES= sysutils net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=utcount
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= den@FreeBSD.org
COMMENT= Users Traffic Count
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index e0960df27cdf..24ad47fec7c7 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -10,10 +10,9 @@ PORTVERSION= 1.480
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://download.webmin.com/updates/:up \
- ${MASTER_SITE_SOURCEFORGE:S/$/:sf/} \
+ SF/webadmin/${PORTNAME}/${PORTVERSION}:sf \
${MASTER_SITE_LOCAL:S/$/:up/}
-MASTER_SITE_SUBDIR= webadmin/:sf \
- olgeni/:up
+MASTER_SITE_SUBDIR= olgeni/:up
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sf ${WEBMIN_MODULES:S/gz$/gz:up/}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/sysutils/wmtop/Makefile b/sysutils/wmtop/Makefile
index 97a4892a3924..d109c1501c47 100644
--- a/sysutils/wmtop/Makefile
+++ b/sysutils/wmtop/Makefile
@@ -9,8 +9,8 @@ PORTVERSION= 0.84
PORTREVISION= 3
CATEGORIES= sysutils windowmaker
MASTER_SITES= http://ftp1.sourceforge.net/wmtop/ \
- ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+ SF
+
MAINTAINER= uspoerlein@gmail.com
COMMENT= Windowmaker dock app to display top 3 CPU consuming processes
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index b7ae9af2ae55..b738b87e57b4 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -9,9 +9,9 @@ PORTNAME= xcdroast
PORTVERSION= 0.98.a.16
PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.98alpha16 \
http://www.xcdroast.org/download/
-MASTER_SITE_SUBDIR= xcdroast
+
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.a./alpha/}
MAINTAINER= oliver@FreeBSD.org
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index 77f29563702a..ca00b401d458 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -10,7 +10,7 @@ PORTNAME= xosview
PORTVERSION= 1.8.3
PORTREVISION= 3
CATEGORIES= sysutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= clsung@FreeBSD.org
COMMENT= A graphical performance meter
diff --git a/sysutils/xstow/Makefile b/sysutils/xstow/Makefile
index 3dd710a16d24..274dc9f5ba0a 100644
--- a/sysutils/xstow/Makefile
+++ b/sysutils/xstow/Makefile
@@ -12,8 +12,7 @@ PORTVERSION= 0.5.1
PORTREVISION= 1
PORTEPOCH= 0
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Enhanced replacement for GNU stow written in C++
diff --git a/sysutils/xvidcap/Makefile b/sysutils/xvidcap/Makefile
index 4b15c7e93f9d..2e8407672506 100644
--- a/sysutils/xvidcap/Makefile
+++ b/sysutils/xvidcap/Makefile
@@ -10,7 +10,7 @@ DISTVERSION= 1.1.4p1
PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= sysutils multimedia
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= thierry@FreeBSD.org
COMMENT= Capture your X display to individual frames or MPEG video
diff --git a/sysutils/zidrav/Makefile b/sysutils/zidrav/Makefile
index 891521e402c1..cb04f040cefc 100644
--- a/sysutils/zidrav/Makefile
+++ b/sysutils/zidrav/Makefile
@@ -8,8 +8,7 @@
PORTNAME= zidrav
PORTVERSION= 1.2.0
CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}4unix/${PORTVERSION}
DISTNAME= zidrav4unix-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org