aboutsummaryrefslogtreecommitdiff
path: root/x11-servers/xorg-server
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2004-07-23 19:10:32 +0000
committerEric Anholt <anholt@FreeBSD.org>2004-07-23 19:10:32 +0000
commit4eb209da7d941e66e0cb065aead6bda76c9e97f3 (patch)
treec9cf2fdcee3885499960b9c706dacac0a0080f8e /x11-servers/xorg-server
parentb188150955302fdc3c1402eb0688a84d1f2cf451 (diff)
downloadports-4eb209da7d941e66e0cb065aead6bda76c9e97f3.tar.gz
ports-4eb209da7d941e66e0cb065aead6bda76c9e97f3.zip
- 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)
Notes
Notes: svn path=/head/; revision=114511
Diffstat (limited to 'x11-servers/xorg-server')
-rw-r--r--x11-servers/xorg-server/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index f1686cdfef69..a9d5eea89a94 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -63,6 +63,10 @@ NOT_FOR_ARCHS= ia64
.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM:L} != xorg
+IGNORE= is part of X.Org
+.endif
+
.if ${ARCH} == ia64
PLIST_SUB+= IA64_NA="@comment "
.else