Update with the new PORTNAME/PORTVERSION variables

32 files changed, 65 insertions, 95 deletions

diff --git a/x11-servers/Xatm/Makefile b/x11-servers/Xatm/Makefile
index 5a93232..e170ac0 100644
--- a/x11-servers/Xatm/Makefile
+++ b/x11-servers/Xatm/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	xfs-atm
-# Version required:	3.0.1
 # Date created:		31 Oct 1999
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xfs-atm+cid-3.0.1
-PKGNAME=	xfs-atm-3.0.1
+PORTNAME=	xfs-atm
+PORTVERSION= 	3.0.1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.netlab.is.tsukuba.ac.jp/~yokota/archive/
+DISTNAME=	${PORTNAME}+cid-${PORTVERSION}
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
diff --git a/x11-servers/Xfstt/Makefile b/x11-servers/Xfstt/Makefile
index 80ae647..3105a51 100644
--- a/x11-servers/Xfstt/Makefile
+++ b/x11-servers/Xfstt/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	Xfstt
-# Version required:	1.1
 # Date created:		11 September 1998
 # Whom:			jabley@clear.co.nz
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xfstt-1.1
+PORTNAME=	xfstt
+PORTVERSION= 	1.1
 CATEGORIES=	x11-servers
 MASTER_SITES=	$(MASTER_SITE_SUNSITE)
 MASTER_SITE_SUBDIR=	X11/fonts
diff --git a/x11-servers/XttXF86srv-3DLabs/Makefile b/x11-servers/XttXF86srv-3DLabs/Makefile
index 5720b0e..2672bc4 100644
--- a/x11-servers/XttXF86srv-3DLabs/Makefile
+++ b/x11-servers/XttXF86srv-3DLabs/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	Xserver for 3DLabs with X True Type
-# Version required:	1.3.0
 # Date created:		13 Dec 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-3DLabs-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-3DLabs
+PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-8514/Makefile b/x11-servers/XttXF86srv-8514/Makefile
index e405976..49e7a9f 100644
--- a/x11-servers/XttXF86srv-8514/Makefile
+++ b/x11-servers/XttXF86srv-8514/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	Xserver for I8514 with X True Type
-# Version required:	1.3.0
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-8514-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-8514
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-AGX/Makefile b/x11-servers/XttXF86srv-AGX/Makefile
index 0fd87b0..1d19465 100644
--- a/x11-servers/XttXF86srv-AGX/Makefile
+++ b/x11-servers/XttXF86srv-AGX/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	Xserver for AGX with X True Type
-# Version required:	1.3.0
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-AGX-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-AGX
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-I128/Makefile b/x11-servers/XttXF86srv-I128/Makefile
index d735de9..5053db9 100644
--- a/x11-servers/XttXF86srv-I128/Makefile
+++ b/x11-servers/XttXF86srv-I128/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	Xserver for I128 with X True Type
-# Version required:	1.3.0
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-I128-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-I128
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-Mach32/Makefile b/x11-servers/XttXF86srv-Mach32/Makefile
index 5cf61d0..9aaa7d8 100644
--- a/x11-servers/XttXF86srv-Mach32/Makefile
+++ b/x11-servers/XttXF86srv-Mach32/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	Xserver for Mach32 with X True Type
-# Version required:	1.3.0
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-Mach32-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-Mach32
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-Mach64/Makefile b/x11-servers/XttXF86srv-Mach64/Makefile
index 52cdeb7..091af00 100644
--- a/x11-servers/XttXF86srv-Mach64/Makefile
+++ b/x11-servers/XttXF86srv-Mach64/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	Xserver for Mach64 with X True Type
-# Version required:	1.3.0
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-Mach64-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-Mach64
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-Mach8/Makefile b/x11-servers/XttXF86srv-Mach8/Makefile
index 4beda85..ff9f719 100644
--- a/x11-servers/XttXF86srv-Mach8/Makefile
+++ b/x11-servers/XttXF86srv-Mach8/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	Xserver for Mach8 with X True Type
-# Version required:	1.3.0
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-Mach8-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-Mach8
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-Mono/Makefile b/x11-servers/XttXF86srv-Mono/Makefile
index 67b6731..9744771 100644
--- a/x11-servers/XttXF86srv-Mono/Makefile
+++ b/x11-servers/XttXF86srv-Mono/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	Xserver for Mono with X True Type
-# Version required:	1.3.0
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-Mono-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-Mono
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-P9000/Makefile b/x11-servers/XttXF86srv-P9000/Makefile
index 8feb688..7e9f62e 100644
--- a/x11-servers/XttXF86srv-P9000/Makefile
+++ b/x11-servers/XttXF86srv-P9000/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	Xserver for P9000 with X True Type
-# Version required:	1.3.0
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-P9000-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-P9000
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-S3/Makefile b/x11-servers/XttXF86srv-S3/Makefile
index 440a627..c4e371f 100644
--- a/x11-servers/XttXF86srv-S3/Makefile
+++ b/x11-servers/XttXF86srv-S3/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	Xserver for S3 with X True Type
-# Version required:	1.3.0
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-S3-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-S3
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-S3V/Makefile b/x11-servers/XttXF86srv-S3V/Makefile
index 22b718f..35eecc3 100644
--- a/x11-servers/XttXF86srv-S3V/Makefile
+++ b/x11-servers/XttXF86srv-S3V/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	Xserver for S3V with X True Type
-# Version required:	1.3.0
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-S3V-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-S3V
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-SVGA/Makefile b/x11-servers/XttXF86srv-SVGA/Makefile
index ce45a62..89a473a 100644
--- a/x11-servers/XttXF86srv-SVGA/Makefile
+++ b/x11-servers/XttXF86srv-SVGA/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	Xserver for SVGA with X True Type
-# Version required:	1.3.0
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-SVGA-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-SVGA
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-VGA16/Makefile b/x11-servers/XttXF86srv-VGA16/Makefile
index eaf680d..9f93541 100644
--- a/x11-servers/XttXF86srv-VGA16/Makefile
+++ b/x11-servers/XttXF86srv-VGA16/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	Xserver for VGA16 with X True Type
-# Version required:	1.3.0
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-VGA16-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-VGA16
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-W32/Makefile b/x11-servers/XttXF86srv-W32/Makefile
index ff80dea..ef50491 100644
--- a/x11-servers/XttXF86srv-W32/Makefile
+++ b/x11-servers/XttXF86srv-W32/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	Xserver for W32 with X True Type
-# Version required:	1.3.0
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-W32-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-W32
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-common/Makefile b/x11-servers/XttXF86srv-common/Makefile
index 5d2bf75..26652b9 100644
--- a/x11-servers/XttXF86srv-common/Makefile
+++ b/x11-servers/XttXF86srv-common/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	Common Files for Xservers with Xtt
-# Version required:	1.3.0
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME?=	xtt-common-${VERSION}.${PATCHLEVEL}
+PORTNAME?=	xtt-common
+PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.5/source/ \
 		ftp://xfree86.cdrom.com/pub/XFree86/3.3.5/source/ \
