From backi@bingo.tky.hut.fi  Sun Mar 17 12:55:47 2002
Return-Path: <backi@bingo.tky.hut.fi>
Received: from bingo.tky.hut.fi (bingo.tky.hut.fi [130.233.28.67])
	by hub.freebsd.org (Postfix) with ESMTP id 43D4637B400
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 17 Mar 2002 12:55:43 -0800 (PST)
Received: (from backi@localhost)
	by bingo.tky.hut.fi (8.11.6/8.11.6) id g2HKtRN01874;
	Sun, 17 Mar 2002 22:55:27 +0200 (EET)
	(envelope-from backi)
Message-Id: <200203172055.g2HKtRN01874@bingo.tky.hut.fi>
Date: Sun, 17 Mar 2002 22:55:27 +0200 (EET)
From: Patrik Backlund <pbacklun@cc.hut.fi>
Reply-To: Patrik Backlund <pbacklun@cc.hut.fi>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update port: x11-servers/XFree86-4-Server matrox driver
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         36021
>Category:       ports
>Synopsis:       Update port: x11-servers/XFree86-4-Server matrox driver
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 17 13:00:05 PST 2002
>Closed-Date:    Mon Mar 18 07:11:07 PST 2002
>Last-Modified:  Mon Mar 18 07:11:07 PST 2002
>Originator:     Patrik Backlund
>Release:        FreeBSD 4.5-STABLE i386
>Organization:
>Environment:
System: FreeBSD bingo.tky.hut.fi 4.5-STABLE FreeBSD 4.5-STABLE #0: Thu Mar 14 23:19:50 EET 2002 root@bingo.tky.hut.fi:/stuff/work/obj/home/work/src/sys/BINGO i386

Driver tested on my Matrox G400 Dualhead using TV-out on second head.
	
>Description:
 * update official Matrox GXX driver to version 2.0 which supports
   XFree 4.2.0
	
>How-To-Repeat:
	
>Fix:

	

--- mgadriver.diff begins here ---
diff -ruN XFree86-4-Server.old/Makefile XFree86-4-Server/Makefile
--- XFree86-4-Server.old/Makefile	Sun Mar 17 10:31:35 2002
+++ XFree86-4-Server/Makefile	Sun Mar 17 17:02:55 2002
@@ -135,36 +135,28 @@
 PLIST_SUB+=	XIE:="@comment "
 .endif
 
-# matrox BETA driver is not ready for 4.2.0.
-# I don't confirm feather it is newer than the one which included in 4.2.0,
-# but you can try the BETA driver. Just set that variable.
-
 .if ${BuildXF86DRI} == YES
 .if !defined(WITH_MATROX_GXX_DRIVER)
 HaveMatroxHal=		NO
 PLIST_SUB+=		MATROX="@comment "
 pre-fetch::
-	@${ECHO_MSG} "*** WARNING: UNTESTED WITH XFREE86 4.2.0!  ENABLE AT"
-	@${ECHO_MSG} "YOUR OWN RISK!  ***"
-	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Define WITH_MATROX_GXX_DRIVER to enable the official"
 	@${ECHO_MSG} "Matrox drivers for the G200, G400, G450, and G550"
 	@${ECHO_MSG} "graphic adapters."
 .else
 NO_PACKAGE=	"Matrox drivers may not be distributed."
 HaveMatroxHal=		YES
-MGA_DRIVER_VERSION=	133_143
-MASTER_SITES+=		ftp://ftp.matrox.com/pub/mga/archive/linux/2001/beta_${MGA_DRIVER_VERSION}/
-DISTFILES+=		mga-${MGA_DRIVER_VERSION}-source.tgz
-EXTRACT_ONLY+=		mga-${MGA_DRIVER_VERSION}-source.tgz
+MGA_DRIVER_VERSION=	2.0
+MASTER_SITES+=		ftp://ftp.matrox.com/pub/mga/archive/linux/2002/:matrox
+DISTFILES+=		mgadrivers-${MGA_DRIVER_VERSION}-src.tgz:matrox
+EXTRACT_ONLY+=		mgadrivers-${MGA_DRIVER_VERSION}-src.tgz
 PLIST_SUB+=		MATROX=""
 post-patch::
 	@(cd ${WRKSRC}; \
 	  ${MV} programs/Xserver/hw/xfree86/drivers/mga \
 		programs/Xserver/hw/xfree86/drivers/mga.old; \
-	  ${MV} ../mgasource/mga-1.4.3/mga programs/Xserver/hw/xfree86/drivers)
+	  ${MV} ../mgadrivers-${MGA_DRIVER_VERSION}-src/4.2.0/drivers/src programs/Xserver/hw/xfree86/drivers/mga)
 post-install::
-	${INSTALL_DATA} ${WRKSRC}/programs/Xserver/hw/xfree86/drivers/mga/README ${PREFIX}/lib/X11/doc/README.mga
 	${INSTALL_DATA} ${WRKSRC}/programs/Xserver/hw/xfree86/drivers/mga/README_HALLIB ${PREFIX}/lib/X11/doc/README.mga_HALLIB
 .endif	# !WITH_MATROX_GXX_DRIVER
 .endif
diff -ruN XFree86-4-Server.old/distinfo XFree86-4-Server/distinfo
--- XFree86-4-Server.old/distinfo	Sun Mar 17 10:31:35 2002
+++ XFree86-4-Server/distinfo	Sun Mar 17 16:37:48 2002
@@ -1,2 +1,3 @@
 MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+MD5 (xc/mgadrivers-2.0-src.tgz) = 877db503967ae837c147953dbcd8ee6d
 MD5 (xc/Wraphelp.c) = IGNORE
diff -ruN XFree86-4-Server.old/pkg-plist XFree86-4-Server/pkg-plist
--- XFree86-4-Server.old/pkg-plist	Sun Mar 17 10:31:35 2002
+++ XFree86-4-Server/pkg-plist	Sun Mar 17 16:46:49 2002
@@ -31,7 +31,6 @@
 lib/X11/doc/README.fonts
 %%I386:%%lib/X11/doc/README.i740
 %%I386:%%lib/X11/doc/README.i810
-%%MATROX%%lib/X11/doc/README.mga
 %%MATROX%%lib/X11/doc/README.mga_HALLIB
 lib/X11/doc/README.mouse
 %%I386:%%lib/X11/doc/README.newport
--- mgadriver.diff ends here ---


>Release-Note:
>Audit-Trail:

From: Patrik Backlund <pbacklun@cc.hut.fi>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/36021: Update port: x11-servers/XFree86-4-Server matrox driver
Date: Mon, 18 Mar 2002 12:39:20 +0200

 Problem report can be closed. A similar patch has been committed.
State-Changed-From-To: open->closed 
State-Changed-By: trevor 
State-Changed-When: Mon Mar 18 07:09:57 PST 2002 
State-Changed-Why:  
closed by request of submitter 

http://www.freebsd.org/cgi/query-pr.cgi?pr=36021 
>Unformatted:
