Update XFree86 clients to 4.4 release. Release notes are available at

http://www.xfree86.org/4.4.0/RELNOTES.html

PR:		ports/67733 imake
		ports/67508 libraries
		ports/67510 clients
		ports/67513 server
		ports/67776 100dpi fonts
		ports/67777 75dpi fonts
		ports/67778 cyrillic fonts
		ports/67779 default bitmap fonts
		ports/67781 font encodings
		ports/67783 scalable fonts
		ports/67784 font server
		ports/67785 XFree86 meta-port
		ports/67775 documents
		ports/67786 manpages
		ports/67787 nest server
		ports/67788 print server
		ports/67789 virtual framebuffer server
		ports/56487 (Upgrading Xfree86-clients from ports overwrites xdm config files)
		ports/44252 (XFree86-4-Server port removes/overwrites config files)
Submitted by:	Dejan Lesjak (dejan DOT lesjak AT ijs DOT si)
Additional changes by:	anholt
			Jung-uk Kim (jkim AT niksun DOT com)
			arved
Tested by:	pointyhat
		linimon

19 files changed, 97 insertions, 40 deletions

diff --git a/x11-fonts/XFree86-4-font100dpi/Makefile b/x11-fonts/XFree86-4-font100dpi/Makefile
index 13edde71d937..cc18c68c45c1 100644
--- a/x11-fonts/XFree86-4-font100dpi/Makefile
+++ b/x11-fonts/XFree86-4-font100dpi/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	font100dpi
-PORTVERSION=	4.3.0
+PORTVERSION=	4.4.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X430src-4.tgz
+DISTFILES=	XFree86-4.4.0-src-4.tgz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	XFree86-4 bitmap 100 dpi fonts
diff --git a/x11-fonts/XFree86-4-font100dpi/distinfo b/x11-fonts/XFree86-4-font100dpi/distinfo
index d309cf51bf38..68a120863349 100644
--- a/x11-fonts/XFree86-4-font100dpi/distinfo
+++ b/x11-fonts/XFree86-4-font100dpi/distinfo
@@ -1,2 +1,2 @@
-MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
-SIZE (xc/X430src-4.tgz) = 12906091
+MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b
+SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535
diff --git a/x11-fonts/XFree86-4-font100dpi/pkg-plist b/x11-fonts/XFree86-4-font100dpi/pkg-plist
index 102e1bfbcfac..e490a38b7b26 100644
--- a/x11-fonts/XFree86-4-font100dpi/pkg-plist
+++ b/x11-fonts/XFree86-4-font100dpi/pkg-plist
@@ -465,6 +465,7 @@ lib/X11/fonts/100dpi/courR24.pcf.gz
 lib/X11/fonts/100dpi/encodings.dir
 lib/X11/fonts/100dpi/fonts.alias
 lib/X11/fonts/100dpi/fonts.dir
+lib/X11/fonts/100dpi/fonts.scale
 lib/X11/fonts/100dpi/helvB08-ISO8859-1.pcf.gz
 lib/X11/fonts/100dpi/helvB08-ISO8859-10.pcf.gz
 lib/X11/fonts/100dpi/helvB08-ISO8859-13.pcf.gz
@@ -1035,6 +1036,15 @@ lib/X11/fonts/100dpi/lubB18-ISO8859-3.pcf.gz
 lib/X11/fonts/100dpi/lubB18-ISO8859-4.pcf.gz
 lib/X11/fonts/100dpi/lubB18-ISO8859-9.pcf.gz
 lib/X11/fonts/100dpi/lubB18.pcf.gz
+lib/X11/fonts/100dpi/lubB19-ISO8859-1.pcf.gz
+lib/X11/fonts/100dpi/lubB19-ISO8859-10.pcf.gz
+lib/X11/fonts/100dpi/lubB19-ISO8859-13.pcf.gz
+lib/X11/fonts/100dpi/lubB19-ISO8859-14.pcf.gz
+lib/X11/fonts/100dpi/lubB19-ISO8859-15.pcf.gz
+lib/X11/fonts/100dpi/lubB19-ISO8859-2.pcf.gz
+lib/X11/fonts/100dpi/lubB19-ISO8859-3.pcf.gz
+lib/X11/fonts/100dpi/lubB19-ISO8859-4.pcf.gz
+lib/X11/fonts/100dpi/lubB19-ISO8859-9.pcf.gz
 lib/X11/fonts/100dpi/lubB19.pcf.gz
 lib/X11/fonts/100dpi/lubB24-ISO8859-1.pcf.gz
 lib/X11/fonts/100dpi/lubB24-ISO8859-10.pcf.gz
