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-fonts/xorg-fonts-miscbitmaps/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'x11-fonts/xorg-fonts-miscbitmaps') diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile index 28a9de3fd7c2..8a5190185bdc 100644 --- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile +++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile @@ -25,4 +25,8 @@ XBUILD_DIRS= fonts/encodings fonts/bdf/misc XINSTALL_DIRS= fonts/bdf/misc .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc" -.include +.include +.if ${X_WINDOW_SYSTEM:L} != xorg +IGNORE= is part of X.Org +.endif +.include -- cgit debian/1.2.3+git2.25.1-1-2-gaceb0