Merge ati-kms driver into the ati port. Enable KMS driver on OSVERSION

of the radeonkms driver import. 1000051


git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1093 058c260c-8361-11dd-a0ac-aa2bafec7d09

9 files changed, 13 insertions, 54 deletions

diff --git a/x11-drivers/xf86-video-ati-kms/Makefile b/x11-drivers/xf86-video-ati-kms/Makefile
deleted file mode 100644
index 5b1fe0d..0000000
--- a/x11-drivers/xf86-video-ati-kms/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	xf86-video-ati
-PORTVERSION=	7.2.0
-CATEGORIES=	x11-drivers
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org ati display driver
-
-USE_GL=		gl
-XORG_CAT=	driver
-USE_XORG=	xf86driproto xineramaproto xf86miscproto glproto
-MAN4=		ati.4x radeon.4x
-
-CONFIGURE_ARGS+=--disable-udev
-
-EXTRA_PATCHES+=	${FILESDIR}/extra-src__radeon_kms.c
-
-pre-everything::
-	@${ECHO_CMD}
-	@${ECHO_CMD} "This port is KMS/TTM only, and only for testing the upcoming"
-	@${ECHO_CMD} "radeon KMS/TTM kernel support. When that kernel supports lands"
-	@${ECHO_CMD} "this port will be merged into the regular ati driver port."
-	@${ECHO_CMD}
-	@/bin/sleep 7
-
-.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-ati-kms/distinfo b/x11-drivers/xf86-video-ati-kms/distinfo
deleted file mode 100644
index 56b04cd..0000000
--- a/x11-drivers/xf86-video-ati-kms/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xorg/driver/xf86-video-ati-7.2.0.tar.bz2) = f30f5efdc8d7d18d06eda7ef2f91a8b7290f1cfbf6ff26362cd47ab8969daec4
-SIZE (xorg/driver/xf86-video-ati-7.2.0.tar.bz2) = 824613
diff --git a/x11-drivers/xf86-video-ati-kms/files/patch-src_radeon_accel.c b/x11-drivers/xf86-video-ati-kms/files/patch-src_radeon_accel.c
deleted file mode 100644
index 73d311a..0000000
--- a/x11-drivers/xf86-video-ati-kms/files/patch-src_radeon_accel.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/radeon_accel.c.orig	2012-06-25 10:19:41.000000000 +0200
-+++ src/radeon_accel.c	2012-07-30 02:11:51.000000000 +0200
-@@ -967,10 +967,9 @@
- 
- 	    for (; nwords > 0; --nwords, ++d, ++s)
- #ifdef __powerpc__
--		asm volatile("stwbrx %0,0,%1" : : "r" (*s), "r" (d));
-+		asm volatile("sthbrx %0,0,%1" : : "r" (*s), "r" (d));
- #else
--		*d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
--			| ((*s & 0xff00) << 8) | ((*s & 0xff) << 24);
-+		*d = (*s >> 8) | (*s << 8);
- #endif
- 	    return;
-         }
diff --git a/x11-drivers/xf86-video-ati-kms/pkg-descr b/x11-drivers/xf86-video-ati-kms/pkg-descr
deleted file mode 100644
index fe1b01b..0000000
--- a/x11-drivers/xf86-video-ati-kms/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-This package contains the X.Org xf86-video-ati driver.
diff --git a/x11-drivers/xf86-video-ati-kms/pkg-plist b/x11-drivers/xf86-video-ati-kms/pkg-plist
deleted file mode 100644
index 48b777e..0000000
--- a/x11-drivers/xf86-video-ati-kms/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-lib/xorg/modules/drivers/ati_drv.la
-lib/xorg/modules/drivers/ati_drv.so
-lib/xorg/modules/drivers/radeon_drv.la
-lib/xorg/modules/drivers/radeon_drv.so
-@dirrmtry lib/xorg/modules/drivers
-@dirrmtry lib/xorg/modules
-@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index 369e3d2..7e4afd2 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-ati
-PORTVERSION=	6.14.6
+PORTVERSION=	${ATI_VERSION}
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
@@ -12,6 +12,15 @@ XORG_CAT=	driver
 USE_XORG=	xf86driproto xineramaproto xf86miscproto glproto
 MAN4=		ati.4x radeon.4x
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1000051
+ATI_VERSION=	6.14.6
 CONFIGURE_ARGS+=--disable-kms
+.else
+ATI_VERSION=	7.2.0
+CONFIGURE_ARGS+=--disable-udev
+EXTRA_PATCHES+=	${FILESDIR}/extra-src__radeon_kms.c
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-drivers/xf86-video-ati/distinfo b/x11-drivers/xf86-video-ati/distinfo
index baa6ed5..08cd562 100644
--- a/x11-drivers/xf86-video-ati/distinfo
+++ b/x11-drivers/xf86-video-ati/distinfo
@@ -1,2 +1,4 @@
 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
diff --git a/x11-drivers/xf86-video-ati-kms/files/extra-src__radeon_kms.c b/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c
index 30bbc72..30bbc72 100644
--- a/x11-drivers/xf86-video-ati-kms/files/extra-src__radeon_kms.c
+++ b/x11-drivers/xf86-video-ati/files/extra-src__radeon_kms.c
diff --git a/x11-drivers/xf86-video-ati-kms/files/patch-src__radeon_dri2.c b/x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c
index 3de34a1..3de34a1 100644
--- a/x11-drivers/xf86-video-ati-kms/files/patch-src__radeon_dri2.c
+++ b/x11-drivers/xf86-video-ati/files/patch-src__radeon_dri2.c