diff --git a/x11-fonts/XFree86-4-font75dpi/Makefile b/x11-fonts/XFree86-4-font75dpi/Makefile
index 0b4dc79cc5ea..f90c0f3bbc5c 100644
--- a/x11-fonts/XFree86-4-font75dpi/Makefile
+++ b/x11-fonts/XFree86-4-font75dpi/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	font75dpi
-PORTVERSION=	4.3.0
+PORTVERSION=	4.4.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X430src-4.tgz
+DISTFILES=	XFree86-4.4.0-src-4.tgz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	XFree86-4 bitmap 75 dpi fonts
diff --git a/x11-fonts/XFree86-4-font75dpi/distinfo b/x11-fonts/XFree86-4-font75dpi/distinfo
index d309cf51bf38..68a120863349 100644
--- a/x11-fonts/XFree86-4-font75dpi/distinfo
+++ b/x11-fonts/XFree86-4-font75dpi/distinfo
@@ -1,2 +1,2 @@
-MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
-SIZE (xc/X430src-4.tgz) = 12906091
+MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b
+SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535
diff --git a/x11-fonts/XFree86-4-font75dpi/pkg-plist b/x11-fonts/XFree86-4-font75dpi/pkg-plist
index ac325cc27e1b..a6fe936f64e8 100644
--- a/x11-fonts/XFree86-4-font75dpi/pkg-plist
+++ b/x11-fonts/XFree86-4-font75dpi/pkg-plist
@@ -465,6 +465,7 @@ lib/X11/fonts/75dpi/courR24.pcf.gz
 lib/X11/fonts/75dpi/encodings.dir
 lib/X11/fonts/75dpi/fonts.alias
 lib/X11/fonts/75dpi/fonts.dir
+lib/X11/fonts/75dpi/fonts.scale
 lib/X11/fonts/75dpi/helvB08-ISO8859-1.pcf.gz
 lib/X11/fonts/75dpi/helvB08-ISO8859-10.pcf.gz
 lib/X11/fonts/75dpi/helvB08-ISO8859-13.pcf.gz
@@ -1035,6 +1036,15 @@ lib/X11/fonts/75dpi/lubB18-ISO8859-3.pcf.gz
 lib/X11/fonts/75dpi/lubB18-ISO8859-4.pcf.gz
 lib/X11/fonts/75dpi/lubB18-ISO8859-9.pcf.gz
 lib/X11/fonts/75dpi/lubB18.pcf.gz
+lib/X11/fonts/75dpi/lubB19-ISO8859-1.pcf.gz
+lib/X11/fonts/75dpi/lubB19-ISO8859-10.pcf.gz
+lib/X11/fonts/75dpi/lubB19-ISO8859-13.pcf.gz
+lib/X11/fonts/75dpi/lubB19-ISO8859-14.pcf.gz
+lib/X11/fonts/75dpi/lubB19-ISO8859-15.pcf.gz
+lib/X11/fonts/75dpi/lubB19-ISO8859-2.pcf.gz
+lib/X11/fonts/75dpi/lubB19-ISO8859-3.pcf.gz
+lib/X11/fonts/75dpi/lubB19-ISO8859-4.pcf.gz
+lib/X11/fonts/75dpi/lubB19-ISO8859-9.pcf.gz
 lib/X11/fonts/75dpi/lubB19.pcf.gz
 lib/X11/fonts/75dpi/lubB24-ISO8859-1.pcf.gz
 lib/X11/fonts/75dpi/lubB24-ISO8859-10.pcf.gz
