PORTNAME/VERSION stuff

author: Michael Haro <mharo@FreeBSD.org> 2000-04-12 04:56:17 +0000
committer: Michael Haro <mharo@FreeBSD.org> 2000-04-12 04:56:17 +0000
commit: b7f08d10c0d0a613ef1f2d4f805e1e14fd1cfc4d (patch)
tree: 5385aaba8d145f303a49f4d03b2ae3374f09932a /emulators
parent: (1) Include ${.CURDIR}/../Makefile.inc before ${MASTERDIR}/../Makefile.inc (diff)
57 files changed, 155 insertions, 173 deletions
diff --git a/emulators/aftp/Makefile b/emulators/aftp/Makefile
index 180f8e69455f..76b601a02975 100644
--- a/emulators/aftp/Makefile
+++ b/emulators/aftp/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:   aftp
-# Version required:	1.0
 # Date created:		18th Febuary 1997
 # Last updated:		2nd August, 1998
 # Whom:			Joel Sutton <jsutton@bbcon.com.au>
@@ -7,10 +6,11 @@
 # $FreeBSD$
 #
 
-DISTNAME=	aftp
-PKGNAME=	aftp-1.0
+PORTNAME=	aftp
+PORTVERSION=	1.0
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.apple.asimov.net/pub/apple_II/utility/
+DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jsutton@bbcon.com.au
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 771858a1b2b3..299133e7b1fc 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,16 +1,16 @@
-# New ports collection makefile for:   Atari800-0.8.6
-# Version required:	0.8.6
+# New ports collection makefile for:   Atari800
 # Date created:		29th April, 1997
 # Whom:			Joel Sutton <jsutton@webnet.com.au>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Atari800-0.8.6
-PKGNAME=	atari800-0.8.6
+PORTNAME=	atari800
+PORTVERSION=	0.8.6
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.signus.demon.co.uk/Software/Portable/Atari800e/ \
 		http://cas3.zlin.vutbr.cz/~stehlik/a800/
+DISTNAME=	Atari800-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${EXTRA_FILES}
 
 MAINTAINER=	jsutton@bbcon.com.au
diff --git a/emulators/bfe/Makefile b/emulators/bfe/Makefile
index 3783e7bb8b9e..496b648a26f6 100644
--- a/emulators/bfe/Makefile
+++ b/emulators/bfe/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	bfe
-# Version required:     991102
 # Date created:		02 February 2000
 # Whom:			jhb
 #
 # $FreeBSD$
 #
 
-DISTNAME=       bfe-${DATE}
+PORTNAME=	bfe
+PORTVERSION=	991102
 CATEGORIES=     emulators
 MASTER_SITES=	http://www.qzx.com/bfe/
 EXTRACT_SUFX=	.tgz
@@ -18,8 +18,6 @@ RUN_DEPENDS=	bochs:${PORTSDIR}/emulators/bochs
 
 USE_X_PREFIX=	yes
 
-DATE=		991102
-
 WRKSRC=		${WRKDIR}/bfe
 
 do-install:
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 9484345ac54d..e91984f1beb0 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,21 +1,21 @@
 # ex:ts=8
 # Ports collection makefile for:  bochs
-# Version required: 0.0
 # Date created:			  16 December 1997
 # Whom:				  alex
 #
 # $FreeBSD$
 #
 
-DISTNAME=	bochs-${DATE}c
+PORTNAME=	bochs
+PORTVERSION=	2000_0104c
 CATEGORIES= 	emulators
 MASTER_SITES= 	ftp://ftp.bochs.com/pub/
+DISTFILE=	${PORTNAME}-${PORTVERSION}c
 
 MAINTAINER=	obrien@FreeBSD.org
 
 VGABIOS=	VGABIOS-elpin-2.20
 BIOS=		BIOS-bochs-990925a
-DATE= 		2000_0104
 
 USE_XLIB=	yes
 GNU_CONFIGURE=	YES
diff --git a/emulators/bsvc/Makefile b/emulators/bsvc/Makefile
index 0addd8f822cc..880f2781d049 100644
--- a/emulators/bsvc/Makefile
+++ b/emulators/bsvc/Makefile
@@ -1,16 +1,16 @@
 # New ports collection Makefile for:	bsvc
-# Version required:	2.1
 # Date created:		03-Mar-1997
 # Whom:			tenser@spitfire.ecsel.psu.edu
 #
 # $FreeBSD$
 #
 
-DISTNAME=	bsvc-2.1-src
-PKGNAME=	bsvc-2.1
+PORTNAME=	bsvc
+PORTVERSION=	2.1
 CATEGORIES=	emulators tk82
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	system/emulators
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	jseger@FreeBSD.org
 
diff --git a/emulators/cpmemu/Makefile b/emulators/cpmemu/Makefile
index af0655a99083..3fcaf7597cd8 100644
--- a/emulators/cpmemu/Makefile
+++ b/emulators/cpmemu/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:	cpm-emulator
-# Version required:	0.2.1.1
 # Date created:		28 June 1995
 # Whom:			janek@gaja.ipan.lublin.pl
 #
 # $FreeBSD$
 #
 
-DISTNAME=	cpm-0.2.1
-PKGNAME=	cpmemu-0.2.1.1
+PORTNAME=	cpmemu
+PORTVERSION=	0.2.1.1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		ftp://ftp.cdrom.com/pub/linux/slackware-4.0/source/extra-stuff/CPM-80-emulator/
 MASTER_SITE_SUBDIR=	system/emulators
+DISTNAME=	cpm-0.2.1
 
 PATCH_SITES=	${MASTER_SITE_SUNSITE}
 PATCH_SITE_SUBDIR=	system/emulators
diff --git a/emulators/cpmtools/Makefile b/emulators/cpmtools/Makefile
index fe1daff25784..0cccca37e9da 100644
--- a/emulators/cpmtools/Makefile
+++ b/emulators/cpmtools/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	cpm(1)
-# Version required:	1.1
 # Date created:		25 December 1994
 # Whom:			joerg
 #
 # $FreeBSD$
 #
 
-DISTNAME=	cpm-1.1
-PKGNAME=	cpmtools-1.1
+PORTNAME=	cpmtools
+PORTVERSION=	1.1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_LOCAL}
+DISTNAME=	cpm-${PORTVERSION}
 
 MAINTAINER=	joerg@FreeBSD.org
 
diff --git a/emulators/dlx/Makefile b/emulators/dlx/Makefile
index eebe5cdb0ab3..d5cf9dd1c895 100644
--- a/emulators/dlx/Makefile
+++ b/emulators/dlx/Makefile
@@ -1,16 +1,16 @@
 # ex:ts=8
 # Ports collection makefile for:  dlx
-# Version required: 0.0
 # Date created:			  Mon Dec 23, 1998
 # Whom:				  David O'Brien (obrien@NUXI.com)
 #
 # $FreeBSD$
 #
 
-DISTNAME=	dlx
-PKGNAME=	dlx-2.0
+PORTNAME=	dlx
+PORTVERSION=	2.0
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://max.stanford.edu/pub/hennessy-patterson.software/
+DISTFILE=	${PORTNAME}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	obrien@FreeBSD.org
diff --git a/emulators/fmsx/Makefile b/emulators/fmsx/Makefile
index da321435bccd..9861ac79bb25 100644
--- a/emulators/fmsx/Makefile
+++ b/emulators/fmsx/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    fMSX
-# Version required:     1.5
 # Date created:         15 Oct 1996
 # Whom:                 dk
 #
 # $FreeBSD$
 #
 
-DISTNAME=       fMSX
-PKGNAME=	fmsx-1.5
+PORTNAME=	fmsx
+PORTVERSION=	1.5
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.komkon.org/fms/fMSX/
+DISTNAME=       fMSX
 EXTRACT_SUFX=   .tar.Z
 
 MAINTAINER=	dk@farm.org
diff --git a/emulators/frodo/Makefile b/emulators/frodo/Makefile
index 99583f299b0d..411e5b7ab65e 100644
--- a/emulators/frodo/Makefile
+++ b/emulators/frodo/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	frodo
-# Version required:	4.1
 # Date created:		11 Dez 1997
 # Whom:			dirk.meyer@dinoex.sub.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	FrodoV4_1a.Src
-PKGNAME=	frodo-4.1
+PORTNAME=	frodo
+PORTVERSION=	4.1a
 CATEGORIES=	emulators tk82
 MASTER_SITES=	ftp://sunsite.unc.edu/pub/micro/commodore/crossplatform/emulators/unix/
+DISTNAME=	FrodoV4_1a.Src
 
 MAINTAINER=	dirk.meyer@dinoex.sub.org
 
diff --git a/emulators/hfs/Makefile b/emulators/hfs/Makefile
index cdeebe9e7055..a57bb3398f5c 100644
--- a/emulators/hfs/Makefile
+++ b/emulators/hfs/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    hfs
-# Version required:     0.37
 # Date created:         17 November 1994
 # Whom:                 jmz
 #
 # $FreeBSD$
 #
 
-DISTNAME=	hfs0_37
-PKGNAME=	hfs-0.37
+PORTNAME=	hfs
+PORTVERSION=	0.37
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.obs-besancon.fr/pub/outgoing/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/./_/}
 
 MAINTAINER=	jmz@FreeBSD.org
 
diff --git a/emulators/hfsutils/Makefile b/emulators/hfsutils/Makefile
index 0f18311dd17a..c0c5c142672c 100644
--- a/emulators/hfsutils/Makefile
+++ b/emulators/hfsutils/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	hfsutils
-# Version required:	3.2.6
 # Date Created:		7 Sep 1997
 # Whom:			Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	hfsutils-3.2.6
+PORTNAME=	hfsutils
+PORTVERSION=	3.2.6
 CATEGORIES=	emulators tk82
 MASTER_SITES=	ftp://ftp.mars.org/pub/hfs/
 
diff --git a/emulators/ines/Makefile b/emulators/ines/Makefile
index db1e502a5ce8..fee630db933e 100644
--- a/emulators/ines/Makefile
+++ b/emulators/ines/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	ines
-# Version required:	0.7
 # Date created:		02 November 1996
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	iNES10-FreeBSD-80x86-bin
-PKGNAME=	ines-1.0
+PORTNAME=	ines
+PORTVERSION=	1.0
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.komkon.org/fms/iNES/
+DISTNAME=	iNES10-FreeBSD-80x86-bin
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	nakai@FreeBSD.org
diff --git a/emulators/kmamerun/Makefile b/emulators/kmamerun/Makefile
index b7219f4ee748..8fd0138d8ec2 100644
--- a/emulators/kmamerun/Makefile
+++ b/emulators/kmamerun/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:   kmamerun
-# Version required:	0.3.0pre1
 # Date created:		24 Nov 1999
 # Whom:			Nick Sayer <nsayer@freebsd.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	kmamerun-0.3.0pre1
-PKGNAME=	kmamerun-0.3.0.1
+PORTNAME=	kmamerun
+PORTVERSION=	0.3.0.1
 CATEGORIES=	emulators kde
 MASTER_SITES=	ftp://ftp.sad.it/pub/kde/local/
+DISTNAME=	kmamerun-0.3.0pre1
 
 MAINTAINER=	nsayer@freebsd.org
 
diff --git a/emulators/ksnes9x/Makefile b/emulators/ksnes9x/Makefile
index ecfd2548126c..89023b186f89 100644
--- a/emulators/ksnes9x/Makefile
+++ b/emulators/ksnes9x/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	KSnes9x
-# Version required:	1.2
 # Date created:		12 Nov 1999
 # Whom:			Will Andrews <andrews@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ksnes9x-1.2
+PORTNAME=	ksnes9x
+PORTVERSION=	1.2
 CATEGORIES=	emulators
 MASTER_SITES=	http://people.FreeBSD.org/~will/distfiles/
 
diff --git a/emulators/linux_base-6/Makefile b/emulators/linux_base-6/Makefile
index 81c9e586a080..adf3d0102357 100644
--- a/emulators/linux_base-6/Makefile
+++ b/emulators/linux_base-6/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:    linux_base
-# Version required:     6.1
 # Date created:         Jul 7, 1999
 # Whom:                 marcel@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=		linux_base
