PORTNAME / PORTVERSION syntax conversion

34 files changed, 91 insertions, 94 deletions

diff --git a/graphics/4va/Makefile b/graphics/4va/Makefile
index ba898e9..cc671f7 100644
--- a/graphics/4va/Makefile
+++ b/graphics/4va/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	4va
-# Version required:	1.21
 # Date created:		26 July 1998
 # Whom:			Malte Lance <malte.lance@gmx.net>
 #
 # $FreeBSD$
 #
 
-DISTNAME=		4va-1.21
+PORTNAME=		4va
+PORTVERSION=		1.21
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/graphics/hacks/X
diff --git a/graphics/Cgraph/Makefile b/graphics/Cgraph/Makefile
index ddbb76c..04f384e 100644
--- a/graphics/Cgraph/Makefile
+++ b/graphics/Cgraph/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	cgraph
-# Version required:	2.04
 # Date created:		25 September 1998
 # Whom:			Anton Berezin <tobez@plab.ku.dk>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Cgraph2.04
-PKGNAME=	Cgraph-2.04
+PORTNAME=	Cgraph
+PORTVERSION=	2.04
 CATEGORIES=	graphics
 MASTER_SITES=	http://totoro.berkeley.edu/software/
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	tobez@plab.ku.dk
 
diff --git a/graphics/EZWGL/Makefile b/graphics/EZWGL/Makefile
index db1c361..76df26f 100644
--- a/graphics/EZWGL/Makefile
+++ b/graphics/EZWGL/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	EZWGL
-# Version required:			1.40
 # Date created:				4 May 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	EZWGL-1.40c
+PORTNAME=	EZWGL
+PORTVERSION=	1.40c
 CATEGORIES=	graphics devel
 MASTER_SITES=	ftp://ftp.ma.utexas.edu/pub/mzou/
 DISTFILES=	EZWGL-1.40-doc.tgz ${DISTNAME}-src.tgz
diff --git a/graphics/GIFgraph/Makefile b/graphics/GIFgraph/Makefile
index 7da3685..873b67a 100644
--- a/graphics/GIFgraph/Makefile
+++ b/graphics/GIFgraph/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	p5-GIFgraph
-# Version required:			1.01
 # Date created:				Nov 9, 1998
 # Whom:					laskavy@gambit.msk.su
 #
 # $FreeBSD$
 #
 
-DISTNAME=	GIFgraph-1.10
-PKGNAME=	p5-${DISTNAME}
+PORTNAME=	p5-GIFgraph
+PORTVERSION=	1.10
 CATEGORIES=	graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	GIFgraph
+DISTNAME=	GIFgraph-${PORTVERSION}
 
 MAINTAINER=	laskavy@gambit.msk.su
 
diff --git a/graphics/Hermes/Makefile b/graphics/Hermes/Makefile
index c67a262..daa4a81 100644
--- a/graphics/Hermes/Makefile
+++ b/graphics/Hermes/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	Hermes
-# Version required:			1.2.5
 # Date created:				29 April 1999
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Hermes-1.2.5
+PORTNAME=	Hermes
+PORTVERSION=	1.2.5
 CATEGORIES=	graphics
 MASTER_SITES=	http://hermes.terminal.at/files/
 
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 08f5b4d..79db2af3 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	ImageMagick
-# Version required:     5.1.1
 # Date created:		15 November 1994
 # Whom:			torstenb
 #
 # $FreeBSD$
 #
 
-DISTNAME=       ImageMagick-5.1.1
+PORTNAME=	ImageMagick
+PORTVERSION=	5.1.1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://people.FreeBSD.org/~asami/distfiles/ \
 		ftp://ftp.wizards.dupont.com/pub/ImageMagick/ \
@@ -31,7 +31,7 @@ BUILD_DEPENDS=  bzip2:${PORTSDIR}/archivers/bzip2 \
 		mpeg2decode:${PORTSDIR}/graphics/mpeg2codec \
 		gs:${PORTSDIR}/print/ghostscript55
 
-MAN1=   ImageMagick.1 animate.1 combine.1 convert.1 display.1 identify.1 \
+MAN1=	ImageMagick.1 animate.1 combine.1 convert.1 display.1 identify.1 \
 	import.1 mogrify.1 montage.1
 MAN3=	Image::Magick.3
 MAN4=	miff.4
@@ -45,8 +45,8 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --enable-shared --with-perl=${PERL5} \
 CONFIGURE_ARGS+= --enable-lzw
 .endif
 USE_PERL5=	YES
-USE_XLIB=       YES
-CONFIGURE_ENV=  LDFLAGS="$(LDFLAGS) -L${WRKSRC}/magick/.libs"
+USE_XLIB=	YES
+CONFIGURE_ENV=	LDFLAGS="$(LDFLAGS) -L${WRKSRC}/magick/.libs"
 
 pre-configure:
 	${RM} -f ${WRKSRC}/config.cache
diff --git a/graphics/Mesa3/Makefile b/graphics/Mesa3/Makefile
index e92df7a..afacfec 100644
--- a/graphics/Mesa3/Makefile
+++ b/graphics/Mesa3/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:    Mesa
-# Version required:     3.1
 # Date created:         Tue Feb  7 12:02:49  1995
 # Whom:                 hsu
 #
 # $FreeBSD$
 #
 
-DISTNAME=	MesaLib-${VERSION}
-PKGNAME=	Mesa-${VERSION}
+PORTNAME=	Mesa
+PORTVERSION=	3.1
 CATEGORIES=	graphics
 MASTER_SITES= 	http://download.sourceforge.net/mesa3d/ \
 		ftp://iris.ssec.wisc.edu/pub/Mesa/ \
 		ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} MesaDemos-${VERSION}.tar.gz
+DISTFILES=	MesaLib-${PORTVERSION}${DISTNAME}${EXTRACT_SUFX} \
+		MesaDemos-${VERSION}.tar.gz
 
 MAINTAINER=	jseger@FreeBSD.org
 
@@ -21,7 +21,6 @@ LIB_DEPENDS=	ggi.2:${PORTSDIR}/graphics/libggi
 CONFIGURE_ARGS+=--with-ggi=${LOCALBASE}
 .endif
 
-VERSION=	3.1
 GLVER=		14
 GLUTVER=	3
 WRKSRC=		${WRKDIR}/${PKGNAME}
diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index 730da09..1b82b37 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	aalib
-# Version required:			1.2
 # Date created:				9 Dec 1997
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	aalib-1.2
+PORTNAME=	aalib
+PORTVERSION=	1.2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.ta.jcu.cz/pub/aa/
 
diff --git a/graphics/aero/Makefile b/graphics/aero/Makefile
index 275538c..b7d45b3 100644
--- a/graphics/aero/Makefile
+++ b/graphics/aero/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    aero
-# Version required:     1.5.2
 # Date created:         Mon Aug 28 13:35:31 CDT 1995
 # Whom:                 erich@rrnet.com
 #
 # $FreeBSD$
 #
 
-DISTNAME=	aero_1.7.0_src
-PKGNAME=	aero-1.7.0
+PORTNAME=	aero
+PORTVERSION=	1.7.0
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.ee.uwa.edu.au/users/braunl/aero/
+DISTNAME=	${PORTNAME}_${PORTVERSION}_src
 
 MAINTAINER=	erich@FreeBSD.org
 
diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile
index 6635db5..9207eb8 100644
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -1,16 +1,16 @@
 # New ports collection Makefile for: aview
-# Version required:     1.2
 # Date created:         Dec 18 1997
 # Whom:                 frankch@waru.life.nthu.edu.tw
 #
 # $FreeBSD$
 #
 
