aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2012-07-13 10:23:57 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2012-07-13 10:23:57 +0000
commitabb421178b40d538c4cd278668b0390288ab38a6 (patch)
tree2fb00fbbbc36f2454852abe8d678aa386bc41730
parent41a8aed64311c115afcc4ecfe550c1924198f414 (diff)
downloadports-abb421178b40d538c4cd278668b0390288ab38a6.tar.gz
ports-abb421178b40d538c4cd278668b0390288ab38a6.zip
Notes
-rw-r--r--Mk/bsd.options.mk5
-rw-r--r--x11-servers/xorg-server/Makefile7
2 files changed, 7 insertions, 5 deletions
diff --git a/Mk/bsd.options.mk b/Mk/bsd.options.mk
index 55c3e72f7d31..ae48591fb7df 100644
--- a/Mk/bsd.options.mk
+++ b/Mk/bsd.options.mk
@@ -27,6 +27,11 @@ PORT_OPTIONS+= NLS
PORT_OPTIONS+= EXAMPLES
.endif
+.for opt in ${OPTIONS_EXCLUDE_${ARCH}}
+OPTIONS_DEFINE:= ${OPTIONS_DEFINE:N${opt}}
+OPTIONS_DEFAULT:= ${OPTIONS_DEFAULT:N${opt}}
+.endfor
+
# Append options set by the port Makefile
.for opt in ${OPTIONS_DEFINE}
ALL_OPTIONS+= ${opt}
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 4f693e228648..2e35ac81c929 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -80,12 +80,9 @@ SUID_DESC= Install the Xorg server with setuid bit set
HAL_DESC= Compile with HAL config support
OPTIONS_DEFAULT= AIGLX SUID HAL
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == sparc64
-OPTIONS_DEFAULT:= ${OPTIONS_DEFAULT:NHAL}
-.endif
+OPTIONS_EXCLUDE_sparc64= HAL
+.include <bsd.port.pre.mk>
.if defined(WITH_OPENSSL_BASE)
# The reason why I use this is cause openssl from base doesn't install a .pc file