32 files changed, 131 insertions, 120 deletions

diff --git a/x11-servers/XttXF86srv-3DLabs/Makefile b/x11-servers/XttXF86srv-3DLabs/Makefile
index 4b15a33325c4..72c9c3c30229 100644
--- a/x11-servers/XttXF86srv-3DLabs/Makefile
+++ b/x11-servers/XttXF86srv-3DLabs/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	Xserver for 3DLabs with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		13 Dec 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1999/01/02 19:18:40 sada Exp $
+# $Id: Makefile,v 1.2 1999/01/15 09:49:24 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-3DLabs-1.1
+PKGNAME=	xtt-3DLabs-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-8514/Makefile b/x11-servers/XttXF86srv-8514/Makefile
index 4cde49cc4c8a..1a71afb3448c 100644
--- a/x11-servers/XttXF86srv-8514/Makefile
+++ b/x11-servers/XttXF86srv-8514/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	Xserver for I8514 with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.5 1999/01/02 19:11:08 sada Exp $
+# $Id: Makefile,v 1.6 1999/01/15 09:49:26 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-8514-1.1
+PKGNAME=	xtt-8514-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-AGX/Makefile b/x11-servers/XttXF86srv-AGX/Makefile
index f2eb05e28442..5d5a815af992 100644
--- a/x11-servers/XttXF86srv-AGX/Makefile
+++ b/x11-servers/XttXF86srv-AGX/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	Xserver for AGX with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.5 1999/01/02 19:11:08 sada Exp $
+# $Id: Makefile,v 1.6 1999/01/15 09:49:27 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-AGX-1.1
+PKGNAME=	xtt-AGX-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-I128/Makefile b/x11-servers/XttXF86srv-I128/Makefile
index b0e0cc455f4e..b45770bd9b56 100644
--- a/x11-servers/XttXF86srv-I128/Makefile
+++ b/x11-servers/XttXF86srv-I128/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	Xserver for I128 with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.5 1999/01/02 19:11:08 sada Exp $
+# $Id: Makefile,v 1.6 1999/01/15 09:49:27 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-I128-1.1
+PKGNAME=	xtt-I128-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-Mach32/Makefile b/x11-servers/XttXF86srv-Mach32/Makefile
index 3d66ab581f7f..6fc0e1ebe5d2 100644
--- a/x11-servers/XttXF86srv-Mach32/Makefile
+++ b/x11-servers/XttXF86srv-Mach32/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	Xserver for Mach32 with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.5 1999/01/02 19:11:08 sada Exp $
+# $Id: Makefile,v 1.6 1999/01/15 09:49:28 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-Mach32-1.1
+PKGNAME=	xtt-Mach32-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-Mach64/Makefile b/x11-servers/XttXF86srv-Mach64/Makefile
index 47e1fcb7d6b9..6b43e982084e 100644
--- a/x11-servers/XttXF86srv-Mach64/Makefile
+++ b/x11-servers/XttXF86srv-Mach64/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	Xserver for Mach64 with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.5 1999/01/02 19:11:08 sada Exp $
+# $Id: Makefile,v 1.6 1999/01/15 09:49:28 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-Mach64-1.1
+PKGNAME=	xtt-Mach64-1.2.1
 CATEGORIES=	x11
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-Mach8/Makefile b/x11-servers/XttXF86srv-Mach8/Makefile
index 6765719cd469..92bc607326b4 100644
--- a/x11-servers/XttXF86srv-Mach8/Makefile
+++ b/x11-servers/XttXF86srv-Mach8/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	Xserver for Mach8 with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.5 1999/01/02 19:11:09 sada Exp $
+# $Id: Makefile,v 1.6 1999/01/15 09:49:29 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-Mach8-1.1
+PKGNAME=	xtt-Mach8-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-Mono/Makefile b/x11-servers/XttXF86srv-Mono/Makefile
index 0e7b624b068b..f708f7fcbe46 100644
--- a/x11-servers/XttXF86srv-Mono/Makefile
+++ b/x11-servers/XttXF86srv-Mono/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	Xserver for Mono with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.5 1999/01/02 19:11:09 sada Exp $
+# $Id: Makefile,v 1.6 1999/01/15 09:49:29 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-Mono-1.1
+PKGNAME=	xtt-Mono-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-P9000/Makefile b/x11-servers/XttXF86srv-P9000/Makefile
index 54dae60cfe73..0e179a924d85 100644
--- a/x11-servers/XttXF86srv-P9000/Makefile
+++ b/x11-servers/XttXF86srv-P9000/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	Xserver for P9000 with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.5 1999/01/02 19:11:09 sada Exp $
+# $Id: Makefile,v 1.6 1999/01/15 09:49:30 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-P9000-1.1
+PKGNAME=	xtt-P9000-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-S3/Makefile b/x11-servers/XttXF86srv-S3/Makefile
index e7d5c50756dd..61667bcca509 100644
--- a/x11-servers/XttXF86srv-S3/Makefile
+++ b/x11-servers/XttXF86srv-S3/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	Xserver for S3 with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.5 1999/01/02 19:11:09 sada Exp $
+# $Id: Makefile,v 1.6 1999/01/15 09:49:30 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-S3-1.1
+PKGNAME=	xtt-S3-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-S3V/Makefile b/x11-servers/XttXF86srv-S3V/Makefile
index 0d842612abb3..6fac56488637 100644
--- a/x11-servers/XttXF86srv-S3V/Makefile
+++ b/x11-servers/XttXF86srv-S3V/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	Xserver for S3V with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.5 1999/01/02 19:11:09 sada Exp $
+# $Id: Makefile,v 1.6 1999/01/15 09:49:31 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-S3V-1.1
+PKGNAME=	xtt-S3V-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-SVGA/Makefile b/x11-servers/XttXF86srv-SVGA/Makefile
index 225843eef90b..8871a0446700 100644
--- a/x11-servers/XttXF86srv-SVGA/Makefile
+++ b/x11-servers/XttXF86srv-SVGA/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	Xserver for SVGA with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.6 1999/01/02 19:11:09 sada Exp $
+# $Id: Makefile,v 1.7 1999/01/15 09:49:32 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-SVGA-1.1
+PKGNAME=	xtt-SVGA-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-VGA16/Makefile b/x11-servers/XttXF86srv-VGA16/Makefile
index 4cf1d713d451..3a66aae30541 100644
--- a/x11-servers/XttXF86srv-VGA16/Makefile
+++ b/x11-servers/XttXF86srv-VGA16/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	Xserver for VGA16 with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.5 1999/01/02 19:11:09 sada Exp $
+# $Id: Makefile,v 1.6 1999/01/15 09:49:32 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-VGA16-1.1
+PKGNAME=	xtt-VGA16-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-W32/Makefile b/x11-servers/XttXF86srv-W32/Makefile
index 24840c6ad7ef..e66d9e75eb3a 100644
--- a/x11-servers/XttXF86srv-W32/Makefile
+++ b/x11-servers/XttXF86srv-W32/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	Xserver for W32 with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.5 1999/01/02 19:11:09 sada Exp $
+# $Id: Makefile,v 1.6 1999/01/15 09:49:33 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-W32-1.1
+PKGNAME=	xtt-W32-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF86srv-common/Makefile b/x11-servers/XttXF86srv-common/Makefile
index d9ab5918dbd7..526b4071a02a 100644
--- a/x11-servers/XttXF86srv-common/Makefile
+++ b/x11-servers/XttXF86srv-common/Makefile
@@ -1,32 +1,31 @@
 # New ports collection makefile for:	Common Files for Xservers with Xtt
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.16 1999/03/08 07:28:36 asami Exp $
+# $Id: Makefile,v 1.17 1999/03/19 22:38:55 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME?=	xtt-common-1.1
+PKGNAME?=	xtt-common-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.3/source/ \
 		ftp://xfree86.cdrom.com/pub/XFree86/3.3.3/source/ \
-		http://hawk.ise.chuo-u.ac.jp/student/person/tshiozak/x-tt/dists/1.x/
+		http://hawk.ise.chuo-u.ac.jp/student/person/tshiozak/x-tt/dists/1.x/1.2/
 DISTFILES=	X333src-1.tgz X333src-2.tgz \
-		xtt-1.1.tar.gz xttdoc11-to-pl01.diff.gz
+		xtt-1.2.tar.gz \
+		xtt-1.2-to-1.2.1.tar.gz
 
-PATCH_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.3/fixes/ \
-		http://hawk.ise.chuo-u.ac.jp/student/person/tshiozak/x-tt/dists/1.x/
-PATCHFILES=	3.3.3-3.3.3.1.diff.gz \
-		xtt11-to-pl00.diff.gz xtt11pl00-to-pl01.diff.gz \
-		xtt11pl01-to-pl02.diff.gz xtt11pl02-to-pl03.diff.gz \
-		xtt11pl03-to-pl04.diff.gz xtt11pl04-to-pl05.diff.gz
+PATCH_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.3/fixes/
+PATCHFILES=	3.3.3-3.3.3.1.diff.gz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
 LIB_DEPENDS+=	ttf.3:${PORTSDIR}/print/freetype
 RUN_DEPENDS=	mkttfdir:${PORTSDIR}/print/perlftlib
 
+VERSION=	1.2
+PATCHLEVEL=	1
 .if !defined(USE_SHARED_WRKSRC) && defined(COMPILE_ALL_SERVERS_AT_ONCE)
 USE_SHARED_WRKSRC= YES
 .endif
@@ -38,7 +37,8 @@ DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
 .endif
 USE_X_PREFIX=	YES
-EXTRACT_ONLY=	X333src-1.tgz  X333src-2.tgz xtt-1.1.tar.gz
+EXTRACT_ONLY=	X333src-1.tgz  X333src-2.tgz \
+		xtt-1.2.tar.gz xtt-1.2-to-1.2.1.tar.gz
 BINOWN=		root
 BINGRP=		wheel
 MASTERDIR?=	${.CURDIR}/../XttXF86srv-common
@@ -49,7 +49,18 @@ WRKDIR=		${MASTERDIR}/work
 .endif
 WRKSRC=		${WRKDIR}/xc
 DIST_SUBDIR=	xc
-XTTDIR=		${WRKDIR}/xtt-1.1
+XTTDIR=		${WRKDIR}/xtt-1.2
+XTTPATCHDIR=	${WRKDIR}/xtt-1.2-to-1.2.1
+.if !defined(PATCH_DEBUG)
+XTTPATCHARGS=	-p1 -E -t -s -N
+.else
+XTTPATCHARGS=	-p1 -E
+.endif
+COREPATCHES=	shared-libfont-1.0.diff xfs-for-delayed-font-1.0.diff \
+		make-xfs-only-1.1.diff xtt-xf333-changes.diff
+XTTTARBALL=	xtt-core.tar
+ADDPATCHES=	${XTTDIR}/contribute/xtt-xfsft-lib.patch \
+		${XTTPATCHDIR}/xtt-core.diff
 DOCDIR=		${PREFIX}/share/doc/Xtt
 SERVER?=	common
 PATCH_DIST_ARGS= -d ${WRKDIR} --forward --quiet -E ${PATCH_STRIP}
@@ -127,10 +138,16 @@ pre-extract:
 .endif
 
 pre-patch:
-	@( cd ${WRKSRC}; ${PATCH} -p1 -t -s < ${XTTDIR}/xtt-1.1.diff ; \
-	   cd ${XTTDIR}; \
-           ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/xttdoc11-to-pl01.diff.gz | \
-             ${PATCH} -t -s )
+	@( cd ${WRKSRC}; \
+	   for i in ${COREPATCHES} ; do \
+		${PATCH} ${XTTPATCHARGS} < ${XTTDIR}/$${i}; \
+	   done; \
+	   ${TAR} xf ${XTTDIR}/${XTTTARBALL} -C ${WRKSRC}/lib/font; \
+	   for i in ${ADDPATCHES} ; do \
+		${PATCH} ${XTTPATCHARGS} < $${i}; \
+	   done; \
+	   cd ${XTTDIR}/doc; \
+	   ${PATCH} ${XTTPATCHARGS} < ${XTTPATCHDIR}/xtt-doc.diff )
 
 pre-configure:
 	@( \
@@ -148,10 +165,10 @@ do-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib; \
 	${INSTALL_SCRIPT} ${FILESDIR}/mkfontdir.pl ${PREFIX}/bin; \
 	${MKDIR} ${DOCDIR}; \
-	${INSTALL_DATA} ${XTTDIR}/[0A-Z]*.eng ${DOCDIR}; \
-	${INSTALL_DATA} ${XTTDIR}/[0A-Z]*.jis ${DOCDIR} )
+	${INSTALL_DATA} ${XTTDIR}/doc/[0A-Z]*.eng ${DOCDIR}; \
+	${INSTALL_DATA} ${XTTDIR}/doc/[0A-Z]*.jis ${DOCDIR} )
 .if ${PORTOBJFORMAT} == "aout"
-	${LN} -sf libfont.so.1.1 ${PREFIX}/lib/libfont.so
+	${LN} -sf libfont.so.1.2 ${PREFIX}/lib/libfont.so
 .endif
 .elif ${SERVER} == xfs
 do-install:
diff --git a/x11-servers/XttXF86srv-common/distinfo b/x11-servers/XttXF86srv-common/distinfo
index a3b0946e941e..b6f64f154b6f 100644
--- a/x11-servers/XttXF86srv-common/distinfo
+++ b/x11-servers/XttXF86srv-common/distinfo
@@ -1,12 +1,6 @@
 MD5 (xc/X333src-1.tgz) = 4c7518284e05d8858a95501d2013c985
 MD5 (xc/X333src-2.tgz) = 8b10b70b59c05bf9e5898444b725f039
-MD5 (xc/xtt-1.1.tar.gz) = 9a6df3f641ffccde0d65271ff60fa813
-MD5 (xc/xttdoc11-to-pl01.diff.gz) = 09911c05ba01a57b4518e2b1f94ef177
+MD5 (xc/xtt-1.2.tar.gz) = 15585e87ffaa35de7cf80ca17fd02246
+MD5 (xc/xtt-1.2-to-1.2.1.tar.gz) = 157b175a19e56b5dabeb9d3f88de9533
 MD5 (xc/3.3.3-3.3.3.1.diff.gz) = 35d41054e0bcb1a4cf29ab4364027d2b
-MD5 (xc/xtt11-to-pl00.diff.gz) = 4e78449a5448b761051be8ba8eaca0a7
-MD5 (xc/xtt11pl00-to-pl01.diff.gz) = 13a411f6162b5a15418e8e8536c89a6d
-MD5 (xc/xtt11pl01-to-pl02.diff.gz) = 914aa5605b75eb4f22351e9eb4439daa
-MD5 (xc/xtt11pl02-to-pl03.diff.gz) = 88b7fa986d3eb30fcf44b7bb62cab68e
-MD5 (xc/xtt11pl03-to-pl04.diff.gz) = 3f36befe256f442bee7bdfa074c10665
-MD5 (xc/xtt11pl04-to-pl05.diff.gz) = 28f1f8442728d4b4cb411c95b4bf8b94
 MD5 (xc/Wraphelp.c) = IGNORE
diff --git a/x11-servers/XttXF86srv-common/pkg-plist b/x11-servers/XttXF86srv-common/pkg-plist
index 66a23c5855e5..853e69d7930c 100644
--- a/x11-servers/XttXF86srv-common/pkg-plist
+++ b/x11-servers/XttXF86srv-common/pkg-plist
@@ -9,11 +9,11 @@ share/doc/Xtt/CHANGES.jis
 share/doc/Xtt/EXAMPLES.jis
 share/doc/Xtt/INSTALL.jis
 share/doc/Xtt/MISCNOTES.jis
-include/X11/fonts/codeconv/ftcap.h
-include/X11/fonts/codeconv/ftcconv.h
-include/X11/fonts/codeconv/ftcconvC.h
-include/X11/fonts/codeconv/ftcconvP.h
-include/X11/fonts/codeconv/ftmisc.h
+include/X11/fonts/codeconv/xttcap.h
+include/X11/fonts/codeconv/xttcconv.h
+include/X11/fonts/codeconv/xttcconvP.h
+include/X11/fonts/codeconv/xttcommon.h
+lib/modules/codeconv/ARABIC.so
 lib/modules/codeconv/ARMSCII8.so
 lib/modules/codeconv/BIG5.so
 lib/modules/codeconv/DOSENCODING.so
diff --git a/x11-servers/XttXF86srv-xfs/Makefile b/x11-servers/XttXF86srv-xfs/Makefile
index eb76219d7d09..963d08624897 100644
--- a/x11-servers/XttXF86srv-xfs/Makefile
+++ b/x11-servers/XttXF86srv-xfs/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	X Font Server with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		15 April 1998
 # Whom:			Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
 #
