13 files changed, 37 insertions, 37 deletions

diff --git a/x11-fonts/Xg/Makefile b/x11-fonts/Xg/Makefile
index 2b8843605e63..6bd74c95167b 100644
--- a/x11-fonts/Xg/Makefile
+++ b/x11-fonts/Xg/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    libXg
-# Version required:     ????? arbitrarily picked 1.0 for version
 # Date created:         Sun Aug 13 12:36:14 CDT 1995
 # Whom:                 erich@rrnet.com
 #
 # $FreeBSD$
 #
 
-DISTNAME=	libXg.utf.fonts
-PKGNAME=	libXgFonts-1.0
+PORTNAME=	libXgFonts
+PORTVERSION= 	1.0
 CATEGORIES=	x11-fonts plan9
 MASTER_SITES=	ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
+DISTNAME=	libXg.utf.fonts
 
 MAINTAINER=	erich@FreeBSD.org
 
diff --git a/x11-fonts/bitmap-fonts/Makefile b/x11-fonts/bitmap-fonts/Makefile
index 1be12522908f..7de81aaac6df 100644
--- a/x11-fonts/bitmap-fonts/Makefile
+++ b/x11-fonts/bitmap-fonts/Makefile
@@ -1,22 +1,21 @@
 # New ports collection makefile for:	bitmap-font
-# Version required:	8.2
 # Date created:		23 September 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	bitmap-mule-${BITMAP_VER}
-PKGNAME=	bitmap-font-${BITMAP_VER}
+PORTNAME=	bitmap-font
+PORTVERSION=	8.2
 CATEGORIES=	x11-fonts elisp
 MASTER_SITES=	ftp://ftp.jpl.org/pub/elisp/bitmap/
+DISTNAME=	bitmap-mule-${PORTVERSION}
 
 MAINTAINER=	shige@FreeBSD.org
 
 BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86
 
 # distfile version
-BITMAP_VER=	8.2
 BITMAP_FONT=	etl6x12-bitmap etl7x14-bitmap etl8x16-bitmap etl12x24-bitmap
 FONTSDIR=	lib/X11/fonts/local
 PKGINSTALL=     ${WRKDIR}/INSTALL
diff --git a/x11-fonts/etlfonts/Makefile b/x11-fonts/etlfonts/Makefile
index 8fca37e68885..af75018c61d2 100644
--- a/x11-fonts/etlfonts/Makefile
+++ b/x11-fonts/etlfonts/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	etlfonts-noncjk
-# Version required:	1.0
 # Date created:		3 Nov 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	non-cjk
-PKGNAME=	etlfonts-noncjk-1.0
+PORTNAME=	etlfonts-noncjk
+PORTVERSION= 	1.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	ftp://ftp.etl.go.jp/pub/mule/fonts/
+DISTNAME=	non-cjk
 EXTRACT_SUFX=	.tar
 
 MAINTAINER=	mita@jp.FreeBSD.org
diff --git a/x11-fonts/freefonts/Makefile b/x11-fonts/freefonts/Makefile
index c8d991703fff..3a03690f7b80 100644
--- a/x11-fonts/freefonts/Makefile
+++ b/x11-fonts/freefonts/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    freefonts
-# Version required:     0.10
 # Date created:         Thu Aug  1 21:32:14 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	freefonts-0.10
+PORTNAME=	freefonts
+PORTVERSION= 	0.10
 CATEGORIES=	x11-fonts
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/fonts/
 
diff --git a/x11-fonts/getbdf/Makefile b/x11-fonts/getbdf/Makefile
index 028c641a3d9b..57ca62695ddc 100644
--- a/x11-fonts/getbdf/Makefile
+++ b/x11-fonts/getbdf/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    getbdf
-# Version required:	?
 # Date created:         30 August 1996
 # Whom:                 ache
 #
 # $FreeBSD$
 #
 
-DISTNAME=       getbdf
-PKGNAME=        getbdf-1.0
+PORTNAME=	getbdf
+PORTVERSION= 	1.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=   ftp://ftp.ipa.fhg.de/pub/X/
+DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=   .tar.Z
 
 MAINTAINER=     ache@FreeBSD.org
diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile
index ec2554753535..4c010c32d86b 100644
--- a/x11-fonts/intlfonts/Makefile
+++ b/x11-fonts/intlfonts/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	intlfonts
-# Version required:	1.2
 # Date created:		99/10/26
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	intlfonts-1.2
+PORTNAME=	intlfonts
+PORTVERSION= 	1.2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	intlfonts
diff --git a/x11-fonts/nexfontsel/Makefile b/x11-fonts/nexfontsel/Makefile
index a3046225ec67..25346eb1309e 100644
--- a/x11-fonts/nexfontsel/Makefile
+++ b/x11-fonts/nexfontsel/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	nexfontsel
-# Version required:	2.0
 # Date created:		99/09/29
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	NeXFontSel-2.0
-PKGNAME=	nexfontsel-2.0
+PORTNAME=	nexfontsel
+PORTVERSION= 	2.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.netlab.is.tsukuba.ac.jp/~yokota/archive/
+DISTNAME=	NeXFontSel-${PORTVERSION}
 
 MAINTAINER=	taoka@FreeBSD.org
 
