summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoramdmi3 <amdmi3@FreeBSD.org>2009-08-22 00:35:32 +0000
committeramdmi3 <amdmi3@FreeBSD.org>2009-08-22 00:35:32 +0000
commit15323e14ca5e26ed7f61689771fc0aa594453e3e (patch)
tree8548af9a729d1cf57c0e531cbb14598ae974ef7f
parent3f959ccac94a73ce731865cd12c9914cbe6d65b7 (diff)
downloadFreeBSD-ports-15323e14ca5e26ed7f61689771fc0aa594453e3e.zip
FreeBSD-ports-15323e14ca5e26ed7f61689771fc0aa594453e3e.tar.gz
- Switch SourceForge ports to the new File Release System: categories starting with P,R,S
-rw-r--r--palm/barry/Makefile2
-rw-r--r--palm/bibelot/Makefile3
-rw-r--r--palm/makeztxt/Makefile3
-rw-r--r--palm/pilrc/Makefile3
-rw-r--r--palm/romeo/Makefile3
-rw-r--r--palm/synce-gvfs/Makefile2
-rw-r--r--palm/synce-hal/Makefile3
-rw-r--r--palm/synce-librapi2/Makefile3
-rw-r--r--palm/synce-librra/Makefile2
-rw-r--r--palm/synce-libsynce/Makefile2
-rw-r--r--palm/synce-serial/Makefile3
-rw-r--r--palm/synce-sync-engine/Makefile3
-rw-r--r--palm/synce-trayicon/Makefile3
-rw-r--r--palm/synce-vdccm/Makefile3
-rw-r--r--polish/gnugadu2/Makefile2
-rw-r--r--polish/libtlen/Makefile3
-rw-r--r--polish/qnapi/Makefile3
-rw-r--r--polish/tleenx2/Makefile2
-rw-r--r--ports-mgmt/kports/Makefile3
-rw-r--r--ports-mgmt/pkg-orphan/Makefile3
-rw-r--r--ports-mgmt/portdowngrade/Makefile3
-rw-r--r--ports-mgmt/portell/Makefile3
-rw-r--r--ports-mgmt/portmanager/Makefile3
-rw-r--r--ports-mgmt/portupgrade-devel/Makefile3
-rw-r--r--ports-mgmt/portupgrade/Makefile3
-rw-r--r--print/ansiprint/Makefile3
-rw-r--r--print/bibcursed/Makefile3
-rw-r--r--print/catdvi/Makefile3
-rw-r--r--print/dvips2ascii/Makefile3
-rw-r--r--print/easylatex/Makefile3
-rw-r--r--print/epsonepl/Makefile3
-rw-r--r--print/fontforge/Makefile2
-rw-r--r--print/freetype-tools/Makefile11
-rw-r--r--print/freetype/Makefile11
-rw-r--r--print/freetype2/Makefile11
-rw-r--r--print/ft2demos/Makefile11
-rw-r--r--print/ghostscript7/Makefile2
-rw-r--r--print/ghostscript8/Makefile2
-rw-r--r--print/guitartex/Makefile3
-rw-r--r--print/gutenprint-base/Makefile3
-rw-r--r--print/hpijs/Makefile3
-rw-r--r--print/hplip/Makefile3
-rw-r--r--print/hyperlatex/Makefile3
-rw-r--r--print/jabref/Makefile3
-rw-r--r--print/jadetex/Makefile3
-rw-r--r--print/kaspaliste/Makefile3
-rw-r--r--print/kcdlabel/Makefile3
-rw-r--r--print/latex-beamer/Makefile3
-rw-r--r--print/latex-pgf/Makefile3
-rw-r--r--print/latex2rtf/Makefile4
-rw-r--r--print/latex2slides/Makefile3
-rw-r--r--print/libppd/Makefile3
-rw-r--r--print/muttprint/Makefile3
-rw-r--r--print/panda/Makefile5
-rw-r--r--print/paps/Makefile3
-rw-r--r--print/pcal/Makefile3
-rw-r--r--print/pnm2ppa/Makefile3
-rw-r--r--print/pslib/Makefile3
-rw-r--r--print/pup/Makefile3
-rw-r--r--print/py-fonttools/Makefile2
-rw-r--r--print/py-pyscript/Makefile3
-rw-r--r--print/py-rtf/Makefile3
-rw-r--r--print/rtf2latex2e/Makefile3
-rw-r--r--print/scribus-devel/Makefile1
-rw-r--r--print/scribus/Makefile1
-rw-r--r--print/texpower/Makefile3
-rw-r--r--print/texvc/Makefile3
-rw-r--r--print/ttf2pt1/Makefile3
-rw-r--r--print/xdvik/Makefile3
-rw-r--r--print/xpp/Makefile3
-rw-r--r--russian/bugzilla-ru/Makefile2
-rw-r--r--russian/bugzilla3-ru/Makefile2
-rw-r--r--russian/rux/Makefile2
-rw-r--r--science/InsightToolkit/Makefile3
-rw-r--r--science/bodr/Makefile3
-rw-r--r--science/brian/Makefile3
-rw-r--r--science/buddy/Makefile3
-rw-r--r--science/cgnslib/Makefile3
-rw-r--r--science/chemical-mime-data/Makefile3
-rw-r--r--science/crf++/Makefile4
-rw-r--r--science/elmer-eio/Makefile2
-rw-r--r--science/elmer-fem/Makefile2
-rw-r--r--science/elmer-hutiter/Makefile2
-rw-r--r--science/elmer-matc/Makefile2
-rw-r--r--science/elmer-meshgen2d/Makefile2
-rw-r--r--science/elmergrid/Makefile2
-rw-r--r--science/elmerpost/Makefile2
-rw-r--r--science/euler/Makefile3
-rw-r--r--science/felt/Makefile2
-rw-r--r--science/gdis/Makefile3
-rw-r--r--science/gerris/Makefile2
-rw-r--r--science/ghmm/Makefile3
-rw-r--r--science/gnudatalanguage/Makefile3
-rw-r--r--science/gramps/Makefile2
-rw-r--r--science/gtamsanalyzer/Makefile3
-rw-r--r--science/isaac-cfd/Makefile3
-rw-r--r--science/jmol/Makefile2
-rw-r--r--science/linsmith/Makefile2
-rw-r--r--science/mayavi/Makefile3
-rw-r--r--science/mpqc/Makefile3
-rw-r--r--science/nifticlib/Makefile3
-rw-r--r--science/pcp/Makefile3
-rw-r--r--science/psi3/Makefile4
-rw-r--r--science/py-mdp/Makefile3
-rw-r--r--science/py-paida/Makefile2
-rw-r--r--science/pycdf/Makefile3
-rw-r--r--science/vis5d+/Makefile3
-rw-r--r--science/xmds/Makefile2
-rw-r--r--security/aescrypt/Makefile2
-rw-r--r--security/afterglow/Makefile3
-rw-r--r--security/aide/Makefile4
-rw-r--r--security/aimsniff/Makefile3
-rw-r--r--security/amavisd-milter/Makefile2
-rw-r--r--security/aolserver-nsencrypt/Makefile3
-rw-r--r--security/aolserver-nsopenssl/Makefile3
-rw-r--r--security/aolserver-nssha1/Makefile3
-rw-r--r--security/barnyard/Makefile2
-rw-r--r--security/base/Makefile2
-rw-r--r--security/beecrypt/Makefile3
-rw-r--r--security/blocksshd/Makefile2
-rw-r--r--security/bubblegum/Makefile3
-rw-r--r--security/ccrypt/Makefile4
-rw-r--r--security/chaosreader/Makefile3
-rw-r--r--security/checkpassword-pam/Makefile3
-rw-r--r--security/chroot_safe/Makefile3
-rw-r--r--security/clamtk/Makefile2
-rw-r--r--security/clusterssh/Makefile3
-rw-r--r--security/courier-authlib/Makefile2
-rw-r--r--security/cp2fwb/Makefile3
-rw-r--r--security/crank/Makefile3
-rw-r--r--security/cryptopp/Makefile1
-rw-r--r--security/denyhosts/Makefile3
-rw-r--r--security/distcache-devel/Makefile4
-rw-r--r--security/distcache/Makefile4
-rw-r--r--security/doorman/Makefile3
-rw-r--r--security/fpm/Makefile3
-rw-r--r--security/fprint_demo/Makefile3
-rw-r--r--security/fswatch/Makefile3
-rw-r--r--security/ftimes/Makefile3
-rw-r--r--security/fuzz/Makefile3
-rw-r--r--security/fwbuilder-devel/Makefile3
-rw-r--r--security/fwbuilder/Makefile3
-rw-r--r--security/gnome-password-generator/Makefile2
-rw-r--r--security/gtk-knocker/Makefile3
-rw-r--r--security/gtkpasman/Makefile2
-rw-r--r--security/integrit/Makefile3
-rw-r--r--security/kedpm/Makefile3
-rw-r--r--security/keepassx/Makefile3
-rw-r--r--security/klamav/Makefile2
-rw-r--r--security/knocker/Makefile3
-rw-r--r--security/kssh/Makefile3
-rw-r--r--security/libecc/Makefile3
-rw-r--r--security/libfprint/Makefile3
-rw-r--r--security/libfwbuilder-devel/Makefile3
-rw-r--r--security/libfwbuilder/Makefile3
-rw-r--r--security/libmcrypt/Makefile3
-rw-r--r--security/libpwstor/Makefile2
-rw-r--r--security/mailzu/Makefile2
-rw-r--r--security/mcrypt/Makefile6
-rw-r--r--security/md5deep/Makefile2
-rw-r--r--security/mosref/Makefile3
-rw-r--r--security/mussh/Makefile3
-rw-r--r--security/ncrypt/Makefile3
-rw-r--r--security/newpki-client/Makefile3
-rw-r--r--security/newpki-lib/Makefile3
-rw-r--r--security/newpki-server/Makefile3
-rw-r--r--security/ocaml-ssl/Makefile3
-rw-r--r--security/oidentd/Makefile3
-rw-r--r--security/oinkmaster/Makefile3
-rw-r--r--security/openfwtk/Makefile3
-rw-r--r--security/openvpn-admin/Makefile3
-rw-r--r--security/osslsigncode/Makefile2
-rw-r--r--security/p5-GnuPG-Interface/Makefile2
-rw-r--r--security/p5-openxpki-client-html-mason/Makefile3
-rw-r--r--security/p5-openxpki-client-scep/Makefile3
-rw-r--r--security/p5-openxpki-client/Makefile3
-rw-r--r--security/p5-openxpki-deployment/Makefile3
-rw-r--r--security/p5-openxpki-i18n/Makefile3
-rw-r--r--security/p5-openxpki/Makefile3
-rw-r--r--security/pam-mysql/Makefile3
-rw-r--r--security/pam-pgsql/Makefile3
-rw-r--r--security/pam_abl/Makefile3
-rw-r--r--security/pam_fprint/Makefile3
-rw-r--r--security/pamtester/Makefile3
-rw-r--r--security/pantera/Makefile3
-rw-r--r--security/pdfcrack/Makefile2
-rw-r--r--security/phpdeadlock/Makefile2
-rw-r--r--security/pidgin-encryption/Makefile2
-rw-r--r--security/pks/Makefile3
-rw-r--r--security/portsentry/Makefile3
-rw-r--r--security/proxytunnel/Makefile3
-rw-r--r--security/pwman/Makefile2
-rw-r--r--security/py-PF/Makefile3
-rw-r--r--security/py-cryptkit/Makefile3
-rw-r--r--security/py-fail2ban/Makefile2
-rw-r--r--security/py-gnupg/Makefile3
-rw-r--r--security/py-mcrypt/Makefile3
-rw-r--r--security/py-mhash/Makefile3
-rw-r--r--security/py-openssl/Makefile3
-rw-r--r--security/py-posix1e/Makefile3
-rw-r--r--security/py-pow/Makefile3
-rw-r--r--security/py-pyme/Makefile2
-rw-r--r--security/py-trustedpickle/Makefile3
-rw-r--r--security/py-twofish/Makefile3
-rw-r--r--security/qtfw/Makefile3
-rw-r--r--security/rarcrack/Makefile2
-rw-r--r--security/ruby-pam/Makefile3
-rw-r--r--security/sancp/Makefile2
-rw-r--r--security/scamp/Makefile2
-rw-r--r--security/sguil-client/Makefile3
-rw-r--r--security/sguil-sensor/Makefile3
-rw-r--r--security/sguil-server/Makefile3
-rw-r--r--security/sha/Makefile3
-rw-r--r--security/shimmer/Makefile2
-rw-r--r--security/shttpscanner/Makefile2
-rw-r--r--security/snortsms/Makefile2
-rw-r--r--security/srm/Makefile3
-rw-r--r--security/ssh-gui/Makefile3
-rw-r--r--security/sshguard/Makefile2
-rw-r--r--security/steghide/Makefile3
-rw-r--r--security/sudoscript/Makefile2
-rw-r--r--security/swatch/Makefile3
-rw-r--r--security/switzerland/Makefile2
-rw-r--r--security/symbion-sslproxy/Makefile3
-rw-r--r--security/tripwire/Makefile3
-rw-r--r--security/umit/Makefile4
-rw-r--r--security/vinetto/Makefile3
-rw-r--r--security/w3af/Makefile3
-rw-r--r--security/webfwlog/Makefile2
-rw-r--r--security/wipe/Makefile3
-rw-r--r--security/yafic/Makefile3
-rw-r--r--security/zebedee/Makefile3
-rw-r--r--shells/heirloom-sh/Makefile2
-rw-r--r--shells/ibsh/Makefile3
-rw-r--r--shells/rssh/Makefile3
-rw-r--r--shells/scponly/Makefile4
-rw-r--r--shells/zsh/Makefile2
-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
357 files changed, 393 insertions, 638 deletions
diff --git a/palm/barry/Makefile b/palm/barry/Makefile
index 4f8c7e7..11388ec 100644
--- a/palm/barry/Makefile
+++ b/palm/barry/Makefile
@@ -9,7 +9,7 @@ PORTNAME= barry
PORTVERSION= 0.12
PORTREVISION= 1
CATEGORIES= palm
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= meitolake@gmail.com
COMMENT= C++ library for interfacing with the BlackBerry Handheld
diff --git a/palm/bibelot/Makefile b/palm/bibelot/Makefile
index 78ef52e..61cc823 100644
--- a/palm/bibelot/Makefile
+++ b/palm/bibelot/Makefile
@@ -9,8 +9,7 @@
PORTNAME= bibelot
PORTVERSION= 0.9.4
CATEGORIES= palm
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/Bibelot/${PORTVERSION}
MAINTAINER= ijliao@FreeBSD.org
COMMENT= Formats and converts text documents into compressed PalmDoc .pdb files
diff --git a/palm/makeztxt/Makefile b/palm/makeztxt/Makefile
index 00a420e..bbe7868 100644
--- a/palm/makeztxt/Makefile
+++ b/palm/makeztxt/Makefile
@@ -8,8 +8,7 @@
PORTNAME= makeztxt
PORTVERSION= 1.62
CATEGORIES= palm
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gutenpalm
+MASTER_SITES= SF/gutenpalm/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= ports@FreeBSD.org
diff --git a/palm/pilrc/Makefile b/palm/pilrc/Makefile
index 3611b5c..4be1eed 100644
--- a/palm/pilrc/Makefile
+++ b/palm/pilrc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pilrc
PORTVERSION= 3.2
PORTREVISION= 3
CATEGORIES= palm
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Resource compiler for Pilot applications
diff --git a/palm/romeo/Makefile b/palm/romeo/Makefile
index ceac703..9888fca 100644
--- a/palm/romeo/Makefile
+++ b/palm/romeo/Makefile
@@ -10,8 +10,7 @@ PORTNAME= romeo
PORTVERSION= 0.5.0
PORTREVISION= 1
CATEGORIES= palm
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
EXTRACT_SUFX= .tgz
MAINTAINER= ijliao@FreeBSD.org
diff --git a/palm/synce-gvfs/Makefile b/palm/synce-gvfs/Makefile
index 3e0924c..cd388d4 100644
--- a/palm/synce-gvfs/Makefile
+++ b/palm/synce-gvfs/Makefile
@@ -9,7 +9,7 @@ PORTNAME= synce-gvfs
PORTVERSION= 0.2.2
PORTREVISION= 1
CATEGORIES= palm
-MASTER_SITES= SF/synce
+MASTER_SITES= SF/synce/SynCE-GNOME/0.13
MAINTAINER= avl@FreeBSD.org
COMMENT= GVFS module for access Windows Mobile devices
diff --git a/palm/synce-hal/Makefile b/palm/synce-hal/Makefile
index 48a32ad..650a9ba 100644
--- a/palm/synce-hal/Makefile
+++ b/palm/synce-hal/Makefile
@@ -8,8 +8,7 @@ PORTNAME= hal
PORTVERSION= 0.13.1
PORTEPOCH= 1
CATEGORIES= palm
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= synce
+MASTER_SITES= SF/synce/SynCE/0.13
PKGNAMEPREFIX= synce-
DISTNAME= synce-hal-${PORTVERSION}
diff --git a/palm/synce-librapi2/Makefile b/palm/synce-librapi2/Makefile
index 6f76e7c..41c5e43 100644
--- a/palm/synce-librapi2/Makefile
+++ b/palm/synce-librapi2/Makefile
@@ -7,8 +7,7 @@
PORTNAME= librapi2
PORTVERSION= 0.13.1
CATEGORIES?= palm
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= synce
+MASTER_SITES= SF/synce/SynCE/0.13
PKGNAMEPREFIX?= synce-
MAINTAINER= webmaster@kibab.com
diff --git a/palm/synce-librra/Makefile b/palm/synce-librra/Makefile
index d627db7..dd231be 100644
--- a/palm/synce-librra/Makefile
+++ b/palm/synce-librra/Makefile
@@ -7,7 +7,7 @@
PORTNAME= librra
PORTVERSION= 0.13
CATEGORIES?= palm
-MASTER_SITES= SF/synce
+MASTER_SITES= SF/synce/SynCE/${PORTVERSION}
PKGNAMEPREFIX?= synce-
MAINTAINER= webmaster@kibab.com
diff --git a/palm/synce-libsynce/Makefile b/palm/synce-libsynce/Makefile
index 75fa6cf..3664755 100644
--- a/palm/synce-libsynce/Makefile
+++ b/palm/synce-libsynce/Makefile
@@ -7,7 +7,7 @@
PORTNAME= libsynce
PORTVERSION= 0.13
CATEGORIES= palm
-MASTER_SITES= SF/synce
+MASTER_SITES= SF/synce/SynCE/${PORTVERSION}
PKGNAMEPREFIX= synce-
MAINTAINER= webmaster@kibab.com
diff --git a/palm/synce-serial/Makefile b/palm/synce-serial/Makefile
index 1462dd5..fc320cf 100644
--- a/palm/synce-serial/Makefile
+++ b/palm/synce-serial/Makefile
@@ -7,8 +7,7 @@
PORTNAME= synce-serial
PORTVERSION= 0.11
CATEGORIES= palm
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= synce
+MASTER_SITES= SF/synce/SynCE/${PORTVERSION}
MAINTAINER= avl@FreeBSD.org
COMMENT= Wrapper for pppd to initiate communications with Windows Mobile devices
diff --git a/palm/synce-sync-engine/Makefile b/palm/synce-sync-engine/Makefile
index 2011cea..ecce423 100644
--- a/palm/synce-sync-engine/Makefile
+++ b/palm/synce-sync-engine/Makefile
@@ -7,8 +7,7 @@
PORTNAME?= sync-engine
PORTVERSION= 0.13
CATEGORIES?= palm
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= synce
+MASTER_SITES= SF/synce/SynCE/${PORTVERSION}
DISTNAME= sync-engine-${PORTVERSION}
MAINTAINER?= avl@FreeBSD.org
diff --git a/palm/synce-trayicon/Makefile b/palm/synce-trayicon/Makefile
index cb69375..312a557 100644
--- a/palm/synce-trayicon/Makefile
+++ b/palm/synce-trayicon/Makefile
@@ -8,8 +8,7 @@ PORTNAME= synce-trayicon
PORTVERSION= 0.13
PORTREVISION= 1
CATEGORIES= palm
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= synce
+MASTER_SITES= SF/synce/SynCE-GNOME/${PORTVERSION}
MAINTAINER= avl@FreeBSD.org
COMMENT= GNOME system tray app for monitoring connected WinCE based devices
diff --git a/palm/synce-vdccm/Makefile b/palm/synce-vdccm/Makefile
index fe31f5a..12d384d 100644
--- a/palm/synce-vdccm/Makefile
+++ b/palm/synce-vdccm/Makefile
@@ -7,8 +7,7 @@
PORTNAME= vdccm
PORTVERSION= 0.10.1
CATEGORIES= palm
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= synce
+MASTER_SITES= SF/synce/SynCE/${PORTVERSION}
PKGNAMEPREFIX= synce-
MAINTAINER= avl@FreeBSD.org
diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
index 1246102..7ce8069 100644
--- a/polish/gnugadu2/Makefile
+++ b/polish/gnugadu2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnugadu2
PORTVERSION= 2.3.0
PORTREVISION= 7
CATEGORIES= polish net-im
-MASTER_SITES= SF/ggadu
+MASTER_SITES= SF/ggadu/gg2/${PORTVERSION}
DISTNAME= gg2-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/polish/libtlen/Makefile b/polish/libtlen/Makefile
index b2f140c..22ce9c7 100644
--- a/polish/libtlen/Makefile
+++ b/polish/libtlen/Makefile
@@ -9,8 +9,7 @@
PORTNAME= libtlen
PORTVERSION= 20041113
CATEGORIES= polish net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= smyru@heron.pl
COMMENT= Backend for interoperability with Tlen.pl, Polish IM network
diff --git a/polish/qnapi/Makefile b/polish/qnapi/Makefile
index b853e66e..9b0a179 100644
--- a/polish/qnapi/Makefile
+++ b/polish/qnapi/Makefile
@@ -9,8 +9,7 @@ PORTNAME= qnapi
PORTVERSION= 0.1.5
PORTREVISION= 1
CATEGORIES= polish multimedia
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= qnapi
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= c0rn@o2.pl
COMMENT= Unoffical napiprojekt.pl qt4 client
diff --git a/polish/tleenx2/Makefile b/polish/tleenx2/Makefile
index 8949934..8451c53 100644
--- a/polish/tleenx2/Makefile
+++ b/polish/tleenx2/Makefile
@@ -9,7 +9,7 @@ PORTNAME= tleenx2
PORTVERSION= 20040214
PORTREVISION= 7
CATEGORIES= polish net
-MASTER_SITES= SF/leenx
+MASTER_SITES= SF/tleenx/tleenx2/${DISTNAME}
DISTNAME= TleenX2-${PORTVERSION}
MAINTAINER= mkorzen@gmail.com
diff --git a/ports-mgmt/kports/Makefile b/ports-mgmt/kports/Makefile
index 376f712..be56c6c 100644
--- a/ports-mgmt/kports/Makefile
+++ b/ports-mgmt/kports/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kports
PORTVERSION= 0.6.1
PORTREVISION= 5
CATEGORIES= ports-mgmt kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= kports@soulrebel.in-berlin.de
COMMENT= KDE3-Version of your favorite frontend to the Ports
diff --git a/ports-mgmt/pkg-orphan/Makefile b/ports-mgmt/pkg-orphan/Makefile
index e1ba3c4..e73d3e41 100644
--- a/ports-mgmt/pkg-orphan/Makefile
+++ b/ports-mgmt/pkg-orphan/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pkg-orphan
PORTVERSION= 0.1.1
CATEGORIES= ports-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= vsemionov@gmail.com
COMMENT= A console utility for managing unreferenced FreeBSD packages
diff --git a/ports-mgmt/portdowngrade/Makefile b/ports-mgmt/portdowngrade/Makefile
index 5ba9daf..ea01c4b 100644
--- a/ports-mgmt/portdowngrade/Makefile
+++ b/ports-mgmt/portdowngrade/Makefile
@@ -9,8 +9,7 @@ PORTNAME= portdowngrade
PORTVERSION= 0.6
PORTREVISION= 1
CATEGORIES= ports-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= h.eichmann@gmx.de
COMMENT= Sets a port back to a previous version
diff --git a/ports-mgmt/portell/Makefile b/ports-mgmt/portell/Makefile
index 44be145..dfd3f2c 100644
--- a/ports-mgmt/portell/Makefile
+++ b/ports-mgmt/portell/Makefile
@@ -9,8 +9,7 @@ PORTNAME= portell
PORTVERSION= 0.2
PORTREVISION= 1
CATEGORIES= ports-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
EXTRACT_SUFX= .zip
MAINTAINER= mich@FreeBSD.org
diff --git a/ports-mgmt/portmanager/Makefile b/ports-mgmt/portmanager/Makefile
index 7487081..2a66a2f 100644
--- a/ports-mgmt/portmanager/Makefile
+++ b/ports-mgmt/portmanager/Makefile
@@ -9,8 +9,7 @@ PORTNAME= portmanager
PORTVERSION= 0.4.1
PORTREVISION= 9
CATEGORIES= ports-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= portmanager
+MASTER_SITES= SF
MAINTAINER= rnoland@FreeBSD.org
COMMENT= FreeBSD installed ports status and safe update utility
diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 2982da8..456224d 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -8,8 +8,7 @@
PORTNAME= portupgrade-devel
PORTVERSION= 2.4.6
CATEGORIES= ports-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= portupgrade
+MASTER_SITES= SF/portupgrade/pkgtools/${PORTVERSION}
DISTNAME= pkgtools-${DISTVERSION}
MAINTAINER= ruby@FreeBSD.org
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index 7cbb4b5..3b648a2 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 2.4.6
PORTREVISION= 3
PORTEPOCH= 2
CATEGORIES= ports-mgmt
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/pkgtools/${PORTVERSION}
DISTNAME= pkgtools-${DISTVERSION}
MAINTAINER= ruby@FreeBSD.org
diff --git a/print/ansiprint/Makefile b/print/ansiprint/Makefile
index d38cad6..535ec64 100644
--- a/print/ansiprint/Makefile
+++ b/print/ansiprint/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ansiprint
PORTVERSION= 1.0
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/print/bibcursed/Makefile b/print/bibcursed/Makefile
index 6ef8a34..f33f964 100644
--- a/print/bibcursed/Makefile
+++ b/print/bibcursed/Makefile
@@ -9,8 +9,7 @@
PORTNAME= bibcursed
PORTVERSION= 2.0.0
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_${PORTVERSION}
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/print/catdvi/Makefile b/print/catdvi/Makefile
index 283f516..9ee1a59 100644
--- a/print/catdvi/Makefile
+++ b/print/catdvi/Makefile
@@ -10,8 +10,7 @@ PORTNAME= catdvi
PORTVERSION= 0.14
PORTREVISION= 3
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A DVI to text/plain translator
diff --git a/print/dvips2ascii/Makefile b/print/dvips2ascii/Makefile
index 5924a20..6163ae8 100644
--- a/print/dvips2ascii/Makefile
+++ b/print/dvips2ascii/Makefile
@@ -8,8 +8,7 @@
PORTNAME= dvips2ascii
PORTVERSION= 1.3
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= srezic
+MASTER_SITES= SF/srezic/${PORTNAME}/${PORTVERSION}
MAINTAINER= slaven@rezic.de
COMMENT= PostScript (created by dvips) to ascii converter
diff --git a/print/easylatex/Makefile b/print/easylatex/Makefile
index 4194ad9..b879c8d 100644
--- a/print/easylatex/Makefile
+++ b/print/easylatex/Makefile
@@ -9,8 +9,7 @@ PORTNAME= easylatex
PORTVERSION= 0.062
PORTREVISION= 2
CATEGORIES= print textproc
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= nivit@FreeBSD.org
COMMENT= Perl script which transforms "pseudo-LaTeX" into proper LaTeX
diff --git a/print/epsonepl/Makefile b/print/epsonepl/Makefile
index eaf638d..1e12482 100644
--- a/print/epsonepl/Makefile
+++ b/print/epsonepl/Makefile
@@ -9,8 +9,7 @@ PORTNAME= epsonepl
PORTVERSION= 0.2.2
PORTREVISION= 1
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/GS-IJS%20Plugin%20v${PORTVERSION}
DISTNAME= ${PORTNAME}ijs-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index f6b3220..5831539 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -9,7 +9,7 @@ PORTNAME= fontforge
PORTVERSION= 20090622
PORTREVISION= 1
CATEGORIES= print
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
DISTFILES= ${EXTRACT_ONLY} ${DOCFILES}
EXTRACT_ONLY= ${PORTNAME}_full-${PORTVERSION}.tar.bz2
diff --git a/print/freetype-tools/Makefile b/print/freetype-tools/Makefile
index ea4c4c4..91a7f67 100644
--- a/print/freetype-tools/Makefile
+++ b/print/freetype-tools/Makefile
@@ -9,13 +9,12 @@ PORTNAME= freetype-tools
PORTVERSION= 1.3.1
PORTREVISION= 6
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
- http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
- http://www.funet.fi/pub/mirrors/ftp.freetype.org/%SUBDIR%/ \
- http://ftp.sunet.se/pub/text-processing/freetype/%SUBDIR%/ \
+MASTER_SITES= SF/freetype/freetype/${PORTVERSION} \
+ http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype1/ \
+ http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype1/ \
+ http://ftp.sunet.se/pub/text-processing/freetype/freetype1/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/freetype/&,} \
- ftp://ftp.freetype.org/freetype/%SUBDIR%/
-MASTER_SITE_SUBDIR= freetype1
+ ftp://ftp.freetype.org/freetype/freetupe1/
DISTNAME= freetype-${PORTVERSION}
MAINTAINER= rafan@FreeBSD.org
diff --git a/print/freetype/Makefile b/print/freetype/Makefile
index 8d07b7d..843283d 100644
--- a/print/freetype/Makefile
+++ b/print/freetype/Makefile
@@ -9,13 +9,12 @@ PORTNAME= freetype
PORTVERSION= 1.3.1
PORTREVISION= 4
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
- http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
- http://www.funet.fi/pub/mirrors/ftp.freetype.org/%SUBDIR%/ \
- http://ftp.sunet.se/pub/text-processing/freetype/%SUBDIR%/ \
+MASTER_SITES= SF \
+ http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype1/ \
+ http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype1/ \
+ http://ftp.sunet.se/pub/text-processing/freetype/freetype1/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/freetype/&,} \
- ftp://ftp.freetype.org/freetype/%SUBDIR%/
-MASTER_SITE_SUBDIR= freetype1
+ ftp://ftp.freetype.org/freetype/freetupe1/
MAINTAINER= ports@FreeBSD.org
COMMENT= A free and portable TrueType font rendering engine
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index 1d3b75c..d3b6909 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -10,13 +10,12 @@ PORTNAME= freetype2
PORTVERSION= 2.3.9
PORTREVISION= 1
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
- http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
- http://www.funet.fi/pub/mirrors/ftp.freetype.org/%SUBDIR%/ \
- http://ftp.sunet.se/pub/text-processing/freetype/%SUBDIR%/ \
+MASTER_SITES= SF/freetype/${PORTNAME}/${PORTVERSION} \
+ http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \
+ http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype2/ \
+ http://ftp.sunet.se/pub/text-processing/freetype/freetype2/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/freetype/&,} \
- ftp://ftp.freetype.org/freetype/%SUBDIR%/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+ ftp://ftp.freetype.org/freetype/freetype2/
DISTNAME= ${PORTNAME:S/2//}-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/print/ft2demos/Makefile b/print/ft2demos/Makefile
index 46e2c2a..9d6b5c7 100644
--- a/print/ft2demos/Makefile
+++ b/print/ft2demos/Makefile
@@ -8,13 +8,12 @@
PORTNAME= ft2demos
PORTVERSION= 2.3.9
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
- http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
- http://www.funet.fi/pub/mirrors/ftp.freetype.org/%SUBDIR%/ \
- http://ftp.sunet.se/pub/text-processing/freetype/%SUBDIR%/ \
+MASTER_SITES= SF/freetype/freetype-demos/${PORTVERSION} \
+ http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \
+ http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype2/ \
+ http://ftp.sunet.se/pub/text-processing/freetype/freetype2/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/freetype/&,} \
- ftp://ftp.freetype.org/freetype/%SUBDIR%/
-MASTER_SITE_SUBDIR= freetype2
+ ftp://ftp.freetype.org/freetype/freetype2/
MAINTAINER= ports@FreeBSD.org
COMMENT= Demo programs for FreeType2
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 71ac081..9a4554e 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ghostscript7
PORTVERSION= 7.07
PORTREVISION= 21
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs/} \
+MASTER_SITES= SF/ghostscript/gnu-gs/${PORTVERSION}:gs_srcs \
${MASTER_SITE_PORTS_JP:S/$/:ports_jp,ports_jp_gs/} \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs${PORTVERSION:S/.//}/:gs_srcs
MASTER_SITE_SUBDIR= ghostscript/:gs_srcs,ports_jp_gs \
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 94f2fe8..c2386f9 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -9,7 +9,7 @@ PORTNAME= ghostscript8
PORTVERSION= 8.64
PORTREVISION= 6
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs/} \
+MASTER_SITES= SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs${PORTVERSION:S/.//}/:gs_srcs \
http://www.humblesoft.com/pub/:epag
MASTER_SITE_SUBDIR= ghostscript/:gs_srcs
diff --git a/print/guitartex/Makefile b/print/guitartex/Makefile
index 2ffd29d..95c401a 100644
--- a/print/guitartex/Makefile
+++ b/print/guitartex/Makefile
@@ -10,8 +10,7 @@ PORTNAME= guitartex
PORTVERSION= 2.8.2
PORTREVISION= 1
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/GuitarTeX/GuitarTeX-${PORTVERSION}
## Hack just for this "fix version"
DISTNAME= ${PORTNAME}-${PORTVERSION}-fix1
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/print/gutenprint-base/Makefile b/print/gutenprint-base/Makefile
index 7fb977a..7d99358 100644
--- a/print/gutenprint-base/Makefile
+++ b/print/gutenprint-base/Makefile
@@ -10,8 +10,7 @@ PORTNAME?= gutenprint
PORTVERSION= 5.1.7
PORTREVISION?= 2
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= gimp-print
+MASTER_SITES= SF/gimp-print/gutenprint-5.1/${PORTVERSION}
PKGNAMESUFFIX?= -base
MAINTAINER= ahze@FreeBSD.org
diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile
index 94627d8..683176a 100644
--- a/print/hpijs/Makefile
+++ b/print/hpijs/Makefile
@@ -9,8 +9,7 @@ PORTNAME= hpijs
PORTVERSION= 2.1.4
PORTREVISION= 3
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= hpinkjet
+MASTER_SITES= SF/hpinkjet/${PORTNAME}/${PORTVERSION}
MAINTAINER= DougB@FreeBSD.org
COMMENT= Drivers and support resources for HP Inkjet Printers
diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 39bd09a..3d0e2c4 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -9,8 +9,7 @@ PORTNAME= hplip
PORTVERSION= 2.8.2
PORTREVISION= 5
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= hplip
+MASTER_SITES= SF
MAINTAINER= amistry@am-productions.biz
COMMENT= Drivers and utilities for HP Printers and All-in-One devices
diff --git a/print/hyperlatex/Makefile b/print/hyperlatex/Makefile
index 990b623..7a3e18c 100644
--- a/print/hyperlatex/Makefile
+++ b/print/hyperlatex/Makefile
@@ -8,8 +8,7 @@
PORTNAME= Hyperlatex
DISTVERSION= 2.9a
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=hyperlatex
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/2.9a
MAINTAINER= ports@FreeBSD.org
COMMENT= Produce HTML and printed documents from LaTeX source
diff --git a/print/jabref/Makefile b/print/jabref/Makefile
index e6a8ed4..1a7f10e 100644
--- a/print/jabref/Makefile
+++ b/print/jabref/Makefile
@@ -8,8 +8,7 @@ PORTNAME= jabref
PORTVERSION= 2.5
PORTEPOCH= 1
CATEGORIES= print java editors
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= JabRef-${PORTVERSION}
EXTRACT_SUFX= .jar
EXTRACT_ONLY= #
diff --git a/print/jadetex/Makefile b/print/jadetex/Makefile
index 14bd999..d92e25c 100644
--- a/print/jadetex/Makefile
+++ b/print/jadetex/Makefile
@@ -9,8 +9,7 @@ PORTNAME= jadetex
PORTVERSION= 3.13
PORTREVISION= 3
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= jadetex
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A TeX backend for Jade, for typesetting SGML documents
diff --git a/print/kaspaliste/Makefile b/print/kaspaliste/Makefile
index df43d21..d435adc 100644
--- a/print/kaspaliste/Makefile
+++ b/print/kaspaliste/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kaspaliste
PORTVERSION= 0.96
PORTREVISION= 7
CATEGORIES= print kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kaspaliste
+MASTER_SITES= SF
MAINTAINER= jaapb@kerguelen.org
COMMENT= Bibliography tool for KDE/Postgres/BibTeX
diff --git a/print/kcdlabel/Makefile b/print/kcdlabel/Makefile
index 9a9f371..ec3b47e 100644
--- a/print/kcdlabel/Makefile
+++ b/print/kcdlabel/Makefile
@@ -8,8 +8,7 @@ PORTNAME= kcdlabel
PORTVERSION= 2.12
PORTREVISION= 7
CATEGORIES= print kde
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-KDE3
DISTNAME= ${PORTNAME}-${PORTVERSION}-KDE3
MAINTAINER= markus@FreeBSD.org
diff --git a/print/latex-beamer/Makefile b/print/latex-beamer/Makefile
index 0e8e3f3..af36bba 100644
--- a/print/latex-beamer/Makefile
+++ b/print/latex-beamer/Makefile
@@ -8,8 +8,7 @@ PORTNAME= latex-beamer
PORTVERSION= 3.07
PORTREVISION= 2
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/version%20${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
COMMENT= A LaTeX class to create a beamer presentation
diff --git a/print/latex-pgf/Makefile b/print/latex-pgf/Makefile
index eb252b7..8eec40a 100644
--- a/print/latex-pgf/Makefile
+++ b/print/latex-pgf/Makefile
@@ -8,8 +8,7 @@ PORTNAME= latex-pgf
PORTVERSION= 2.00
PORTREVISION= 1
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pgf
+MASTER_SITES= SF/pgf/pgf/version%20${PORTVERSION}
DISTNAME= ${PORTNAME:S/^latex-//}-${PORTVERSION}
MAINTAINER= hrs@FreeBSD.org
diff --git a/print/latex2rtf/Makefile b/print/latex2rtf/Makefile
index fdcb471..71b0fdf 100644
--- a/print/latex2rtf/Makefile
+++ b/print/latex2rtf/Makefile
@@ -8,9 +8,9 @@
PORTNAME= latex2rtf
PORTVERSION= 1.9.19
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-unix/${PORTVERSION} \
${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR= ${PORTNAME} support/latex2rtf
+
MAINTAINER= joerg@FreeBSD.org
COMMENT= Translator from LaTeX to RTF
diff --git a/print/latex2slides/Makefile b/print/latex2slides/Makefile
index a966304..b50b9d56 100644
--- a/print/latex2slides/Makefile
+++ b/print/latex2slides/Makefile
@@ -10,8 +10,7 @@ PORTNAME= latex2slides
PORTVERSION= 1.0
PORTREVISION= 2
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/print/libppd/Makefile b/print/libppd/Makefile
index eae4fcb..b47bc74 100644
--- a/print/libppd/Makefile
+++ b/print/libppd/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libppd
PORTVERSION= 0.10
PORTREVISION= 2
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= lpr
+MASTER_SITES= SF/lpr/${PORTNAME}/${PORTVERSION}
MAINTAINER= e-masson@kisoft-services.com
COMMENT= A library providing routines for ppd files
diff --git a/print/muttprint/Makefile b/print/muttprint/Makefile
index a9ba14f..b299517 100644
--- a/print/muttprint/Makefile
+++ b/print/muttprint/Makefile
@@ -9,8 +9,7 @@ PORTNAME?= muttprint
PORTVERSION= 0.72d
PORTREVISION= 3
CATEGORIES?= print mail
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= muttprint
+MASTER_SITES= SF/muttprint/muttprint/muttprint-${PORTVERSION}
MAINTAINER?= ports@FreeBSD.org
COMMENT?= Utility to print mail for most any mail client
diff --git a/print/panda/Makefile b/print/panda/Makefile
index a3b0fe4..3a0b1c1 100644
--- a/print/panda/Makefile
+++ b/print/panda/Makefile
@@ -9,10 +9,11 @@ PORTNAME= panda
PORTVERSION= 0.5.4
PORTREVISION= 2
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
${MASTER_SITE_SAVANNAH} \
+
http://www.stillhq.com/panda/source/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= ports@FreeBSD.org
COMMENT= A PDF generation library
diff --git a/print/paps/Makefile b/print/paps/Makefile
index 7c21357..1ea85ca 100644
--- a/print/paps/Makefile
+++ b/print/paps/Makefile
@@ -9,8 +9,7 @@ PORTNAME= paps
PORTVERSION= 0.6.8
PORTREVISION= 1
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= johans@stack.nl
COMMENT= UTF-8 to PostScript converter using Pango
diff --git a/print/pcal/Makefile b/print/pcal/Makefile
index ae49904..dd78cae 100644
--- a/print/pcal/Makefile
+++ b/print/pcal/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pcal
PORTVERSION= 4.11.0
CATEGORIES= print
-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/print/pnm2ppa/Makefile b/print/pnm2ppa/Makefile
index a7b4f0d..8d2a490 100644
--- a/print/pnm2ppa/Makefile
+++ b/print/pnm2ppa/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pnm2ppa
PORTVERSION= 1.12
PORTREVISION= 1
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Convert PNM images to PPA for some HP printers
diff --git a/print/pslib/Makefile b/print/pslib/Makefile
index ccda6fd..fdf2249 100644
--- a/print/pslib/Makefile
+++ b/print/pslib/Makefile
@@ -10,8 +10,7 @@ PORTNAME= pslib
PORTVERSION= 0.4.1
PORTREVISION= 2
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= mva@FreeBSD.org
COMMENT= A C-library for generating multi page PostScript documents
diff --git a/print/pup/Makefile b/print/pup/Makefile
index 97c6728..1da37c9 100644
--- a/print/pup/Makefile
+++ b/print/pup/Makefile
@@ -10,8 +10,7 @@ PORTVERSION= 1.1
PORTREVISION= 4
CATEGORIES= print
#MASTER_SITES= http://download.sourceforge.net/pup/
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION}_src
MAINTAINER= ports@FreeBSD.org
diff --git a/print/py-fonttools/Makefile b/print/py-fonttools/Makefile
index e0574c2..70735d3 100644
--- a/print/py-fonttools/Makefile
+++ b/print/py-fonttools/Makefile
@@ -9,7 +9,7 @@ PORTNAME= fonttools
PORTVERSION= 2.2
PORTREVISION= 1
CATEGORIES= print python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Source%20code/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/print/py-pyscript/Makefile b/print/py-pyscript/Makefile
index 0187802..5920716 100644
--- a/print/py-pyscript/Makefile
+++ b/print/py-pyscript/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pyscript
PORTVERSION= 0.6.1
PORTREVISION= 2
CATEGORIES= print graphics python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nivit@FreeBSD.org
diff --git a/print/py-rtf/Makefile b/print/py-rtf/Makefile
index 7b09b2f..77a3681 100644
--- a/print/py-rtf/Makefile
+++ b/print/py-rtf/Makefile
@@ -8,8 +8,7 @@
PORTNAME= rtf
PORTVERSION= 0.45
CATEGORIES= print python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pyrtf
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= PyRTF-${PORTVERSION}
diff --git a/print/rtf2latex2e/Makefile b/print/rtf2latex2e/Makefile
index df51320..107bf41 100644
--- a/print/rtf2latex2e/Makefile
+++ b/print/rtf2latex2e/Makefile
@@ -8,8 +8,7 @@
PORTNAME= rtf2latex2e
PORTVERSION= 1.0
CATEGORIES= print
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= rtf2latex2e
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-unix/${PORTVERSION}fc2
DISTNAME= ${PORTNAME}Unix1
MAINTAINER= martin.dieringer@gmx.de
diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index e0b5820..3f2a135 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= print editors
MASTER_SITES= SF \
http://www.scribus.net/downloads/${PORTVERSION}/
+
MAINTAINER= scjamorim@bsd.com.br
COMMENT= A comprehensive desktop publishing program
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index e0b5820..3f2a135 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= print editors
MASTER_SITES= SF \
http://www.scribus.net/downloads/${PORTVERSION}/
+
MAINTAINER= scjamorim@bsd.com.br
COMMENT= A comprehensive desktop publishing program
diff --git a/print/texpower/Makefile b/print/texpower/Makefile
index 2156997..8cc780d 100644
--- a/print/texpower/Makefile
+++ b/print/texpower/Makefile
@@ -10,8 +10,7 @@ PORTNAME= texpower
PORTVERSION= 0.2
PORTREVISION= 2
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= latex-
DISTNAME= ${PORTNAME}-0-2
diff --git a/print/texvc/Makefile b/print/texvc/Makefile
index af08193..d5ee4b0 100644
--- a/print/texvc/Makefile
+++ b/print/texvc/Makefile
@@ -8,8 +8,7 @@
PORTNAME= texvc
PORTVERSION= 20050202
CATEGORIES= print
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=wikipedia
+MASTER_SITES= SF/wikipedia/Support%20files/${PORTNAME}%20Linux-x86%20source%20%2B%20binary
DISTNAME= ${PORTNAME}-linux-x86-${PORTVERSION}
MAINTAINER= makc@FreeBSD.org
diff --git a/print/ttf2pt1/Makefile b/print/ttf2pt1/Makefile
index 59a3afc..27d4dcc 100644
--- a/print/ttf2pt1/Makefile
+++ b/print/ttf2pt1/Makefile
@@ -10,8 +10,7 @@ PORTNAME= ttf2pt1
PORTVERSION= 3.4.4
PORTREVISION= 2
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile
index e406d44..47ecbc6 100644
--- a/print/xdvik/Makefile
+++ b/print/xdvik/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xdvik
PORTVERSION= 22.84.10
PORTREVISION= 3
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= xdvi
+MASTER_SITES= SF/xdvi/${PORTNAME}/${PORTVERSION}
PKGNAMESUFFIX= -tetex
MAINTAINER= hrs@FreeBSD.org
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index 4dc1d46..9072daa 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -9,8 +9,7 @@ PORTNAME= xpp
PORTVERSION= 1.5
PORTREVISION= 3
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cups
+MASTER_SITES= SF/cups/${PORTNAME}/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/russian/bugzilla-ru/Makefile b/russian/bugzilla-ru/Makefile
index b86992d..50b3e53 100644
--- a/russian/bugzilla-ru/Makefile
+++ b/russian/bugzilla-ru/Makefile
@@ -8,7 +8,7 @@
PORTNAME= bugzilla-ru
DISTVERSION= 3.2rc2-ru-1.0
CATEGORIES= russian
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= bugzilla-${DISTVERSION}
MAINTAINER= skv@FreeBSD.org
diff --git a/russian/bugzilla3-ru/Makefile b/russian/bugzilla3-ru/Makefile
index b86992d..50b3e53 100644
--- a/russian/bugzilla3-ru/Makefile
+++ b/russian/bugzilla3-ru/Makefile
@@ -8,7 +8,7 @@
PORTNAME= bugzilla-ru
DISTVERSION= 3.2rc2-ru-1.0
CATEGORIES= russian
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= bugzilla-${DISTVERSION}
MAINTAINER= skv@FreeBSD.org
diff --git a/russian/rux/Makefile b/russian/rux/Makefile
index 1b524b2..091a080 100644
--- a/russian/rux/Makefile
+++ b/russian/rux/Makefile
@@ -9,7 +9,7 @@ PORTNAME= rux
PORTVERSION= 0.79
PORTREVISION= 1
CATEGORIES= russian
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= anikinsl@gmail.com
COMMENT= The best cyrillic text viewer and code page converter
diff --git a/science/InsightToolkit/Makefile b/science/InsightToolkit/Makefile
index 1e21c48..8353481 100644
--- a/science/InsightToolkit/Makefile
+++ b/science/InsightToolkit/Makefile
@@ -9,8 +9,7 @@ PORTNAME= InsightToolkit
PORTVERSION= 2.8.1
PORTREVISION= 2
CATEGORIES= science biology
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= itk
+MASTER_SITES= SF/itk/itk/2.8
MAINTAINER= jwbacon@tds.net
COMMENT= Insight Toolkit
diff --git a/science/bodr/Makefile b/science/bodr/Makefile
index 4015084..3f9ce70 100644
--- a/science/bodr/Makefile
+++ b/science/bodr/Makefile
@@ -7,8 +7,7 @@
PORTNAME= bodr
PORTVERSION= 8
CATEGORIES= science
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= bodr
+MASTER_SITES= SF
MAINTAINER= pav@FreeBSD.org
COMMENT= Chemistry data like element and isotope properties, atomic radii, etc
diff --git a/science/brian/Makefile b/science/brian/Makefile
index 4a158d2..8494b6e 100644
--- a/science/brian/Makefile
+++ b/science/brian/Makefile
@@ -10,7 +10,8 @@ PORTVERSION= 1.1.2
PORTREVISION= 1
CATEGORIES= science python
MASTER_SITES= CHEESESHOP \
- SF
+ SF/${PORTNAME}/Brian/${PORTVERSION}
+
MAINTAINER= wenheping@gmail.com
COMMENT= A clock-driven simulator for spiking neural networks
diff --git a/science/buddy/Makefile b/science/buddy/Makefile
index 150d192..853d9ce 100644
--- a/science/buddy/Makefile
+++ b/science/buddy/Makefile
@@ -9,8 +9,7 @@ PORTNAME= buddy
PORTVERSION= 2.4
PORTREVISION= 1
CATEGORIES= science
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= buddy
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/BuDDy%20${PORTVERSION}
MAINTAINER= llwang@infor.org
COMMENT= A Binary Decision Diagram library
diff --git a/science/cgnslib/Makefile b/science/cgnslib/Makefile
index 946283a..881d460 100644
--- a/science/cgnslib/Makefile
+++ b/science/cgnslib/Makefile
@@ -9,8 +9,7 @@ PORTNAME= cgnslib
DISTVERSION= 2.5-3
PORTREVISION= 1
CATEGORIES= science
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cgns
+MASTER_SITES= SF/cgns/${PORTNAME}_2.5/Release%203
DISTNAME= ${PORTNAME}_${DISTVERSION}
MAINTAINER= thierry@FreeBSD.org
diff --git a/science/chemical-mime-data/Makefile b/science/chemical-mime-data/Makefile
index 69fffda..3498172 100644
--- a/science/chemical-mime-data/Makefile
+++ b/science/chemical-mime-data/Makefile
@@ -8,8 +8,7 @@ PORTNAME= chemical-mime-data
PORTVERSION= 0.1.94
PORTREVISION= 2
CATEGORIES= science
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= chemical-mime
+MASTER_SITES= SF/chemical-mime/${PORTNAME}/${PORTVERSION}
MAINTAINER= pav@FreeBSD.org
COMMENT= A collection of chemical MIME types for UNIX desktops
diff --git a/science/crf++/Makefile b/science/crf++/Makefile
index 2c1dd8c..5200b7e 100644
--- a/science/crf++/Makefile
+++ b/science/crf++/Makefile
@@ -8,9 +8,9 @@
PORTNAME= crf++
PORTVERSION= 0.52
CATEGORIES= science math
-MASTER_SITES= SF \
+MASTER_SITES= SF/crfpp/crfpp/${PORTVERSION} \
${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= crfpp clsung/${PORTNAME}
+
DISTNAME= CRF++-${PORTVERSION}
MAINTAINER= clsung@FreeBSD.org
diff --git a/science/elmer-eio/Makefile b/science/elmer-eio/Makefile
index d2be43c..e12140b 100644
--- a/science/elmer-eio/Makefile
+++ b/science/elmer-eio/Makefile
@@ -9,7 +9,7 @@ PORTNAME= eio
PORTVERSION= 5.4.0
PORTREVISION= 2
CATEGORIES= science
-MASTER_SITES= SF/elmerfem
+MASTER_SITES= # none known, please fix
PKGNAMEPREFIX= elmer-
MAINTAINER= scjamorim@bsd.com.br
diff --git a/science/elmer-fem/Makefile b/science/elmer-fem/Makefile
index c00cd0a..2d1dea6 100644
--- a/science/elmer-fem/Makefile
+++ b/science/elmer-fem/Makefile
@@ -9,7 +9,7 @@ PORTNAME= fem
PORTVERSION= 5.4.0
PORTREVISION= 5
CATEGORIES= science tk
-MASTER_SITES= SF/elmerfem
+MASTER_SITES= # none known, please fix
PKGNAMEPREFIX= elmer-
MAINTAINER= scjamorim@bsd.com.br
diff --git a/science/elmer-hutiter/Makefile b/science/elmer-hutiter/Makefile
index 5b2850e..11e4e09d 100644
--- a/science/elmer-hutiter/Makefile
+++ b/science/elmer-hutiter/Makefile
@@ -9,7 +9,7 @@ PORTNAME= hutiter
PORTVERSION= 5.4.0
PORTREVISION= 2
CATEGORIES= science
-MASTER_SITES= SF/elmerfem
+MASTER_SITES= # none known, please fix
PKGNAMEPREFIX= elmer-
MAINTAINER= scjamorim@bsd.com.br
diff --git a/science/elmer-matc/Makefile b/science/elmer-matc/Makefile
index bdb6a79..1f0fdac 100644
--- a/science/elmer-matc/Makefile
+++ b/science/elmer-matc/Makefile
@@ -9,7 +9,7 @@ PORTNAME= matc
PORTVERSION= 5.4.0
PORTREVISION= 4
CATEGORIES= science
-MASTER_SITES= SF/elmerfem
+MASTER_SITES= # none known, please fix
PKGNAMEPREFIX= elmer-
MAINTAINER= scjamorim@bsd.com.br
diff --git a/science/elmer-meshgen2d/Makefile b/science/elmer-meshgen2d/Makefile
index b398569..03793d4 100644
--- a/science/elmer-meshgen2d/Makefile
+++ b/science/elmer-meshgen2d/Makefile
@@ -9,7 +9,7 @@ PORTNAME= meshgen2d
PORTVERSION= 5.0.0
PORTREVISION= 5
CATEGORIES= science
-MASTER_SITES= SF/elmerfem
+MASTER_SITES= # none known, please fix
PKGNAMEPREFIX= elmer-
MAINTAINER= scjamorim@bsd.com.br
diff --git a/science/elmergrid/Makefile b/science/elmergrid/Makefile
index 47b21eb..98a02f3 100644
--- a/science/elmergrid/Makefile
+++ b/science/elmergrid/Makefile
@@ -9,7 +9,7 @@ PORTNAME= elmergrid
PORTVERSION= 5.4.0
PORTREVISION= 2
CATEGORIES= science
-MASTER_SITES= SF/elmerfem
+MASTER_SITES= # none known, please fix
MAINTAINER= scjamorim@bsd.com.br
COMMENT= A Mesh Manipulation Utility for use with the ELMER FEM package
diff --git a/science/elmerpost/Makefile b/science/elmerpost/Makefile
index feea648..e6d69f2 100644
--- a/science/elmerpost/Makefile
+++ b/science/elmerpost/Makefile
@@ -9,7 +9,7 @@ PORTNAME= elmerpost
PORTVERSION= 5.4.0
PORTREVISION= 6
CATEGORIES= science
-MASTER_SITES= SF/elmerfem
+MASTER_SITES= # none known, please fix
MAINTAINER= scjamorim@bsd.com.br
COMMENT= Visualization of Numerical Results in the ELMER FEM package
diff --git a/science/euler/Makefile b/science/euler/Makefile
index 779347e..13e2a78 100644
--- a/science/euler/Makefile
+++ b/science/euler/Makefile
@@ -10,8 +10,7 @@ PORTNAME= euler
PORTVERSION= 1.61.0
PORTREVISION= 3
CATEGORIES= science
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.61
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/science/felt/Makefile b/science/felt/Makefile
index 3052f37..614a85c 100644
--- a/science/felt/Makefile
+++ b/science/felt/Makefile
@@ -9,7 +9,7 @@ PORTNAME= felt
PORTVERSION= 3.06
PORTREVISION= 2
CATEGORIES= science
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/FElt/${PORTVERSION}devel
EXTRACT_SUFX= -devel.src.tar.gz
MAINTAINER= ports@FreeBSD.org
diff --git a/science/gdis/Makefile b/science/gdis/Makefile
index 36cfe8d..03ac348 100644
--- a/science/gdis/Makefile
+++ b/science/gdis/Makefile
@@ -10,8 +10,7 @@ PORTNAME= gdis
PORTVERSION= 0.89
PORTREVISION= 3
CATEGORIES= science
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= -source.tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/science/gerris/Makefile b/science/gerris/Makefile
index bad686b..c14fda2 100644
--- a/science/gerris/Makefile
+++ b/science/gerris/Makefile
@@ -10,7 +10,7 @@ PORTNAME= gerris
PORTVERSION= 0.9.2
PORTREVISION= 1
CATEGORIES= science math
-MASTER_SITES= SF/gfs
+MASTER_SITES= SF/gfs/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A scientific CFD simulator
diff --git a/science/ghmm/Makefile b/science/ghmm/Makefile
index 7d21dbb..b8448a3 100644
--- a/science/ghmm/Makefile
+++ b/science/ghmm/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ghmm
PORTVERSION= 0.7.0b
CATEGORIES= science math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
MAINTAINER= clsung@FreeBSD.org
COMMENT= General Hidden Markov Model Library in C
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index f171884..ecd7a96 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gnudatalanguage
DISTVERSION= 0.9pre6
PORTREVISION= 9
CATEGORIES= science lang
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/gdl/0.9pre6
.if defined(BUILD_PYTHON_MODULE)
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
.endif
diff --git a/science/gramps/Makefile b/science/gramps/Makefile
index b64ac4d..a9881f4 100644
--- a/science/gramps/Makefile
+++ b/science/gramps/Makefile
@@ -8,7 +8,7 @@ PORTNAME= gramps
PORTVERSION= 3.0.4
PORTREVISION= 3
CATEGORIES= science gnome python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Stable/${PORTVERSION}
MAINTAINER= freebsd@troback.com
COMMENT= A GTK/GNOME-based genealogy program
diff --git a/science/gtamsanalyzer/Makefile b/science/gtamsanalyzer/Makefile
index d3bdb26..cb7b1bf 100644
--- a/science/gtamsanalyzer/Makefile
+++ b/science/gtamsanalyzer/Makefile
@@ -9,8 +9,7 @@ PORTNAME= gtamsanalyzer
PORTVERSION= 0.42
PORTREVISION= 2
CATEGORIES= science gnustep
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= tamsys
+MASTER_SITES= SF/tamsys/gnustep%20tams/GTAMSAnalyzer%2${PORTVERSION}
DISTNAME= GTAMSAnalyzer.src.${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
diff --git a/science/isaac-cfd/Makefile b/science/isaac-cfd/Makefile
index 5d6c618..eb433e2 100644
--- a/science/isaac-cfd/Makefile
+++ b/science/isaac-cfd/Makefile
@@ -9,8 +9,7 @@ PORTNAME= isaac
PORTVERSION= 4.2
PORTREVISION= 3
CATEGORIES= science
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= isaac-cfd
+MASTER_SITES= SF/${PORTNAME}-cfd/${PORTNAME}-cfd/ISAAC%20Version%20${PORTVERSION}
DISTFILES= ${PORTNAME}src.4_2${EXTRACT_SUFX} ${PORTNAME}mk.4_2${EXTRACT_SUFX}
.ifndef NOPORTDOCS
DISTFILES+= man.4_2.ps.gz
diff --git a/science/jmol/Makefile b/science/jmol/Makefile
index 744fd9a..58261c5 100644
--- a/science/jmol/Makefile
+++ b/science/jmol/Makefile
@@ -8,7 +8,7 @@
PORTNAME= jmol
PORTVERSION= 11.6.17
CATEGORIES= science java
-MASTER_SITES= SF:source1 \
+MASTER_SITES= SF/${PORTNAME}/Jmol/Version%20${PORTVERSION}:source1 \
http://jmol.svn.sourceforge.net/viewvc/jmol/trunk/Jmol/selfSignedCertificate/:source2
DISTFILES= ${PORTNAME}-${PORTVERSION}-full.tar.gz:source1 \
selfSignedCertificate.cer:source2 \
diff --git a/science/linsmith/Makefile b/science/linsmith/Makefile
index 3d2bca1..6630640 100644
--- a/science/linsmith/Makefile
+++ b/science/linsmith/Makefile
@@ -10,7 +10,7 @@ PORTNAME= linsmith
PORTVERSION= 0.99.12
PORTREVISION= 1
CATEGORIES= science hamradio
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.9.12
MAINTAINER= beat@FreeBSD.org
COMMENT= Smith charting program
diff --git a/science/mayavi/Makefile b/science/mayavi/Makefile
index d1087c8..59b5a36 100644
--- a/science/mayavi/Makefile
+++ b/science/mayavi/Makefile
@@ -10,8 +10,7 @@ PORTNAME= mayavi
PORTVERSION= 1.5
PORTREVISION= 1
CATEGORIES= science python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= MayaVi-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/science/mpqc/Makefile b/science/mpqc/Makefile
index ec770fa..351f7db 100644
--- a/science/mpqc/Makefile
+++ b/science/mpqc/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mpqc
PORTVERSION= 2.3.1
PORTREVISION= 6
CATEGORIES= science parallel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mpqc
+MASTER_SITES= SF
MAINTAINER= maho@FreeBSD.org
COMMENT= The massively parallel quantum computing library and program
diff --git a/science/nifticlib/Makefile b/science/nifticlib/Makefile
index cc6b02f..8e72e71 100644
--- a/science/nifticlib/Makefile
+++ b/science/nifticlib/Makefile
@@ -8,8 +8,7 @@
PORTNAME= nifticlib
PORTVERSION= 1.1.0
CATEGORIES= science graphics
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= niftilib
+MASTER_SITES= SF/niftilib/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= jwbacon@tds.net
COMMENT= Neuroimaging Infoirmatics Technology Initiative data format
diff --git a/science/pcp/Makefile b/science/pcp/Makefile
index d48ce9b..98a8976 100644
--- a/science/pcp/Makefile
+++ b/science/pcp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pcp
PORTVERSION= 2.2
CATEGORIES= science math
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= clsung@FreeBSD.org
COMMENT= Machine learning program for pattern classification
diff --git a/science/psi3/Makefile b/science/psi3/Makefile
index 20bb980..15fabc3 100644
--- a/science/psi3/Makefile
+++ b/science/psi3/Makefile
@@ -8,9 +8,9 @@
PORTNAME= psi3
PORTVERSION= 3.4.0
CATEGORIES= science
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/psicode/psi/${PORTVERSION} \
http://www.psicode.org/doc/:doc
-MASTER_SITE_SUBDIR= psicode
+
DISTNAME= psi-${PORTVERSION}
.if !defined(NOPORTDOCS)
DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} installation.pdf:doc userman.pdf:doc progman.pdf:doc
diff --git a/science/py-mdp/Makefile b/science/py-mdp/Makefile
index 45e0693..34f8872 100644
--- a/science/py-mdp/Makefile
+++ b/science/py-mdp/Makefile
@@ -8,8 +8,7 @@
PORTNAME= mdp
PORTVERSION= 2.4
CATEGORIES= science python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= mdp-toolkit
+MASTER_SITES= SF/${PORTNAME}-toolkit/${PORTNAME}-toolkit/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME:U}-${PORTVERSION}
diff --git a/science/py-paida/Makefile b/science/py-paida/Makefile
index f5efd1d..77142a3 100644
--- a/science/py-paida/Makefile
+++ b/science/py-paida/Makefile
@@ -8,7 +8,7 @@
PORTNAME= paida
PORTVERSION= 3.2.1.2.10
CATEGORIES= science python
-MASTER_SITES= SF/paida
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-3.2.1_2.10.1
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-3.2.1_2.10.1
diff --git a/science/pycdf/Makefile b/science/pycdf/Makefile
index 2dd5cc6..97e84ec 100644
--- a/science/pycdf/Makefile
+++ b/science/pycdf/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pycdf
PORTVERSION= 0.6.3
CATEGORIES= science python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= pysclint
+MASTER_SITES= SF/pysclint/${PORTNAME}/${PORTNAME}-${PORTVERSION}b
DISTNAME= ${PORTNAME}-0.6-3b
MAINTAINER= wenheping@gmail.com
diff --git a/science/vis5d+/Makefile b/science/vis5d+/Makefile
index 1bff1a0..caf9376 100644
--- a/science/vis5d+/Makefile
+++ b/science/vis5d+/Makefile
@@ -10,8 +10,7 @@ PORTNAME= vis5d+
PORTVERSION= 1.2.1
PORTREVISION= 12
CATEGORIES= science
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= vis5d
+MASTER_SITES= SF/vis5d/vis5d/${PORTVERSION}
MAINTAINER= stephen@missouri.edu
COMMENT= OpenGL-based volumetric visualization program for scientific datasets
diff --git a/science/xmds/Makefile b/science/xmds/Makefile
index c09edff..b873bc3 100644
--- a/science/xmds/Makefile
+++ b/science/xmds/Makefile
@@ -8,7 +8,7 @@
PORTNAME= xmds
PORTVERSION= 1.6
CATEGORIES= science
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}.5
DISTNAME= xmds-1.6.5
MAINTAINER= mplekos@physics.upatras.gr
diff --git a/security/aescrypt/Makefile b/security/aescrypt/Makefile
index da24852..08bc133 100644
--- a/security/aescrypt/Makefile
+++ b/security/aescrypt/Makefile
@@ -9,7 +9,7 @@ PORTNAME= aescrypt
PORTVERSION= 0.7
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}.0
PATCH_SITES= http://devel.ringlet.net/security/aescrypt/patches/ \
http://people.FreeBSD.org/~roam/ports/patches/security/aescrypt/
diff --git a/security/afterglow/Makefile b/security/afterglow/Makefile
index 9c609ab..c47ea54 100644
--- a/security/afterglow/Makefile
+++ b/security/afterglow/Makefile
@@ -9,8 +9,7 @@ PORTNAME= afterglow
PORTVERSION= 1.5
PORTREVISION= 1
CATEGORIES= security graphics
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= afterglow
+MASTER_SITES= SF/${PORTNAME}/AfterGlow%201.x/${PORTVERSION}
MAINTAINER= pauls@utdallas.edu
COMMENT= A collection of graph-generating scripts
diff --git a/security/aide/Makefile b/security/aide/Makefile
index 183e444..1e7261d 100644
--- a/security/aide/Makefile
+++ b/security/aide/Makefile
@@ -9,9 +9,9 @@ PORTNAME= aide
PORTVERSION= 0.13.1
PORTREVISION= 2
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
http://www.cs.tut.fi/~rammer/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= cy@FreeBSD.org
COMMENT= A replacement and extension for Tripwire
diff --git a/security/aimsniff/Makefile b/security/aimsniff/Makefile
index f667746..0ce77ee 100644
--- a/security/aimsniff/Makefile
+++ b/security/aimsniff/Makefile
@@ -7,8 +7,7 @@
PORTNAME= aimsniff
PORTVERSION= 0.9d
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= aimsniff
+MASTER_SITES= SF/${PORTNAME}/AIM%20Sniff/${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= andrew@amrx.net
diff --git a/security/amavisd-milter/Makefile b/security/amavisd-milter/Makefile
index 4f840f8..7254d13 100644
--- a/security/amavisd-milter/Makefile
+++ b/security/amavisd-milter/Makefile
@@ -8,7 +8,7 @@
PORTNAME= amavisd-milter
PORTVERSION= 1.4.0
CATEGORIES= security mail
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= prehor@gmail.com
COMMENT= Milter for amavisd-new
diff --git a/security/aolserver-nsencrypt/Makefile b/security/aolserver-nsencrypt/Makefile
index 0d5223d..0768477 100644
--- a/security/aolserver-nsencrypt/Makefile
+++ b/security/aolserver-nsencrypt/Makefile
@@ -9,8 +9,7 @@ PORTNAME= aolserver-nsencrypt
PORTVERSION= 0.4
PORTREVISION= 2
CATEGORIES= security www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= aolserver
+MASTER_SITES= SF/aolserver/nsencrypt/${PORTVERSION}
DISTFILES= nsencrypt-${PORTVERSION}-src.tar.gz
DIST_SUBDIR= aolserver
diff --git a/security/aolserver-nsopenssl/Makefile b/security/aolserver-nsopenssl/Makefile
index f63edb3..dae85ef 100644
--- a/security/aolserver-nsopenssl/Makefile
+++ b/security/aolserver-nsopenssl/Makefile
@@ -9,8 +9,7 @@ PORTNAME= aolserver-nsopenssl
PORTVERSION= 3.0.b26
PORTREVISION= 1
CATEGORIES= security www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= aolserver
+MASTER_SITES= SF/aolserver/nsopenssl/3.0
DISTFILES= nsopenssl-3.0beta26-src.tar.gz
DIST_SUBDIR= aolserver
diff --git a/security/aolserver-nssha1/Makefile b/security/aolserver-nssha1/Makefile
index c827c95..bb5bb6a 100644
--- a/security/aolserver-nssha1/Makefile
+++ b/security/aolserver-nssha1/Makefile
@@ -9,8 +9,7 @@ PORTNAME= aolserver-nssha1
PORTVERSION= 0.1
PORTREVISION= 1
CATEGORIES= security www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= aolserver
+MASTER_SITES= SF/aolserver/nssha1/nssha1-${PORTVERSION}
DISTFILES= nssha1-${PORTVERSION}.tar.gz
DIST_SUBDIR= aolserver
diff --git a/security/barnyard/Makefile b/security/barnyard/Makefile
index 85d90a3..0e105f3 100644
--- a/security/barnyard/Makefile
+++ b/security/barnyard/Makefile
@@ -9,7 +9,7 @@ PORTNAME= barnyard
PORTVERSION= 0.2.0
PORTREVISION= 5
CATEGORIES= security
-MASTER_SITES= SF
+MASTER_SITES= SF/barnyard/barnyard-0.2/${PORTVERSION}
MAINTAINER= pauls@utdallas.edu
COMMENT?= An output system for Snort
diff --git a/security/base/Makefile b/security/base/Makefile
index cb95c42..34e3a41 100644
--- a/security/base/Makefile
+++ b/security/base/Makefile
@@ -8,7 +8,7 @@
PORTNAME= base
PORTVERSION= 1.4.3.1
CATEGORIES= security
-MASTER_SITES= SF/secureideas
+MASTER_SITES= SF/secureideas/BASE/${PORTNAME}-${PORTVERSION}
MAINTAINER= miwi@FreeBSD.org
COMMENT= Basic Analysis and Security Engine - analyzing Snort alerts
diff --git a/security/beecrypt/Makefile b/security/beecrypt/Makefile
index ba190f3..fbf384a 100644
--- a/security/beecrypt/Makefile
+++ b/security/beecrypt/Makefile
@@ -10,8 +10,7 @@ PORTNAME= beecrypt
PORTVERSION= 4.1.2
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= BeeCrypt is an open source cryptography library
diff --git a/security/blocksshd/Makefile b/security/blocksshd/Makefile
index 5ebcd1d..60cef6c 100644
--- a/security/blocksshd/Makefile
+++ b/security/blocksshd/Makefile
@@ -8,7 +8,7 @@
PORTNAME= blocksshd
PORTVERSION= 1.3
CATEGORIES= security sysutils
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/BlockSSHD%20${PORTVERSION}
MAINTAINER= jadawin@FreeBSD.org
COMMENT= Protects computers from SSH brute force attacks
diff --git a/security/bubblegum/Makefile b/security/bubblegum/Makefile
index e7af3a7..88087f2 100644
--- a/security/bubblegum/Makefile
+++ b/security/bubblegum/Makefile
@@ -8,8 +8,7 @@
PORTNAME= bubblegum
PORTVERSION= 1.12
CATEGORIES= security
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= bjk
+MASTER_SITES= SF/bjk/${PORTNAME}/${PORTVERSION}
MAINTAINER= jadawin@FreeBSD.org
COMMENT= Watch a file for changes
diff --git a/security/ccrypt/Makefile b/security/ccrypt/Makefile
index ea01cee..532723d 100644
--- a/security/ccrypt/Makefile
+++ b/security/ccrypt/Makefile
@@ -9,9 +9,9 @@
PORTNAME= ccrypt
PORTVERSION= 1.8
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF \
http://www.mathstat.dal.ca/~selinger/ccrypt/download/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= corky1951@comcast.net
COMMENT= A command-line utility for encrypting and decrypting files and streams
diff --git a/security/chaosreader/Makefile b/security/chaosreader/Makefile
index 8103add..fda92da 100644
--- a/security/chaosreader/Makefile
+++ b/security/chaosreader/Makefile
@@ -8,8 +8,7 @@
PORTNAME= chaosreader
PORTVERSION= 0.94
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= chaosreader
+MASTER_SITES= SF
DISTFILES= ${PORTNAME}${PORTVERSION} sshkeydata0.20
EXTRACT_ONLY=
diff --git a/security/checkpassword-pam/Makefile b/security/checkpassword-pam/Makefile
index 4020889..6ae353b 100644
--- a/security/checkpassword-pam/Makefile
+++ b/security/checkpassword-pam/Makefile
@@ -8,8 +8,7 @@
PORTNAME= checkpassword-pam
PORTVERSION= 0.99
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= checkpasswd-pam
+MASTER_SITES= SF/checkpasswd-pam/checkpasswd-pam/${PORTVERSION}
MAINTAINER= sem@FreeBSD.org
COMMENT= Implementation of checkpassword authentication program
diff --git a/security/chroot_safe/Makefile b/security/chroot_safe/Makefile
index 0e40308..22c54ec 100644
--- a/security/chroot_safe/Makefile
+++ b/security/chroot_safe/Makefile
@@ -7,8 +7,7 @@ PORTNAME= chroot_safe
PORTVERSION= 1.4
PORTREVISION= 1
CATEGORIES= security sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= chrootsafe
+MASTER_SITES= SF/chrootsafe/${PORTNAME}/${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/security/clamtk/Makefile b/security/clamtk/Makefile
index 340db21..87a04f2 100644
--- a/security/clamtk/Makefile
+++ b/security/clamtk/Makefile
@@ -8,7 +8,7 @@
PORTNAME= clamtk
PORTVERSION= 4.16
CATEGORIES= security
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/ClamTk/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK front-end for Clam Antivirus
diff --git a/security/clusterssh/Makefile b/security/clusterssh/Makefile
index a5fff3a..401f9e1 100644
--- a/security/clusterssh/Makefile
+++ b/security/clusterssh/Makefile
@@ -8,8 +8,7 @@
PORTNAME= clusterssh
PORTVERSION= 3.26
CATEGORIES= security net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/1.%20ClusterSSH%20Series%203/${PORTVERSION}
MAINTAINER= lx@FreeBSD.org
COMMENT= Controls multiple hosts simultaneously via xterms and ssh
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index 19373e9..3e1d36f 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -9,7 +9,7 @@ PORTNAME= courier-authlib
PORTVERSION= 0.62.4
CATEGORIES?= security mail
.if defined(PKGNAMESUFFIX)
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES= SF/courier/authlib/${PORTVERSION}
MASTER_SITE_SUBDIR= courier
.else
MASTER_SITES= # empty
diff --git a/security/cp2fwb/Makefile b/security/cp2fwb/Makefile
index 4e4b61f..23d8dfe 100644
--- a/security/cp2fwb/Makefile
+++ b/security/cp2fwb/Makefile
@@ -8,8 +8,7 @@
PORTNAME= cp2fwb
PORTVERSION= 0.6
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= cp2fwbuilder
+MASTER_SITES= SF/${PORTNAME}uilder/${PORTNAME}uilder/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/security/crank/Makefile b/security/crank/Makefile
index 278a0d6..4108e1b 100644
--- a/security/crank/Makefile
+++ b/security/crank/Makefile
@@ -10,8 +10,7 @@ PORTNAME= crank
PORTVERSION= 0.2.1
PORTREVISION= 5
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= CRyptANalysis toolKit
diff --git a/security/cryptopp/Makefile b/security/cryptopp/Makefile
index 81de628..7587ebe 100644
--- a/security/cryptopp/Makefile
+++ b/security/cryptopp/Makefile
@@ -10,6 +10,7 @@ PORTVERSION= 5.6.0
CATEGORIES= security
MASTER_SITES= SF \
http://www.cryptopp.com/
+
DISTNAME= cryptopp${PORTVERSION:S/.//g}
MAINTAINER= delphij@FreeBSD.org
diff --git a/security/denyhosts/Makefile b/security/denyhosts/Makefile
index 3d591fd..6107440 100644
--- a/security/denyhosts/Makefile
+++ b/security/denyhosts/Makefile
@@ -9,8 +9,7 @@ PORTNAME= denyhosts
PORTVERSION= 2.6
PORTREVISION= 2
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= DenyHosts-${PORTVERSION}
MAINTAINER= janos.mohacsi@bsd.hu
diff --git a/security/distcache-devel/Makefile b/security/distcache-devel/Makefile
index f5db40f..deb6d55 100644
--- a/security/distcache-devel/Makefile
+++ b/security/distcache-devel/Makefile
@@ -9,9 +9,9 @@ PORTNAME= distcache
PORTVERSION= 1.5.1
PORTREVISION= 1
CATEGORIES= security www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/1.%20${PORTNAME}-devel/${PORTVERSION} \
http://osdn.dl.sourceforge.net/sourceforge/${PORTNAME}/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
PKGNAMESUFFIX= -devel
DISTNAME= ${PORTNAME}-${PORTVERSION}
diff --git a/security/distcache/Makefile b/security/distcache/Makefile
index de887a7..5a6fd0e 100644
--- a/security/distcache/Makefile
+++ b/security/distcache/Makefile
@@ -9,9 +9,9 @@ PORTNAME= distcache
PORTVERSION= 1.4.5
PORTREVISION= 1
CATEGORIES= security www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/2.%20${PORTNAME}-stable/${PORTVERSION} \
http://osdn.dl.sourceforge.net/sourceforge/${PORTNAME}/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= marcel.prisi@virtua.ch
COMMENT= Distributed OpenSSL session caching tools
diff --git a/security/doorman/Makefile b/security/doorman/Makefile
index 7c24d54..b056425 100644
--- a/security/doorman/Makefile
+++ b/security/doorman/Makefile
@@ -9,8 +9,7 @@ PORTNAME= doorman
PORTVERSION= 0.81
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= doorman
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= lupe@lupe-christoph.de
diff --git a/security/fpm/Makefile b/security/fpm/Makefile
index 7e29aeb..aa57c27 100644
--- a/security/fpm/Makefile
+++ b/security/fpm/Makefile
@@ -9,8 +9,7 @@ PORTNAME= fpm
PORTVERSION= 0.60
PORTREVISION= 5
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Figaro's Password Manager, an app to securely store your passwords
diff --git a/security/fprint_demo/Makefile b/security/fprint_demo/Makefile
index 6ecbdb5..f0b9d65 100644
--- a/security/fprint_demo/Makefile
+++ b/security/fprint_demo/Makefile
@@ -9,8 +9,7 @@ PORTNAME= fprint_demo
PORTVERSION= 0.4
PORTREVISION= 2
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fprint
+MASTER_SITES= SF/fprint/${PORTNAME}/v${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Demo and test application for libfprint
diff --git a/security/fswatch/Makefile b/security/fswatch/Makefile
index 42084f4..790e925 100644
--- a/security/fswatch/Makefile
+++ b/security/fswatch/Makefile
@@ -8,8 +8,7 @@
PORTNAME= fswatch
DISTVERSION= 0.02beta5
CATEGORIES= security sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fswatch
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.02beta5
MAINTAINER= dominik@karczmarski.com
COMMENT= File system checksum checker
diff --git a/security/ftimes/Makefile b/security/ftimes/Makefile
index 3647bca..e57ac1c 100644
--- a/security/ftimes/Makefile
+++ b/security/ftimes/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ftimes
PORTVERSION= 3.8.0
CATEGORIES= security sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ftimes
+MASTER_SITES= SF
EXTRACT_SUFX= .tgz
MAINTAINER= klm@uidzero.org
diff --git a/security/fuzz/Makefile b/security/fuzz/Makefile
index 1853957..6a4ddc6 100644
--- a/security/fuzz/Makefile
+++ b/security/fuzz/Makefile
@@ -9,8 +9,7 @@ PORTNAME= fuzz
PORTVERSION= 0.6
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fuzz
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool for testing software by bombarding the program with random data
diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
index be6ac94..6d1e38d 100644
--- a/security/fwbuilder-devel/Makefile
+++ b/security/fwbuilder-devel/Makefile
@@ -12,8 +12,7 @@ CATEGORIES= security
.if defined(BUILD)
MASTER_SITES= http://www.fwbuilder.org/nightly_builds/fwbuilder-3.0/build-${BUILD}/
.else
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}/fwbuilder/
-MASTER_SITE_SUBDIR= fwbuilder
+MASTER_SITES= SF/${PORTNAME}/Current_Packages/${PORTVERSION}
.endif
MAINTAINER= cy@FreeBSD.org
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index be6ac94..6d1e38d 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -12,8 +12,7 @@ CATEGORIES= security
.if defined(BUILD)
MASTER_SITES= http://www.fwbuilder.org/nightly_builds/fwbuilder-3.0/build-${BUILD}/
.else
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}/fwbuilder/
-MASTER_SITE_SUBDIR= fwbuilder
+MASTER_SITES= SF/${PORTNAME}/Current_Packages/${PORTVERSION}
.endif
MAINTAINER= cy@FreeBSD.org
diff --git a/security/gnome-password-generator/Makefile b/security/gnome-password-generator/Makefile
index 3ad6b11..6356905 100644
--- a/security/gnome-password-generator/Makefile
+++ b/security/gnome-password-generator/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gnome-password-generator
PORTVERSION= 1.6
PORTREVISION= 2
CATEGORIES= security gnome python
-MASTER_SITES= SF/gnome-password
+MASTER_SITES= SF/gnome-password/Gnome%20Password%20Generator/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= GNOME 2 password generator
diff --git a/security/gtk-knocker/Makefile b/security/gtk-knocker/Makefile
index 9dda401..2c676d7 100644
--- a/security/gtk-knocker/Makefile
+++ b/security/gtk-knocker/Makefile
@@ -9,8 +9,7 @@ PORTNAME= knocker
PORTVERSION= 0.6.6
PORTREVISION= 4
CATEGORIES= security net x11
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/gtk-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= gtk-
DISTNAME= gtk-${PORTNAME}-${PORTVERSION}
diff --git a/security/gtkpasman/Makefile b/security/gtkpasman/Makefile
index 24d9771..7d1abfd 100644
--- a/security/gtkpasman/Makefile
+++ b/security/gtkpasman/Makefile
@@ -9,7 +9,7 @@ PORTNAME= gtkpasman
PORTVERSION= 0.9
PORTREVISION= 5
CATEGORIES= security
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-sources/${PORTVERSION}
MAINTAINER= phil@teaser.fr
COMMENT= A GTK+ passwords manager for system and network administrators
diff --git a/security/integrit/Makefile b/security/integrit/Makefile
index 42ff433..932a9ca 100644
--- a/security/integrit/Makefile
+++ b/security/integrit/Makefile
@@ -9,8 +9,7 @@
PORTNAME= integrit
PORTVERSION= 4.0
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= jos@catnook.com
COMMENT= A file integrity verification program
diff --git a/security/kedpm/Makefile b/security/kedpm/Makefile
index a47f3db..1ff68f2 100644
--- a/security/kedpm/Makefile
+++ b/security/kedpm/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kedpm
PORTVERSION= 0.4.0
PORTREVISION= 4
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= kedpm
+MASTER_SITES= SF
MAINTAINER= ports@thepentagon.org
COMMENT= A simple application for managing personal data
diff --git a/security/keepassx/Makefile b/security/keepassx/Makefile
index 8218cf7..c698994 100644
--- a/security/keepassx/Makefile
+++ b/security/keepassx/Makefile
@@ -8,8 +8,7 @@
PORTNAME= KeePassX
PORTVERSION= 0.3.4
CATEGORIES= security
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:L}
+MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
MAINTAINER= skv@FreeBSD.org
COMMENT= Cross Platform Password Manager
diff --git a/security/klamav/Makefile b/security/klamav/Makefile
index ada48b5..0ca1ec1 100644
--- a/security/klamav/Makefile
+++ b/security/klamav/Makefile
@@ -9,7 +9,7 @@ PORTNAME= klamav
PORTVERSION= 0.46
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Source%20%28For%20ClamAV%20and%20gt_%3D%200.9x%29/KlamAV-${PORTVERSION}
DISTNAME= ${PORTNAME}-${PORTVERSION}-source
MAINTAINER= anderson@cnpm.embrapa.br
diff --git a/security/knocker/Makefile b/security/knocker/Makefile
index 7bb032f6..9a9ead0 100644
--- a/security/knocker/Makefile
+++ b/security/knocker/Makefile
@@ -8,8 +8,7 @@
PORTNAME= knocker
PORTVERSION= 0.7.1
CATEGORIES= security net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= sbrabez@gmail.com
COMMENT= A simple and easy to use TCP only port scanner (Console version)
diff --git a/security/kssh/Makefile b/security/kssh/Makefile
index 5eb0899e..4a113fa 100644
--- a/security/kssh/Makefile
+++ b/security/kssh/Makefile
@@ -9,8 +9,7 @@ PORTNAME= kssh
PORTVERSION= 0.7
PORTREVISION= 7
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= kevlo@FreeBSD.org
COMMENT= KDE frontend to ssh
diff --git a/security/libecc/Makefile b/security/libecc/Makefile
index 9b094e9..90dc42f 100644
--- a/security/libecc/Makefile
+++ b/security/libecc/Makefile
@@ -10,8 +10,7 @@ PORTNAME= libecc
PORTVERSION= 0.12.1
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= johans@stack.nl
COMMENT= C++ Elliptic Curve Library
diff --git a/security/libfprint/Makefile b/security/libfprint/Makefile
index 0177c1a..235b067 100644
--- a/security/libfprint/Makefile
+++ b/security/libfprint/Makefile
@@ -9,8 +9,7 @@ PORTNAME= libfprint
PORTVERSION= 0.0.6
PORTREVISION= 2
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fprint
+MASTER_SITES= SF/fprint/${PORTNAME}/v${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Library for fingerprint reader devices
diff --git a/security/libfwbuilder-devel/Makefile b/security/libfwbuilder-devel/Makefile
index b366c63..6fe5f37 100644
--- a/security/libfwbuilder-devel/Makefile
+++ b/security/libfwbuilder-devel/Makefile
@@ -11,8 +11,7 @@ CATEGORIES= security
.if defined(BUILD)
MASTER_SITES= http://www.fwbuilder.org/nightly_builds/fwbuilder-3.0/build-${BUILD}/
.else
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fwbuilder
+MASTER_SITES= SF/fwbuilder/Current_Packages/${PORTVERSION}
.endif
MAINTAINER= cy@FreeBSD.org
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index b366c63..6fe5f37 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -11,8 +11,7 @@ CATEGORIES= security
.if defined(BUILD)
MASTER_SITES= http://www.fwbuilder.org/nightly_builds/fwbuilder-3.0/build-${BUILD}/
.else
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fwbuilder
+MASTER_SITES= SF/fwbuilder/Current_Packages/${PORTVERSION}
.endif
MAINTAINER= cy@FreeBSD.org
diff --git a/security/libmcrypt/Makefile b/security/libmcrypt/Makefile
index 7a331e8..d0eaccb 100644
--- a/security/libmcrypt/Makefile
+++ b/security/libmcrypt/Makefile
@@ -8,8 +8,7 @@
PORTNAME= libmcrypt
PORTVERSION= 2.5.8
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/lib//}
+MASTER_SITES= SF/mcrypt/Libmcrypt/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Multi-cipher cryptographic library (used in PHP)
diff --git a/security/libpwstor/Makefile b/security/libpwstor/Makefile
index 4eb9de6..bf41732 100644
--- a/security/libpwstor/Makefile
+++ b/security/libpwstor/Makefile
@@ -8,7 +8,7 @@
PORTNAME= libpwstor
PORTVERSION= 0.1
CATEGORIES= security devel
-MASTER_SITES= SF/kageki
+MASTER_SITES= SF/kageki/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= A password storage library for C programmers
diff --git a/security/mailzu/Makefile b/security/mailzu/Makefile
index 804bcec..01a715a 100644
--- a/security/mailzu/Makefile
+++ b/security/mailzu/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mailzu
DISTVERSION= 0.8rc3
CATEGORIES= security
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/MailZu%200.8RC3
DISTNAME= MailZu_${DISTVERSION:S/rc/RC/}
MAINTAINER= sahil@tandon.net
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index 3080ddd..095645d 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -10,11 +10,13 @@
PORTNAME= mcrypt
PORTVERSION= 2.6.8
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/MCrypt/${PORTVERSION} \
ftp://argeas.cs-net.gr/pub/unix/mcrypt/attic/ \
+
ftp://ftp.ntua.gr/pub/security/mcrypt/ \
+
ftp://mcrypt.hellug.gr/pub/mcrypt/attic/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
MAINTAINER= johans@stack.nl
COMMENT= Replacement for crypt(1)
diff --git a/security/md5deep/Makefile b/security/md5deep/Makefile
index fd4dac4..0f1e559 100644
--- a/security/md5deep/Makefile
+++ b/security/md5deep/Makefile
@@ -8,7 +8,7 @@
PORTNAME= md5deep
PORTVERSION= 3.3
CATEGORIES= security
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= nobutaka@FreeBSD.org
COMMENT= Program to compute various message digests recursively
diff --git a/security/mosref/Makefile b/security/mosref/Makefile
index be9973e..cbd4c61 100644
--- a/security/mosref/Makefile
+++ b/security/mosref/Makefile
@@ -7,8 +7,7 @@
PORTNAME= mosref
PORTVERSION= 2.0.b3
CATEGORIES= security lang scheme
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2.0-beta3
DISTNAME= ${PORTNAME}-2.0-beta3
MAINTAINER= pjdelport@gmail.com
diff --git a/security/mussh/Makefile b/security/mussh/Makefile
index 3d99c38..75cbc24 100644
--- a/security/mussh/Makefile
+++ b/security/mussh/Makefile
@@ -9,8 +9,7 @@ PORTNAME= mussh
PORTVERSION= 0.7
PORTREVISION= 2
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/security/ncrypt/Makefile b/security/ncrypt/Makefile
index 31c3f41..627eea3 100644
--- a/security/ncrypt/Makefile
+++ b/security/ncrypt/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ncrypt
PORTVERSION= 0.7.0
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-0.7/${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/security/newpki-client/Makefile b/security/newpki-client/Makefile
index c148e58..5426401 100644
--- a/security/newpki-client/Makefile
+++ b/security/newpki-client/Makefile
@@ -9,8 +9,7 @@ PORTNAME= newpki-client
DISTVERSION= 2.0.0-beta4
PORTREVISION= 3
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= newpki
+MASTER_SITES= SF/newpki/${PORTNAME}/2.0.0-beta4
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ PKI client from newpki project
diff --git a/security/newpki-lib/Makefile b/security/newpki-lib/Makefile
index 327e3f9..1bf53c0 100644
--- a/security/newpki-lib/Makefile
+++ b/security/newpki-lib/Makefile
@@ -9,8 +9,7 @@ PORTNAME= newpki-lib
DISTVERSION= 2.0.0-beta4
PORTREVISION= 1
CATEGORIES= security devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= newpki
+MASTER_SITES= SF/newpki/${PORTNAME}/2.0.0-beta4
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ PKI libraries from newpki project
diff --git a/security/newpki-server/Makefile b/security/newpki-server/Makefile
index d1a4909..6d49619 100644
--- a/security/newpki-server/Makefile
+++ b/security/newpki-server/Makefile
@@ -9,8 +9,7 @@ PORTNAME= newpki-server
DISTVERSION= 2.0.0-beta4
PORTREVISION= 2
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= newpki
+MASTER_SITES= SF/newpki/${PORTNAME}/2.0.0-beta4
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ PKI server from newpki project
diff --git a/security/ocaml-ssl/Makefile b/security/ocaml-ssl/Makefile
index 3966cc0..3cf6048 100644
--- a/security/ocaml-ssl/Makefile
+++ b/security/ocaml-ssl/Makefile
@@ -7,8 +7,7 @@
PORTNAME= ssl
PORTVERSION= 0.4.3
CATEGORIES= security devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= savonet
+MASTER_SITES= SF/savonet/ocaml-${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ocaml-
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
diff --git a/security/oidentd/Makefile b/security/oidentd/Makefile
index 82f27b5..d4a0f2c 100644
--- a/security/oidentd/Makefile
+++ b/security/oidentd/Makefile
@@ -9,8 +9,7 @@ PORTNAME= oidentd
PORTVERSION= 2.0.8
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ojnk
+MASTER_SITES= SF/ojnk/${PORTNAME}/${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
COMMENT= Ident server that supports user-defined ident strings
diff --git a/security/oinkmaster/Makefile b/security/oinkmaster/Makefile
index 476af3b..45088d3 100644
--- a/security/oinkmaster/Makefile
+++ b/security/oinkmaster/Makefile
@@ -10,8 +10,7 @@ PORTNAME= oinkmaster
PORTVERSION= 2.0
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= question+fbsdports@closedsrc.org
COMMENT= Help you update your snort rules after each update
diff --git a/security/openfwtk/Makefile b/security/openfwtk/Makefile
index 35201fd..08661ed 100644
--- a/security/openfwtk/Makefile
+++ b/security/openfwtk/Makefile
@@ -7,8 +7,7 @@
PORTNAME= openfwtk
PORTVERSION= 2.0
CATEGORIES= security
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Release%20${PORTVERSION}
DISTNAME=${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/security/openvpn-admin/Makefile b/security/openvpn-admin/Makefile
index e0d558c..82b05e1 100644
--- a/security/openvpn-admin/Makefile
+++ b/security/openvpn-admin/Makefile
@@ -9,8 +9,7 @@ PORTNAME= openvpn-admin
PORTVERSION= 1.9.4
PORTREVISION= 2
CATEGORIES= security gnome
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= GUI frontend to openvpn
diff --git a/security/osslsigncode/Makefile b/security/osslsigncode/Makefile
index 947edd5..29c6d9b 100644
--- a/security/osslsigncode/Makefile
+++ b/security/osslsigncode/Makefile
@@ -9,7 +9,7 @@ PORTNAME= osslsigncode
PORTVERSION= 1.3
PORTREVISION= 1
CATEGORIES= security devel
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
MAINTAINER= snb@FreeBSD.org
COMMENT= OpenSSL-based signcode utility
diff --git a/security/p5-GnuPG-Interface/Makefile b/security/p5-GnuPG-Interface/Makefile
index 23616cd..d881d9f 100644
--- a/security/p5-GnuPG-Interface/Makefile
+++ b/security/p5-GnuPG-Interface/Makefile
@@ -9,7 +9,7 @@ PORTNAME= GnuPG-Interface
PORTVERSION= 0.36
PORTREVISION= 2
CATEGORIES= security perl5
-MASTER_SITES= CPAN SF
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= clsung@FreeBSD.org
diff --git a/security/p5-openxpki-client-html-mason/Makefile b/security/p5-openxpki-client-html-mason/Makefile
index bb85131..e7fea1c 100644
--- a/security/p5-openxpki-client-html-mason/Makefile
+++ b/security/p5-openxpki-client-html-mason/Makefile
@@ -8,8 +8,7 @@
PORTNAME= openxpki-client-html-mason
PORTVERSION= 0.9.1396
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= openxpki
+MASTER_SITES= SF/openxpki/openxpki/0.9.1300
PKGNAMEPREFIX= p5-
DISTNAME= OpenXPKI-Client-HTML-Mason-${PORTVERSION}
DIST_SUBDIR= openxpki
diff --git a/security/p5-openxpki-client-scep/Makefile b/security/p5-openxpki-client-scep/Makefile
index 61c1275..5c431c0 100644
--- a/security/p5-openxpki-client-scep/Makefile
+++ b/security/p5-openxpki-client-scep/Makefile
@@ -8,8 +8,7 @@
PORTNAME= openxpki-client-scep
PORTVERSION= 0.9.1313
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= openxpki
+MASTER_SITES= SF/openxpki/openxpki/0.9.1300
PKGNAMEPREFIX= p5-
DISTNAME= OpenXPKI-Client-SCEP-${PORTVERSION}
DIST_SUBDIR= openxpki
diff --git a/security/p5-openxpki-client/Makefile b/security/p5-openxpki-client/Makefile
index 2621e0a..7eab190 100644
--- a/security/p5-openxpki-client/Makefile
+++ b/security/p5-openxpki-client/Makefile
@@ -8,8 +8,7 @@
PORTNAME= openxpki-client
PORTVERSION= 0.9.1284
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= openxpki
+MASTER_SITES= SF/openxpki/openxpki/0.9.1300
PKGNAMEPREFIX= p5-
DISTNAME= OpenXPKI-Client-${PORTVERSION}
DIST_SUBDIR= openxpki
diff --git a/security/p5-openxpki-deployment/Makefile b/security/p5-openxpki-deployment/Makefile
index 2a2ec3a..0f54076 100644
--- a/security/p5-openxpki-deployment/Makefile
+++ b/security/p5-openxpki-deployment/Makefile
@@ -8,8 +8,7 @@
PORTNAME= openxpki-deployment
PORTVERSION= 0.9.1386
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= openxpki
+MASTER_SITES= SF/openxpki/openxpki/0.9.1300
PKGNAMEPREFIX= p5-
DIST_SUBDIR= openxpki
diff --git a/security/p5-openxpki-i18n/Makefile b/security/p5-openxpki-i18n/Makefile
index 669d6fb..43dfde9 100644
--- a/security/p5-openxpki-i18n/Makefile
+++ b/security/p5-openxpki-i18n/Makefile
@@ -8,8 +8,7 @@
PORTNAME= openxpki-i18n
PORTVERSION= 0.9.1395
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= openxpki
+MASTER_SITES= SF/openxpki/openxpki/0.9.1300
PKGNAMEPREFIX= p5-
DIST_SUBDIR= openxpki
diff --git a/security/p5-openxpki/Makefile b/security/p5-openxpki/Makefile
index b5b7bcc..ac80f89 100644
--- a/security/p5-openxpki/Makefile
+++ b/security/p5-openxpki/Makefile
@@ -8,8 +8,7 @@
PORTNAME= openxpki
PORTVERSION= 0.9.1389
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.9.1300
PKGNAMEPREFIX= p5-
DISTNAME= OpenXPKI-${PORTVERSION}
DIST_SUBDIR= openxpki
diff --git a/security/pam-mysql/Makefile b/security/pam-mysql/Makefile
index 7a623dc..91e3d17 100644
--- a/security/pam-mysql/Makefile
+++ b/security/pam-mysql/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pam_mysql
PORTVERSION= 0.7.r1
CATEGORIES= security databases
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/_/-/}
+MASTER_SITES= SF/pam-mysql/pam-mysql/0.7RC1
DISTNAME= ${PORTNAME}-0.7RC1${DISTVERSIONSUFFIX}
MAINTAINER= anders@FreeBSD.org
diff --git a/security/pam-pgsql/Makefile b/security/pam-pgsql/Makefile
index 1214974..cdb819c 100644
--- a/security/pam-pgsql/Makefile
+++ b/security/pam-pgsql/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pam-pgsql
PORTVERSION= 0.6.3
PORTREVISION= 1
CATEGORIES= security databases
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
DISTNAME= libpam-pgsql-${PORTVERSION}
MAINTAINER= chinsan@FreeBSD.org
diff --git a/security/pam_abl/Makefile b/security/pam_abl/Makefile
index 8a3f49e..6bfa83f1 100644
--- a/security/pam_abl/Makefile
+++ b/security/pam_abl/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pam_abl
PORTVERSION= 0.2.3
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/_/-/}
+MASTER_SITES= SF/pam-abl/pam-abl/${PORTVERSION}
MAINTAINER= prehor@gmail.com
COMMENT= Blacklisting responsible for repeated failed authentication attempts
diff --git a/security/pam_fprint/Makefile b/security/pam_fprint/Makefile
index d9fa2a3..4043821 100644
--- a/security/pam_fprint/Makefile
+++ b/security/pam_fprint/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pam_fprint
PORTVERSION= 0.2
PORTREVISION= 2
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fprint
+MASTER_SITES= SF/fprint/${PORTNAME}/v${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= PAM module offering finger print authentication using libfprint
diff --git a/security/pamtester/Makefile b/security/pamtester/Makefile
index 69754a8..ca7dfe4 100644
--- a/security/pamtester/Makefile
+++ b/security/pamtester/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pamtester
PORTVERSION= 0.1.2
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A command line pam authentication tester
diff --git a/security/pantera/Makefile b/security/pantera/Makefile
index e1a362d..32ad963 100644
--- a/security/pantera/Makefile
+++ b/security/pantera/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pantera
PORTVERSION= 0.1.1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= owasp
+MASTER_SITES= SF/owasp/Pantera/Pantera_Release_${PORTVERSION}
DISTNAME= Pantera_Release_${PORTVERSION}
MAINTAINER= onatan@gmail.com
diff --git a/security/pdfcrack/Makefile b/security/pdfcrack/Makefile
index ea07c24..9755dd6 100644
--- a/security/pdfcrack/Makefile
+++ b/security/pdfcrack/Makefile
@@ -6,7 +6,7 @@
PORTNAME= pdfcrack
PORTVERSION= 0.11
CATEGORIES= security
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= jadawin@FreeBSD.org
COMMENT= A command line, password recovery tool for PDF-files
diff --git a/security/phpdeadlock/Makefile b/security/phpdeadlock/Makefile
index c76f3a5..d7cc66a 100644
--- a/security/phpdeadlock/Makefile
+++ b/security/phpdeadlock/Makefile
@@ -8,7 +8,7 @@
PORTNAME= phpdeadlock
PORTVERSION= 1.01
CATEGORIES= security www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/Deadlock/${PORTVERSION}%20Stable
DISTNAME= Deadlock-${PORTVERSION}-Stable
MAINTAINER= glarkin@FreeBSD.org
diff --git a/security/pidgin-encryption/Makefile b/security/pidgin-encryption/Makefile
index 0b9b14b..3492ca1 100644
--- a/security/pidgin-encryption/Makefile
+++ b/security/pidgin-encryption/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pidgin
PORTVERSION= 3.0
PORTREVISION= 9
CATEGORIES= security
-MASTER_SITES= SF/pidgin-encrypt
+MASTER_SITES= SF/${PORTNAME}-encrypt/Releases/${PORTVERSION}
PKGNAMESUFFIX= -encryption
DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
diff --git a/security/pks/Makefile b/security/pks/Makefile
index b3381a6..7365867 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -9,8 +9,7 @@ PORTNAME= pks
PORTVERSION= 0.9.6
PORTREVISION= 1
CATEGORIES= security www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= gtodd@bellanet.org
COMMENT= PGP Public Key Server
diff --git a/security/portsentry/Makefile b/security/portsentry/Makefile
index f87d741..56437d9 100644
--- a/security/portsentry/Makefile
+++ b/security/portsentry/Makefile
@@ -8,8 +8,7 @@
PORTNAME= portsentry
PORTVERSION= 1.2
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= sentrytools
+MASTER_SITES= SF/sentrytools/${PORTNAME}%201.x/${PORTNAME}-${PORTVERSION}
MAINTAINER= glen.j.barber@gmail.com
COMMENT= Port scan detection and active defense
diff --git a/security/proxytunnel/Makefile b/security/proxytunnel/Makefile
index 1c9b7c1..8f9dc65 100644
--- a/security/proxytunnel/Makefile
+++ b/security/proxytunnel/Makefile
@@ -8,8 +8,7 @@
PORTNAME= proxytunnel
PORTVERSION= 1.9.0
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20source%20tarballs/${PORTNAME}%20${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= ehaupt@FreeBSD.org
diff --git a/security/pwman/Makefile b/security/pwman/Makefile
index 8816749..36c958f 100644
--- a/security/pwman/Makefile
+++ b/security/pwman/Makefile
@@ -8,7 +8,7 @@
PORTNAME= pwman
PORTVERSION= 0.3.9
CATEGORIES= security
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= anders@FreeBSD.org
COMMENT= Console password management application based on gpg(me)
diff --git a/security/py-PF/Makefile b/security/py-PF/Makefile
index 07c593d..a040423 100644
--- a/security/py-PF/Makefile
+++ b/security/py-PF/Makefile
@@ -8,8 +8,7 @@
PORTNAME= PF
PORTVERSION= 0.0.4
CATEGORIES= security python
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ../project/py-${PORTNAME:L}/py-${PORTNAME:L}/${DISTNAME}
+MASTER_SITES= SF/py-${PORTNAME:L}/py-${PORTNAME:L}/${DISTNAME}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PYTHON_PKGNAMEPREFIX:C/[0-9]+//}${PORTNAME}-${PORTVERSION}
diff --git a/security/py-cryptkit/Makefile b/security/py-cryptkit/Makefile
index 0249d4a..3a66524 100644
--- a/security/py-cryptkit/Makefile
+++ b/security/py-cryptkit/Makefile
@@ -9,8 +9,7 @@
PORTNAME= cryptkit
PORTVERSION= 0.9
CATEGORIES= security python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/_${PORTNAME}/Complete%20Kit
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
diff --git a/security/py-fail2ban/Makefile b/security/py-fail2ban/Makefile
index e2da76d..199daf4 100644
--- a/security/py-fail2ban/Makefile
+++ b/security/py-fail2ban/Makefile
@@ -9,7 +9,7 @@ PORTNAME= fail2ban
PORTVERSION= 0.8.3
PORTREVISION= 2
CATEGORIES= security python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= pgollucci@FreeBSD.org
diff --git a/security/py-gnupg/Makefile b/security/py-gnupg/Makefile
index bd6e887..6aabda5 100644
--- a/security/py-gnupg/Makefile
+++ b/security/py-gnupg/Makefile
@@ -9,8 +9,7 @@
PORTNAME= gnupg
PORTVERSION= 0.3.2
CATEGORIES= security python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= py-gnupg
+MASTER_SITES= SF/py-${PORTNAME}/GnuPGInterface/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= GnuPGInterface-${PORTVERSION}
diff --git a/security/py-mcrypt/Makefile b/security/py-mcrypt/Makefile
index 7a55a03..de5a16d 100644
--- a/security/py-mcrypt/Makefile
+++ b/security/py-mcrypt/Makefile
@@ -9,8 +9,7 @@
PORTNAME= mcrypt
PORTVERSION= 1.1
CATEGORIES= security python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= python-mcrypt
+MASTER_SITES= SF/python-${PORTNAME}/OldFiles
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= python-mcrypt-${PORTVERSION}
diff --git a/security/py-mhash/Makefile b/security/py-mhash/Makefile
index 92fe01f..9a29166 100644
--- a/security/py-mhash/Makefile
+++ b/security/py-mhash/Makefile
@@ -9,8 +9,7 @@
PORTNAME= mhash
PORTVERSION= 1.4
CATEGORIES= security python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= mhash
+MASTER_SITES= SF/${PORTNAME}/OldFiles
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= python-mhash-${PORTVERSION}
diff --git a/security/py-openssl/Makefile b/security/py-openssl/Makefile
index 3d27732..4359db5 100644
--- a/security/py-openssl/Makefile
+++ b/security/py-openssl/Makefile
@@ -10,8 +10,7 @@ PORTNAME= openssl
PORTVERSION= 0.8
PORTREVISION= 1
CATEGORIES= security python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pyopenssl
+MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyOpenSSL-${PORTVERSION}
diff --git a/security/py-posix1e/Makefile b/security/py-posix1e/Makefile
index ccb3799..e1c4f40 100644
--- a/security/py-posix1e/Makefile
+++ b/security/py-posix1e/Makefile
@@ -8,8 +8,7 @@
PORTNAME= posix1e
PORTVERSION= 0.4.0
CATEGORIES= security python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= pylibacl
+MASTER_SITES= SF/pylibacl/pylibacl/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pylibacl-${PORTVERSION}
diff --git a/security/py-pow/Makefile b/security/py-pow/Makefile
index d367580..441d643 100644
--- a/security/py-pow/Makefile
+++ b/security/py-pow/Makefile
@@ -9,8 +9,7 @@
PORTNAME= pow
PORTVERSION= 0.7
CATEGORIES= security python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/POW/POW-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME:U}-${PORTVERSION}
diff --git a/security/py-pyme/Makefile b/security/py-pyme/Makefile
index bc6f85d..9c76c61 100644
--- a/security/py-pyme/Makefile
+++ b/security/py-pyme/Makefile
@@ -9,7 +9,7 @@ PORTNAME= pyme
PORTVERSION= 0.8.1
PORTREVISION= 1
CATEGORIES= security python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= johans@stack.nl
diff --git a/security/py-trustedpickle/Makefile b/security/py-trustedpickle/Makefile
index 0d44b61..b4df445 100644
--- a/security/py-trustedpickle/Makefile
+++ b/security/py-trustedpickle/Makefile
@@ -8,8 +8,7 @@
PORTNAME= trustedpickle
PORTVERSION= 0.02
CATEGORIES= security python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= TrustedPickle
EXTRACT_SUFX= .tgz
diff --git a/security/py-twofish/Makefile b/security/py-twofish/Makefile
index aa168c1..d4c909d 100644
--- a/security/py-twofish/Makefile
+++ b/security/py-twofish/Makefile
@@ -10,8 +10,7 @@ PORTNAME= twofish
PORTVERSION= 0.7
PORTREVISION= 1
CATEGORIES= security python
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= twofish-py
+MASTER_SITES= SF/${PORTNAME}-py/${PORTNAME}-py/${PORTVERSION}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= twofishmodule-${PORTVERSION}
diff --git a/security/qtfw/Makefile b/security/qtfw/Makefile
index c2018c3..56817b7 100644
--- a/security/qtfw/Makefile
+++ b/security/qtfw/Makefile
@@ -9,8 +9,7 @@ PORTNAME= qtfw
PORTVERSION= 0.5
PORTREVISION= 4
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A GUI frontend for ipfw utility in FreeBSD
diff --git a/security/rarcrack/Makefile b/security/rarcrack/Makefile
index e7d5350..7107eab 100644
--- a/security/rarcrack/Makefile
+++ b/security/rarcrack/Makefile
@@ -7,7 +7,7 @@ PORTNAME= rarcrack
PORTVERSION= 0.2
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/%5BUnnamed%20release%5D
MAINTAINER= jadawin@FreeBSD.org
COMMENT= Rarcrack guesses the passwords of encrypted RAR, ZIP, and 7Z archives
diff --git a/security/ruby-pam/Makefile b/security/ruby-pam/Makefile
index 584bb70..4701a03 100644
--- a/security/ruby-pam/Makefile
+++ b/security/ruby-pam/Makefile
@@ -8,8 +8,7 @@
PORTNAME= pam
PORTVERSION= 1.5.2
CATEGORIES= security 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/security/sancp/Makefile b/security/sancp/Makefile
index aae5fb5..49e3013 100644
--- a/security/sancp/Makefile
+++ b/security/sancp/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 1.6.1
DISTVERSIONSUFFIX= -stable
PORTREVISION= 3
CATEGORIES= security
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}-stable
MAINTAINER= pauls@utdallas.edu
COMMENT= A network connection profiler
diff --git a/security/scamp/Makefile b/security/scamp/Makefile
index 06fea19..1aa8601 100644
--- a/security/scamp/Makefile
+++ b/security/scamp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= scamp
PORTVERSION= 5.2d
CATEGORIES= security
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= gerard@seibercom.net
COMMENT= Download & Install additional definition files for Clamav
diff --git a/security/sguil-client/Makefile b/security/sguil-client/Makefile
index 315cab5..6a3c742 100644
--- a/security/sguil-client/Makefile
+++ b/security/sguil-client/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sguil-client
PORTVERSION= 0.7.0
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= sguil
+MASTER_SITES= SF/sguil/sguil/sguil-${PORTVERSION}
MAINTAINER= pauls@utdallas.edu
COMMENT= Sguil is a network security monitoring program
diff --git a/security/sguil-sensor/Makefile b/security/sguil-sensor/Makefile
index ff3b1ed..370f94a 100644
--- a/security/sguil-sensor/Makefile
+++ b/security/sguil-sensor/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sguil-sensor
PORTVERSION= 0.7.0
PORTREVISION= 2
CATEGORIES= security
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= sguil
+MASTER_SITES= SF/sguil/sguil/sguil-${PORTVERSION}
MAINTAINER= pauls@utdallas.edu
COMMENT= Sguil is a network security monitoring program
diff --git a/security/sguil-server/Makefile b/security/sguil-server/Makefile
index 5e5004e..70c35ef 100644
--- a/security/sguil-server/Makefile
+++ b/security/sguil-server/Makefile
@@ -9,8 +9,7 @@ PORTNAME= sguil-server
PORTVERSION= 0.7.0
PORTREVISION= 3
CATEGORIES= security
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= sguil
+MASTER_SITES= SF/sguil/sguil/sguil-${PORTVERSION}
MAINTAINER= pauls@utdallas.edu
COMMENT= Sguil is a network security monitoring program
diff --git a/security/sha/Makefile b/security/sha/Makefile
index 2ec4fed..7686de6 100644
--- a/security/sha/Makefile
+++ b/security/sha/Makefile
@@ -8,8 +8,7 @@
PORTNAME= sha
PORTVERSION= 1.0.4
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= allan@saddi.com
COMMENT= Simple file hash program utilizing SHA-1, SHA-256, SHA-384, SHA-512
diff --git a/security/shimmer/Makefile b/security/shimmer/Makefile
index ec5e5df..200c80c 100644
--- a/security/shimmer/Makefile
+++ b/security/shimmer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= shimmer
PORTVERSION= 0.1.0
CATEGORIES= security
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
DISTNAME= ${PORTNAME}
MAINTAINER= lippe@FreeBSD.org
diff --git a/security/shttpscanner/Makefile b/security/shttpscanner/Makefile
index aeb70de..79844a8 100644
--- a/security/shttpscanner/Makefile
+++ b/security/shttpscanner/Makefile
@@ -8,7 +8,7 @@
PORTNAME= shttpscanner
PORTVERSION= 0.4
CATEGORIES= security www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/sHTTPScanner/sHTTPScanner%20v${PORTVERSION}
DISTNAME= sHTTPScanner_v${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/security/snortsms/Makefile b/security/snortsms/Makefile
index d98ecbf..6724384 100644
--- a/security/snortsms/Makefile
+++ b/security/snortsms/Makefile
@@ -8,7 +8,7 @@
PORTNAME= snortsms
PORTVERSION= 1.7.8
CATEGORIES= security www
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/SnortSMS%20Suite%20%28Console_Agent%29/${PORTVERSION}-Release
MAINTAINER= jadawin@FreeBSD.org
COMMENT= A remote management and monitoring interface for Snort based IDS
diff --git a/security/srm/Makefile b/security/srm/Makefile
index 678d51a..9309126 100644
--- a/security/srm/Makefile
+++ b/security/srm/Makefile
@@ -8,8 +8,7 @@
PORTNAME= srm
PORTVERSION= 1.2.8
CATEGORIES= security sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= srm
+MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= kjones@antihackertoolkit.com
COMMENT= Secure rm, a utility which destroys file contents before unlinking
diff --git a/security/ssh-gui/Makefile b/security/ssh-gui/Makefile
index 1787970..33199f6 100644
--- a/security/ssh-gui/Makefile
+++ b/security/ssh-gui/Makefile
@@ -9,8 +9,7 @@ PORTNAME= ssh-gui
PORTVERSION= 0.7.1
PORTREVISION= 5
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= A front-end for ssh which can open multiple xterms
diff --git a/security/sshguard/Makefile b/security/sshguard/Makefile
index f3fd117..a0b2aff 100644
--- a/security/sshguard/Makefile
+++ b/security/sshguard/Makefile
@@ -8,7 +8,7 @@
PORTNAME= sshguard
PORTVERSION= 1.3
CATEGORIES= security
-MASTER_SITES= SF
+MASTER_SITES= SF/sshguard/sshguard/sshguard-${PORTVERSION}
MAINTAINER= mij@bitchx.it
COMMENT?= Protect hosts from brute force attacks against ssh and other services
diff --git a/security/steghide/Makefile b/security/steghide/Makefile
index c9fec5c..92a26c9 100644
--- a/security/steghide/Makefile
+++ b/security/steghide/Makefile
@@ -9,8 +9,7 @@ PORTNAME= steghide
PORTVERSION= 0.5.1
PORTREVISION= 2
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= steghide
+MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/b/}
MAINTAINER= arved@FreeBSD.org
diff --git a/security/sudoscript/Makefile b/security/sudoscript/Makefile
index 23e5995..18d23f4 100644
--- a/security/sudoscript/Makefile
+++ b/security/sudoscript/Makefile
@@ -8,7 +8,7 @@
PORTNAME= sudoscript
PORTVERSION= 2.1.2
CATEGORIES= security
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%202.1%20release/${PORTNAME}%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Audited shells in Perl with sudo(8) and script(1)
diff --git a/security/swatch/Makefile b/security/swatch/Makefile
index 14b49ed..b8ca0a4 100644
--- a/security/swatch/Makefile
+++ b/security/swatch/Makefile
@@ -9,8 +9,7 @@ PORTNAME= swatch
PORTVERSION= 3.2.1
PORTREVISION= 2
CATEGORIES= security sysutils
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= swatch
+MASTER_SITES= SF
MAINTAINER= joseph@randomnetworks.com
COMMENT= The Simple WATCHer and filter
diff --git a/security/switzerland/Makefile b/security/switzerland/Makefile
index 277fe21..08c931b 100644
--- a/security/switzerland/Makefile
+++ b/security/switzerland/Makefile
@@ -8,7 +8,7 @@
PORTNAME= switzerland
PORTVERSION= 0.1.0
CATEGORIES= security python
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/zero%20point%20one
EXTRACT_SUFX= .tgz
MAINTAINER= beat@FreeBSD.org
diff --git a/security/symbion-sslproxy/Makefile b/security/symbion-sslproxy/Makefile
index a2a649d..04e374c 100644
--- a/security/symbion-sslproxy/Makefile
+++ b/security/symbion-sslproxy/Makefile
@@ -6,8 +6,7 @@
PORTNAME= symbion-sslproxy
PORTVERSION= 1.0.5
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= sslproxy
+MASTER_SITES= SF/sslproxy/sslproxy/${PORTVERSION}
DISTNAME= sslproxy-${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/security/tripwire/Makefile b/security/tripwire/Makefile
index 6b56a66..bb5a37d 100644
--- a/security/tripwire/Makefile
+++ b/security/tripwire/Makefile
@@ -8,8 +8,7 @@
PORTNAME= tripwire
PORTVERSION= 2.4.1.2
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-${PORTVERSION}-src
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= cy@FreeBSD.org
diff --git a/security/umit/Makefile b/security/umit/Makefile
index 2372abd..e58f31e 100644
--- a/security/umit/Makefile
+++ b/security/umit/Makefile
@@ -9,9 +9,9 @@ PORTNAME= umit
PORTVERSION= 0.9.3
PORTREVISION= 5
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-RC2 \
http://bio3k.softboard.ru/uploads/arch/
-MASTER_SITE_SUBDIR= ${PORTNAME}
+
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= b3k@mail.ru
diff --git a/security/vinetto/Makefile b/security/vinetto/Makefile
index 1585794..9c7223b 100644
--- a/security/vinetto/Makefile
+++ b/security/vinetto/Makefile
@@ -8,8 +8,7 @@
PORTNAME= vinetto
PORTVERSION= 0.07
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-beta-${PORTVERSION}
DISTNAME= ${PORTNAME}-beta-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/security/w3af/Makefile b/security/w3af/Makefile
index c5fca59..56ff2e3 100644
--- a/security/w3af/Makefile
+++ b/security/w3af/Makefile
@@ -8,8 +8,7 @@
PORTNAME= w3af
PORTVERSION= 0.1.20070610
CATEGORIES= security python www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=w3af
+MASTER_SITES= SF/${PORTNAME}/OldFiles
DISTNAME= ${PORTNAME}-10Jun2007
MAINTAINER= sbrabez@gmail.com
diff --git a/security/webfwlog/Makefile b/security/webfwlog/Makefile
index a2b6a7f..dfb4705 100644
--- a/security/webfwlog/Makefile
+++ b/security/webfwlog/Makefile
@@ -9,7 +9,7 @@ PORTNAME= webfwlog
PORTVERSION= 0.93
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= zeus@ix.netcom.com
COMMENT= A web-based firewall log analyzer
diff --git a/security/wipe/Makefile b/security/wipe/Makefile
index 52961e5..eb7565a 100644
--- a/security/wipe/Makefile
+++ b/security/wipe/Makefile
@@ -8,8 +8,7 @@
PORTNAME= wipe
PORTVERSION= 2.2.0
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= File and block device wiping utility
diff --git a/security/yafic/Makefile b/security/yafic/Makefile
index 262be78..f6b9e3e 100644
--- a/security/yafic/Makefile
+++ b/security/yafic/Makefile
@@ -8,8 +8,7 @@
PORTNAME= yafic
PORTVERSION= 1.2.2
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= allan@saddi.com
COMMENT= Yet Another File Integrity Checker, similar to Tripwire
diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index 35809b9..2c27edd 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -8,8 +8,7 @@
PORTNAME= zebedee
PORTVERSION= 2.5.3
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Encrypted, secure compressed TCP tunnel
diff --git a/shells/heirloom-sh/Makefile b/shells/heirloom-sh/Makefile
index 8655c11..4dc5b9b 100644
--- a/shells/heirloom-sh/Makefile
+++ b/shells/heirloom-sh/Makefile
@@ -8,7 +8,7 @@
PORTNAME= heirloom-sh
PORTVERSION= 050706
CATEGORIES= shells
-MASTER_SITES= SF/heirloom
+MASTER_SITES= SF/heirloom/${PORTNAME}/${PORTVERSION}
MAINTAINER= danielt@pilgerer.org
COMMENT= Portable version of OpenSolaris' Bourne Shell
diff --git a/shells/ibsh/Makefile b/shells/ibsh/Makefile
index 15b520f..76e7fa4 100644
--- a/shells/ibsh/Makefile
+++ b/shells/ibsh/Makefile
@@ -8,8 +8,7 @@
PORTNAME= ibsh
PORTVERSION= 0.3e
CATEGORIES= shells
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= vaida.bogdan@gmail.com
COMMENT= Restricted unix shell
diff --git a/shells/rssh/Makefile b/shells/rssh/Makefile
index dec1127..59e331d 100644
--- a/shells/rssh/Makefile
+++ b/shells/rssh/Makefile
@@ -8,8 +8,7 @@
PORTNAME= rssh
PORTVERSION= 2.3.2
CATEGORIES= shells security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SF
MAINTAINER= pav@FreeBSD.org
COMMENT= A Restricted Secure SHell only for sftp or/and scp
diff --git a/shells/scponly/Makefile b/shells/scponly/Makefile
index 3d572a3..ea73b0d 100644
--- a/shells/scponly/Makefile
+++ b/shells/scponly/Makefile
@@ -73,8 +73,8 @@ PORTNAME= scponly
PORTVERSION= 4.8
CATEGORIES= shells security
MASTER_SITES= http://www.sublimation.org/scponly/ \
- SF
-MASTER_SITE_SUBDIR= scponly
+ SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index a651e08..fc4c5d6 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -9,7 +9,7 @@ PORTNAME= zsh
PORTVERSION= 4.3.10
PORTREVISION= 2
CATEGORIES= shells
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-dev/${PORTVERSION}
.if !defined(NOPORTDOCS)
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-doc${EXTRACT_SUFX}
.endif
diff --git a/sysutils/ah-tty/Makefile b/sysutils/ah-tty/Makefile
index 58c34fe..045d75c 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 6edb341..6b9632e 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 cd844f2..47d66b8 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 ae4a264..4aa809d 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 06560f8..77fd87a 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 7132c70..527a507 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 a17e470..b617215 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 4d1b182..b40bf83 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 c3e54ce..66a0a40 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 0d36a53..9067dfa 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 5a2cdb4..8857f02 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 0fcf744..6d00ff7 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 0fcf744..6d00ff7 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 77b2eae..872aa28 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 c846fe4..46825f2 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 da38abe..7661849 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 261969d0..f48da69 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 2c08796..a53d46b 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 dabb98e..6f866c7 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 a8d8f22..e1c95bb 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 0687605..9f940bf 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 68d66f1..1f65dae 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 e550f52..923a0f9 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 e6b5c60d..8de6c92 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 dd4affd..263ecbe 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 4a2f033..d4ca52a 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 aafce66..91b74d42 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 526d24f..2627039 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 e5cc065..5664147 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 229e05f..8bca359 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 6b7cdc6..751f022 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 20e2693..f622d7c 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 2a05a36..a1656a7 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 750091e..d1c191f 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 ba6c1a3..65a3cca 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 2ef3a86..9b1426a 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 4092355..b44d980 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 c173974..0e2189c 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 5c3f249..6538433 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 86e72fe..0d33896 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 8ae733e..844b988 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 05ddb3b..ed9e613 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 e050878..4b0ce25 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 395a850..ca1219d 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 da40bb1..d006446 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 2477eb1..996c977 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 7a5d054..844493a 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 4afa655..f325bb6 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 7d6df5a..ad32cfd 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 af3b9bb..2d7d1e0 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 c1bc5ce..e3ec79b 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 3e6b53f..f29cd32 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 450d396..d906917 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 fb585b8..244c4c9 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 71bc167..e9a6820 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 3e9c057..7c7a8e5 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 fb36836..f108481 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 ba455c2..d671069 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 dd870ef..02ae896 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 dc8fc83..698231f 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 dc8fc83..698231f 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 089ea70..f227150 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 e9aa919..1543f8e 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 7118d70..7b9bd35 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 0ead603..a87748b 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 8752340..78d86d8 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 2e20cff..33c5e95 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 72147aa..d7c9422 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 f3d08c4..64d4eff 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 db6f83c..f419235 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 fbd3539..a7e7c53 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 5060418..81d870b 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 904b17d..5c98e6c 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 cf8ab93..0573639 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 cf8ab93..0573639 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 de23b71..7bb066d 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 2577d8f..2907e38 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 38d7091..d65837d 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 7fb41f9..fcbb83a 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 f48e925..a2d801f 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 2d54fb9..dc16073 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 b79d242..c345b18 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 574cacf..ec7b77d 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 16a4acf..d8ea72a 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 8bbfb35..7c6a3d7 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 6a7a22c..399a524 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 4dd9902..f105213 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 4418a19..978a879 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 0f6efd6..f20d256 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 c1df78c..870377c 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 129d104..186e579 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 0bba755..31768f3 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 983c2c9..a9fa12e 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 3657303..70ad432 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 34c3787..2c97569 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 faf2e46..5bff19f 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 a45ab6f..ca49028 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 f5d1035..3324739 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 c942cf4..e22f39f 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 07123e5..205767e 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 07123e5..205767e 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 440de27..40ad416 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 b75e8f6..ce557ef 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 1c40a49..566603e 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 990298a..40fefdd 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 151c64d..e33dbcf 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 0b3b12a..50f4d6a 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 3525cdd..41299f0 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 c3538ff..3a260d7 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 f0e460d..1a2c82c 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 6acf3f1..39a98e1 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 c95d766..7cf2c9b 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 0f8d130..3006701 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 e0960df..24ad47f 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 97a4892..d109c15 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 b7ae9af..b738b87 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 77f2956..ca00b40 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 3dd710a..274dc9f 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 4b15c7e..2e84076 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 891521e..cb04f04 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
OpenPOWER on IntegriCloud