update with the new PORTNAME/PORTVERSION variables

16 files changed, 41 insertions, 41 deletions

diff --git a/cad/acs/Makefile b/cad/acs/Makefile
index eff118c4b1af..5ad8e10f7041 100644
--- a/cad/acs/Makefile
+++ b/cad/acs/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	acs
-# Version required:	0.25
 # Date created:		01 January 1995
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	acs-0.25
+PORTNAME=	acs
+PORTVERSION=	0.25
 CATEGORIES=	cad
 MASTER_SITES=	http://www.geda.seul.org/dist/ \
 		http://www.geda.coelacanth.com/dist/ \
diff --git a/cad/chipmunk/Makefile b/cad/chipmunk/Makefile
index 8069aef72c5d..4533de69e94d 100644
--- a/cad/chipmunk/Makefile
+++ b/cad/chipmunk/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	chipmunk
-# Version required:	5.51
 # Date created:		29 July 1995
 # Whom:			janek@gaja.ipan.lublin.pl
 #
 # $FreeBSD$
 #
 
-DISTNAME=	chipmunk-5.51
+PORTNAME=	chipmunk
+PORTVERSION=	5.51
 CATEGORIES=	cad
 MASTER_SITES=	http://www.cs.berkeley.edu/~lazzaro/chipmunk/pickup/sources/
 DISTFILES=	psys-1.51.tar.gz log-5.51.tar.gz netcmpbeta.tar.gz \
diff --git a/cad/cider/Makefile b/cad/cider/Makefile
index eaf466482040..1365de2efd51 100644
--- a/cad/cider/Makefile
+++ b/cad/cider/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	cider
-# Version required:	1b1
 # Date created:		1999-12-12
 # Whom:			AMAKAWA Shuhei <amakawa@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	cider1b1
-PKGNAME=	cider-1b1
+PORTNAME=	cider
+PORTVERSION=	1.b1
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ic.eecs.berkeley.edu/pub/Cider/new/
+DISTNAME=	cider1b1
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	amakawa@jp.FreeBSD.org
diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index 7b011376f213..e711336aad46 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	FElt
-# Version required:	3.02
 # Date created:		19 October 1996
 # Whom:			Pedro Giffuni
 #
 # $FreeBSD$
 #
 
-DISTNAME=	felt-3.02
+PORTNAME=	felt
+PORTVERSION=	3.02
 CATEGORIES=	cad
 MASTER_SITES=	ftp://felt.sourceforge.net/pub/FElt/ \
 		http://symphony.clarku.edu/atkinson/felt/Binaries/ \
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index a7cd4e65f080..bae3cfaaf480 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:	geda
-# Version required:		19990327
 # Date created:			24 Nov 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gEDA-19990516
-PKGNAME=	geda-19990516
+PORTNAME=	geda
+PORTVERSION=	1999.05.16
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.cc.gatech.edu/ac121/linux/X11/gtkbuffet/apps/geda/ \
 		ftp://ftp.geda.seul.org/pub/geda/dist/ \
 		ftp://ftp.infodrom.north.de/pub/unix/gtk-etc/apps/geda/
+DISTNAME=	gEDA-19990516
 
 MAINTAINER=	vanilla@FreeBSD.org
 
diff --git a/cad/irsim/Makefile b/cad/irsim/Makefile
index 44307b9bba62..fbb8b5ba784a 100644
--- a/cad/irsim/Makefile
+++ b/cad/irsim/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    irsim
-# Version required:     9.2
 # Date created:         18 Dec 1994
 # Whom:                 swallace
 #
 # $FreeBSD$
 #
 
-DISTNAME=       irsim-9.4.1
+PORTNAME=	irsim
+PORTVERSION=	9.4.1
 CATEGORIES=	cad
 MASTER_SITES=	ftp://gatekeeper.dec.com/pub/DEC/WRL/projects/magic/6.5/
-EXTRACT_SUFX=   .tar.Z
+EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	swallace@FreeBSD.org
 
diff --git a/cad/kaskade/Makefile b/cad/kaskade/Makefile
index 39b5d44e4a52..c5f8936bfffb 100644
--- a/cad/kaskade/Makefile
+++ b/cad/kaskade/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	Kaskade
-# Version required:	3.1.1
 # Date created:		19 Sept. 1997
 # Whom:			Pedro Giffuni
 #
 # $FreeBSD$
 #
 
