Index: head/x11/nvidia-driver/Makefile =================================================================== --- head/x11/nvidia-driver/Makefile (revision 238866) +++ head/x11/nvidia-driver/Makefile (revision 238867) @@ -1,126 +1,127 @@ # New ports collection makefile for: nvidia-driver (latest and master port) # Date created: 4 December 2002 # Whom: Stijn Hoop # # $FreeBSD$ # PORTNAME= nvidia-driver DISTVERSION?= 185.18.29 PORTREVISION?= 0 # As a reminder it can be overridden CATEGORIES= x11 kld MASTER_SITES= ${MASTER_SITE_NVIDIA} MASTER_SITE_SUBDIR= freebsd/${DISTVERSION} DISTNAME= NVIDIA-FreeBSD-x86-${DISTVERSION} MAINTAINER= danfe@FreeBSD.org COMMENT= NVidia graphics card binary drivers for hardware OpenGL rendering ONLY_FOR_ARCHS= i386 NO_PACKAGE= should be recompiled for a particular FreeBSD kernel USE_GL= gl USE_LDCONFIG= yes SUB_FILES+= pkg-message DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0 MODULESDIR= lib/xorg/modules PORTDOCS= * OPTIONS= FREEBSD_AGP "Use FreeBSD AGP GART driver" off \ ACPI "Enable support for ACPI Power Management" off \ LINUX "Build with support for Linux compatibility" on # Starting with version 1.0-7667, NVidia has dropped support for numerous # "legacy" GPUs. Consult NVidia README (the Appendix) to find out whether # you need to use legacy driver version and install one of corresponding # `x11/nvidia-driver-71', `x11/nvidia-driver-96', or `x11/nvidia-driver-173' # slave ports. # # XXX Until NVidia starts to name their releases consistently, employ this # ugly hack to derive NVVERSION. XXX # .if ${DISTVERSION:C/[0-9]+//g} == ".." # major.minor.update NVVERSION= ${DISTVERSION:S/.//g} .else # major.minor NVVERSION= ${DISTVERSION:S/.//g}00 .endif .include # XXX Should use ${PKG_INFO} but it does not expand for some reason XXX # XSERVVERSION!= /usr/sbin/pkg_info -qO x11-servers/xorg-server 2>/dev/null || true LIBGLVERSION!= /usr/sbin/pkg_info -qO graphics/libGL 2>/dev/null || true .if empty(XSERVVERSION) IGNORE= needs an X server implementation installed .endif PLIST_SUB+= XSERVVERSION=${XSERVVERSION} LIBGLVERSION=${LIBGLVERSION} \ LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \ MODULESDIR=${MODULESDIR} .if !defined(WITHOUT_LINUX) USE_LINUX= yes PLIST_SUB+= LINUX="" .else PLIST_SUB+= LINUX="@comment " # Propagate WITHOUT_LINUX variable down to inner Makefiles MAKE_ENV+= WITHOUT_LINUX=yes .endif LIB_DEPENDS+= m.3:${PORTSDIR}/misc/compat5x post-patch: .SILENT # We should support -CURRENT: kill the check ${REINPLACE_CMD} '24,26d' ${WRKSRC}/src/nv-freebsd.h .if defined(WITH_FREEBSD_AGP) ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \ ${WRKSRC}/src/nv-freebsd.h .endif .if defined(WITH_ACPI) ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_ACPI_PM)/define \1/' \ ${WRKSRC}/src/nv-freebsd.h .endif .if defined(WITHOUT_LINUX) ${REINPLACE_CMD} -E 's/define (NV_SUPPORT_LINUX_COMPAT)/undef \1/' \ ${WRKSRC}/src/nv-freebsd.h .endif # Don't build any binaries (nvidia-settings and nvidia-xconfig) and manuals .if ${NVVERSION} < 974600 ${REINPLACE_CMD} -E 's/(extension).*/\1/' ${WRKSRC}/x11/Makefile .else ${REINPLACE_CMD} -E 's/(lib).*/\1/' ${WRKSRC}/x11/Makefile .endif ${REINPLACE_CMD} '/bin/d ; /man/d' ${WRKSRC}/x11/Makefile # Conditionally install documentation (but you generally want it) .if defined(NOPORTDOCS) ${REINPLACE_CMD} -E 's/(x11).*/\1/ ; /doc/d' ${WRKSRC}/Makefile .endif # Do not execute afterinstall target (prevent automatic module registration) ${REINPLACE_CMD} -e 's/afterinstall/dontexecute/' ${WRKSRC}/Makefile pre-su-install: # XXX This port silently assumes PREFIX == LOCALBASE XXX @${MKDIR} ${PREFIX}/${MODULESDIR}/drivers post-install: # pkg-plist is already overbloated, so use this hack instead of PLIST_SUB's .if ${NVVERSION} < 817400 @${REINPLACE_CMD} '/libnvidia-cfg/d' ${TMPPLIST} -.else - @${REINPLACE_CMD} '/nvidia_drv\.o/d' ${TMPPLIST} .endif .if ${NVVERSION} < 974600 @${REINPLACE_CMD} '/wfb/d' ${TMPPLIST} .endif .if ${NVVERSION} < 1802900 - @${REINPLACE_CMD} '/libcuda/d ; /libvdpau/d' ${TMPPLIST} + @${REINPLACE_CMD} '/libvdpau/d' ${TMPPLIST} +.endif +.if ${NVVERSION} < 1851829 + @${REINPLACE_CMD} '/libcuda/d' ${TMPPLIST} .endif # Some applications need this symlink (see PR ports/72877) @${LN} -sf libXvMCNVIDIA.so.1 ${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1 @${ECHO_MSG} @${CAT} ${PKGMESSAGE} @${ECHO_MSG} .include Property changes on: head/x11/nvidia-driver/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.91 \ No newline at end of property +1.92 \ No newline at end of property Index: head/x11/nvidia-driver/pkg-plist =================================================================== --- head/x11/nvidia-driver/pkg-plist (revision 238866) +++ head/x11/nvidia-driver/pkg-plist (revision 238867) @@ -1,53 +1,52 @@ @comment I can't add the below files to the package because pkg_delete @comment will complain when removing this package: @comment %%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%% @comment %%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% @comment lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%% @comment They are however restored when this package is removed: @exec mv -f %D/%%MODULESDIR%%/extensions/libglx.la %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%% @unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.la @exec mv -f %D/%%MODULESDIR%%/extensions/libglx.so %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% @unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.so @exec mv -f %D/lib/libGL.so.1 %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%% @unexec mv -f %D/lib/XXX-libGL.so.1.%%%%.%%LIBGLVERSION%% %D/lib/libGL.so.1 lib/libnvidia-tls.so.1 lib/libnvidia-tls.so lib/libnvidia-cfg.so.1 lib/libnvidia-cfg.so lib/libGLcore.so.1 lib/libGLcore.so lib/libvdpau.so.1 lib/libvdpau.so lib/libvdpau_nvidia.so.1 lib/libvdpau_nvidia.so lib/libvdpau_trace.so.1 lib/libvdpau_trace.so lib/libXvMCNVIDIA.so.1 lib/libXvMCNVIDIA.so lib/libXvMCNVIDIA.a lib/libXvMCNVIDIA_dynamic.so.1 %%MODULESDIR%%/libnvidia-wfb.so.1 -%%MODULESDIR%%/drivers/nvidia_drv.o %%MODULESDIR%%/drivers/nvidia_drv.so %%MODULESDIR%%/extensions/libglx.so.1 @dirrmtry %%MODULESDIR%%/drivers @cwd /boot/modules nvidia.ko @unexec kldxref %D %%LINUX%%@cwd %%LINUXBASE%% %%LINUX%%usr/lib/libGL.so.%%SHLIB_VERSION%% %%LINUX%%usr/lib/libGL.so.1 %%LINUX%%usr/lib/libGLcore.so.%%SHLIB_VERSION%% %%LINUX%%usr/lib/libGLcore.so.1 %%LINUX%%usr/lib/libcuda.so.%%SHLIB_VERSION%% %%LINUX%%usr/lib/libcuda.so.1 %%LINUX%%usr/lib/libnvidia-tls.so.%%SHLIB_VERSION%% %%LINUX%%usr/lib/libnvidia-tls.so.1 %%LINUX%%usr/lib/libvdpau.so.%%SHLIB_VERSION%% %%LINUX%%usr/lib/libvdpau.so.1 %%LINUX%%usr/lib/libvdpau_nvidia.so.%%SHLIB_VERSION%% %%LINUX%%usr/lib/libvdpau_nvidia.so %%LINUX%%usr/lib/libvdpau_trace.so.%%SHLIB_VERSION%% %%LINUX%%usr/lib/libvdpau_trace.so %%LINUX%%@exec %D/sbin/ldconfig -r %D %%LINUX%%@unexec %D/sbin/ldconfig -r %D Property changes on: head/x11/nvidia-driver/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.24 \ No newline at end of property +1.25 \ No newline at end of property