ports/55699: [PATCH] making x11-servers/XFree86-4-Server able to use mga hal library

[Jens Rehsack]

>Number:         55699
>Category:       ports
>Synopsis:       [PATCH] making x11-servers/XFree86-4-Server able to use mga hal library
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 18 09:10:22 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Jens Rehsack
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
LiWing IT-Services
>Environment:
System: FreeBSD statler 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Sun Aug 17 12:35:32 GMT 2003 root at statler:/usr/obj/usr/src/sys/STATLER i386


	
>Description:
	
>How-To-Repeat:
	
>Fix:

	

This patch has to be placed into ${FILESDIR}

--- patch-have_mga_hal begins here ---
--- config/cf/xf86site.def.orig	Wed Aug  6 23:58:05 2003
+++ config/cf/xf86site.def	Wed Aug  6 23:58:47 2003
@@ -140,15 +140,15 @@
 /*
  * To disable use of the Matrox HAL library, uncomment this:
  *
-#define UseMatroxHal		NO
  */
+#define UseMatroxHal		YES
 
 /*
  * If you have the HALlib.a binary installed in xfree86/drivers/mga/HALlib,
  * uncomment this:
  *
-#define HaveMatroxHal		YES
  */
+#define HaveMatroxHal		YES
 
 /*
  * If you have the HALlib source code installed in xfree86/drivers/mga/hallib,
--- patch-have_mga_hal ends here ---

This is the patch for the port itself.

--- patch-mga begins here ---
Index: x11-servers/XFree86-4-Server/Makefile
===================================================================
diff -u x11-servers/XFree86-4-Server/Makefile.orig x11-servers/XFree86-4-Server/Makefile
--- x11-servers/XFree86-4-Server/Makefile.orig	Mon Aug 18 09:17:13 2003
+++ x11-servers/XFree86-4-Server/Makefile	Mon Aug 18 09:49:43 2003
@@ -22,6 +22,12 @@
 		X430src-2.tgz \
 		X430src-3.tgz
 
+.if defined(WITH_MGA_HAL)
+MASTER_SITES+=	ftp://ftp.matrox.com/pub/mga/archive/linux/2003/:mga
+DISTFILES+=	mgadrivers-3.0-src.tgz:mga
+EXTRACT_ONLY+=	mgadrivers-3.0-src.tgz
+.endif
+
 MAINTAINER=	anholt at freebsd.org
 COMMENT=	XFree86-4 X server and related programs
 
@@ -38,6 +44,11 @@
 	patch-sunffb_Imakefile patch-xf86sym.c patch-xf86Events.c patch-ftfuncs.c
 EXTRA_PATCHES+=		${FILESDIR}/${pf}
 .endfor
+
+.if defined(WITH_MGA_HAL)
+EXTRA_PATCHES+=		${FILESDIR}/patch-have_mga_hal
+.endif
+
 SCRIPTS_ENV=		OSVERSION=${OSVERSION} \
 			BuildXF86DRI=${BuildXF86DRI} \
 			WITH_DEBUG="${WITH_DEBUG}"
@@ -94,6 +105,10 @@
 .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} != i386 && defined(WITH_MGA_HAL)
+BROKEN=	"Binary MGA HAL Library works with x86 only."
+.endif
+
 .if ${ARCH} == i386 ||  ${ARCH} == alpha
 BuildXF86DRI=		YES
 PLIST_SUB+=		DRI=""
@@ -156,6 +171,10 @@
 post-extract::
 	${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \
 		${WRKSRC}/lib/Xdmcp/Wraphelp.c
+.if defined(WITH_MGA_HAL)
+	@cd ${WRKDIR}; ${CP} mgadrivers-3.0-src/4.3.0/drivers/src/HALlib/mgaHALlib.a \
+		${WRKSRC}/programs/Xserver/hw/xfree86/drivers/mga/HALlib/
+.endif
 
 post-build:
 	@${RM} -f ${PKGMESSAGE}
Index: x11-servers/XFree86-4-Server/distinfo
===================================================================
diff -u x11-servers/XFree86-4-Server/distinfo.orig x11-servers/XFree86-4-Server/distinfo
--- x11-servers/XFree86-4-Server/distinfo.orig	Mon Aug 18 09:26:55 2003
+++ x11-servers/XFree86-4-Server/distinfo	Mon Aug 18 09:31:05 2003
@@ -2,3 +2,4 @@
 MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4
 MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
 MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535
+MD5 (xc/mgadrivers-3.0-src.tgz) = 9e7ed8a25fc7ee683cfdcc1cf6da8c3f
--- patch-mga ends here ---


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