-DISTNAME=       aview-1.2
-CATEGORIES=     graphics
-MASTER_SITES=   ftp://ftp.ta.jcu.cz/pub/aa/
+PORTNAME=	aview
+PORTVERSION=	1.2
+CATEGORIES=	graphics
+MASTER_SITES=	ftp://ftp.ta.jcu.cz/pub/aa/
 
-MAINTAINER=     frankch@waru.life.nthu.edu.tw
+MAINTAINER=	frankch@waru.life.nthu.edu.tw
 
 RUN_DEPENDS=	anytopnm:${PORTSDIR}/graphics/netpbm \
 		convert:${PORTSDIR}/graphics/ImageMagick
diff --git a/graphics/camediaplay/Makefile b/graphics/camediaplay/Makefile
index 82373a6..238e0f4 100644
--- a/graphics/camediaplay/Makefile
+++ b/graphics/camediaplay/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	camediaplay
-# Version required:	19991202
 # Date created:		2 May 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	camediaplay-19991202
+PORTNAME=	camediaplay
+PORTVERSION=	19991202
 CATEGORIES=	graphics
 MASTER_SITES=   ftp://ftp.itojun.org/pub/digi-cam/C-400L/unix/ \
 		ftp://ftp.digipri.co.jp/pub/free-software/Olympus/C-400L/unix/
diff --git a/graphics/chbg/Makefile b/graphics/chbg/Makefile
index 30a04bc..800ca8e 100644
--- a/graphics/chbg/Makefile
+++ b/graphics/chbg/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	chbg
-# Version required:	0.8pl1
 # Date created:		10 Dec 1999
 # Whom:			Peter Jones <p@dancris.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	chbg-0.8pl1
-PKGNAME=	chbg-0.8.1
+PORTNAME=	chbg
+PORTVERSION=	0.8.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.idata.sk/~ondrej/sw/
+DISTNAME=	${PORTNAME}-0.8pl1
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	p@dancris.com
diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile
index 23475b3..3f58426 100644
--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	cqcam
-# Version required:	0.45a
 # Date created:		29 Oct 1997
 # Whom:			Kensaku Masuda <greg@greg.rim.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	cqcam-0.45a
+PORTNAME=	cqcam
+PORTVERSION=	0.45a
 CATEGORIES=	graphics tk82
 MASTER_SITES=	ftp://ftp.cdrom.com/pub/unixfreeware/graphics/
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/dc20ctrl/Makefile b/graphics/dc20ctrl/Makefile
index 20062a3..8975323 100644
--- a/graphics/dc20ctrl/Makefile
+++ b/graphics/dc20ctrl/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	dc20ctrl
-# Version required:	0.4
 # Date created:		17 Feb 1998
 # Whom:			Ugo Paternostro <paterno@dsi.unifi.it>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	dc20ctrl-0.4
+PORTNAME=	dc20ctrl
+PORTVERSION=	0.4
 CATEGORIES=	graphics
 MASTER_SITES=   http://aguirre.dsi.unifi.it/~paterno/binaries/
 
diff --git a/graphics/dc20pack/Makefile b/graphics/dc20pack/Makefile
index 6bcea89..b3291e7 100644
--- a/graphics/dc20pack/Makefile
+++ b/graphics/dc20pack/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	dc20pack
-# Version required:	1.0
 # Date created:		Jul 31 1999
 # Whom:			Maurice Castro <maurice@serc.rmit.edu.au>
 #
 # $FreeBSD$
 #
 
-DISTNAME=		dc20pack-1.0
+PORTNAME=		dc20pack
+PORTVERSION=		1.0
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/graphics/capture
diff --git a/graphics/dc3play/Makefile b/graphics/dc3play/Makefile
index 807050f..c4adb78 100644
--- a/graphics/dc3play/Makefile
+++ b/graphics/dc3play/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	dc3play
-# Version required:	19991202
 # Date created:		15 Jul 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	dc3play-19991202
