From root@distalzou.net  Tue May 24 08:19:26 2005
Return-Path: <root@distalzou.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 148F116A41C;
	Tue, 24 May 2005 08:19:26 +0000 (GMT)
	(envelope-from root@distalzou.net)
Received: from mail.distalzou.net (203.141.139.231.user.ad.il24.net [203.141.139.231])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C3B5743D1D;
	Tue, 24 May 2005 08:19:25 +0000 (GMT)
	(envelope-from root@distalzou.net)
Received: from root by mail.distalzou.net with local (Exim 4.51 (FreeBSD))
	id 1DaUdI-000O1T-7F; Tue, 24 May 2005 17:19:24 +0900
Message-Id: <E1DaUdI-000O1T-7F@mail.distalzou.net>
Date: Tue, 24 May 2005 17:19:24 +0900
From: Tod McQuillin <devin@spamcop.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: x11@FreeBSD.org
Subject: [PATCH] x11-servers/mga_hal: also install mga_drv.o
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         81428
>Category:       ports
>Synopsis:       [PATCH] x11-servers/mga_hal: also install mga_drv.o
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-x11
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 24 08:20:01 GMT 2005
>Closed-Date:    Thu Dec 29 22:21:04 GMT 2005
>Last-Modified:  Fri Dec 30 21:50:03 GMT 2005
>Originator:     Tod McQuillin
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
>Environment:
System: FreeBSD plexi.pun-pun.prv 4.11-STABLE FreeBSD 4.11-STABLE #0: Sat May 21 11:14:44 JST 2005
>Description:
In addition to mga_hal_drv.o, the supplied mga_drv.o is also required
for proper operation, at least for the Matrox G550 running in dual
DVI mode.  Without the supploed mga_drv.o the server fails to initialise
the G550 properly and generates the DVI signal at an incorrect
frequency.

Port maintainer (x11@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- mga_hal-4.1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /usr/src/cvs-repo/ports/x11-servers/mga_hal/Makefile,v
retrieving revision 1.1
diff -u -u -r1.1 Makefile
--- Makefile	13 Jan 2005 01:11:53 -0000	1.1
+++ Makefile	24 May 2005 08:14:44 -0000
@@ -17,7 +17,7 @@
 NO_PACKAGE=	"Matrox drivers may not be distributed"
 RESTRICTED=	"Matrox drivers may not be distributed."
 
-ONLY_FOR_ARCHS= i386
+ONLY_FOR_ARCHS=	i386
 
 PREFIX?=	${X11BASE}
 WRKSRC=		${WRKDIR}/mgadriver-${PORTVERSION}
@@ -30,5 +30,7 @@
 .endif
 	${INSTALL_DATA} ${WRKSRC}/xfree86/6.8.1/mga_hal_drv.o \
 		${PREFIX}/lib/modules/drivers/
+	${INSTALL_DATA} ${WRKSRC}/xfree86/6.8.1/mga_drv.o \
+		${PREFIX}/lib/modules/drivers/
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /usr/src/cvs-repo/ports/x11-servers/mga_hal/pkg-plist,v
retrieving revision 1.1
diff -u -u -r1.1 pkg-plist
--- pkg-plist	13 Jan 2005 01:11:54 -0000	1.1
+++ pkg-plist	24 May 2005 08:14:02 -0000
@@ -1,3 +1,4 @@
 %%PORTDOCS%%%%DOCSDIR%%/readme.txt
 lib/modules/drivers/mga_hal_drv.o
+lib/modules/drivers/mga_drv.o
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
--- mga_hal-4.1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->x11 
Responsible-Changed-By: jylefort 
Responsible-Changed-When: Tue May 24 11:57:22 GMT 2005 
Responsible-Changed-Why:  
Over to maintainers. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=81428 
Responsible-Changed-From-To: x11->freebsd-x11 
Responsible-Changed-By: lesi 
Responsible-Changed-When: Mon May 30 11:26:46 GMT 2005 
Responsible-Changed-Why:  
Canonicalize assignment. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=81428 

From: Dejan Lesjak <dejan.lesjak@ijs.si>
To: bug-followup@FreeBSD.org,
 devin@spamcop.net
Cc:  
Subject: Re: ports/81428: [PATCH] x11-servers/mga_hal: also install mga_drv.o
Date: Mon, 30 May 2005 13:26:17 +0200

 Trouble with this is that it would make this port conflict with 
 (xorg,XFree86-4)-server ports.
 One possible solution is to take x11/nvidia-driver approach and backup 
 conflicting file, then restoring it upon uninstall. I can try to make a patch 
 in this general direction if nobody comes with better approach...

From: Dejan Lesjak <dejan.lesjak@ijs.si>
To: bug-followup@FreeBSD.org,
 devin@spamcop.net
Cc:  
Subject: Re: ports/81428: [PATCH] x11-servers/mga_hal: also install mga_drv.o
Date: Tue, 31 May 2005 20:27:24 +0200

 Here's another possibility that could avoid messing with pkg-plist:
 We add a knob, say WITH_DRIVER_OVERWRITE or some such silly name to 
 x11-servers/mga_hal so anybody that installs this would have to set it and 
 thus would know that it overwrites files of (XFree86-4|xorg)-server port (it 
 prints a nice message explaining this of course if this is not set by marking 
 port IGNORE). Then, we mark add CONFLICTS to -server ports so users are 
 reminded that they have to uninstall and then reinstall x11-servers/mga_hal 
 after upgrading -server port as files will be overwritten with Xorg/XFree86 
 driver.
 
 How does this sound?

From: Eric Anholt <eta@lclark.edu>
To: gnats <freebsd-gnats-submit@FreeBSD.ORG>
Cc:  
Subject: Re: ports/81428
Date: Tue, 31 May 2005 13:53:30 -0700

 I for one would not commit any hacks that involve overwriting the
 standard open-source mga 2d driver with the matrox-supplied one.  If
 there are improvements in any feature in the matrox-supplied one, that
 improvement needs to be identified and integrated upstream, rather than
 continue supplying a buggy-in-other-ways Matrox-supplied driver.
 
 The diffs between 4.3.0 and matrox's driver were relatively small and
 mostly whitespace. It should not be hard for someone who cares to
 identify which missing chunk of diff is causing the problem.
 
 -- 
 Eric Anholt                                     eta@lclark.edu
 http://people.freebsd.org/~anholt/              anholt@FreeBSD.org
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Thu Dec 29 22:20:55 UTC 2005 
State-Changed-Why:  
Maintainer's turned down the proposal. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=81428 

From: <pfgshield-freebsd@yahoo.com>
To: bug-followup@FreeBSD.org, devin@spamcop.net
Cc:  
Subject: Re: ports/81428: [PATCH] x11-servers/mga_hal: also install mga_drv.o
Date: Fri, 30 Dec 2005 22:47:25 +0100 (CET)

 Hi;
 
 What other ports do (mostly with config files) is to have the package copy the
 original file before overwritting it, and have the packaging tools reinstall
 the original file when/if the port is deinstalled.
 
 FWIW, the new version in the ftp server has drivers for different versions of
 X.Org. I sent a quick (read conservatively sloppy) update to the maintainer
 that must be in the mail archives, but I'm not using Matrox anymore.
 
 cheers,
 
     Pedro.
 
 
 	
 
 	
 		
 ___________________________________ 
 Yahoo! Mail: gratis 1GB per i messaggi e allegati da 10MB 
 http://mail.yahoo.it
>Unformatted:
