ports/118253: x11/nvidia-driver build broken on pre RELENG_7

[barbara]

>Number:         118253
>Category:       ports
>Synopsis:       x11/nvidia-driver build broken on pre RELENG_7
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 25 23:00:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     barbara
>Release:        
>Organization:
>Environment:
FreeBSD satanasso.local.domain 6.3-PRERELEASE FreeBSD 6.3-PRERELEASE #0: Sun Nov 25 22:10:34 CET 2007 root at satanasso.local.domain:/usr/obj/usr/src/sys/SATANASSO i386

>Description:
The last changes to fix nvidia-driver in -CURRENT results in a broken build on pre RELENG_7 versions.
Here's the diff of the changes
http://www.freebsd.org/cgi/cvsweb.cgi/ports/x11/nvidia-driver/Makefile.diff?r1=1.67;r2=1.68;f=h

The Makefile patch a file from the source tarball adding an include of an header, but, as I can see here http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/sys/priv.h, the file only exists  since RELENG_7.

This is a transcript of the build output
# make
===>  Building for nvidia-driver-100.14.19
===> src (all)
cc -O2 -pipe -fno-strict-aliasing -march=athlon-mp -DNV_VERSION_STRING=\"100.14.19\" -D__KERNEL__ -DNVRM -UDEBUG -U_DEBUG -DNDEBUG -O -Werror -D_KERNEL -DKLD_MODULE -nostdinc -I-  -I/src -I. -I@ -I@/contrib/altq -I@/../include -finline-limit=8000 -fno-common  -mno-align-long-strings -mpreferred-stack-boundary=2  -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -ffreestanding -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual  -fformat-extensions -std=c99 -c nvidia_os.c
nvidia_os.c:15:22: sys/priv.h: No such file or directory
*** Error code 1

Stop in /usr/ports/x11/nvidia-driver/work/NVIDIA-FreeBSD-x86-100.14.19/src.
*** Error code 1

Stop in /usr/ports/x11/nvidia-driver/work/NVIDIA-FreeBSD-x86-100.14.19.
*** Error code 1

Stop in /usr/ports/x11/nvidia-driver.
*** Error code 1

>How-To-Repeat:
On a pre RELENG_7 installation

cd /usr/ports/x11/nvidia-driver && make

>Fix:
The FreeBSD version should be checked before patching the source file.
Here's a patch

--- Makefile.orig       2007-11-24 22:55:46.000000000 +0100
+++ Makefile    2007-11-25 23:24:20.000000000 +0100
@@ -97,8 +97,10 @@
                ${WRKSRC}/src/nv-freebsd.h
 .endif
 # Building with -Werror requires prototype for suser()
+.if ${OSVERSION} >= 700053
        ${REINPLACE_CMD} -e '15s,^,#include <sys/priv.h>,' \
                ${WRKSRC}/src/nvidia_os.c
+.endif
 .if defined(WITH_FREEBSD_AGP)
        ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \
                ${WRKSRC}/src/nv-freebsd.h


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