-PKGNAME=	dc3play-19991202
+PORTNAME=	dc3play
+PORTVERSION=	19991202
 CATEGORIES=	graphics
 MASTER_SITES=   ftp://ftp.itojun.org/pub/digi-cam/DC-3/unix/ \
 		ftp://ftp.digipri.co.jp/pub/free-software/Ricoh/DC-3/unix/
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index db37fcb..5c342ec 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	dia
-# Version required:    0.83
 # Date created:        21 December 1999
 # Whom:                saper@system.pl
 #
 # $FreeBSD$
 #
 
-DISTNAME=	dia-0.84
+PORTNAME=	dia
+PORTVERSION=	0.84
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/dia
diff --git a/graphics/diacanvas/Makefile b/graphics/diacanvas/Makefile
index 4dd8904..ad0caee 100644
--- a/graphics/diacanvas/Makefile
+++ b/graphics/diacanvas/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   diacanvas
-# Version required:    0.40.1
 # Date created:        04 February 2000
 # Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	diacanvas-0.40.1
+PORTNAME=	diacanvas
+PORTVERSION=	0.40.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.linuxstart.com/~arjan/diacanvas/download/
 
diff --git a/graphics/dore/Makefile b/graphics/dore/Makefile
index 20f396c..00d64cf 100644
--- a/graphics/dore/Makefile
+++ b/graphics/dore/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	dore
-# Version required:	6.0
 # Date created:		10 February 1995
 # Whom:			jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=	pdore-6.0
+PORTNAME=	pdore
+PORTVERSION=	6.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.Z
diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile
index 6022a43..9c49f8b 100644
--- a/graphics/electriceyes/Makefile
+++ b/graphics/electriceyes/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	electriceyes
-# Version required:			0.3.11
 # Date created:				21 August 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ee-0.3.11
-PKGNAME=	electriceyes-0.3.11
+PORTNAME=	electriceyes
+PORTVERSION=	0.3.11
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/ee
+DISTNAME=	ee-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
diff --git a/graphics/enfle/Makefile b/graphics/enfle/Makefile
index fcfb718..20701ff 100644
--- a/graphics/enfle/Makefile
+++ b/graphics/enfle/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	enfle
-# Version required:	20000403
 # Date created:		Tue Sep 28 02:25:17 JST 1999
 # Whom:			Yuuki SAWADA <yuuki@goldmoon.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	enfle-20000403
+PORTNAME=	enfle
+PORTVERSION=	20000403
 CATEGORIES=	graphics
 MASTER_SITES=	http://enfle.fennel.org/ \
 		ftp://ftp.goldmoon.org/pub/FreeBSD/ports/distfiles/
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 94e9e1f..01086eb 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	eog
-# Version required:	0.2
 # Date created:		5th October 1999
 # Whom:			Ade Lovett <ade@lovett.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	eog-0.2
+PORTNAME=	eog
+PORTVERSION=	0.2
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/eog
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 94e9e1f..01086eb 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	eog
-# Version required:	0.2
 # Date created:		5th October 1999
 # Whom:			Ade Lovett <ade@lovett.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	eog-0.2
+PORTNAME=	eog
+PORTVERSION=	0.2
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/eog
diff --git a/graphics/epstool/Makefile b/graphics/epstool/Makefile
index 46560bc8..f397bc6 100644
--- a/graphics/epstool/Makefile
+++ b/graphics/epstool/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	epstool
-# Version required:	1.08
 # Date created:		23 October 1999
 # Whom:			Yuzo FURUKAWA <hurukawa@kuee.kyoto-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	epstool-108
-PKGNAME=	epstool-1.08
+PORTNAME=	epstool
+PORTVERSION=	1.08
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/ghostgum/ \
 		ftp://ftp.fh-koblenz.de/pub/Ghostscript/ghostgum/
+DISTNAME=	${PORTNAME}-108
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/graphics/eterm-bg/Makefile b/graphics/eterm-bg/Makefile
index eba59e7..f18f021 100644
--- a/graphics/eterm-bg/Makefile
+++ b/graphics/eterm-bg/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	eterm-bg
-# Version required:    0.9
 # Date created:        99/06/12
 # Whom:                Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Eterm-bg-0.9
