6 files changed, 29 insertions, 62 deletions

diff --git a/x11-drivers/xf86-video-openchrome/Makefile b/x11-drivers/xf86-video-openchrome/Makefile
index 2e4e98c131e6..4ec0ca587529 100644
--- a/x11-drivers/xf86-video-openchrome/Makefile
+++ b/x11-drivers/xf86-video-openchrome/Makefile
@@ -6,28 +6,19 @@
 #
 
 PORTNAME=	xf86-video-openchrome
-PORTVERSION=	0.2.6
+PORTVERSION=	0.2.901
 CATEGORIES=	x11-drivers
-MASTER_SITES=	http://archive.ubuntu.com/ubuntu/pool/main/x/xserver-xorg-video-openchrome/
-DISTFILES=	xserver-xorg-video-openchrome_${PORTVERSION}+svn357.orig.tar.gz
+MASTER_SITES=	http://www.openchrome.org/releases/
 
 MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X.Org openchrome display driver
+COMMENT=	X.Org openChrome display driver
 
-CONFLICTS=	xf86-video-via-[0-9]*
-
-USE_TGZ=	yes
-WRKSRC=		${WRKDIR}/xserver-xorg-video-openchrome
-NOMANCOMPRESS=	yes
-
-USE_AUTOTOOLS=	autoconf:261:env automake:19:env libtool:15:env
+USE_GL=		gl
 
 XORG_CAT=	driver
-USE_GL=		gl
-USE_XORG=	xvmc xf86driproto glproto
-MAN4=		via.4x
+USE_XORG=	videoproto xf86driproto xextproto xvmc
+MAN4=		openchrome.4x
 
-pre-configure:
-	@(cd ${WRKSRC} && ${SH} ./autogen.sh)
+MAKE_ARGS+=	drivermandir=${LOCALBASE}/man/man4
 
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-openchrome/distinfo b/x11-drivers/xf86-video-openchrome/distinfo
index 7dbc7ced549a..6cf8fbfe7611 100644
--- a/x11-drivers/xf86-video-openchrome/distinfo
+++ b/x11-drivers/xf86-video-openchrome/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xserver-xorg-video-openchrome_0.2.6+svn357.orig.tar.gz) = 46bfb583347ee294a8c2c7bb2180d5a1
-SHA256 (xorg/driver/xserver-xorg-video-openchrome_0.2.6+svn357.orig.tar.gz) = 5425a7a315111baa88f801a97450a5e9f9a104305a5e07331645d55ac447795e
-SIZE (xorg/driver/xserver-xorg-video-openchrome_0.2.6+svn357.orig.tar.gz) = 249450
+MD5 (xorg/driver/xf86-video-openchrome-0.2.901.tar.bz2) = 96576fcf874d8ee05de31dd7cf2c5f92
+SHA256 (xorg/driver/xf86-video-openchrome-0.2.901.tar.bz2) = e31b159fdf742635a7f4aea630dabcd635885c17ac57eb1293df8957b7de13f3
+SIZE (xorg/driver/xf86-video-openchrome-0.2.901.tar.bz2) = 431585
diff --git a/x11-drivers/xf86-video-openchrome/files/patch-configure b/x11-drivers/xf86-video-openchrome/files/patch-configure
new file mode 100644
index 000000000000..42654fc59a46
--- /dev/null
+++ b/x11-drivers/xf86-video-openchrome/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2008-01-02 15:05:04.000000000 -0500
++++ configure	2008-01-10 20:48:21.000000000 -0500
+@@ -21484,7 +21484,7 @@
+ _ACEOF
+ 
+ 
+-DRIVER_MAN_SUFFIX="4"
++DRIVER_MAN_SUFFIX="4x"
+ 
+ 
+ 
diff --git a/x11-drivers/xf86-video-openchrome/files/patch-libxvmc_viaXvMCPriv.h b/x11-drivers/xf86-video-openchrome/files/patch-libxvmc_viaXvMCPriv.h
deleted file mode 100644
index 2af32071aa66..000000000000
--- a/x11-drivers/xf86-video-openchrome/files/patch-libxvmc_viaXvMCPriv.h
+++ /dev/null
@@ -1,6 +0,0 @@
---- libxvmc/viaXvMCPriv.h.orig	Wed Jan 25 15:56:20 2006
-+++ libxvmc/viaXvMCPriv.h	Sun Nov 25 09:43:03 2007
-@@ -31,2 +31,3 @@
- #include <stdlib.h>
-+#include <pthread.h>		/* For FreeBSD 5.x */
- #include <X11/Xutil.h>
diff --git a/x11-drivers/xf86-video-openchrome/files/patch-man_Makefile.am b/x11-drivers/xf86-video-openchrome/files/patch-man_Makefile.am
deleted file mode 100644
index e1a7455c227a..000000000000
--- a/x11-drivers/xf86-video-openchrome/files/patch-man_Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
---- man/Makefile.am.orig	Tue Oct  9 19:01:32 2007
-+++ man/Makefile.am	Tue Oct  9 19:02:32 2007
-@@ -29,7 +29,7 @@
- 
- driverman_MANFILES = @DRIVER_NAME@.man
- 
--driverman_DATA = $(driverman_MANFILES:man=@DRIVER_MAN_SUFFIX@)
-+driverman_DATA = $(driverman_MANFILES:man=@DRIVER_MAN_SUFFIX@x)
- 
- EXTRA_DIST = @DRIVER_NAME@.man
- 
-@@ -48,14 +48,14 @@
- 	-e 's|__xconfigfile__|xorg.conf|g' \
- 	-e 's|__projectroot__|$(prefix)|g' \
- 	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
-+	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)x|g' \
- 	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- 	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- 	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
- 
--SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
-+SUFFIXES = .$(DRIVER_MAN_SUFFIX)x .man
- 
--.man.$(DRIVER_MAN_SUFFIX):
-+.man.$(DRIVER_MAN_SUFFIX)x:
- 	sed $(MAN_SUBSTS) < $< > $@
- 
- @DRIVER_NAME@.man:
diff --git a/x11-drivers/xf86-video-openchrome/pkg-plist b/x11-drivers/xf86-video-openchrome/pkg-plist
index 06c919d0743b..51f4809b32e3 100644
--- a/x11-drivers/xf86-video-openchrome/pkg-plist
+++ b/x11-drivers/xf86-video-openchrome/pkg-plist
@@ -1,11 +1,11 @@
-lib/libviaXvMC.la
-lib/libviaXvMC.so
-lib/libviaXvMC.so.1
-lib/libviaXvMCPro.la
-lib/libviaXvMCPro.so
-lib/libviaXvMCPro.so.1
-lib/xorg/modules/drivers/via_drv.la
-lib/xorg/modules/drivers/via_drv.so
+lib/libchromeXvMC.la
+lib/libchromeXvMC.so
+lib/libchromeXvMC.so.1
+lib/libchromeXvMCPro.la
+lib/libchromeXvMCPro.so
+lib/libchromeXvMCPro.so.1
+lib/xorg/modules/drivers/openchrome_drv.la
+lib/xorg/modules/drivers/openchrome_drv.so
 @dirrmtry lib/xorg/modules/drivers
 @dirrmtry lib/xorg/modules
 @dirrmtry lib/xorg