Date: Tue, 18 Apr 2017 14:45:00 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438783 - head/x11/nvidia-driver Message-ID: <201704181445.v3IEj0Kv041980@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Apr 18 14:45:00 2017 New Revision: 438783 URL: https://svnweb.freebsd.org/changeset/ports/438783 Log: - Remove always true/false OSVERSION conditions Approved by: portmgr blanket Modified: head/x11/nvidia-driver/Makefile Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Tue Apr 18 14:36:08 2017 (r438782) +++ head/x11/nvidia-driver/Makefile Tue Apr 18 14:45:00 2017 (r438783) @@ -115,39 +115,31 @@ post-patch: .SILENT # We should support -CURRENT: kill the check ${REINPLACE_CMD} -e '24,26d' ${WRKSRC}/src/${NVSRC}/nv-freebsd.h # Adjust Linux headers #include's after FreeBSD src r246085 -.if ${OSVERSION} > 1000027 ${REINPLACE_CMD} -E '/#include "machine\/\.\.\/linux(32)?\/linux.h"/ \ { x ; s/.*/#include "machine\/..\/..\/compat\/linux\/linux_ioctl.h"/ ; H ; x ; }' \ ${WRKSRC}/src/${NVSRC}/nvidia_linux.c -.endif # Adjust `vm_object' locking after FreeBSD src r248084 -.if ${OSVERSION} > 1000029 ${REINPLACE_CMD} -e '/#include <vm\/vm_object.h>/ \ { x ; s/.*/#include <sys\/rwlock.h>/ ; G ; }' \ ${WRKSRC}/src/${NVSRC}/nv-freebsd.h ${REINPLACE_CMD} -E 's/(VM_OBJECT_)(UN)?(LOCK)/\1W\2\3/' \ ${WRKSRC}/src/${NVSRC}/nvidia_subr.c -.endif # Adjust kmem(9) calls after FreeBSD src r254025 -.if ${OSVERSION} > 1000040 && ${NVVERSION} < 331.067 +.if ${NVVERSION} < 331.067 ${REINPLACE_CMD} -e '/kmem_/s/kernel_map/kernel_arena/' \ ${WRKSRC}/src/${NVSRC}/nvidia_subr.c .endif # Chase `sys/capability.h' rename to `sys/capsicum.h' in FreeBSD src r263232 -.if ${OSVERSION} > 1100013 || ${OSVERSION} > 1001510 && ${OSVERSION} < 1100000 ${REINPLACE_CMD} -e 's:sys/capability\.h:sys/capsicum.h:' \ ${WRKSRC}/src/${NVSRC}/nv-freebsd.h -. if ${NVVERSION} >= 358.009 +.if ${NVVERSION} >= 358.009 ${REINPLACE_CMD} -e 's:sys/capability\.h:sys/capsicum.h:' \ ${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c -. endif .endif # Fix CTLFLAG_* values for SYSCTL_ADD_PROC() after FreeBSD src r273377 -.if ${OSVERSION} > 1100039 || ${OSVERSION} > 1001501 && ${OSVERSION} < 1100000 ${REINPLACE_CMD} -e '/SYSCTL_ADD_PROC/,/;/ \ s/^[[:blank:]]*CTLFLAG_RD/CTLTYPE_STRING |&/' \ ${WRKSRC}/src/${NVSRC}/nvidia_sysctl.c -.endif # Replace `d_thread_t' (FreeBSD 4 support compat shim) with `struct thread' ${REINPLACE_CMD} -e 's/d_thread_t/struct thread/' \ ${WRKSRC}/src/${NVSRC}/nvidia_ctl.c \ @@ -188,11 +180,6 @@ post-patch: .SILENT ${REINPLACE_CMD} -e 's,/usr/share/nvidia,${STAGEDIR}${DOCSDIR},' \ ${WRKSRC}/lib/libGL/Makefile ${WRKSRC}/doc/Makefile .endif -# New `cap_rights_t' structure was introduced in FreeBSD src r255219 -.if ${OSVERSION} < 1000053 && ${NVVERSION} >= 358.009 - ${REINPLACE_CMD} '/<sys\/caprights.h>/d ; /cap_rights_t rights/d ; s/cap_rights_init(&rights, CAP_IOCTL)/CAP_IOCTL/' \ - ${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c -.endif # Finally, process OPTIONS .if ${PORT_OPTIONS:MFREEBSD_AGP} ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704181445.v3IEj0Kv041980>