From owner-svn-ports-head@FreeBSD.ORG  Wed Sep 10 10:42:46 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D4415C96;
 Wed, 10 Sep 2014 10:42:46 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BF67A1C4D;
 Wed, 10 Sep 2014 10:42:46 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8AAgkGr076633;
 Wed, 10 Sep 2014 10:42:46 GMT (envelope-from kwm@FreeBSD.org)
Received: (from kwm@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8AAgkUK076632;
 Wed, 10 Sep 2014 10:42:46 GMT (envelope-from kwm@FreeBSD.org)
Message-Id: <201409101042.s8AAgkUK076632@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kwm set sender to kwm@FreeBSD.org
 using -f
From: Koop Mast <kwm@FreeBSD.org>
Date: Wed, 10 Sep 2014 10:42:46 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r367808 - head/x11-drivers/xf86-video-ati
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Sep 2014 10:42:46 -0000

Author: kwm
Date: Wed Sep 10 10:42:46 2014
New Revision: 367808
URL: http://svnweb.freebsd.org/changeset/ports/367808
QAT: https://qat.redports.org/buildarchive/r367808/

Log:
  Rework checks to select between UMS and KMS versions of the ati driver.
  
  Developed with:	dumbbell@
  Obtained from:	xorg-dev repo

Modified:
  head/x11-drivers/xf86-video-ati/Makefile

Modified: head/x11-drivers/xf86-video-ati/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-ati/Makefile	Wed Sep 10 09:36:24 2014	(r367807)
+++ head/x11-drivers/xf86-video-ati/Makefile	Wed Sep 10 10:42:46 2014	(r367808)
@@ -14,8 +14,31 @@ USE_XORG=	xf86driproto xineramaproto xf8
 
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 1000051 || !defined(WITH_NEW_XORG) || \
-	(${ARCH} != i386 && ${ARCH} != amd64)
+.if (${OSVERSION} >= 902508 && ${OSVERSION} < 1000000) || ${OSVERSION} >= 1000051
+#  902508: Radeon kernel driver imported in FreeBSD 9.x
+# 1000051: Radeon kernel driver imported in FreeBSD 10.x
+. if defined(WITH_NEW_XORG)
+NEW_ATI_DRIVER=	yes
+. else
+NEW_ATI_DRIVER=	no
+. endif
+.else
+# FreeBSD < 902508 doesn't have the Radeon kernel driver. No need to
+# check for WITH_NEW_XORG. But we do support a flag to force the usage
+# of the KMS-only DDX: this is used by the build cluster only.
+. if defined(FORCE_KMS_ONLY_DDX)
+NEW_ATI_DRIVER=	yes
+. else
+NEW_ATI_DRIVER=	no
+. endif
+.endif
+
+.if (${ARCH} != i386 && ${ARCH} != amd64)
+# No Radeon kernel driver on non-x86 and PC98.
+NEW_ATI_DRIVER=	no
+.endif
+
+.if ${NEW_ATI_DRIVER} == no
 ATI_VERSION=	6.14.6
 ATI_REVISION=	3
 CONFIGURE_ARGS+=--disable-kms