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

4 files changed, 42 insertions, 14 deletions

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))
+