-PKGNAME=		linux_base-6.1
+PORTNAME=		linux_base
+PORTVERSION=		6.1
 CATEGORIES=		emulators linux
 MASTER_SITES=		${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 DISTFILES=		${RPM_SET1} ${RPM_LDCONFIG} ${RPM_SET2} \
diff --git a/emulators/linux_base-62/Makefile b/emulators/linux_base-62/Makefile
index 81c9e586a080..adf3d0102357 100644
--- a/emulators/linux_base-62/Makefile
+++ b/emulators/linux_base-62/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:    linux_base
-# Version required:     6.1
 # Date created:         Jul 7, 1999
 # Whom:                 marcel@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=		linux_base
-PKGNAME=		linux_base-6.1
+PORTNAME=		linux_base
+PORTVERSION=		6.1
 CATEGORIES=		emulators linux
 MASTER_SITES=		${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 DISTFILES=		${RPM_SET1} ${RPM_LDCONFIG} ${RPM_SET2} \
diff --git a/emulators/linux_base-8/Makefile b/emulators/linux_base-8/Makefile
index 81c9e586a080..adf3d0102357 100644
--- a/emulators/linux_base-8/Makefile
+++ b/emulators/linux_base-8/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:    linux_base
-# Version required:     6.1
 # Date created:         Jul 7, 1999
 # Whom:                 marcel@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=		linux_base
-PKGNAME=		linux_base-6.1
+PORTNAME=		linux_base
+PORTVERSION=		6.1
 CATEGORIES=		emulators linux
 MASTER_SITES=		${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 DISTFILES=		${RPM_SET1} ${RPM_LDCONFIG} ${RPM_SET2} \
diff --git a/emulators/linux_base-rh-9/Makefile b/emulators/linux_base-rh-9/Makefile
index 81c9e586a080..adf3d0102357 100644
--- a/emulators/linux_base-rh-9/Makefile
+++ b/emulators/linux_base-rh-9/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:    linux_base
-# Version required:     6.1
 # Date created:         Jul 7, 1999
 # Whom:                 marcel@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=		linux_base
-PKGNAME=		linux_base-6.1
+PORTNAME=		linux_base
+PORTVERSION=		6.1
 CATEGORIES=		emulators linux
 MASTER_SITES=		${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 DISTFILES=		${RPM_SET1} ${RPM_LDCONFIG} ${RPM_SET2} \
diff --git a/emulators/linux_base-suse-9.1/Makefile b/emulators/linux_base-suse-9.1/Makefile
index 81c9e586a080..adf3d0102357 100644
--- a/emulators/linux_base-suse-9.1/Makefile
+++ b/emulators/linux_base-suse-9.1/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:    linux_base
-# Version required:     6.1
 # Date created:         Jul 7, 1999
 # Whom:                 marcel@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=		linux_base
-PKGNAME=		linux_base-6.1
+PORTNAME=		linux_base
+PORTVERSION=		6.1
 CATEGORIES=		emulators linux
 MASTER_SITES=		${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 DISTFILES=		${RPM_SET1} ${RPM_LDCONFIG} ${RPM_SET2} \
diff --git a/emulators/linux_base-suse-9.2/Makefile b/emulators/linux_base-suse-9.2/Makefile
index 81c9e586a080..adf3d0102357 100644
--- a/emulators/linux_base-suse-9.2/Makefile
+++ b/emulators/linux_base-suse-9.2/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:    linux_base
-# Version required:     6.1
 # Date created:         Jul 7, 1999
 # Whom:                 marcel@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=		linux_base
-PKGNAME=		linux_base-6.1
+PORTNAME=		linux_base
+PORTVERSION=		6.1
 CATEGORIES=		emulators linux
 MASTER_SITES=		${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 DISTFILES=		${RPM_SET1} ${RPM_LDCONFIG} ${RPM_SET2} \
diff --git a/emulators/linux_base-suse-9.3/Makefile b/emulators/linux_base-suse-9.3/Makefile
index 81c9e586a080..adf3d0102357 100644
--- a/emulators/linux_base-suse-9.3/Makefile
+++ b/emulators/linux_base-suse-9.3/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:    linux_base
-# Version required:     6.1
 # Date created:         Jul 7, 1999
 # Whom:                 marcel@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=		linux_base
-PKGNAME=		linux_base-6.1
+PORTNAME=		linux_base
+PORTVERSION=		6.1
 CATEGORIES=		emulators linux
 MASTER_SITES=		${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 DISTFILES=		${RPM_SET1} ${RPM_LDCONFIG} ${RPM_SET2} \
diff --git a/emulators/linux_base/Makefile b/emulators/linux_base/Makefile
index 81c9e586a080..adf3d0102357 100644
--- a/emulators/linux_base/Makefile
+++ b/emulators/linux_base/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:    linux_base
-# Version required:     6.1
 # Date created:         Jul 7, 1999
 # Whom:                 marcel@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=		linux_base
-PKGNAME=		linux_base-6.1
+PORTNAME=		linux_base
+PORTVERSION=		6.1
 CATEGORIES=		emulators linux
 MASTER_SITES=		${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
 DISTFILES=		${RPM_SET1} ${RPM_LDCONFIG} ${RPM_SET2} \
diff --git a/emulators/mastergear/Makefile b/emulators/mastergear/Makefile
index 0efd3d88ca52..c226f6897011 100644
--- a/emulators/mastergear/Makefile
+++ b/emulators/mastergear/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:   mastergear
-# Version required:    1.3
 # Date created:        02 November 1996
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	MG13-FreeBSD-80x86-bin
-PKGNAME=	mastergear-1.3
+PORTNAME=	mastergear
+PORTVERSION=	1.3
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.komkon.org/fms/MG/
+DISTNAME=	MG13-FreeBSD-80x86-bin
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	nakai@FreeBSD.org
diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index 43d40ce4a7e2..851c5c87aff6 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    mtools
-# Version required:     3.9.6
 # Date created:         5 October 1994
 # Whom:                 jmz
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mtools-3.9.6
+PORTNAME=	mtools
+PORTVERSION=	3.9.6
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.tux.org/pub/knaff/mtools/  \
 		http://mtools.linux.lu/
diff --git a/emulators/osf1_base/Makefile b/emulators/osf1_base/Makefile
index 7cb865d1f339..1a427fcfe9ea 100644
--- a/emulators/osf1_base/Makefile
+++ b/emulators/osf1_base/Makefile
@@ -1,16 +1,16 @@
 # ex:ts=8
 # Ports collection makefile for:  osf1_base
-# Version required: 0.0
 # Date created:			  Mon Feb 03, 1998
 # Whom:				  David O'Brien (obrien@NUXI.com)
 #
 # $FreeBSD$
 #
 
-DISTNAME=	netscape-4.7-1.alpha
-PKGNAME=	osf1_base-4.0f
+PORTNAME=	osf1_base
+PORTVERSION=	4.0f
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.digital.com/private/netscape/
+DISTNAME=	netscape-4.7-1.alpha
 EXTRACT_SUFX=	.rpm
 
 MAINTAINER=	obrien@FreeBSD.org
diff --git a/emulators/pcemu/Makefile b/emulators/pcemu/Makefile
index e868a1e40105..073c7e662bd9 100644
--- a/emulators/pcemu/Makefile
+++ b/emulators/pcemu/Makefile
@@ -1,15 +1,13 @@
 # New ports collection makefile for:	pcemu(1)
-# Version required:	1.01alpha
 # Date created:		7 March 1995
 # Whom:			joerg
 #
 # $FreeBSD$
 #
 
-DISTNAME=	pcemu1.01alpha
-PKGNAME=	pcemu-1.01b
+PORTNAME=	pcemu
+PORTVERSION=	1.01b
 CATEGORIES=	emulators
-
 #
 # This could in theory become a chicken-and-egg problem.  Anyway,
 # wcarchive is well connected, and the distfile hasn't been changed
@@ -22,6 +20,7 @@ MASTER_SITES+=	ftp://ftp.interface-business.de/pub/outgoing/
 #
 # This is the original master site, but better use a well-connected server
 MASTER_SITES+=	ftp://ftp.cs.bris.ac.uk/pub/users/hedley/
+DISTNAME=	pcemu1.01alpha
 
 MAINTAINER=	joerg@FreeBSD.org
 
diff --git a/emulators/prodosemu/Makefile b/emulators/prodosemu/Makefile
index 177c81d0b1e7..12a576a54b00 100644
--- a/emulators/prodosemu/Makefile
+++ b/emulators/prodosemu/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	prodosemu
-# Version required:	0.1
 # Date created:		18th February 1997
 # Whom:			Joel Sutton <sutton@aardvark.apana.org.au>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	prodosemu.v0.1
-PKGNAME=	prodosemu-0.1
+PORTNAME=	prodosemu
+PORTVERSION=	0.1
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.apple.asimov.net/pub/apple_II/emulators/prodosemu/ \
 		ftp://apple2.caltech.edu/pub/apple2/emulators/
+DISTNAME=	${PORTNAME}.v${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/emulators/quasi88/Makefile b/emulators/quasi88/Makefile
index da7e4b8da11d..a3f2e5bf073d 100644
--- a/emulators/quasi88/Makefile
+++ b/emulators/quasi88/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	QUASI88
-# Version required:	0.3.2
 # Date created:		22 May 1999
 # Whom:				Nishika <nishika@cheerful.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	quasi88-0.3.2
+PORTNAME=	quasi88
+PORTVERSION=	0.3.2
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.117.ne.jp/~show/pc8801/
 EXTRACT_SUFX=   .tgz
diff --git a/emulators/rtc/Makefile b/emulators/rtc/Makefile
index c9ad04218127..b23a8edc7f76 100644
--- a/emulators/rtc/Makefile
+++ b/emulators/rtc/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	rtc
-# Version required:	2000.03.28
 # Date created:		28 March 2000
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	rtc-2000.03.28
+PORTNAME=	rtc
+PORTVERSION=	2000.03.28
 CATEGORIES=	emulators linux
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/emulators/sim/Makefile b/emulators/sim/Makefile
index 37d1358e0fc9..258c318ca352 100644
--- a/emulators/sim/Makefile
+++ b/emulators/sim/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    sim
-# Version required:     2.3d
 # Date created:         7 November 1997
 # Whom:			jraynard
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sim_2.3d
-PKGNAME=	sim-2.3d
+PORTNAME=	sim
+PORTVERSION=	2.3d
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://minnie.cs.adfa.oz.au/pub/PDP-11/Sims/Supnik_2.3/sources/ \
 		http://people.FreeBSD.org/~jedgar/distfiles/
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	jedgar@FreeBSD.org
 
diff --git a/emulators/sim6811/Makefile b/emulators/sim6811/Makefile
index 9f9dbaa5eb0f..08ae86085188 100644
--- a/emulators/sim6811/Makefile
+++ b/emulators/sim6811/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    6811sim
-# Version required:     1.6
 # Date created:         Thu Sep 14 11:10:01 CDT 1995
 # Whom:                 erich@rrnet.com
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sim
-PKGNAME=	sim6811-1.6
+PORTNAME=	sim6811
+PORTVERSION=	1.6
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://crl.nmsu.edu/pub/non-lexical/6811/
+DISTNAME=	sim
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index 37d1358e0fc9..258c318ca352 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    sim
-# Version required:     2.3d
 # Date created:         7 November 1997
 # Whom:			jraynard
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sim_2.3d
-PKGNAME=	sim-2.3d
+PORTNAME=	sim
+PORTVERSION=	2.3d
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://minnie.cs.adfa.oz.au/pub/PDP-11/Sims/Supnik_2.3/sources/ \
 		http://people.FreeBSD.org/~jedgar/distfiles/
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	jedgar@FreeBSD.org
 
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 7ebbb9019387..df8f2a119f3c 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    snes9x
-# Version required:     1.26
 # Date created:         20 July 1997
 # Whom:                 Yukihiro Nakai<Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	s9xs129
-PKGNAME=	snes9x-1.29
+PORTNAME=	snes9x
+PORTVERSION=	1.29
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.snes9x.com/zips/
+DISTNAME=	s9xs129
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index f86ac068b9c9..e5a1c4d5ccbf 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -1,16 +1,16 @@
 # ex:ts=8
 # Ports collection makefile for:  spim
-# Version required: 0.0
 # Date created:			  Mon Oct 28, 1996
 # Whom:				  David O'Brien (obrien@cs.ucdavis.edu)
 #
 # $FreeBSD$
 #
 
-DISTNAME=	spim5.9
-PKGNAME=	spim-5.9
+PORTNAME=	spim
+PORTVERSION=	5.9
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/pub/spim/Old_Versions/
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index eba187ea1272..ed4a5ff39ece 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:   	stella-1.1
-# Version required:			1.1
 # Date created:				March 4, 1999
 # Whom:					Jacques Vidrine <nectar@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	stella-1.1-src
-PKGNAME=	stella-1.1
+PORTNAME=	stella
+PORTVERSION=	1.1
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.eos.ncsu.edu/pub/bsvc/stella/1.1/ \
 		http://www.nectar.com/distfiles/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	nectar@FreeBSD.org
 
diff --git a/emulators/stonx/Makefile b/emulators/stonx/Makefile
index 520b54450a8c..367dbe1282dc 100644
--- a/emulators/stonx/Makefile
+++ b/emulators/stonx/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    STonX
-# Version required:     0.6.7
 # Date created:         3rd August, 1997
 # Whom:                 Tobias Reifenberger <tr@freebsd.mayn.de>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	STonX-0.6.7-epsilon
-PKGNAME=	stonx-0.6.7e
+PORTNAME=	stonx
+PORTVERSION=	0.6.7e
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.complang.tuwien.ac.at/pub/nino/stonx-current/
+DISTNAME=	STonX-0.6.7-epsilon
 
 MAINTAINER=	treif@mayn.de
 
diff --git a/emulators/tkhfs/Makefile b/emulators/tkhfs/Makefile
index 8e64209d3f35..b5f58365cfbc 100644
--- a/emulators/tkhfs/Makefile
+++ b/emulators/tkhfs/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    tkhfs
-# Version required:     1.27
 # Date created:         17 November 1994
 # Whom:                 jmz
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tkhfs
-PKGNAME=	tkhfs-1.27
+PORTNAME=	tkhfs
+PORTVERSION=	1.27
 CATEGORIES=	emulators tk82
 MASTER_SITES=	ftp://ftp.obs-besancon.fr/pub/outgoing/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	jmz@FreeBSD.org
 
diff --git a/emulators/truereality/Makefile b/emulators/truereality/Makefile
index 52ef02cde26a..ac4cfd2b73b9 100644
--- a/emulators/truereality/Makefile
+++ b/emulators/truereality/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	truereality
-# Version required:	1999062900
 # Date Created:		28 November 1999
 # Whom:			Mario S F Ferreira <lioux@linf.unb.br> et al.
 #
 # $FreeBSD$
 #
 
-DISTNAME=	TrueReality-${DATE}
-PKGNAME=	truereality-${DATE}
+PORTNAME=	truereality
+PORTVERSION=	1999062900
 CATEGORIES=	emulators devel
 MASTER_SITES=	http://www.emuhq.com/emulators/
+DISTNAME=	TrueReality-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	lioux@linf.unb.br
@@ -24,8 +24,6 @@ USE_XLIB=	yes
 
 WRKSRC=		${WRKDIR}/TrueReality/Source
 
-DATE=		1999062900
-
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/TrueReality ${PREFIX}/bin
 	@${LN} -sf ${PREFIX}/bin/TrueReality ${PREFIX}/bin/truereality
diff --git a/emulators/tuxnes/Makefile b/emulators/tuxnes/Makefile
index f962d75b81eb..79513f47fa3f 100644
--- a/emulators/tuxnes/Makefile
+++ b/emulators/tuxnes/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	tuxnes
-# Version required:	0.73
 # Date created:		13 Feb 2000
 # Whom:			Jeroen Ruigrok van der Werven <asmodai@freebsd.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tuxnes-0.73
+PORTNAME=	tuxnes
+PORTVERSION=	0.73
 CATEGORIES=	emulators
 MASTER_SITES=	http://people.freebsd.org/~asmodai/mirror/ \
 		http://tmmm.simplenet.com/tuxnes/packages/
diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile
index b0a74010291a..6836069888ec 100644
--- a/emulators/twin/Makefile
+++ b/emulators/twin/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	Willows
-# Version required:	1999.06.16
 # Date created:		5 June 1999
 # Whom:			Pedro F. Giffuni
 #
 # $FreeBSD$
 #
 
-DISTNAME=	twin-19991230
-PKGNAME=	twin-1999.12.30
+PORTNAME=	twin
+PORTVERSION=	1999.12.30
 CATEGORIES=	emulators devel
 MASTER_SITES=	ftp://ftp.willows.com/pub/development/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
 
 MAINTAINER=	giffunip@asme.org
 
diff --git a/emulators/vMac/Makefile b/emulators/vMac/Makefile
index 57ff68ec0c9d..c1bde3422830 100644
--- a/emulators/vMac/Makefile
+++ b/emulators/vMac/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:	vMac
-# Version required:		 	0.1.9.3
 # Date created:				Jul 11th 1999
 # Whom:					troll
 #
 # $FreeBSD$
 #
 
-DISTNAME=		vMac-0.1.9.3-src
-PKGNAME=		vMac-0.1.9.3
+PORTNAME=		vMac
+PORTVERSION=		0.1.9.3
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.vmac.org/download/XWindows/
+DISTNAME=		${PORTNAME}-${PORTVERSION}-src
 EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		troll@digitalspark.net
 
 MAKEFILE=		Makefile
-WRKSRC=			${WRKDIR}/vMac-0.1.9.3
+WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_GMAKE=	 	yes
 HAS_CONFIGURE=		yes
 USE_XLIB=		yes
diff --git a/emulators/vgb/Makefile b/emulators/vgb/Makefile
index 9dc93700e32e..c8a32caee2ea 100644
--- a/emulators/vgb/Makefile
+++ b/emulators/vgb/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:   vgb
-# Version required:    0.7
 # Date created:        31 October 1996
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	VGB
-PKGNAME=	vgb-0.7
+PORTNAME=	vgb
+PORTVERSION=	0.7
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_LOCAL}
+DISTNAME=	VGB
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	nakai@FreeBSD.org
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index f74b3b36829a..ac358531fa15 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,11 +1,11 @@
 # New ports collection makefile for:	vice
-# Version required:	1.2
 # Date created:		Mar 28, 1998
 # Whom:			dchapes@ddm.on.ca
 #
 # $FreeBSD$
 
-DISTNAME=	vice-1.2
+PORTNAME=	vice
+PORTVERSION=	1.2
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/
 
diff --git a/emulators/vmsbackup/Makefile b/emulators/vmsbackup/Makefile
index 65b59f12d7dc..0136101792cb 100644
--- a/emulators/vmsbackup/Makefile
+++ b/emulators/vmsbackup/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:	vmsbackup
-# Version required:	3.0
 # Date created:		18 Apr 1994
 # Whom:			Jonathan M. Bresler (jmb)
 #
 # $FreeBSD$
 #
 
-DISTNAME=	vmsbackup
-PKGNAME=	vmsbackup-3.0
+PORTNAME=	vmsbackup
+PORTVERSION=	3.0
 CATEGORIES=	emulators sysutils
 MASTER_SITES=	ftp://ftp.cs.uni-sb.de/pub/utils/
 # slightly different version
 # MASTER_SITES+=	ftp://ftp.uni-passau.de/pub/unix/system/backup/
+DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jmb@FreeBSD.org
diff --git a/emulators/vmware/Makefile b/emulators/vmware/Makefile
index 8b9a37e8e573..9d6f5fc8ac14 100644
--- a/emulators/vmware/Makefile
+++ b/emulators/vmware/Makefile
@@ -1,5 +1,4 @@
 # ports collection makefile for:	VMware 1.1.2 for Linux
-# Version required:	1.1.2
 # Date created:		Fri 26 Nov 19:16:47 EST 1999
 # Whom:			vns@delta.odessa.ua
 #
@@ -7,8 +6,8 @@
 # $vmFreeBSD: vmware/vmmon-only/freebsd/port/Makefile,v 1.8 1999/12/17 00:38:27 vsilyaev Exp $
 #
 
-DISTNAME=	VMware-1.1.2-364
-PKGNAME=	vmware-1.1.2.364
+PORTNAME=	vmware
+PORTVERSION=	1.1.2.364
 CATEGORIES=	emulators linux
 MASTER_SITES=	http://www4.vmware.com/software/ \
 		http://vmware-svca.www.conxion.com/software/ \
@@ -17,6 +16,7 @@ MASTER_SITES=	http://www4.vmware.com/software/ \
 		http://www.vmware.co.uk/software/ \
 		http://mirror.aarnet.edu.au/pub/vmware/software/ \
 		ftp://mirror.aarnet.edu.au/pub/vmware/software/
+DISTNAME=	VMware-1.1.2-364
 
 PATCH_SITES=	http://www.mindspring.com/~vsilyaev/vmware/files/ \
 		ftp://mirror.aarnet.edu.au/pub/vmware/freebsd/ \
diff --git a/emulators/vmware2/Makefile b/emulators/vmware2/Makefile
index 022d34e1ae79..5a21a0e5fe01 100644
--- a/emulators/vmware2/Makefile
+++ b/emulators/vmware2/Makefile
@@ -1,5 +1,4 @@
 # ports collection makefile for:	VMware 2.0 for Linux
-# Version required:	2.0 - Build 476
 # Date created:		Fri 26 Nov 19:16:47 EST 1999
 # Whom:			vns@delta.odessa.ua
 #
@@ -7,8 +6,8 @@
 # $vmFreeBSD: vmware/vmmon-only/freebsd/port/Makefile,v 1.9 2000/01/23 22:29:24 vsilyaev Exp $
 #
 
-DISTNAME=	VMware-2.0-476
-PKGNAME=	vmware2-2.0.476
+PORTNAME=	vmware2
+PORTVERSION=	2.0.476
 CATEGORIES=	emulators linux
 MASTER_SITES=	http://www4.vmware.com/software/ \
 		http://vmware-svca.www.conxion.com/software/ \
@@ -17,6 +16,7 @@ MASTER_SITES=	http://www4.vmware.com/software/ \
 		http://www.vmware.co.uk/software/ \
 		http://mirror.aarnet.edu.au/pub/vmware/software/ \
 		ftp://mirror.aarnet.edu.au/pub/vmware/software/
+DISTNAME=	VMware-2.0-476
 
 PATCH_SITES=	http://www.mindspring.com/~vsilyaev/vmware/files/ \
 		ftp://mirror.aarnet.edu.au/pub/vmware/freebsd/ \
diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile
index 022d34e1ae79..5a21a0e5fe01 100644
--- a/emulators/vmware3/Makefile
+++ b/emulators/vmware3/Makefile
@@ -1,5 +1,4 @@
 # ports collection makefile for:	VMware 2.0 for Linux
-# Version required:	2.0 - Build 476
 # Date created:		Fri 26 Nov 19:16:47 EST 1999
 # Whom:			vns@delta.odessa.ua
 #
@@ -7,8 +6,8 @@
 # $vmFreeBSD: vmware/vmmon-only/freebsd/port/Makefile,v 1.9 2000/01/23 22:29:24 vsilyaev Exp $
 #
 
-DISTNAME=	VMware-2.0-476
-PKGNAME=	vmware2-2.0.476
+PORTNAME=	vmware2
+PORTVERSION=	2.0.476
 CATEGORIES=	emulators linux
 MASTER_SITES=	http://www4.vmware.com/software/ \
 		http://vmware-svca.www.conxion.com/software/ \
@@ -17,6 +16,7 @@ MASTER_SITES=	http://www4.vmware.com/software/ \
 		http://www.vmware.co.uk/software/ \
 		http://mirror.aarnet.edu.au/pub/vmware/software/ \
 		ftp://mirror.aarnet.edu.au/pub/vmware/software/
+DISTNAME=	VMware-2.0-476
 
 PATCH_SITES=	http://www.mindspring.com/~vsilyaev/vmware/files/ \
 		ftp://mirror.aarnet.edu.au/pub/vmware/freebsd/ \
diff --git a/emulators/vpce/Makefile b/emulators/vpce/Makefile
index d4b1f912f22c..4f8b74d9b07a 100644
--- a/emulators/vpce/Makefile
+++ b/emulators/vpce/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:   vpce
-# Version required:    0.3f
 # Date created:        20 August 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	vpce03f_freebsd
-PKGNAME=	vpce-0.3f
+PORTNAME=	vpce
+PORTVERSION=	0.3f
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.fortunecity.com/roswell/vanthal/10/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}_freebsd
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	nakai@FreeBSD.org
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 030d8046190e..12aeab4eb86f 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,24 +1,23 @@
 # New ports collection makefile for:    wine
-# Version required:     980517
 # Date created:         Sa   9 Nov 1996 00:52:22 MET
 # Whom:			se
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Wine-${DATE}
-PKGNAME=	wine-99.11.14
+PORTNAME=	wine
+PORTVERSION=	99.11.14
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
+DISTNAME=	Wine-${PORTVERSION:S/.//g}
 
 MAINTAINER=	se@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		GL.14:${PORTSDIR}/graphics/Mesa3
 
-DATE=		991114
-WRKSRC=		${WRKDIR}/wine-${DATE}
+WRKSRC=		${WRKDIR}/wine-${PORTVERSION:S/.//g}
 GNU_CONFIGURE=	yes
 MAN1=		wine.1
 MAN5=		wine.conf.5
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 030d8046190e..12aeab4eb86f 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,24 +1,23 @@
 # New ports collection makefile for:    wine
-# Version required:     980517
 # Date created:         Sa   9 Nov 1996 00:52:22 MET
 # Whom:			se
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Wine-${DATE}
-PKGNAME=	wine-99.11.14
+PORTNAME=	wine
+PORTVERSION=	99.11.14
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
+DISTNAME=	Wine-${PORTVERSION:S/.//g}
 
 MAINTAINER=	se@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		GL.14:${PORTSDIR}/graphics/Mesa3
 
-DATE=		991114
-WRKSRC=		${WRKDIR}/wine-${DATE}
+WRKSRC=		${WRKDIR}/wine-${PORTVERSION:S/.//g}
 GNU_CONFIGURE=	yes
 MAN1=		wine.1
 MAN5=		wine.conf.5
diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile
index 86934996760f..d6150973ebeb 100644
--- a/emulators/x48/Makefile
+++ b/emulators/x48/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    x48
-# Version required:  0.4.0   
 # Date created:         Thu Oct 24 13:10:59 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	x48-0.4.0
+PORTNAME=	x48
+PORTVERSION=	0.4.0
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	system/emulators
diff --git a/emulators/xgs/Makefile b/emulators/xgs/Makefile
index 8bd20c995594..cf3180332576 100644
--- a/emulators/xgs/Makefile
+++ b/emulators/xgs/Makefile
@@ -1,17 +1,14 @@
 # New ports collection makefile for:	xgs
-# Version required:	0.50
 # Date created:		2nd May, 1997
 # Whom:			Joel Sutton <sutton@aardvark.apana.org.au>
 #
 # $FreeBSD$
 #
-
 # This is the stable release of the xgs emulator. Sound support is
 # currently broken.
 
-# Distfile collection and extraction stuff
-#
-DISTNAME=	xgs-0.50
+PORTNAME=	xgs
+PORTVERSION=	0.50
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.inwards.com/xgs/ \
 		ftp://ftp.apple.asimov.net/pub/apple_II/emulators/rom_images/
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index b83f2f596177..d91e26d3c0e7 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    xmame
-# Version required:     0.36b3.1
 # Date created:         4 Sep 1999
 # Whom:                 Donald Burr <dburr@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xmame-0.36b3.1
+PORTNAME=	xmame
+PORTVERSION=	0.36b3.1
 CATEGORIES=	emulators
 MASTER_SITES=	http://xmame.retrogames.com/download/ \
 		ftp://ftp.kaupp.cx/pub/xmame/ \
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index ed47be52127c..afd6fb70758d 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	xmess
-# Version required:			0.2b4.1
 # Date created:				Tue Aug 17 00:21:10 MET DST 1999
 # Whom:					nox@jelal.kn-bremen.de
 #
 # $FreeBSD$
 #
 
-DISTNAME=	unix02s4
-PKGNAME=	xmess-0.2b4.1
+PORTNAME=	xmess
+PORTVERSION=	0.2b4.1
 CATEGORIES=	emulators
 MASTER_SITES=	http://mess.emuverse.com/files/ \
 		http://www.vintagegaming.com/hosted/vectrex/
+DISTNAME=	unix02s4
 DISTFILES=	${DISTNAME}.tgz pdp1.zip
 
 #MAINTAINER=	mycroft@NetBSD.ORG	# NetBSD
diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile
index 68cfa26b8cb7..0150cab6d03a 100644
--- a/emulators/xsystem35/Makefile
+++ b/emulators/xsystem35/Makefile
@@ -1,15 +1,15 @@
 # ports collection makefile for:	AliceSoft System 3.5 on X
-# Version required:	1.0.1
 # Date created:		24 Oct 1998
 # Whom:			Seiichirou Hiraoka
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xsystem35-1.2.5-1
-PKGNAME=	xsystem35-1.2.5.1
+PORTNAME=	xsystem35
+PORTVERSION=	1.2.5.1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.aist-nara.ac.jp/~masaki-c/private/unitbase/xsys35/down/
+DISTNAME=	xsystem35-1.2.5-1
 
 MAINTAINER=	k5@cheerful.com
 
diff --git a/emulators/xzx/Makefile b/emulators/xzx/Makefile
index e2889257fc51..e51f0b0e826a 100644
--- a/emulators/xzx/Makefile
+++ b/emulators/xzx/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xzx
-# Version required:     2.9.0
 # Date created:         13 Nov 1997
 # Whom:                 Sheldon Hearn <axl@iafrica.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xzx-2.9.1
+PORTNAME=	xzx
+PORTVERSION=	2.9.1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR= system/emulators/zx
author	Michael Haro <mharo@FreeBSD.org>	2000-04-12 04:56:17 +0000
committer	Michael Haro <mharo@FreeBSD.org>	2000-04-12 04:56:17 +0000
commit	b7f08d10c0d0a613ef1f2d4f805e1e14fd1cfc4d (patch)
tree	5385aaba8d145f303a49f4d03b2ae3374f09932a /emulators
parent	(1) Include ${.CURDIR}/../Makefile.inc before ${MASTERDIR}/../Makefile.inc (diff)