aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2009-08-22 00:35:32 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2009-08-22 00:35:32 +0000
commit3eb168f46b2ba49b62efa711ffbdd0a1047a5e5b (patch)
tree28b9adb73fe8d399559adc4ba81356f878615d45 /security
parent15e2263847b985944297d2a93caf296d9b64a255 (diff)
downloadports-3eb168f46b2ba49b62efa711ffbdd0a1047a5e5b.tar.gz
ports-3eb168f46b2ba49b62efa711ffbdd0a1047a5e5b.zip
Notes
Diffstat (limited to 'security')
-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
124 files changed, 132 insertions, 215 deletions
diff --git a/security/aescrypt/Makefile b/security/aescrypt/Makefile
index da24852b10d9..08bc1330d288 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 9c609ab253e2..c47ea54f3071 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 183e444f878e..1e7261d7a7b4 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 f667746f0a7a..0ce77ee6f496 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 4f840f8d67f7..7254d134679e 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 0d5223da1b27..0768477381d0 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 f63edb31d085..dae85ef0e2dc 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 c827c95a44a1..bb5bb6af7cc0 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 85d90a369958..0e105f30bdc4 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 cb95c429bc9a..34e3a413ce10 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 ba190f3b9f73..fbf384a458a5 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 5ebcd1d12e52..60cef6cbbb99 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 e7af3a77c60d..88087f2618ac 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 ea01cee431de..532723d88878 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 8103adde63f8..fda92da3ba0e 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 4020889d40db..6ae353b38a36 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 0e40308e3531..22c54ec78427 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 340db214a321..87a04f20df86 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 a5fff3a40427..401f9e1ae6f7 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 19373e9ec4be..3e1d36f26c62 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 4e4b61faa080..23d8dfe7014c 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 278a0d6791c4..4108e1bf7d0d 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 81de628afda2..7587ebeebab4 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 3d591fdccaf9..6107440e0224 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 f5db40fbe952..deb6d55a8985 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 de887a7143ab..5a6fd0e8cb45 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 7c24d548a9c5..b0564254c6c4 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 7e29aeb95acc..aa57c270c2d7 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 6ecbdb50661a..f0b9d654a4bc 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 42084f494650..790e925ce5f1 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 3647bcacfa34..e57ac1c9ad09 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 1853957aa288..6a4ddc61465c 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 be6ac9451a11..6d1e38d0db37 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 be6ac9451a11..6d1e38d0db37 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 3ad6b113b9ff..6356905e1c51 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 9dda401d5acd..2c676d7e9c24 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 24d9771e759e..7d1abfde9ac5 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 42ff433735a7..932a9ca6b844 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 a47f3dbe097c..1ff68f2bc6fc 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 8218cf7a89e1..c69899401044 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 ada48b54ff93..0ca1ec12808a 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 7bb032f6c347..9a9ead011f0d 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 5eb0899efa85..4a113fab4377 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 9b094e937f84..90dc42fa31c6 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 0177c1a99bdf..235b0670cba1 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 b366c636139a..6fe5f37cb2af 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 b366c636139a..6fe5f37cb2af 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 7a331e8d7f26..d0eaccb707ce 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 4eb9de6f74c9..bf41732d480f 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 804bcec49b8a..01a715a8a95c 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 3080dddd38d7..095645d2e252 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 fd4dac42d69a..0f1e559d7fd9 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 be9973e82ccc..cbd4c61a28f5 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 3d99c3880d99..75cbc24bccc3 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 31c3f415991b..627eea385ad3 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 c148e580dfad..5426401833e0 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 327e3f913a9b..1bf53c02932c 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 d1a4909c53bc..6d496191ded1 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 3966cc0ca4fb..3cf6048822da 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 82f27b56d551..d4a0f2ca89ba 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 476af3b3b115..45088d320ab8 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 35201fd92eb1..08661ede3b32 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 e0d558c5d7f4..82b05e1b926b 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 947edd54555e..29c6d9bf918e 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 23616cdec6ea..d881d9f7c7f3 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 bb85131ffca2..e7fea1ca85ed 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 61c1275b7832..5c431c0bc1fb 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 2621e0a47809..7eab1909a67a 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 2a2ec3a96021..0f54076ac160 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 669d6fb92c1a..43dfde995413 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 b5b7bcc3c2c7..ac80f89d152a 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 7a623dc91e1e..91e3d17b3b9f 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 1214974327b4..cdb819ceccc7 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 8a3f49e0c20c..6bfa83f1f4f6 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 d9fa2a3b1635..404382127e1e 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 69754a8f87cb..ca7dfe424cc4 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 e1a362dc3e01..32ad963f415e 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 ea07c2416979..9755dd62542f 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 c76f3a5bb2a9..d7cc66a7db8c 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 0b9b14b586f5..3492ca104131 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 b3381a66855c..736586707c00 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 f87d7415f1e4..56437d904d93 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 1c9b7c16aeb5..8f9dc6598ef2 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 8816749aac8d..36c958f3d48f 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 07c593db768c..a04042364e48 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 0249d4a3c193..3a66524089bb 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 e2da76d5cd2c..199daf406839 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 bd6e88793897..6aabda51b3a2 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 7a55a03ab5ee..de5a16d219d9 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 92fe01f1ac4d..9a291661deec 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 3d27732a4b33..4359db5bedcd 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 ccb379948202..e1c4f40cfcec 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 d3675803c99e..441d643856c1 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 bc6f85d5c49a..9c76c61d20e7 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 0d44b6148a1f..b4df445bb45b 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 aa168c1c206f..d4c909dada42 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 c2018c3138c7..56817b76d3ab 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 e7d535040769..7107eaba325a 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 584bb7038076..4701a03ea3c7 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 aae5fb51dd04..49e3013b1f96 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 06fea1984c40..1aa8601ae23b 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 315cab549813..6a3c74218c8f 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 ff3b1edfa316..370f94a63877 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 5e5004efb088..70c35efe4fd4 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 2ec4fed871d5..7686de6fd450 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 ec5e5dfda779..200c80c02eeb 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 aeb70de37f41..79844a82cb5d 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 d98ecbffe2a8..672438403c13 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 678d51afe3d4..93091265d687 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 1787970f84bf..33199f6e0d1f 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 f3fd117ac49e..a0b2aff226cb 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 c9fec5c40593..92a26c9fe23d 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 23e5995bf291..18d23f4bb87e 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 14b49ed432d2..b8ca0a4ce674 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 277fe215e261..08c931bd39e6 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 a2a649d36db1..04e374ce07bc 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 6b56a661cc66..bb5a37da2d35 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 2372abd7e3df..e58f31ee3058 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 158579447916..9c7223b761eb 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 c5fca594fe22..56ff2e3c23ce 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 a2b6a7f68011..dfb4705b1b4b 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 52961e56ca59..eb7565a6b463 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 262be7830082..f6b9e3ed58ff 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 35809b9949c5..2c27edd1a3ba 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