aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2015-05-14 10:15:04 +0000
committerMathieu Arnold <mat@FreeBSD.org>2015-05-14 10:15:04 +0000
commit60d1a83c2a113150cedbc43ff12a7375144f741a (patch)
tree627649ff7699a289d5d78c11bf8d105881402ca8 /security
parenta50428b01c275f058b067787701d333a9d45cbcb (diff)
Notes
Diffstat (limited to 'security')
-rw-r--r--security/ADMsmb/Makefile3
-rw-r--r--security/ADMsnmp/Makefile4
-rw-r--r--security/amap/Makefile3
-rw-r--r--security/amavis-stats/Makefile3
-rw-r--r--security/apache-xml-security-c/Makefile3
-rw-r--r--security/arirang/Makefile1
-rw-r--r--security/axTLS/Makefile3
-rw-r--r--security/blindelephant/Makefile3
-rw-r--r--security/bruteforceblocker/Makefile3
-rw-r--r--security/bsmtrace/Makefile3
-rw-r--r--security/ccsrch/Makefile5
-rw-r--r--security/checkpassword/Makefile3
-rw-r--r--security/clambc/Makefile3
-rw-r--r--security/courier-authlib/Makefile1
-rw-r--r--security/cracklib/Makefile2
-rw-r--r--security/cryptstring/Makefile2
-rw-r--r--security/dcetest/Makefile3
-rw-r--r--security/digest/Makefile3
-rw-r--r--security/dirmngr/Makefile3
-rw-r--r--security/dmitry/Makefile3
-rw-r--r--security/dradis/Makefile5
-rw-r--r--security/easypg/Makefile3
-rw-r--r--security/fakeroot/Makefile3
-rw-r--r--security/flawfinder/Makefile3
-rw-r--r--security/fprint_demo/Makefile3
-rw-r--r--security/fragroute/Makefile3
-rw-r--r--security/fuzzdb/Makefile4
-rw-r--r--security/gnupg/Makefile2
-rw-r--r--security/gnupg1/Makefile3
-rw-r--r--security/gnupg20/Makefile3
-rw-r--r--security/gwee/Makefile3
-rw-r--r--security/honggfuzz/Makefile2
-rw-r--r--security/hotssh/Makefile1
-rw-r--r--security/iaikpkcs11wrapper/Makefile3
-rw-r--r--security/isnprober/Makefile3
-rw-r--r--security/keychain/Makefile2
-rw-r--r--security/keyprint/Makefile3
-rw-r--r--security/kripp/Makefile3
-rw-r--r--security/l0pht-watch/Makefile3
-rw-r--r--security/libgcrypt/Makefile3
-rw-r--r--security/libgpg-error/Makefile3
-rw-r--r--security/libressl/Makefile3
-rw-r--r--security/libtasn1/Makefile3
-rw-r--r--security/logcheck/Makefile2
-rw-r--r--security/makepasswd/Makefile3
-rw-r--r--security/mindterm-binary/Makefile3
-rw-r--r--security/nettle/Makefile3
-rw-r--r--security/oath-toolkit/Makefile3
-rw-r--r--security/opencdk/Makefile1
-rw-r--r--security/openssh-portable/Makefile6
-rw-r--r--security/openssl/Makefile7
-rw-r--r--security/openvpn-auth-ldap/Makefile2
-rw-r--r--security/outguess/Makefile3
-rw-r--r--security/p5-Crypt-CAST5/Makefile1
-rw-r--r--security/p5-Crypt-Juniper/Makefile3
-rw-r--r--security/p5-Crypt-Rijndael/Makefile1
-rw-r--r--security/p5-CryptX/Makefile3
-rw-r--r--security/p5-GSSAPI/Makefile3
-rw-r--r--security/p5-MD5/Makefile3
-rw-r--r--security/p5-Net-Radius-Server/Makefile1
-rw-r--r--security/p5-SAVI-Perl/Makefile1
-rw-r--r--security/pam_fprint/Makefile3
-rw-r--r--security/pgpgpg/Makefile3
-rw-r--r--security/pgpin/Makefile3
-rw-r--r--security/pkcs11-dump/Makefile2
-rw-r--r--security/pkcs11-gateway/Makefile3
-rw-r--r--security/pks/Makefile5
-rw-r--r--security/pulledpork/Makefile2
-rw-r--r--security/putty/Makefile3
-rw-r--r--security/pwauth/Makefile2
-rw-r--r--security/quantis-kmod/Makefile3
-rw-r--r--security/quantis/Makefile3
-rw-r--r--security/ranpwd/Makefile9
-rw-r--r--security/sasp/Makefile3
-rw-r--r--security/seccure/Makefile2
-rw-r--r--security/signing-party/Makefile3
-rw-r--r--security/skipfish/Makefile2
-rw-r--r--security/srm/Makefile7
-rw-r--r--security/sshit/Makefile3
-rw-r--r--security/stoken/Makefile3
-rw-r--r--security/sudo/Makefile2
-rw-r--r--security/tripwire12/Makefile2
-rw-r--r--security/webscarab/Makefile3
-rw-r--r--security/xinetd/Makefile2
-rw-r--r--security/xml-security/Makefile9
85 files changed, 93 insertions, 162 deletions
diff --git a/security/ADMsmb/Makefile b/security/ADMsmb/Makefile
index 8f5142589563..95ccff23d191 100644
--- a/security/ADMsmb/Makefile
+++ b/security/ADMsmb/Makefile
@@ -4,8 +4,7 @@
PORTNAME= ADMsmb
PORTVERSION= 0.3
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_PACKETSTORM}
-MASTER_SITE_SUBDIR= groups/ADM
+MASTER_SITES= PACKETSTORM/groups/ADM
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/security/ADMsnmp/Makefile b/security/ADMsnmp/Makefile
index c2bbec374b46..3bb613a570cc 100644
--- a/security/ADMsnmp/Makefile
+++ b/security/ADMsnmp/Makefile
@@ -6,14 +6,14 @@ PORTVERSION= 0.1
CATEGORIES= security
MASTER_SITES= ftp://adm.freelsd.net/pub/ADM/ \
http://adm.freelsd.net/ADM/ \
- ${MASTER_SITE_PACKETSTORM:=groups/ADM/}
+ PACKETSTORM/groups/ADM
DISTNAME= ${PORTNAME}.${PORTVERSION}
-EXTRACT_SUFX= .tgz
MAINTAINER= onatan@gmail.com
COMMENT= SNMP audit scanner
WRKSRC= ${WRKDIR}/ADMsnmp
+USES= tar:tgz
do-build:
${CC} ${CFLAGS} -DPORTSHAREDIR="${PREFIX}/share/ADMsnmp" \
diff --git a/security/amap/Makefile b/security/amap/Makefile
index 31320042b929..4975a336a229 100644
--- a/security/amap/Makefile
+++ b/security/amap/Makefile
@@ -5,8 +5,7 @@ PORTNAME= amap
PORTVERSION= 5.2
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_PACKETSTORM}
-MASTER_SITE_SUBDIR= groups/thc
+MASTER_SITES= PACKETSTORM/groups/thc
MAINTAINER= onatan@gmail.com
COMMENT= Application mapper
diff --git a/security/amavis-stats/Makefile b/security/amavis-stats/Makefile
index db58d990ccf8..ae7bf4953cf8 100644
--- a/security/amavis-stats/Makefile
+++ b/security/amavis-stats/Makefile
@@ -5,8 +5,7 @@ PORTNAME= amavis-stats
PORTVERSION= 0.1.12
PORTREVISION= 4
CATEGORIES= security
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= feld
+MASTER_SITES= LOCAL/feld
MAINTAINER= feld@FreeBSD.org
COMMENT= Simple AMaViS statistics generator based on rrdtool
diff --git a/security/apache-xml-security-c/Makefile b/security/apache-xml-security-c/Makefile
index 90dcfcff2a82..6ea0679289ac 100644
--- a/security/apache-xml-security-c/Makefile
+++ b/security/apache-xml-security-c/Makefile
@@ -5,8 +5,7 @@ PORTNAME= xml-security-c
PORTVERSION= 1.7.2
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR=santuario/c-library
+MASTER_SITES= APACHE/santuario/c-library
PKGNAMEPREFIX= apache-
MAINTAINER= girgen@FreeBSD.org
diff --git a/security/arirang/Makefile b/security/arirang/Makefile
index 021af395ff9e..68e39c5f37e8 100644
--- a/security/arirang/Makefile
+++ b/security/arirang/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 2.03
PORTEPOCH= 1
CATEGORIES= security www
MASTER_SITES= http://monkey.org/~pilot/arirang/
-MASTER_SITE_SUBDIR= UNIX/cgi-scanners
MAINTAINER= ports@FreeBSD.org
COMMENT= Powerful webserver security scanner for network
diff --git a/security/axTLS/Makefile b/security/axTLS/Makefile
index 15d6eab9350e..ae7e66ad8d6e 100644
--- a/security/axTLS/Makefile
+++ b/security/axTLS/Makefile
@@ -5,8 +5,7 @@ PORTNAME= axTLS
PORTVERSION= 1.4.9
PORTREVISION= 2
CATEGORIES= security devel net
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME:tl}/${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME:tl}/${PORTVERSION}
MAINTAINER= umq@ueo.co.jp
COMMENT= SSL/TLS client/server library implementation
diff --git a/security/blindelephant/Makefile b/security/blindelephant/Makefile
index cc3750772517..97701358307c 100644
--- a/security/blindelephant/Makefile
+++ b/security/blindelephant/Makefile
@@ -5,9 +5,8 @@ PORTNAME= blindelephant
PORTVERSION= 1.0
PORTREVISION= 20100819
CATEGORIES= security www
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/niels \
http://people.freebsd.org/~niels/distfiles/
-MASTER_SITE_SUBDIR= niels
DISTNAME= ${PORTNAME}-${PORTREVISION}
MAINTAINER= ports@FreeBSD.org
diff --git a/security/bruteforceblocker/Makefile b/security/bruteforceblocker/Makefile
index f53fa599bb4a..b2f68a649a29 100644
--- a/security/bruteforceblocker/Makefile
+++ b/security/bruteforceblocker/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.2.3
PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://danger.rulez.sk/projects/bruteforceblocker/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= pav
+ LOCAL/pav
MAINTAINER= danger@FreeBSD.org
COMMENT= Checks for SSH bruteforce and blocks given IPs
diff --git a/security/bsmtrace/Makefile b/security/bsmtrace/Makefile
index adfa8e25e519..661f005cdd2a 100644
--- a/security/bsmtrace/Makefile
+++ b/security/bsmtrace/Makefile
@@ -5,8 +5,7 @@ PORTNAME= bsmtrace
PORTVERSION= 1.4
PORTREVISION= 0
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= csjp
+MASTER_SITES= LOCAL/csjp
MAINTAINER= alm@FreeBSD.org
COMMENT= BSM based intrusion detection system
diff --git a/security/ccsrch/Makefile b/security/ccsrch/Makefile
index 651eb613787f..c64991814729 100644
--- a/security/ccsrch/Makefile
+++ b/security/ccsrch/Makefile
@@ -5,9 +5,7 @@ PORTNAME= ccsrch
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION}
-EXTRACT_SUFX= .tgz
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION}
MAINTAINER= pavelivolkov@gmail.com
COMMENT= Is a tool that searches for credit card numbers (PAN) and track data
@@ -16,6 +14,7 @@ LICENSE= GPLv2
OPTIONS_DEFINE= DOCS
+USES= tar:tgz
PORTDOCS= README
PLIST_FILES= bin/${PORTNAME}
diff --git a/security/checkpassword/Makefile b/security/checkpassword/Makefile
index f5d558c6ad61..71fc1c7848e5 100644
--- a/security/checkpassword/Makefile
+++ b/security/checkpassword/Makefile
@@ -5,8 +5,7 @@ PORTNAME= checkpassword
PORTVERSION= 0.90
CATEGORIES= security
MASTER_SITES= http://cr.yp.to/checkpwd/ \
- ${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR= distfiles
+ GENTOO
MAINTAINER= garga@FreeBSD.org
COMMENT= Simple password-checking interface
diff --git a/security/clambc/Makefile b/security/clambc/Makefile
index 332aa6ecbbd3..4371d3dd90bf 100644
--- a/security/clambc/Makefile
+++ b/security/clambc/Makefile
@@ -4,8 +4,7 @@
PORTNAME= clambc
DISTVERSION= 0.98.5rc1
CATEGORIES= security
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= clamav/${PORTNAME:tl}
+MASTER_SITES= SF/clamav/${PORTNAME:tl}
MAINTAINER= zi@FreeBSD.org
COMMENT= Bytecode signature compiler for ClamAV
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index c2c669a0e067..a4f77956f2e9 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -7,7 +7,6 @@ PORTREVISION?= 0
CATEGORIES?= security mail
.if defined(PKGNAMESUFFIX)
MASTER_SITES= SF/courier/authlib/${PORTVERSION}
-MASTER_SITE_SUBDIR= courier
.else
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/security/cracklib/Makefile b/security/cracklib/Makefile
index f38921b9f389..9e3237dbbd34 100644
--- a/security/cracklib/Makefile
+++ b/security/cracklib/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= security
CATEGORIES+= python
.endif
MASTER_SITES= SF \
- LOCAL/${MAINTAINER:C/([^@]*)@.*/\1/}
+ LOCAL/cy
MAINTAINER= cy@FreeBSD.org
COMMENT?= Password-checking library
diff --git a/security/cryptstring/Makefile b/security/cryptstring/Makefile
index ee126d40a764..612d099cab54 100644
--- a/security/cryptstring/Makefile
+++ b/security/cryptstring/Makefile
@@ -4,7 +4,7 @@
PORTNAME= cryptstring
PORTVERSION= 0.2
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= Crypto Strings for PHP
diff --git a/security/dcetest/Makefile b/security/dcetest/Makefile
index 3c575544ccea..aa52beb75753 100644
--- a/security/dcetest/Makefile
+++ b/security/dcetest/Makefile
@@ -4,8 +4,7 @@
PORTNAME= dcetest
PORTVERSION= 1.2
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_PACKETSTORM}
-MASTER_SITE_SUBDIR= UNIX/scanners
+MASTER_SITES= PACKETSTORM/UNIX/scanners
MAINTAINER= onatan@gmail.com
COMMENT= Utility to dump MSRPC endpoint information from Windows systems
diff --git a/security/digest/Makefile b/security/digest/Makefile
index b66ebd1e94d1..2c206997fa2e 100644
--- a/security/digest/Makefile
+++ b/security/digest/Makefile
@@ -5,8 +5,7 @@ PORTNAME?= digest
PORTVERSION?= 20050323
PORTREVISION= 1
CATEGORIES?= security sysutils
-MASTER_SITES?= ${MASTER_SITE_NETBSD}
-MASTER_SITE_SUBDIR= ../../misc/digest
+MASTER_SITES?= NETBSD/../../misc/digest
MAINTAINER?= ports@FreeBSD.org
COMMENT?= Message digest wrapper utility
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index bb3bec1bf413..0b11ba20b4ed 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -5,8 +5,7 @@ PORTNAME= dirmngr
PORTVERSION= 1.1.0
PORTREVISION= 13
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GNUPG}
-MASTER_SITE_SUBDIR= dirmngr
+MASTER_SITES= GNUPG
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/security/dmitry/Makefile b/security/dmitry/Makefile
index 69ab6ab250e1..e4d887d6e17e 100644
--- a/security/dmitry/Makefile
+++ b/security/dmitry/Makefile
@@ -4,8 +4,7 @@
PORTNAME= dmitry
PORTVERSION= 1.3a
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_PACKETSTORM}
-MASTER_SITE_SUBDIR= UNIX/misc
+MASTER_SITES= PACKETSTORM/UNIX/misc
DISTNAME= DMitry-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/security/dradis/Makefile b/security/dradis/Makefile
index 2a0bf4b02c3a..96434ff9e69e 100644
--- a/security/dradis/Makefile
+++ b/security/dradis/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= dradis
+DISTVERSIONPREFIX= v
DISTVERSION= 2.6.1
CATEGORIES= security
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR=${PORTNAME:tl}/${PORTNAME:tl}/v${PORTVERSION}
-DISTNAME= ${PORTNAME}-v${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME:tl}/v${PORTVERSION}
MAINTAINER= semprix@gmx.com
COMMENT= Opensource framework to enable effective information gathering
diff --git a/security/easypg/Makefile b/security/easypg/Makefile
index 557a14be5396..ac2d18247234 100644
--- a/security/easypg/Makefile
+++ b/security/easypg/Makefile
@@ -5,8 +5,7 @@ PORTNAME= easypg
PORTVERSION= 0.0.16
PORTREVISION= 14
CATEGORIES= security elisp
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR= epg/29289
+MASTER_SITES= SFJP/epg/29289
DISTNAME= epg-${PORTVERSION}
MAINTAINER= iwazaki8@yahoo.co.jp
diff --git a/security/fakeroot/Makefile b/security/fakeroot/Makefile
index f96e03e5ca98..7693dffef2e3 100644
--- a/security/fakeroot/Makefile
+++ b/security/fakeroot/Makefile
@@ -4,8 +4,7 @@
PORTNAME= fakeroot
PORTVERSION= 1.20.2
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/f/fakeroot
+MASTER_SITES= DEBIAN
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= martymac@FreeBSD.org
diff --git a/security/flawfinder/Makefile b/security/flawfinder/Makefile
index bbca190880b1..adbf1fdd54dc 100644
--- a/security/flawfinder/Makefile
+++ b/security/flawfinder/Makefile
@@ -5,8 +5,7 @@ PORTNAME= flawfinder
PORTVERSION= 1.31
CATEGORIES= security devel
MASTER_SITES= http://www.dwheeler.com/flawfinder/ \
- ${MASTER_SITE_PACKETSTORM}
-MASTER_SITE_SUBDIR= UNIX/security
+ PACKETSTORM/UNIX/security
MAINTAINER= lx@FreeBSD.org
COMMENT= Examines source code looking for security weaknesses
diff --git a/security/fprint_demo/Makefile b/security/fprint_demo/Makefile
index 94b53109a1c5..2cac74de2610 100644
--- a/security/fprint_demo/Makefile
+++ b/security/fprint_demo/Makefile
@@ -5,8 +5,7 @@ PORTNAME= fprint_demo
PORTVERSION= 20080303
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/f/${PORTNAME:C/_/-/}
+MASTER_SITES= DEBIAN/pool/main/f/${PORTNAME:C/_/-/}
DISTNAME= ${PORTNAME:C/_/-/}_${PORTVERSION}git.orig
MAINTAINER= lichray@gmail.com
diff --git a/security/fragroute/Makefile b/security/fragroute/Makefile
index 70f3b715906f..ff171f285c09 100644
--- a/security/fragroute/Makefile
+++ b/security/fragroute/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 1.2
PORTREVISION= 12
CATEGORIES= security net
MASTER_SITES= http://monkey.org/~dugsong/fragroute/ \
- ${MASTER_SITE_PACKETSTORM}
-MASTER_SITE_SUBDIR= UNIX/security
+ PACKETSTORM/UNIX/security
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool for intercepting, modifying, and rewriting egress traffic
diff --git a/security/fuzzdb/Makefile b/security/fuzzdb/Makefile
index d24843d6f207..76023df6cafc 100644
--- a/security/fuzzdb/Makefile
+++ b/security/fuzzdb/Makefile
@@ -4,12 +4,12 @@
PORTNAME= fuzzdb
PORTVERSION= 1.09
CATEGORIES= security www
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
-EXTRACT_SUFX= .tgz
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= Comprehensive set of fuzzing patterns
+USES= tar:tgz
NO_BUILD= yes
EXTRACT_AFTER_ARGS= --exclude .svn
PORTDOCS= _copyright.txt _readme.txt
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 072d0560152c..93f673db929e 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -4,7 +4,7 @@ PORTNAME= gnupg
PORTVERSION= 2.1.2
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= GNUPG/gnupg
+MASTER_SITES= GNUPG
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index 6c2d31f95c28..8b26014bcc3e 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -4,8 +4,7 @@ PORTNAME= gnupg
PORTVERSION= 1.4.19
#PORTREVISION= 0
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GNUPG}
-MASTER_SITE_SUBDIR= gnupg
+MASTER_SITES= GNUPG
PKGNAMESUFFIX= 1
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/security/gnupg20/Makefile b/security/gnupg20/Makefile
index f4290e095417..f4c56077c78e 100644
--- a/security/gnupg20/Makefile
+++ b/security/gnupg20/Makefile
@@ -4,8 +4,7 @@ PORTNAME= gnupg
PORTVERSION= 2.0.27
#PORTREVISION= 0
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GNUPG}
-MASTER_SITE_SUBDIR= gnupg
+MASTER_SITES= GNUPG
PKGNAMESUFFIX= 20
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/security/gwee/Makefile b/security/gwee/Makefile
index 3f419599047a..abcaa044154a 100644
--- a/security/gwee/Makefile
+++ b/security/gwee/Makefile
@@ -4,8 +4,7 @@
PORTNAME= gwee
PORTVERSION= 1.36
CATEGORIES= security www
-MASTER_SITES= PACKETSTORM
-MASTER_SITE_SUBDIR= UNIX/utilities
+MASTER_SITES= PACKETSTORM/UNIX/utilities
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool to exploit command execution vulnerabilities in web scripts
diff --git a/security/honggfuzz/Makefile b/security/honggfuzz/Makefile
index 5f8a23744082..5e743a554f2c 100644
--- a/security/honggfuzz/Makefile
+++ b/security/honggfuzz/Makefile
@@ -5,7 +5,7 @@ PORTNAME= honggfuzz
PORTVERSION= 0.3
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= sbz@FreeBSD.org
COMMENT= General-purpose fuzzer with simple, command-line interface
diff --git a/security/hotssh/Makefile b/security/hotssh/Makefile
index 5aafc4300a22..d1fe5c3683bc 100644
--- a/security/hotssh/Makefile
+++ b/security/hotssh/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.2.7
PORTREVISION= 5
CATEGORIES= security gnome
MASTER_SITES= GNOME
-MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
MAINTAINER= ashish@FreeBSD.org
COMMENT= HotSSH is an interface to Secure Shell, for GNOME and OpenSSH
diff --git a/security/iaikpkcs11wrapper/Makefile b/security/iaikpkcs11wrapper/Makefile
index cda85e003b46..27efc672eacc 100644
--- a/security/iaikpkcs11wrapper/Makefile
+++ b/security/iaikpkcs11wrapper/Makefile
@@ -4,8 +4,7 @@
PORTNAME= iaikPkcs11Wrapper
PORTVERSION= 1.2.18
CATEGORIES= security java devel
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ale
+MASTER_SITES= LOCAL/ale
DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/g}
MAINTAINER= ale@FreeBSD.org
diff --git a/security/isnprober/Makefile b/security/isnprober/Makefile
index 1a53de8ed38a..69323c3387b4 100644
--- a/security/isnprober/Makefile
+++ b/security/isnprober/Makefile
@@ -5,8 +5,7 @@ PORTNAME= isnprober
PORTVERSION= 1.02
CATEGORIES= security
MASTER_SITES= ftp://ftp.ubizen.com/tools/ \
- ${MASTER_SITE_PACKETSTORM}
-MASTER_SITE_SUBDIR= UNIX/scanners
+ PACKETSTORM/UNIX/scanners
MAINTAINER= onatan@gmail.com
COMMENT= PenTest tool for TCP Initial Sequence Numbers research
diff --git a/security/keychain/Makefile b/security/keychain/Makefile
index 2f7d3a68cefa..37c70ca3ab65 100644
--- a/security/keychain/Makefile
+++ b/security/keychain/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 2.8.0
PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= http://www.funtoo.org/archive/keychain/ \
- GENTOO/distfiles
+ GENTOO
MAINTAINER= garga@FreeBSD.org
COMMENT= User-friendly front-end to ssh-agent(1)
diff --git a/security/keyprint/Makefile b/security/keyprint/Makefile
index 96365a7f5d66..0c303355503e 100644
--- a/security/keyprint/Makefile
+++ b/security/keyprint/Makefile
@@ -4,8 +4,7 @@
PORTNAME= keyprint
PORTVERSION= 1.0
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= mharo
+MASTER_SITES= LOCAL/mharo
MAINTAINER= ports@FreeBSD.org
COMMENT= Print S/Key keys on a piece of paper, twice the size of a credit card
diff --git a/security/kripp/Makefile b/security/kripp/Makefile
index c765ee74212d..cac3124ed290 100644
--- a/security/kripp/Makefile
+++ b/security/kripp/Makefile
@@ -4,9 +4,8 @@
PORTNAME= kripp
PORTVERSION= 0.6.1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_PACKETSTORM} \
+MASTER_SITES= PACKETSTORM/sniffers \
http://konst.org.ua/download/
-MASTER_SITE_SUBDIR= sniffers
MAINTAINER= ports@FreeBSD.org
COMMENT= Lightweight network password sniffer
diff --git a/security/l0pht-watch/Makefile b/security/l0pht-watch/Makefile
index 8e427d06581a..bd6b75fbc9a7 100644
--- a/security/l0pht-watch/Makefile
+++ b/security/l0pht-watch/Makefile
@@ -4,8 +4,7 @@
PORTNAME= l0pht-watch
PORTVERSION= 1.1
CATEGORIES= security
-MASTER_SITES= LOCAL
-MASTER_SITE_SUBDIR= vs
+MASTER_SITES= LOCAL/vs
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index bc834742ceb1..f98b29fb756b 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -3,8 +3,7 @@
PORTNAME= libgcrypt
PORTVERSION= 1.6.3
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GNUPG}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNUPG
MAINTAINER= cpm@fbsd.es
COMMENT= General purpose crypto library based on code used in GnuPG
diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index c28761da4123..522e7aba7a40 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -4,8 +4,7 @@
PORTNAME= libgpg-error
PORTVERSION= 1.19
CATEGORIES= security devel
-MASTER_SITES= ${MASTER_SITE_GNUPG}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= GNUPG
MAINTAINER= novel@FreeBSD.org
COMMENT= Common error values for all GnuPG components
diff --git a/security/libressl/Makefile b/security/libressl/Makefile
index 454b8c473adb..93b7559ff7cf 100644
--- a/security/libressl/Makefile
+++ b/security/libressl/Makefile
@@ -4,8 +4,7 @@
PORTNAME= libressl
PORTVERSION= 2.1.6
CATEGORIES= security devel
-MASTER_SITES= ${MASTER_SITE_OPENBSD}
-MASTER_SITE_SUBDIR= LibreSSL
+MASTER_SITES= OPENBSD/LibreSSL
MAINTAINER= vsevolod@FreeBSD.org
COMMENT= Free version of the SSL/TLS protocol forked from OpenSSL
diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile
index 5087cac9d997..0ad17c13a010 100644
--- a/security/libtasn1/Makefile
+++ b/security/libtasn1/Makefile
@@ -4,8 +4,7 @@
PORTNAME= libtasn1
PORTVERSION= 4.5
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR= libtasn1
+MASTER_SITES= GNU
MAINTAINER= novel@FreeBSD.org
COMMENT= ASN.1 structure parser library
diff --git a/security/logcheck/Makefile b/security/logcheck/Makefile
index fa2345f63498..dd9904530dbe 100644
--- a/security/logcheck/Makefile
+++ b/security/logcheck/Makefile
@@ -4,7 +4,7 @@
PORTNAME= logcheck
PORTVERSION= 1.3.17
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= yasu@utahime.org
diff --git a/security/makepasswd/Makefile b/security/makepasswd/Makefile
index 22af57791fc0..328c4c855714 100644
--- a/security/makepasswd/Makefile
+++ b/security/makepasswd/Makefile
@@ -5,12 +5,11 @@ PORTNAME= makepasswd
PORTVERSION= 1.10
PORTREVISION= 6
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
PATCHFILES= ${PORTNAME}_${PORTVERSION}-5.diff.gz
PATCH_SITES= ${MASTER_SITES}
-PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR}
PATCH_DIST_STRIP= -p1
MAINTAINER= toni.viemero@iki.fi
diff --git a/security/mindterm-binary/Makefile b/security/mindterm-binary/Makefile
index 726194fb1e72..f4fc21077b16 100644
--- a/security/mindterm-binary/Makefile
+++ b/security/mindterm-binary/Makefile
@@ -5,8 +5,7 @@ PORTNAME= mindterm-binary
PORTVERSION= 1.2.1
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= alex
+MASTER_SITES= LOCAL/alex
DISTNAME= mindtermbin-v121
DISTFILES= mindterm-ssh.html ${EXTRACT_ONLY}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/security/nettle/Makefile b/security/nettle/Makefile
index 001df2f5cc7f..00649926328d 100644
--- a/security/nettle/Makefile
+++ b/security/nettle/Makefile
@@ -4,10 +4,9 @@
PORTNAME= nettle
PORTVERSION= 2.7.1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GNU} \
+MASTER_SITES= GNU \
http://www.lysator.liu.se/~nisse/archive/:liu \
ftp://ftp.lysator.liu.se/pub/security/lsh/:liu
-MASTER_SITE_SUBDIR= ${PORTNAME}/:DEFAULT
MAINTAINER= johans@FreeBSD.org
COMMENT= Low-level cryptographic library
diff --git a/security/oath-toolkit/Makefile b/security/oath-toolkit/Makefile
index fe396233563e..67131b61afeb 100644
--- a/security/oath-toolkit/Makefile
+++ b/security/oath-toolkit/Makefile
@@ -5,8 +5,7 @@ PORTNAME= oath-toolkit
PORTVERSION= 2.4.1
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR= ${PORTNAME}
+MASTER_SITES= SAVANNAH
MAINTAINER= ale@FreeBSD.org
COMMENT= Library, tools, and PAM module for OATH authentication
diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index 84bba7494793..eb148f119be5 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -7,7 +7,6 @@ PORTREVISION= 8
PORTEPOCH= 1
CATEGORIES= security
MASTER_SITES= http://josefsson.org/gnutls/releases/opencdk/
-MASTER_SITE_SUBDIR= alpha/gnutls/opencdk
MAINTAINER= novel@FreeBSD.org
COMMENT= Open Crypto Development Kit
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index f84e4ea00f59..d9bd0aa755eb 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -6,8 +6,7 @@ DISTVERSION= 6.8p1
PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= security ipv6
-MASTER_SITES= ${MASTER_SITE_OPENBSD}
-MASTER_SITE_SUBDIR= OpenSSH/portable
+MASTER_SITES= OPENBSD/OpenSSH/portable
PKGNAMESUFFIX?= -portable
MAINTAINER= bdrewery@FreeBSD.org
@@ -94,8 +93,7 @@ EXTRA_PATCHES:= ${EXTRA_PATCHES:N${TCP_WRAPPERS_EXTRA_PATCHES}}
PORTDOCS+= HPN-README
HPN_VERSION= 14v5
HPN_DISTVERSION= 6.7p1
-#PATCH_SITES+= ${MASTER_SITE_SOURCEFORGE:S/$/:hpn/}
-#PATCH_SITE_SUBDIR+= hpnssh/HPN-SSH%20${HPN_VERSION}%20${HPN_DISTVERSION}/:hpn
+#PATCH_SITES+= SOURCEFORGE/hpnssh/HPN-SSH%20${HPN_VERSION}%20${HPN_DISTVERSION}/:hpn
#PATCHFILES+= ${PORTNAME}-${HPN_DISTVERSION}-hpnssh${HPN_VERSION}.diff.gz:-p1:hpn
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-hpn:-p2
.endif
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 9501eae43489..58a341f10e66 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -6,10 +6,9 @@ PORTVERSION= 1.0.2
DISTVERSIONSUFFIX= a
PORTREVISION= 1
CATEGORIES= security devel
-MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \
- ftp://ftp.openssl.org/%SUBDIR%/ \
- ftp://ftp.cert.dfn.de/pub/tools/net/openssl/%SUBDIR%/
-MASTER_SITE_SUBDIR= source
+MASTER_SITES= http://www.openssl.org/source/ \
+ ftp://ftp.openssl.org/source/ \
+ ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
DIST_SUBDIR= ${DISTNAME}
MAINTAINER= dinoex@FreeBSD.org
diff --git a/security/openvpn-auth-ldap/Makefile b/security/openvpn-auth-ldap/Makefile
index c58d8c5491de..d1a12fea9a5e 100644
--- a/security/openvpn-auth-ldap/Makefile
+++ b/security/openvpn-auth-ldap/Makefile
@@ -5,7 +5,7 @@ PORTNAME= openvpn-auth-ldap
PORTVERSION= 2.0.4.0.s1379
PORTREVISION= 1
CATEGORIES= security
-#MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+#MASTER_SITES= GOOGLE_CODE
MASTER_SITES= LOCAL/mandree
DISTNAME= auth-ldap-${PORTVERSION}
diff --git a/security/outguess/Makefile b/security/outguess/Makefile
index 4a58d22aa5a4..5ea2d75c1483 100644
--- a/security/outguess/Makefile
+++ b/security/outguess/Makefile
@@ -9,8 +9,7 @@ MASTER_SITES= http://www.outguess.org/ \
http://cimarron.river.com/mirrors/www.outguess.org/ \
http://munitions.vipul.net/software/steganography/ \
http://the25200-1.gw.connect.com.au/security/steganography/ \
- ${MASTER_SITE_PACKETSTORM}
-MASTER_SITE_SUBDIR= crypt/stego
+ PACKETSTORM/crypt/stego
MAINTAINER= ports@FreeBSD.org
COMMENT= Steganographic tool
diff --git a/security/p5-Crypt-CAST5/Makefile b/security/p5-Crypt-CAST5/Makefile
index b86c5192db2c..625abb8811c9 100644
--- a/security/p5-Crypt-CAST5/Makefile
+++ b/security/p5-Crypt-CAST5/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.05
PORTREVISION= 1
CATEGORIES= security perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Crypt
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Crypt-Juniper/Makefile b/security/p5-Crypt-Juniper/Makefile
index e66d18d9dd6b..a12fa6cac689 100644
--- a/security/p5-Crypt-Juniper/Makefile
+++ b/security/p5-Crypt-Juniper/Makefile
@@ -5,8 +5,7 @@ PORTNAME= Crypt-Juniper
PORTVERSION= 0.02
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
MAINTAINER= snowfly@yuntech.edu.tw
diff --git a/security/p5-Crypt-Rijndael/Makefile b/security/p5-Crypt-Rijndael/Makefile
index 4b68cbad43ce..84182311d305 100644
--- a/security/p5-Crypt-Rijndael/Makefile
+++ b/security/p5-Crypt-Rijndael/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.11
PORTREVISION= 1
CATEGORIES= security perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Crypt
PKGNAMEPREFIX= p5-
MAINTAINER= skreuzer@FreeBSD.org
diff --git a/security/p5-CryptX/Makefile b/security/p5-CryptX/Makefile
index d40bc8e193fe..8316f2c66001 100644
--- a/security/p5-CryptX/Makefile
+++ b/security/p5-CryptX/Makefile
@@ -5,8 +5,7 @@ PORTNAME= CryptX
PORTVERSION= 0.021
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Crypt
+MASTER_SITES= CPAN/Crypt
PKGNAMEPREFIX= p5-
MAINTAINER= vanilla@FreeBSD.org
diff --git a/security/p5-GSSAPI/Makefile b/security/p5-GSSAPI/Makefile
index 505a90a10e67..8468c56fe7c3 100644
--- a/security/p5-GSSAPI/Makefile
+++ b/security/p5-GSSAPI/Makefile
@@ -5,8 +5,7 @@ PORTNAME= GSSAPI
PORTVERSION= 0.28
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= LWP/AGROLMS
+MASTER_SITES= CPAN/LWP/AGROLMS
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-MD5/Makefile b/security/p5-MD5/Makefile
index 0c457583f496..fbef809fcf45 100644
--- a/security/p5-MD5/Makefile
+++ b/security/p5-MD5/Makefile
@@ -5,8 +5,7 @@ PORTNAME= MD5
PORTVERSION= 2.03
PORTREVISION= 1
CATEGORIES= security perl5
-MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= ${PORTNAME}/GAAS
+MASTER_SITES= CPAN/${PORTNAME}/GAAS
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-Net-Radius-Server/Makefile b/security/p5-Net-Radius-Server/Makefile
index 9f3ca9b1759d..2df562379199 100644
--- a/security/p5-Net-Radius-Server/Makefile
+++ b/security/p5-Net-Radius-Server/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 1.116
PORTREVISION= 1
CATEGORIES= security perl5
MASTER_SITES= CPAN
-MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
diff --git a/security/p5-SAVI-Perl/Makefile b/security/p5-SAVI-Perl/Makefile
index 4c75014c608c..4f79896a3bb9 100644
--- a/security/p5-SAVI-Perl/Makefile
+++ b/security/p5-SAVI-Perl/Makefile
@@ -6,7 +6,6 @@ PORTVERSION= 0.30
PORTREVISION= 6
CATEGORIES= security perl5
MASTER_SITES= http://www.csupomona.edu/~henson/archive/projects/SAVI-Perl/dist/
-MASTER_SITE_SUBDIR= security
PKGNAMEPREFIX= p5-
MAINTAINER= pi@FreeBSD.org
diff --git a/security/pam_fprint/Makefile b/security/pam_fprint/Makefile
index 983332629e97..d1ee036309a5 100644
--- a/security/pam_fprint/Makefile
+++ b/security/pam_fprint/Makefile
@@ -5,8 +5,7 @@ PORTNAME= pam_fprint
PORTVERSION= 20080330
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/p/${PORTNAME:C/_/-/}
+MASTER_SITES= DEBIAN/pool/main/p/${PORTNAME:C/_/-/}
DISTNAME= ${PORTNAME:C/_/-/}_${PORTVERSION}+git.orig
MAINTAINER= lichray@gmail.com
diff --git a/security/pgpgpg/Makefile b/security/pgpgpg/Makefile
index 7176ab00a6e2..fdba7ac8fc87 100644
--- a/security/pgpgpg/Makefile
+++ b/security/pgpgpg/Makefile
@@ -5,10 +5,9 @@ PORTNAME= pgpgpg
PORTVERSION= 0.13
PORTREVISION= 4
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_PACKETSTORM} \
+MASTER_SITES= PACKETSTORM/crypt/pgpgpg \
ftp://ftp.gnupg.org/gcrypt/historic/ \
http://www.nessie.de/mroth/pgpgpg/
-MASTER_SITE_SUBDIR= crypt/pgpgpg
MAINTAINER= ports@FreeBSD.org
COMMENT= Wrapper for GnuPG to simulate PGP 2.6.x
diff --git a/security/pgpin/Makefile b/security/pgpin/Makefile
index e34c5f68b6ca..eddfa10a7570 100644
--- a/security/pgpin/Makefile
+++ b/security/pgpin/Makefile
@@ -3,8 +3,7 @@
PORTNAME= pgpin
PORTVERSION= 010323
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= dinoex
+MASTER_SITES= LOCAL/dinoex
DISTNAME= pgp263in${PORTVERSION}
EXTRACT_SUFX= .tgz
diff --git a/security/pkcs11-dump/Makefile b/security/pkcs11-dump/Makefile
index b57790c42f46..387b5c73ec2f 100644
--- a/security/pkcs11-dump/Makefile
+++ b/security/pkcs11-dump/Makefile
@@ -4,7 +4,7 @@
PORTNAME= pkcs11-dump
PORTVERSION= 0.3.4
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ale@FreeBSD.org
COMMENT= Allow dumping PKCS\#11 token content
diff --git a/security/pkcs11-gateway/Makefile b/security/pkcs11-gateway/Makefile
index b7817a5ffe89..44b420c79369 100644
--- a/security/pkcs11-gateway/Makefile
+++ b/security/pkcs11-gateway/Makefile
@@ -4,8 +4,7 @@
PORTNAME= pkcs11-gateway
PORTVERSION= 1.2
CATEGORIES= security devel linux
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ale
+MASTER_SITES= LOCAL/ale
MAINTAINER= ale@FreeBSD.org
COMMENT= Wrapper Cryptoki library to use Linux PKCS\#11 modules
diff --git a/security/pks/Makefile b/security/pks/Makefile
index f6aa862f5265..2e1f490120c6 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -5,9 +5,8 @@ PORTNAME= pks
PORTVERSION= 0.9.6.20040312
PORTREVISION= 1
CATEGORIES= security www
-MASTER_SITES= http://pks.sourceforge.net/:sf ${MASTER_SITE_LOCAL}:local
-MASTER_SITE_SUBDIR= .:sf mandree:local
-DISTFILES= pks-current.tgz:sf,local
+MASTER_SITES= http://pks.sourceforge.net/ LOCAL/mandree
+DISTFILES= pks-current.tgz
MAINTAINER= tphilipp@potion-studios.com
COMMENT= PGP Public Key Server
diff --git a/security/pulledpork/Makefile b/security/pulledpork/Makefile
index 1216bd72d168..6257d09ed122 100644
--- a/security/pulledpork/Makefile
+++ b/security/pulledpork/Makefile
@@ -4,7 +4,7 @@
PORTNAME= pulledpork
PORTVERSION= 0.7.0
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= ohauer@FreeBSD.org
COMMENT= Script to update snort-2.8+ rules
diff --git a/security/putty/Makefile b/security/putty/Makefile
index 0d5449e0eec1..a9017eb64447 100644
--- a/security/putty/Makefile
+++ b/security/putty/Makefile
@@ -3,9 +3,8 @@
PORTNAME= putty
PORTVERSION= 0.64
CATEGORIES= security ipv6
-MASTER_SITES= http://the.earth.li/~sgtatham/putty/%SUBDIR%/ \
+MASTER_SITES= http://the.earth.li/~sgtatham/putty/${PORTVERSION}/ \
ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/
-MASTER_SITE_SUBDIR= ${PORTVERSION}
# Beat Gaetzi (beat@) is permitted to take maintainership back
# or commit to this port without my prior approval.
diff --git a/security/pwauth/Makefile b/security/pwauth/Makefile
index e6c066e1531e..0d5e737c3c3d 100644
--- a/security/pwauth/Makefile
+++ b/security/pwauth/Makefile
@@ -4,7 +4,7 @@
PORTNAME= pwauth
PORTVERSION= 2.3.11
CATEGORIES= security www
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
+MASTER_SITES= GOOGLE_CODE \
http://www.unixpapa.com/software/
MAINTAINER= eg@fbsd.lt
diff --git a/security/quantis-kmod/Makefile b/security/quantis-kmod/Makefile
index 73791dc1282f..ed32888d1cb4 100644
--- a/security/quantis-kmod/Makefile
+++ b/security/quantis-kmod/Makefile
@@ -5,8 +5,7 @@ PORTNAME= quantis
DISTVERSION= v13.11.08
CATEGORIES= security
MASTER_SITES= http://www.idquantique.com/~download/Quantis/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ale
+ LOCAL/ale
PKGNAMESUFFIX= -kmod
DISTNAME= Quantis-${DISTVERSION}-src
diff --git a/security/quantis/Makefile b/security/quantis/Makefile
index c2672aec0396..f08c84298d67 100644
--- a/security/quantis/Makefile
+++ b/security/quantis/Makefile
@@ -5,8 +5,7 @@ PORTNAME= quantis
DISTVERSION= v13.11.08
CATEGORIES= security devel java
MASTER_SITES= http://www.idquantique.com/~download/Quantis/ \
- ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= ale
+ LOCAL/ale
DISTNAME= Quantis-${DISTVERSION}-src
MAINTAINER= ale@FreeBSD.org
diff --git a/security/ranpwd/Makefile b/security/ranpwd/Makefile
index 9bdba7bfb9f7..f56c5e9660f7 100644
--- a/security/ranpwd/Makefile
+++ b/security/ranpwd/Makefile
@@ -6,11 +6,10 @@ PORTVERSION= 1.2
PORTREVISION= 1
CATEGORIES= security
#MASTER_SITES= KERNEL_ORG
-MASTER_SITES= http://artfiles.org/kernel.org/pub/%SUBDIR%/ \
- http://debian.securedservers.com/kernel/pub/%SUBDIR%/ \
- http://ftp.cc.uoc.gr/pub/%SUBDIR%/ \
- http://ftp.naist.jp/pub/Linux/kernel.org/%SUBDIR%/
-MASTER_SITE_SUBDIR= software/utils/admin/ranpwd
+MASTER_SITES= http://artfiles.org/kernel.org/pub/software/utils/admin/ranpwd/ \
+ http://debian.securedservers.com/kernel/pub/software/utils/admin/ranpwd/ \
+ http://ftp.cc.uoc.gr/pub/software/utils/admin/ranpwd/ \
+ http://ftp.naist.jp/pub/Linux/kernel.org/software/utils/admin/ranpwd/
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool to generate random passwords
diff --git a/security/sasp/Makefile b/security/sasp/Makefile
index 91d6edbaf2aa..08a366cbe4d5 100644
--- a/security/sasp/Makefile
+++ b/security/sasp/Makefile
@@ -5,9 +5,8 @@ PORTNAME= sasp
PORTVERSION= 0.1
PORTREVISION= 3
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/ahze \
http://people.freebsd.org/~ahze/distfiles/
-MASTER_SITE_SUBDIR= ahze
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool that permits to use a gateway whatever IP we have
diff --git a/security/seccure/Makefile b/security/seccure/Makefile
index 489562e95a3d..cafa19fd4540 100644
--- a/security/seccure/Makefile
+++ b/security/seccure/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 0.5
PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://point-at-infinity.org/seccure/ \
- ${MASTER_SITE_NETBSD}
+ NETBSD
MAINTAINER= zi@FreeBSD.org
COMMENT= Elliptic Curve Crypto Utility for Reliable Encryption
diff --git a/security/signing-party/Makefile b/security/signing-party/Makefile
index 4eeabccba4b4..5186aa2779cb 100644
--- a/security/signing-party/Makefile
+++ b/security/signing-party/Makefile
@@ -6,8 +6,7 @@ PORTVERSION= 2.0
PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ftp://ftp.stack.nl/pub/users/johans/signing-party/ \
- ${MASTER_SITE_DEBIAN}
-MASTER_SITE_SUBDIR= pool/main/s/signing-party
+ DEBIAN
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= johans@FreeBSD.org
diff --git a/security/skipfish/Makefile b/security/skipfish/Makefile
index 6310237af84f..6b26ccf9fdef 100644
--- a/security/skipfish/Makefile
+++ b/security/skipfish/Makefile
@@ -5,7 +5,7 @@ PORTNAME= skipfish
PORTVERSION= 2.10b
PORTREVISION= 3
CATEGORIES= security www
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= GOOGLE_CODE
MAINTAINER= zi@FreeBSD.org
COMMENT= Fully automated, active web application security reconnaissance tool
diff --git a/security/srm/Makefile b/security/srm/Makefile
index db8cb14ead22..3057f4684e6e 100644
--- a/security/srm/Makefile
+++ b/security/srm/Makefile
@@ -4,10 +4,9 @@
PORTNAME= srm
PORTVERSION= 1.2.12
CATEGORIES= security sysutils
-MASTER_SITES= SF
-MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION} \
- ${PORTNAME}/old_releases \
- ${PORTNAME}/old_releases/${PORTVERSION}
+MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} \
+ SF/${PORTNAME}/old_releases \
+ SF/${PORTNAME}/old_releases/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Secure rm, a utility which destroys file contents before unlinking
diff --git a/security/sshit/Makefile b/security/sshit/Makefile
index 06cdb2185174..26c9f1ce0943 100644
--- a/security/sshit/Makefile
+++ b/security/sshit/Makefile
@@ -5,8 +5,7 @@ PORTNAME= sshit
PORTVERSION= 0.6
PORTREVISION= 4
CATEGORIES= security
-MASTER_SITES= http://anp.ath.cx/sshit/ \
- ${MASTER_SITE_LOCAL}
+MASTER_SITES= http://anp.ath.cx/sshit/
MAINTAINER= ports@FreeBSD.org
COMMENT= Checks for SSH/FTP bruteforce and blocks given IPs
diff --git a/security/stoken/Makefile b/security/stoken/Makefile
index 7b70a3cb0e14..c913a6573f6f 100644
--- a/security/stoken/Makefile
+++ b/security/stoken/Makefile
@@ -4,8 +4,7 @@
PORTNAME= stoken
PORTVERSION= 0.6
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=stoken
+MASTER_SITES= SF/stoken
MAINTAINER= samm@os2.kiev.ua
COMMENT= Software Token for UNIX compatible with RSA SecurID
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 4f7e471b9632..5d738ef844c2 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -4,7 +4,7 @@
PORTNAME= sudo
DISTVERSION= 1.8.13
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SUDO}
+MASTER_SITES= SUDO
MAINTAINER= garga@FreeBSD.org
COMMENT= Allow others to run commands as root
diff --git a/security/tripwire12/Makefile b/security/tripwire12/Makefile
index 797c06f88724..216f1f700595 100644
--- a/security/tripwire12/Makefile
+++ b/security/tripwire12/Makefile
@@ -5,7 +5,7 @@ PORTNAME= tripwire
PORTVERSION= 1.2
PORTREVISION= 1
CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_NETBSD}
+MASTER_SITES= NETBSD
PKGNAMESUFFIX= 12
MAINTAINER= cy@FreeBSD.org
diff --git a/security/webscarab/Makefile b/security/webscarab/Makefile
index ad4d325c8e70..9e730f19d244 100644
--- a/security/webscarab/Makefile
+++ b/security/webscarab/Makefile
@@ -4,9 +4,8 @@
PORTNAME= webscarab
PORTVERSION= 20090427
CATEGORIES= security www java
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
+MASTER_SITES= LOCAL/niels \
http://people.freebsd.org/~niels/distfiles/
-MASTER_SITE_SUBDIR= niels
MAINTAINER= ports@FreeBSD.org
COMMENT= Framework for analysing HTTP and HTTPS web application traffic
diff --git a/security/xinetd/Makefile b/security/xinetd/Makefile
index b1634bac8b07..3281cd5980be 100644
--- a/security/xinetd/Makefile
+++ b/security/xinetd/Makefile
@@ -5,7 +5,7 @@ PORTNAME= xinetd
PORTVERSION= 2.3.15
PORTREVISION= 1
CATEGORIES= security ipv6
-MASTER_SITES= GENTOO/distfiles
+MASTER_SITES= GENTOO
MAINTAINER= sem@FreeBSD.org
COMMENT= Replacement for inetd with better control and logging
diff --git a/security/xml-security/Makefile b/security/xml-security/Makefile
index ca24b8021e7c..6e9982db4994 100644
--- a/security/xml-security/Makefile
+++ b/security/xml-security/Makefile
@@ -2,11 +2,10 @@
# $FreeBSD$
PORTNAME= xml-security
-PORTVERSION= 1.5.5
+DISTVERSION= 1_5_5
CATEGORIES= security java
-MASTER_SITES= ${MASTER_SITE_APACHE}
-MASTER_SITE_SUBDIR= santuario/java-library/${PORTVERSION:S/./_/g}
-DISTNAME= ${PORTNAME}-src-${PORTVERSION:S/./_/g}
+MASTER_SITES= APACHE/santuario/java-library/${DISTVERSION}
+DISTNAME= ${PORTNAME}-src-${DISTVERSION}
MAINTAINER= ale@FreeBSD.org
COMMENT= Java library for XML Signature and Encryption
@@ -23,7 +22,7 @@ CPE_PRODUCT= xml_security_for_java
CPE_VENDOR= apache
USE_JAVA= yes
JAVA_VERSION= 1.6+
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/./_/g}
+WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
USE_ANT= yes
MAKE_ENV= ANT_INCLUDE_SHARED_JARS=YES
ALL_TARGET= jar