Upgrade to XFree86 4.5.0.

Ports changes:
- Drop dependency on x11/wrapper. X server already contains this code
(programs/Xserver/os/utils.c rev. 3.58).
- Install default SecurityPolicy with XFree86-4-libraries, thus avoiding
plists and who-owns-what complications between different fooServer ports.
Copy default file to real one if that doesn't exist and remove both upon
uninstall if they are the same.
- Revert change to Imake.rules rev. 3.132 in devel/imake-4 port, since
couple of ports break with this change
(devel/imake-4/files/patch-Imake.rules)
- Add grehans patches for PPC [1]
- Several of directories that were previously in /etc/mtree/BSD.x11-4.dist
were moved to respective ports pkg-plists

PR:		[1] 78345, 78346, 78348, 78352, 78353, 78354, 78355, 78356

4 files changed, 111 insertions, 107 deletions

diff --git a/x11/XFree86-4-documents/Makefile b/x11/XFree86-4-documents/Makefile
index ba76eea..e777439 100644
--- a/x11/XFree86-4-documents/Makefile
+++ b/x11/XFree86-4-documents/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	documents
-PORTVERSION=	4.4.0
+PORTVERSION=	4.5.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	XFree86-4.4.0-src-1.tgz \
-		XFree86-4.4.0-src-6.tgz
+DISTFILES=	XFree86-${PORTVERSION}-src-1.tgz \
+		XFree86-${PORTVERSION}-src-6.tgz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	XFree86-4 documentation
@@ -37,6 +37,6 @@ do-configure:
 
 .include <bsd.port.pre.mk>
 .if ${X_WINDOW_SYSTEM:L} != xfree86-4
-IGNORE= is part of XFree86-4
+IGNORE=	is part of XFree86-4
 .endif
 .include <bsd.port.post.mk>
diff --git a/x11/XFree86-4-documents/distinfo b/x11/XFree86-4-documents/distinfo
index 50e799f..0c395b4 100644
--- a/x11/XFree86-4-documents/distinfo
+++ b/x11/XFree86-4-documents/distinfo
@@ -1,4 +1,4 @@
-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-6.tgz) = d1e12c33e9756d5143004a69f2cdac81
-SIZE (xc/XFree86-4.4.0-src-6.tgz) = 3254668
+MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712
+SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331
+MD5 (xc/XFree86-4.5.0-src-6.tgz) = f75cf36c1170c15c5e0de757667151d4
+SIZE (xc/XFree86-4.5.0-src-6.tgz) = 3257406
diff --git a/x11/XFree86-4-documents/files/patch-04 b/x11/XFree86-4-documents/files/patch-Imakefile
index 1dd024b8..34d44da 100644
--- a/x11/XFree86-4-documents/files/patch-04
+++ b/x11/XFree86-4-documents/files/patch-Imakefile
@@ -1,6 +1,6 @@
---- Imakefile.orig	Sun Apr 11 08:26:03 2004
-+++ Imakefile	Sun Apr 11 08:26:24 2004
-@@ -13,13 +13,11 @@
+--- Imakefile.orig	Wed Feb  2 17:35:34 2005
++++ Imakefile	Wed Feb  2 17:36:07 2005
+@@ -8,7 +8,7 @@
  #else
  SUBDIRS = BDF CTEXT FSProtocol GL ICCCM ICE PM Render SM X11 XDMCP \
  	  XIM XLFD XProtocol Xaw Xext Xi Xmu Xserver Xt Xv XvMC \
@@ -8,10 +8,11 @@
 +          i18n rstart xfs xterm xtrans
  #endif
  
- all::
+ AllTarget(specindex.html)
+@@ -21,6 +21,4 @@
+ #endif
  
- MakeSubdirs($(SUBDIRS))
- DependSubdirs($(SUBDIRS))
+ CppRawFileTarget(specindex.html,specindex.cpp,$(SPECINDEXDEFS),NullParameter)
 -
 -InstallDoc(specindex,specindex.html)
  
