update with the new PORTNAME/PORTVERSION variables

23 files changed, 71 insertions, 71 deletions

diff --git a/comms/asmodem/Makefile b/comms/asmodem/Makefile
index a4594329900..603003a96e8 100644
--- a/comms/asmodem/Makefile
+++ b/comms/asmodem/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	asmodem
-# Version required:	0.6.1
 # Date created:		11 May 1998
 # Whom:			Sean Cole <scole@aracnet.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	asmodem-0.6-1
-PKGNAME=	asmodem-0.6.1
+PORTNAME=	asmodem
+PORTVERSION=	0.6.1
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_AFTERSTEP}
 MASTER_SITE_SUBDIR=	apps/asmodem
+DISTNAME=	${PORTNAME}-0.6-1
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/comms/bpl+/Makefile b/comms/bpl+/Makefile
index c9aeec25b57..61461eee33e 100644
--- a/comms/bpl+/Makefile
+++ b/comms/bpl+/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	bpl+
-# Version required:		?
 # Date created:			22 Sep 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	bpl+
-PKGNAME=	bpl+-1.0
+PORTNAME=	bpl+
+PORTVERSION=	1.0
 CATEGORIES=	comms
 MASTER_SITES=	http://people.FreeBSD.org/~max/distfiles/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	max@FreeBSD.org
 
diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index a5d3ea993f4..e07cc9a7890 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -1,16 +1,16 @@
 # Ports collection makefile for:    conserver
-# Version required:     5.21-Beta
 # Date created:         22 November 1997
 # Whom:                 Peter Wemm <peter@netplex.com.au>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	conserver-5.21-Beta
-PKGNAME=	conserver-5.21
+PORTNAME=	conserver
+PORTVERSION=	5.21b
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.uu.net/vendor/bitsko/config-mgmt/ \
 		ftp://unix.hensa.ac.uk/mirrors/uunet/vendor/bitsko/config-mgmt/
+DISTNAME=	conserver-5.21-Beta
 EXTRACT_SUFX=	.shar.gz
 
 MAINTAINER=	peter@FreeBSD.org
diff --git a/comms/ecu/Makefile b/comms/ecu/Makefile
index 173e06797de..5cb3418482d 100644
--- a/comms/ecu/Makefile
+++ b/comms/ecu/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:    ecu
-# Version required:     4.08
 # Date created:         Feb 18, 1995
 # Whom:                 ache
 #
 # $FreeBSD$
 #
 
-DISTNAME=       ecu-4.08
+PORTNAME=	ecu
+PORTVERSION=	4.08
 CATEGORIES=	comms
-MASTER_SITES=   ftp://ftp.kiarchive.ru/pub/unix/comm/
-#MASTER_SITES=   ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/Communications/
+MASTER_SITES=	ftp://ftp.kiarchive.ru/pub/unix/comm/
+#MASTER_SITES=	ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/Communications/
 
-MAINTAINER=     ache@FreeBSD.org
+MAINTAINER=	ache@FreeBSD.org
 
 do-configure:
 	cd ${WRKSRC}; yes "" | ./Configure
diff --git a/comms/gkermit/Makefile b/comms/gkermit/Makefile
index 6b54ecc8ff8..ad4fc74541c 100644
--- a/comms/gkermit/Makefile
+++ b/comms/gkermit/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	gkermit
-# Version required:     1.0
 # Date created:		8 Jan 2000
 # Whom:			dom@myrddin.demon.co.uk
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gkermit
-PKGNAME=        gkermit-1.0
+PORTNAME=	gkermit
+PORTVERSION=	1.0
 CATEGORIES=	comms
 MASTER_SITES=	ftp://kermit.columbia.edu/kermit/archives/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	dom@myrddin.demon.co.uk
 
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 8719d567335..74a0a59bada 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:    gnokii
-# Version required:     0.2.3
 # Date created:         15 March 1999
 # Whom:                 staffanu
 #
 # $FreeBSD$
 #
 
-DISTNAME=       gnokii-0.2.3
+PORTNAME=	gnokii
+PORTVERSION=	0.2.3
 CATEGORIES=	comms
-MASTER_SITES=   ftp://multivac.fatburen.org/pub/gnokii/ \
+MASTER_SITES=	ftp://multivac.fatburen.org/pub/gnokii/ \
 		ftp://multivac.fatburen.org/pub/gnokii/old/
 
-MAINTAINER=     staffanu@nada.kth.se
+MAINTAINER=	staffanu@nada.kth.se
 
 USE_GMAKE=	yes
 
diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index 25e8149b2d6..4ee8ccc63a8 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -1,17 +1,17 @@
 # ports collection makefile for:	hylafax
-# Version required:	v4.0pl2
 # Date created:		19 Apr 1997
 # Whom:			ports@freebsd.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	hylafax-v4.0pl2
-PKGNAME=	hylafax-4.0.2
+PORTNAME=	hylafax
+PORTVERSION=	4.0.2
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.sgi.com/sgi/fax/source/ \
 		ftp://ftp.leo.org/pub/comp/os/unix/networking/fax/hylafax/source/ \
 		ftp://ftp.sisis.de/pub/hylafax/source/
+DISTNAME=	${PORTNAME}-v4.0pl2
 EXTRACT_SUFX=	-tar.gz
 
 PATCH_SITES=	http://www.hylafax.org/patches/
diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index f81ed9821f7..e54ab6cbd54 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	kermit
-# Version required:     6.0.192
 # Date created:		Oct 27, 1994
 # Whom:			pst
 #
 # $FreeBSD$
 #
 
-DISTNAME=	cku196
-PKGNAME=        kermit-7.0.196
+PKGNAME=	kermit
+PORTVERSION=	7.0.196
 CATEGORIES=	comms
 MASTER_SITES=	ftp://kermit.columbia.edu/kermit/archives/
+DISTNAME=	cku196
 
 MAINTAINER=	joerg@FreeBSD.org
 
diff --git a/comms/lrzsz/Makefile b/comms/lrzsz/Makefile
index 777d4f8ef8d..d594b9f6987 100644
--- a/comms/lrzsz/Makefile
+++ b/comms/lrzsz/Makefile
@@ -1,12 +1,12 @@
 # ex:ts=8
 # Ports collection makefile for:  lrzsz
-# Version required: 0.0
 # Date created:			  29 Sept 1996
 # Whom:				  David O'Brien <obrien@cs.ucdavis.edu>
 #
 # $FreeBSD$
 
-DISTNAME=	lrzsz-0.12.20
+PORTNAME=	lrzsz
+PORTVERSION=	0.12.20
 CATEGORIES=	comms
 MASTER_SITES=	ftp://tirka.ohse.de/uwe/releases/  \
 		ftp://ftp.netsw.org/netsw/Network/Modem/Protocols/ZModem/lrzsz/  \
diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 6b61cd25d18..2b87a9a7b2c 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	mgetty+sendfax
-# Version required:			1.1.21
 # Date created:				20 April 1998
 # Whom:					rkw
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mgetty1.1.21-Jul24
-PKGNAME=	mgetty-1.1.21
+PORTNAME=	mgetty
+PORTVERSION=	1.1.21.07.24
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/
+DISTNAME=	mgetty1.1.21-Jul24
 
 MAINTAINER=	jmz@FreeBSD.org
 
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index 9b7056f757c..1c27cf4d24f 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,20 +1,20 @@
 # ex:ts=8
 # Ports collection makefile for:  minicom
-# Version required: 0.0
 # Date created:			  Fri Dec 01, 1995
 # Whom:				  obrien@cs.ucdavis.edu
 #
 # $FreeBSD$
 #
 
-DISTNAME=	${PKGNAME}.src
-PKGNAME=	minicom-1.83.0
+PORTNAME=	minicom
+PORTVERSION=	1.83.0
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_SUNSITE}  \
 		http://www.pp.clinet.fi/~walker/mc-dev/  \
 		http://www.clinet.fi/~walker/  \
 		http://www.pp.clinet.fi/~walker/
 MASTER_SITE_SUBDIR=	apps/serialcomm/dialout
+DISTNAME=	${PKGNAME}.src
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/comms/mlan/Makefile b/comms/mlan/Makefile
index 874081bc47f..5f0db5774bc 100644
--- a/comms/mlan/Makefile
+++ b/comms/mlan/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:   mlan
-# Version required:    1.03
 # Date created:        4 January 2000
 # Whom:                phk
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mlpb103
-PKGNAME=	mlan-1.03
+PORTNAME=	mlan
+PORTVERSION=	1.03
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.dalsemi.com/pub/auto_id/public/
+DISTNAME=	mlpb103
 
 MAINTAINER=	phk@FreeBSD.org
 
diff --git a/comms/mserver/Makefile b/comms/mserver/Makefile
index d108f0ce252..5b9f9203ef4 100644
--- a/comms/mserver/Makefile
+++ b/comms/mserver/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	mserver
-# Version required:	0.23a
 # Date created:		21 May 1999
 # Whom:		Maxim Sobolev <sobomax@altavista.net>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mserver-0.23a
+PORTNAME=	mserver
+PORTVERSION=	0.23a
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.innet.be/pub/staff/carl/
 
diff --git a/comms/plp/Makefile b/comms/plp/Makefile
index 57fa9fde357..47b8a8f4e10 100644
--- a/comms/plp/Makefile
+++ b/comms/plp/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	Psion Link Protocol
-# Version required:			1.8
 # Date created:				Tue Nov 30 15:43:27 EST 1999
 # Whom:					Maurice Castro <maurice@serc.rmit.edu.au>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	plp_1_8
-PKGNAME=	plp-1.8
+PORTNAME=	plp
+PORTVERSION=	1.8
 CATEGORIES=	comms
 MASTER_SITES=	http://www.proudman51.freeserve.co.uk/psion/ \
 		http://people.FreeBSD.org/~kris/distfiles/
+DISTNAME=	${PORTNAME}_1_8
 
 MAINTAINER=	maurice@serc.rmit.edu.au
 
diff --git a/comms/qpage/Makefile b/comms/qpage/Makefile
index 518c0e727ab..9a9d39508cb 100644
--- a/comms/qpage/Makefile
+++ b/comms/qpage/Makefile
@@ -6,7 +6,8 @@
 # $FreeBSD$
 #
 
-DISTNAME=	qpage-3.2
+PORTNAME=	qpage
+PORTVERSION=	3.2
 CATEGORIES=	comms
 #MASTER_SITES=	http://www.qpage.org/download/
 MASTER_SITES=	http://people.FreeBSD.org/~fenner/
diff --git a/comms/seyon/Makefile b/comms/seyon/Makefile
index 70bcf89c274..f588af34e9a 100644
--- a/comms/seyon/Makefile
+++ b/comms/seyon/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	seyon
-# Version required:	2.14b or 2.14c
 # Date created:		3 October 1994
 # Whom:			Michael Elbel (me)
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Seyon-2.14b
-PKGNAME=	seyon-2.14b
+PORTNAME=	seyon
+PORTVERSION=	2.14b
 CATEGORIES=	comms
 MASTER_SITES=	ftp://sipb.mit.edu/pub/seyon/
-DISTFILES=	Seyon-2.14b-tar.Z
+DISTNAME=	Seyon-${PORTVERSION}
+EXTRACT_SUFX=	-tar.Z
 
 MAINTAINER=	me@FreeBSD.org
 
diff --git a/comms/snooper/Makefile b/comms/snooper/Makefile
index db29d1e12d5..42fe13ba21e 100644
--- a/comms/snooper/Makefile
+++ b/comms/snooper/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	snooper
-# Version required:	19991202
 # Date created:		4 May 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	snooper-19991202
-PKGNAME=	snooper-19991202
+PORTNAME=	snooper
+PORTVERSION=	1999.12.02
 CATEGORIES=	comms
 MASTER_SITES=   ftp://ftp.foretune.co.jp/pub/tools/snooper/
+DISTNAME=	snooper-19991202
 
 MAINTAINER=	itojun@itojun.org
 
diff --git a/comms/sredird/Makefile b/comms/sredird/Makefile
index 595231e5480..ced64c8c190 100644
--- a/comms/sredird/Makefile
+++ b/comms/sredird/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	sredird
-# Version required:	1.1.7
 # Date created:		19 Dec 1999
 # Whom:			Maxim Sobolev <sobomax@altavista.net>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sredird-1.1.7
+PORTNAME=	sredird
+PORTVERSION=	1.1.7
 CATEGORIES=	comms
 MASTER_SITES=	http://metalab.unc.edu/pub/Linux/system/serial/
 
diff --git a/comms/tkhylafax/Makefile b/comms/tkhylafax/Makefile
index 3fb9dd0c7e8..1f65905c491 100644
--- a/comms/tkhylafax/Makefile
+++ b/comms/tkhylafax/Makefile
@@ -1,13 +1,12 @@
-# New ports collection Makefile for:	tkhylafax-3.0
-# Version required:	3.0b2
+# New ports collection Makefile for:	tkhylafax
 # Date created:		Sun Jun  8 11:51:21 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tkhylafax-3.0b2
-PKGNAME=	tkhylafax-3.0
+PORTNAME=	tkhylafax
+PORTVERSION=	3.0b2
 CATEGORIES=	comms tk82
 MASTER_SITES=	http://www.NeoSoft.com/tcl/ftparchive/sorted/comm/tkhylafax-3.0b2/
 
diff --git a/comms/viewfax/Makefile b/comms/viewfax/Makefile
index 24bd4ad70de..04b7210d94b 100644
--- a/comms/viewfax/Makefile
+++ b/comms/viewfax/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    viewfax
-# Version required:     2.3
 # Date created:         16 sept 1995
 # Whom:                 jmz
 #
 # $FreeBSD$
 #
 
-DISTNAME=       viewfax-2.3
+PORTNAME=	viewfax
+PORTVERSION=	2.3
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/
 
diff --git a/comms/xcept/Makefile b/comms/xcept/Makefile
index b32fc6ce107..417ab631e8a 100644
--- a/comms/xcept/Makefile
+++ b/comms/xcept/Makefile
@@ -1,22 +1,22 @@
 # New ports collection makefile for:    xcept
-# Version required:     2.1.2
 # Date created:         Sep 1, 1996
 # Whom:                 joerg
 #
 # $FreeBSD$
 #
 
-DISTNAME=       xcept-2.1.2
+PORTNAME=	xcept
+PORTVERSION=	2.1.2
 CATEGORIES=	comms
-MASTER_SITES=   ${MASTER_SITE_LOCAL}
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
-MAINTAINER=     joerg@FreeBSD.org
+MAINTAINER=	joerg@FreeBSD.org
 
 USE_XLIB=	yes
 MAN1=		xcept.1
 MAN8=		ceptd.8
 MANCOMPRESSED=	maybe
 
-WRKSRC=		${WRKDIR}/XCept-2.1.2
+WRKSRC=		${WRKDIR}/XCept-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/comms/yaps/Makefile b/comms/yaps/Makefile
index 173b0f15479..06cec2c73ba 100644
--- a/comms/yaps/Makefile
+++ b/comms/yaps/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:    yaps
-# Version required:     0.96
 # Date created:         Di  29 Sep 1998 15:51:27 CEST
 # Whom:                 se
 #
 # $FreeBSD$
 #
 
-DISTNAME=       yaps-0.96
+PORTNAME=	yaps
+PORTVERSION=	0.96
 CATEGORIES=	comms
-MASTER_SITES=   ${MASTER_SITE_SUNSITE}
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/serialcomm/machines
 
-MAINTAINER=     se@FreeBSD.org
+MAINTAINER=	se@FreeBSD.org
 
 USE_GMAKE=	true
 
diff --git a/comms/zmtx-zmrx/Makefile b/comms/zmtx-zmrx/Makefile
index cec189741c4..78022b8f320 100644
--- a/comms/zmtx-zmrx/Makefile
+++ b/comms/zmtx-zmrx/Makefile
@@ -1,19 +1,19 @@
 # ex:ts=8
 # Ports collection makefile for:  zmtx-zmrx
-# Version required: 0.0
 # Date created:			  29 July 1996
 # Whom:				  David O'Brien <obrien@cs.ucdavis.edu>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	zmtx-zmrx
-PKGNAME=	zmtx-zmrx-1.02
+PORTNAME=	zmtx-zmrx
+PORTVERSION=	1.02
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.inria.fr/network/modem/  \
 		ftp://ftp.vex.net/pub/software/
 # see also comp.unix.sources for version 1.0
 # ftp://ftp.lth.se/pub/usenet/comp.sources.unix/volume28/zm/part01.gz
+DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.shar.gz
 
 MAINTAINER=	obrien@FreeBSD.org