diff --git a/x11-fonts/XFree86-4-fontCyrillic/Makefile b/x11-fonts/XFree86-4-fontCyrillic/Makefile
index fae03aa572dd..f8f9cb348f39 100644
--- a/x11-fonts/XFree86-4-fontCyrillic/Makefile
+++ b/x11-fonts/XFree86-4-fontCyrillic/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	fontCyrillic
-PORTVERSION=	4.3.0
+PORTVERSION=	4.4.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X430src-4.tgz
+DISTFILES=	XFree86-4.4.0-src-4.tgz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	XFree86-4 Cyrillic fonts
diff --git a/x11-fonts/XFree86-4-fontCyrillic/distinfo b/x11-fonts/XFree86-4-fontCyrillic/distinfo
index d309cf51bf38..68a120863349 100644
--- a/x11-fonts/XFree86-4-fontCyrillic/distinfo
+++ b/x11-fonts/XFree86-4-fontCyrillic/distinfo
@@ -1,2 +1,2 @@
-MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
-SIZE (xc/X430src-4.tgz) = 12906091
+MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b
+SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535
diff --git a/x11-fonts/XFree86-4-fontCyrillic/pkg-plist b/x11-fonts/XFree86-4-fontCyrillic/pkg-plist
index ced97bb2130a..e8570a82ca7a 100644
--- a/x11-fonts/XFree86-4-fontCyrillic/pkg-plist
+++ b/x11-fonts/XFree86-4-fontCyrillic/pkg-plist
@@ -61,6 +61,7 @@ lib/X11/fonts/cyrillic/crox6to.pcf.gz
 lib/X11/fonts/cyrillic/encodings.dir
 lib/X11/fonts/cyrillic/fonts.alias
 lib/X11/fonts/cyrillic/fonts.dir
+lib/X11/fonts/cyrillic/fonts.scale
 lib/X11/fonts/cyrillic/koi10x16b.pcf.gz
 lib/X11/fonts/cyrillic/koi10x20.pcf.gz
 lib/X11/fonts/cyrillic/koi12x24.pcf.gz
diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
index c92b14dc4221..daa771be138b 100644
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
+++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	fontDefaultBitmaps
-PORTVERSION=	4.3.0
+PORTVERSION=	4.4.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X430src-4.tgz X430src-1.tgz
-EXTRACT_ONLY=	X430src-4.tgz
+DISTFILES=	XFree86-4.4.0-src-1.tgz \
+		XFree86-4.4.0-src-4.tgz
+EXTRACT_ONLY=	XFree86-4.4.0-src-4.tgz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	XFree86-4 default bitmap fonts
@@ -30,7 +31,7 @@ WRKSRC=			${WRKDIR}/xc/fonts/bdf/misc
 post-extract:
 	(cd ${WRKDIR} && \
 	 ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-		${DISTDIR}/${DIST_SUBDIR}/X${PORTVERSION:S/.//g}src-1.tgz \
+		${DISTDIR}/${DIST_SUBDIR}/XFree86-4.4.0-src-1.tgz \
 		| ${TAR} -xf - xc/extras/fonts)
 
 do-configure:
diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo b/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo
index 3d555de2123c..77c31aba8b09 100644
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo
+++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/distinfo
@@ -1,4 +1,4 @@
-MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
-SIZE (xc/X430src-4.tgz) = 12906091
-MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
-SIZE (xc/X430src-1.tgz) = 10993622
+MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469
+SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814
+MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b
+SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535
diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist b/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist
index 0ce6f07cac34..fc31cc8768d2 100644
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist
+++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-plist
@@ -394,6 +394,7 @@ lib/X11/fonts/misc/decsess.pcf.gz
 lib/X11/fonts/misc/encodings.dir
 lib/X11/fonts/misc/fonts.alias
 lib/X11/fonts/misc/fonts.dir
+lib/X11/fonts/misc/fonts.scale
 lib/X11/fonts/misc/gb16fs.pcf.gz
 lib/X11/fonts/misc/gb16st.pcf.gz
 lib/X11/fonts/misc/gb24st.pcf.gz
diff --git a/x11-fonts/XFree86-4-fontEncodings/Makefile b/x11-fonts/XFree86-4-fontEncodings/Makefile
index ddb5e2a11173..da8cf15f656c 100644
--- a/x11-fonts/XFree86-4-fontEncodings/Makefile
+++ b/x11-fonts/XFree86-4-fontEncodings/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	fontEncodings
-PORTVERSION=	4.3.0
+PORTVERSION=	4.4.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR=	4.3.0
+MASTER_SITE_SUBDIR= ${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X430src-4.tgz
+DISTFILES=	XFree86-4.4.0-src-4.tgz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	XFree86-4 font encoding files
diff --git a/x11-fonts/XFree86-4-fontEncodings/distinfo b/x11-fonts/XFree86-4-fontEncodings/distinfo
index d309cf51bf38..68a120863349 100644
--- a/x11-fonts/XFree86-4-fontEncodings/distinfo
+++ b/x11-fonts/XFree86-4-fontEncodings/distinfo
@@ -1,2 +1,2 @@
-MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
-SIZE (xc/X430src-4.tgz) = 12906091
+MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b
+SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535
diff --git a/x11-fonts/XFree86-4-fontEncodings/pkg-plist b/x11-fonts/XFree86-4-fontEncodings/pkg-plist
index 8c1d3252b280..60a995f12bc5 100644
--- a/x11-fonts/XFree86-4-fontEncodings/pkg-plist
+++ b/x11-fonts/XFree86-4-fontEncodings/pkg-plist
@@ -1,6 +1,7 @@
 lib/X11/fonts/encodings/adobe-dingbats.enc.gz
 lib/X11/fonts/encodings/adobe-standard.enc.gz
 lib/X11/fonts/encodings/adobe-symbol.enc.gz
+lib/X11/fonts/encodings/ansi-1251.enc
 lib/X11/fonts/encodings/armscii-8.enc
 lib/X11/fonts/encodings/dec-special.enc
 lib/X11/fonts/encodings/encodings.dir
@@ -11,16 +12,21 @@ lib/X11/fonts/encodings/ibm-cp866.enc
 lib/X11/fonts/encodings/iso8859-11.enc
 lib/X11/fonts/encodings/iso8859-13.enc
 lib/X11/fonts/encodings/iso8859-16.enc
+lib/X11/fonts/encodings/iso8859-6.16.enc
+lib/X11/fonts/encodings/iso8859-6.8x.enc
 lib/X11/fonts/encodings/large/big5.eten-0.enc.gz
+lib/X11/fonts/encodings/large/big5hkscs-0.enc.gz
 lib/X11/fonts/encodings/large/encodings.dir
+lib/X11/fonts/encodings/large/gb18030.2000-0.enc.gz
+lib/X11/fonts/encodings/large/gb18030.2000-1.enc.gz
 lib/X11/fonts/encodings/large/gb2312.1980-0.enc.gz
 lib/X11/fonts/encodings/large/gbk-0.enc.gz
 lib/X11/fonts/encodings/large/jisx0201.1976-0.enc.gz
-lib/X11/fonts/encodings/large/jisx0208.1983-0.enc.gz
 lib/X11/fonts/encodings/large/jisx0208.1990-0.enc.gz
 lib/X11/fonts/encodings/large/jisx0212.1990-0.enc.gz
 lib/X11/fonts/encodings/large/ksc5601.1987-0.enc.gz
 lib/X11/fonts/encodings/large/ksc5601.1992-3.enc.gz
+lib/X11/fonts/encodings/large/sun.unicode.india-0.enc.gz
 lib/X11/fonts/encodings/microsoft-cp1250.enc
 lib/X11/fonts/encodings/microsoft-cp1251.enc
 lib/X11/fonts/encodings/microsoft-cp1252.enc
diff --git a/x11-fonts/XFree86-4-fontScalable/Makefile b/x11-fonts/XFree86-4-fontScalable/Makefile
index a4e66c0167a8..69ca5b22a421 100644
--- a/x11-fonts/XFree86-4-fontScalable/Makefile
+++ b/x11-fonts/XFree86-4-fontScalable/Makefile
@@ -6,12 +6,13 @@
 #
 
 PORTNAME=	fontScalable
-PORTVERSION=	4.3.0
+PORTVERSION=	4.4.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X430src-4.tgz X430src-5.tgz
+DISTFILES=	XFree86-4.4.0-src-4.tgz \
+		XFree86-4.4.0-src-5.tgz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	XFree86-4 scalable fonts
@@ -19,7 +20,7 @@ COMMENT=	XFree86-4 scalable fonts
 BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/XFree86-4-clients
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
 
-CONFLICTS=	xorg-fonts-type1-* xorg-fonts-truetype-* 
+CONFLICTS=	xorg-fonts-type1-* xorg-fonts-truetype-*
 
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
diff --git a/x11-fonts/XFree86-4-fontScalable/distinfo b/x11-fonts/XFree86-4-fontScalable/distinfo
index 71cf1fccc5c6..5ad35a9bf4ee 100644
--- a/x11-fonts/XFree86-4-fontScalable/distinfo
+++ b/x11-fonts/XFree86-4-fontScalable/distinfo
@@ -1,4 +1,4 @@
-MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
-SIZE (xc/X430src-4.tgz) = 12906091
-MD5 (xc/X430src-5.tgz) = 4dbdbe9a85c8f7f98dd0ee015a3c7b4f
-SIZE (xc/X430src-5.tgz) = 4388018
+MD5 (xc/XFree86-4.4.0-src-4.tgz) = 5d1792f5c154c7462c6aef39c7853b3b
+SIZE (xc/XFree86-4.4.0-src-4.tgz) = 13057535
+MD5 (xc/XFree86-4.4.0-src-5.tgz) = 5c37f028efc6d54a9c725e333f9cc8ae
+SIZE (xc/XFree86-4.4.0-src-5.tgz) = 4386587
diff --git a/x11-fonts/XFree86-4-fontScalable/files/patch-01 b/x11-fonts/XFree86-4-fontScalable/files/patch-01
index d384fd3dfb85..c97feec70a0b 100644
--- a/x11-fonts/XFree86-4-fontScalable/files/patch-01
+++ b/x11-fonts/XFree86-4-fontScalable/files/patch-01
@@ -1,13 +1,13 @@
---- Imakefile.orig	Thu Mar  1 09:37:01 2001
-+++ Imakefile	Tue Jun  5 02:38:03 2001
-@@ -18,7 +18,11 @@
- PEXDIR = PEX
- #endif
+--- Imakefile.orig	Sun Apr 11 03:46:05 2004
++++ Imakefile	Sun Apr 11 03:46:48 2004
+@@ -15,7 +15,11 @@
+ 
+ FONTDIRS = bdf $(SCALEDDIR)
  
 +#if defined(FreeBSDBuildXscl) || FreeBSDBuildXscl
-+SUBDIRS = $(SCALEDDIR) $(PEXDIR)
++SUBDIRS = $(SCALEDDIR)
 +#else
- SUBDIRS = $(ENCODINGDIR) util bdf $(SCALEDDIR) $(PEXDIR)
+ SUBDIRS = $(ENCODINGDIR) util bdf $(SCALEDDIR)
 +#endif
  
  #if MakeLocalFontDir
diff --git a/x11-fonts/XFree86-4-fontScalable/files/patch-scaled::TTF::Imakefile b/x11-fonts/XFree86-4-fontScalable/files/patch-scaled::TTF::Imakefile
new file mode 100644
index 000000000000..649700cf7f6d
--- /dev/null
+++ b/x11-fonts/XFree86-4-fontScalable/files/patch-scaled::TTF::Imakefile
@@ -0,0 +1,27 @@
+--- scaled/TTF/Imakefile.orig	Tue Apr 20 08:55:17 2004
++++ scaled/TTF/Imakefile	Tue Apr 20 08:56:04 2004
+@@ -8,7 +8,7 @@
+ VERAFONTS = Vera.ttf VeraBI.ttf VeraBd.ttf VeraMoBI.ttf VeraMoBd.ttf \
+ 	VeraMoIt.ttf VeraMono.ttf VeraSe.ttf VeraSeBd.ttf
+ 
+-FONTS = $(LUXIFONTS) $(VERAFONTS)
++FONTS = $(LUXIFONTS)
+ OBJS = $(FONTS)
+ 
+ FONTINSTDIR = $(FONTDIR)/TTF
+@@ -30,15 +30,4 @@
+ MakeSubdirs($(SUBDIRS))
+ DependSubdirs($(SUBDIRS))
+ #endif
+-
+-LinkSourceFile(Vera.ttf,$(VERASRCDIR))
+-LinkSourceFile(VeraBI.ttf,$(VERASRCDIR))
+-LinkSourceFile(VeraBd.ttf,$(VERASRCDIR))
+-LinkSourceFile(VeraIt.ttf,$(VERASRCDIR))
+-LinkSourceFile(VeraMoBI.ttf,$(VERASRCDIR))
+-LinkSourceFile(VeraMoBd.ttf,$(VERASRCDIR))
+-LinkSourceFile(VeraMoIt.ttf,$(VERASRCDIR))
+-LinkSourceFile(VeraMono.ttf,$(VERASRCDIR))
+-LinkSourceFile(VeraSe.ttf,$(VERASRCDIR))
+-LinkSourceFile(VeraSeBd.ttf,$(VERASRCDIR))
+