From 4eb209da7d941e66e0cb065aead6bda76c9e97f3 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Fri, 23 Jul 2004 19:10:32 +0000 Subject: - Add the X_WINDOW_SYSTEM={xorg,xfree86-4,xfree86-3} variable to bsd.port.mk, and make XFREE86_VERSION map to it. XFREE86_VERSION is now deprecated. - Make xorg the default X_WINDOW_SYSTEM on -current. - Add several new X_*_PORT variables which point to various pieces of X11 based on the setting of X_WINDOW_SYSTEM, and make ports use them. - Add information to CHANGES about how to handle the transition. PR: ports/68763 Approved by: portmgr (marcus) Approved by: re (scottl) --- x11-servers/XFree86-4-VirtualFramebufferServer/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'x11-servers/XFree86-4-VirtualFramebufferServer') diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile index dfceceda5698..86d887ac8b91 100644 --- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile +++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile @@ -42,4 +42,8 @@ post-extract: ${WRKSRC}/lib/Xdmcp/Wraphelp.c .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xfree86-4 +IGNORE= is part of XFree86-4 +.endif +.include -- cgit v1.2.3