-DISTNAME=	3.1.1
-PKGNAME=	kaskade-3.1.1
+PORTNAME=	kaskade
+PORTVERSION=	3.1.1
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.zib.de/pub/kaskade/3.x/
+DISTNAME=	${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/cad/magic/Makefile b/cad/magic/Makefile
index 588fdae4b352..3aebe6e8b15a 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    magic
-# Version required:     6.4.4
 # Date created:         18 Dec 1994
 # Whom:                 swallace
 #
 # $FreeBSD$
 #
 
-DISTNAME=       magic-6.5
+PORTNAME=	magic
+PORTVERSION=	6.5
 CATEGORIES=	cad
 MASTER_SITES=	ftp://gatekeeper.dec.com/pub/DEC/WRL/projects/magic/6.5/
 DISTFILES=	magic-6_5_tar.Z
diff --git a/cad/mars/Makefile b/cad/mars/Makefile
index 7dd9ee673eb0..ef9acee24060 100644
--- a/cad/mars/Makefile
+++ b/cad/mars/Makefile
@@ -1,16 +1,16 @@
 # ex:ts=8
 # Ports collection makefile for:  MaRS
-# Version required: 0.0
 # Date created:			  Mon Nov 18, 1996
 # Whom:				  David O'Brien (obrien@cs.ucdavis.edu)
 #
 # $FreeBSD$
 #
 
-DISTNAME=	MaRS-2.1
-PKGNAME=	mars-2.1
+PORTNAME=	mars
+PORTVERSION=	2.1
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/sdag/MaRS/
+DISTNAME=	MaRS-${PORTVERSION}
 .if !defined(NOPORTDOCS)
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} MaRS-2-doc${EXTRACT_SUFX}
 .endif
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index 610148b564bf..f972af836e1a 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	PCB
-# Version required:	1.7
 # Date created:		19 October 1994
 # Whom:			mr
 #
 # $FreeBSD$
 #
 
-DISTNAME=	pcb-1.7
+PORTNAME=	pcb
+PORTVERSION=	1.7
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.netlab.is.tsukuba.ac.jp/pub/linux/Plamo/Plamo-current/contrib/Electronic/sources/
 
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index e0c067ddfa8a..5d76f3fff4bb 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	qcad
-# Version required:	1.3.3
 # Date created:		10 Dec 1999
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	qcad_source
-PKGNAME=	qcad-1.3.3
+PORTNAME=	qcad
+PORTVERSION=	1.3.3
 CATEGORIES=	cad
 MASTER_SITES=	http://www.ultraviolet.org/qcad/
+DISTNAME=	qcad_source
 
 MAINTAINER=	will@FreeBSD.org
 
diff --git a/cad/qcad2/Makefile b/cad/qcad2/Makefile
index e0c067ddfa8a..5d76f3fff4bb 100644
--- a/cad/qcad2/Makefile
+++ b/cad/qcad2/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	qcad
-# Version required:	1.3.3
 # Date created:		10 Dec 1999
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	qcad_source
-PKGNAME=	qcad-1.3.3
+PORTNAME=	qcad
+PORTVERSION=	1.3.3
 CATEGORIES=	cad
 MASTER_SITES=	http://www.ultraviolet.org/qcad/
+DISTNAME=	qcad_source
 
 MAINTAINER=	will@FreeBSD.org
 
diff --git a/cad/sis/Makefile b/cad/sis/Makefile
index 328a3d856393..d5f616ab57c7 100644
--- a/cad/sis/Makefile
+++ b/cad/sis/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    sis
-# Version required:     1.2 (pl1)
 # Date created:         10 October 1997
 # Whom:                 volf@oasis.IAEhv.nl
 #
 # $FreeBSD$
 #
 
-DISTNAME=		sis-1.2
-PKGNAME=		sis-1.2.1
+PORTNAME=		sis
+PORTVERSION=		1.2.1
 CATEGORIES=		cad
 MASTER_SITES=		ftp://ic.eecs.berkeley.edu/pub/Sis/
+DISTNAME=		${PORTNAME}-1.2
 EXTRACT_SUFX=   	.tar.Z
 
 PATCH_SITES=		ftp://ic.eecs.berkeley.edu/pub/Sis/
diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index 76f6ba93f740..f8f53daf1381 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    spice
-# Version required:     3f5
 # Date created:         26 Mar 96
 # Whom:                 Julian Jenkins <kaveman@magna.com.au>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sp3f4.kit
-PKGNAME=	spice-3f5
+PORTNAME=	spice
+PORTVERSION=	3f5
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ic.eecs.berkeley.edu/pub/Spice3/
+DISTNAME=	sp3f4.kit
 EXTRACT_SUFX=   .tar.Z
 
 MAINTAINER=	kaveman@magna.com.au
diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile
index 12f7ee18c9aa..7382014f5da0 100644
--- a/cad/tkgate/Makefile
+++ b/cad/tkgate/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	tkgate
-# Version required:			1.0
 # Date created:				28 May 1999
 # Whom:					Jeffery Hansen <hansen@cmu.edu>
 #
 # $FreeBSD$
 #
 
-DISTNAME=		tkgate-1.0
+PORTNAME=		tkgate
+PORTVERSION=		1.0
 CATEGORIES=		cad
 MASTER_SITES=		http://www.cs.cmu.edu/~hansen/tkgate/
 EXTRACT_SUFX=		.tgz
diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index dd4c19b49843..081f3b1259bd 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xcircuit
-# Version required:	2.0b4
 # Date created:		3 Apr 1998
 # Whom:			giffunip@asme.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xcircuit-2.0b4
+PORTNAME=	xcircuit
+PORTVERSION=	2.0b4
 CATEGORIES=	cad
 MASTER_SITES=	ftp://bach.ece.jhu.edu/pub/tim/xcircuit/ \
 		http://bach.ece.jhu.edu/~tim/programs/xcircuit/archive/