-PKGNAME=	eterm-bg-0.9
+PORTNAME=	eterm-bg
+PORTVERSION=	0.9
 CATEGORIES=	graphics x11
 MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/Eterm/ \
 		ftp://ftp.dti.ad.jp/pub/X/enlightenment/Eterm/ \
 		ftp://ftp.kddlabs.co.jp/.10/X11/window_manager/enlightenment/Eterm/ \
 		ftp://ftp.sogang.ac.kr/.c/tools/X11/Enlightenment/Eterm/
+DISTNAME=	Eterm-bg-${PORTVERSION}
 
 MAINTAINER=	taoka@FreeBSD.org
 
diff --git a/graphics/fbm/Makefile b/graphics/fbm/Makefile
index 94ee1c3..d7455d7 100644
--- a/graphics/fbm/Makefile
+++ b/graphics/fbm/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	fbm
-# Version required:	1.2
 # Date created:		21 January 1998
 # Whom:			giffunip@asme.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	fbm-1.2
+PORTNAME=	fbm
+PORTVERSION=	1.2
 CATEGORIES=	graphics
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/graphics/convert
diff --git a/graphics/flashplayer/Makefile b/graphics/flashplayer/Makefile
index 7094618..35ae5ea 100644
--- a/graphics/flashplayer/Makefile
+++ b/graphics/flashplayer/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:   flashplayer
-# Version required:    0.4.3
 # Date created:        2 October 1999
 # Whom:                Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	flash-0.4.3
-PKGNAME=	flashplayer-0.4.3
+PORTNAME=	flashplayer
+PORTVERSION=	0.4.3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.geocities.com/TimesSquare/Labyrinth/5084/flash/Linux/ \
 		http://perso.club-internet.fr/odebon/flash/Linux/
+DISTNAME=	flash-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 PATCH_SITES=   http://leed.t.u-tokyo.ac.jp/~yamagata/flash/
diff --git a/graphics/fli2gif/Makefile b/graphics/fli2gif/Makefile
index f5b1790..7af688f 100644
--- a/graphics/fli2gif/Makefile
+++ b/graphics/fli2gif/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:	fli2gif
-# Version required:	1.1
 # Date created:		7 Jan 1998
 # Whom:			giffunip@asme.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=       fli2gif
-PKGNAME=	fli2gif-1.1
+PORTNAME=	fli2gif
+PORTVERSION=	1.1
 CATEGORIES=	graphics
 MASTER_SITES=   ftp://ftp.sco.com/skunkware/src/misc/ \
 		ftp://ftp.doc.ic.ac.uk/Mirrors/ftp.sco.com/skunkware/src/misc/ \
 		ftp://ftp.vse.cz/pub/.ccd0c/SCO/ftp.sco.com/skunkware/src/misc/
+DISTNAME=       ${PORTNAME}
 
 MAINTAINER=     giffunip@asme.org
 
diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile
index 02188fe..b813369 100644
--- a/graphics/fly/Makefile
+++ b/graphics/fly/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for: fly
-# Version required:     1.6.5
 # Date created:         30 December 1997
 # Whom:                 Juergen Unger <j.unger@choin.net>
 #
 # $FreeBSD$
 #
 
-DISTNAME=       fly-1.6.5
+PORTNAME=	fly
+PORTVERSION=	1.6.5
 CATEGORIES=	graphics
-MASTER_SITES=   ftp://www.unimelb.edu.au/pub/www/tools/unix/fly/
+MASTER_SITES=	ftp://www.unimelb.edu.au/pub/www/tools/unix/fly/
 
