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

[Oliver Lehmann]

The following reply was made to PR ports/75666; it has been noted by GNATS.

From: Oliver Lehmann <oliver at FreeBSD.org>
To: freebsd-gnats-submit at FreeBSD.org
Cc: x11 at freebsd.org
Subject: Re: ports/75666: add Matrox MGA Driver to xorg-server
Date: Sun, 9 Jan 2005 12:55:01 +0100

 Please take this patch as it covers an extra patch which is needed:
 
 
 diff -ruN --exclude=CVS /usr/ports/x11-servers/xorg-server/Makefile xorg-server/Makefile
 --- /usr/ports/x11-servers/xorg-server/Makefile	Sat Jan  8 12:02:58 2005
 +++ xorg-server/Makefile	Sun Jan  9 01:24:27 2005
 @@ -137,6 +137,38 @@
  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."
 +EXTRA_PATCHES=	${FILESDIR}/extra-patch-matrox
 +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"
 diff -ruN --exclude=CVS /usr/ports/x11-servers/xorg-server/distinfo xorg-server/distinfo
 --- /usr/ports/x11-servers/xorg-server/distinfo	Fri Dec 31 13:41:22 2004
 +++ xorg-server/distinfo	Fri Jan  7 21:21:36 2005
 @@ -2,3 +2,5 @@
  SIZE (xorg/X11R6.8.1-src1.tar.gz) = 30562401
  MD5 (xorg/X11R6.8.1-src3.tar.gz) = 8578e566e909e7c40300f44b6f0e88d3
  SIZE (xorg/X11R6.8.1-src3.tar.gz) = 10014808
 +MD5 (xorg/mgadriver-4.1-1-src.tar.gz) = 5376fed39733b605191cf4dbb138a3ff
 +SIZE(xorg/mgadriver-4.1-1-src.tar.gz) = 1148470
 diff -ruN --exclude=CVS /usr/ports/x11-servers/xorg-server/files/extra-patch-matrox xorg-server/files/extra-patch-matrox
 --- /usr/ports/x11-servers/xorg-server/files/extra-patch-matrox	Thu Jan  1 01:00:00 1970
 +++ xorg-server/files/extra-patch-matrox	Sun Jan  9 01:16:31 2005
 @@ -0,0 +1,17 @@
 +--- programs/Xserver/hw/xfree86/drivers/mga/Imakefile.orig	Sun Jan  9 01:14:42 2005
 ++++ programs/Xserver/hw/xfree86/drivers/mga/Imakefile	Sun Jan  9 01:14:48 2005
 +@@ -6,6 +6,14 @@
 + #define IHaveModules
 + #include <Server.tmpl>
 + 
 ++#undef NormalRelocatableTarget
 ++#define NormalRelocatableTarget(objname,objlist)                        @@\
 ++AllTarget(objname.Osuf)                                                 @@\
 ++                                                                        @@\
 ++objname.Osuf: objlist $(EXTRALIBRARYDEPS)                               @@\
 ++	RemoveFile($@)                                                  @@\
 ++	$(MODLD) $(MODLDCOMBINEFLAGS) objlist -L../../i2c -li2c -o $@
 ++
 + #if BuildMatroxHal
 + #define IHaveSubdirs
 + SUBDIRS=hallib
 diff -ruN --exclude=CVS /usr/ports/x11-servers/xorg-server/pkg-plist xorg-server/pkg-plist
 --- /usr/ports/x11-servers/xorg-server/pkg-plist	Sat Jan  8 12:02:58 2005
 +++ xorg-server/pkg-plist	Mon Jan  3 21:27:37 2005
 @@ -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
 @@ -93,6 +94,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
 diff -ruN --exclude=CVS /usr/ports/x11-servers/xorg-server/scripts/configure xorg-server/scripts/configure
 --- /usr/ports/x11-servers/xorg-server/scripts/configure	Sat Jan  8 12:02:58 2005
 +++ xorg-server/scripts/configure	Mon Jan  3 21:27:37 2005
 @@ -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"
 
 
 -- 
  Oliver Lehmann
   http://www.pofo.de/
   http://wishlist.ans-netz.de/