Convert to the PORTNAME - PORTVERSION syntax.

author: David E. O'Brien <obrien@FreeBSD.org> 2000-04-12 06:21:15 +0000
committer: David E. O'Brien <obrien@FreeBSD.org> 2000-04-12 06:21:15 +0000
commit: 5cd5b258b59f63241fff7b2d0cdeda22c2138b33 (patch)
tree: 98671b38100211b23e9d578a8a5a241e41b8a707
parent: 343c80d542a8a68a6de7c4e7b02a392d8e1d6fa0 (diff)
download: ports-5cd5b258b59f63241fff7b2d0cdeda22c2138b33.tar.gz
ports-5cd5b258b59f63241fff7b2d0cdeda22c2138b33.zip
190 files changed, 568 insertions, 609 deletions
diff --git a/java/collections/Makefile b/java/collections/Makefile
index 76c03a305380..f51477e21c4d 100644
--- a/java/collections/Makefile
+++ b/java/collections/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:    JDK1.1 Collections package
-# Version required:	1.1
 # Date created:		1999/08/08
 # Whom:			Jose Marques
 #
 # $FreeBSD$
 #
 
-DISTNAME=	collections1_1
-PKGNAME=	collections-1.1
+PORTNAME=	collections
+PORTVERSION=	1.1
 CATEGORIES=	java
+DISTNAME=	collections1_1
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	noway@nohow.demon.co.uk
diff --git a/java/cos/Makefile b/java/cos/Makefile
index a0eea94ed954..17f4b8f1fb2d 100644
--- a/java/cos/Makefile
+++ b/java/cos/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	cos
-# Version required:	1.0
 # Date created:		1999/07/05
 # Whom:			Jose Marques <noway@nohow.demon.co.uk>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	cos
-PKGNAME=	cos-1.0
+PORTNAME=	cos
+PORTVERSION=	1.0
 CATEGORIES=	java
 MASTER_SITES=	http://www.servlets.com/resources/com.oreilly.servlet/
+DISTNAME=	cos
 
 MAINTAINER=	noway@nohow.demon.co.uk
 
diff --git a/java/cryptix-jce/Makefile b/java/cryptix-jce/Makefile
index 57ca139a043b..4efd3f829f2f 100644
--- a/java/cryptix-jce/Makefile
+++ b/java/cryptix-jce/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	Java Cryptograph Extension by Cryptix
-# Version required:	2000-02-11
 # Date created:		2000/02/19
 # Whom:			Kensaku Masuda <greg@greg.rim.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	cryptix-jce-20000211
+PORTNAME=	cryptix-jce
+PORTVESION=	20000211
 CATEGORIES=	java security
 MASTER_SITES=	http://cvs.cryptix.org/~gelderen/
 
diff --git a/java/guavac/Makefile b/java/guavac/Makefile
index ac2cbba25707..d99f9be4e5f3 100644
--- a/java/guavac/Makefile
+++ b/java/guavac/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   guavac
-# Version required:    1.2
 # Date created:        10 October 1996
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	guavac-1.2
+PORTNAME=	guavac
+PORTVERSION=	1.2
 CATEGORIES=	java
 MASTER_SITES=	ftp://ftp.yggdrasil.com/pub/dist/devel/compilers/guavac/
 
diff --git a/java/infobus/Makefile b/java/infobus/Makefile
index 856c443a67a5..bb54591f9025 100644
--- a/java/infobus/Makefile
+++ b/java/infobus/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:    Infobus 1.2
-# Version required:	1.2
 # Date created:		1999/08/08
 # Whom:			Jose Marques
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ib12
-PKGNAME=	infobus-1.2
+PORTNAME=	infobus
+PORTVERSION=	1.2
 CATEGORIES=	java
+DISTNAME=	ib12
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	noway@nohow.demon.co.uk
diff --git a/java/jaf/Makefile b/java/jaf/Makefile
index 7590bc5803b7..f42751517f6d 100644
--- a/java/jaf/Makefile
+++ b/java/jaf/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:    JavaBeans Activation Framework (JAF)
-# Version required:	1.0.1
 # Date created:		1999/08/08
 # Whom:			Jose Marques
 #
 # $FreeBSD$
 #
 
-DISTNAME=	jaf1_0_1
-PKGNAME=	jaf-1.0.1
+PORTNAME=	jaf
+PORTVERSION=	1.0.1
 CATEGORIES=	java
+DISTNAME=	jaf1_0_1
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	noway@nohow.demon.co.uk
diff --git a/java/java-cup/Makefile b/java/java-cup/Makefile
index 266b91ba1e65..cfeb13a88b0b 100644
--- a/java/java-cup/Makefile
+++ b/java/java-cup/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	cup
-# Version required:	0.10g
 # Date created:		10 May 1998
 # Whom:			nordwick@xcf.berkeley.edu
 #
 # $FreeBSD$
 #
 
-DISTNAME=	java_cup_v10g
-PKGNAME=	java_cup-10.g
+PORTNAME=	java_cup
+PORTVERSION=	10.g
 CATEGORIES=	java
 MASTER_SITES=	http://www.cs.princeton.edu/~appel/modern/java/CUP/
+DISTNAME=	java_cup_v10g
 
 MAINTAINER=	nordwick@xcf.berkeley.edu
 
diff --git a/java/java-tutorial/Makefile b/java/java-tutorial/Makefile
index 31352a52e785..be69532ad868 100644
--- a/java/java-tutorial/Makefile
+++ b/java/java-tutorial/Makefile
@@ -1,31 +1,31 @@
 # New ports collection makefile for:	JDK tutorial
-# Version required:	1.1.8
 # Date created:		Tue Mar 23 10:18:20 EET 1999
 # Whom:			Martti Kuparinen <martti.kuparinen@ericsson.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tutorial
-PKGNAME=	jdk-tutorial-1.1.8
+PORTNAME=	jdk-tutorial
+PORTVERSION=	1.1.8
 CATEGORIES=	java
 MASTER_SITES=	ftp://ftp.javasoft.com/docs/
+DISTNAME=	tutorial
 
 MAINTAINER=	martti.kuparinen@ericsson.com
 
-VERSION=	1.1.8
 WRKSRC=		${WRKDIR}
 RESTRICTED=	"This software is under license and export control."
 NO_BUILD=	yes
-PLIST_SUB+=	VERSION=${VERSION}
+PLIST_SUB+=	VERSION=${PORTVERSION}
 PKGMESSAGE= ${WRKDIR}/MESSAGE
 
 .include <bsd.port.pre.mk>
 
 do-install:
-	${MKDIR} ${PREFIX}/jdk${VERSION}/docs/books/tutorial
+	${MKDIR} ${PREFIX}/jdk${PORTVERSION}/docs/books/tutorial
 	(cd ${WRKSRC} && ${TAR} -cf - * ) \
-	    | (cd ${PREFIX}/jdk${VERSION}/docs/books/tutorial && ${TAR} -xf -)
+	    | (cd ${PREFIX}/jdk${PORTVERSION}/docs/books/tutorial \
+	        && ${TAR} -xf -)
 	@${SED} s+!!PREFIX!!+${PREFIX}+g < ${PKGDIR}/MESSAGE > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 	@${RM} ${PKGMESSAGE}
diff --git a/java/javamail/Makefile b/java/javamail/Makefile
index 32c1a10c2350..711f746139bd 100644
--- a/java/javamail/Makefile
+++ b/java/javamail/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:    JavaMail API Implementation Version 1.1.2
-# Version required:	1.1.2
 # Date created:		1999/08/08
 # Whom:			Jose Marques
 #
 # $FreeBSD$
 #
 
-DISTNAME=	javamail1_1_2
-PKGNAME=	javamail-1.1.2
+PORTNAME=	javamail
+PORTVERSION=	1.1.2
 CATEGORIES=	java
+DISTNAME=	javamail1_1_2
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	noway@nohow.demon.co.uk
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${PREFIX}/jdk${JDK_VERSION}/bin/java:${PORTSDIR}/java/jdk \
 
 USE_ZIP=	YES
 
-WRKSRC=		${WRKDIR}/javamail-1.1.2
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 JDK_VERSION=	1.1.8
 NO_BUILD=	yes
 NO_CDROM=	"See the license"
diff --git a/java/jce-aba/Makefile b/java/jce-aba/Makefile
index 51ceb1909bcc..02a85497fbd6 100644
--- a/java/jce-aba/Makefile
+++ b/java/jce-aba/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	Java Cryptograph Extension
-# Version required:	1.1
 # Date created:		2000/02/11
 # Whom:			Kensaku Masuda <greg@greg.rim.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	jce-aba-1.1
+PORTNAME=	jce-aba
+PORTVERSION=	1.1
 CATEGORIES=	java
 MASTER_SITES=	http://www.openjce.org/
 
diff --git a/java/jdbcpool/Makefile b/java/jdbcpool/Makefile
index 7366623ba970..4e93fa18243f 100644
--- a/java/jdbcpool/Makefile
+++ b/java/jdbcpool/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    JDBC connection pool
-# Version required:	0.94
 # Date created:		1999/07/04
 # Whom:			Jose Marques
 #
 # $FreeBSD$
 #
 
-DISTNAME=	jdbcpool-0.94
+PORTNAME=	jdbcpool
+PORTVERSION=	0.94
 CATEGORIES=	java
 MASTER_SITES=	http://www.bitmechanic.com/projects/jdbcpool/dist/
 
diff --git a/java/jdk-doc/Makefile b/java/jdk-doc/Makefile
index a1c346ac60d8..ba40cf003dd5 100644
--- a/java/jdk-doc/Makefile
+++ b/java/jdk-doc/Makefile
@@ -1,23 +1,22 @@
 # New ports collection makefile for:	JDK documentation
-# Version required:	1.1.8
 # Date created:		Mon Mar  8 10:10:42 EET 1999
 # Whom:			Martti Kuparinen <martti.kuparinen@ericsson.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	jdk118-doc
-PKGNAME=	jdk-doc-1.1.8
+PORTNAME=	jdk-doc
+PORTVERSION=	1.1.8
 CATEGORIES=	java
+DISTNAME=	jdk118-doc
 
 MAINTAINER=	martti.kuparinen@ericsson.com
 
 RESTRICTED=	"This software is under license and export control."
 IS_INTERACTIVE=	"Requires manual fetch"
-VERSION=	1.1.8
-WRKSRC=		${WRKDIR}/jdk${VERSION}
+WRKSRC=		${WRKDIR}/jdk${PORTVERSION}
 NO_BUILD=	yes
-PLIST_SUB+=	VERSION=${VERSION}
+PLIST_SUB+=	VERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
@@ -37,9 +36,9 @@ do-fetch:
 .endif
 
 do-install:
-	${MKDIR} ${PREFIX}/jdk${VERSION}
+	${MKDIR} ${PREFIX}/jdk${PORTVERSION}
 	(cd ${WRKSRC} && ${TAR} -cf - docs) \
-		| (cd ${PREFIX}/jdk${VERSION} && ${TAR} -xf -)
+		| (cd ${PREFIX}/jdk${PORTVERSION} && ${TAR} -xf -)
 	@${CAT} ${PKGMESSAGE} | ${SED} s+!!PREFIX!!+${PREFIX}+g
 
 .include <bsd.port.post.mk>
diff --git a/java/jdk-tutorial/Makefile b/java/jdk-tutorial/Makefile
index 31352a52e785..be69532ad868 100644
--- a/java/jdk-tutorial/Makefile
+++ b/java/jdk-tutorial/Makefile
@@ -1,31 +1,31 @@
 # New ports collection makefile for:	JDK tutorial
-# Version required:	1.1.8
 # Date created:		Tue Mar 23 10:18:20 EET 1999
 # Whom:			Martti Kuparinen <martti.kuparinen@ericsson.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tutorial
-PKGNAME=	jdk-tutorial-1.1.8
+PORTNAME=	jdk-tutorial
+PORTVERSION=	1.1.8
 CATEGORIES=	java
 MASTER_SITES=	ftp://ftp.javasoft.com/docs/
+DISTNAME=	tutorial
 
 MAINTAINER=	martti.kuparinen@ericsson.com
 
-VERSION=	1.1.8
 WRKSRC=		${WRKDIR}
 RESTRICTED=	"This software is under license and export control."
 NO_BUILD=	yes
-PLIST_SUB+=	VERSION=${VERSION}
+PLIST_SUB+=	VERSION=${PORTVERSION}
 PKGMESSAGE= ${WRKDIR}/MESSAGE
 
 .include <bsd.port.pre.mk>
 
 do-install:
-	${MKDIR} ${PREFIX}/jdk${VERSION}/docs/books/tutorial
+	${MKDIR} ${PREFIX}/jdk${PORTVERSION}/docs/books/tutorial
 	(cd ${WRKSRC} && ${TAR} -cf - * ) \
-	    | (cd ${PREFIX}/jdk${VERSION}/docs/books/tutorial && ${TAR} -xf -)
+	    | (cd ${PREFIX}/jdk${PORTVERSION}/docs/books/tutorial \
+	        && ${TAR} -xf -)
 	@${SED} s+!!PREFIX!!+${PREFIX}+g < ${PKGDIR}/MESSAGE > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 	@${RM} ${PKGMESSAGE}
diff --git a/java/jdk/Makefile b/java/jdk/Makefile
index 130068296c09..72eb66a593ef 100644
--- a/java/jdk/Makefile
+++ b/java/jdk/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	jdk
-# Version required:     1.1.8
 # Date created:		Feb, 8, 1998
 # Whom:			Nate Williams <nate@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	jdk-${JDK_VERSION}
+PORTNAME=	jdk
+PORTVERSION=	${JDK_VERSION}
 CATEGORIES=	java devel
 MASTER_SITES=	ftp://ftp.sc.sri.com/pub/FreeBSD/JDK/ \
 		http://www.freebsd.org/java/
diff --git a/java/jdk11-doc/Makefile b/java/jdk11-doc/Makefile
index a1c346ac60d8..ba40cf003dd5 100644
--- a/java/jdk11-doc/Makefile
+++ b/java/jdk11-doc/Makefile
@@ -1,23 +1,22 @@
 # New ports collection makefile for:	JDK documentation
-# Version required:	1.1.8
 # Date created:		Mon Mar  8 10:10:42 EET 1999
 # Whom:			Martti Kuparinen <martti.kuparinen@ericsson.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	jdk118-doc
-PKGNAME=	jdk-doc-1.1.8
+PORTNAME=	jdk-doc
+PORTVERSION=	1.1.8
 CATEGORIES=	java
+DISTNAME=	jdk118-doc
 
 MAINTAINER=	martti.kuparinen@ericsson.com
 
 RESTRICTED=	"This software is under license and export control."
 IS_INTERACTIVE=	"Requires manual fetch"
-VERSION=	1.1.8
-WRKSRC=		${WRKDIR}/jdk${VERSION}
+WRKSRC=		${WRKDIR}/jdk${PORTVERSION}
 NO_BUILD=	yes
-PLIST_SUB+=	VERSION=${VERSION}
+PLIST_SUB+=	VERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
@@ -37,9 +36,9 @@ do-fetch:
 .endif
 
 do-install:
-	${MKDIR} ${PREFIX}/jdk${VERSION}
+	${MKDIR} ${PREFIX}/jdk${PORTVERSION}
 	(cd ${WRKSRC} && ${TAR} -cf - docs) \
-		| (cd ${PREFIX}/jdk${VERSION} && ${TAR} -xf -)
+		| (cd ${PREFIX}/jdk${PORTVERSION} && ${TAR} -xf -)
 	@${CAT} ${PKGMESSAGE} | ${SED} s+!!PREFIX!!+${PREFIX}+g
 
 .include <bsd.port.post.mk>
diff --git a/java/jdk11/Makefile b/java/jdk11/Makefile
index 130068296c09..72eb66a593ef 100644
--- a/java/jdk11/Makefile
+++ b/java/jdk11/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	jdk
-# Version required:     1.1.8
 # Date created:		Feb, 8, 1998
 # Whom:			Nate Williams <nate@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	jdk-${JDK_VERSION}
+PORTNAME=	jdk
+PORTVERSION=	${JDK_VERSION}
 CATEGORIES=	java devel
 MASTER_SITES=	ftp://ftp.sc.sri.com/pub/FreeBSD/JDK/ \
 		http://www.freebsd.org/java/
diff --git a/java/jdk12-doc/Makefile b/java/jdk12-doc/Makefile
index a1c346ac60d8..ba40cf003dd5 100644
--- a/java/jdk12-doc/Makefile
+++ b/java/jdk12-doc/Makefile
@@ -1,23 +1,22 @@
 # New ports collection makefile for:	JDK documentation
-# Version required:	1.1.8
 # Date created:		Mon Mar  8 10:10:42 EET 1999
 # Whom:			Martti Kuparinen <martti.kuparinen@ericsson.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	jdk118-doc
-PKGNAME=	jdk-doc-1.1.8
+PORTNAME=	jdk-doc
+PORTVERSION=	1.1.8
 CATEGORIES=	java
+DISTNAME=	jdk118-doc
 
 MAINTAINER=	martti.kuparinen@ericsson.com
 
 RESTRICTED=	"This software is under license and export control."
 IS_INTERACTIVE=	"Requires manual fetch"
-VERSION=	1.1.8
-WRKSRC=		${WRKDIR}/jdk${VERSION}
+WRKSRC=		${WRKDIR}/jdk${PORTVERSION}
 NO_BUILD=	yes
-PLIST_SUB+=	VERSION=${VERSION}
+PLIST_SUB+=	VERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
@@ -37,9 +36,9 @@ do-fetch:
 .endif
 
 do-install:
-	${MKDIR} ${PREFIX}/jdk${VERSION}
+	${MKDIR} ${PREFIX}/jdk${PORTVERSION}
 	(cd ${WRKSRC} && ${TAR} -cf - docs) \
-		| (cd ${PREFIX}/jdk${VERSION} && ${TAR} -xf -)
+		| (cd ${PREFIX}/jdk${PORTVERSION} && ${TAR} -xf -)
 	@${CAT} ${PKGMESSAGE} | ${SED} s+!!PREFIX!!+${PREFIX}+g
 
 .include <bsd.port.post.mk>
diff --git a/java/jdk13-doc/Makefile b/java/jdk13-doc/Makefile
index a1c346ac60d8..ba40cf003dd5 100644
--- a/java/jdk13-doc/Makefile
+++ b/java/jdk13-doc/Makefile
@@ -1,23 +1,22 @@
 # New ports collection makefile for:	JDK documentation
-# Version required:	1.1.8
 # Date created:		Mon Mar  8 10:10:42 EET 1999
 # Whom:			Martti Kuparinen <martti.kuparinen@ericsson.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	jdk118-doc
-PKGNAME=	jdk-doc-1.1.8
+PORTNAME=	jdk-doc
+PORTVERSION=	1.1.8
 CATEGORIES=	java
+DISTNAME=	jdk118-doc
 
 MAINTAINER=	martti.kuparinen@ericsson.com
 
 RESTRICTED=	"This software is under license and export control."
 IS_INTERACTIVE=	"Requires manual fetch"
-VERSION=	1.1.8
-WRKSRC=		${WRKDIR}/jdk${VERSION}
+WRKSRC=		${WRKDIR}/jdk${PORTVERSION}
 NO_BUILD=	yes
-PLIST_SUB+=	VERSION=${VERSION}
+PLIST_SUB+=	VERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
@@ -37,9 +36,9 @@ do-fetch:
 .endif
 
 do-install:
-	${MKDIR} ${PREFIX}/jdk${VERSION}
+	${MKDIR} ${PREFIX}/jdk${PORTVERSION}
 	(cd ${WRKSRC} && ${TAR} -cf - docs) \
-		| (cd ${PREFIX}/jdk${VERSION} && ${TAR} -xf -)
+		| (cd ${PREFIX}/jdk${PORTVERSION} && ${TAR} -xf -)
 	@${CAT} ${PKGMESSAGE} | ${SED} s+!!PREFIX!!+${PREFIX}+g
 
 .include <bsd.port.post.mk>
diff --git a/java/jdk14-doc/Makefile b/java/jdk14-doc/Makefile
index a1c346ac60d8..ba40cf003dd5 100644
--- a/java/jdk14-doc/Makefile
+++ b/java/jdk14-doc/Makefile
@@ -1,23 +1,22 @@
 # New ports collection makefile for:	JDK documentation
-# Version required:	1.1.8
 # Date created:		Mon Mar  8 10:10:42 EET 1999
 # Whom:			Martti Kuparinen <martti.kuparinen@ericsson.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	jdk118-doc
-PKGNAME=	jdk-doc-1.1.8
+PORTNAME=	jdk-doc
+PORTVERSION=	1.1.8
 CATEGORIES=	java
+DISTNAME=	jdk118-doc
 
 MAINTAINER=	martti.kuparinen@ericsson.com
 
 RESTRICTED=	"This software is under license and export control."
 IS_INTERACTIVE=	"Requires manual fetch"
-VERSION=	1.1.8
-WRKSRC=		${WRKDIR}/jdk${VERSION}
+WRKSRC=		${WRKDIR}/jdk${PORTVERSION}
 NO_BUILD=	yes
-PLIST_SUB+=	VERSION=${VERSION}
+PLIST_SUB+=	VERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
@@ -37,9 +36,9 @@ do-fetch:
 .endif
 
 do-install:
-	${MKDIR} ${PREFIX}/jdk${VERSION}
+	${MKDIR} ${PREFIX}/jdk${PORTVERSION}
 	(cd ${WRKSRC} && ${TAR} -cf - docs) \
-		| (cd ${PREFIX}/jdk${VERSION} && ${TAR} -xf -)
+		| (cd ${PREFIX}/jdk${PORTVERSION} && ${TAR} -xf -)
 	@${CAT} ${PKGMESSAGE} | ${SED} s+!!PREFIX!!+${PREFIX}+g
 
 .include <bsd.port.post.mk>
diff --git a/java/jfc/Makefile b/java/jfc/Makefile
index 8a9bf8509514..41c7b76af42c 100644
--- a/java/jfc/Makefile
+++ b/java/jfc/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	Java Foundation Classes with Swing
-# Version required:	1.1.1
 # Date created:		17 May 1999
 # Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	swing1_1_1
-PKGNAME=	jfc-1.1.1
+PORTNAME=	jfc
+PORTVERSION=	1.1.1
 CATEGORIES=	java
 MASTER_SITES=	http://java.sun.com/products/jfc/
+DISTNAME=	swing1_1_1
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	kuriyama@FreeBSD.org
diff --git a/java/jikes/Makefile b/java/jikes/Makefile
index d1eedcaef633..94fcd4610ce3 100644
--- a/java/jikes/Makefile
+++ b/java/jikes/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    jikes
-# Version required:     0.41
 # Date created:         09 December 1998
 # Whom:                 Matthew Dillon <dillon@backplane.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	jikes-1.11
+PORTNAME=	jikes
+PORTVERSION=	1.11
 CATEGORIES=	java
 MASTER_SITES=	ftp://ftp.whistle.com/pub/archie/misc/
 
diff --git a/java/jlex/Makefile b/java/jlex/Makefile
index a20f6cef2149..5e88e2fd7d03 100644
--- a/java/jlex/Makefile
+++ b/java/jlex/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	jlex
-# Version required:	1.2.3
 # Date created:		1 June 1999
 # Whom:			jake@checker.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Main
-PKGNAME=	jlex-1.2.3
+PORTNAME=	jlex
+PORTVERSION=	1.2.3
 CATEGORIES=	java
 MASTER_SITES=	http://www.cs.princeton.edu/~appel/modern/java/JLex/Archive/1.2.3/
+DISTNAME=	Main
 EXTRACT_SUFX=	.java
 
 MAINTAINER=	jake@checker.org
diff --git a/java/jsdk/Makefile b/java/jsdk/Makefile
index e2a66d3ebfd2..3105380a471b 100644
--- a/java/jsdk/Makefile
+++ b/java/jsdk/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    Java Servlet Developpers Kit
-# Version required:	2.0
 # Date created:		1999/05/29
 # Whom:			Kensaku Masuda <greg@greg.rim.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	jsdk20-solaris2-sparc
-PKGNAME=	jsdk-2.0
+PORTNAME=	jsdk
+PORTVERSION=	2.0
 CATEGORIES=	java
 MASTER_SITES=	
+DISTNAME=	jsdk20-solaris2-sparc
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	greg@greg.rim.or.jp
diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index a81eea8ef4a3..ab3b70fa9ebf 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    kaffe
-# Version required:     1.0.b4
 # Date created:         20 February 1995
 # Whom:                 Tim Wilkinson <tim@sarc.city.ac.uk>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	kaffe-1.0.5
+PORTNAME=	kaffe
+PORTVERSION=	1.0.5
 CATEGORIES=	java
 MASTER_SITES=	ftp://ftp.kaffe.org/pub/kaffe/
 
diff --git a/java/netrexx/Makefile b/java/netrexx/Makefile
index 37ff1b9e9d9e..d3bd809a174f 100644
--- a/java/netrexx/Makefile
+++ b/java/netrexx/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	NetRexx
-# Version required:     1.160
 # Date created:		Feb 8, 1999
 # Whom:			Pedro Giffuni
 #
 # $FreeBSD$
 #
 
-DISTNAME=	NetRexx
-PKGNAME=	netrexx-1.160
+PORTNAME=	netrexx
+PORTVERSION=	1.160
 CATEGORIES=	java lang
 MASTER_SITES=	http://www.ibm.com/technology/NetRexx/
+DISTNAME=	NetRexx
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/java/shujit/Makefile b/java/shujit/Makefile
index aa899794cd89..c06c193353fc 100644
--- a/java/shujit/Makefile
+++ b/java/shujit/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	shujit
-# Version required:	0.4.2
 # Date created:		30 April 1999
 # Whom:			jake@checker.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	shujit-0.4.2
+PORTNAME=	shujit
+PORTVERSION=	0.4.2
 CATEGORIES=	java
 MASTER_SITES=	http://www.shudo.net/jit/dist/
 
diff --git a/java/tya/Makefile b/java/tya/Makefile
index c393250bb3ed..fe94c4c4ade9 100644
--- a/java/tya/Makefile
+++ b/java/tya/Makefile
@@ -5,10 +5,11 @@
 # $FreeBSD$
 #
 
-DISTNAME=	tya17
-PKGNAME=	tya-1.7
+PORTNAME=	tya
+PORTVERSION=	1.7
 CATEGORIES=	java
 MASTER_SITES=	http://sax.sax.de/~adlibit/
+DISTNAME=	tya17
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jburkhol@home.com
diff --git a/lang/ETHOberonV4/Makefile b/lang/ETHOberonV4/Makefile
index 7a2894f5fd96..d1bd746ef953 100644
--- a/lang/ETHOberonV4/Makefile
+++ b/lang/ETHOberonV4/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	ETHOberonV4
-# Version required:	ETH Oberon V4-0.9 (for Linux)
 # Date created:		12 July 1998
 # Whom:			Jerry Hicks <jhicks@glenatl.glenayre.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ETHLinuxOberon
-PKGNAME=	ETHOberonV4-0.9
+PORTNAME=	ETHOberonV4
+PORTVERSION=	0.9
 CATEGORIES=	lang linux
 MASTER_SITES=	ftp://ftp.inf.ethz.ch/pub/Oberon/OberonV4/Linux/latest/
+DISTNAME=	ETHLinuxOberon
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jhicks@glenatl.glenayre.com
diff --git a/lang/Gofer/Makefile b/lang/Gofer/Makefile
index bf69b7a6e4ba..6f22c9740917 100644
--- a/lang/Gofer/Makefile
+++ b/lang/Gofer/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	gofer
-# Version required:     2.30
 # Date created:         Wed Feb  1 01:51:59 PST 1995
 # Whom:                 hsu
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gofer230a
-PKGNAME=	gofer-2.30a
+PORTNAME=	gofer
+PORTVERSION=	2.30a
 CATEGORIES=	lang
 MASTER_SITES=	ftp://cs.nott.ac.uk/nott-fp/languages/haskell/gofer/
+DISTNAME=	gofer230a
 
 MAINTAINER=	hsu@FreeBSD.org
 
diff --git a/lang/STk/Makefile b/lang/STk/Makefile
index befe3a70eeba..c8b651eb1ad9 100644
--- a/lang/STk/Makefile
+++ b/lang/STk/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:    STk
-# Version required:     3.1
 # Date created:         17 Sep 96 
 # Whom:                 jmacd@cs.berkeley.edu
 #
 # $FreeBSD$
 #
 
-DISTNAME=       STk-3.1.1
+PORTNAME=	STk
+PORTVERSION=	3.1.1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://kaolin.unice.fr/pub/
 
 MAINTAINER=	jmacd@FreeBSD.org
 
 USE_XLIB=	yes
-PATCH_STRIP=      -p1
+PATCH_STRIP=	-p1
 GNU_CONFIGURE=	yes
-MAKE_FLAGS=  	"prefix=${PREFIX}" -f
+MAKE_FLAGS=	"prefix=${PREFIX}" -f
 STK_ARCH!=	echo "$$(uname)-$$(uname -r)-$$(uname -m)"
 PLIST_SUB=	STK_VERSION=3.1.1 STK_ARCH=${STK_ARCH}
 
diff --git a/lang/Sather/Makefile b/lang/Sather/Makefile
index 666bbcd30ba5..138134c1ae3a 100644
--- a/lang/Sather/Makefile
+++ b/lang/Sather/Makefile
@@ -1,13 +1,13 @@
 # ex:ts=8
 # Ports collection makefile for:  Sather
-# Version required: 0.0
 # Date created:			  Mon Oct 31 22:04:12 PST 1994
 # Whom:				  hsu
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sather-1.2.1
+PORTNAME=	sather
+PORTVERSION=	1.2.1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	sather
diff --git a/lang/TenDRA/Makefile b/lang/TenDRA/Makefile
index c6626286aff0..db4d239841f9 100644
--- a/lang/TenDRA/Makefile
+++ b/lang/TenDRA/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	TenDRA
-# Version required:	4.1.2
 # Date created:		7 Apr 1998
 # Whom:			Robert Nordier <rnordier@iafrica.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	TenDRA-4.1.2
+PORTNAME=	TenDRA
+PORTVERSION=	4.1.2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://alph.dera.gov.uk/pub/TenDRA/
 
diff --git a/lang/atlast/Makefile b/lang/atlast/Makefile
index fcca9845e4f5..f2142bcc3424 100644
--- a/lang/atlast/Makefile
+++ b/lang/atlast/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	atlast
-# Version required:     1.0
 # Date created:         26 Ag 97
 # Whom:                 Pedro Giffuni
 #
 # $FreeBSD$
 #
 
-DISTNAME=	atlast-1.0
+PORTNAME=	atlast
+PORTVERSION=	1.0
 CATEGORIES=	lang
 MASTER_SITES=	http://www.fourmilab.ch/atlast/ \
 		http://www.fourmilab.to/atlast/
diff --git a/lang/bc-gcc/Makefile b/lang/bc-gcc/Makefile
index e43410979af1..05c5700fb743 100644
--- a/lang/bc-gcc/Makefile
+++ b/lang/bc-gcc/Makefile
@@ -1,14 +1,13 @@
 # ex:ts=8
 # Ports collection makefile for:  gcc-2.7.2 - Bounds checking gcc
-# Version required: 0.0
 # Date created:			  Sun June 08, 1997
 # Whom:				  David O'Brien (obrien@FreeBSD.org)
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gcc-2.7.2
-PKGNAME=	bc-gcc-2.7.2p1.0.2
+PORTNAME=	bc-gcc
+PORTVERSION=	2.7.2p1.0.2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}  \
 		ftp://dse.doc.ic.ac.uk/pub/misc/bcc/  \
diff --git a/lang/bwbasic/Makefile b/lang/bwbasic/Makefile
index 06eeae8ff674..cb7aef8c6718 100644
--- a/lang/bwbasic/Makefile
+++ b/lang/bwbasic/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	bwbasic
-# Version required:	2.20
 # Date created:		16 Jan 1997
 # Whom:			msmith@gsoft.com.au
 #
 # $FreeBSD$
 #
 
-DISTNAME=	bwbasic-2.20
+PORTNAME=	bwbasic
+PORTVERSION=	2.20
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.rahul.net/pub/rhn/
 DISTFILES=	bwbasic-2.20.tar.Z bwb-2.20-patch01.tar.Z.uu.txt
diff --git a/lang/caml-light/Makefile b/lang/caml-light/Makefile
index 86f94a5021c1..4d54a01fc3c0 100644
--- a/lang/caml-light/Makefile
+++ b/lang/caml-light/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for: CAML
-# Version required:	0.74
 # Date created:		21 July 1998
 # Whom:			jkoshy
 #
 # $FreeBSD$
 #
 
-DISTNAME=	cl74unix
-PKGNAME=	caml-0.74
+PORTNAME=	caml
+PORTVERSION=	0.74
 CATEGORIES=	lang elisp
 MASTER_SITES=	ftp://ftp.inria.fr/lang/caml-light/ \
 	ftp://sunsite.doc.ic.ac.uk/computing/programming/languages/ml/caml-light/ \
 	ftp://arcadia.informatik.uni-muenchen.de/pub/comp/programming/languages/functional/caml-light/ \
 	ftp://sunsite.icm.edu.pl/pub/programming/caml/ \
 	http://wwwfun.kurims.kyoto-u.ac.jp/soft/caml-light/
+DISTNAME=	cl74unix
 
 MAINTAINER=	jkoshy@freebsd.org
 
diff --git a/lang/cim/Makefile b/lang/cim/Makefile
index 8d0cb6d024ea..0e3ff5811936 100644
--- a/lang/cim/Makefile
+++ b/lang/cim/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	cim
-# Version required:		3.33
 # Date created:			21 Sept 1996
 # Whom:				giffunip
 #
 # $FreeBSD$
 #
 
-DISTNAME=	cim-3.33
+PORTNAME=	cim
+PORTVERSION=	3.33
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.ifi.uio.no/pub/cim/
 
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index d3f6121ee2fe..557de004a0e1 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    clisp
-# Version required:     1999-07-22
 # Date created:         Feb  5 2000
 # Whom:                 Jeff Brown <jabrown@caida.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	clisp-1999-07-22
-PKGNAME=	clisp-1999.07.22
+PORTNAME=	clisp
+PORTVERSION=	1999.07.22
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp2.cons.org/pub/lisp/clisp/source/ \
 		ftp://ftp.cdrom.com/pub/lisp/clisp/source/
+DISTNAME=	clisp-1999-07-22
 
 MAINTAINER=	jabrown@caida.org
 
diff --git a/lang/cmucl/Makefile b/lang/cmucl/Makefile
index dfd8e5969573..248cb1e887b5 100644
--- a/lang/cmucl/Makefile
+++ b/lang/cmucl/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:    CMUCL
-# Version required:     18a, build 19970824
 # Date created:         Jul, 15, 1997
 # Whom:                 cracauer@cons.org "Martin Cracauer"
 #
@@ -7,13 +6,14 @@
 #
 #
 
-DISTNAME=	cmucl-18b.x86.freebsd22
-PKGNAME=	cmucl-18b
+PORTNAME=	cmucl
+PORTVERSION=	18b
 CATEGORIES=	lang
 MASTER_SITES=	http://www2.cons.org:8000/freebsd-distfiles/ \
 		ftp://ftp2.cons.org/pub/languages/lisp/cmucl/release/ \
 		http://www2.cons.org:8000/ftp-area/cmucl/release/ \
 		http://people.FreeBSD.org/~cracauer/freebsd-distfiles/
+DISTNAME=	cmucl-18b.x86.freebsd22
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER= 	cracauer@cons.org
diff --git a/lang/cu-prolog/Makefile b/lang/cu-prolog/Makefile
index 3b86d41a6d43..e8afab52f916 100644
--- a/lang/cu-prolog/Makefile
+++ b/lang/cu-prolog/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	cu-Prolog
-# Version required:	3.94
 # Date created:		7 July 1999
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.ORG>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	cupsrc
-PKGNAME=	cu-prolog-3.94
+PORTNAME=	cu-prolog
+PORTVERSION=	3.94
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.icot.or.jp/ifs/kbms-clp/unix/cuprolog/
 DISTFILES=	${DISTNAME}.tar.gz cupdoc.tar.gz
+DISTNAME=	cupsrc
 
 MAINTAINER=	issei@jp.FreeBSD.ORG
 
diff --git a/lang/dylan/Makefile b/lang/dylan/Makefile
index 917298bcfa68..caadcfde5aae 100644
--- a/lang/dylan/Makefile
+++ b/lang/dylan/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:    Dylan
-# Version required:     2.0
 # Date created:         23 Jan 1998
 # Whom:                 housel@acm.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gd-2.2.0
-PKGNAME=	dylan-2.2.0
+PORTNAME=	dylan
+PORTVERSION=	2.2.0
 CATEGORIES=	lang
 MASTER_SITES=	ftp://berlin.ccc.de/pub/gd/src/                        \
 		ftp://berlin.ccc.de/pub/gd/FreeBSD/                    \
@@ -25,7 +24,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} d2c-2.2.0-FreeBSD.gz
 MAINTAINER= 	housel@acm.org
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-WRKSRC=		$(WRKDIR)/gd/src
+WRKSRC=		${WRKDIR}/gd/src
 
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS= --srcdir=$(WRKSRC)
diff --git a/lang/egcs/Makefile b/lang/egcs/Makefile
index 7702d054c1a7..813e1915b447 100644
--- a/lang/egcs/Makefile
+++ b/lang/egcs/Makefile
@@ -1,13 +1,13 @@
 # ex:ts=8
 # Ports collection makefile for:	egcs
-# Version required: 0.0
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gcc-2.95.2
+PORTNAME=	gcc
+PORTVERSION=	2.95.2
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/releases/${DISTNAME}/  \
 		ftp://ftp.ninemoons.com/pub/mirrors/egcs/releases/${DISTNAME}/ \
diff --git a/lang/eiffel/Makefile b/lang/eiffel/Makefile
index 32fa550d5c65..f9e396e41084 100644
--- a/lang/eiffel/Makefile
+++ b/lang/eiffel/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    eiffel
-# Version required:     1.3
 # Date created:         Thu Sep 14 11:10:01 CDT 1995
 # Whom:                 erich@rrnet.com
 #
 # $FreeBSD$
 #
 
-DISTNAME=	eiffels13a
-PKGNAME=	eiffel-13a
+PORTNAME=	eiffel
+PORTVERSION=	13a
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.cm.cf.ac.uk/pub/Eiffel/SIG/Eiffel-S-1.3/BSD/
+DISTNAME=	eiffels13a
 EXTRACT_SUFX=	.freebsd.tar.gz
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/lang/elisp-manual/Makefile b/lang/elisp-manual/Makefile
index c767f0b1e820..9f073595a6d4 100644
--- a/lang/elisp-manual/Makefile
+++ b/lang/elisp-manual/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:		elisp-manual
-# Version required:	20-2.5
 # Date created:		18 November 1997
 # Whom:			Don Croyle <croyle@gelemna.ft-wayne.in.us>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	elisp-manual-20-2.5
+PORTNAME=	elisp-manual
+PORTVERSION=	20-2.5
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index b6872b3b3eee..a10b659cc0d8 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	elk
-# Version required:	3.0pl3
 # Date created:		08 March 1995
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	elk-3.0
-PKGNAME=	elk-3.0.3
+PORTNAME=	elk
+PORTVERSION=	3.0.3
 CATEGORIES=	lang
 MASTER_SITES=	http://www-rn.informatik.uni-bremen.de/software/elk/dist/
+DISTNAME=	elk-3.0
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/lang/emacs-lisp-intro/Makefile b/lang/emacs-lisp-intro/Makefile
index 90ab83528e2a..e0847d2fc94b 100644
--- a/lang/emacs-lisp-intro/Makefile
+++ b/lang/emacs-lisp-intro/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	emacs-lisp-intro
-# Version required:	1.05
 # Date created:		18 November 1997
 # Whom:			Don Croyle <croyle@gelemna.ft-wayne.in.us>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	emacs-lisp-intro-1.05
+PORTNAME=	emacs-lisp-intro
+PORTVERSION=	1.05
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
diff --git a/lang/eperl/Makefile b/lang/eperl/Makefile
index d0b8cccceb93..faf1ac7cfcce 100644
--- a/lang/eperl/Makefile
+++ b/lang/eperl/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	eperl
-# Version required:	2.2.14
 # Date created:		03-Sep-1997
 # Whom:			Ralf S. Engelschall <rse@engelschall.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	eperl-2.2.14
+PORTNAME=	eperl
+PORTVERSION=	2.2.14
 CATEGORIES=	lang www perl5
 MASTER_SITES=	http://www.engelschall.com/sw/eperl/distrib/ \
 		ftp://ftp.engelschall.com/sw/eperl/ \
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 2966ad9b4034..7c49b1c5316a 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	erlang
-# Version required:	R6B-0
 # Date created:		11 Dec 1998
 # Whom:			ruslan@shevchenko.kiev.ua
 #
 # $FreeBSD$
 #
 
-DISTNAME=	otp_src_R6B-0
-PKGNAME=	erlang-6.1.0
+PORTNAME=	erlang
+PORTVERSION=	6.1.0
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.erlang.org/pub/download/     \
 		http://www.erlang.org/download/        \
 		http://erlang.stacken.kth.se/download/ \
 		http://www.csd.uu.se/ftp/mirror/erlang/download/
-DISTFILES=	otp_src_R6B-0.tar.gz  ${ERLANG_MAN} ${ERLANG_DOCS}
+DISTNAME=	otp_src_R6B-0
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
 
 PATCH_SITES=	http://www.erlang.org/faq/ http://erlang.stacken.kth.se/faq/
 PATCHFILES=	tmp_patch_R6B0.2.txt tmp_patch_R6B0.3.txt \
diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile
index 2966ad9b4034..7c49b1c5316a 100644
--- a/lang/erlang14/Makefile
+++ b/lang/erlang14/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	erlang
-# Version required:	R6B-0
 # Date created:		11 Dec 1998
 # Whom:			ruslan@shevchenko.kiev.ua
 #
 # $FreeBSD$
 #
 
-DISTNAME=	otp_src_R6B-0
-PKGNAME=	erlang-6.1.0
+PORTNAME=	erlang
+PORTVERSION=	6.1.0
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.erlang.org/pub/download/     \
 		http://www.erlang.org/download/        \
 		http://erlang.stacken.kth.se/download/ \
 		http://www.csd.uu.se/ftp/mirror/erlang/download/
-DISTFILES=	otp_src_R6B-0.tar.gz  ${ERLANG_MAN} ${ERLANG_DOCS}
+DISTNAME=	otp_src_R6B-0
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${ERLANG_MAN} ${ERLANG_DOCS}
 
 PATCH_SITES=	http://www.erlang.org/faq/ http://erlang.stacken.kth.se/faq/
 PATCHFILES=	tmp_patch_R6B0.2.txt tmp_patch_R6B0.3.txt \
diff --git a/lang/expect/Makefile b/lang/expect/Makefile
index eb1e2dd5a1c1..116abf51d501 100644
--- a/lang/expect/Makefile
+++ b/lang/expect/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:	expect
 # Date created:		20 November 1994
 # Whom:			pst
-# Version required:	5.31
 #
 # $FreeBSD$
 
-DISTNAME=	expect
-PKGNAME=	expect-5.31
+PORTNAME=	expect
+PORTVERSION=	5.31
 CATEGORIES=	lang tcl82 tk82
 MASTER_SITES=	http://expect.nist.gov/
+DISTNAME=	expect
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index c693d758786e..d40478095ed2 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -1,15 +1,15 @@
 # Ports collection makefile for:	f2c-freebsd
-# Version required: 			2.0.1
 # Date created:				28 DEC 1998
 # Whom:					Steven G. Kargl
 #
 # $FreeBSD$
 #
 
-DISTNAME=	f2c-freebsd.2.0.1
-PKGNAME=	f2c-2.0.1
+PORTNAME=	f2c
+PORTVERSION=	2.0.1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://troutmask.apl.washington.edu/pub/
+DISTNAME=	f2c-freebsd.2.0.1
 
 MAINTAINER=	kargl@troutmask.apl.washington.edu
 
diff --git a/lang/f77/Makefile b/lang/f77/Makefile
index 5cd4cdcabbc3..1eae4e7de8bd 100644
--- a/lang/f77/Makefile
+++ b/lang/f77/Makefile
@@ -1,15 +1,15 @@
 # Ports collection makefile for:	f77-freebsd
-# Version required: 			0.3
 # Date created:				19 JAN 1999
 # Whom:					Steven G. Kargl
 #
 # $FreeBSD$
 #
 
-DISTNAME=	f77-freebsd.0.3
-PKGNAME=	f77-0.3
+PORTNAME=	f77
+PORTVERSION=	0.3
 CATEGORIES=	lang
 MASTER_SITES=	ftp://troutmask.apl.washington.edu/pub/
+DISTNAME=	f77-freebsd.0.3
 
 MAINTAINER=	kargl@troutmask.apl.washington.edu
 
diff --git a/lang/forth/Makefile b/lang/forth/Makefile
index cc9b6b3bca65..f183fe1997c4 100644
--- a/lang/forth/Makefile
+++ b/lang/forth/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    pfe
-# Version required:     0.9.14
 # Date created:         23 November 1994
 # Whom:                 mr
 #
 # $FreeBSD$
 #
 
-DISTNAME=	pfe-0.9.14
+PORTNAME=	pfe
+PORTVERSION=	0.9.14
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.taygeta.com/pub/Forth/Compilers/native/unix/
 
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index 973a6b7090a8..7d8b3696525c 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,11 +1,11 @@
 # New ports collection makefile for:	gawk
-# Version required:	3.0.4
 # Date created:		Mi  21 Okt 1998 13:53:18 CEST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
 # $FreeBSD$
 
-DISTNAME=	gawk-3.0.4
+PORTNAME=	gawk
+PORTVERSION=	3.0.4
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gawk
diff --git a/lang/gcc-devel/Makefile b/lang/gcc-devel/Makefile
index d6ee60dae3fc..34a87bd1dc5a 100644
--- a/lang/gcc-devel/Makefile
+++ b/lang/gcc-devel/Makefile
@@ -1,6 +1,5 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
-# Version required: 0.0
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -10,8 +9,8 @@
 SNAPDATE=	2000-03-13
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-2.96
-PKGNAME=	gcc-devel-${SNAPVER}
+PORTNAME=	gcc-devel
+PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://ftp.freesoftware.com/pub/egcs/snapshots/${SNAPDATE}/  \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index d6ee60dae3fc..34a87bd1dc5a 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -1,6 +1,5 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
-# Version required: 0.0
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -10,8 +9,8 @@
 SNAPDATE=	2000-03-13
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-2.96
-PKGNAME=	gcc-devel-${SNAPVER}
+PORTNAME=	gcc-devel
+PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://ftp.freesoftware.com/pub/egcs/snapshots/${SNAPDATE}/  \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index d6ee60dae3fc..34a87bd1dc5a 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,6 +1,5 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
-# Version required: 0.0
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -10,8 +9,8 @@
 SNAPDATE=	2000-03-13
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-2.96
-PKGNAME=	gcc-devel-${SNAPVER}
+PORTNAME=	gcc-devel
+PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://ftp.freesoftware.com/pub/egcs/snapshots/${SNAPDATE}/  \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
diff --git a/lang/gcc27/Makefile b/lang/gcc27/Makefile
index 7764db4133d8..d9b9d48bd072 100644
--- a/lang/gcc27/Makefile
+++ b/lang/gcc27/Makefile
@@ -1,13 +1,13 @@
 # ex:ts=8
 # Ports collection makefile for:	gcc
-# Version required:			2.8.1
 # Date created:				17 Jan 1998
 # Whom:					David O'Brien <obrien@NUXI.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gcc-2.7.2.3
+PORTNAME=	gcc
+PORTVERSION=	2.7.2.3
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}  \
 		ftp://ftp.gnu.org/gnu/libg++/  \
diff --git a/lang/gcc28/Makefile b/lang/gcc28/Makefile
index d098c764c97e..57b791beabef 100644
--- a/lang/gcc28/Makefile
+++ b/lang/gcc28/Makefile
@@ -1,13 +1,13 @@
 # ex:ts=8
 # Ports collection makefile for:	gcc
-# Version required: 0.0
 # Date created:				17 Jan 1998
 # Whom:					David O'Brien <obrien@NUXI.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gcc-2.8.1
+PORTNAME=	gcc
+PORTVERSION=	2.8.1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gcc
diff --git a/lang/gcc295/Makefile b/lang/gcc295/Makefile
index 7702d054c1a7..813e1915b447 100644
--- a/lang/gcc295/Makefile
+++ b/lang/gcc295/Makefile
@@ -1,13 +1,13 @@
 # ex:ts=8
 # Ports collection makefile for:	egcs
-# Version required: 0.0
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gcc-2.95.2
+PORTNAME=	gcc
+PORTVERSION=	2.95.2
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/releases/${DISTNAME}/  \
 		ftp://ftp.ninemoons.com/pub/mirrors/egcs/releases/${DISTNAME}/ \
diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile
index d6ee60dae3fc..34a87bd1dc5a 100644
--- a/lang/gcc30/Makefile
+++ b/lang/gcc30/Makefile
@@ -1,6 +1,5 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
-# Version required: 0.0
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -10,8 +9,8 @@
 SNAPDATE=	2000-03-13
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-2.96
-PKGNAME=	gcc-devel-${SNAPVER}
+PORTNAME=	gcc-devel
+PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://ftp.freesoftware.com/pub/egcs/snapshots/${SNAPDATE}/  \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index d6ee60dae3fc..34a87bd1dc5a 100644
--- a/lang/gcc31/Makefile
+++ b/lang/gcc31/Makefile
@@ -1,6 +1,5 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
-# Version required: 0.0
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -10,8 +9,8 @@
 SNAPDATE=	2000-03-13
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-2.96
-PKGNAME=	gcc-devel-${SNAPVER}
+PORTNAME=	gcc-devel
+PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://ftp.freesoftware.com/pub/egcs/snapshots/${SNAPDATE}/  \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index d6ee60dae3fc..34a87bd1dc5a 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -1,6 +1,5 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
-# Version required: 0.0
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -10,8 +9,8 @@
 SNAPDATE=	2000-03-13
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-2.96
-PKGNAME=	gcc-devel-${SNAPVER}
+PORTNAME=	gcc-devel
+PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://ftp.freesoftware.com/pub/egcs/snapshots/${SNAPDATE}/  \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index d6ee60dae3fc..34a87bd1dc5a 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -1,6 +1,5 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
-# Version required: 0.0
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -10,8 +9,8 @@
 SNAPDATE=	2000-03-13
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-2.96
-PKGNAME=	gcc-devel-${SNAPVER}
+PORTNAME=	gcc-devel
+PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://ftp.freesoftware.com/pub/egcs/snapshots/${SNAPDATE}/  \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index d6ee60dae3fc..34a87bd1dc5a 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -1,6 +1,5 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
-# Version required: 0.0
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -10,8 +9,8 @@
 SNAPDATE=	2000-03-13
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-2.96
-PKGNAME=	gcc-devel-${SNAPVER}
+PORTNAME=	gcc-devel
+PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://ftp.freesoftware.com/pub/egcs/snapshots/${SNAPDATE}/  \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index d6ee60dae3fc..34a87bd1dc5a 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -1,6 +1,5 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
-# Version required: 0.0
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -10,8 +9,8 @@
 SNAPDATE=	2000-03-13
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-2.96
-PKGNAME=	gcc-devel-${SNAPVER}
+PORTNAME=	gcc-devel
+PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://ftp.freesoftware.com/pub/egcs/snapshots/${SNAPDATE}/  \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index d6ee60dae3fc..34a87bd1dc5a 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -1,6 +1,5 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
-# Version required: 0.0
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -10,8 +9,8 @@
 SNAPDATE=	2000-03-13
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-2.96
-PKGNAME=	gcc-devel-${SNAPVER}
+PORTNAME=	gcc-devel
+PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://ftp.freesoftware.com/pub/egcs/snapshots/${SNAPDATE}/  \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index d6ee60dae3fc..34a87bd1dc5a 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -1,6 +1,5 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
-# Version required: 0.0
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -10,8 +9,8 @@
 SNAPDATE=	2000-03-13
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-2.96
-PKGNAME=	gcc-devel-${SNAPVER}
+PORTNAME=	gcc-devel
+PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://ftp.freesoftware.com/pub/egcs/snapshots/${SNAPDATE}/  \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index d6ee60dae3fc..34a87bd1dc5a 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -1,6 +1,5 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
-# Version required: 0.0
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -10,8 +9,8 @@
 SNAPDATE=	2000-03-13
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-2.96
-PKGNAME=	gcc-devel-${SNAPVER}
+PORTNAME=	gcc-devel
+PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://ftp.freesoftware.com/pub/egcs/snapshots/${SNAPDATE}/  \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index d6ee60dae3fc..34a87bd1dc5a 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -1,6 +1,5 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
-# Version required: 0.0
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -10,8 +9,8 @@
 SNAPDATE=	2000-03-13
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-2.96
-PKGNAME=	gcc-devel-${SNAPVER}
+PORTNAME=	gcc-devel
+PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://ftp.freesoftware.com/pub/egcs/snapshots/${SNAPDATE}/  \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index d6ee60dae3fc..34a87bd1dc5a 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -1,6 +1,5 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
-# Version required: 0.0
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -10,8 +9,8 @@
 SNAPDATE=	2000-03-13
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-2.96
-PKGNAME=	gcc-devel-${SNAPVER}
+PORTNAME=	gcc-devel
+PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://ftp.freesoftware.com/pub/egcs/snapshots/${SNAPDATE}/  \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index d6ee60dae3fc..34a87bd1dc5a 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -1,6 +1,5 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
-# Version required: 0.0
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -10,8 +9,8 @@
 SNAPDATE=	2000-03-13
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-2.96
-PKGNAME=	gcc-devel-${SNAPVER}
+PORTNAME=	gcc-devel
+PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://ftp.freesoftware.com/pub/egcs/snapshots/${SNAPDATE}/  \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index d6ee60dae3fc..34a87bd1dc5a 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -1,6 +1,5 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
-# Version required: 0.0
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -10,8 +9,8 @@
 SNAPDATE=	2000-03-13
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-2.96
-PKGNAME=	gcc-devel-${SNAPVER}
+PORTNAME=	gcc-devel
+PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://ftp.freesoftware.com/pub/egcs/snapshots/${SNAPDATE}/  \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index d6ee60dae3fc..34a87bd1dc5a 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -1,6 +1,5 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
-# Version required: 0.0
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -10,8 +9,8 @@
 SNAPDATE=	2000-03-13
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-2.96
-PKGNAME=	gcc-devel-${SNAPVER}
+PORTNAME=	gcc-devel
+PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://ftp.freesoftware.com/pub/egcs/snapshots/${SNAPDATE}/  \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index d6ee60dae3fc..34a87bd1dc5a 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -1,6 +1,5 @@
 # ex:ts=8 
 # Ports collection makefile for:	egcs 
-# Version required: 0.0
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
@@ -10,8 +9,8 @@
 SNAPDATE=	2000-03-13
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-2.96
-PKGNAME=	gcc-devel-${SNAPVER}
+PORTNAME=	gcc-devel
+PORTVERSION=	${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://ftp.freesoftware.com/pub/egcs/snapshots/${SNAPDATE}/  \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/  \
diff --git a/lang/gcl/Makefile b/lang/gcl/Makefile
index 58f405df01d9..c140f898805d 100644
--- a/lang/gcl/Makefile
+++ b/lang/gcl/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:    gcl
-# Version required:     2.3
 # Date created:         Feb  8 1995
 # Whom:                 hsu
 #
 # $FreeBSD$
 #
 
-DISTNAME=       gcl-2.3
+PORTNAME=	gcl
+PORTVERSION=	2.3
 CATEGORIES=	lang tk82
-MASTER_SITES=   ftp://ftp.ma.utexas.edu/pub/gcl/
+MASTER_SITES=	ftp://ftp.ma.utexas.edu/pub/gcl/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jseger@FreeBSD.org
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 7849a0b748cb..0aea65a4afe3 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,11 +1,11 @@
 # New ports collection makefile for:	ghc
-# Version required:			4.06
 # Date created:				28 August 1999
 # Whom:					Simon Marlow <simonmar@microsoft.com>
 #
 # $FreeBSD$
 
-DISTNAME=	ghc-4.06
+PORTNAME=	ghc
+PORTVERSION=	4.06
 CATEGORIES=	lang
 MASTER_SITES=	http://www.haskell.org/ghc/dist/4.06/
 DISTFILES=	ghc-4.06-src${EXTRACT_SUFX} ghc-4.06-x86-hc${EXTRACT_SUFX}
diff --git a/lang/ghc5/Makefile b/lang/ghc5/Makefile
index 7849a0b748cb..0aea65a4afe3 100644
--- a/lang/ghc5/Makefile
+++ b/lang/ghc5/Makefile
@@ -1,11 +1,11 @@
 # New ports collection makefile for:	ghc
-# Version required:			4.06
 # Date created:				28 August 1999
 # Whom:					Simon Marlow <simonmar@microsoft.com>
 #
 # $FreeBSD$
 
-DISTNAME=	ghc-4.06
+PORTNAME=	ghc
+PORTVERSION=	4.06
 CATEGORIES=	lang
 MASTER_SITES=	http://www.haskell.org/ghc/dist/4.06/
 DISTFILES=	ghc-4.06-src${EXTRACT_SUFX} ghc-4.06-x86-hc${EXTRACT_SUFX}
diff --git a/lang/ghc6/Makefile b/lang/ghc6/Makefile
index 7849a0b748cb..0aea65a4afe3 100644
--- a/lang/ghc6/Makefile
+++ b/lang/ghc6/Makefile
@@ -1,11 +1,11 @@
 # New ports collection makefile for:	ghc
-# Version required:			4.06
 # Date created:				28 August 1999
 # Whom:					Simon Marlow <simonmar@microsoft.com>
 #
 # $FreeBSD$
 
-DISTNAME=	ghc-4.06
+PORTNAME=	ghc
+PORTVERSION=	4.06
 CATEGORIES=	lang
 MASTER_SITES=	http://www.haskell.org/ghc/dist/4.06/
 DISTFILES=	ghc-4.06-src${EXTRACT_SUFX} ghc-4.06-x86-hc${EXTRACT_SUFX}
diff --git a/lang/glibstdc++28/Makefile b/lang/glibstdc++28/Makefile
index a75002195f93..98f74000fe02 100644
--- a/lang/glibstdc++28/Makefile
+++ b/lang/glibstdc++28/Makefile
@@ -1,17 +1,17 @@
 # ex:ts=8
 # Ports collection makefile for:	GNU libstdc++
-# Version required: 0.0
 # Date created:				03 Mar 1998
 # Whom:					David O'Brien <obrien@NUXI.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	libstdc++-2.8.1.1
-PKGNAME=	glibstdc++-2.8.1.1
+PORTNAME=	glibstdc++
+PORTVERSION=	2.8.1.1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libstdc++
+DISTNAME=	libstdc++-2.8.1.1
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/lang/gnat/Makefile b/lang/gnat/Makefile
index fc6759e67148..c5c308eb34b9 100644
--- a/lang/gnat/Makefile
+++ b/lang/gnat/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	GNU Ada gnat
-# Version required:     3.09
 # Date created:         Sat Mar 18 02:16:45 1995
 # Whom:			hsu
 # Porter (original):	nils@guru.ims.uni-stuttgart.de
@@ -14,12 +13,13 @@
 #   conflict with other gcc based products. Standard names can be provided
 #   using symbolic links.
 
-DISTNAME=       gcc-2.8.1
-PKGNAME=        gnat-3.12p
+PORTNAME=	gnat
+PORTVERSION=	3.12p
 CATEGORIES=	lang
-MASTER_SITES=   ftp://cs.nyu.edu/pub/gnat/ \
+MASTER_SITES=	ftp://cs.nyu.edu/pub/gnat/ \
 		${MASTER_SITE_GNU}
-DISTFILES=      gnat-3.12p-src.tar.gz gcc-2.8.1.tar.gz
+DISTNAME=	gcc-2.8.1
+DISTFILES=	gnat-3.12p-src.tar.gz gcc-2.8.1.tar.gz
 
 MAINTAINER=	eischen@vigrid.com
 
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index b90dbebc73ec..16ffd60be7b3 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	guile
-# Version required:	1.3.4
 # Date created:		2 November 1997
 # Whom:			jseger@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	guile-1.3.4
+PORTNAME=	guile
+PORTVERSION=	1.3.4
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		ftp://ftp.guile.org/pub/
diff --git a/lang/guileobjc/Makefile b/lang/guileobjc/Makefile
index 5b622cb08a9f..8bd8c490ee5a 100644
--- a/lang/guileobjc/Makefile
+++ b/lang/guileobjc/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   guileobjc
-# Version required:    0.3.8
 # Date created:        21 April 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	guileobjc-0.3.8
+PORTNAME=	guileobjc
+PORTVERSION=	0.3.8
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.aist-nara.ac.jp/pub/personal/masata-y/gyve/fullkit/gyve-0.1.2.4/
 
diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile
index 818ce497455b..67a17420c6e1 100644
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	hugs
-# Version required:	Hugs98 (September 1999)
 # Date created:		22 September 1997
 # Whom:			Torsten Teg Grust (Torsten.Grust@uni-konstanz.de)
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Hugs98-Sep1999
-PKGNAME=	hugs-98
+PORTNAME=	hugs
+PORTVERSION=	98
 CATEGORIES=	lang
 MASTER_SITES=	ftp://www.cse.ogi.edu/pub/pacsoft/hugs/
+DISTNAME=	Hugs98-Sep1999
 
 MAINTAINER=	Torsten.Grust@uni-konstanz.de
 
diff --git a/lang/ici/Makefile b/lang/ici/Makefile
index 4643be83b183..87cbba7acf98 100644
--- a/lang/ici/Makefile
+++ b/lang/ici/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   ici
-# Version required:    2.1.4
 # Date created:        18 December 1997
 # Whom:                andy
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ici-2.1.4
+PORTNAME=	ici
+PORTVERSION=	2.1.4
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.research.canon.com.au/pub/misc/ici/ \
 		ftp://ftp.ntua.gr/pub/lang/ici/ \
diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index 8f49000ea6ed..c972ac1f53c6 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    icon
-# Version required:     9.3.2
 # Date created:         05 April 1995
 # Whom:                 Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=       unix
-PKGNAME=	icon-9.3.2
+PORTNAME=	icon
+PORTVERSION=	9.3.2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.cs.arizona.edu/icon/packages/unix/
+DISTNAME=       unix
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/lang/intel2gas/Makefile b/lang/intel2gas/Makefile
index 60e5ee104824..c75556cb1b5a 100644
--- a/lang/intel2gas/Makefile
+++ b/lang/intel2gas/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	intel2gas
-# Version required:     1.2
 # Date created:		12 May 1999
 # Whom:			G. Adam Stanislav
 #
 # $FreeBSD$
 #
 
-DISTNAME=	intel2gas-1.2
+PORTNAME=	intel2gas
+PORTVERSION=	1.2
 CATEGORIES=	lang
 MASTER_SITES=	http://hermes.terminal.at/intel2gas/
 
diff --git a/lang/intercal/Makefile b/lang/intercal/Makefile
index c4eff378ff29..5ea88b460565 100644
--- a/lang/intercal/Makefile
+++ b/lang/intercal/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	intercal
-# Version required:    0.19
 # Date created:        20 March 1998
 # Whom:                Matthew Hunt <mph@freebsd.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	intercal-0.19
+PORTNAME=	intercal
+PORTVERSION=	0.19
 CATEGORIES=	lang
 MASTER_SITES=	http://www.tuxedo.org/~esr/intercal/
 
diff --git a/lang/itcl/Makefile b/lang/itcl/Makefile
index f97d3be040ad..054468465927 100644
--- a/lang/itcl/Makefile
+++ b/lang/itcl/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	itcl
-# Version required:	3.0.1
 # Date created:		Aug 17 1996
 # Whom:			chuckr
 #
 # $FreeBSD$
 #
 
-DISTNAME=	itcl3.0.1
-PKGNAME=	itcl-3.0.1
+PORTNAME=	itcl
+PORTVERSION=	3.0.1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.tcltk.com/pub/itcl/
+DISTNAME=	itcl3.0.1
 
 MAINTAINER=	dmlb@ragnet.demon.co.uk
 
diff --git a/lang/lcc/Makefile b/lang/lcc/Makefile
index 162dc8068851..b64304b8d766 100644
--- a/lang/lcc/Makefile
+++ b/lang/lcc/Makefile
@@ -1,13 +1,13 @@
 # ex:ts=8
 # Ports collection makefile for:  lcc
-# Version required: 0.0
 # Date created:			  Sat Dec 7, 1996
 # Whom:				  David O'Brien (obrien@cs.ucdavis.edu)
 #
 # $FreeBSD$
 #
 
-DISTNAME=	lcc-3.6
+PORTNAME=	lcc
+PORTVERSION=	3.6
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.cs.princeton.edu/pub/packages/lcc/
 
diff --git a/lang/libobjects/Makefile b/lang/libobjects/Makefile
index bfc77b8cd05d..9cc001a4e6b7 100644
--- a/lang/libobjects/Makefile
+++ b/lang/libobjects/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   libobjects
-# Version required:    0.1.19
 # Date created:        21 April 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	libobjects-0.1.19
+PORTNAME=	libobjects
+PORTVERSION=	0.1.19
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libobjects
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index cfc331e50845..46357db9493a 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   librep
-# Version required:    0.11.1
 # Date created:        13 September 1999
 # Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	librep-0.11.1
+PORTNAME=	librep
+PORTVERSION=	0.11.1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://librep.sourceforge.net/pub/librep/
 
diff --git a/lang/librep2/Makefile b/lang/librep2/Makefile
index cfc331e50845..46357db9493a 100644
--- a/lang/librep2/Makefile
+++ b/lang/librep2/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   librep
-# Version required:    0.11.1
 # Date created:        13 September 1999
 # Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	librep-0.11.1
+PORTNAME=	librep
+PORTVERSION=	0.11.1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://librep.sourceforge.net/pub/librep/
 
diff --git a/lang/logo/Makefile b/lang/logo/Makefile
index 0c4ede5021ca..ab8e31cd254d 100644
--- a/lang/logo/Makefile
+++ b/lang/logo/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	logo
-# Version required:	4.6
 # Date created:		22 October 1994
 # Whom:			jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ucblogo-4.6
+PORTNAME=	ucblogo
+PORTVERSION=	4.6
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		ftp://anarres.cs.berkeley.edu/pub/ucblogo/
diff --git a/lang/lua/Makefile b/lang/lua/Makefile
index af10ef8b728c..33420da5a727 100644
--- a/lang/lua/Makefile
+++ b/lang/lua/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for: 	lua
-# Version required: 			3.2.2
 # Date created:				27 June 1999
 # Whom:					Richard Kiss <richard@homemail.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	lua-3.2
-PKGNAME=	lua-3.2.2
+PORTNAME=	lua
+PORTVERSION=	3.2.2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
 		ftp://csg.uwaterloo.ca/pub/lhf/lua/ \
@@ -15,6 +14,7 @@ MASTER_SITES=	ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
 		ftp://ftp.ntua.gr/pub/lang/lua/ \
 		ftp://ftp.uni-trier.de/pub/languages/lua/ \
 		ftp://ftp.gwdg.de/pub/languages/lua/
+DISTNAME=	lua-3.2
 
 MAINTAINER=	richard@homemail.com
 
diff --git a/lang/lua4/Makefile b/lang/lua4/Makefile
index af10ef8b728c..33420da5a727 100644
--- a/lang/lua4/Makefile
+++ b/lang/lua4/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for: 	lua
-# Version required: 			3.2.2
 # Date created:				27 June 1999
 # Whom:					Richard Kiss <richard@homemail.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	lua-3.2
-PKGNAME=	lua-3.2.2
+PORTNAME=	lua
+PORTVERSION=	3.2.2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
 		ftp://csg.uwaterloo.ca/pub/lhf/lua/ \
@@ -15,6 +14,7 @@ MASTER_SITES=	ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
 		ftp://ftp.ntua.gr/pub/lang/lua/ \
 		ftp://ftp.uni-trier.de/pub/languages/lua/ \
 		ftp://ftp.gwdg.de/pub/languages/lua/
+DISTNAME=	lua-3.2
 
 MAINTAINER=	richard@homemail.com
 
diff --git a/lang/lua50/Makefile b/lang/lua50/Makefile
index af10ef8b728c..33420da5a727 100644
--- a/lang/lua50/Makefile
+++ b/lang/lua50/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for: 	lua
-# Version required: 			3.2.2
 # Date created:				27 June 1999
 # Whom:					Richard Kiss <richard@homemail.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	lua-3.2
-PKGNAME=	lua-3.2.2
+PORTNAME=	lua
+PORTVERSION=	3.2.2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
 		ftp://csg.uwaterloo.ca/pub/lhf/lua/ \
@@ -15,6 +14,7 @@ MASTER_SITES=	ftp://ftp.tecgraf.puc-rio.br/pub/lua/ \
 		ftp://ftp.ntua.gr/pub/lang/lua/ \
 		ftp://ftp.uni-trier.de/pub/languages/lua/ \
 		ftp://ftp.gwdg.de/pub/languages/lua/
+DISTNAME=	lua-3.2
 
 MAINTAINER=	richard@homemail.com
 
diff --git a/lang/m3gdb/Makefile b/lang/m3gdb/Makefile
index 6a96c2de2d18..21d639c052c4 100644
--- a/lang/m3gdb/Makefile
+++ b/lang/m3gdb/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   m3gdb
-# Version required:    4.17
 # Date created:        17 February 1999
 # Whom:                wagner@luthien.in-berlin.de
 #
 # $FreeBSD$
 #
 
-DISTNAME=	m3gdb-4.17
+PORTNAME=	m3gdb
+PORTVERSION=	4.17
 CATEGORIES=	lang devel
 MASTER_SITES=	http://people.FreeBSD.org/~jdp/distfiles/
 DISTFILES=	m3gdb-4.17.tar.gz \
diff --git a/lang/mawk/Makefile b/lang/mawk/Makefile
index dadad8934c0a..31efd38bf7a4 100644
--- a/lang/mawk/Makefile
+++ b/lang/mawk/Makefile
@@ -1,16 +1,16 @@
 # ex:ts=8
 # Ports collection makefile for:  mawk
-# Version required: 0.0
 # Date created:			  24 Dec 1998
 # Whom:				  Pedro F. Giffuni <giffunip@asme.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mawk1.3.3
-PKGNAME=	mawk-1.3.3
+PORTNAME=	mawk
+PORTVERSION=	1.3.3
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.whidbey.net/pub/brennan/
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/lang/mit-scheme/Makefile b/lang/mit-scheme/Makefile
index 15dbc23eb93f..95565e67a7fa 100644
--- a/lang/mit-scheme/Makefile
+++ b/lang/mit-scheme/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	MIT-Scheme
-# Version required:	7.5.5
 # Date created:		Mar 26 1995
 # Whom:			jmacd@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	scheme-7.5.5-ix86-freebsd
-PKGNAME=	mit-scheme-7.5.5
+PORTNAME=	mit-scheme
+PORTVERSION=	7.5.5
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.swiss.ai.mit.edu/pub/scheme-7.5/
+DISTNAME=	scheme-7.5.5-ix86-freebsd
 
 MAINTAINER= 	jmacd@FreeBSD.org
 
diff --git a/lang/mixal/Makefile b/lang/mixal/Makefile
index e13ed19e1678..36adc1e7f80f 100644
--- a/lang/mixal/Makefile
+++ b/lang/mixal/Makefile
@@ -1,13 +1,13 @@
 # ex:ts=8
 # Ports collection makefile for:  mixal
-# Version required: 0.0
 # Date created:			  21-Dec-1996
 # Whom:                 	  David O'Brien <obrien@cs.ucdavis.edu>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mixal-1.06
+PORTNAME=	mixal
+PORTVERSION=	1.06
 CATEGORIES=	lang
 MASTER_SITES=	http://www.ccil.org/retro/  \
 		ftp://locke.ccil.org/pub/retro/
diff --git a/lang/modula-3-lib/Makefile b/lang/modula-3-lib/Makefile
index f9ac28210ca2..e6854379fdcb 100644
--- a/lang/modula-3-lib/Makefile
+++ b/lang/modula-3-lib/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	modula-3-lib
-# Version required:	3.6
 # Date created:		28 Oct 1996
 # Whom:			John Polstra <jdp@polstra.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	modula-3-lib-3.6
+PORTNAME=	modula-3-lib
+PORTVERSION=	3.6
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 DISTFILES=	m3-fbsd-src-3.6.tar.gz \
diff --git a/lang/modula-3-socks/Makefile b/lang/modula-3-socks/Makefile
index b2a434233cba..4cbe35b76e84 100644
--- a/lang/modula-3-socks/Makefile
+++ b/lang/modula-3-socks/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	modula-3-socks
-# Version required:	A.B9.06
 # Date created:		31 Oct 1996
 # Whom:			John Polstra <jdp@polstra.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	socks
-PKGNAME=	modula-3-socks-1.0
+PORTNAME=	modula-3-socks
+PORTVERSION=	1.0
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.cup.hp.com/dist/socks/A.B9.06/
+DISTNAME=	socks
 
 MAINTAINER=	jdp@polstra.com
 
diff --git a/lang/modula-3/Makefile b/lang/modula-3/Makefile
index 6d8d71aa22ae..3cf1ef0249ad 100644
--- a/lang/modula-3/Makefile
+++ b/lang/modula-3/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	modula-3
-# Version required:	3.6
 # Date created:		18 Mar 1996
 # Whom:			John Polstra <jdp@polstra.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	modula-3-3.6
+PORTNAME=	modula-3
+PORTVERSION=	3.6
 CATEGORIES=	lang
 DISTFILES=
 
diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile
index 1b509df09239..8e9708680afe 100644
--- a/lang/moscow_ml/Makefile
+++ b/lang/moscow_ml/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:    moscow-ml
-# Version required:     1.43
 # Date created:         2 August 1998
 # Whom:                 chuckr
 #
 # $FreeBSD$
 #
 
-DISTNAME=       mos14src
-PKGNAME=        moscow_ml-1.4
+PORTNAME=	moscow_ml
+PORTVERSION=	1.4
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.dina.kvl.dk/pub/mosml/ \
 		ftp://ftp.csd.uu.se/pub/mirror/mosml/ \
 		ftp://ftp.dcs.ed.ac.uk/pub/ml/Moscow/
+DISTNAME=	mos14src
 
 MAINTAINER=	chuckr@freefall.FreeBSD.org
 
diff --git a/lang/nawk/Makefile b/lang/nawk/Makefile
index 36aabb34c688..cd1816c1813e 100644
--- a/lang/nawk/Makefile
+++ b/lang/nawk/Makefile
@@ -1,16 +1,16 @@
 # ex:ts=8
 # Ports collection makefile for:  nawk
-# Version required: 0.0
 # Date created:			  29 April 1998
 # Whom:				  Josh Gilliam <josh@quick.net>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	awk
-PKGNAME=	nawk-99.06.20
+PORTNAME=	nawk
+PORTVERSION=	99.06.20
 CATEGORIES=	lang
 MASTER_SITES=	http://cm.bell-labs.com/who/bwk/
+DISTNAME=	awk
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/lang/nqc/Makefile b/lang/nqc/Makefile
index 467000992f26..6a1e8d44af7b 100644
--- a/lang/nqc/Makefile
+++ b/lang/nqc/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	nqc
-# Version required:    2.0.2
 # Date created:        11 Aug 1999
 # Whom:                kbyanc
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nqc_src_2_0_2
-PKGNAME=	nqc-2.0.2
+PORTNAME=	nqc
+PORTVERSION=	2.0.2
 CATEGORIES=	lang
 MASTER_SITES=	http://www.enteract.com/~dbaum/nqc/release/
+DISTNAME=	nqc_src_2_0_2
 
 MAINTAINER=	kbyanc@posi.net
 
diff --git a/lang/o2c/Makefile b/lang/o2c/Makefile
index f49b8c7272a3..0924f1dc38f4 100644
--- a/lang/o2c/Makefile
+++ b/lang/o2c/Makefile
@@ -1,11 +1,11 @@
 # New ports collection makefile for:	Oberon2C
-# Version required:	1.16
 # Date created:		December 3, 1997
 # Whom:			Oliver Breuninger <ob@seicom.NET>
 #
 # $FreeBSD$
 
-DISTNAME=	o2c-1.16
+PORTNAME=	o2c
+PORTVERSION=	1.16
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.uni-kl.de/pub/informatik/software/ \
 		ftp://ftp.archive.de.uu.net/pub/programming/languages/oberon/www.uni-kl.de/OOC/files/misc/
diff --git a/lang/objc/Makefile b/lang/objc/Makefile
index fa0375ac1b25..82e3f7ba588d 100644
--- a/lang/objc/Makefile
+++ b/lang/objc/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:    objc compiler
-# Version required:     1.8.18
 # Date created:         16 May 1998
 # Whom:                 chuckr@freebsd.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=       objc-3.1.5
-CATEGORIES=     lang
-MASTER_SITES=   http://metalab.unc.edu/pub/Linux/devel/lang/objc/ \
+PORTNAME=	objc
+PORTVERSION=	3.1.5
+CATEGORIES=	lang
+MASTER_SITES=	http://metalab.unc.edu/pub/Linux/devel/lang/objc/ \
 		http://people.FreeBSD.org/~chuckr/
 DISTFILES=	objc-3.1.5-bootstrap.tar.gz objc-3.1.5.tar.gz
 
-MAINTAINER=     chuckr@freebsd.org
+MAINTAINER=	chuckr@freebsd.org
 
 BUILD_DEPENDS=	$(PREFIX)/lib/libgc.a:$(PORTSDIR)/devel/boehm-gc
 
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index d0a1cd3155e4..62ac63d6be55 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	Objective Caml
-# Version required:	2.04
 # Date created:		24 December 1996
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ocaml-2.04
+PORTNAME=	ocaml
+PORTVERSION=	2.04
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.inria.fr/lang/caml-light/ \
 		ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/caml-light/
-DISTFILES=	${DISTNAME}.tar.gz ${DOCFILES}
+DISTFILES=	${PORTNAME}${PORTVERSION}.tar.gz ${DOCFILES}
 
 MAINTAINER=	ortmann@isl.net
 
diff --git a/lang/otcl/Makefile b/lang/otcl/Makefile
index eb2f4959fb30..c82aedd43a5c 100644
--- a/lang/otcl/Makefile
+++ b/lang/otcl/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for: otcl
-# Version required:	1.0a5
 # Date created:		23 April 1999
 # Whom:			obonilla
 #
 # $FreeBSD$
 #
 
-DISTNAME=	otcl-1.0a5
+PORTNAME=	otcl
+PORTVERSION=	1.0a5
 CATEGORIES=	lang
 MASTER_SITES=	http://www-mash.cs.berkeley.edu/dist/
 
diff --git a/lang/p2c/Makefile b/lang/p2c/Makefile
index 907ce268fed6..7f88d86820cc 100644
--- a/lang/p2c/Makefile
+++ b/lang/p2c/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:    p2c
-# Version required:     1.21alpha-07.Dec.93
 # Date created:         4 October 1994
 # Whom:                 jmz
 #
 # $FreeBSD$
 #
 
-DISTNAME=	p2c-1.21alpha-07.Dec.93
-PKGNAME=	p2c-1.21a
+PORTNAME=	p2c
+PORTVERSION=	1.21a
 CATEGORIES=	lang
 MASTER_SITES=   ftp://ftp.pal.xgw.fi/pub/gnu/alpha/gnu/ \
 		ftp://ftp.clara.net/pub/mirrors/gnu/hurd/ \
@@ -16,6 +15,7 @@ DISTFILES=	p2c-1.21alpha2.tar.gz
 
 MAINTAINER=	jmz@FreeBSD.org
 
+WRKSRC=		${WRKDIR}/p2c-1.21alpha-07.Dec.93
 MAN1=		p2c.1 p2cc.1
 
 pre-install: build
diff --git a/lang/p5-Expect/Makefile b/lang/p5-Expect/Makefile
index 9e457c341d93..88e6e011aa17 100644
--- a/lang/p5-Expect/Makefile
+++ b/lang/p5-Expect/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	p5-Expect
-# Version required:	1.07
 # Date created:		14 Jan 2000
 # Whom:			Will Andrews <andrews@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Expect.pm-1.07
-PKGNAME=	p5-Expect-1.07
+PORTNAME=	p5-Expect
+PORTVERSION=	1.07
 CATEGORIES=	lang perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Expect
+DISTNAME=	Expect.pm-1.07
 
 MAINTAINER=	will@FreeBSD.org
 
diff --git a/lang/p5-ExtUtils-F77/Makefile b/lang/p5-ExtUtils-F77/Makefile
index 395035d78c73..5dc3f9db1d6d 100644
--- a/lang/p5-ExtUtils-F77/Makefile
+++ b/lang/p5-ExtUtils-F77/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	p5-ExtUtils-F77
-# Version required:			1.12
 # Date created:				December 7 1999
 # Whom:	      				jmz
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ExtUtils-F77-1.12
-PKGNAME=	p5-ExtUtils-F77-1.12
+PORTNAME=	p5-ExtUtils-F77
+PORTVERSION=	1.12
 CATEGORIES=	lang perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	ExtUtils
+DISTNAME=	ExtUtils-F77-1.12
 
 MAINTAINER=	jmz@FreeBSD.org
 
diff --git a/lang/p5-F77/Makefile b/lang/p5-F77/Makefile
index 395035d78c73..5dc3f9db1d6d 100644
--- a/lang/p5-F77/Makefile
+++ b/lang/p5-F77/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	p5-ExtUtils-F77
-# Version required:			1.12
 # Date created:				December 7 1999
 # Whom:	      				jmz
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ExtUtils-F77-1.12
-PKGNAME=	p5-ExtUtils-F77-1.12
+PORTNAME=	p5-ExtUtils-F77
+PORTVERSION=	1.12
 CATEGORIES=	lang perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	ExtUtils
+DISTNAME=	ExtUtils-F77-1.12
 
 MAINTAINER=	jmz@FreeBSD.org
 
diff --git a/lang/p5-Tcl/Makefile b/lang/p5-Tcl/Makefile
index 7eed48144a64..c24c5b47c917 100644
--- a/lang/p5-Tcl/Makefile
+++ b/lang/p5-Tcl/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	p5-Tcl
-# Version required:			b2
 # Date created:				June 15th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Tcl-b2
-PKGNAME=	p5-Tcl-b2
+PORTNAME=	p5-Tcl
+PORTVERSION=	b2
 CATEGORIES=	lang perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Tcl
+DISTNAME=	Tcl-b2
 
 MAINTAINER=	jfitz@FreeBSD.org
 
diff --git a/lang/p5-ePerl/Makefile b/lang/p5-ePerl/Makefile
index 99e2eebfa04e..e9274b1f0371 100644
--- a/lang/p5-ePerl/Makefile
+++ b/lang/p5-ePerl/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	p5-ePerl
-# Version required:	2.2.14
 # Date created:		03-Sep-1997
 # Whom:	      		Ralf S. Engelschall <rse@engelschall.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	eperl-2.2.14
-PKGNAME=	p5-ePerl-2.2.14
+PORTNAME=	p5-ePerl
+PORTVERSION=	2.2.14
 CATEGORIES=	lang www perl5
 MASTER_SITES=	http://www.engelschall.com/sw/eperl/distrib/ \
 		ftp://ftp.engelschall.com/sw/eperl/ \
 		ftp://ftp.hyperreal.org/software/engelschall/eperl/ \
 		${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=Parse
+DISTNAME=	eperl-2.2.14
 
 MAINTAINER=	rse@engelschall.com
 
diff --git a/lang/pbasic/Makefile b/lang/pbasic/Makefile
index f9e2a8a15326..ca696ba99beb 100644
--- a/lang/pbasic/Makefile
+++ b/lang/pbasic/Makefile
@@ -1,15 +1,15 @@
 # ports collection makefile for:	pbasic
-# Version required:	2.0-950813
 # Date created:		13th August 1995
 # Whom:			Julian Stacey <jhs@freebsd.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	pbasic-2.0-950813
-PKGNAME=	pbasic-2.0
+PORTNAME=	pbasic
+PORTVERSION=	2.0
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-950813
 
 MAINTAINER=	asami@FreeBSD.org
 # Ask jhs@freebsd.org if you want newer sources or author's latest e-mail
diff --git a/lang/perl5.10/Makefile b/lang/perl5.10/Makefile
index e77b56bff8c0..2fd15cd1f221 100644
--- a/lang/perl5.10/Makefile
+++ b/lang/perl5.10/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	perl5
-# Version required:	5.005_02
 # Date created:		16 April 1995
 # Whom:			markm
 #
 # $FreeBSD$
 #
 
-DISTNAME=	perl5.005_02
-PKGNAME=	perl-5.00502
+PORTNAME=	perl
+PORTVESION=	5.00502
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/ \
 		ftp://ftp.cdrom.com/pub/perl/CPAN/src/5.0/
+DISTNAME=	perl5.005_02
 
 MAINTAINER=	markm@FreeBSD.org
 
diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile
index e77b56bff8c0..2fd15cd1f221 100644
--- a/lang/perl5.12/Makefile
+++ b/lang/perl5.12/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	perl5
-# Version required:	5.005_02
 # Date created:		16 April 1995
 # Whom:			markm
 #
 # $FreeBSD$
 #
 
-DISTNAME=	perl5.005_02
-PKGNAME=	perl-5.00502
+PORTNAME=	perl
+PORTVESION=	5.00502
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/ \
 		ftp://ftp.cdrom.com/pub/perl/CPAN/src/5.0/
+DISTNAME=	perl5.005_02
 
 MAINTAINER=	markm@FreeBSD.org
 
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index e77b56bff8c0..2fd15cd1f221 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	perl5
-# Version required:	5.005_02
 # Date created:		16 April 1995
 # Whom:			markm
 #
 # $FreeBSD$
 #
 
-DISTNAME=	perl5.005_02
-PKGNAME=	perl-5.00502
+PORTNAME=	perl
+PORTVESION=	5.00502
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/ \
 		ftp://ftp.cdrom.com/pub/perl/CPAN/src/5.0/
+DISTNAME=	perl5.005_02
 
 MAINTAINER=	markm@FreeBSD.org
 
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index e77b56bff8c0..2fd15cd1f221 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	perl5
-# Version required:	5.005_02
 # Date created:		16 April 1995
 # Whom:			markm
 #
 # $FreeBSD$
 #
 
-DISTNAME=	perl5.005_02
-PKGNAME=	perl-5.00502
+PORTNAME=	perl
+PORTVESION=	5.00502
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/ \
 		ftp://ftp.cdrom.com/pub/perl/CPAN/src/5.0/
+DISTNAME=	perl5.005_02
 
 MAINTAINER=	markm@FreeBSD.org
 
diff --git a/lang/perl5.6/Makefile b/lang/perl5.6/Makefile
index e77b56bff8c0..2fd15cd1f221 100644
--- a/lang/perl5.6/Makefile
+++ b/lang/perl5.6/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	perl5
-# Version required:	5.005_02
 # Date created:		16 April 1995
 # Whom:			markm
 #
 # $FreeBSD$
 #
 
-DISTNAME=	perl5.005_02
-PKGNAME=	perl-5.00502
+PORTNAME=	perl
+PORTVESION=	5.00502
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/ \
 		ftp://ftp.cdrom.com/pub/perl/CPAN/src/5.0/
+DISTNAME=	perl5.005_02
 
 MAINTAINER=	markm@FreeBSD.org
 
diff --git a/lang/perl5.8/Makefile b/lang/perl5.8/Makefile
index e77b56bff8c0..2fd15cd1f221 100644
--- a/lang/perl5.8/Makefile
+++ b/lang/perl5.8/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	perl5
-# Version required:	5.005_02
 # Date created:		16 April 1995
 # Whom:			markm
 #
 # $FreeBSD$
 #
 
-DISTNAME=	perl5.005_02
-PKGNAME=	perl-5.00502
+PORTNAME=	perl
+PORTVESION=	5.00502
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/ \
 		ftp://ftp.cdrom.com/pub/perl/CPAN/src/5.0/
+DISTNAME=	perl5.005_02
 
 MAINTAINER=	markm@FreeBSD.org
 
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index e77b56bff8c0..2fd15cd1f221 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	perl5
-# Version required:	5.005_02
 # Date created:		16 April 1995
 # Whom:			markm
 #
 # $FreeBSD$
 #
 
-DISTNAME=	perl5.005_02
-PKGNAME=	perl-5.00502
+PORTNAME=	perl
+PORTVESION=	5.00502
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/ \
 		ftp://ftp.cdrom.com/pub/perl/CPAN/src/5.0/
+DISTNAME=	perl5.005_02
 
 MAINTAINER=	markm@FreeBSD.org
 
diff --git a/lang/pgcc/Makefile b/lang/pgcc/Makefile
index ae7d4ede74e3..9e8dbe6de85a 100644
--- a/lang/pgcc/Makefile
+++ b/lang/pgcc/Makefile
@@ -1,14 +1,13 @@
 # ex:ts=8
 # Ports collection makefile for:  pgcc
-# Version required: 0.0
 # Date created:			  10 Dec 1998
 # Whom:				  David O'Brien <obrien@NUXI.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gcc-2.95.1
-PKGNAME=	pgcc-2.95.1
+PORTNAME=	pgcc
+PORTVERSION=	2.95.1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/releases/${DISTNAME}/ \
 		ftp://egcs.cygnus.com/pub/egcs/releases/${DISTNAME}/ \
@@ -50,6 +49,7 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
+WRKSRC=		${WRKDIR}/gcc-2.95.1
 PLIST_SUB=	EGCS_REV=${GCC_REV} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/lang/pike/Makefile b/lang/pike/Makefile
index ebc4f3c4ba3a..bfd0a3b2b343 100644
--- a/lang/pike/Makefile
+++ b/lang/pike/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	pike
-# Version required:	0.6
 # Date created:		16 Jan 1999
 # Whom:			vns@delta.odessa.ua
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Pike-v0.6.110
-PKGNAME=	pike-0.6
+PORTNAME=	pike
+PORTVERSION=	0.6
 CATEGORIES=	lang
 MASTER_SITES=	http://pike.idonex.se/download/
+DISTNAME=	Pike-v0.6.110
 
 MAINTAINER=	vns@delta.odessa.ua
 
diff --git a/lang/pike70/Makefile b/lang/pike70/Makefile
index ebc4f3c4ba3a..bfd0a3b2b343 100644
--- a/lang/pike70/Makefile
+++ b/lang/pike70/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	pike
-# Version required:	0.6
 # Date created:		16 Jan 1999
 # Whom:			vns@delta.odessa.ua
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Pike-v0.6.110
-PKGNAME=	pike-0.6
+PORTNAME=	pike
+PORTVERSION=	0.6
 CATEGORIES=	lang
 MASTER_SITES=	http://pike.idonex.se/download/
+DISTNAME=	Pike-v0.6.110
 
 MAINTAINER=	vns@delta.odessa.ua
 
diff --git a/lang/pike72/Makefile b/lang/pike72/Makefile
index ebc4f3c4ba3a..bfd0a3b2b343 100644
--- a/lang/pike72/Makefile
+++ b/lang/pike72/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	pike
-# Version required:	0.6
 # Date created:		16 Jan 1999
 # Whom:			vns@delta.odessa.ua
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Pike-v0.6.110
-PKGNAME=	pike-0.6
+PORTNAME=	pike
+PORTVERSION=	0.6
 CATEGORIES=	lang
 MASTER_SITES=	http://pike.idonex.se/download/
+DISTNAME=	Pike-v0.6.110
 
 MAINTAINER=	vns@delta.odessa.ua
 
diff --git a/lang/pike73/Makefile b/lang/pike73/Makefile
index ebc4f3c4ba3a..bfd0a3b2b343 100644
--- a/lang/pike73/Makefile
+++ b/lang/pike73/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	pike
-# Version required:	0.6
 # Date created:		16 Jan 1999
 # Whom:			vns@delta.odessa.ua
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Pike-v0.6.110
-PKGNAME=	pike-0.6
+PORTNAME=	pike
+PORTVERSION=	0.6
 CATEGORIES=	lang
 MASTER_SITES=	http://pike.idonex.se/download/
+DISTNAME=	Pike-v0.6.110
 
 MAINTAINER=	vns@delta.odessa.ua
 
diff --git a/lang/pike74/Makefile b/lang/pike74/Makefile
index ebc4f3c4ba3a..bfd0a3b2b343 100644
--- a/lang/pike74/Makefile
+++ b/lang/pike74/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	pike
-# Version required:	0.6
 # Date created:		16 Jan 1999
 # Whom:			vns@delta.odessa.ua
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Pike-v0.6.110
-PKGNAME=	pike-0.6
+PORTNAME=	pike
+PORTVERSION=	0.6
 CATEGORIES=	lang
 MASTER_SITES=	http://pike.idonex.se/download/
+DISTNAME=	Pike-v0.6.110
 
 MAINTAINER=	vns@delta.odessa.ua
 
diff --git a/lang/pm3-base/Makefile b/lang/pm3-base/Makefile
index 390eba940e20..c4ea1c168da3 100644
--- a/lang/pm3-base/Makefile
+++ b/lang/pm3-base/Makefile
@@ -1,20 +1,21 @@
 # New ports collection makefile for:	pm3-base
-# Version required:	1.1.13
 # Date created:		6 Feb 2000
 # Whom:			John Polstra <jdp@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	pm3-base-${VERSION}
+PORTNAME=	pm3-base
+PORTVERSION=	1.1.13
 CATEGORIES=	lang
 MASTER_SITES=	http://people.FreeBSD.org/~jdp/distfiles/pm3/
 DISTFILES=	${BOOTSTRAP} \
-		pm3-${VERSION}-src.tar.bz2
+		pm3-${PORTVERSION}-src.tar.bz2
 
 MAINTAINER=	jdp@FreeBSD.org
 
 DIST_SUBDIR=	pm3
+WRKSRC=		${WRKDIR}/pm3-base-${PORTVERSION}
 INSTALL_TARGET=	all
 MAKE_ARGS+=	M3OPTIONS="-DBUILD_ALL -DSHIP_ALL"
 MAN1=		m3bundle.1
@@ -23,7 +24,7 @@ PLIST_SUB+=	SOVERSION=${SOVERSION} TARGET=${TARGET} \
 SCRIPTS_ENV+=	TARGET=${TARGET}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/pm3-${VERSION}
+WRKSRC=		${WRKDIR}/pm3-${PORTVERSION}
 
 PROGS=		bin/m3build \
 		bin/m3bundle \
@@ -37,7 +38,6 @@ PROGS=		bin/m3build \
 		bin/sgmltom3 \
 		lib/m3/${TARGET}/m3cgc1
 SOVERSION=	7
-VERSION=	1.1.13
 
 .include <bsd.port.pre.mk>
 
@@ -45,16 +45,16 @@ VERSION=	1.1.13
 TARGET=		FreeBSD2
 TARGETDIR=	freebsd-2
 WORDSIZE=	32
-BOOTSTRAP=	pm3-${VERSION}-${TARGET}-boot.tar.bz2
+BOOTSTRAP=	pm3-${PORTVERSION}-${TARGET}-boot.tar.bz2
 .elif ${ARCH} == "i386"
 .if ${OSVERSION} < 400011
 TARGET=		FreeBSD3
 TARGETDIR=	freebsd-3
-BOOTSTRAP=	pm3-${VERSION}-${TARGET}-boot.tar.bz2
+BOOTSTRAP=	pm3-${PORTVERSION}-${TARGET}-boot.tar.bz2
 .else
 TARGET=		FreeBSD4
 TARGETDIR=	freebsd-4
-BOOTSTRAP=	pm3-${VERSION}a-${TARGET}-boot.tar.bz2
+BOOTSTRAP=	pm3-${PORTVERSION}a-${TARGET}-boot.tar.bz2
 .endif
 WORDSIZE=	32
 .elif ${ARCH} == "alpha"
@@ -65,7 +65,7 @@ CFLAGS+=	-mieee
 TARGET=		FBSD_ALPHA
 TARGETDIR=	fbsd-alpha
 WORDSIZE=	64
-BOOTSTRAP=	pm3-${VERSION}a-${TARGET}-boot.tar.bz2
+BOOTSTRAP=	pm3-${PORTVERSION}a-${TARGET}-boot.tar.bz2
 .endif
 
 .if empty(TARGET)
diff --git a/lang/pm3-forms/Makefile b/lang/pm3-forms/Makefile
index 011b35e508c2..c7804eedb204 100644
--- a/lang/pm3-forms/Makefile
+++ b/lang/pm3-forms/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	pm3-forms
-# Version required:	1.1.13
 # Date created:		6 Feb 2000
 # Whom:			John Polstra <jdp@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	pm3-forms-${VERSION}
+PORTNAME=	pm3-forms
+PORTVERSION=	1.1.13
 CATEGORIES=	lang
 DISTFILES=
 
@@ -21,7 +21,7 @@ INSTALL_TARGET=	all
 MAN1=		formsedit.1
 PLIST_SUB+=	SOVERSION=${SOVERSION} TARGET=${TARGET} \
 		TARGETDIR=${TARGETDIR} WORDSIZE=${WORDSIZE}
-WRKSRC=		${WRKDIRPREFIX}${.CURDIR}/../pm3-base/work/pm3-${VERSION}
+WRKSRC=		${WRKDIRPREFIX}${.CURDIR}/../pm3-base/work/pm3-${PORTVERSION}
 
 BUILDDIRS=	network/www/web \
 		graphics/gr-libs/jvideo \
@@ -32,7 +32,6 @@ BUILDDIRS=	network/www/web \
 L1=		${PREFIX}/lib/m3/${TARGET}/
 PROGS=		bin/formsedit
 SOVERSION=	7
-VERSION=	1.1.13
 # hack to work around bsd.port.mk problem
 USE_BZIP2=	yes
 
diff --git a/lang/pm3-gui/Makefile b/lang/pm3-gui/Makefile
index 78314d9c5c41..4395b951b350 100644
--- a/lang/pm3-gui/Makefile
+++ b/lang/pm3-gui/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	pm3-gui
-# Version required:	1.1.13
 # Date created:		6 Feb 2000
 # Whom:			John Polstra <jdp@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	pm3-gui-${VERSION}
+PORTNAME=	pm3-gui
+PORTVERSION=	1.1.13
 CATEGORIES=	lang
 DISTFILES=
 
@@ -21,7 +21,7 @@ INSTALL_TARGET=	all
 PLIST_SUB+=	SOVERSION=${SOVERSION} TARGET=${TARGET} \
 		TARGETDIR=${TARGETDIR} WORDSIZE=${WORDSIZE}
 USE_XLIB=	yes
-WRKSRC=		${WRKDIRPREFIX}${.CURDIR}/../pm3-base/work/pm3-${VERSION}
+WRKSRC=		${WRKDIRPREFIX}${.CURDIR}/../pm3-base/work/pm3-${PORTVERSION}
 
 BUILDDIRS=	graphics/gr-libs/X11 \
 		graphics/gr-libs/ui \
@@ -29,7 +29,6 @@ BUILDDIRS=	graphics/gr-libs/X11 \
 		graphics/gr-libs/vbtkit
 L1=		${PREFIX}/lib/m3/${TARGET}/
 SOVERSION=	7
-VERSION=	1.1.13
 # hack to work around bsd.port.mk problem
 USE_BZIP2=	yes
 
diff --git a/lang/pm3-m3tk/Makefile b/lang/pm3-m3tk/Makefile
index c0745827a8a5..a21834d5f9d2 100644
--- a/lang/pm3-m3tk/Makefile
+++ b/lang/pm3-m3tk/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	pm3-m3tk
-# Version required:	1.1.13
 # Date created:		11 Feb 2000
 # Whom:			John Polstra <jdp@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	pm3-m3tk-${VERSION}
+PORTNAME=	pm3-m3tk
+PORTVERSION=	1.1.13
 CATEGORIES=	lang
 DISTFILES=
 
@@ -20,12 +20,11 @@ DIST_SUBDIR=	pm3
 INSTALL_TARGET=	all
 PLIST_SUB+=	SOVERSION=${SOVERSION} TARGET=${TARGET} \
 		TARGETDIR=${TARGETDIR} WORDSIZE=${WORDSIZE}
-WRKSRC=		${WRKDIRPREFIX}${.CURDIR}/../pm3-base/work/pm3-${VERSION}
+WRKSRC=		${WRKDIRPREFIX}${.CURDIR}/../pm3-base/work/pm3-${PORTVERSION}
 
 BUILDDIRS=	language/modula3/m3tools/m3tk
 L1=		${PREFIX}/lib/m3/${TARGET}/
 SOVERSION=	7
-VERSION=	1.1.13
 # hack to work around bsd.port.mk problem
 USE_BZIP2=	yes
 
diff --git a/lang/pm3-net/Makefile b/lang/pm3-net/Makefile
index 920244646485..c106f297b5b5 100644
--- a/lang/pm3-net/Makefile
+++ b/lang/pm3-net/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	pm3-net
-# Version required:	1.1.13
 # Date created:		6 Feb 2000
 # Whom:			John Polstra <jdp@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	pm3-net-${VERSION}
+PORTNAME=	pm3-net
+PORTVERSION=	1.1.13
 CATEGORIES=	lang
 DISTFILES=
 
@@ -20,14 +20,13 @@ DIST_SUBDIR=	pm3
 INSTALL_TARGET=	all
 PLIST_SUB+=	SOVERSION=${SOVERSION} TARGET=${TARGET} \
 		TARGETDIR=${TARGETDIR} WORDSIZE=${WORDSIZE}
-WRKSRC=		${WRKDIRPREFIX}${.CURDIR}/../pm3-base/work/pm3-${VERSION}
+WRKSRC=		${WRKDIRPREFIX}${.CURDIR}/../pm3-base/work/pm3-${PORTVERSION}
 
 BUILDDIRS=	network/tcplibs/tcp \
 		network/tcplibs/tcpextras \
 		network/udp
 L1=		${PREFIX}/lib/m3/${TARGET}/
 SOVERSION=	7
-VERSION=	1.1.13
 # hack to work around bsd.port.mk problem
 USE_BZIP2=	yes
 
diff --git a/lang/pm3-netobj/Makefile b/lang/pm3-netobj/Makefile
index db47cb95287c..69993bb4cb18 100644
--- a/lang/pm3-netobj/Makefile
+++ b/lang/pm3-netobj/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	pm3-netobj
-# Version required:	1.1.13
 # Date created:		11 Feb 2000
 # Whom:			John Polstra <jdp@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	pm3-netobj-${VERSION}
+PORTVERSION=	pm3-netobj
+PORTVERSION=	1.1.13
 CATEGORIES=	lang
 DISTFILES=
 
@@ -23,7 +23,7 @@ INSTALL_TARGET=	all
 MAN1=		netobjd.1 stubgen.1
 PLIST_SUB+=	SOVERSION=${SOVERSION} TARGET=${TARGET} \
 		TARGETDIR=${TARGETDIR} WORDSIZE=${WORDSIZE}
-WRKSRC=		${WRKDIRPREFIX}${.CURDIR}/../pm3-base/work/pm3-${VERSION}
+WRKSRC=		${WRKDIRPREFIX}${.CURDIR}/../pm3-base/work/pm3-${PORTVERSION}
 
 BUILDDIRS=	network/netobjects/netobj \
 		network/netobjects/netobjd \
@@ -32,7 +32,6 @@ PROGS=		bin/netobjd \
 		bin/stubgen
 L1=		${PREFIX}/lib/m3/${TARGET}/
 SOVERSION=	7
-VERSION=	1.1.13
 # hack to work around bsd.port.mk problem
 USE_BZIP2=	yes
 
diff --git a/lang/ptoc/Makefile b/lang/ptoc/Makefile
index 46e9ba72662b..86a1e516aab0 100644
--- a/lang/ptoc/Makefile
+++ b/lang/ptoc/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	ptoc
-# Version required:			3.41
 # Date created:				10 December 1997
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		ptoc-3.41
+PORTNAME=		ptoc
+PORTVERSION=		3.41
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.netsw.org/netsw/SoftEng/Lang/Pascal/ \
 			ftp://ftp.u-aizu.ac.jp/pub/lang/netsw/Pascal/ \
diff --git a/lang/python+ipv6/Makefile b/lang/python+ipv6/Makefile
index 28c2c6639c9c..a232dfa82695 100644
--- a/lang/python+ipv6/Makefile
+++ b/lang/python+ipv6/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    python
-# Version required:     1.5.2
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=       py152
-PKGNAME=        python+ipv6-1.5.2
+PORTNAME=	python+ipv6
+PORTVERSION=	1.5.2
 CATEGORIES=	lang python tk82 ipv6
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
+DISTNAME=	py152
 EXTRACT_SUFX=	.tgz
 
 PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/
@@ -21,7 +21,7 @@ MAINTAINER=	sumikawa@FreeBSD.org
 
 LIB_DEPENDS=	${TK_DEPENDS}
 
-DIST_SUBDIR=    python
+DIST_SUBDIR=	python
 WRKSRC=		${WRKDIR}/Python-1.5.2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fpectl --with-libs='-lxpg4'
diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index fc091f0a9713..311e9a39b235 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    python
-# Version required:     1.5.2
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=       py152
-PKGNAME=        python-1.5.2
+PORTNAME=	python
+PORTVERSION=	1.5.2
 CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
+DISTNAME=	py152
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python-doc-html/Makefile b/lang/python-doc-html/Makefile
index 74e6317ef416..6f09b66dc9a9 100644
--- a/lang/python-doc-html/Makefile
+++ b/lang/python-doc-html/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    python-doc
-# Version required:     1.5.2p2
 # Date created:         12 May 1999
 # Whom:                 Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	${DOCFORMAT}-${VERSION}
-PKGNAME=        python-doc-${DOCFORMAT}-${VERSION}
+PORTNAME=	python-doc-${DOCFORMAT}
+PORTVERSION=	1.5.2p2
 CATEGORIES=	lang python
 MASTER_SITES=	http://www.python.org/ftp/python/doc/ \
 		http://SunSITE.Informatik.RWTH-Aachen.DE/python/ftp/python/doc/1.5.2p2/
+DISTNAME=	${DOCFORMAT}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
@@ -19,7 +19,6 @@ DIST_SUBDIR=	python
 NO_BUILD=	yes
 PLIST=		${PKGDIR}/PLIST_${DOCFORMAT}
 
-VERSION=	1.5.2p2
 DOCDIR=		${PREFIX}/share/doc/python
 
 DOCFORMAT?=	html
diff --git a/lang/python-doc-pdf-a4/Makefile b/lang/python-doc-pdf-a4/Makefile
index 86fba7d9f6dc..74158c6f4887 100644
--- a/lang/python-doc-pdf-a4/Makefile
+++ b/lang/python-doc-pdf-a4/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	python-doc-pdf-a4
-# Version required:	1.5.2
 # Date created:		02 June 1999
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
diff --git a/lang/python-doc-pdf-letter/Makefile b/lang/python-doc-pdf-letter/Makefile
index 8e29793a20cc..4fb0675b660f 100644
--- a/lang/python-doc-pdf-letter/Makefile
+++ b/lang/python-doc-pdf-letter/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	python-doc-pdf-letter
-# Version required:	1.5.2
 # Date created:		02 June 1999
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
diff --git a/lang/python-doc-postscript-a4/Makefile b/lang/python-doc-postscript-a4/Makefile
index f709803e4967..e8b769634983 100644
--- a/lang/python-doc-postscript-a4/Makefile
+++ b/lang/python-doc-postscript-a4/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	python-doc-postscript-a4
-# Version required:	1.5.2
 # Date created:		02 June 1999
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
diff --git a/lang/python-doc-postscript-letter/Makefile b/lang/python-doc-postscript-letter/Makefile
index daf1e27d5355..3d7f0cddd42c 100644
--- a/lang/python-doc-postscript-letter/Makefile
+++ b/lang/python-doc-postscript-letter/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	python-doc-postscript-letter
-# Version required:	1.5.2
 # Date created:		02 June 1999
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
diff --git a/lang/python/Makefile b/lang/python/Makefile
index fc091f0a9713..311e9a39b235 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    python
-# Version required:     1.5.2
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=       py152
-PKGNAME=        python-1.5.2
+PORTNAME=	python
+PORTVERSION=	1.5.2
 CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
+DISTNAME=	py152
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index fc091f0a9713..311e9a39b235 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    python
-# Version required:     1.5.2
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=       py152
-PKGNAME=        python-1.5.2
+PORTNAME=	python
+PORTVERSION=	1.5.2
 CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
+DISTNAME=	py152
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index fc091f0a9713..311e9a39b235 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    python
-# Version required:     1.5.2
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=       py152
-PKGNAME=        python-1.5.2
+PORTNAME=	python
+PORTVERSION=	1.5.2
 CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
+DISTNAME=	py152
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index fc091f0a9713..311e9a39b235 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    python
-# Version required:     1.5.2
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=       py152
-PKGNAME=        python-1.5.2
+PORTNAME=	python
+PORTVERSION=	1.5.2
 CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
+DISTNAME=	py152
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index fc091f0a9713..311e9a39b235 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    python
-# Version required:     1.5.2
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=       py152
-PKGNAME=        python-1.5.2
+PORTNAME=	python
+PORTVERSION=	1.5.2
 CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
+DISTNAME=	py152
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index fc091f0a9713..311e9a39b235 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    python
-# Version required:     1.5.2
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=       py152
-PKGNAME=        python-1.5.2
+PORTNAME=	python
+PORTVERSION=	1.5.2
 CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
+DISTNAME=	py152
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index fc091f0a9713..311e9a39b235 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    python
-# Version required:     1.5.2
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=       py152
-PKGNAME=        python-1.5.2
+PORTNAME=	python
+PORTVERSION=	1.5.2
 CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
+DISTNAME=	py152
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index fc091f0a9713..311e9a39b235 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    python
-# Version required:     1.5.2
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=       py152
-PKGNAME=        python-1.5.2
+PORTNAME=	python
+PORTVERSION=	1.5.2
 CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
+DISTNAME=	py152
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index fc091f0a9713..311e9a39b235 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    python
-# Version required:     1.5.2
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=       py152
-PKGNAME=        python-1.5.2
+PORTNAME=	python
+PORTVERSION=	1.5.2
 CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
+DISTNAME=	py152
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index fc091f0a9713..311e9a39b235 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    python
-# Version required:     1.5.2
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=       py152
-PKGNAME=        python-1.5.2
+PORTNAME=	python
+PORTVERSION=	1.5.2
 CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
+DISTNAME=	py152
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index fc091f0a9713..311e9a39b235 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    python
-# Version required:     1.5.2
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=       py152
-PKGNAME=        python-1.5.2
+PORTNAME=	python
+PORTVERSION=	1.5.2
 CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
+DISTNAME=	py152
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index fc091f0a9713..311e9a39b235 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    python
-# Version required:     1.5.2
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=       py152
-PKGNAME=        python-1.5.2
+PORTNAME=	python
+PORTVERSION=	1.5.2
 CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
+DISTNAME=	py152
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index fc091f0a9713..311e9a39b235 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    python
-# Version required:     1.5.2
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=       py152
-PKGNAME=        python-1.5.2
+PORTNAME=	python
+PORTVERSION=	1.5.2
 CATEGORIES=	lang python
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
+DISTNAME=	py152
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
diff --git a/lang/rexx-imc/Makefile b/lang/rexx-imc/Makefile
index 4223bd2e61aa..9e1e4811be99 100644
--- a/lang/rexx-imc/Makefile
+++ b/lang/rexx-imc/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	REXX/imc
-# Version required:			1.6d
 # Date created:				Septermber 21 96
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	rexx-imc-1.7
+PORTNAME=	rexx-imc
+PORTVERSION=	1.7
 CATEGORIES=	lang
 MASTER_SITES=	http://ruby.comlab.ox.ac.uk/imc/distribution/           \
 		ftp://ftp.sai.msu.su/pub/unix/rexx/                     \
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 6b555d0e88ca..7450b76e10a1 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    ruby
-# Version required:     1.4.3
 # Date created:         04 September 1997
 # Whom:                 Eiji-usagi-MATSUmoto <usagi@ruby.club.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ruby-1.4.3
+PORTNAME=	ruby
+PORTVERSION=	1.4.3
 CATEGORIES=	lang ipv6
 MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \
diff --git a/lang/ruby14-irb/Makefile b/lang/ruby14-irb/Makefile
index a13966e82b81..8f2a350e8bd3 100644
--- a/lang/ruby14-irb/Makefile
+++ b/lang/ruby14-irb/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    irb
-# Version required:     0.6.1
 # Date created:         19 April 1999
 # Whom:                 Yasuhiro Fukuma <yasuf@big.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	irb-0.6.1
+PORTNAME=	irb
+PORTVERSION=	0.6.1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/contrib/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/contrib/ \
diff --git a/lang/ruby14/Makefile b/lang/ruby14/Makefile
index 6b555d0e88ca..7450b76e10a1 100644
--- a/lang/ruby14/Makefile
+++ b/lang/ruby14/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    ruby
-# Version required:     1.4.3
 # Date created:         04 September 1997
 # Whom:                 Eiji-usagi-MATSUmoto <usagi@ruby.club.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ruby-1.4.3
+PORTNAME=	ruby
+PORTVERSION=	1.4.3
 CATEGORIES=	lang ipv6
 MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index 6b555d0e88ca..7450b76e10a1 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    ruby
-# Version required:     1.4.3
 # Date created:         04 September 1997
 # Whom:                 Eiji-usagi-MATSUmoto <usagi@ruby.club.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ruby-1.4.3
+PORTNAME=	ruby
+PORTVERSION=	1.4.3
 CATEGORIES=	lang ipv6
 MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \
diff --git a/lang/scheme48/Makefile b/lang/scheme48/Makefile
index d371b7a7182f..60dff2b13945 100644
--- a/lang/scheme48/Makefile
+++ b/lang/scheme48/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    scheme48
-# Version required:     0.46
 # Date created:         25 Aug 1997
 # Whom:                 jmacd
 #
 # $FreeBSD$
 #
 
-DISTNAME=	scheme48-0.46
+PORTNAME=	scheme48
+PORTVERSION=	0.46
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp-swiss.ai.mit.edu/pub/s48/
 EXTRACT_SUFX=	.tgz
diff --git a/lang/schemetoc/Makefile b/lang/schemetoc/Makefile
index 6467042fd854..f92f019be404 100644
--- a/lang/schemetoc/Makefile
+++ b/lang/schemetoc/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	Scheme-to-C
-# Version required:	15mar93
 # Date created:		28 Dec 1994
 # Whom:			jmacd@uclink.berkeley.edu
 #
 # $FreeBSD$
 #
 
-DISTNAME=	15mar93
-PKGNAME= 	schemetoc-93.3.15
+PORTNAME= 	schemetoc
+PORTVERSION= 	93.3.15
 CATEGORIES=	lang
 MASTER_SITES=	ftp://gatekeeper.dec.com/pub/DEC/Scheme-to-C/
+DISTNAME=	15mar93
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	jmacd@FreeBSD.org
diff --git a/lang/scm/Makefile b/lang/scm/Makefile
index f3aa0497c4f3..06d9581d26e2 100644
--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	scm
-# Version required:	5d2
 # Date created:		Sat Nov  5 17:11:01 PST 1994
 # Whom:			hsu
 #
 # $FreeBSD$
 #
 
-DISTNAME=	scm
-PKGNAME=	scm-5d2
+PORTNAME=	scm
+PORTVERSION=	5d2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		ftp://ftp.swiss.ai.mit.edu/pub/scm/OLD/
@@ -20,7 +19,7 @@ EXTRACT_ONLY=	scm5d2.zip slib2c7.zip
 
 USE_ZIP=	yes
 GNU_CONFIGURE=	yes
-
+WRKSRC=		${WRKDIR}/scm
 MAN1=		scm.1
 
 IMPLINIT=	${PREFIX}/libdata/scm/Init.scm
diff --git a/lang/siod/Makefile b/lang/siod/Makefile
index 8430d5dcd2c7..a46e8135d671 100644
--- a/lang/siod/Makefile
+++ b/lang/siod/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:   siod
-# Version required:    3.4
 # Date created:        28 April 1999
 # Whom:                jkoshy
 #
 # $FreeBSD$
 #
 
-DISTNAME=	siod
-PKGNAME=	siod-3.4
+PORTNAME=	siod
+PORTVERSION=	3.4
 CATEGORIES=	lang
 MASTER_SITES=	http://people.delphi.com/gjc/\
 		ftp://ftp.std.com/pub/gjc/ \
 		http://freefall.freebsd.org/~jkoshy/PORTS/
+DISTNAME=	siod
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jkoshy@FreeBSD.org
diff --git a/lang/slib/Makefile b/lang/slib/Makefile
index a5bb847df950..c8add430048b 100644
--- a/lang/slib/Makefile
+++ b/lang/slib/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:   slib
-# Version required:    2c0
 # Date created:        01 April 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	slib2c5
-PKGNAME=	slib-2c5
+PORTNAME=	slib
+PORTVERSION=	2c5
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	scm
+DISTNAME=	slib2c5
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index abeb95c3d59c..b1f78905366b 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	smalltalk
-# Version required:	1.7.3
 # Date created:		09 Feb 1995
 # Whom:			gpalmer
 #
 # $FreeBSD$
 #
 
-DISTNAME=	smalltalk-1.7.3
+PORTNAME=	smalltalk
+PORTVERSION=	1.7.3
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	smalltalk
diff --git a/lang/sml-mode.el/Makefile b/lang/sml-mode.el/Makefile
index 3dc32a2af51f..f716eb7c75c0 100644
--- a/lang/sml-mode.el/Makefile
+++ b/lang/sml-mode.el/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	sml-mode.el
-# Version required:	3.3
 # Date created:		23 December 1999
 # Whom:			J Koshy <jkoshy@freebsd.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sml-mode-3.3
+PORTNAME=	sml-mode
+PORTVERSION=	3.3
 CATEGORIES=	lang elisp
 MASTER_SITES=	ftp://ftp.research.bell-labs.com/dist/smlnj/contrib/emacs/ \
 		http://people.FreeBSD.org/~jkoshy/PORTS/
diff --git a/lang/sml-nj-devel/Makefile b/lang/sml-nj-devel/Makefile
index 63cd9c193a0f..57690455e05f 100644
--- a/lang/sml-nj-devel/Makefile
+++ b/lang/sml-nj-devel/Makefile
@@ -1,25 +1,24 @@
 # New ports collection makefile for: sml/nj
-# Version required:    110
 # Date created:        7 July 1998
 # Whom:                jkoshy
 #
 # $FreeBSD$
 #
 
-DISTNAME=     110.9.1-bin.x86-unix
-PKGNAME=      smlnj-110.9.1
-CATEGORIES=   lang
-MASTER_SITES= ftp://ftp.research.bell-labs.com/dist/smlnj/working/110.9.1/ \
-	      ftp://ftp.diku.dk/pub/smlnj/working/110.9.1/ \
-	      ftp://sunsite.doc.ic.ac.uk/computing/programming/languages/ml/smlnj/working/110.9.1/ \
-	      ftp://compiler.kaist.ac.kr/pub/sml/working/110.9.1/
-DISTFILES=    110.9.1-bin.x86-unix.tar.Z 110.9.1-cm.tar.Z 110.9.1-cml.tar.Z \
-	      110.9.1-config.tar.Z 110.9.1-eXene.tar.Z \
-	      110.9.1-ml-burg.tar.Z 110.9.1-ml-lex.tar.Z 110.9.1-ml-yacc.tar.Z \
-	      110.9.1-runtime.tar.Z 110.9.1-smlnj-c.tar.Z \
-	      110.9.1-smlnj-lib.tar.Z
+PORTNAME=	smlnj
+PORTVERSION=	110.9.1
+CATEGORIES=	lang
+MASTER_SITES=	ftp://ftp.research.bell-labs.com/dist/smlnj/working/110.9.1/ \
+		ftp://ftp.diku.dk/pub/smlnj/working/110.9.1/ \
+		ftp://sunsite.doc.ic.ac.uk/computing/programming/languages/ml/smlnj/working/110.9.1/ \
+		ftp://compiler.kaist.ac.kr/pub/sml/working/110.9.1/
+DISTFILES=	110.9.1-bin.x86-unix.tar.Z 110.9.1-cm.tar.Z 110.9.1-cml.tar.Z \
+		110.9.1-config.tar.Z 110.9.1-eXene.tar.Z \
+		110.9.1-ml-burg.tar.Z 110.9.1-ml-lex.tar.Z \
+		110.9.1-ml-yacc.tar.Z 110.9.1-runtime.tar.Z \
+		110.9.1-smlnj-c.tar.Z 110.9.1-smlnj-lib.tar.Z
 
-MAINTAINER=   jkoshy@freebsd.org
+MAINTAINER=	jkoshy@freebsd.org
 
 # Other mirror sites that generally carry only released versions of SML
 # 	ftp://rodin.stanford.edu/pub/smlnj/release/
@@ -28,16 +27,16 @@ MAINTAINER=   jkoshy@freebsd.org
 # Mirror sites that keep files around in gzipped format
 # 	ftp://flint.cs.yale.edu/pub/smlnj/working/110.9.1/
 
-DIST_SUBDIR=  sml-nj
-NO_WRKSUBDIR= yes
-EXTRACT_ONLY= 110.9.1-config.tar.Z
-USE_GMAKE=    yes
+DIST_SUBDIR=	sml-nj
+NO_WRKSUBDIR=	yes
+EXTRACT_ONLY=	110.9.1-config.tar.Z
+USE_GMAKE=	yes
 
-SML_BASE=     ${PREFIX}/lib/sml-nj
-SML_LIBDIR=   ${SML_BASE}/lib
-SML_BINDIR=   ${SML_BASE}/bin
-SML_SRCDIR=   ${SML_BASE}/src
-SML_EXES=     ml-burg ml-lex ml-yacc sml
+SML_BASE=	${PREFIX}/lib/sml-nj
+SML_LIBDIR=	${SML_BASE}/lib
+SML_BINDIR=	${SML_BASE}/bin
+SML_SRCDIR=	${SML_BASE}/src
+SML_EXES=	ml-burg ml-lex ml-yacc sml
 
 # make symlinks to the dist files
 post-extract:
diff --git a/lang/sml-nj/Makefile b/lang/sml-nj/Makefile
index 63cd9c193a0f..57690455e05f 100644
--- a/lang/sml-nj/Makefile
+++ b/lang/sml-nj/Makefile
@@ -1,25 +1,24 @@
 # New ports collection makefile for: sml/nj
-# Version required:    110
 # Date created:        7 July 1998
 # Whom:                jkoshy
 #
 # $FreeBSD$
 #
 
-DISTNAME=     110.9.1-bin.x86-unix
-PKGNAME=      smlnj-110.9.1
-CATEGORIES=   lang
-MASTER_SITES= ftp://ftp.research.bell-labs.com/dist/smlnj/working/110.9.1/ \
-	      ftp://ftp.diku.dk/pub/smlnj/working/110.9.1/ \
-	      ftp://sunsite.doc.ic.ac.uk/computing/programming/languages/ml/smlnj/working/110.9.1/ \
-	      ftp://compiler.kaist.ac.kr/pub/sml/working/110.9.1/
-DISTFILES=    110.9.1-bin.x86-unix.tar.Z 110.9.1-cm.tar.Z 110.9.1-cml.tar.Z \
-	      110.9.1-config.tar.Z 110.9.1-eXene.tar.Z \
-	      110.9.1-ml-burg.tar.Z 110.9.1-ml-lex.tar.Z 110.9.1-ml-yacc.tar.Z \
-	      110.9.1-runtime.tar.Z 110.9.1-smlnj-c.tar.Z \
-	      110.9.1-smlnj-lib.tar.Z
+PORTNAME=	smlnj
+PORTVERSION=	110.9.1
+CATEGORIES=	lang
+MASTER_SITES=	ftp://ftp.research.bell-labs.com/dist/smlnj/working/110.9.1/ \
+		ftp://ftp.diku.dk/pub/smlnj/working/110.9.1/ \
+		ftp://sunsite.doc.ic.ac.uk/computing/programming/languages/ml/smlnj/working/110.9.1/ \
+		ftp://compiler.kaist.ac.kr/pub/sml/working/110.9.1/
+DISTFILES=	110.9.1-bin.x86-unix.tar.Z 110.9.1-cm.tar.Z 110.9.1-cml.tar.Z \
+		110.9.1-config.tar.Z 110.9.1-eXene.tar.Z \
+		110.9.1-ml-burg.tar.Z 110.9.1-ml-lex.tar.Z \
+		110.9.1-ml-yacc.tar.Z 110.9.1-runtime.tar.Z \
+		110.9.1-smlnj-c.tar.Z 110.9.1-smlnj-lib.tar.Z
 
-MAINTAINER=   jkoshy@freebsd.org
+MAINTAINER=	jkoshy@freebsd.org
 
 # Other mirror sites that generally carry only released versions of SML
 # 	ftp://rodin.stanford.edu/pub/smlnj/release/
@@ -28,16 +27,16 @@ MAINTAINER=   jkoshy@freebsd.org
 # Mirror sites that keep files around in gzipped format
 # 	ftp://flint.cs.yale.edu/pub/smlnj/working/110.9.1/
 
-DIST_SUBDIR=  sml-nj
-NO_WRKSUBDIR= yes
-EXTRACT_ONLY= 110.9.1-config.tar.Z
-USE_GMAKE=    yes
+DIST_SUBDIR=	sml-nj
+NO_WRKSUBDIR=	yes
+EXTRACT_ONLY=	110.9.1-config.tar.Z
+USE_GMAKE=	yes
 
-SML_BASE=     ${PREFIX}/lib/sml-nj
-SML_LIBDIR=   ${SML_BASE}/lib
-SML_BINDIR=   ${SML_BASE}/bin
-SML_SRCDIR=   ${SML_BASE}/src
-SML_EXES=     ml-burg ml-lex ml-yacc sml
+SML_BASE=	${PREFIX}/lib/sml-nj
+SML_LIBDIR=	${SML_BASE}/lib
+SML_BINDIR=	${SML_BASE}/bin
+SML_SRCDIR=	${SML_BASE}/src
+SML_EXES=	ml-burg ml-lex ml-yacc sml
 
 # make symlinks to the dist files
 post-extract:
diff --git a/lang/squeak1/Makefile b/lang/squeak1/Makefile
index 90ad2a53c2a5..dbaf7989e19c 100644
--- a/lang/squeak1/Makefile
+++ b/lang/squeak1/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:   	squeak1
-# Version required:    			1.31
 # Date created:        			20 December 1998
 # Whom:                			jesse@cs.uni-magdeburg.de
 #
 # $FreeBSD$
 #
 
-DISTNAME=	1.31
-PKGNAME=	squeak-1.31
+PORTNAME=	squeak
+PORTVERSION=	1.31
 CATEGORIES=	lang
 MASTER_SITES=	http://www.apfel.de/~jesse/squeak/ \
 		ftp://alix.inria.fr/pub/squeak/unix/ \
@@ -17,7 +16,7 @@ MASTER_SITES=	http://www.apfel.de/~jesse/squeak/ \
 		http://st-www.cs.uiuc.edu/ftp/Smalltalk/Squeak/ \
 		ftp://uiarchive.cso.uiuc.edu/pub/lang/smalltalk/smalltalk/Squeak/ \
 		http://wuarchive.wustl.edu/languages/smalltalk/smalltalk/Squeak/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${SQUEAK_SRC}
+DISTFILES=	${PORTVERSION}${EXTRACT_SUFX} ${SQUEAK_SRC}
 
 MAINTAINER=	jesse@cs.uni-magdeburg.de
 
diff --git a/lang/squeak2/Makefile b/lang/squeak2/Makefile
index 5753c664c3c0..5f4218feb74c 100644
--- a/lang/squeak2/Makefile
+++ b/lang/squeak2/Makefile
@@ -1,18 +1,17 @@
 # New ports collection makefile for:   	squeak
-# Version required:    			2.3
 # Date created:        			4 March 1999
 # Whom:                			jesse@cs.uni-magdeburg.de
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Squeak2.7-src
-PKGNAME=	squeak-2.7
+PORTNAME=	squeak
+PORTVERSION=	2.7
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/SOR/users/piumarta/squeak/ \
 		ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/free/squeak/unix/ \
 		http://www.nectar.com/distfiles/squeak/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${SQUEAK_SRC}
+DISTFILES=	Squeak2.7-src${EXTRACT_SUFX} ${SQUEAK_SRC}
 
 MAINTAINER=	jesse@cs.uni-magdeburg.de
 
diff --git a/lang/squeak3/Makefile b/lang/squeak3/Makefile
index 5753c664c3c0..5f4218feb74c 100644
--- a/lang/squeak3/Makefile
+++ b/lang/squeak3/Makefile
@@ -1,18 +1,17 @@
 # New ports collection makefile for:   	squeak
-# Version required:    			2.3
 # Date created:        			4 March 1999
 # Whom:                			jesse@cs.uni-magdeburg.de
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Squeak2.7-src
-PKGNAME=	squeak-2.7
+PORTNAME=	squeak
+PORTVERSION=	2.7
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/SOR/users/piumarta/squeak/ \
 		ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/free/squeak/unix/ \
 		http://www.nectar.com/distfiles/squeak/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${SQUEAK_SRC}
+DISTFILES=	Squeak2.7-src${EXTRACT_SUFX} ${SQUEAK_SRC}
 
 MAINTAINER=	jesse@cs.uni-magdeburg.de
 
diff --git a/lang/sr/Makefile b/lang/sr/Makefile
index f35e277dac5a..278ace481948 100644
--- a/lang/sr/Makefile
+++ b/lang/sr/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	sr
-# Version required:		2.3.1
 # Date created:			2 Jun 1997
 # Whom:				Ruslan Shevchenko <rssh@satori.ipri.kiev.ua>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sr231
-PKGNAME=	sr-2.3.1
+PORTNAME=	sr
+PORTVERSION=	2.3.1
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.cs.arizona.edu/sr/
+DISTNAME=	sr231
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	rssh@cki.ipri.kiev.ua
diff --git a/lang/starlogo/Makefile b/lang/starlogo/Makefile
index 56dba8495ee5..004086d2a744 100644
--- a/lang/starlogo/Makefile
+++ b/lang/starlogo/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    StarLogo
-# Version required:	1.0
 # Date created:		14th November 1999
 # Whom:			Jose Marques
 #
 # $FreeBSD$
 #
 
-DISTNAME=	java-starlogo-beta-2
-PKGNAME=	starlogo-1.0
+PORTNAME=	starlogo
+PORTVERSION=	1.0
 CATEGORIES=	lang java
 MASTER_SITES=	http://el.www.media.mit.edu/starlogo/download/
+DISTNAME=	java-starlogo-beta-2
 
 MAINTAINER=	noway@nohow.demon.co.uk
 
diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile
index febf237dc504..b19d34bc46e7 100644
--- a/lang/swi-pl/Makefile
+++ b/lang/swi-pl/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for: SWI-Prolog
-# Version required:		3.2.9
 # Date created:			10 August 1996
 # Whom:				Michael Butschky <butsch@computi.erols.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	pl-3.2.9
-PKGNAME=	swi-pl-3.2.9
+PORTNAME=	swi-pl
+PORTVERSION=	3.2.9
 CATEGORIES=	lang
 MASTER_SITES=	ftp://swi.psy.uva.nl/pub/SWI-Prolog/
+DISTNAME=	pl-3.2.9
 
 MAINTAINER=	max@FreeBSD.org
 
diff --git a/lang/tcl80/Makefile b/lang/tcl80/Makefile
index 25ac543e90cd..654bdc3fa47c 100644
--- a/lang/tcl80/Makefile
+++ b/lang/tcl80/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	tcl8.0
-# Version required:	8.0
 # Date created:		19 August 1997
 # Whom:			jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcl8.0.5
-PKGNAME=	tcl-8.0.5
+PORTNAME=	tcl
+PORTVERSION=	8.0.5
 CATEGORIES=	lang tcl80
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_0/
+DISTNAME=	tcl8.0.5
 
 MAINTAINER=	cwt@freebsd.org
 
diff --git a/lang/tcl81-thread/Makefile b/lang/tcl81-thread/Makefile
index 82a022f69e91..32349dcff294 100644
--- a/lang/tcl81-thread/Makefile
+++ b/lang/tcl81-thread/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	tcl8.1
-# Version required:	8.1.b2
 # Date created:		19 August 1997
 # Whom:			jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcl8.1b1
-PKGNAME=	tcl-thread-8.1.b1
+PORTNAME=	tcl-thread
+PORTVERSION=	8.1.b1
 CATEGORIES=	lang tcl81
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
+DISTNAME=	tcl8.1b1
 
 MAINTAINER=	ejc@FreeBSD.org
 
diff --git a/lang/tcl82/Makefile b/lang/tcl82/Makefile
index 5d9a4d0fde85..682565b43d0f 100644
--- a/lang/tcl82/Makefile
+++ b/lang/tcl82/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	tcl8.2.3
-# Version required:	8.2.3
 # Date created:		19 August 1997
 # Whom:			jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcl8.2.3
-PKGNAME=	tcl-8.2.3
+PORTNAME=	tcl
+PORTVERSION=	8.2.3
 CATEGORIES=	lang tcl82
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_2/
+DISTNAME=	tcl8.2.3
 
 MAINTAINER=	jseger@FreeBSD.org
 
diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index 04c81a16e19f..9023abae9bbf 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	tcl8.3.b1
-# Version required:	8.3.b1
 # Date created:		19 August 1997
 # Whom:			jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcl8.3b1
-PKGNAME=	tcl-8.3.b1
+PORTNAME=	tcl
+PORTVERSION=	8.3.b1
 CATEGORIES=	lang #tcl83
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_3/
+DISTNAME=	tcl8.3b1
 
 MAINTAINER=	jseger@FreeBSD.org
 
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index 04c81a16e19f..9023abae9bbf 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	tcl8.3.b1
-# Version required:	8.3.b1
 # Date created:		19 August 1997
 # Whom:			jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcl8.3b1
-PKGNAME=	tcl-8.3.b1
+PORTNAME=	tcl
+PORTVERSION=	8.3.b1
 CATEGORIES=	lang #tcl83
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_3/
+DISTNAME=	tcl8.3b1
 
 MAINTAINER=	jseger@FreeBSD.org
 
diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index 2593ffa18262..672f51b93730 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	tclX
-# Version required:	8.0.4
 # Date created:		6 February 1996
 # Whom:			jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tclX8.0.4
-PKGNAME=	tclX-8.0.4
+PORTNAME=	tclX
+PORTVERSION=	8.0.4
 CATEGORIES=	lang tcl80 tk80
 MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/
+DISTNAME=	tclX8.0.4
 
 MAINTAINER=	jseger@FreeBSD.org
 
diff --git a/lang/tclX80/Makefile b/lang/tclX80/Makefile
index 2593ffa18262..672f51b93730 100644
--- a/lang/tclX80/Makefile
+++ b/lang/tclX80/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	tclX
-# Version required:	8.0.4
 # Date created:		6 February 1996
 # Whom:			jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tclX8.0.4
-PKGNAME=	tclX-8.0.4
+PORTNAME=	tclX
+PORTVERSION=	8.0.4
 CATEGORIES=	lang tcl80 tk80
 MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/
+DISTNAME=	tclX8.0.4
 
 MAINTAINER=	jseger@FreeBSD.org
 
diff --git a/lang/tclX82/Makefile b/lang/tclX82/Makefile
index 2593ffa18262..672f51b93730 100644
--- a/lang/tclX82/Makefile
+++ b/lang/tclX82/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	tclX
-# Version required:	8.0.4
 # Date created:		6 February 1996
 # Whom:			jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tclX8.0.4
-PKGNAME=	tclX-8.0.4
+PORTNAME=	tclX
+PORTVERSION=	8.0.4
 CATEGORIES=	lang tcl80 tk80
 MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/
+DISTNAME=	tclX8.0.4
 
 MAINTAINER=	jseger@FreeBSD.org
 
diff --git a/lang/tclplugin/Makefile b/lang/tclplugin/Makefile
index c039f6df5d17..6323cb1ce507 100644
--- a/lang/tclplugin/Makefile
+++ b/lang/tclplugin/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	tclplugin2.0.3
-# Version required:	2.0.4-beta
 # Date created:		Sat Nov  8 10:46:42 CET 1997
 # Whom:			andreas
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tclplug20-src
-PKGNAME=	tclplugin-2.0
+PORTNAME=	tclplugin
+PORTVERSION=	2.0
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/plugin/
+DISTNAME=	tclplug20-src
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/lang/wamcc/Makefile b/lang/wamcc/Makefile
index 26f7954737d5..82629e6f0f0f 100644
--- a/lang/wamcc/Makefile
+++ b/lang/wamcc/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	wamcc
-# Version required:	2.22
 # Date created:		14 September 1999
 # Whom:			Jerry Hicks <wghicks@bellsouth.net>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	wamcc2.22
-PKGNAME=	wamcc-2.22
+PORTNAME=	wamcc
+PORTVERSION=	2.22
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/loco/wamcc/
 DISTFILES=	wamcc2.22.tar.Z prg.tar.Z
diff --git a/lang/yabasic/Makefile b/lang/yabasic/Makefile
index d39bc16aa82c..df69597a3687 100644
--- a/lang/yabasic/Makefile
+++ b/lang/yabasic/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	yabasic
-# Version required:	2.62
 # Date created:		11 Nov 1999
 # Whom:			Frank Gruender
 #
 # $FreeBSD$
 #
 
-DISTNAME=	yab
-PKGNAME=	yabasic-2.62
+PORTNAME=	yabasic
+PORTVERSION=	2.62
 CATEGORIES=	lang
 MASTER_SITES=	http://www.yabasic.de/download/
+DISTNAME=	yab
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	elwood@mc5sys.in-berlin.de
diff --git a/lang/yorick/Makefile b/lang/yorick/Makefile
index 4c235844ad37..a565334949aa 100644
--- a/lang/yorick/Makefile
+++ b/lang/yorick/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	Yorick
-# Version required:	1.4.1
 # Date created:         26 Oct 97
 # Whom:                 Pedro Giffuni <giffunip@asme.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	yorick-1.4
-PKGNAME=	yorick-1.4.1
+PORTNAME=	yorick
+PORTVERSION=	1.4.1
 CATEGORIES=	lang math
 MASTER_SITES=	ftp://ftp-icf.llnl.gov/pub/Yorick/		\
 		ftp://wuarchive.wustl.edu/languages/yorick/
+DISTNAME=	yorick-1.4
 
 PATCH_SITES=	ftp://ftp-icf.llnl.gov/pub/Yorick/
 PATCHFILES=	yorick-1.4.diff.gz
author	David E. O'Brien <obrien@FreeBSD.org>	2000-04-12 06:21:15 +0000
committer	David E. O'Brien <obrien@FreeBSD.org>	2000-04-12 06:21:15 +0000
commit	5cd5b258b59f63241fff7b2d0cdeda22c2138b33 (patch)
tree	98671b38100211b23e9d578a8a5a241e41b8a707
parent	343c80d542a8a68a6de7c4e7b02a392d8e1d6fa0 (diff)
download	ports-5cd5b258b59f63241fff7b2d0cdeda22c2138b33.tar.gz ports-5cd5b258b59f63241fff7b2d0cdeda22c2138b33.zip