diff --git a/x11-fonts/p5-type1inst/Makefile b/x11-fonts/p5-type1inst/Makefile
index 2e2fb38b0227..092bd93264e3 100644
--- a/x11-fonts/p5-type1inst/Makefile
+++ b/x11-fonts/p5-type1inst/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	p5-type1inst
-# Version required:	0.6.1
 # Date created:		7 Jan 1998
 # Whom:			giffunip@asme.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=       type1inst-0.6.1
-PKGNAME=	p5-type1inst-0.6.1
+PORTNAME=	p5-type1inst
+PORTVERSION=	0.6.1
 CATEGORIES=	x11-fonts perl5
 MASTER_SITES=	$(MASTER_SITE_SUNSITE)
 MASTER_SITE_SUBDIR=X11/xutils
+DISTNAME=	type1inst-${PORTVERSION}
 
 MAINTAINER=     giffunip@asme.org
 
diff --git a/x11-fonts/sharefonts/Makefile b/x11-fonts/sharefonts/Makefile
index 79917edb8915..c6dcb9430e61 100644
--- a/x11-fonts/sharefonts/Makefile
+++ b/x11-fonts/sharefonts/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    sharefonts
-# Version required:     0.10
 # Date created:         Thu Mar 26 04:50:00 PST 1998
 # Whom:                 dburr@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sharefonts-0.10
+PORTNAME=	sharefonts
+PORTVERSION=	0.10
 CATEGORIES=	x11-fonts
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/fonts/
 
diff --git a/x11-fonts/tkfont/Makefile b/x11-fonts/tkfont/Makefile
index 0a8ee0408444..b468ef9e9ec1 100644
--- a/x11-fonts/tkfont/Makefile
+++ b/x11-fonts/tkfont/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:	tkfont-1.1
-# Version required:	1.1
 # Date created:		11 May 1998
 # Whom:			Brett Taylor
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tkfont-1.1
+PORTNAME=	tkfont
+PORTVERSION= 	1.1
 CATEGORIES=	x11-fonts tk82
-MASTER_SITES=	ftp://ftp.cdrom.com/pub/linux/tsx-11/sources/usr.bin.X11/ \
+MASTER_SITES=	ftp://ftp.freesoftware.com/pub/linux/tsx-11/sources/usr.bin.X11/ \
 		http://people.FreeBSD.org/~billf/
 
 MAINTAINER=	brett@peloton.runet.edu
diff --git a/x11-fonts/ttmkfdir/Makefile b/x11-fonts/ttmkfdir/Makefile
index c2453ed3a3c6..a0460db0e199 100644
--- a/x11-fonts/ttmkfdir/Makefile
+++ b/x11-fonts/ttmkfdir/Makefile
@@ -1,14 +1,15 @@
 # New ports collection makefile for:	ttmkfdir
-# Version required:	0.0
 # Date created:		September 08, 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
+#
 
-DISTNAME=	ttmkfdir
-PKGNAME=	ttmkfdir-0.0
+PORTNAME=	ttmkfdir
+PORTVERSION= 	0.0
 CATEGORIES=	x11
 MASTER_SITES=	http://www.darmstadt.gmd.de/~pommnitz/TrueType/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/x11-fonts/xfed/Makefile b/x11-fonts/xfed/Makefile
index 53001b7f1e55..41f43054ee72 100644
--- a/x11-fonts/xfed/Makefile
+++ b/x11-fonts/xfed/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    xfed
-# Version required:     something old
 # Date created:         7 December 1994
 # Whom:                 asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xfed
-PKGNAME=	xfed-1.0
+PORTNAME=	xfed
+PORTVERSION= 	1.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	ftp://ftp.demon.co.uk/pub/graphics/systems/X11.old/pub/R6untarred/contrib/programs/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/x11-fonts/xmbdfed/Makefile b/x11-fonts/xmbdfed/Makefile
index 97d1fc8bd91c..f5e0466e0644 100644
--- a/x11-fonts/xmbdfed/Makefile
+++ b/x11-fonts/xmbdfed/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	xmbdfed
-# Version required:	4.3.3
 # Date created:		June 20, 1997
 # Whom:			jfieber
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xmbdfed-4.3
-PKGNAME=	xmbdfed-4.3.3
+PORTNAME=	xmbdfed
+PORTVERSION= 	4.3.3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	ftp://crl.nmsu.edu/CLR/multiling/General/
+DISTNAME=	${PORTNAME}-4.3
 
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	${DISTNAME}.patch1 ${DISTNAME}.patch2 ${DISTNAME}.patch3