ports/75666: add Matrox MGA Driver to xorg-server

[Oliver Lehmann]

>Number:         75666
>Category:       ports
>Synopsis:       add Matrox MGA Driver to xorg-server
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 30 17:50:30 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Oliver Lehmann
>Release:        FreeBSD 6.0-CURRENT i386
>Organization:
>Environment:
System: 

	FreeBSD curry.salatschuessel.net 6.0-CURRENT FreeBSD 6.0-CURRENT #0: Fri Nov  5 22:52:36 CET 2004     olivleh1 at curry.salatschuessel.net:/usr/obj/i386-6.0/usr/src/sys/CURRY  i386


>Description:
	Add the matrox-driver stuff back since matrox now supports driver for xorg

>How-To-Repeat:
>Fix:


--- patch-x11-servers::xorg-server begins here ---
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/ports/x11-servers/xorg-server/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile	29 Dec 2004 02:29:31 -0000	1.19
+++ Makefile	30 Dec 2004 16:35:38 -0000
@@ -136,6 +136,37 @@
 PLIST_SUB+=	AMD64_I386="@comment "
 .endif
 
+.if ${ARCH} == i386
+.if !defined(WITH_MATROX_GXX_DRIVER)
+SCRIPTS_ENV+=		HaveMatroxHal=NO
+PLIST_SUB+=		MATROX="@comment "
+pre-fetch::
+	@${ECHO_MSG} "********************************************************"
+	@${ECHO_MSG} "Define WITH_MATROX_GXX_DRIVER to include Matrox's extra"
+	@${ECHO_MSG} "\"HALLIB\" binary driver"
+	@${ECHO_MSG} "********************************************************"
+.else
+NO_PACKAGE=	"Matrox drivers may not be distributed"
+RESTRICTED=	"Matrox drivers may not be distributed."
+SCRIPTS_ENV+=		HaveMatroxHal=YES
+MGA_DRIVER_VERSION=	4.1-1
+MASTER_SITES+=  	ftp://ftp.matrox.com/pub/mga/archive/linux/2004/:mga
+DISTFILES+=		mgadriver-${MGA_DRIVER_VERSION}-src.tar.gz:mga
+#EXTRACT_ONLY+=  	mgadriver-${MGA_DRIVER_VERSION}-src.tar.gz
+RESTRICTED_FILES=	mgadriver-${MGA_DRIVER_VERSION}-src.tar.gz
+PLIST_SUB+=		MATROX=""
+post-extract::
+	${CP} -r ${WRKDIR}/mgadriver-${MGA_DRIVER_VERSION}-src/${PORTVERSION}/mga \
+		${WRKSRC}/programs/Xserver/hw/xfree86/drivers/
+post-install::
+	${INSTALL_DATA} ${WRKDIR}/mgadriver-${MGA_DRIVER_VERSION}-src/${PORTVERSION}/mga/README_HALLIB \
+		${PREFIX}/lib/X11/doc/README.mga_HALLIB
+.endif  # !WITH_MATROX_GXX_DRIVER
+.else
+SCRIPTS_ENV+=		HaveMatroxHal=NO
+PLIST_SUB+=		MATROX="@comment "
+.endif
+
 .if !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO
 pre-everything::
 	@${ECHO_MSG} "By default, the X Server installs as a set-user-id root binary. When run by"
Index: pkg-plist
===================================================================
RCS file: /usr/local/cvsroot/ports/x11-servers/xorg-server/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist	23 Dec 2004 01:35:48 -0000	1.5
+++ pkg-plist	30 Dec 2004 16:35:38 -0000
@@ -63,6 +63,7 @@
 lib/X11/doc/README.fonts
 lib/X11/doc/README.i740
 lib/X11/doc/README.i810
+%%MATROX%%lib/X11/doc/README.mga_HALLIB
 lib/X11/doc/README.mouse
 lib/X11/doc/README.newport
 lib/X11/doc/README.r128
@@ -92,6 +93,7 @@
 %%I386%%lib/modules/drivers/i740_drv.o
 %%I386%%lib/modules/drivers/i810_drv.o
 lib/modules/drivers/mga_drv.o
+%%MATROX%%lib/modules/drivers/mga_hal_drv.o
 %%AMD64_I386%%lib/modules/drivers/neomagic_drv.o
 %%I386%%lib/modules/drivers/nsc_drv.o
 %%SPARC64_NA%%lib/modules/drivers/nv_drv.o
Index: scripts/configure
===================================================================
RCS file: /usr/local/cvsroot/ports/x11-servers/xorg-server/scripts/configure,v
retrieving revision 1.4
diff -u -r1.4 configure
--- scripts/configure	23 Dec 2004 01:35:48 -0000	1.4
+++ scripts/configure	30 Dec 2004 16:35:38 -0000
@@ -24,6 +24,8 @@
 echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
 echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
 echo "#define BuildXFree86ConfigTools YES"	>> $LOCALDEF
+# Matrox driver support
+echo "#define HaveMatroxHal $HaveMatroxHal"	>> $LOCALDEF
 
 if [ X$WITH_DEBUG != X ]; then
 	export CFLAGS="-g $CFLAGS"
--- patch-x11-servers::xorg-server ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: