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

7 files changed, 38 insertions, 59 deletions

diff --git a/devel/imake-4/Makefile b/devel/imake-4/Makefile
index 35d29d55eff0..bb859fead7a1 100644
--- a/devel/imake-4/Makefile
+++ b/devel/imake-4/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	imake
-PORTVERSION=	4.3.0
-PORTREVISION=	2
+PORTVERSION=	4.4.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
-DISTFILES=	X430src-1.tgz X430src-3.tgz
+DISTFILES=	XFree86-4.4.0-src-1.tgz \
+		XFree86-4.4.0-src-3.tgz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Imake and other utilities from XFree86
@@ -19,6 +19,7 @@ COMMENT=	Imake and other utilities from XFree86
 CONFLICTS=	imake-6*
 
 PREFIX?=	${X11BASE}
+MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
 USE_PERL5=	YES
 USE_REINPLACE=	yes
 
@@ -32,14 +33,8 @@ USE_REINPLACE=	yes
 IGNORE=		is part of XFree86-4
 .endif
 
-.if ${OSVERSION} < 500000
-LATEST_LINK=	imake4
-.else
-LATEST_LINK=	imake
-.endif
 DIST_SUBDIR=	xc
 WRKSRC=		${WRKDIR}/xc/config
-MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
 PATCH_DIST_ARGS=	--force -d ${WRKDIR} --forward --quiet -E ${PATCH_DIST_STRIP} 2>/dev/null || true
 MAN1=		ccmakedep.1 \
 		cleanlinks.1 \
diff --git a/devel/imake-4/distinfo b/devel/imake-4/distinfo
index e4afe34769b0..0559e773d23a 100644
--- a/devel/imake-4/distinfo
+++ b/devel/imake-4/distinfo
@@ -1,4 +1,4 @@
-MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
-SIZE (xc/X430src-1.tgz) = 10993622
-MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
-SIZE (xc/X430src-3.tgz) = 12366363
+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-3.tgz) = 703404f48d3a15f58389a879d47c769d
+SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253
diff --git a/devel/imake-4/files/patch-amd64 b/devel/imake-4/files/patch-amd64
new file mode 100644
index 000000000000..7e786cf3d680
--- /dev/null
+++ b/devel/imake-4/files/patch-amd64
@@ -0,0 +1,22 @@
+--- imake/imakemdep.h.orig	Mon Dec 29 20:53:52 2003
++++ imake/imakemdep.h	Tue Mar  2 11:05:16 2004
+@@ -374,6 +374,9 @@
+ # ifdef __AMD64__
+ 	"-D__AMD64__",
+ # endif
++# ifdef __amd64__
++	"-D__amd64__",
++# endif
+ # ifdef __x86_64__
+ 	"-D__AMD64__",
+ # endif
+@@ -1271,6 +1274,9 @@
+ # if defined (__AMD64__) || defined (__x86_64__)
+ 	{"__AMD64__", "1"},
+ 	{"__x86_64__", "1"},
++# endif
++# if defined (__amd64__)
++	{"__amd64__", "1"},
+ # endif
+ # ifdef __i386
+ 	{"__i386", "1"},
diff --git a/devel/imake-4/files/patch-d b/devel/imake-4/files/patch-d
index 9c63e1fad9dd..693987b584d7 100644
--- a/devel/imake-4/files/patch-d
+++ b/devel/imake-4/files/patch-d
@@ -1,6 +1,6 @@
---- cf/FreeBSD.cf.orig	Tue Jan 14 21:52:12 2003
-+++ cf/FreeBSD.cf	Fri Feb  6 12:27:55 2004
-@@ -89,14 +89,14 @@
+--- cf/FreeBSD.cf.orig	Wed Jun  9 04:53:53 2004
++++ cf/FreeBSD.cf	Wed Jun  9 04:56:47 2004
+@@ -108,14 +108,14 @@
  # endif
  # define HasPosixThreads	YES
  # define ThreadedX		YES