-MAINTAINER=     j.unger@choin.net
+MAINTAINER=	j.unger@choin.net
 
 #this doesn't matter.. the program builds its own libgd.a.
 #BUILD_DEPENDS=	${PREFIX}/lib/libgd\.a #can't use ports' gd..
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index 9e2d44c..35b72d62 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	fnlib
-# Version required:	0.5
 # Date created:		23 June 1997
 # Whom:			brett@peloton.physics.montana.edu
 #
 # $FreeBSD$
 #
 
-DISTNAME=	fnlib-0.5
+PORTNAME=	fnlib
+PORTVERSION=	0.5
 CATEGORIES=	graphics
 MASTER_SITES=	http://mirror.nucba.ac.jp/mirror/enlightenment/enlightenment/libs/ \
 		ftp://ftp.leirianet.pt/pub/X11/enlightenment/enlightenment/libs/ \
diff --git a/graphics/fujiplay/Makefile b/graphics/fujiplay/Makefile
index 33bbc55..f88d18a 100644
--- a/graphics/fujiplay/Makefile
+++ b/graphics/fujiplay/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	fujiplay
-# Version required:	1.33
 # Date created:		20 Sep 1999
 # Whom:			KIRIYAMA Kazuhiko<kiri@pis.toba-cmt.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	fujiplay
-PKGNAME=	fujiplay-1.33
+PORTNAME=	fujiplay
+PORTVERSION=	1.33
 CATEGORIES=	graphics
 MASTER_SITES=	http://topo.math.u-psud.fr/~bousch/
+DISTNAME=	${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile
index d14b42d..72943ec 100644
--- a/graphics/fxtv/Makefile
+++ b/graphics/fxtv/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	fxtv
-# Version required:	1.02
 # Date created:		Thu Nov  4 19:54:04 EST 1999
 # Whom:			Randall Hopper <aa8vb@ipass.net>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	fxtv-1.02
+PORTNAME=	fxtv
+PORTVERSION=	1.02
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.ipass.net/~dbhopper/aa8vb/fxtv/
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/libflash/Makefile b/graphics/libflash/Makefile
index 7094618..35ae5ea 100644
--- a/graphics/libflash/Makefile
+++ b/graphics/libflash/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:   flashplayer
-# Version required:    0.4.3
 # Date created:        2 October 1999
 # Whom:                Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	flash-0.4.3
-PKGNAME=	flashplayer-0.4.3
+PORTNAME=	flashplayer
+PORTVERSION=	0.4.3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.geocities.com/TimesSquare/Labyrinth/5084/flash/Linux/ \
 		http://perso.club-internet.fr/odebon/flash/Linux/
+DISTNAME=	flash-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 PATCH_SITES=   http://leed.t.u-tokyo.ac.jp/~yamagata/flash/
diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile
index e92df7a..afacfec 100644
--- a/graphics/mesagl/Makefile
+++ b/graphics/mesagl/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:    Mesa
-# Version required:     3.1
 # Date created:         Tue Feb  7 12:02:49  1995
 # Whom:                 hsu
 #
 # $FreeBSD$
 #
 
-DISTNAME=	MesaLib-${VERSION}
-PKGNAME=	Mesa-${VERSION}
+PORTNAME=	Mesa
+PORTVERSION=	3.1
 CATEGORIES=	graphics
 MASTER_SITES= 	http://download.sourceforge.net/mesa3d/ \
 		ftp://iris.ssec.wisc.edu/pub/Mesa/ \
 		ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} MesaDemos-${VERSION}.tar.gz
+DISTFILES=	MesaLib-${PORTVERSION}${DISTNAME}${EXTRACT_SUFX} \
+		MesaDemos-${VERSION}.tar.gz
 
 MAINTAINER=	jseger@FreeBSD.org
 
@@ -21,7 +21,6 @@ LIB_DEPENDS=	ggi.2:${PORTSDIR}/graphics/libggi
 CONFIGURE_ARGS+=--with-ggi=${LOCALBASE}
 .endif
 
-VERSION=	3.1
 GLVER=		14
 GLUTVER=	3
 WRKSRC=		${WRKDIR}/${PKGNAME}