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

3 files changed, 26 insertions, 10 deletions

diff --git a/x11/XFree86-4-manuals/Makefile b/x11/XFree86-4-manuals/Makefile
index 4959e739a31e..ebb149c5f1cd 100644
--- a/x11/XFree86-4-manuals/Makefile
+++ b/x11/XFree86-4-manuals/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	manuals
-PORTVERSION=	4.4.0
-PORTREVISION=	1
+PORTVERSION=	4.5.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	${PORTVERSION}
@@ -17,9 +16,9 @@ DISTFILES=	XFree86-${PORTVERSION}-src-1.tgz
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	XFree86-4 man pages
 
-CONFLICTS=	xorg-manpages-*
+CONFLICTS=	xorg-manpages-[0-9]*
 
-USE_IMAKE=		YES
+USE_IMAKE=		yes
 EXTRACT_TARGET=		xc/doc/man \
 			xc/extras/ogl-sample/main/doc/man
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - ${EXTRACT_TARGET}
@@ -33,6 +32,7 @@ pre-configure:
 	@${MKDIR} ${CFGDIR}
 	@${CP} ${PREFIX}/lib/X11/config/* ${CFGDIR}
 	@${ECHO} "#define BuildHtmlManPages NO" >>${CFGDIR}/xf86site.def
+	@${ECHO} "#define PreprocessManPages YES" >>${CFGDIR}/xf86site.def
 
 do-configure:
 	(cd ${WRKSRC} && \
@@ -45,7 +45,7 @@ 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 "${FILESDIR}/manpages"
diff --git a/x11/XFree86-4-manuals/distinfo b/x11/XFree86-4-manuals/distinfo
index 95d757b34b21..7f73580f3b79 100644
--- a/x11/XFree86-4-manuals/distinfo
+++ b/x11/XFree86-4-manuals/distinfo
@@ -1,2 +1,2 @@
-MD5 (xc/XFree86-4.4.0-src-1.tgz) = 97cea3d9e1197dde32ca34e3b6086469
-SIZE (xc/XFree86-4.4.0-src-1.tgz) = 11760814
+MD5 (xc/XFree86-4.5.0-src-1.tgz) = 6c0fcf8069c13d068276016bbf6ad712
+SIZE (xc/XFree86-4.5.0-src-1.tgz) = 10507331
diff --git a/x11/XFree86-4-manuals/files/manpages b/x11/XFree86-4-manuals/files/manpages
index 2adf970511dc..7b41f1e47574 100644
--- a/x11/XFree86-4-manuals/files/manpages
+++ b/x11/XFree86-4-manuals/files/manpages
@@ -8,6 +8,25 @@ MAN3=	AllPlanes.3 \
 	ClientWhitePointOfCCC.3 \
 	ConnectionNumber.3 \
 	DBE.3 \
+	DMX.3 \
+	DMXAddBackendInput.3 \
+	DMXAddConsoleInput.3 \
+	DMXAddInput.3 \
+	DMXAddScreen.3 \
+	DMXChangeDesktopAttributes.3 \
+	DMXChangeScreensAttributes.3 \
+	DMXForceWindowCreation.3 \
+	DMXGetDesktopAttributes.3 \
+	DMXGetInputAttributes.3 \
+	DMXGetInputCount.3 \
+	DMXGetScreenAttributes.3 \
+	DMXGetScreenCount.3 \
+	DMXGetWindowAttributes.3 \
+	DMXQueryExtension.3 \
+	DMXQueryVersion.3 \
+	DMXRemoveInput.3 \
+	DMXRemoveScreen.3 \
+	DMXSync.3 \
 	DefaultColormap.3 \
 	DefaultColormapOfScreen.3 \
 	DefaultDepth.3 \
@@ -1500,8 +1519,5 @@ MAN3=	AllPlanes.3 \
 	gluTessVertex.3 \
 	gluUnProject.3
 MAN7=	X.7 \
-	X.Org.7 \
-	XConsortium.7 \
-	XProjectTeam.7 \
 	XStandards.7 \
 	Xsecurity.7