svn commit: r369876 - in head/x11-drivers: . xf86-video-ati-ums

[Baptiste Daroussin]

Author: bapt
Date: Fri Oct  3 08:36:17 2014
New Revision: 369876
URL: https://svnweb.freebsd.org/changeset/ports/369876
QAT: https://qat.redports.org/buildarchive/r369876/

Log:
  Add a ums only version of the ati drivers

Added:
  head/x11-drivers/xf86-video-ati-ums/
     - copied from r369769, head/x11-drivers/xf86-video-ati/
Modified:
  head/x11-drivers/Makefile
  head/x11-drivers/xf86-video-ati-ums/Makefile
  head/x11-drivers/xf86-video-ati-ums/distinfo
  head/x11-drivers/xf86-video-ati-ums/pkg-plist

Modified: head/x11-drivers/Makefile
==============================================================================
--- head/x11-drivers/Makefile	Fri Oct  3 08:35:28 2014	(r369875)
+++ head/x11-drivers/Makefile	Fri Oct  3 08:36:17 2014	(r369876)
@@ -20,6 +20,7 @@
     SUBDIR += xf86-video-apm
     SUBDIR += xf86-video-ark
     SUBDIR += xf86-video-ati
+    SUBDIR += xf86-video-ati-ums
     SUBDIR += xf86-video-chips
     SUBDIR += xf86-video-cirrus
     SUBDIR += xf86-video-dummy

Modified: head/x11-drivers/xf86-video-ati-ums/Makefile
==============================================================================
--- head/x11-drivers/xf86-video-ati/Makefile	Wed Oct  1 21:49:25 2014	(r369769)
+++ head/x11-drivers/xf86-video-ati-ums/Makefile	Fri Oct  3 08:36:17 2014	(r369876)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-ati
-PORTVERSION=	${ATI_VERSION}
-PORTREVISION=	${ATI_REVISION}
+PORTVERSION=	6.14.6
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11 at FreeBSD.org
@@ -12,44 +12,7 @@ USE_GL=		gl
 XORG_CAT=	driver
 USE_XORG=	xf86driproto xineramaproto xf86miscproto glproto
 
-.include <bsd.port.options.mk>
-
-.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=	4
 CONFIGURE_ARGS+=--disable-kms
-PLIST_SUB+=	OLD=""
-.else
-ATI_VERSION=	7.2.0
-ATI_REVISION=	4
-CONFIGURE_ARGS+=--disable-udev
-CONFIGURE_ARGS+=--disable-glamor
-EXTRA_PATCHES+=	${FILESDIR}/extra-src__radeon_kms.c
-PLIST_SUB+=	OLD="@comment "
-.endif
+INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>

Modified: head/x11-drivers/xf86-video-ati-ums/distinfo
==============================================================================
--- head/x11-drivers/xf86-video-ati/distinfo	Wed Oct  1 21:49:25 2014	(r369769)
+++ head/x11-drivers/xf86-video-ati-ums/distinfo	Fri Oct  3 08:36:17 2014	(r369876)
@@ -1,4 +1,2 @@
 SHA256 (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36
 SIZE (xorg/driver/xf86-video-ati-6.14.6.tar.bz2) = 1139495
-SHA256 (xorg/driver/xf86-video-ati-7.2.0.tar.bz2) = f30f5efdc8d7d18d06eda7ef2f91a8b7290f1cfbf6ff26362cd47ab8969daec4
-SIZE (xorg/driver/xf86-video-ati-7.2.0.tar.bz2) = 824613

Modified: head/x11-drivers/xf86-video-ati-ums/pkg-plist
==============================================================================
--- head/x11-drivers/xf86-video-ati/pkg-plist	Wed Oct  1 21:49:25 2014	(r369769)
+++ head/x11-drivers/xf86-video-ati-ums/pkg-plist	Fri Oct  3 08:36:17 2014	(r369876)
@@ -1,11 +1,7 @@
 lib/xorg/modules/drivers/ati_drv.so
 lib/xorg/modules/drivers/radeon_drv.so
-%%OLD%%lib/xorg/modules/multimedia/theatre200_drv.so
-%%OLD%%lib/xorg/modules/multimedia/theatre_detect_drv.so
-%%OLD%%lib/xorg/modules/multimedia/theatre_drv.so
+lib/xorg/modules/multimedia/theatre200_drv.so
+lib/xorg/modules/multimedia/theatre_detect_drv.so
+lib/xorg/modules/multimedia/theatre_drv.so
 man/man4/ati.4x.gz
 man/man4/radeon.4x.gz
- at dirrmtry lib/xorg/modules/drivers
-%%OLD%%@dirrmtry lib/xorg/modules/multimedia
- at dirrmtry lib/xorg/modules
- at dirrmtry lib/xorg