diff --git a/x11/XFree86-4-documents/pkg-plist b/x11/XFree86-4-documents/pkg-plist
index cf8199d..5a8207d 100644
--- a/x11/XFree86-4-documents/pkg-plist
+++ b/x11/XFree86-4-documents/pkg-plist
@@ -1,93 +1,96 @@
-lib/X11/doc/DPMS.txt
-lib/X11/doc/DPMSLib.txt
-lib/X11/doc/ICElib.txt
-lib/X11/doc/LocaleDB.txt
-lib/X11/doc/PM_spec.txt
-lib/X11/doc/PostScript/DPMS.ps
-lib/X11/doc/PostScript/DPMSLib.ps
-lib/X11/doc/PostScript/ICElib.ps
-lib/X11/doc/PostScript/LocaleDB.ps
-lib/X11/doc/PostScript/SMlib.ps
-lib/X11/doc/PostScript/XIMTransport.ps
-lib/X11/doc/PostScript/XiLib.ps
-lib/X11/doc/PostScript/XiPorting.ps
-lib/X11/doc/PostScript/XiProtocol.ps
-lib/X11/doc/PostScript/Xtrans.ps
-lib/X11/doc/PostScript/appgroup.ps
-lib/X11/doc/PostScript/bdf.ps
-lib/X11/doc/PostScript/bigreq.ps
-lib/X11/doc/PostScript/buffer.ps
-lib/X11/doc/PostScript/ctext.ps
-lib/X11/doc/PostScript/ctlseqs.ps
-lib/X11/doc/PostScript/ddx.ps
-lib/X11/doc/PostScript/evi.ps
-lib/X11/doc/PostScript/fontlib.ps
-lib/X11/doc/PostScript/fsproto.ps
-lib/X11/doc/PostScript/i18nFramework.ps
-lib/X11/doc/PostScript/icccm.ps
-lib/X11/doc/PostScript/ice.ps
-lib/X11/doc/PostScript/intrinsics.ps
-lib/X11/doc/PostScript/mit-shm.ps
-lib/X11/doc/PostScript/proto.ps
-lib/X11/doc/PostScript/record.ps
-lib/X11/doc/PostScript/recordlib.ps
-lib/X11/doc/PostScript/rstart.ps
-lib/X11/doc/PostScript/shape.ps
-lib/X11/doc/PostScript/shapelib.ps
-lib/X11/doc/PostScript/tog-cup.ps
-lib/X11/doc/PostScript/widgets.ps
-lib/X11/doc/PostScript/xc-misc.ps
-lib/X11/doc/PostScript/xdmcp.ps
-lib/X11/doc/PostScript/xfs-design.ps
-lib/X11/doc/PostScript/xim.ps
-lib/X11/doc/PostScript/xlfd.ps
-lib/X11/doc/PostScript/xlib.ps
-lib/X11/doc/PostScript/xmu.ps
-lib/X11/doc/PostScript/xsmp.ps
-lib/X11/doc/PostScript/xtest.ps
-lib/X11/doc/PostScript/xtestlib.ps
-lib/X11/doc/SMlib.txt
-lib/X11/doc/XIMTransport.txt
-lib/X11/doc/XiLib.txt
-lib/X11/doc/XiPorting.txt
-lib/X11/doc/XiProtocol.txt
-lib/X11/doc/Xtrans.txt
-lib/X11/doc/XvMC_API.txt
-lib/X11/doc/appgroup.txt
-lib/X11/doc/bdf.txt
-lib/X11/doc/bigreq.txt
-lib/X11/doc/buffer.txt
-lib/X11/doc/ctext.txt
-lib/X11/doc/ctlseqs.txt
-lib/X11/doc/ddx.txt
-lib/X11/doc/evi.txt
-lib/X11/doc/fontlib.txt
-lib/X11/doc/fsproto.txt
-lib/X11/doc/i18nFramework.txt
-lib/X11/doc/icccm.txt
-lib/X11/doc/ice.txt
-lib/X11/doc/intrinsics.txt
-lib/X11/doc/libGL.txt
-lib/X11/doc/mit-shm.txt
-lib/X11/doc/proto.txt
-lib/X11/doc/record.txt
-lib/X11/doc/recordlib.txt
-lib/X11/doc/render-protocol.txt
-lib/X11/doc/rstart.txt
-lib/X11/doc/rstartd.txt
-lib/X11/doc/shape.txt
-lib/X11/doc/shapelib.txt
-lib/X11/doc/tog-cup.txt
-lib/X11/doc/widgets.txt
-lib/X11/doc/xc-misc.txt
-lib/X11/doc/xdmcp.txt
-lib/X11/doc/xfs-design.txt
-lib/X11/doc/xim.txt
-lib/X11/doc/xlfd.txt
-lib/X11/doc/xlib.txt
-lib/X11/doc/xmu.txt
-lib/X11/doc/xsmp.txt
-lib/X11/doc/xtest.txt
-lib/X11/doc/xtestlib.txt
-lib/X11/doc/xv-protocol-v2.txt
-@unexec rmdir %D/lib/X11/doc/PDF 2>/dev/null || true
+share/doc/XFree86/DPMS.txt
+share/doc/XFree86/DPMSLib.txt
+share/doc/XFree86/ICElib.txt
+share/doc/XFree86/LocaleDB.txt
+share/doc/XFree86/PM_spec.txt
+share/doc/XFree86/PostScript/DPMS.ps
+share/doc/XFree86/PostScript/DPMSLib.ps
+share/doc/XFree86/PostScript/ICElib.ps
+share/doc/XFree86/PostScript/LocaleDB.ps
+share/doc/XFree86/PostScript/SMlib.ps
+share/doc/XFree86/PostScript/XIMTransport.ps
+share/doc/XFree86/PostScript/XiLib.ps
+share/doc/XFree86/PostScript/XiPorting.ps
+share/doc/XFree86/PostScript/XiProtocol.ps
+share/doc/XFree86/PostScript/Xtrans.ps
+share/doc/XFree86/PostScript/appgroup.ps
+share/doc/XFree86/PostScript/bdf.ps
+share/doc/XFree86/PostScript/bigreq.ps
+share/doc/XFree86/PostScript/buffer.ps
+share/doc/XFree86/PostScript/ctext.ps
+share/doc/XFree86/PostScript/ctlseqs.ps
+share/doc/XFree86/PostScript/ddx.ps
+share/doc/XFree86/PostScript/evi.ps
+share/doc/XFree86/PostScript/fontlib.ps
+share/doc/XFree86/PostScript/fsproto.ps
+share/doc/XFree86/PostScript/i18nFramework.ps
+share/doc/XFree86/PostScript/icccm.ps
+share/doc/XFree86/PostScript/ice.ps
+share/doc/XFree86/PostScript/intrinsics.ps
+share/doc/XFree86/PostScript/mit-shm.ps
+share/doc/XFree86/PostScript/proto.ps
+share/doc/XFree86/PostScript/record.ps
+share/doc/XFree86/PostScript/recordlib.ps
+share/doc/XFree86/PostScript/rstart.ps
+share/doc/XFree86/PostScript/shape.ps
+share/doc/XFree86/PostScript/shapelib.ps
+share/doc/XFree86/PostScript/tog-cup.ps
+share/doc/XFree86/PostScript/widgets.ps
+share/doc/XFree86/PostScript/xc-misc.ps
+share/doc/XFree86/PostScript/xdmcp.ps
+share/doc/XFree86/PostScript/xfs-design.ps
+share/doc/XFree86/PostScript/xim.ps
+share/doc/XFree86/PostScript/xlfd.ps
+share/doc/XFree86/PostScript/xlib.ps
+share/doc/XFree86/PostScript/xmu.ps
+share/doc/XFree86/PostScript/xsmp.ps
+share/doc/XFree86/PostScript/xtest.ps
+share/doc/XFree86/PostScript/xtestlib.ps
+share/doc/XFree86/SMlib.txt
+share/doc/XFree86/XIMTransport.txt
+share/doc/XFree86/XiLib.txt
+share/doc/XFree86/XiPorting.txt
+share/doc/XFree86/XiProtocol.txt
+share/doc/XFree86/Xtrans.txt
+share/doc/XFree86/XvMC_API.txt
+share/doc/XFree86/appgroup.txt
+share/doc/XFree86/bdf.txt
+share/doc/XFree86/bigreq.txt
+share/doc/XFree86/buffer.txt
+share/doc/XFree86/ctext.txt
+share/doc/XFree86/ctlseqs.txt
+share/doc/XFree86/ddx.txt
+share/doc/XFree86/evi.txt
+share/doc/XFree86/fontlib.txt
+share/doc/XFree86/fsproto.txt
+share/doc/XFree86/i18nFramework.txt
+share/doc/XFree86/icccm.txt
+share/doc/XFree86/ice.txt
+share/doc/XFree86/intrinsics.txt
+share/doc/XFree86/libGL.txt
+share/doc/XFree86/mit-shm.txt
+share/doc/XFree86/proto.txt
+share/doc/XFree86/record.txt
+share/doc/XFree86/recordlib.txt
+share/doc/XFree86/render-protocol.txt
+share/doc/XFree86/rstart.txt
+share/doc/XFree86/rstartd.txt
+share/doc/XFree86/shape.txt
+share/doc/XFree86/shapelib.txt
+share/doc/XFree86/tog-cup.txt
+share/doc/XFree86/widgets.txt
+share/doc/XFree86/xc-misc.txt
+share/doc/XFree86/xdmcp.txt
+share/doc/XFree86/xfs-design.txt
+share/doc/XFree86/xim.txt
+share/doc/XFree86/xlfd.txt
+share/doc/XFree86/xlib.txt
+share/doc/XFree86/xmu.txt
+share/doc/XFree86/xsmp.txt
+share/doc/XFree86/xtest.txt
+share/doc/XFree86/xtestlib.txt
+share/doc/XFree86/xv-protocol-v2.txt
+@unexec rmdir %D/share/doc/XFree86/PDF 2>/dev/null || true
+@unexec rmdir %D/share/doc/XFree86/PostScript 2>/dev/null || true
+@unexec rmdir %D/share/doc/XFree86/html 2>/dev/null || true
+@unexec rmdir %D/share/doc/XFree86 2>/dev/null || true