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

5 files changed, 17 insertions, 43 deletions

diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile
index 729bad199bc6..b03e4a24d354 100644
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@@ -6,41 +6,28 @@
 #
 
 PORTNAME=	NestServer
-PORTVERSION=	4.4.0
-PORTREVISION=	1
+PORTVERSION=	4.5.0
 CATEGORIES=	x11-servers
-MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
-		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
-			anholt/:local
+MASTER_SITES=	${MASTER_SITE_XFREE}
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	XFree86-4.4.0-src-1.tgz:x \
-		XFree86-4.4.0-src-2.tgz:x \
-		XFree86-4.4.0-src-3.tgz:x \
-  		Wraphelp2.gz:local
-EXTRACT_ONLY=	XFree86-4.4.0-src-1.tgz \
-		XFree86-4.4.0-src-2.tgz \
-		XFree86-4.4.0-src-3.tgz
+DISTFILES=	XFree86-${PORTVERSION}-src-1.tgz \
+		XFree86-${PORTVERSION}-src-2.tgz \
+		XFree86-${PORTVERSION}-src-3.tgz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	XFree86-4 nested X server
 
-CONFLICTS=	xorg-nestserver-*
+CONFLICTS=	xorg-nestserver-[0-9]*
 
 MAN1=			Xnest.1
-EXTRA_PATCHES+=		${FILESDIR}/patch-programs::Xserver::Xext::Imakefile
+PLIST_FILES=		bin/Xnest
+
 XBUILD_DIRS=		lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver
 XINCLUDE_DIRS=		lib/xkbfile lib/xtrans
 XINSTALL_DIRS=		programs/Xserver
 XINSTALL_MAN_DIRS=	programs/Xserver/hw/xnest
 
-post-extract:
-	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \
-		${WRKSRC}/lib/Xdmcp/Wraphelp.c
-
-post-install:
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
 .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.pre.mk>
 .if ${X_WINDOW_SYSTEM:L} != xfree86-4
diff --git a/x11-servers/XFree86-4-NestServer/distinfo b/x11-servers/XFree86-4-NestServer/distinfo
index edbe3d91944d..5cb3430994ae 100644
--- a/x11-servers/XFree86-4-NestServer/distinfo
+++ b/x11-servers/XFree86-4-NestServer/distinfo
@@ -1,8 +1,6 @@
-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-2.tgz) = b9b6c74a03e314569e01d5fd4ff59523
-SIZE (xc/XFree86-4.4.0-src-2.tgz) = 5745538
-MD5 (xc/XFree86-4.4.0-src-3.tgz) = 703404f48d3a15f58389a879d47c769d
-SIZE (xc/XFree86-4.4.0-src-3.tgz) = 11239253
-MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535
-SIZE (xc/Wraphelp2.gz) = 3376
+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-2.tgz) = cc296c71cbe58edc3ffdec1084e58f4c
+SIZE (xc/XFree86-4.5.0-src-2.tgz) = 5826556
+MD5 (xc/XFree86-4.5.0-src-3.tgz) = c0ad630bfec4545857c2877b3e2dcbeb
+SIZE (xc/XFree86-4.5.0-src-3.tgz) = 12086763
diff --git a/x11-servers/XFree86-4-NestServer/files/patch-programs::Xserver::Xext::Imakefile b/x11-servers/XFree86-4-NestServer/files/patch-programs::Xserver::Xext::Imakefile
deleted file mode 100644
index 350e13eebafb..000000000000
--- a/x11-servers/XFree86-4-NestServer/files/patch-programs::Xserver::Xext::Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- programs/Xserver/Xext/Imakefile.orig	Mon May 10 01:50:48 2004
-+++ programs/Xserver/Xext/Imakefile	Mon May 10 01:53:00 2004
-@@ -160,7 +160,7 @@
- LinkSourceFile(modinit.h,extmod)
- 
- #if BuildXCSecurity && InstallSecurityConfig
--InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR))
-+InstallNamedNonExec(SecurityPolicy,SecurityPolicy.default-NestServer,$(SERVERCONFIGDIR))
- #endif
- 
- DependTarget()
diff --git a/x11-servers/XFree86-4-NestServer/pkg-plist b/x11-servers/XFree86-4-NestServer/pkg-plist
deleted file mode 100644
index d30d2d29dd1e..000000000000
--- a/x11-servers/XFree86-4-NestServer/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/Xnest
-lib/X11/xserver/SecurityPolicy.default-NestServer
diff --git a/x11-servers/XFree86-4-NestServer/scripts/configure b/x11-servers/XFree86-4-NestServer/scripts/configure
index 63f1ce26feed..a5a5dfc2c9e5 100644
--- a/x11-servers/XFree86-4-NestServer/scripts/configure
+++ b/x11-servers/XFree86-4-NestServer/scripts/configure
@@ -36,8 +36,10 @@ for i in BuildFonts \
 	BuildFontServer \
 	XVirtualFramebufferServer \
 	XprtServer \
+	XdmxServer \
 	LibHeaders \
 	ForceNormalLib \
+	InstallSecurityConfig \
 	XTrueTypeInstallCConvHeaders
 do \
 	echo "#define $i NO"			>> $LOCALDEF