diff --git a/x11-servers/XttXF86srv-xfs/Makefile b/x11-servers/XttXF86srv-xfs/Makefile
index 5354967..bca9f0e 100644
--- a/x11-servers/XttXF86srv-xfs/Makefile
+++ b/x11-servers/XttXF86srv-xfs/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	X Font Server with X True Type
-# Version required:	1.3.0
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-xfs-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-xfs
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF98srv-EGC/Makefile b/x11-servers/XttXF98srv-EGC/Makefile
index f8e412d..a02f643 100644
--- a/x11-servers/XttXF98srv-EGC/Makefile
+++ b/x11-servers/XttXF98srv-EGC/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	X98server for EGC with X True Type
-# Version required:	1.3.0
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-98EGC-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-98EGC
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
diff --git a/x11-servers/XttXF98srv-GA968/Makefile b/x11-servers/XttXF98srv-GA968/Makefile
index 7442c54..3ff22a3 100644
--- a/x11-servers/XttXF98srv-GA968/Makefile
+++ b/x11-servers/XttXF98srv-GA968/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	X98server for GA968 with X True Type
-# Version required:	1.3.0
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-98GA968-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-98GA968
+PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
diff --git a/x11-servers/XttXF98srv-GANBWAP/Makefile b/x11-servers/XttXF98srv-GANBWAP/Makefile
index 327b129..0e861c7 100644
--- a/x11-servers/XttXF98srv-GANBWAP/Makefile
+++ b/x11-servers/XttXF98srv-GANBWAP/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	X98server for GANBWAP with X True Type
-# Version required:	1.3.0
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-98GANBWAP-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-98GANBWAP
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
diff --git a/x11-servers/XttXF98srv-MGA/Makefile b/x11-servers/XttXF98srv-MGA/Makefile
index 63bffde..734736a 100644
--- a/x11-servers/XttXF98srv-MGA/Makefile
+++ b/x11-servers/XttXF98srv-MGA/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	X98server for MGA with X True Type
-# Version required:	1.3.0
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-98MGA-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-98MGA
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
diff --git a/x11-servers/XttXF98srv-NEC480/Makefile b/x11-servers/XttXF98srv-NEC480/Makefile
index 6258ca2..e2f3266 100644
--- a/x11-servers/XttXF98srv-NEC480/Makefile
+++ b/x11-servers/XttXF98srv-NEC480/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	X98server for NEC480 with X True Type
-# Version required:	1.3.0
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-98NEC480-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-98NEC480
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
diff --git a/x11-servers/XttXF98srv-NECS3/Makefile b/x11-servers/XttXF98srv-NECS3/Makefile
index 8ecaaca..be5ad73 100644
--- a/x11-servers/XttXF98srv-NECS3/Makefile
+++ b/x11-servers/XttXF98srv-NECS3/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	X98server for NECS3 with X True Type
-# Version required:	1.3.0
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-98NECS3-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-98NECS3
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
diff --git a/x11-servers/XttXF98srv-NKVNEC/Makefile b/x11-servers/XttXF98srv-NKVNEC/Makefile
index 445d773..b7807b1 100644
--- a/x11-servers/XttXF98srv-NKVNEC/Makefile
+++ b/x11-servers/XttXF98srv-NKVNEC/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	X98server for NKVNEC with X True Type
-# Version required:	1.3.0
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-98NKVNEC-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-98NKVNEC
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
diff --git a/x11-servers/XttXF98srv-PWLB/Makefile b/x11-servers/XttXF98srv-PWLB/Makefile
index 5a61fb0..19e1376c 100644
--- a/x11-servers/XttXF98srv-PWLB/Makefile
+++ b/x11-servers/XttXF98srv-PWLB/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	X98server for PWLB with X True Type
-# Version required:	1.3.0
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-98PWLB-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-98PWLB
+PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
diff --git a/x11-servers/XttXF98srv-PWSKB/Makefile b/x11-servers/XttXF98srv-PWSKB/Makefile
index ba9bf93..74ba0a9 100644
--- a/x11-servers/XttXF98srv-PWSKB/Makefile
+++ b/x11-servers/XttXF98srv-PWSKB/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	X98server for PWSKB with X True Type
-# Version required:	1.3.0
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-98PWSKB-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-98PWSKB
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
diff --git a/x11-servers/XttXF98srv-SVGA/Makefile b/x11-servers/XttXF98srv-SVGA/Makefile
index 5b41b17..17d0bbb 100644
--- a/x11-servers/XttXF98srv-SVGA/Makefile
+++ b/x11-servers/XttXF98srv-SVGA/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	X98server for SVGA with X True Type
-# Version required:	1.3.0
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-98SVGA-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-98SVGA
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
diff --git a/x11-servers/XttXF98srv-TGUI/Makefile b/x11-servers/XttXF98srv-TGUI/Makefile
index 1be0c2c..88dc225 100644
--- a/x11-servers/XttXF98srv-TGUI/Makefile
+++ b/x11-servers/XttXF98srv-TGUI/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	X98server for TGUI with X True Type
-# Version required:	1.3.0
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-98TGUI-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-98TGUI
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
diff --git a/x11-servers/XttXF98srv-WABEP/Makefile b/x11-servers/XttXF98srv-WABEP/Makefile
index 1baa79f..b4a5355 100644
--- a/x11-servers/XttXF98srv-WABEP/Makefile
+++ b/x11-servers/XttXF98srv-WABEP/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	X98server for WABEP with X True Type
-# Version required:	1.3.0
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-98WABEP-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-98WABEP
+PORTVERSION=	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
diff --git a/x11-servers/XttXF98srv-WABS/Makefile b/x11-servers/XttXF98srv-WABS/Makefile
index e469c72..549840c 100644
--- a/x11-servers/XttXF98srv-WABS/Makefile
+++ b/x11-servers/XttXF98srv-WABS/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	X98server for WABS with X True Type
-# Version required:	1.3.0
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-98WABS-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-98WABS
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp
diff --git a/x11-servers/XttXF98srv-WSNA/Makefile b/x11-servers/XttXF98srv-WSNA/Makefile
index aeacb49..d3871d1 100644
--- a/x11-servers/XttXF98srv-WSNA/Makefile
+++ b/x11-servers/XttXF98srv-WSNA/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	X98server for WSNA with X True Type
-# Version required:	1.3.0
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xc
-PKGNAME=	xtt-98WSNA-${VERSION}.${PATCHLEVEL}
+PORTNAME=	xtt-98WSNA
+PORTVERSION= 	${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11-servers
 
 MAINTAINER=	nakaji@tutrp.tut.ac.jp