@@ -17,23 +17,24 @@
  # else
  #  if OSRelVersion >= 500043
  #   define BuildThreadStubLibrary  NO
-@@ -106,9 +106,9 @@
+@@ -125,10 +125,10 @@
  #   define NeedUIThrStubs          YES
  #  endif
  #  if (OSRelVersion >= 500016)
 -#   define ThreadsLibraries	-lc_r
 +#   define ThreadsLibraries	%%PTHREAD_LIBS%%
+ #   define SharedGLReqs		$(LDPRELIBS) $(XLIB) -lc
  #  else
 -#   define ThreadsLibraries	-pthread
 +#   define ThreadsLibraries	%%PTHREAD_LIBS%%
  #  endif
  #  define SharedX11Reqs		$(LDPRELIB) $(XTHRSTUBLIB)
- #  define SharedXtReqs		$(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
-@@ -485,14 +485,14 @@
+ #  define SharedXtReqs		$(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB)
+@@ -442,14 +442,14 @@
  /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
  #ifndef DefaultGcc2i386Opt
  #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
--#define DefaultGcc2i386Opt -O2
+-#define DefaultGcc2i386Opt -O2 GccAliasingArgs
 +#define DefaultGcc2i386Opt
  #endif
  #endif
diff --git a/devel/imake-4/files/patch-freetype b/devel/imake-4/files/patch-freetype
deleted file mode 100644
index aecdd09fd35b..000000000000
--- a/devel/imake-4/files/patch-freetype
+++ /dev/null
@@ -1,11 +0,0 @@
---- cf/X11.tmpl.orig	Tue Feb 25 13:57:52 2003
-+++ cf/X11.tmpl	Sun Mar  2 21:07:54 2003
-@@ -3029,7 +3029,7 @@
- #endif /* else BuildFreetype2Library */
- 
- #if BuildFreetype2Library || HasFreetype2
--FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)
-+FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2DIR)/include
- FREETYPE2DEFINES = -DFREETYPE2
- #endif
- 
diff --git a/devel/imake-4/files/patch-rman.c b/devel/imake-4/files/patch-rman.c
deleted file mode 100644
index 49f96f114a45..000000000000
--- a/devel/imake-4/files/patch-rman.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../extras/rman/rman.c.orig	Tue Jul 15 23:53:53 2003
-+++ ../extras/rman/rman.c	Tue Jul 15 23:44:21 2003
-@@ -4104,6 +4104,9 @@
- 	     }
- 	   }
- 	   break;
-+	 case 0:
-+	   /* ignore */
-+	   break;
- 	 default:		/* unknown escaped character */
- 	   sputchar(*p++);
- 	 }
diff --git a/devel/imake-4/pkg-plist b/devel/imake-4/pkg-plist
index 8a1608524fb4..261dbcb08bf0 100644
--- a/devel/imake-4/pkg-plist
+++ b/devel/imake-4/pkg-plist
@@ -119,19 +119,3 @@ lib/X11/config/xf86.tmpl
 lib/X11/config/xf86site.def
 lib/X11/config/xfree86.cf
 lib/X11/config/xttMod.tmpl
-lib/X11/doc/html/ccmakedep.1.html
-lib/X11/doc/html/cleanlinks.1.html
-lib/X11/doc/html/gccmakedep.1.html
-lib/X11/doc/html/imake.1.html
-lib/X11/doc/html/lndir.1.html
-lib/X11/doc/html/makedepend.1.html
-lib/X11/doc/html/makeg.1.html
-lib/X11/doc/html/makestrs.1.html
-lib/X11/doc/html/manindex1.html
-lib/X11/doc/html/mergelib.1.html
-lib/X11/doc/html/mkdirhier.1.html
-lib/X11/doc/html/mkhtmlindex.1.html
-lib/X11/doc/html/pswrap.1.html
-lib/X11/doc/html/revpath.1.html
-lib/X11/doc/html/rman.1.html
-lib/X11/doc/html/xmkmf.1.html