Remove the switch code between 6.14.6 and 7.2.0.

Update to 7.2.0, since we have xf86-video-ati-ums for 6.14.6.

3 files changed, 4 insertions, 45 deletions

diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index f63209decb27..0c8b03798e02 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-ati
-PORTVERSION=	${ATI_VERSION}
-PORTREVISION=	${ATI_REVISION}
+PORTVERSION=	7.2.0
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -11,45 +11,11 @@ COMMENT=	X.Org ati display driver
 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)
+INSTALL_TARGET=	install-strip
 # No Radeon kernel driver on non-x86 and PC98.
-NEW_ATI_DRIVER=	no
-.endif
+ONLY_FOR_ARCHS=	i386 amd64
 
-.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
 
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c b/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c
index 9de83f0dfac5..9de83f0dfac5 100644
--- a/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c
+++ b/x11-drivers/xf86-video-ati/files/patch-src__radeon_kms.c
diff --git a/x11-drivers/xf86-video-ati/pkg-plist b/x11-drivers/xf86-video-ati/pkg-plist
index f64d9df88ad3..aff4d6112940 100644
--- a/x11-drivers/xf86-video-ati/pkg-plist
+++ b/x11-drivers/xf86-video-ati/pkg-plist
@@ -1,11 +1,4 @@
 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
 man/man4/ati.4x.gz
 man/man4/radeon.4x.gz
-@dirrmtry lib/xorg/modules/drivers
-%%OLD%%@dirrmtry lib/xorg/modules/multimedia
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg