5 files changed, 42 insertions, 15 deletions

diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index 86d887ac8b91..4ab3747a0363 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -6,21 +6,20 @@
 #
 
 PORTNAME=	VirtualFramebufferServer
-PORTVERSION=	4.3.0
-PORTREVISION=	4
+PORTVERSION=	4.4.0
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE:S/$/:x/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
 MASTER_SITE_SUBDIR=	${PORTVERSION}/:x \
 			anholt/:local
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X430src-1.tgz:x \
-		X430src-2.tgz:x \
-		X430src-3.tgz:x \
+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=	X430src-1.tgz \
-		X430src-2.tgz \
-		X430src-3.tgz
+EXTRACT_ONLY=	XFree86-4.4.0-src-1.tgz \
+		XFree86-4.4.0-src-2.tgz \
+		XFree86-4.4.0-src-3.tgz
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	XFree86-4 virtual framebuffer server
@@ -32,6 +31,7 @@ RUN_DEPENDS=	${FONT}:${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps
 FONT=	${X11BASE}/lib/X11/fonts/misc/cursor.pcf.gz
 
 MAN1=			Xvfb.1
+EXTRA_PATCHES+=		${FILESDIR}/patch-programs::Xserver::Xext::Imakefile
 XBUILD_DIRS=		lib/font lib/lbxutil/ lib/Xdmcp lib/Xau programs/Xserver
 XINCLUDE_DIRS=		lib/xkbfile lib/xtrans
 XINSTALL_DIRS=		programs/Xserver
@@ -41,6 +41,9 @@ 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-VirtualFramebufferServer/distinfo b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
index 4c3445d29834..edbe3d91944d 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
@@ -1,8 +1,8 @@
-MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
-SIZE (xc/X430src-1.tgz) = 10993622
-MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4
-SIZE (xc/X430src-2.tgz) = 7962239
-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-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
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/files/patch-programs::Xserver::Xext::Imakefile b/x11-servers/XFree86-4-VirtualFramebufferServer/files/patch-programs::Xserver::Xext::Imakefile
new file mode 100644
index 000000000000..557654663de4
--- /dev/null
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/files/patch-programs::Xserver::Xext::Imakefile
@@ -0,0 +1,11 @@
+--- 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-VFBServer,$(SERVERCONFIGDIR))
+ #endif
+ 
+ DependTarget()
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-install b/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-install
new file mode 100644
index 000000000000..3b7163d6046d
--- /dev/null
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-install
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if [ "$2" != "POST-INSTALL" ]; then
+	exit 0
+fi
+
+PKG_PREFIX=${PKG_PREFIX:=/usr/X11R6}
+SECCONFDIR=${PKG_PREFIX}/lib/X11/xserver
+
+if [ ! -f ${SECCONFDIR}/SecurityPolicy ]; then
+	cp ${SECCONFDIR}/SecurityPolicy.default-VFBServer \
+	    ${SECCONFDIR}/SecurityPolicy
+fi
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-plist b/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-plist
index e31e7c170ff1..e81bbc131be4 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-plist
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-plist
@@ -1,2 +1,2 @@
 bin/Xvfb
-lib/X11/xserver/SecurityPolicy
+lib/X11/xserver/SecurityPolicy.default-VFBServer