ports/61867: PORT UPDATE: x11/nvidia-driver

[Alexey Dokuchaev]

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

From: Alexey Dokuchaev <danfe at nsu.ru>
To: freebsd-gnats-submit at FreeBSD.org, danfe at regency.nsu.ru
Cc:  
Subject: Re: ports/61867: PORT UPDATE: x11/nvidia-driver
Date: Sun, 25 Jan 2004 18:41:46 +0600

 This is a multi-part message in MIME format.
 --------------080706090405000102090803
 Content-Type: text/plain; charset=us-ascii; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Even better, use this slightly tuned patch instead (I've splitted it so 
 it is less confusing, and wraped some overly long lines).
 Please don't forget to rename `patch-nvidia_pci.c' to 
 `patch-src::nvidia_pci.c', and add `patch-module::Makefile' to files/ 
 (both files attached).
 Thanks!
 
 --------------080706090405000102090803
 Content-Type: text/plain;
  name="DIFF"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="DIFF"
 
 diff -Naur /usr/ports/x11/nvidia-driver/Makefile nvidia-driver/Makefile
 --- /usr/ports/x11/nvidia-driver/Makefile	Thu Jan 22 21:52:56 2004
 +++ nvidia-driver/Makefile	Sun Jan 25 19:38:14 2004
 @@ -59,19 +59,24 @@
  	@${ECHO_MSG} "Define WITH_NVIDIA_HACKS to enable work-arounds to override basic AGP setup"
  .endif
  
 -.if defined(WITH_FREEBSD_AGP) || defined(FORCE_AGP_RATE) || defined(WITH_NVIDIA_HACKS)
 +.if defined(WITH_FREEBSD_AGP) || defined(FORCE_AGP_RATE) || defined(WITH_NVIDIA_HACKS) || ${OSVERSION} > 501106
  USE_REINPLACE=	yes
  
  post-patch:
  . if defined(WITH_FREEBSD_AGP)
 -	@${REINPLACE_CMD} "s/undef USE_OS_AGP_GART/define USE_OS_AGP_GART/" \
 +	@${REINPLACE_CMD} 's/undef USE_OS_AGP_GART/define USE_OS_AGP_GART/' \
  		${WRKSRC}/src/nv-freebsd.h
  . endif
  . if defined(FORCE_AGP_RATE)
 -	@${REINPLACE_CMD} 's/NVreg_ReqAGPRate,[[:blank:]]*0/NVreg_ReqAGPRate, 1/' ${WRKSRC}/src/nvidia_os_registry.c
 +	@${REINPLACE_CMD} 's/NVreg_ReqAGPRate,[[:blank:]]*0/NVreg_ReqAGPRate, 1/' \
 +		${WRKSRC}/src/nvidia_os_registry.c
  . endif
  . if defined(WITH_NVIDIA_HACKS)
 -	@${REINPLACE_CMD} 's/NVreg_UpdateKernelAGP,[[:blank:]]*1/NVreg_UpdateKernelAGP, 0/' ${WRKSRC}/src/nvidia_os_registry.c
 +	@${REINPLACE_CMD} 's/NVreg_UpdateKernelAGP,[[:blank:]]*1/NVreg_UpdateKernelAGP, 0/' \
 +		${WRKSRC}/src/nvidia_os_registry.c
 +. endif
 +. if ${OSVERSION} > 501106
 +	@${REINPLACE_CMD} 's/PCIR_HEADERTYPE/PCIR_HDRTYPE/' ${WRKSRC}/src/nvidia_sysctl.c
  . endif
  .endif
  
 diff -Naur /usr/ports/x11/nvidia-driver/pkg-plist nvidia-driver/pkg-plist
 --- /usr/ports/x11/nvidia-driver/pkg-plist	Sat Aug 23 11:54:12 2003
 +++ nvidia-driver/pkg-plist	Sun Jan 25 19:36:19 2004
 @@ -28,7 +28,7 @@
  share/doc/NVIDIA/XF86Config.sample
  share/doc/NVIDIA/license.txt
  %%FREEBSD4%%@cwd /modules
 -%%FREEBSD5%%@cwd /boot/kernel
 +%%FREEBSD5%%@cwd /boot/modules
  nvidia.ko
  %%FREEBSD4%%@cwd /dev
  %%FREEBSD4%%MAKEDEV.nvidia
 
 --------------080706090405000102090803
 Content-Type: text/plain;
  name="patch-module::Makefile"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="patch-module::Makefile"
 
 --- module/Makefile.orig	Wed May 28 23:51:52 2003
 +++ module/Makefile	Sun Jan 25 11:47:48 2004
 @@ -14,6 +14,8 @@
  BUILD_DONE=	${.CURDIR}/.build_done
  CLEANFILES+=	${BUILD_DONE}
  
 +KMODDIR?=	/boot/modules
 +
  #
  # To enable debugging see nvidia_debug.h
  # uncomment the following line and change the 'debug'
 
 --------------080706090405000102090803--