aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPDATING14
-rw-r--r--x11-drivers/Makefile2
-rw-r--r--x11-drivers/xf86-video-ati/Makefile5
-rw-r--r--x11-drivers/xf86-video-ati/distinfo6
-rw-r--r--x11-drivers/xf86-video-ati/pkg-plist4
-rw-r--r--x11-drivers/xf86-video-ati613/Makefile5
-rw-r--r--x11-drivers/xf86-video-ati613/distinfo6
-rw-r--r--x11-drivers/xf86-video-ati613/pkg-plist4
-rw-r--r--x11-drivers/xf86-video-mach64/Makefile20
-rw-r--r--x11-drivers/xf86-video-mach64/distinfo3
-rw-r--r--x11-drivers/xf86-video-mach64/pkg-descr4
-rw-r--r--x11-drivers/xf86-video-mach64/pkg-plist5
-rw-r--r--x11-drivers/xf86-video-r128/Makefile21
-rw-r--r--x11-drivers/xf86-video-r128/distinfo3
-rw-r--r--x11-drivers/xf86-video-r128/pkg-descr4
-rw-r--r--x11-drivers/xf86-video-r128/pkg-plist5
-rw-r--r--x11-drivers/xorg-drivers/Makefile4
17 files changed, 94 insertions, 21 deletions
diff --git a/UPDATING b/UPDATING
index d00736c6d65f..d7ac60d2237f 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,20 @@ You should get into the habit of checking this file for changes each
time you update your ports collection, before attempting any port
upgrades.
+20080627:
+ AFFECTS: users of x11-drivers/xf86-video-ati
+ AUTHOR: Jung-uk Kim <jkim@FreeBSD.org>
+
+ mach64 and r128 drivers are now separated out from the ati driver.
+ These video cards are supported by x11-drivers/xf86-video-mach64
+ and x11-drivers/xf86-video-r128 respectively. If you have one of
+ the affected video cards and xorg.conf contains the following line:
+
+ Driver "ati"
+
+ you must specify "mach64" or "r128". Alternatively, you may install
+ x11-drivers/xf86-video-ati to get a wrapper driver.
+
20080624:
AFFECTS: users of irc/ircd-ratbox-devel
AUTHOR: Beech Rintoul <beech@FreeBSD.org>
diff --git a/x11-drivers/Makefile b/x11-drivers/Makefile
index 446d1075876c..573569868952 100644
--- a/x11-drivers/Makefile
+++ b/x11-drivers/Makefile
@@ -43,12 +43,14 @@
SUBDIR += xf86-video-i810
SUBDIR += xf86-video-imstt
SUBDIR += xf86-video-intel
+ SUBDIR += xf86-video-mach64
SUBDIR += xf86-video-mga
SUBDIR += xf86-video-neomagic
SUBDIR += xf86-video-newport
SUBDIR += xf86-video-nsc
SUBDIR += xf86-video-nv
SUBDIR += xf86-video-openchrome
+ SUBDIR += xf86-video-r128
SUBDIR += xf86-video-radeonhd
SUBDIR += xf86-video-rendition
SUBDIR += xf86-video-s3
diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile
index f1bbff1d63b7..049af109c5fb 100644
--- a/x11-drivers/xf86-video-ati/Makefile
+++ b/x11-drivers/xf86-video-ati/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-ati
-PORTVERSION= 6.8.0
-PORTREVISION= 2
+PORTVERSION= 6.9.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -17,6 +16,6 @@ USE_GL= gl
XORG_CAT= driver
USE_XORG= xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
-MAN4= ati.4x r128.4x radeon.4x
+MAN4= ati.4x radeon.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-ati/distinfo b/x11-drivers/xf86-video-ati/distinfo
index 75bf2437d5c9..2dba90ba75e3 100644
--- a/x11-drivers/xf86-video-ati/distinfo
+++ b/x11-drivers/xf86-video-ati/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-ati-6.8.0.tar.bz2) = 3c97c7925ebf4162eeb3463e23adc0e3
-SHA256 (xorg/driver/xf86-video-ati-6.8.0.tar.bz2) = 3863851e3c85d25cc38941eec63e866656806821b028519ae32ab8b276664fba
-SIZE (xorg/driver/xf86-video-ati-6.8.0.tar.bz2) = 901737
+MD5 (xorg/driver/xf86-video-ati-6.9.0.tar.bz2) = afa4873f58ae6fa31fedeb9ed31531db
+SHA256 (xorg/driver/xf86-video-ati-6.9.0.tar.bz2) = 682cd1916c386c192dd83d22d07529a247e72a1052c4a008c5466a155413d7c2
+SIZE (xorg/driver/xf86-video-ati-6.9.0.tar.bz2) = 777455
diff --git a/x11-drivers/xf86-video-ati/pkg-plist b/x11-drivers/xf86-video-ati/pkg-plist
index 87a891032c61..52b142182bbd 100644
--- a/x11-drivers/xf86-video-ati/pkg-plist
+++ b/x11-drivers/xf86-video-ati/pkg-plist
@@ -1,9 +1,5 @@
lib/xorg/modules/drivers/ati_drv.la
lib/xorg/modules/drivers/ati_drv.so
-lib/xorg/modules/drivers/mach64_drv.la
-lib/xorg/modules/drivers/mach64_drv.so
-lib/xorg/modules/drivers/r128_drv.la
-lib/xorg/modules/drivers/r128_drv.so
lib/xorg/modules/drivers/radeon_drv.la
lib/xorg/modules/drivers/radeon_drv.so
lib/xorg/modules/multimedia/theatre200_drv.la
diff --git a/x11-drivers/xf86-video-ati613/Makefile b/x11-drivers/xf86-video-ati613/Makefile
index f1bbff1d63b7..049af109c5fb 100644
--- a/x11-drivers/xf86-video-ati613/Makefile
+++ b/x11-drivers/xf86-video-ati613/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xf86-video-ati
-PORTVERSION= 6.8.0
-PORTREVISION= 2
+PORTVERSION= 6.9.0
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org
@@ -17,6 +16,6 @@ USE_GL= gl
XORG_CAT= driver
USE_XORG= xf86driproto xineramaproto videoproto xf86miscproto xextproto glproto
-MAN4= ati.4x r128.4x radeon.4x
+MAN4= ati.4x radeon.4x
.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-ati613/distinfo b/x11-drivers/xf86-video-ati613/distinfo
index 75bf2437d5c9..2dba90ba75e3 100644
--- a/x11-drivers/xf86-video-ati613/distinfo
+++ b/x11-drivers/xf86-video-ati613/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-video-ati-6.8.0.tar.bz2) = 3c97c7925ebf4162eeb3463e23adc0e3
-SHA256 (xorg/driver/xf86-video-ati-6.8.0.tar.bz2) = 3863851e3c85d25cc38941eec63e866656806821b028519ae32ab8b276664fba
-SIZE (xorg/driver/xf86-video-ati-6.8.0.tar.bz2) = 901737
+MD5 (xorg/driver/xf86-video-ati-6.9.0.tar.bz2) = afa4873f58ae6fa31fedeb9ed31531db
+SHA256 (xorg/driver/xf86-video-ati-6.9.0.tar.bz2) = 682cd1916c386c192dd83d22d07529a247e72a1052c4a008c5466a155413d7c2
+SIZE (xorg/driver/xf86-video-ati-6.9.0.tar.bz2) = 777455
diff --git a/x11-drivers/xf86-video-ati613/pkg-plist b/x11-drivers/xf86-video-ati613/pkg-plist
index 87a891032c61..52b142182bbd 100644
--- a/x11-drivers/xf86-video-ati613/pkg-plist
+++ b/x11-drivers/xf86-video-ati613/pkg-plist
@@ -1,9 +1,5 @@
lib/xorg/modules/drivers/ati_drv.la
lib/xorg/modules/drivers/ati_drv.so
-lib/xorg/modules/drivers/mach64_drv.la
-lib/xorg/modules/drivers/mach64_drv.so
-lib/xorg/modules/drivers/r128_drv.la
-lib/xorg/modules/drivers/r128_drv.so
lib/xorg/modules/drivers/radeon_drv.la
lib/xorg/modules/drivers/radeon_drv.so
lib/xorg/modules/multimedia/theatre200_drv.la
diff --git a/x11-drivers/xf86-video-mach64/Makefile b/x11-drivers/xf86-video-mach64/Makefile
new file mode 100644
index 000000000000..1275055253a4
--- /dev/null
+++ b/x11-drivers/xf86-video-mach64/Makefile
@@ -0,0 +1,20 @@
+# New ports collection makefile for: xf86-video-mach64
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-video-mach64
+PORTVERSION= 6.8.0
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org mach64 display driver
+
+USE_GL= gl
+
+XORG_CAT= driver
+USE_XORG= glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-mach64/distinfo b/x11-drivers/xf86-video-mach64/distinfo
new file mode 100644
index 000000000000..696ec7f02acd
--- /dev/null
+++ b/x11-drivers/xf86-video-mach64/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-mach64-6.8.0.tar.bz2) = 6081b8fa50c689d51f85c2fbaf93867e
+SHA256 (xorg/driver/xf86-video-mach64-6.8.0.tar.bz2) = fba616f88d351759e00a90965e38a0d82608698ae36fc2a18df4036cd384e1a1
+SIZE (xorg/driver/xf86-video-mach64-6.8.0.tar.bz2) = 477295
diff --git a/x11-drivers/xf86-video-mach64/pkg-descr b/x11-drivers/xf86-video-mach64/pkg-descr
new file mode 100644
index 000000000000..5e9a1717b3e8
--- /dev/null
+++ b/x11-drivers/xf86-video-mach64/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-mach64 driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-mach64/pkg-plist b/x11-drivers/xf86-video-mach64/pkg-plist
new file mode 100644
index 000000000000..32f0985ef3f9
--- /dev/null
+++ b/x11-drivers/xf86-video-mach64/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/mach64_drv.la
+lib/xorg/modules/drivers/mach64_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile
new file mode 100644
index 000000000000..12b9d2cd5608
--- /dev/null
+++ b/x11-drivers/xf86-video-r128/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for: xf86-video-r128
+# Date Created: 17 Feb 2006
+# Whom: Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= xf86-video-r128
+PORTVERSION= 6.8.0
+CATEGORIES= x11-drivers
+
+MAINTAINER= x11@FreeBSD.org
+COMMENT= X.Org r128 display driver
+
+USE_GL= gl
+
+XORG_CAT= driver
+USE_XORG= glproto videoproto xextproto xf86driproto xf86miscproto xineramaproto
+MAN4= r128.4x
+
+.include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-r128/distinfo b/x11-drivers/xf86-video-r128/distinfo
new file mode 100644
index 000000000000..b94c1aeb03b8
--- /dev/null
+++ b/x11-drivers/xf86-video-r128/distinfo
@@ -0,0 +1,3 @@
+MD5 (xorg/driver/xf86-video-r128-6.8.0.tar.bz2) = 007bec0c6b07d9d3aeca4da18e561efb
+SHA256 (xorg/driver/xf86-video-r128-6.8.0.tar.bz2) = 5689ca714fee9c9272bee12883b07a0ef2c40358ffb19fa684e963027b56567b
+SIZE (xorg/driver/xf86-video-r128-6.8.0.tar.bz2) = 409166
diff --git a/x11-drivers/xf86-video-r128/pkg-descr b/x11-drivers/xf86-video-r128/pkg-descr
new file mode 100644
index 000000000000..4c7c5e44140c
--- /dev/null
+++ b/x11-drivers/xf86-video-r128/pkg-descr
@@ -0,0 +1,4 @@
+This package contains the X.Org xf86-video-r128 driver.
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/x11-drivers/xf86-video-r128/pkg-plist b/x11-drivers/xf86-video-r128/pkg-plist
new file mode 100644
index 000000000000..e599abdfe830
--- /dev/null
+++ b/x11-drivers/xf86-video-r128/pkg-plist
@@ -0,0 +1,5 @@
+lib/xorg/modules/drivers/r128_drv.la
+lib/xorg/modules/drivers/r128_drv.so
+@dirrmtry lib/xorg/modules/drivers
+@dirrmtry lib/xorg/modules
+@dirrmtry lib/xorg
diff --git a/x11-drivers/xorg-drivers/Makefile b/x11-drivers/xorg-drivers/Makefile
index ab9c4b3d5399..b2a9f256cef1 100644
--- a/x11-drivers/xorg-drivers/Makefile
+++ b/x11-drivers/xorg-drivers/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xorg-drivers
PORTVERSION= 7.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-drivers
MASTER_SITES= # none
DISTFILES= # none
@@ -27,7 +27,9 @@ ARCH!= /usr/bin/uname -p
VIDEO_ON= ati \
intel \
+ mach64 \
nv \
+ r128 \
radeonhd \
vesa vga