summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lang/scsh/Makefile4
-rw-r--r--security/bjorb/Makefile4
-rw-r--r--security/bro/Makefile6
-rw-r--r--security/bugs/Makefile4
-rw-r--r--security/cfs/Makefile6
-rw-r--r--security/checkpassword/Makefile4
-rw-r--r--security/chrootuid/Makefile4
-rw-r--r--security/cops/Makefile4
-rw-r--r--security/crack/Makefile6
-rw-r--r--security/cyrus-sasl/Makefile6
-rw-r--r--security/cyrus-sasl2/Makefile6
-rw-r--r--security/ddos_scan/Makefile6
-rw-r--r--security/donkey/Makefile4
-rw-r--r--security/dsniff/Makefile5
-rw-r--r--security/fakebo/Makefile4
-rw-r--r--security/find_ddos/Makefile6
-rw-r--r--security/firewalk/Makefile6
-rw-r--r--security/fragrouter/Makefile4
-rw-r--r--security/fwtk/Makefile6
-rw-r--r--security/gag/Makefile6
-rw-r--r--security/gnupg/Makefile4
-rw-r--r--security/gnupg1/Makefile4
-rw-r--r--security/gpasman/Makefile4
-rw-r--r--security/gtkportscan/Makefile4
-rw-r--r--security/heimdal/Makefile4
-rw-r--r--security/ident2/Makefile6
-rw-r--r--security/identify/Makefile4
-rw-r--r--security/its4/Makefile4
-rw-r--r--security/john/Makefile6
-rw-r--r--security/keynote/Makefile6
-rw-r--r--security/keyprint/Makefile4
-rw-r--r--security/kmap/Makefile4
-rw-r--r--security/krb5-16/Makefile4
-rw-r--r--security/krb5-17/Makefile4
-rw-r--r--security/krb5-appl/Makefile4
-rw-r--r--security/krb5/Makefile4
-rw-r--r--security/kssh/Makefile4
-rw-r--r--security/l0pht-watch/Makefile6
-rw-r--r--security/libident/Makefile4
-rw-r--r--security/libmcrypt/Makefile4
-rw-r--r--security/libparanoia/Makefile5
-rw-r--r--security/logcheck/Makefile4
-rw-r--r--security/lxnb/Makefile7
-rw-r--r--security/mhash/Makefile4
-rw-r--r--security/nbaudit/Makefile6
-rw-r--r--security/nessus-devel/Makefile6
-rw-r--r--security/nessus-libnasl-devel/Makefile6
-rw-r--r--security/nessus-libnasl/Makefile6
-rw-r--r--security/nessus-libraries-devel/Makefile4
-rw-r--r--security/nessus-libraries/Makefile4
-rw-r--r--security/nessus-plugins-devel/Makefile4
-rw-r--r--security/nessus-plugins/Makefile4
-rw-r--r--security/nessus/Makefile6
-rw-r--r--security/nmap/Makefile6
-rw-r--r--security/nmapfe/Makefile4
-rw-r--r--security/oidentd/Makefile4
-rw-r--r--security/openssh-askpass/Makefile6
-rw-r--r--security/openssh/Makefile6
-rw-r--r--security/openssl-beta/Makefile4
-rw-r--r--security/openssl/Makefile4
-rw-r--r--security/opieprint/Makefile4
-rw-r--r--security/p5-Authen-PAM/Makefile6
-rw-r--r--security/p5-Authen-Radius/Makefile6
-rw-r--r--security/p5-Crypt-CBC/Makefile6
-rw-r--r--security/p5-Crypt-DES/Makefile6
-rw-r--r--security/p5-Crypt-IDEA/Makefile6
-rw-r--r--security/p5-Digest-MD5/Makefile6
-rw-r--r--security/p5-MD5/Makefile6
-rw-r--r--security/p5-PGP-Sign/Makefile6
-rw-r--r--security/p5-PGP/Makefile6
-rw-r--r--security/pgp/Makefile15
-rw-r--r--security/pgp5/Makefile8
-rw-r--r--security/pgp6/Makefile8
-rw-r--r--security/pgpgpg/Makefile4
-rw-r--r--security/pidentd/Makefile4
-rw-r--r--security/pktsuckers/Makefile6
-rw-r--r--security/portscanner/Makefile6
-rw-r--r--security/portsentry/Makefile4
-rw-r--r--security/rid/Makefile6
-rw-r--r--security/rsaref/Makefile6
-rw-r--r--security/saint/Makefile6
-rw-r--r--security/seahorse/Makefile7
-rw-r--r--security/skip/Makefile7
-rw-r--r--security/slurpie/Makefile6
-rw-r--r--security/slush/Makefile4
-rw-r--r--security/smurflog/Makefile4
-rw-r--r--security/sniff/Makefile4
-rw-r--r--security/snort/Makefile4
-rw-r--r--security/ssh/Makefile4
-rw-r--r--security/ssh2/Makefile6
-rw-r--r--security/sslproxy/Makefile6
-rw-r--r--security/sslwrap/Makefile6
-rw-r--r--security/strobe/Makefile4
-rw-r--r--security/stunnel/Makefile4
-rw-r--r--security/sudo/Makefile4
-rw-r--r--security/super/Makefile4
-rw-r--r--security/swatch/Makefile6
-rw-r--r--security/tcp_wrapper/Makefile6
-rw-r--r--security/trinokiller/Makefile6
-rw-r--r--security/tripwire-131/Makefile4
-rw-r--r--security/tripwire/Makefile4
-rw-r--r--security/tripwire12/Makefile4
-rw-r--r--security/vscan/Makefile6
-rw-r--r--security/whisker/Makefile7
-rw-r--r--security/xinetd/Makefile4
-rw-r--r--security/zebedee/Makefile4
-rw-r--r--security/zenmap/Makefile4
-rw-r--r--security/zombiezapper/Makefile6
-rw-r--r--shells/bash/Makefile4
-rw-r--r--shells/bash1/Makefile4
-rw-r--r--shells/bash2/Makefile4
-rw-r--r--shells/bash3/Makefile4
-rw-r--r--shells/es/Makefile6
-rw-r--r--shells/esh/Makefile4
-rw-r--r--shells/flash/Makefile4
-rw-r--r--shells/ksh93/Makefile8
-rw-r--r--shells/pdksh/Makefile4
-rw-r--r--shells/perlsh/Makefile11
-rw-r--r--shells/psh/Makefile11
-rw-r--r--shells/rc/Makefile4
-rw-r--r--shells/sash/Makefile4
-rw-r--r--shells/scsh/Makefile4
-rw-r--r--shells/tcsh/Makefile5
-rw-r--r--shells/zsh-devel/Makefile4
-rw-r--r--shells/zsh/Makefile4
125 files changed, 323 insertions, 321 deletions
diff --git a/lang/scsh/Makefile b/lang/scsh/Makefile
index e5ded7965443..fb19aa000b6b 100644
--- a/lang/scsh/Makefile
+++ b/lang/scsh/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: scsh
-# Version required: 0.5.1
# Date created: Jul, 15, 1997
# Whom: cracauer@cons.org "Martin Cracauer"
#
# $FreeBSD$
#
-DISTNAME= scsh-0.5.1
+PORTNAME= scsh
+PORTVERSION= 0.5.1
CATEGORIES= shells lang
MASTER_SITES= ftp://ftp-swiss.ai.mit.edu/pub/su/scsh/ \
http://www2.cons.org:8000/freebsd-distfiles/ \
diff --git a/security/bjorb/Makefile b/security/bjorb/Makefile
index 3fe97b26dca2..34cd84056ce2 100644
--- a/security/bjorb/Makefile
+++ b/security/bjorb/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bjorb
-# Version required: 0.5.5p1
# Date created: May 16, 1998
# Whom: issei@jp.FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= bjorb-0.5.5p1
+PORTNAME= bjorb
+PORTVERSION= 0.5.5p1
CATEGORIES= net security
MASTER_SITES= ftp://ftp.hitachi-ms.co.jp/pub/bjorb/
diff --git a/security/bro/Makefile b/security/bro/Makefile
index 9c0804f03534..fb665be09952 100644
--- a/security/bro/Makefile
+++ b/security/bro/Makefile
@@ -1,17 +1,17 @@
# ex:ts=8
# Ports collection makefile for: bro
-# Version required: 0.0
# Date created: Sat Feb 28, 1998
# Whom: David O'Brien (obrien@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= vp-bro-0.5-alpha
-PKGNAME= bro-0.5a
+PORTNAME= bro
+PORTVERSION= 0.5a
CATEGORIES= security net
#MASTER_SITES= ftp://ee.lbl.gov/
#see http://www-nrg.ee.lbl.gov/bro-info.html
+DISTNAME= vp-bro-0.5-alpha
MAINTAINER= obrien@FreeBSD.org
diff --git a/security/bugs/Makefile b/security/bugs/Makefile
index 6f00b62a79cd..ed690e421137 100644
--- a/security/bugs/Makefile
+++ b/security/bugs/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bugs
-# Version required: 1.8.1
# Date created: 20 June 1998
# Whom: Stephane Legrand
#
# $FreeBSD$
#
-DISTNAME= bugs-1.8.1
+PORTNAME= bugs
+PORTVERSION= 1.8.1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://www.asi.fr/~martinez/crypto/
diff --git a/security/cfs/Makefile b/security/cfs/Makefile
index 6233eacb61f6..66cb309e711d 100644
--- a/security/cfs/Makefile
+++ b/security/cfs/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: cfs
-# Version required: 1.3.3
# Date created: 30 Jul 1997
# Whom: John Polstra <jdp@polstra.com>
#
# $FreeBSD$
#
-DISTNAME= cfs-1.3.3bf
-PKGNAME= cfs-1.3.3.1
+PORTNAME= cfs
+PORTVERSION= 1.3.3.1
CATEGORIES= security
MASTER_SITES= ftp://ftp.hacktic.nl/pub/crypto/disk/ \
ftp://ftp.uni-bielefeld.de/pub/crypto/replay/disk/
+DISTNAME= cfs-1.3.3bf
MAINTAINER= green@FreeBSD.org
diff --git a/security/checkpassword/Makefile b/security/checkpassword/Makefile
index 6bc11dff896c..6e66fbeef1e8 100644
--- a/security/checkpassword/Makefile
+++ b/security/checkpassword/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: checkpassword
-# Version required: 0.81
# Date created: 05 August 1998
# Whom: sada@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= checkpassword-0.81
+PORTNAME= checkpassword
+PORTVERSION= 0.81
CATEGORIES= security
MASTER_SITES= http://cr.yp.to/software/ \
http://people.FreeBSD.org/~sada/distfiles/ \
diff --git a/security/chrootuid/Makefile b/security/chrootuid/Makefile
index 7f2362a97f09..2205e7645fbb 100644
--- a/security/chrootuid/Makefile
+++ b/security/chrootuid/Makefile
@@ -1,16 +1,18 @@
# New ports collection makefile for: chrootuid
-# Version required: 1.2
# Date created: 12 Dec 1999
# Whom: truckman
#
# $FreeBSD$
#
+PORTNAME= chrootuid
+PORTVERSION= 1.2
DISTNAME= chrootuid1.2
PKGNAME= chrootuid-1.2
CATEGORIES= security
MASTER_SITES= ftp://ftp.porcupine.org/pub/security/ \
ftp://coast.cs.purdue.edu/pub/tools/unix/chrootuid/
+DISTNAME= ${PORTNAME}${PORTVERSION}
EXTRACT_SUFX= .shar.Z
MAINTAINER= truckman@FreeBSD.org
diff --git a/security/cops/Makefile b/security/cops/Makefile
index ed3677d58dfe..47145022a910 100644
--- a/security/cops/Makefile
+++ b/security/cops/Makefile
@@ -1,15 +1,17 @@
# New ports collection makefile for: cops
-# Version required: 1.04
# Date created: 29 August 1996
# Whom: oly
#
# $FreeBSD$
#
+PORTNAME= cops
+PORTVERSION= 1.04
DISTNAME= cops.1.04
PKGNAME= cops-1.04
CATEGORIES= security
MASTER_SITES= ftp://ftp.cert.org/pub/tools/cops/
+DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= oly@world.std.com
diff --git a/security/crack/Makefile b/security/crack/Makefile
index b91f8677b81d..f2d3d169fe54 100644
--- a/security/crack/Makefile
+++ b/security/crack/Makefile
@@ -1,6 +1,5 @@
# ex:ts=8
# Ports collection makefile for: Crack
-# Version required: 0.0
# Date created: 12 Jan 1997
# Whom: David O'Brien <obrien@FreeBSD.org>
# & Yukihiro Nakai <nakai@mlab.t.u-tokyo.ac.jp>
@@ -8,13 +7,14 @@
# $FreeBSD$
#
-DISTNAME= crack5.0
-PKGNAME= crack-5.0
+PORTNAME= crack
+PORTVERSION= 5.0
CATEGORIES= security
MASTER_SITES= ftp://ftp.win.tue.nl/pub/security/ \
ftp://ftp.ox.ac.uk/pub/comp/security/software/crackers/ \
ftp://ftp.auscert.org.au/pub/coast/mirrors/cert.org/tools/crack/ \
ftp://ftp.riken.go.jp/pub/net/cert_security_tools/crack/
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= obrien@FreeBSD.org
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index e4563b769a3a..d5717d38de36 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cyrus-sasl
-# Version required: 1.5.13
# Date created: Nov 1 1999
# Whom: hetzels@westbend.net
#
# $FreeBSD$
#
-DISTNAME= cyrus-sasl-${SASL_VER}
+PORTNAME= cyrus-sasl
+PORTVERSION= 1.5.15
CATEGORIES= security
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@@ -18,7 +18,7 @@ USE_OPENSSL= NORSA
.include <bsd.port.pre.mk>
-SASL_VER= 1.5.15
+SASL_VER= ${PORTVERSION} #note, may not be needed any more
Y2K= http://asg.web.cmu.edu/cyrus/imapd/y2k.html
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index e4563b769a3a..d5717d38de36 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cyrus-sasl
-# Version required: 1.5.13
# Date created: Nov 1 1999
# Whom: hetzels@westbend.net
#
# $FreeBSD$
#
-DISTNAME= cyrus-sasl-${SASL_VER}
+PORTNAME= cyrus-sasl
+PORTVERSION= 1.5.15
CATEGORIES= security
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@@ -18,7 +18,7 @@ USE_OPENSSL= NORSA
.include <bsd.port.pre.mk>
-SASL_VER= 1.5.15
+SASL_VER= ${PORTVERSION} #note, may not be needed any more
Y2K= http://asg.web.cmu.edu/cyrus/imapd/y2k.html
diff --git a/security/ddos_scan/Makefile b/security/ddos_scan/Makefile
index b1eb3ca2731e..dfa940fd9daf 100644
--- a/security/ddos_scan/Makefile
+++ b/security/ddos_scan/Makefile
@@ -1,16 +1,16 @@
# ex:ts=8
# Ports collection makefile for: ddos_scan
-# Version required: 0.0
# Date created: Sun Feb 12, 2000
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= ddos_scan
-PKGNAME= ddos_scan-1.6
+PORTNAME= ddos_scan
+PORTVERSION= 1.6
CATEGORIES= security
MASTER_SITES= http://staff.washington.edu/dittrich/misc/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar
MAINTAINER= obrien@FreeBSD.org
diff --git a/security/donkey/Makefile b/security/donkey/Makefile
index 5dc959007cb0..c5dfd9c662ec 100644
--- a/security/donkey/Makefile
+++ b/security/donkey/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: donkey
-# Version required: 0.5
# Date created: 17 Sep 1996
# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= donkey-0.5
+PORTNAME= donkey
+PORTVERSION= 0.5
CATEGORIES= security
MASTER_SITES= ftp://ftp.aist-nara.ac.jp/pub/Security/tool/donkey/
diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile
index eec3e767253a..1bacafe0bf89 100644
--- a/security/dsniff/Makefile
+++ b/security/dsniff/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: dsniff
-# Version required: 1.7
# Date created: 08 Jan 2000
# Whom: kris@FreeBSD.org
#
# $FreeBSD$
+#
-DISTNAME= dsniff-1.7
+PORTNAME= dsniff
+PORTVERSION= 1.7
CATEGORIES= security
MASTER_SITES= http://naughty.monkey.org/~dugsong/dsniff/
diff --git a/security/fakebo/Makefile b/security/fakebo/Makefile
index 8dde91377e6d..e56c82ba4b86 100644
--- a/security/fakebo/Makefile
+++ b/security/fakebo/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: fakebo
-# Version required: 0.4.1
# Date created: 16 March 1999
# Whom: Kris Kennaway <kris@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= fakebo-0.4.1
+PORTNAME= fakebo
+PORTVERSION= 0.4.1
CATEGORIES= security
MASTER_SITES= http://yi.com/home/KosturjakVlatko/ \
ftp://ftp.bitcon.no/.4/console/adm/ \
diff --git a/security/find_ddos/Makefile b/security/find_ddos/Makefile
index 2dbcab95a389..0263e0c213db 100644
--- a/security/find_ddos/Makefile
+++ b/security/find_ddos/Makefile
@@ -1,16 +1,16 @@
# ex:ts=8
# Ports collection makefile for: find_ddos
-# Version required: 0.0
# Date created: Sun Feb 12, 2000
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= find_ddos_v31_linux
-PKGNAME= find_ddos-3.1
+PORTNAME= find_ddos
+PORTVERSION= 3.1
CATEGORIES= security
MASTER_SITES= http://www.fbi.gov/nipc/
+DISTNAME= find_ddos_v31_linux
EXTRACT_SUFX= .tar.Z
MAINTAINER= obrien@FreeBSD.org
diff --git a/security/firewalk/Makefile b/security/firewalk/Makefile
index 034b37154ea5..2e829016fb4f 100644
--- a/security/firewalk/Makefile
+++ b/security/firewalk/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: slush
-# Version required: 0.1.0
# Date created: Sun May 3, 1999
# Whom: shipley@dis.org
#
# $FreeBSD$
#
-DISTNAME= firewalk-0.99beta
-PKGNAME= firewalk-0.9.9b
+PORTNAME= firewalk
+PORTVERSION= 0.9.9b
CATEGORIES= security net
MASTER_SITES= http://www.packetfactory.net/firewalk/
+DISTNAME= firewalk-0.99beta
MAINTAINER= shipley@dis.org
diff --git a/security/fragrouter/Makefile b/security/fragrouter/Makefile
index 6edf79f976bc..280421ba13f0 100644
--- a/security/fragrouter/Makefile
+++ b/security/fragrouter/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: fragrouter
-# Version required: 1.6
# Date created: 7 Jan 2000
# Whom: kris@FreeBSD.ORG
#
# $FreeBSD$
#
-DISTNAME= fragrouter-1.6
+PORTNAME= fragrouter
+PORTVERSION= 1.6
CATEGORIES= security
MASTER_SITES= http://www.anzen.com/research/nidsbench/
diff --git a/security/fwtk/Makefile b/security/fwtk/Makefile
index c1bfd831444c..d0384b21e89a 100644
--- a/security/fwtk/Makefile
+++ b/security/fwtk/Makefile
@@ -1,16 +1,16 @@
# ex:ts=8
# Ports collection makefile for: fwtk
-# Version required: 0.0
# Date created: 15th June 1996
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= fwtk2.1
-PKGNAME= fwtk-2.1
+PORTNAME= fwtk
+PORTVERSION= 2.1
CATEGORIES= security net
DISTFILES= fwtk2.1${EXTRACT_SUFX} fwtk-doc-only${EXTRACT_SUFX}
+DISTNAME= ${PORTNAME}${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= obrien@FreeBSD.org
diff --git a/security/gag/Makefile b/security/gag/Makefile
index 4d0df848a459..e187ae8fb04f 100644
--- a/security/gag/Makefile
+++ b/security/gag/Makefile
@@ -1,16 +1,16 @@
# ex:ts=8
# Ports collection makefile for: gag
-# Version required: 0.0
# Date created: Sun Feb 12, 2000
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= sickenscan
-PKGNAME= gag-2.9
+PORTNAME= gag
+PORTVERSION= 2.9
CATEGORIES= security
MASTER_SITES= http://staff.washington.edu/dittrich/misc/
+DISTNAME= sickenscan
EXTRACT_SUFX= .tar
MAINTAINER= obrien@FreeBSD.org
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index d4752d88bf4d..8812d1792d42 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gnupg
-# Version required: 1.0.1
# Date created: Sep 30, 1998
# Whom: kuriyama@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= gnupg-1.0.1
+PORTNAME= gnupg
+PORTVERSION= 1.0.1
CATEGORIES= security
MASTER_SITES= ftp://ftp.gnupg.org/pub/gcrypt/gnupg/ \
ftp://pgp.iijlab.net/pub/gnupg/ \
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index d4752d88bf4d..8812d1792d42 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gnupg
-# Version required: 1.0.1
# Date created: Sep 30, 1998
# Whom: kuriyama@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= gnupg-1.0.1
+PORTNAME= gnupg
+PORTVERSION= 1.0.1
CATEGORIES= security
MASTER_SITES= ftp://ftp.gnupg.org/pub/gcrypt/gnupg/ \
ftp://pgp.iijlab.net/pub/gnupg/ \
diff --git a/security/gpasman/Makefile b/security/gpasman/Makefile
index 7743461cc861..cda66d2fe764 100644
--- a/security/gpasman/Makefile
+++ b/security/gpasman/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gpasman
-# Version required: 1.3.0
# Date created: Mon Mai 10 1999
# Whom: domi@saargate.de
#
# $FreeBSD$
#
-DISTNAME= gpasman-1.3.0
+PORTNAME= gpasman
+PORTVERSION= 1.3.0
CATEGORIES= security
MASTER_SITES= http://gpasman.nl.linux.org/
diff --git a/security/gtkportscan/Makefile b/security/gtkportscan/Makefile
index afdd074a4661..4d56c0e71d6f 100644
--- a/security/gtkportscan/Makefile
+++ b/security/gtkportscan/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gtkportscan
-# Version required: 1.2
# Date created: 11 March 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gtkportscan-1.2
+PORTNAME= gtkportscan
+PORTVERSION= 1.2
CATEGORIES= security net
#MASTER_SITES= http://armageddon.splorg.org/gtkportscan/
MASTER_SITES= http://people.FreeBSD.org/~cpiazza/distfiles/
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index f98dec81dce1..9dc19c2b30f2 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,12 +1,12 @@
# Ports collection Makefile for: heimdal
-# Version required: 0.2l
# Date created: 10/23/1999
# Whom: nectar@FreeBSD.ORG
#
# $FreeBSD$
#
-DISTNAME= heimdal-0.2q
+PORTNAME= heimdal
+PORTVERSION= 0.2q
CATEGORIES= security ipv6
MASTER_SITES= ftp://ftp.pdc.kth.se/pub/heimdal/src/ \
ftp://ftp.replay.com/pub/replay/crypto/APPS/kerberos/heimdal/ \
diff --git a/security/ident2/Makefile b/security/ident2/Makefile
index 0cdb289f0b9a..c6d8e6c13ea9 100644
--- a/security/ident2/Makefile
+++ b/security/ident2/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: ident2
-# Version required: 1.0
# Date created: 30 Nov 1999
# Whom: rod@zort.on.ca
#
# $FreeBSD$
#
-DISTNAME= ident2-v1.0_FINAL
-PKGNAME= ident2-1.0
+PORTNAME= ident2
+PORTVERSION= 1.0
CATEGORIES= security net
MASTER_SITES= http://www.nyct.net/~defile/programs/ident2/ \
http://www.oscentral.org/files/software/
+DISTNAME= ident2-v1.0_FINAL
MAINTAINER= rod@zort.on.ca
diff --git a/security/identify/Makefile b/security/identify/Makefile
index 70adb42709ff..18acb7594ce2 100644
--- a/security/identify/Makefile
+++ b/security/identify/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: identify
-# Version required: 0.7
# Date created: 13 March 1999
# Whom: nsayer@quack.kfu.com
#
# $FreeBSD$
#
-DISTNAME= identify-0.7
+PORTNAME= identify
+PORTVERSION= 0.7
CATEGORIES= security net
MASTER_SITES= ftp://ftp.lysator.liu.se/pub/ident/tools/
diff --git a/security/its4/Makefile b/security/its4/Makefile
index 975db4048055..997490b8b340 100644
--- a/security/its4/Makefile
+++ b/security/its4/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: its4
-# Version required: 1.0.1
# Date created: 21 February 2000
# Whom: Chris D. Faulhaber <jedgar@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= its4-1.0.1
+PORTNAME= its4
+PORTVERSION= 1.0.1
CATEGORIES= security
MASTER_SITES= ""
EXTRACT_SUFX= .tgz
diff --git a/security/john/Makefile b/security/john/Makefile
index 314ba1dd9701..2f1e223563d0 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
-# Ports collection makefile for: ufcjohn
-# Version required: 0.0
+# Ports collection makefile for: john
# Date created: Sun Mar 09, 1997
# Whom: David O'Brien (obrien@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= john-1.6
+PORTNAME= john
+PORTVERSION= 1.6
CATEGORIES= security
MASTER_SITES= http://www.false.com/security/john/ \
ftp://ftp.false.com/pub/security/john/
diff --git a/security/keynote/Makefile b/security/keynote/Makefile
index e8f3d6b18e72..177472316435 100644
--- a/security/keynote/Makefile
+++ b/security/keynote/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: keynote
-# Version required: 2-beta4
# Date created: 02 September 1999
# Whom: se
#
# $FreeBSD$
#
-DISTNAME= keynote-2-beta4
-PKGNAME= keynote-2b4
+PORTNAME= keynote
+PORTVERSION= 2.b4
CATEGORIES= security
MASTER_SITES= http://www.cis.upenn.edu/~angelos/Code/
+DISTNAME= keynote-2-beta4
MAINTAINER= se@FreeBSD.org
diff --git a/security/keyprint/Makefile b/security/keyprint/Makefile
index 5b9e7b33a1d4..c3c2fe19baf2 100644
--- a/security/keyprint/Makefile
+++ b/security/keyprint/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: keyprint
-# Version required: 1.0
# Date created: Sat May 29 02:05:00 PDT 1999
# Whom: mharo@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= keyprint-1.0
+PORTNAME=u keyprint
+PORTVERSION= 1.0
CATEGORIES= security
MASTER_SITES= http://people.FreeBSD.org/~mharo/distfiles/
diff --git a/security/kmap/Makefile b/security/kmap/Makefile
index a3d6e94d1bb0..d191dfa608c1 100644
--- a/security/kmap/Makefile
+++ b/security/kmap/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: kmap
-# Version required: 0.0
# Date created: Fri Sep 10, 1999
# Whom: David O'Brien (obrien@cs.ucdavis.edu)
#
# $FreeBSD$
#
-DISTNAME= kmap-0.7.1
+PORTNAME= kmap
+PORTVERSION= 0.7.1
CATEGORIES= security net
MASTER_SITES= http://www.islc.net/~icszepp/downloads/
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
index ddbae5cc5440..9dc828875f97 100644
--- a/security/krb5-16/Makefile
+++ b/security/krb5-16/Makefile
@@ -1,12 +1,12 @@
# Ports collection Makefile for: MIT Kerberos V
-# Version required: 1.0.5
# Date created: 6/5/1998
# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= krb5-1.1.1
+PORTNAME= krb5
+PORTVERSION= 1.1.1
CATEGORIES= security
MASTER_SITES= # manual download
EXTRACT_SUFX= .tar
diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
index ddbae5cc5440..9dc828875f97 100644
--- a/security/krb5-17/Makefile
+++ b/security/krb5-17/Makefile
@@ -1,12 +1,12 @@
# Ports collection Makefile for: MIT Kerberos V
-# Version required: 1.0.5
# Date created: 6/5/1998
# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= krb5-1.1.1
+PORTNAME= krb5
+PORTVERSION= 1.1.1
CATEGORIES= security
MASTER_SITES= # manual download
EXTRACT_SUFX= .tar
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index ddbae5cc5440..9dc828875f97 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -1,12 +1,12 @@
# Ports collection Makefile for: MIT Kerberos V
-# Version required: 1.0.5
# Date created: 6/5/1998
# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= krb5-1.1.1
+PORTNAME= krb5
+PORTVERSION= 1.1.1
CATEGORIES= security
MASTER_SITES= # manual download
EXTRACT_SUFX= .tar
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index ddbae5cc5440..9dc828875f97 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -1,12 +1,12 @@
# Ports collection Makefile for: MIT Kerberos V
-# Version required: 1.0.5
# Date created: 6/5/1998
# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= krb5-1.1.1
+PORTNAME= krb5
+PORTVERSION= 1.1.1
CATEGORIES= security
MASTER_SITES= # manual download
EXTRACT_SUFX= .tar
diff --git a/security/kssh/Makefile b/security/kssh/Makefile
index 5aa65440feac..ef6eae60c1ec 100644
--- a/security/kssh/Makefile
+++ b/security/kssh/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kssh
-# Version required: 0.2
# Date created: 19 Nov 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= kssh-0.2
+PORTNAME= kssh
+PORTVERSION= 0.2
CATEGORIES= security
MASTER_SITES= http://people.FreeBSD.org/~will/distfiles/
diff --git a/security/l0pht-watch/Makefile b/security/l0pht-watch/Makefile
index 3b514b806212..9f2420c20bd5 100644
--- a/security/l0pht-watch/Makefile
+++ b/security/l0pht-watch/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: l0pht-query
-# Version required: 1.1
# Date created: 11 Jan 1999
# Whom: Dom Mitchell <dom@myrddin.demon.co.uk>
#
# $FreeBSD$
#
-DISTNAME= l0pht-watch
-PKGNAME= l0pht-watch-1.1
+PORTNAME= l0pht-watch
+PORTVERSION= 1.1
CATEGORIES= security
MASTER_SITES= http://www.l0pht.com/advisories/
+DISTNAME= ${PORTNAME}
MAINTAINER= dom@myrddin.demon.co.uk
diff --git a/security/libident/Makefile b/security/libident/Makefile
index fbf6522e5e0b..11931571ab6b 100644
--- a/security/libident/Makefile
+++ b/security/libident/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: libident
-# Version required: 0.21
# Date created: 9 October 1995
# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= libident-0.22
+PORTNAME= libident
+PORTVERSION= 0.22
CATEGORIES= devel net security
MASTER_SITES= ftp://ftp.lysator.liu.se/pub/ident/libs/
diff --git a/security/libmcrypt/Makefile b/security/libmcrypt/Makefile
index a976e5453cf3..8e866c9b5788 100644
--- a/security/libmcrypt/Makefile
+++ b/security/libmcrypt/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mcrypt
-# Version required: 2.2.4
# Date created: Mon Jun 28 18:02:04 PDT 1999
# Whom: nsayer@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= libmcrypt-2.2.4
+PORTNAME= libmcrypt
+PORTVERSION= 2.2.4
CATEGORIES= security
MASTER_SITES= ftp://argeas.cs-net.gr/pub/unix/mcrypt/ \
ftp://ftp.internat.freebsd.org/pub/FreeBSD/distfiles/
diff --git a/security/libparanoia/Makefile b/security/libparanoia/Makefile
index b4c13fb0b5f5..ce5c1710dfa2 100644
--- a/security/libparanoia/Makefile
+++ b/security/libparanoia/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: libparanoia
-# Version required: 1.3
# Date created: 1 Jan 1999
# Whom: Alexandre Snarskii <snar@paranoia.ru>
#
# $FreeBSD$
+#
-DISTNAME= libparanoia-1.3
+PORTNAME= libparanoia
+PORTVERSION= 1.3
CATEGORIES= security
MASTER_SITES= ftp://ftp.lexa.ru/pub/domestic/snar/
diff --git a/security/logcheck/Makefile b/security/logcheck/Makefile
index edd5a243c147..d012523bc3d6 100644
--- a/security/logcheck/Makefile
+++ b/security/logcheck/Makefile
@@ -1,12 +1,12 @@
# Ports collection makefile for: logcheck
-# Version required: 1.1.1
# Date created: 9 December 1999
# Whom: Dan Langille <dan@freebsddiary.org>
#
# $FreeBSD$
#
-DISTNAME= logcheck-1.1.1
+PORTNAME= logcheck
+PORTVERSION= 1.1.1
CATEGORIES= security
MASTER_SITES= http://www.psionic.com/tools/
diff --git a/security/lxnb/Makefile b/security/lxnb/Makefile
index c447fccb8c91..8bdaa6ac139f 100644
--- a/security/lxnb/Makefile
+++ b/security/lxnb/Makefile
@@ -1,14 +1,15 @@
# New ports collection makefile for: lxnb
-# Version required: 0.4
# Date created: 04 March 2000
# Whom: Kris Kennaway <kris@FreeBSD.org>
#
# $FreeBSD$
+#
-DISTNAME= linux-netbus-client-v0.4
-PKGNAME= lxnb-0.4
+PORTNAME= lxnb
+PORTVERSION= 0.4
CATEGORIES= security
MASTER_SITES= http://ns2.crw.se/~tm/projects/lxnb/
+DISTNAME= linux-netbus-client-v0.4
EXTRACT_SUFX= .tgz
MAINTAINER= kris@FreeBSD.org
diff --git a/security/mhash/Makefile b/security/mhash/Makefile
index c0f2f2012a49..d32141f63790 100644
--- a/security/mhash/Makefile
+++ b/security/mhash/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mhash
-# Version required: 0.6.1
# Date created: Mon Jun 28 17:59:13 PDT 1999
# Whom: nsayer@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= mhash-0.6.1
+PORTNAME= mhash
+PORTVERSION= 0.6.1
CATEGORIES= security
MASTER_SITES= http://schumann.cx/mhash/dl/
diff --git a/security/nbaudit/Makefile b/security/nbaudit/Makefile
index 0b63a3094d86..b8ea5e2abfca 100644
--- a/security/nbaudit/Makefile
+++ b/security/nbaudit/Makefile
@@ -1,17 +1,17 @@
# ex:ts=8
# Ports collection makefile for: nat/nbaudit
-# Version required: 0.0
# Date created: Mon Feb 03, 1997
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= nat10
-PKGNAME= nbaudit-1.0
+PORTNAME= nbaudit
+PORTVERSION= 1.0
CATEGORIES= security net
MASTER_SITES= ftp://ftp.secnet.com/pub/tools/nat10/ \
ftp://ftp.auscert.org.au/pub/coast/mirrors/ftp.secnet.com/tools/nat10/
+DISTNAME= nat10
MAINTAINER= obrien@FreeBSD.org
diff --git a/security/nessus-devel/Makefile b/security/nessus-devel/Makefile
index e414b478fdf5..4ef22edcd3e1 100644
--- a/security/nessus-devel/Makefile
+++ b/security/nessus-devel/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: nessus
-# Version required: 0.99.4
# Date created: 1 May 1999
# Whom: Anders Nordby <anders@fix.no>
#
# $FreeBSD$
#
-DISTNAME= nessus-core-0.99.7
-PKGNAME= nessus-0.99.7
+PORTNAME= nessus
+PORTVERSION= 0.99.7
CATEGORIES= security
MASTER_SITES= ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/ \
ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
@@ -18,6 +17,7 @@ MASTER_SITES= ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/ \
ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/ \
ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/ \
ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/
+DISTNAME= nessus-core-0.99.7
MAINTAINER= anders@fix.no
diff --git a/security/nessus-libnasl-devel/Makefile b/security/nessus-libnasl-devel/Makefile
index 58cd9466cd19..ec2d5ada1827 100644
--- a/security/nessus-libnasl-devel/Makefile
+++ b/security/nessus-libnasl-devel/Makefile
@@ -1,13 +1,12 @@
# Ports collection makefile for: nessus-libnasl
-# Version required: 0.99.4
# Date created: 07 November 1999
# Whom: Anders Nordby <anders@fix.no>
#
# $FreeBSD$
#
-DISTNAME= libnasl-0.99.7
-PKGNAME= nessus-libnasl-0.99.7
+PORTNAME= nessus-libnasl
+PORTVERSION= 0.99.7
CATEGORIES= security
MASTER_SITES= ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/ \
ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
@@ -18,6 +17,7 @@ MASTER_SITES= ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/ \
ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/ \
ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/ \
ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/
+DISTNAME= libnasl-0.99.7
MAINTAINER= anders@fix.no
diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile
index 58cd9466cd19..ec2d5ada1827 100644
--- a/security/nessus-libnasl/Makefile
+++ b/security/nessus-libnasl/Makefile
@@ -1,13 +1,12 @@
# Ports collection makefile for: nessus-libnasl
-# Version required: 0.99.4
# Date created: 07 November 1999
# Whom: Anders Nordby <anders@fix.no>
#
# $FreeBSD$
#
-DISTNAME= libnasl-0.99.7
-PKGNAME= nessus-libnasl-0.99.7
+PORTNAME= nessus-libnasl
+PORTVERSION= 0.99.7
CATEGORIES= security
MASTER_SITES= ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/ \
ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
@@ -18,6 +17,7 @@ MASTER_SITES= ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/ \
ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/ \
ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/ \
ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/
+DISTNAME= libnasl-0.99.7
MAINTAINER= anders@fix.no
diff --git a/security/nessus-libraries-devel/Makefile b/security/nessus-libraries-devel/Makefile
index 0077a37b93dc..57baccb9e582 100644
--- a/security/nessus-libraries-devel/Makefile
+++ b/security/nessus-libraries-devel/Makefile
@@ -1,12 +1,12 @@
# Ports collection makefile for: nessus-libraries
-# Version required: 0.99.4
# Date created: 07 Noevmber 1999
# Whom: Anders Nordby <anders@fix.no>
#
# $FreeBSD$
#
-DISTNAME= nessus-libraries-0.99.7
+PORTNAME= nessus-libraries
+PORTVERSION= 0.99.7
CATEGORIES= security
MASTER_SITES= ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/ \
ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index 0077a37b93dc..57baccb9e582 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -1,12 +1,12 @@
# Ports collection makefile for: nessus-libraries
-# Version required: 0.99.4
# Date created: 07 Noevmber 1999
# Whom: Anders Nordby <anders@fix.no>
#
# $FreeBSD$
#
-DISTNAME= nessus-libraries-0.99.7
+PORTNAME= nessus-libraries
+PORTVERSION= 0.99.7
CATEGORIES= security
MASTER_SITES= ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/ \
ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
diff --git a/security/nessus-plugins-devel/Makefile b/security/nessus-plugins-devel/Makefile
index 163630371607..6a21960c622b 100644
--- a/security/nessus-plugins-devel/Makefile
+++ b/security/nessus-plugins-devel/Makefile
@@ -1,12 +1,12 @@
# Ports collection makefile for: nessus-plugins
-# Version required: 0.99.4
# Date created: 16 October 1999
# Whom: Anders Nordby <anders@fix.no>
#
# $FreeBSD$
#
-DISTNAME= nessus-plugins-0.99.7
+PORTNAME= nessus-plugins
+PORTVERSION= 0.99.7
CATEGORIES= security
MASTER_SITES= ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/ \
ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile
index 163630371607..6a21960c622b 100644
--- a/security/nessus-plugins/Makefile
+++ b/security/nessus-plugins/Makefile
@@ -1,12 +1,12 @@
# Ports collection makefile for: nessus-plugins
-# Version required: 0.99.4
# Date created: 16 October 1999
# Whom: Anders Nordby <anders@fix.no>
#
# $FreeBSD$
#
-DISTNAME= nessus-plugins-0.99.7
+PORTNAME= nessus-plugins
+PORTVERSION= 0.99.7
CATEGORIES= security
MASTER_SITES= ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/ \
ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
diff --git a/security/nessus/Makefile b/security/nessus/Makefile
index e414b478fdf5..4ef22edcd3e1 100644
--- a/security/nessus/Makefile
+++ b/security/nessus/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: nessus
-# Version required: 0.99.4
# Date created: 1 May 1999
# Whom: Anders Nordby <anders@fix.no>
#
# $FreeBSD$
#
-DISTNAME= nessus-core-0.99.7
-PKGNAME= nessus-0.99.7
+PORTNAME= nessus
+PORTVERSION= 0.99.7
CATEGORIES= security
MASTER_SITES= ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/ \
ftp://ftp.nessus.org/pub/nessus/nessus-${NESSUS_REV}/ \
@@ -18,6 +17,7 @@ MASTER_SITES= ftp://ftp.cis.fed.gov/pub/nessus/nessus-${NESSUS_REV}/ \
ftp://sunsite.cnlab-switch.ch/mirror/nessus/nessus-${NESSUS_REV}/ \
ftp://ftp.chg.ru/pub/security/nessus/nessus-${NESSUS_REV}/ \
ftp://ftp.sekure.net/pub/nessus/nessus-${NESSUS_REV}/
+DISTNAME= nessus-core-0.99.7
MAINTAINER= anders@fix.no
diff --git a/security/nmap/Makefile b/security/nmap/Makefile
index 41ed45529ffa..e842aa4d1093 100644
--- a/security/nmap/Makefile
+++ b/security/nmap/Makefile
@@ -1,18 +1,18 @@
# ex:ts=8
# Ports collection makefile for: nmap
-# Version required: 0.0
# Date created: Tue Aug 04, 1998
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= nmap-2.30BETA18
-PKGNAME= nmap-2.3b18
+PORTNAME= nmap
+PORTVERSION= 2.3.b18
CATEGORIES= security net
MASTER_SITES= http://www.insecure.org/nmap/dist/ \
ftp://nuxi.ucdavis.edu/pub/misc/ \
http://www.mobis.com/ajax/projects/
+DISTNAME= nmap-2.30BETA18
EXTRACT_SUFX= .tgz
#PATCH_SITES= http://www.mobis.com/ajax/projects/
diff --git a/security/nmapfe/Makefile b/security/nmapfe/Makefile
index 2ba6be21e2a1..b1884c22e980 100644
--- a/security/nmapfe/Makefile
+++ b/security/nmapfe/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: nmap
-# Version required: 0.0
# Date created: Tue Aug 04, 1998
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= nmapfe-0.9.5
+PORTNAME= nmapfe
+PORTVERSION= 0.9.5
CATEGORIES= security net
MASTER_SITES= http://codebox.net/download/ \
http://www.insecure.org/nmap/dist/
diff --git a/security/oidentd/Makefile b/security/oidentd/Makefile
index cb5dfcfe5704..76d1031539c7 100644
--- a/security/oidentd/Makefile
+++ b/security/oidentd/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: oidentd
-# Version required: 1.6.4
# Date created: 29 Mar 2000
# Whom: trevor@jpj.net
#
# $FreeBSD$
#
-DISTNAME= oidentd-1.6.4
+PORTNAME= oidentd
+PORTVERSION= 1.6.4
CATEGORIES= security net
MASTER_SITES= ftp://ftp.sourceforge.net/pub/sourceforge/ojnk/ \
http://www.numb.org/~odin/stuff/
diff --git a/security/openssh-askpass/Makefile b/security/openssh-askpass/Makefile
index 6b43c7439d69..e21755defa3e 100644
--- a/security/openssh-askpass/Makefile
+++ b/security/openssh-askpass/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: OpenSSH-askpass
-# Version required: 1.2.2
# Date created: 27 February 2000
# Whom: Kris Kennaway <kris@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= X11/xc/programs/ssh-askpass
-PKGNAME= OpenSSH-askpass-1.2.2
+PORTNAME= OpenSSH-askpass
+PORTVERSION= 1.2.2
CATEGORIES= security
# ${MASTER_SITES} is only for if CVS won't work, period.
MASTER_SITES= http://people.FreeBSD.org/~kris/distfiles/
+DISTNAME= X11/xc/programs/ssh-askpass
MAINTAINER= kris@FreeBSD.org
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 0bd76f07c338..8dd5f67e466e 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: OpenSSH
-# Version required: 1.2
# Date created: 7 October 1999
# Whom: green
#
# $FreeBSD$
#
-DISTNAME= src/usr.bin/ssh
-PKGNAME= OpenSSH-1.2.2
+PORTNAME= OpenSSH
+PORTVERSION= 1.2.2
CATEGORIES= security net ipv6
# ${MASTER_SITES} is only for if CVS won't work, period.
MASTER_SITES= ftp://internat.FreeBSD.org/pub/Crypto/OpenSSH/
+DISTNAME= src/usr.bin/ssh
MAINTAINER= green@FreeBSD.org
diff --git a/security/openssl-beta/Makefile b/security/openssl-beta/Makefile
index f3e9c7371517..962098f9c621 100644
--- a/security/openssl-beta/Makefile
+++ b/security/openssl-beta/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: OpenSSL
-# Version required: 0.9.4
# Date created: Sun Jan 3 19:36:27 CET 1999
# Whom: Dirk Froemberg <dirk@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= openssl-0.9.4
+PORTNAME= openssl
+PORTVERSION= 0.9.4
CATEGORIES= security devel
MASTER_SITES= http://www.openssl.org/source/ \
ftp://ftp.openssl.org/source/ \
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index f3e9c7371517..962098f9c621 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: OpenSSL
-# Version required: 0.9.4
# Date created: Sun Jan 3 19:36:27 CET 1999
# Whom: Dirk Froemberg <dirk@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= openssl-0.9.4
+PORTNAME= openssl
+PORTVERSION= 0.9.4
CATEGORIES= security devel
MASTER_SITES= http://www.openssl.org/source/ \
ftp://ftp.openssl.org/source/ \
diff --git a/security/opieprint/Makefile b/security/opieprint/Makefile
index 5b9e7b33a1d4..c3c2fe19baf2 100644
--- a/security/opieprint/Makefile
+++ b/security/opieprint/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: keyprint
-# Version required: 1.0
# Date created: Sat May 29 02:05:00 PDT 1999
# Whom: mharo@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= keyprint-1.0
+PORTNAME=u keyprint
+PORTVERSION= 1.0
CATEGORIES= security
MASTER_SITES= http://people.FreeBSD.org/~mharo/distfiles/
diff --git a/security/p5-Authen-PAM/Makefile b/security/p5-Authen-PAM/Makefile
index 4e2730ab82e0..956d00236d5f 100644
--- a/security/p5-Authen-PAM/Makefile
+++ b/security/p5-Authen-PAM/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Authen-PAM
-# Version required: 0.08
# Date created: Mon Oct 4 1999
# Whom: Matt Behrens <matt@zigg.com>
#
# $FreeBSD$
#
-DISTNAME= Authen-PAM-0.08
-PKGNAME= p5-Authen-PAM-0.08
+PORTNAME= p5-Authen-PAM
+PORTVERSION= 0.08
CATEGORIES= security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Authen
+DISTNAME= Authen-PAM-0.08
MAINTAINER= matt@zigg.com
diff --git a/security/p5-Authen-Radius/Makefile b/security/p5-Authen-Radius/Makefile
index e2e9f2ce9e4c..1108c5321831 100644
--- a/security/p5-Authen-Radius/Makefile
+++ b/security/p5-Authen-Radius/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Authen-Radius
-# Version required: 0.05
# Date created: September 11th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= RadiusPerl-0.05
-PKGNAME= p5-Authen-Radius-0.05
+PORTNAME= p5-Authen-Radius
+PORTVERSION= 0.05
CATEGORIES= security net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Authen
+DISTNAME= RadiusPerl-0.05
MAINTAINER= jfitz@FreeBSD.org
diff --git a/security/p5-Crypt-CBC/Makefile b/security/p5-Crypt-CBC/Makefile
index 4f458097319a..6be11a09dd62 100644
--- a/security/p5-Crypt-CBC/Makefile
+++ b/security/p5-Crypt-CBC/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Crypt-DES
-# Version required: 1.20
# Date created: October 20th 1996
# Whom: Mark Murray <markm@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Crypt-CBC-1.20
-PKGNAME= p5-Crypt-CBC-1.20
+PORTNAME= p5-Crypt-CBC
+PORTVERSION= 1.20
CATEGORIES= security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Crypt
+DISTNAME= Crypt-CBC-1.20
MAINTAINER= markm@FreeBSD.org
diff --git a/security/p5-Crypt-DES/Makefile b/security/p5-Crypt-DES/Makefile
index b51cab190328..efbcc703da15 100644
--- a/security/p5-Crypt-DES/Makefile
+++ b/security/p5-Crypt-DES/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Crypt-DES
-# Version required: 1.0
# Date created: October 20th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Crypt-DES-1.0
-PKGNAME= p5-Crypt-DES-1.0
+PORTNAME= p5-Crypt-DES
+PORTVERSION= 1.0
CATEGORIES= security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Crypt
+DISTNAME= Crypt-DES-1.0
MAINTAINER= jfitz@FreeBSD.org
diff --git a/security/p5-Crypt-IDEA/Makefile b/security/p5-Crypt-IDEA/Makefile
index b208a700c51e..95e631d4942f 100644
--- a/security/p5-Crypt-IDEA/Makefile
+++ b/security/p5-Crypt-IDEA/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Crypt-IDEA
-# Version required: 1.0
# Date created: October 20th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Crypt-IDEA-1.0
-PKGNAME= p5-Crypt-IDEA-1.0
+PORTNAME= p5-Crypt-IDEA
+PORTVERSION= 1.0
CATEGORIES= security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Crypt
+DISTNAME= Crypt-IDEA-1.0
MAINTAINER= jfitz@FreeBSD.org
diff --git a/security/p5-Digest-MD5/Makefile b/security/p5-Digest-MD5/Makefile
index ef0ee5221f0b..a575a33bb3a1 100644
--- a/security/p5-Digest-MD5/Makefile
+++ b/security/p5-Digest-MD5/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Digest-MD5
-# Version required: 2.*
# Date created: 1999/04/07
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= Digest-MD5-2.09
-PKGNAME= p5-Digest-MD5-2.09
+PORTNAME= p5-Digest-MD5
+PORTVERSION= 2.09
CATEGORIES= security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= MD5
+DISTNAME= Digest-MD5-2.09
MAINTAINER= ache@FreeBSD.org
diff --git a/security/p5-MD5/Makefile b/security/p5-MD5/Makefile
index 70637989efce..2ab0495370fb 100644
--- a/security/p5-MD5/Makefile
+++ b/security/p5-MD5/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-MD5
-# Version required: 1.7
# Date created: September 30th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= MD5-1.7
-PKGNAME= p5-MD5-1.7
+PORTNAME= p5-MD5
+PORTVERSION= 1.7
CATEGORIES= security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= MD5
+DISTNAME= MD5-1.7
MAINTAINER= jfitz@FreeBSD.org
diff --git a/security/p5-PGP-Sign/Makefile b/security/p5-PGP-Sign/Makefile
index b679ca1d0965..a633181f45f0 100644
--- a/security/p5-PGP-Sign/Makefile
+++ b/security/p5-PGP-Sign/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-PGP-Sign
-# Version required: 0.16
# Date created: January 2, 1998
# Whom: Don Croyle <croyle@gelemna.ft-wayne.in.us>
#
# $FreeBSD$
#
-DISTNAME= PGP-Sign-0.16
-PKGNAME= p5-PGP-Sign-0.16
+PORTNAME= p5-PGP-Sign
+PORTVERSION= 0.16
CATEGORIES= security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= PGP
+DISTNAME= PGP-Sign-0.16
MAINTAINER= croyle@gelemna.ft-wayne.in.us
diff --git a/security/p5-PGP/Makefile b/security/p5-PGP/Makefile
index 35644e1d211d..5202b06a4069 100644
--- a/security/p5-PGP/Makefile
+++ b/security/p5-PGP/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-PGP
-# Version required: 0.3a
# Date created: October 21st 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= PGP-0.3a
-PKGNAME= p5-PGP-0.3a
+PORTNAME= p5-PGP
+PORTVERSION= 0.3a
CATEGORIES= security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= PGP
+DISTNAME= PGP-0.3a
MAINTAINER= jfitz@FreeBSD.org
diff --git a/security/pgp/Makefile b/security/pgp/Makefile
index 163431b2719d..9dc84e4e95ca 100644
--- a/security/pgp/Makefile
+++ b/security/pgp/Makefile
@@ -1,7 +1,4 @@
# New ports collection makefile for: pgp
-# Version required: MIT 2.6.2 / International 2.6.3ia
-# International PGP homepage is http://www.ifi.uio.no/pgp/
-#
# Date created: 8 Jul 1995
# Whom: ache
#
@@ -45,10 +42,12 @@ pre-fetch:
@${FALSE}
.elif defined(USA_RESIDENT)
.if ${USA_RESIDENT} == YES
-DISTNAME= pgp262s
-PKGNAME= pgp-2.6.2
+PORTNAME= pgp
+PORTVERSION= 2.6.2
MASTER_SITES= ftp://utopia.hacktic.nl/pub/replay/pub/pgp/unix/ \
ftp://sable.ox.ac.uk/pub/crypto/pgp/unix/
+DISTNAME= pgp262s
+
WRKSRC= ${WRKDIR}/src
BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake
LIB_DEPENDS+= rsaref.2:${PORTSDIR}/security/rsaref
@@ -62,10 +61,12 @@ post-extract:
cd ${WRKDIR}; ${RM} -f *.zip
.else
-DISTNAME= pgp263is
-PKGNAME= pgp-2.6.3ia
+PORTNAME= pgp
+PORTVERSION= 2.6.3ia
MASTER_SITES= ftp://ftp.ifi.uio.no/pub/pgp/2.x/src/ \
ftp://ftp.kiarchive.ru/pub/unix/crypto/pgp/
+DISTNAME= pgp263is
+
WRKSRC= ${WRKDIR}/src
FILESDIR= ${.CURDIR}/files.non_usa
PATCHDIR= ${.CURDIR}/patches.non_usa
diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile
index 357d6147c861..90171995c62e 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -1,18 +1,16 @@
# New ports collection makefile for: pgp5
-# Version required: International PGP 5.0
-# International PGP homepage is http://www.ifi.uio.no/pgp/
-#
# Date created: 10 Feb 1998
# Whom: markm
#
# $FreeBSD$
#
-DISTNAME= pgp50i
-PKGNAME= pgp-5.0i
+PORTNAME= pgp
+PORTVERSION= 5.0i
CATEGORIES= security
MASTER_SITES= ftp://ftp.ifi.uio.no/pub/pgp/5.0/unix/ \
ftp://ftp.doc.ic.ac.uk/pub/Mirrors/ftp.ifi.uio.no/pub/pgp/5.0/unix/
+DISTNAME= pgp50i
EXTRACT_SUFX= -unix-src.tar.gz
MAINTAINER= markm@FreeBSD.org
diff --git a/security/pgp6/Makefile b/security/pgp6/Makefile
index 357d6147c861..90171995c62e 100644
--- a/security/pgp6/Makefile
+++ b/security/pgp6/Makefile
@@ -1,18 +1,16 @@
# New ports collection makefile for: pgp5
-# Version required: International PGP 5.0
-# International PGP homepage is http://www.ifi.uio.no/pgp/
-#
# Date created: 10 Feb 1998
# Whom: markm
#
# $FreeBSD$
#
-DISTNAME= pgp50i
-PKGNAME= pgp-5.0i
+PORTNAME= pgp
+PORTVERSION= 5.0i
CATEGORIES= security
MASTER_SITES= ftp://ftp.ifi.uio.no/pub/pgp/5.0/unix/ \
ftp://ftp.doc.ic.ac.uk/pub/Mirrors/ftp.ifi.uio.no/pub/pgp/5.0/unix/
+DISTNAME= pgp50i
EXTRACT_SUFX= -unix-src.tar.gz
MAINTAINER= markm@FreeBSD.org
diff --git a/security/pgpgpg/Makefile b/security/pgpgpg/Makefile
index e4f2a5d520d4..974f8b3c8b7b 100644
--- a/security/pgpgpg/Makefile
+++ b/security/pgpgpg/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: pgpgpg
-# Version required: 0.13
# Date created: 16 December 1999
# Whom: Matt Behrens <matt@zigg.com>
#
# $FreeBSD$
#
-DISTNAME= pgpgpg-0.13
+PORTNAME= pgpgpg
+PORTVERSION= 0.13
CATEGORIES= security
MASTER_SITES= http://www.nessie.de/mroth/pgpgpg/ \
ftp://ftp.gnupg.org/pub/gcrypt/pgpgpg/
diff --git a/security/pidentd/Makefile b/security/pidentd/Makefile
index 59cd50bcd6c8..712fe03d07bd 100644
--- a/security/pidentd/Makefile
+++ b/security/pidentd/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: pidentd
-# Version required: 2.8.5
# Date created: 19 Oct 1994
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= pidentd-2.8.5
+PORTNAME= pidentd
+PORTVERSION= 2.8.5
CATEGORIES= security net ipv6
MASTER_SITES= ftp://ftp.lysator.liu.se/pub/ident/servers/ \
ftp://ftp.fu-berlin.de/unix/security/ident/servers/
diff --git a/security/pktsuckers/Makefile b/security/pktsuckers/Makefile
index 2cdc664f4944..7debefe360d6 100644
--- a/security/pktsuckers/Makefile
+++ b/security/pktsuckers/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: pktsuckers
-# Version required: 1.2
# Date created: 31 May 1999
# Whom: Warren Toomey <wkt@cs.adfa.edu.au>
#
# $FreeBSD$
#
-DISTNAME= pktsuckers1_2
-PKGNAME= pktsuckers-1.2
+PORTNAME= pktsuckers
+PORTVERSION= 1.2
CATEGORIES= security net
MASTER_SITES= ftp://minnie.cs.adfa.edu.au/pub/NetSecurity/
+DISTNAME= ${PORTNAME}1_2
MAINTAINER= wkt@cs.adfa.edu.au
diff --git a/security/portscanner/Makefile b/security/portscanner/Makefile
index 9fe331b8762c..d74b1bb6f945 100644
--- a/security/portscanner/Makefile
+++ b/security/portscanner/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: portscanner
-# Version required: 1.0
# Date created: 11 August 1998
# Whom: Bill Fumerola <billf@chc-chimes.com>
#
# $FreeBSD$
#
-DISTNAME= PortScanner-1.0
-PKGNAME= portscanner-1.0
+PORTNAME= portscanner
+PORTVERSION= 1.0
CATEGORIES= security net
MASTER_SITES= http://www.ameth.org/~veilleux/ \
http://people.FreeBSD.org/~billf/
+DISTNAME= PortScanner-1.0
MAINTAINER= billf@FreeBSD.org
diff --git a/security/portsentry/Makefile b/security/portsentry/Makefile
index 3ea4a274808a..8609f0981298 100644
--- a/security/portsentry/Makefile
+++ b/security/portsentry/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sentry
-# Version required: 1.0
# Date created: 3 January 1998
# Whom: chris@still.whet.org
#
# $FreeBSD$
#
-DISTNAME= portsentry-1.0
+PORTNAME= portsentry
+PORTVERSION= 1.0
CATEGORIES= security
MASTER_SITES= http://www.psionic.com/tools/
diff --git a/security/rid/Makefile b/security/rid/Makefile
index a7cfaacab43b..f724874a5f6d 100644
--- a/security/rid/Makefile
+++ b/security/rid/Makefile
@@ -1,17 +1,17 @@
# ex:ts=8
# Ports collection makefile for: ddos_scan
-# Version required: 0.0
# Date created: Sun Feb 12, 2000
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= rid-1_0
-PKGNAME= rid-1.0
+PORTNAME= rid
+PORTVERSION= 1.0
CATEGORIES= security
MASTER_SITES= http://packetstorm.securify.com/distributed/ \
ftp://ftp.ntua.gr/pub/security/technotronic/denial/
+DISTNAME= ${PORTNAME}-1_0
EXTRACT_SUFX= .tgz
MAINTAINER= obrien@FreeBSD.org
diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile
index 2fce05c00d5f..6f15ea7a40c7 100644
--- a/security/rsaref/Makefile
+++ b/security/rsaref/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: rsaref
-# Version required: 2.0
# Date created: 2 Feb 1997
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= rsaref20.1996
-PKGNAME= rsaref-2.0
+PORTNAME= rsaref
+PORTVERSION= 2.0
CATEGORIES= security
MASTER_SITES= ftp://ftp.deva.net/pub/sources/crypto/ \
ftp://ftp.kddlabs.co.jp/.7/inet/caida/bmwt/ \
@@ -17,6 +16,7 @@ MASTER_SITES= ftp://ftp.deva.net/pub/sources/crypto/ \
ftp://ftp.jyu.fi/.3/ftp.zedz.net/pub/replay/crypto/LIBS/rsa/ \
ftp://ftp.funet.fi/pub/mirrors/utopia.hacktic.nl/crypto/LIBS/rsa/ \
ftp://ftp.fu-berlin.de/unix/security/replay-mirror/crypto/LIBS/rsa/
+DISTNAME= rsaref20.1996
EXTRACT_SUFX= .tar.Z
MAINTAINER= kris@FreeBSD.ORG
diff --git a/security/saint/Makefile b/security/saint/Makefile
index 5ce2f5cf6613..a656d6968d00 100644
--- a/security/saint/Makefile
+++ b/security/saint/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: SAINT
-# Version required: 2.0.beta2
# Date created: 27 Jan 2000
# Whom: Carl Johan Madestrand <calle.madestrand@norrgarden.se>
#
# $FreeBSD$
#
-DISTNAME= saint-2.0.beta2
-PKGNAME= saint-2.0
+PORTNAME= saint
+PORTVERSION= 2.0
CATEGORIES= security
MASTER_SITES= http://www.wwdsi.com/saint/downloads/ \
ftp://ukug.uk.freebsd.org/pub/lord_cj/ \
ftp://ftp.wwdsi.com/pub/saint/
+DISTNAME= ${PKGNAME}.beta2
MAINTAINER= calle.madestrand@norrgarden.se
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index e7e4e4ec8990..898ed1b03f4b 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,14 +1,13 @@
# New ports collection makefile for: Seahorse
-# Version required: 0.3.6
# Date created: 08 March 2000
# Whom: Dave McKay <dave@mu.org>
#
# $FreeBSD$
#
-#http://seahorse.sourceforge.net/
-DISTNAME= seahorse-0.3.6
-CATEGORIES= security
+PORTNAME= seahorse
+PORTVERSION= 0.3.6
+CATEGORIES= security
MASTER_SITES= http://www.mu.org/~dave/
MAINTAINER= dave@mu.org
diff --git a/security/skip/Makefile b/security/skip/Makefile
index 5e84cc8350ba..71297fadee6c 100644
--- a/security/skip/Makefile
+++ b/security/skip/Makefile
@@ -1,18 +1,19 @@
# New ports collection makefile for: skip
-# Version required: 1.0
# Date created: 26 November 1997
# Whom: Archie L. Cobbs <archie@whistle.com>
#
# $FreeBSD$
+#
-DISTNAME= skipsrc-1.0
-PKGNAME= skip-1.0
+PORTNAME= skip
+PORTVERSION= 1.0
CATEGORIES= security
# Note: the original source comes from Sun, via this web page:
# http://skip.incog.com/src-form.html
# The site below is outside of the U.S.
MASTER_SITES= ftp://ftp.replaytv.com/pub/replay/crypto/APPS/skip/ \
ftp://ftp.internat.freebsd.org/pub/FreeBSD/distfiles/
+DISTNAME= skipsrc-1.0
EXTRACT_SUFX= .tar.Z
MAINTAINER= archie@freebsd.org
diff --git a/security/slurpie/Makefile b/security/slurpie/Makefile
index 2629e748c56f..13ea1d595702 100644
--- a/security/slurpie/Makefile
+++ b/security/slurpie/Makefile
@@ -1,16 +1,16 @@
# ex:ts=8
# Ports collection makefile for: slurpie
-# Version required: 2.0b
# Date created: Sun Feb 12, 2000
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= slurpie
-PKGNAME= slurpie-2.0b
+PORTNAME= slurpie
+PORTVERSION= 2.0b
CATEGORIES= security
MASTER_SITES= http://www.jps.net/coati/archives/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= obrien@FreeBSD.org
diff --git a/security/slush/Makefile b/security/slush/Makefile
index 34df7de333da..7c5adcb4e8c1 100644
--- a/security/slush/Makefile
+++ b/security/slush/Makefile
@@ -1,12 +1,12 @@
# Ports collection makefile for: slush
-# Version required: 0.1.0
# Date created: Sun May 3, 1999
# Whom: shipley@dis.org
#
# $FreeBSD$
#
-DISTNAME= slush-0.1.1
+PORTNAME= slush
+PORTVERSION= 0.1.1
CATEGORIES= security net
MASTER_SITES= http://violet.ibs.com.au/slush/files/ \
ftp://www.dis.org/pub/Security/
diff --git a/security/smurflog/Makefile b/security/smurflog/Makefile
index 5beed37acb0d..5c93c24caec8 100644
--- a/security/smurflog/Makefile
+++ b/security/smurflog/Makefile
@@ -1,12 +1,12 @@
# Ports collection Makefile for: smurflog
-# Version required: 1.0
# Date created: 7/06/1998
# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= smurflog-2.1
+PORTNAME= smurflog
+PORTVERSION= 2.1
CATEGORIES= net security
MASTER_SITES= ftp://ftp.bitchx.org/pub/misc/ \
ftp://ftp.plur.net/pub/software/bitchx/files/ \
diff --git a/security/sniff/Makefile b/security/sniff/Makefile
index 3d750d99f935..b8902b5fc68a 100644
--- a/security/sniff/Makefile
+++ b/security/sniff/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sniff
-# Version required: 1.0
# Date created: 7 December 1998
# Whom: Rick & Samu
#
# $FreeBSD$
#
-DISTNAME= sniff-1.0
+PORTNAME= sniff
+PORTVERSION= 1.0
CATEGORIES= security
MASTER_SITES= http://people.FreeBSD.org/~fenner/distfiles/
diff --git a/security/snort/Makefile b/security/snort/Makefile
index c01cd10fe86b..19df351ffb3c 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: snort
-# Version required: 1.6
# Date created: Mon Aug 2 12:04:08 CEST 1999
# Whom: Dirk Froemberg <dirk@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= snort-1.6
+PORTNAME= snort
+PORTVERSION= 1.6
CATEGORIES= security net
MASTER_SITES= http://www.clark.net/~roesch/ \
http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index e9c1640645cb..823b0c92b89c 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: ssh
-# Version required: 1.2.*
# Date created: 30 Jul 1995
# Whom: torstenb@FreeBSD.org
#
@@ -9,7 +8,8 @@
# USE_PERL, USE_TCPWRAP
#
-DISTNAME= ssh-1.2.27
+PORTNAME= ssh
+PORTVERSION= 1.2.27
CATEGORIES= security net ipv6
MASTER_SITES= ftp://ftp.cs.hut.fi/pub/ssh/
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index aed389b84676..c1aa002617f1 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: ssh2
-# Version required: 2.0.*
# Date created: 5 Oct 1998
# Whom: Issei Suzuki <issei@jp.FreeBSD.org>
#
@@ -8,12 +7,13 @@
# Maximal ssh2 package requires YES values for
# USE_SSH1, USE_TCPWRAP
-DISTNAME= ssh-2.0.13
-PKGNAME= ssh2-2.0.13
+PORTNAME= ssh2
+PORTVERSION= 2.0.13
CATEGORIES= security net
MASTER_SITES= ftp://ftp.cs.hut.fi/pub/ssh/ \
ftp://sunsite.unc.edu/pub/packages/security/ssh/ \
ftp://ftp.kyoto.wide.ad.jp/pub/security/ssh/
+DISTNAME= ssh-2.0.13
PATCHFILES= patch-${DISTNAME}-bsd.tty.chown
PATCH_SITES= http://www.ssh.org/patches/
diff --git a/security/sslproxy/Makefile b/security/sslproxy/Makefile
index 4bcc184e8889..5cff8845ddb9 100644
--- a/security/sslproxy/Makefile
+++ b/security/sslproxy/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: sslproxy
-# Version required: 2000_Jan_29
# Date created: 11 February 1999
# Whom: Alex Le Heux
#
# $FreeBSD$
#
-DISTNAME= sslproxy.2000_Jan_29
-PKGNAME= sslproxy-20000129
+PORTNAME= sslproxy
+PORTVERSION= 20000129
CATEGORIES= security
MASTER_SITES= ftp://ftp.obdev.at/pub/Products/sslproxy/
+DISTNAME= sslproxy.2000_Jan_29
MAINTAINER= alexlh@funk.org
diff --git a/security/sslwrap/Makefile b/security/sslwrap/Makefile
index 7db06921643a..cc8c4b09bd6b 100644
--- a/security/sslwrap/Makefile
+++ b/security/sslwrap/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: sslwrap
-# Version required: 2.0.5
# Date created: 1999 november 7.
# Whom: Zahemszky, Gabor <ZGabor at CoDe dot HU>
#
# $FreeBSD$
#
-DISTNAME= sslwrap
-PKGNAME= sslwrap-2.0.5
+PORTNAME= sslwrap
+PORTVERSION= 2.0.5
CATEGORIES= security
MASTER_SITES= http://www.rickk.com/sslwrap/
+DISTNAME= ${PORTNAME}
MAINTAINER= ZGabor@CoDe.HU
diff --git a/security/strobe/Makefile b/security/strobe/Makefile
index 6978c5c06f3a..1a96a34afe65 100644
--- a/security/strobe/Makefile
+++ b/security/strobe/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: strobe
-# Version required: 1.06
# Date created: 23 Sep 1996
# Whom: proff
#
# $FreeBSD$
#
-DISTNAME= strobe-1.06
+PORTNAME= strobe
+PORTVERSION= 1.06
CATEGORIES= security net
MASTER_SITES= ftp://ftp.win.or.jp/pub/network/misc/
EXTRACT_SUFX= .tgz
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 4c16882e5a8a..4cb137b4efad 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: stunnel
-# Version required: 3.7
# Date created: Mon Jan 11 11:53:54 EET 1999
# Whom: Martti Kuparinen <martti.kuparinen@ericsson.com>
#
# $FreeBSD$
#
-DISTNAME= stunnel-3.7
+PORTNAME= stunnel
+PORTVERSION= 3.7
CATEGORIES= security
MASTER_SITES= http://opensores.thebunker.net/pub/mirrors/stunnel/ \
http://mike.daewoo.com.pl/computer/stunnel/ \
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index aa75acb7f85a..9cc6a9bb1e66 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sudo
-# Version required: 1.6.2p1
# Date created: Sun Aug 13 12:36:14 CDT 1995
# Whom: erich@rrnet.com
#
# $FreeBSD$
#
-DISTNAME= sudo-1.6.2p3
+PORTNAME= sudo
+PORTVERSION= 1.6.2p3
CATEGORIES= security
MASTER_SITES= ftp://ftp.cs.colorado.edu/pub/sysadmin/sudo/
diff --git a/security/super/Makefile b/security/super/Makefile
index f9d7b00ad9d6..94a7256f6655 100644
--- a/security/super/Makefile
+++ b/security/super/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: foo
-# Version required: 0.0
# Date created: Fri Mar 18, 1997
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= super-3.12.1
+PORTNAME= super
+PORTVERSION= 3.12.1
CATEGORIES= security sysutils
MASTER_SITES= ftp://phobos.caltech.edu/users/will/ \
ftp://ftp.ucolick.org/pub/users/will/ \
diff --git a/security/swatch/Makefile b/security/swatch/Makefile
index 40776196520c..60de7d319a5c 100644
--- a/security/swatch/Makefile
+++ b/security/swatch/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: swatch
-# Version required: 2.2
# Date created: May 2 97
# Whom: jfitz
#
# $FreeBSD$
#
-DISTNAME= swatch-2.2
-CATEGORIES= security sysutils
+PORTNAME= swatch
+PORTVERSION= 2.2
+CATEGORIES= security sysutils
MASTER_SITES= ftp://ftp.stanford.edu/general/security-tools/swatch/ \
ftp://ftp.cert.dfn.de/pub/tools/audit/swatch/
diff --git a/security/tcp_wrapper/Makefile b/security/tcp_wrapper/Makefile
index 53a976a4a347..49168ff396a5 100644
--- a/security/tcp_wrapper/Makefile
+++ b/security/tcp_wrapper/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: tcp_wrapper
-# Version required: 7.6
# Date created: 27 Oct 1994
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= tcp_wrappers_7.6
-PKGNAME= tcp_wrappers-7.6
+PORTNAME= tcp_wrappers
+PORTVERSION= 7.6
CATEGORIES= security net
MASTER_SITES= ftp://ftp.porcupine.org/pub/security/
+DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= torstenb@FreeBSD.org
diff --git a/security/trinokiller/Makefile b/security/trinokiller/Makefile
index 7a36f1163277..2aae13986404 100644
--- a/security/trinokiller/Makefile
+++ b/security/trinokiller/Makefile
@@ -1,16 +1,16 @@
# ex:ts=8
# Ports collection makefile for: trinokiller
-# Version required: 1.0
# Date created: Sun Feb 12, 2000
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= trinokiller
-PKGNAME= trinokiller-1.0
+PORTNAME= trinokiller
+PORTVERSION= 1.0
CATEGORIES= security
MASTER_SITES= http://www.afro-productions.com/
+DISTNAME= trinokiller
EXTRACT_SUFX= .c
MAINTAINER= obrien@FreeBSD.org
diff --git a/security/tripwire-131/Makefile b/security/tripwire-131/Makefile
index 707ff26e975d..3a81d2581886 100644
--- a/security/tripwire-131/Makefile
+++ b/security/tripwire-131/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tripwire
-# Version required: 1.2
# Date created: 31 Mar 1997
# Whom: Joe Greco <jgreco@ns.sol.net>
#
# $FreeBSD$
#
-DISTNAME= tripwire-1.2
+PORTNAME= tripwire
+PORTVERSION= 1.2
CATEGORIES= security net
MASTER_SITES= ftp://coast.cs.purdue.edu/pub/COAST/Tripwire/
EXTRACT_SUFX= .tar.Z
diff --git a/security/tripwire/Makefile b/security/tripwire/Makefile
index 707ff26e975d..3a81d2581886 100644
--- a/security/tripwire/Makefile
+++ b/security/tripwire/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tripwire
-# Version required: 1.2
# Date created: 31 Mar 1997
# Whom: Joe Greco <jgreco@ns.sol.net>
#
# $FreeBSD$
#
-DISTNAME= tripwire-1.2
+PORTNAME= tripwire
+PORTVERSION= 1.2
CATEGORIES= security net
MASTER_SITES= ftp://coast.cs.purdue.edu/pub/COAST/Tripwire/
EXTRACT_SUFX= .tar.Z
diff --git a/security/tripwire12/Makefile b/security/tripwire12/Makefile
index 707ff26e975d..3a81d2581886 100644
--- a/security/tripwire12/Makefile
+++ b/security/tripwire12/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tripwire
-# Version required: 1.2
# Date created: 31 Mar 1997
# Whom: Joe Greco <jgreco@ns.sol.net>
#
# $FreeBSD$
#
-DISTNAME= tripwire-1.2
+PORTNAME= tripwire
+PORTVERSION= 1.2
CATEGORIES= security net
MASTER_SITES= ftp://coast.cs.purdue.edu/pub/COAST/Tripwire/
EXTRACT_SUFX= .tar.Z
diff --git a/security/vscan/Makefile b/security/vscan/Makefile
index eda08456be08..5af5f0be88eb 100644
--- a/security/vscan/Makefile
+++ b/security/vscan/Makefile
@@ -1,17 +1,17 @@
# ex:ts=8
# Ports collection makefile for: vscan
-# Version required: 0.0
# Date created: Thur Sept 25, 1996
# Whom: David O'Brien (obrien@cs.ucdavis.edu)
#
# $FreeBSD$
#
-DISTNAME= nlxb318e
-PKGNAME= vscan-3.1.8
+PORTNAME= vscan
+PORTVERSION= 3.1.8
CATEGORIES= security
MASTER_SITES= ftp://ftp.mcafee.com/pub/antivirus/unix/linux/ \
http://people.FreeBSD.org/~steve/distfiles/
+DISTNAME= nlxb318e
EXTRACT_SUFX= .tar
MAINTAINER= obrien@FreeBSD.org
diff --git a/security/whisker/Makefile b/security/whisker/Makefile
index 522d4ece9d82..198715cbf2c2 100644
--- a/security/whisker/Makefile
+++ b/security/whisker/Makefile
@@ -1,14 +1,15 @@
# New ports collection makefile for: whisker
-# Version required: 1.3
# Date created: 7 Jan 2000
# Whom: kris@FreeBSD.ORG
#
# $FreeBSD$
+#
-DISTNAME= whisker
-PKGNAME= whisker-1.3
+PORTNAME= whisker
+PORTVERSION= 1.3
CATEGORIES= security
MASTER_SITES= http://www.wiretrip.net/rfp/bins/whisker/
+DISTNAME= ${PORTNAME}
MAINTAINER= kris@FreeBSD.ORG
diff --git a/security/xinetd/Makefile b/security/xinetd/Makefile
index 0a3da14a97e7..6fa167fe0b90 100644
--- a/security/xinetd/Makefile
+++ b/security/xinetd/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xinetd
-# Version required: 2.1.8.8p2
# Date created: 28 June 1996
# Whom: markm
#
# $FreeBSD$
#
-DISTNAME= xinetd-2.1.8.8p2
+PORTNAME= xnited
+PORTVERSION= 2.1.8.8p2
CATEGORIES= security
MASTER_SITES= http://synack.net/xinetd/
diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index 65664d1dff9c..efd51f828f33 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: zebedee
-# Version required: 1.3.0
# Date created: 4 January 2000
# Whom: Greg Hewgill <greg@hewgill.com>
#
# $FreeBSD$
#
-DISTNAME= zebedee-1.3.0
+PORTNAME= zebedee
+PORTVERSION= 1.3.0
CATEGORIES= security
MASTER_SITES= http://www.winton.org.uk/zebedee/ \
http://www.hewgill.com/zebedee/
diff --git a/security/zenmap/Makefile b/security/zenmap/Makefile
index 2ba6be21e2a1..b1884c22e980 100644
--- a/security/zenmap/Makefile
+++ b/security/zenmap/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: nmap
-# Version required: 0.0
# Date created: Tue Aug 04, 1998
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= nmapfe-0.9.5
+PORTNAME= nmapfe
+PORTVERSION= 0.9.5
CATEGORIES= security net
MASTER_SITES= http://codebox.net/download/ \
http://www.insecure.org/nmap/dist/
diff --git a/security/zombiezapper/Makefile b/security/zombiezapper/Makefile
index 5aa5e71b5c3f..0539cf31cf5d 100644
--- a/security/zombiezapper/Makefile
+++ b/security/zombiezapper/Makefile
@@ -1,15 +1,15 @@
# Ports collection makefile for: zombiezapper
-# Version required: 1.0
# Date created: 19 Feb 2000
# Whom: Kris Kennaway <kris@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= zombie
-PKGNAME= zombiezapper-1.0
+PORTNAME= zombiezapper
+PORTVERSION= 1.0
CATEGORIES= security
MASTER_SITES= http://razor.bindview.com/tools/files/
+DISTNAME= zombie
EXTRACT_SUFX= .tar
MAINTAINER= kris@FreeBSD.org
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 9e652f2dc5f8..b18fcf264e58 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bash
-# Version required: 2.*
# Date created: 21 August 1994
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= bash-2.03
+PORTNAME= bash
+PORTVERSION= 2.03
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.cwru.edu/pub/bash/
diff --git a/shells/bash1/Makefile b/shells/bash1/Makefile
index c39e0a0585c7..faf2aa47e2db 100644
--- a/shells/bash1/Makefile
+++ b/shells/bash1/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: bash
-# Version required: 0.0
# Date created: 21 August 1994
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= bash-1.14.7
+PORTNAME= bash
+PORTVERSION= 1.14.7
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= bash
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index 9e652f2dc5f8..b18fcf264e58 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bash
-# Version required: 2.*
# Date created: 21 August 1994
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= bash-2.03
+PORTNAME= bash
+PORTVERSION= 2.03
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.cwru.edu/pub/bash/
diff --git a/shells/bash3/Makefile b/shells/bash3/Makefile
index 9e652f2dc5f8..b18fcf264e58 100644
--- a/shells/bash3/Makefile
+++ b/shells/bash3/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bash
-# Version required: 2.*
# Date created: 21 August 1994
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= bash-2.03
+PORTNAME= bash
+PORTVERSION= 2.03
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.cwru.edu/pub/bash/
diff --git a/shells/es/Makefile b/shells/es/Makefile
index bb16c196cb5e..da6c60a6f067 100644
--- a/shells/es/Makefile
+++ b/shells/es/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: es
-# Version required: 0.9a1
# Date created: Sun Aug 13 12:36:14 CDT 1995
# Whom: erich@rrnet.com
#
# $FreeBSD$
#
-DISTNAME= es-0.9-beta1
-PKGNAME= es-0.9b1
+PORTNAME= es
+PORTVERSION= 0.9b1
CATEGORIES= shells
MASTER_SITES= ftp://ftp.sys.toronto.edu/pub/es/
+DISTNAME= es-0.9-beta1
MAINTAINER= erich@FreeBSD.org
diff --git a/shells/esh/Makefile b/shells/esh/Makefile
index 9c450c36199b..c25203c88c05 100644
--- a/shells/esh/Makefile
+++ b/shells/esh/Makefile
@@ -1,12 +1,12 @@
# Ports collection Makefile for: esh
-# Version required: 0.8
# Date created: 05/20/1999
# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= esh-0.8
+PORTNAME= esh
+PORTVERSION= 0.8
CATEGORIES= shells
MASTER_SITES= http://esh.netpedia.net/ \
http://www.nectar.cc/distfiles/
diff --git a/shells/flash/Makefile b/shells/flash/Makefile
index 4f5c3c14860f..6bdb3d2cd5a5 100644
--- a/shells/flash/Makefile
+++ b/shells/flash/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: flash
-# Version required: 0.9.1
# Date created: 11 Dec 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= flash-0.9.1
+PORTNAME= flash
+PORTVERSION= 0.9.1
CATEGORIES= shells
MASTER_SITES= ftp://ftp.netsoc.ucd.ie/pub/computing/flash/
diff --git a/shells/ksh93/Makefile b/shells/ksh93/Makefile
index 41179ac4991c..9394351ed1cb 100644
--- a/shells/ksh93/Makefile
+++ b/shells/ksh93/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: ksh93
-# Version required: 98
# Date created: 1999-10-24
# Whom: Christian Weisgerber <naddy@mips.rhein-neckar.de>
#
# $FreeBSD$
#
-
# ast-base-99 is linked dynamically for BSD/OS and will not work
-DISTNAME= ast-base-98.bsd.i386
-PKGNAME= ksh-19931228
+
+PORTNAME= ksh
+PORTVERSION= 19931228
CATEGORIES= shells
# Users must register with AT&T before downloading tarball.
#MASTER_SITES= http://www.research.att.com/sw/tools/reuse/
+DISTNAME= ast-base-98.bsd.i386
EXTRACT_SUFX= .tgz
MAINTAINER= naddy@mips.rhein-neckar.de
diff --git a/shells/pdksh/Makefile b/shells/pdksh/Makefile
index 938c31eb4905..6783dc2cb23e 100644
--- a/shells/pdksh/Makefile
+++ b/shells/pdksh/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: pdksh
-# Version required: 5.2.14
# Date created: 23 May 1995
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= pdksh-5.2.14
+PORTNAME= pdksh
+PORTVERSION= 5.2.14
CATEGORIES= shells
MASTER_SITES= ftp://ftp.cs.mun.ca/pub/pdksh/ \
http://gd.tuwien.ac.at/utils/shells/pdksh/ \
diff --git a/shells/perlsh/Makefile b/shells/perlsh/Makefile
index 69513addf12c..46691f1f1abe 100644
--- a/shells/perlsh/Makefile
+++ b/shells/perlsh/Makefile
@@ -1,19 +1,18 @@
# New ports collection makefile for: perlsh
-# Version required: 0.007
# Date created: 11 Dec 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= psh-${VERSION}
-PKGNAME= perlsh-${VERSION}
+PORTNAME= perlsh
+PORTVERSION= 0.007
CATEGORIES= shells perl5
MASTER_SITES= http://www.focusresearch.com/gregor/psh/
+DISTNAME= psh-${PORTVERSION}
MAINTAINER= will@FreeBSD.org
-VERSION= 0.007
USE_PERL5= yes
FETCH_BEFORE_ARGS+= -t
MAKE_ENV+= PPREFIX="${PREFIX}"
@@ -25,8 +24,8 @@ MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
do-build:
@(cd ${WRKSRC} && ${PERL} Makefile.PL && ${MAKE})
-post-install:
- @${ECHO} "Updating /etc/shells"
+post-install:
+ @${ECHO} "Updating /etc/shells"
@${CP} /etc/shells /etc/shells.bak
@(${GREP} -v ${PREFIX}/bin/psh /etc/shells.bak; \
${ECHO} ${PREFIX}/bin/psh) > /etc/shells
diff --git a/shells/psh/Makefile b/shells/psh/Makefile
index 69513addf12c..46691f1f1abe 100644
--- a/shells/psh/Makefile
+++ b/shells/psh/Makefile
@@ -1,19 +1,18 @@
# New ports collection makefile for: perlsh
-# Version required: 0.007
# Date created: 11 Dec 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= psh-${VERSION}
-PKGNAME= perlsh-${VERSION}
+PORTNAME= perlsh
+PORTVERSION= 0.007
CATEGORIES= shells perl5
MASTER_SITES= http://www.focusresearch.com/gregor/psh/
+DISTNAME= psh-${PORTVERSION}
MAINTAINER= will@FreeBSD.org
-VERSION= 0.007
USE_PERL5= yes
FETCH_BEFORE_ARGS+= -t
MAKE_ENV+= PPREFIX="${PREFIX}"
@@ -25,8 +24,8 @@ MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
do-build:
@(cd ${WRKSRC} && ${PERL} Makefile.PL && ${MAKE})
-post-install:
- @${ECHO} "Updating /etc/shells"
+post-install:
+ @${ECHO} "Updating /etc/shells"
@${CP} /etc/shells /etc/shells.bak
@(${GREP} -v ${PREFIX}/bin/psh /etc/shells.bak; \
${ECHO} ${PREFIX}/bin/psh) > /etc/shells
diff --git a/shells/rc/Makefile b/shells/rc/Makefile
index 828a7ba5250f..e2523787b77e 100644
--- a/shells/rc/Makefile
+++ b/shells/rc/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rc
-# Version required: 1.6
# Date created: Sun Aug 13 12:36:14 CDT 1995
# Whom: erich@rrnet.com
#
# $FreeBSD$
#
-DISTNAME= rc-1.6
+PORTNAME= rc
+PORTVERSION= 1.6
CATEGORIES= shells plan9
MASTER_SITES= http://www.star.le.ac.uk/~tjg/rc/release/ \
ftp://ftp.sys.utoronto.ca/pub/rc/
diff --git a/shells/sash/Makefile b/shells/sash/Makefile
index a02beff5ad81..12e7f94babfe 100644
--- a/shells/sash/Makefile
+++ b/shells/sash/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sash
-# Version required: 3.4
# Date created: Jan 22, 2000
# Whom: Patrick Gardella <patrick@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= sash-3.4
+PORTNAME= sash
+PORTVERSION= 3.4
CATEGORIES= shells
MASTER_SITES= http://www.pcug.org.au/~dbell/programs/ \
http://people.FreeBSD.org/~patrick/
diff --git a/shells/scsh/Makefile b/shells/scsh/Makefile
index e5ded7965443..fb19aa000b6b 100644
--- a/shells/scsh/Makefile
+++ b/shells/scsh/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: scsh
-# Version required: 0.5.1
# Date created: Jul, 15, 1997
# Whom: cracauer@cons.org "Martin Cracauer"
#
# $FreeBSD$
#
-DISTNAME= scsh-0.5.1
+PORTNAME= scsh
+PORTVERSION= 0.5.1
CATEGORIES= shells lang
MASTER_SITES= ftp://ftp-swiss.ai.mit.edu/pub/su/scsh/ \
http://www2.cons.org:8000/freebsd-distfiles/ \
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index 34ad386d5e2d..ea5f6e377eb0 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: tcsh
-# Version required: 6.09
# Date created: 22 August 1994
# Whom: jkh
#
# $FreeBSD$
#
-DISTNAME= tcsh-6.09
-PKGNAME= tcsh-6.09.00
+PORTNAME= tcsh
+PORTVERSION= 6.09
CATEGORIES= shells
MASTER_SITES= ftp://ftp.astron.com/pub/tcsh/
diff --git a/shells/zsh-devel/Makefile b/shells/zsh-devel/Makefile
index 5f83620cd5a6..b16029054382 100644
--- a/shells/zsh-devel/Makefile
+++ b/shells/zsh-devel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: zsh-devel
-# Version required: 3.1.6
# Date created: 31 October 1998
# Whom: shige
#
# $FreeBSD$
#
-DISTNAME= zsh-3.1.6
+PORTNAME= zsh
+PORTVERSION= 3.1.6
CATEGORIES= shells
MASTER_SITES= ftp://ftp.zsh.org/zsh/ \
ftp://ftp.sterling.com/zsh/ \
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index d35be4b71dc3..8edc7c510da0 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: zsh
-# Version required: 3.0.7
# Date created: 11 Feb. 1995
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= zsh-3.0.7
+PORTNAME= zsh
+PORTVERSION= 3.0.7
CATEGORIES= shells
MASTER_SITES= ftp://ftp.sterling.com/zsh/ \
ftp://ftp.rge.com/pub/shells/zsh/ \