-# $Id: Makefile,v 1.5 1999/01/02 19:11:11 sada Exp $
+# $Id: Makefile,v 1.6 1999/01/15 09:49:37 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-xfs-1.1
+PKGNAME=	xtt-xfs-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
diff --git a/x11-servers/XttXF98srv-EGC/Makefile b/x11-servers/XttXF98srv-EGC/Makefile
index 982da919cfa1..f2cdc31fbf8b 100644
--- a/x11-servers/XttXF98srv-EGC/Makefile
+++ b/x11-servers/XttXF98srv-EGC/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	X98server for EGC with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1999/01/02 19:11:11 sada Exp $
+# $Id: Makefile,v 1.3 1999/01/15 09:49:37 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-98EGC-1.1
+PKGNAME=	xtt-98EGC-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	nakaji@zeisei.dpri.kyoto-u.ac.jp
diff --git a/x11-servers/XttXF98srv-GA968/Makefile b/x11-servers/XttXF98srv-GA968/Makefile
index d2b7fd88765f..5c9fa1c978e9 100644
--- a/x11-servers/XttXF98srv-GA968/Makefile
+++ b/x11-servers/XttXF98srv-GA968/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	X98server for GA968 with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1999/01/02 19:11:11 sada Exp $
+# $Id: Makefile,v 1.3 1999/01/15 09:49:38 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-98GA968-1.1
+PKGNAME=	xtt-98GA968-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	nakaji@zeisei.dpri.kyoto-u.ac.jp
diff --git a/x11-servers/XttXF98srv-GANBWAP/Makefile b/x11-servers/XttXF98srv-GANBWAP/Makefile
index 7ef975fbd55c..e35f14821405 100644
--- a/x11-servers/XttXF98srv-GANBWAP/Makefile
+++ b/x11-servers/XttXF98srv-GANBWAP/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	X98server for GANBWAP with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1999/01/02 19:11:11 sada Exp $
+# $Id: Makefile,v 1.3 1999/01/15 09:49:39 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-98GANBWAP-1.1
+PKGNAME=	xtt-98GANBWAP-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	nakaji@zeisei.dpri.kyoto-u.ac.jp
diff --git a/x11-servers/XttXF98srv-MGA/Makefile b/x11-servers/XttXF98srv-MGA/Makefile
index 75db4e1668bf..d36a06dc7e21 100644
--- a/x11-servers/XttXF98srv-MGA/Makefile
+++ b/x11-servers/XttXF98srv-MGA/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	X98server for MGA with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1999/01/02 19:11:11 sada Exp $
+# $Id: Makefile,v 1.3 1999/01/15 09:49:39 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-98MGA-1.1
+PKGNAME=	xtt-98MGA-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	nakaji@zeisei.dpri.kyoto-u.ac.jp
diff --git a/x11-servers/XttXF98srv-NEC480/Makefile b/x11-servers/XttXF98srv-NEC480/Makefile
index b7abf39b2a45..899adfdeb4bd 100644
--- a/x11-servers/XttXF98srv-NEC480/Makefile
+++ b/x11-servers/XttXF98srv-NEC480/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	X98server for NEC480 with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1999/01/02 19:11:11 sada Exp $
+# $Id: Makefile,v 1.3 1999/01/15 09:49:39 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-98NEC480-1.1
+PKGNAME=	xtt-98NEC480-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	nakaji@zeisei.dpri.kyoto-u.ac.jp
diff --git a/x11-servers/XttXF98srv-NECS3/Makefile b/x11-servers/XttXF98srv-NECS3/Makefile
index 16db02cda013..41c6717f12ed 100644
--- a/x11-servers/XttXF98srv-NECS3/Makefile
+++ b/x11-servers/XttXF98srv-NECS3/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	X98server for NECS3 with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1999/01/02 19:11:12 sada Exp $
+# $Id: Makefile,v 1.3 1999/01/15 09:49:40 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-98NECS3-1.1
+PKGNAME=	xtt-98NECS3-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	nakaji@zeisei.dpri.kyoto-u.ac.jp
diff --git a/x11-servers/XttXF98srv-NKVNEC/Makefile b/x11-servers/XttXF98srv-NKVNEC/Makefile
index c4f9d13bc1ba..3e6b68010132 100644
--- a/x11-servers/XttXF98srv-NKVNEC/Makefile
+++ b/x11-servers/XttXF98srv-NKVNEC/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	X98server for NKVNEC with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1999/01/02 19:11:12 sada Exp $
+# $Id: Makefile,v 1.3 1999/01/15 09:49:41 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-98NKVNEC-1.1
+PKGNAME=	xtt-98NKVNEC-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	nakaji@zeisei.dpri.kyoto-u.ac.jp
diff --git a/x11-servers/XttXF98srv-PWLB/Makefile b/x11-servers/XttXF98srv-PWLB/Makefile
index 3116b93d2863..db9e0abfec3f 100644
--- a/x11-servers/XttXF98srv-PWLB/Makefile
+++ b/x11-servers/XttXF98srv-PWLB/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	X98server for PWLB with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1999/01/02 19:11:12 sada Exp $
+# $Id: Makefile,v 1.3 1999/01/15 09:49:41 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-98PWLB-1.1
+PKGNAME=	xtt-98PWLB-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	nakaji@zeisei.dpri.kyoto-u.ac.jp
diff --git a/x11-servers/XttXF98srv-PWSKB/Makefile b/x11-servers/XttXF98srv-PWSKB/Makefile
index 959a33fd2b40..d3461e5c35af 100644
--- a/x11-servers/XttXF98srv-PWSKB/Makefile
+++ b/x11-servers/XttXF98srv-PWSKB/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	X98server for PWSKB with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1999/01/02 19:11:12 sada Exp $
+# $Id: Makefile,v 1.3 1999/01/15 09:49:42 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-98PWSKB-1.1
+PKGNAME=	xtt-98PWSKB-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	nakaji@zeisei.dpri.kyoto-u.ac.jp
diff --git a/x11-servers/XttXF98srv-SVGA/Makefile b/x11-servers/XttXF98srv-SVGA/Makefile
index ec14bfb84e3b..4c10373dd9f8 100644
--- a/x11-servers/XttXF98srv-SVGA/Makefile
+++ b/x11-servers/XttXF98srv-SVGA/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	X98server for SVGA with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1999/01/02 19:11:12 sada Exp $
+# $Id: Makefile,v 1.3 1999/01/15 09:49:42 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-98SVGA-1.1
+PKGNAME=	xtt-98SVGA-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	nakaji@zeisei.dpri.kyoto-u.ac.jp
diff --git a/x11-servers/XttXF98srv-TGUI/Makefile b/x11-servers/XttXF98srv-TGUI/Makefile
index 880098c2917f..4a80c283fc99 100644
--- a/x11-servers/XttXF98srv-TGUI/Makefile
+++ b/x11-servers/XttXF98srv-TGUI/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	X98server for TGUI with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1999/01/02 19:11:12 sada Exp $
+# $Id: Makefile,v 1.3 1999/01/15 09:49:43 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-98TGUI-1.1
+PKGNAME=	xtt-98TGUI-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	nakaji@zeisei.dpri.kyoto-u.ac.jp
diff --git a/x11-servers/XttXF98srv-WABEP/Makefile b/x11-servers/XttXF98srv-WABEP/Makefile
index 4f23f3369cc1..cc6d58fa6cbd 100644
--- a/x11-servers/XttXF98srv-WABEP/Makefile
+++ b/x11-servers/XttXF98srv-WABEP/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	X98server for WABEP with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1999/01/02 19:11:12 sada Exp $
+# $Id: Makefile,v 1.3 1999/01/15 09:49:45 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-98WABEP-1.1
+PKGNAME=	xtt-98WABEP-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	nakaji@zeisei.dpri.kyoto-u.ac.jp
diff --git a/x11-servers/XttXF98srv-WABS/Makefile b/x11-servers/XttXF98srv-WABS/Makefile
index fea440a01e10..54e385b17c1a 100644
--- a/x11-servers/XttXF98srv-WABS/Makefile
+++ b/x11-servers/XttXF98srv-WABS/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	X98server for WABS with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1999/01/02 19:11:13 sada Exp $
+# $Id: Makefile,v 1.3 1999/01/15 09:49:45 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-98WABS-1.1
+PKGNAME=	xtt-98WABS-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	nakaji@zeisei.dpri.kyoto-u.ac.jp
diff --git a/x11-servers/XttXF98srv-WSNA/Makefile b/x11-servers/XttXF98srv-WSNA/Makefile
index 2b8bf95c3fc3..1c8f5f28bd7d 100644
--- a/x11-servers/XttXF98srv-WSNA/Makefile
+++ b/x11-servers/XttXF98srv-WSNA/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	X98server for WSNA with X True Type
-# Version required:	1.1
+# Version required:	1.2.1
 # Date created:		25 October 1998
 # Whom:			NAKAJI Hiroyuki <nakaji@zeisei.dpri.kyoto-u.ac.jp>
 #
-# $Id: Makefile,v 1.2 1999/01/02 19:11:13 sada Exp $
+# $Id: Makefile,v 1.3 1999/01/15 09:49:46 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME=	xtt-98WSNA-1.1
+PKGNAME=	xtt-98WSNA-${VERSION}.${PATCHLEVEL}
 CATEGORIES=	x11
 
 MAINTAINER=	nakaji@zeisei.dpri.kyoto-u.ac.jp