17 files changed, 43 insertions, 46 deletions

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/ \