Index: head/x11/nvidia-driver/Makefile =================================================================== --- head/x11/nvidia-driver/Makefile (revision 163852) +++ head/x11/nvidia-driver/Makefile (revision 163853) @@ -1,171 +1,170 @@ # New ports collection makefile for: nvidia-driver # Date created: 4 December 2002 # Whom: Stijn Hoop # # $FreeBSD$ # PORTNAME= nvidia-driver PORTVERSION= 1.0.${NVVERSION} CATEGORIES= x11 MASTER_SITES= http://download.nvidia.com/freebsd/1.0-${NVVERSION}/ \ ftp://download.nvidia.com/freebsd/1.0-${NVVERSION}/ \ http://download1.nvidia.com/freebsd/1.0-${NVVERSION}/ \ ftp://download1.nvidia.com/freebsd/1.0-${NVVERSION}/ DISTNAME= NVIDIA-FreeBSD-x86-${PORTVERSION:S/0./0-/} MAINTAINER= danfe@FreeBSD.org COMMENT= NVidia graphics card binary drivers for hardware OpenGL rendering ONLY_FOR_ARCHS= i386 USE_X_PREFIX= yes NO_PACKAGE= should be recompiled for a particular FreeBSD kernel INSTALLS_SHLIB= yes SUB_FILES+= pkg-message DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0 OPTIONS= FREEBSD_AGP "Use FreeBSD AGP GART driver" off \ VM86_INT10CALL "Use VM86 interface for video BIOS calls" off \ ACPI "Enable support for ACPI Power Management" off \ LINUX "Build with support for Linux compatibility" on # Get __FreeBSD_version. Needed to set PORTREVISION before including of # . # XXX This is not required for -CURRENT XXX # .if !defined(OSVERSION) .if exists(/sbin/sysctl) OSVERSION!= /sbin/sysctl -n kern.osreldate .else OSVERSION!= /usr/sbin/sysctl -n kern.osreldate .endif .endif # Newer releases from NVidia do not play nicely with FreeBSD prior to 5.3. # While we support 4.x/5.2.1 releases, stick to version 6113 of driver for # that old versions of FreeBSD. This can go away when we stop supporting # them. For details, please refer to PR ports/79571. # # Starting with version 7667, NVidia has dropped support for numerous # "legacy" GPUs. One can, however, build the port with -DWITH_LEGACY_GPU_SUPPORT # to go with version 7174 of driver (this does not apply to older versions # of FreeBSD, since one has to use version 6113 of driver (if [s]he did not # yet upgraded to FreeBSD 5.3 or later) which has support for those GPUs). # # If you must use WITH_LEGACY_GPU_SUPPORT option, be sure to ``hold'' the # package by making appropriate entry in your pkgtools.conf, otherwise # portupgrade(1) will upgrade your port to latest NVidia release on the # next run, which is probably not what you want. # # ATTENTION!! ACHTUNG!! VNIMANIE!! # # This very Makefile is already overly complicated, thus support for # multiple versions of NVidia releases is going away once we stop caring for # ports on 4.x versions of FreeBSD. This also applies to "legacy GPUs" # support. Those poor souls^W^Wproud owners of RIVA's and Vanta's, frankly, # should consider buying a modern gfx card. # # XXX WITH_LEGACY_GPU_SUPPORT is not in OPTIONS because it has to be handled # _before_ including of . On the other hand, it is really # an UNSUPPORTED option anyway, so this is for good to hide it here XXX # .if ${OSVERSION} < 503000 NVVERSION= 6113 PORTREVISION= 4 PLIST_SUB+= DIFFS="" DRVSO="@comment " EXTRA_PATCHES+= ${FILESDIR}/${NVVERSION}-* .else .if defined(WITH_LEGACY_GPU_SUPPORT) NVVERSION= 7174 PORTREVISION= 3 EXTRA_PATCHES+= ${FILESDIR}/6113-patch-lib::Makefile .else -NVVERSION= 8178 -PORTREVISION= 1 +NVVERSION= 8762 EXTRA_PATCHES+= ${FILESDIR}/7667-* .endif .if ${OSVERSION} >= 600033 LIB_DEPENDS+= m.3:${PORTSDIR}/misc/compat5x .endif PLIST_SUB+= DIFFS="@comment " DRVSO="" .endif .include # XXX Should use ${PKG_INFO} XXX # XSERVVERSION!= /usr/sbin/pkg_info -O x11-servers/XFree86-4-Server 2>/dev/null | ${GREP} Server- || /usr/sbin/pkg_info -O x11-servers/xorg-server 2>/dev/null | ${GREP} server- || true XLIBVERSION!= /usr/sbin/pkg_info -O x11/XFree86-4-libraries 2>/dev/null | ${GREP} libraries- || /usr/sbin/pkg_info -O x11/xorg-libraries 2>/dev/null | ${GREP} libraries- || true PLIST_SUB+= XSERVVERSION=${XSERVVERSION} XLIBVERSION=${XLIBVERSION} \ LINUXBASE=${LINUXBASE} NVVERSION=${NVVERSION} .if !defined(WITHOUT_LINUX) # Add explicit X11 libraries dependency since USE_LINUX causes the port to # RUN_DEPEND on the Linux libraries rather than LIB_DEPEND on native ones LIB_DEPENDS+= X11.6:${X_LIBRARIES_PORT} USE_LINUX= yes PLIST_SUB+= LINUX="" .else PLIST_SUB+= LINUX="@comment " .endif .if ${OSVERSION} < 490000 || ${OSVERSION} >= 500000 && ${OSVERSION} < 502001 IGNORE= supports FreeBSD -STABLE (4.9 or later, 5.2.1 or later), or FreeBSD -CURRENT .endif .if ${OSVERSION} < 500000 PLIST_SUB+= FREEBSD5="@comment " FREEBSD4="" .else PLIST_SUB+= FREEBSD5="" FREEBSD4="@comment " .endif post-patch: .SILENT # We should support -CURRENT: kill the check .if ${NVVERSION} >= 7174 ${REINPLACE_CMD} '24,26d' ${WRKSRC}/src/nv-freebsd.h .endif .if ${OSVERSION} > 600028 ${REINPLACE_CMD} '/bus_memio\.h/d' ${WRKSRC}/src/nv-freebsd.h .endif .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_VM86_INT10CALL) ${REINPLACE_CMD} -E 's/undef (NV_USE_OS_VM86_INT10CALL)/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 ${REINPLACE_CMD} -E 's/(extension).*/\1/ ; /bin/d ; /man/d' \ ${WRKSRC}/x11/Makefile post-install: # pkg-plist is already overbloated, so use this hack instead of PLIST_SUB's .if ${NVVERSION} < 8174 @${REINPLACE_CMD} '/libnvidia-cfg/d ; /html/d' ${TMPPLIST} .else @${REINPLACE_CMD} '/README\.Linux/d' ${TMPPLIST} .endif ${LN} -sf libXvMCNVIDIA.so.1 ${PREFIX}/lib/libXvMCNVIDIA_dynamic.so.1 .if ${OSVERSION} < 500000 .for dev in 0 1 2 3 @${RM} -f /dev/nvidia${dev} @mknod /dev/nvidia${dev} c 180 ${dev} @${CHMOD} 0666 /dev/nvidia${dev} .endfor @${RM} -f /dev/nvidiactl @mknod /dev/nvidiactl c 180 255 @${CHMOD} 0666 /dev/nvidiactl .endif @${CAT} ${PKGMESSAGE} .include Property changes on: head/x11/nvidia-driver/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.45 \ No newline at end of property +1.46 \ No newline at end of property Index: head/x11/nvidia-driver/distinfo =================================================================== --- head/x11/nvidia-driver/distinfo (revision 163852) +++ head/x11/nvidia-driver/distinfo (revision 163853) @@ -1,9 +1,9 @@ MD5 (NVIDIA-FreeBSD-x86-1.0-6113.tar.gz) = 1dab16b9ebf3ab4253811b6ba29fc701 SHA256 (NVIDIA-FreeBSD-x86-1.0-6113.tar.gz) = 0a52b6f7d928e6bee8d14defa46267bdce142a81a6aa4d6f6e4e19379e4995eb SIZE (NVIDIA-FreeBSD-x86-1.0-6113.tar.gz) = 6215565 MD5 (NVIDIA-FreeBSD-x86-1.0-7174.tar.gz) = b57a03e0325617092016144229ae6114 SHA256 (NVIDIA-FreeBSD-x86-1.0-7174.tar.gz) = 926dfca6078bcaed486e0e27637faacd6a9eda7a3252d0d7779256e674776532 SIZE (NVIDIA-FreeBSD-x86-1.0-7174.tar.gz) = 8433799 -MD5 (NVIDIA-FreeBSD-x86-1.0-8178.tar.gz) = ef6d63b01ff062b9f5c2dd458e7e89b1 -SHA256 (NVIDIA-FreeBSD-x86-1.0-8178.tar.gz) = 90d3fd6acf916471a6d41737e83f5ed5489effd920cb695bc44bec791262a280 -SIZE (NVIDIA-FreeBSD-x86-1.0-8178.tar.gz) = 9067056 +MD5 (NVIDIA-FreeBSD-x86-1.0-8762.tar.gz) = ddc62c375db4a6db9007bf9e2d667d2c +SHA256 (NVIDIA-FreeBSD-x86-1.0-8762.tar.gz) = f29fa9dd9728a264d0b09267f23acea9ac2c04cc578b1e9644093bb2ade17875 +SIZE (NVIDIA-FreeBSD-x86-1.0-8762.tar.gz) = 9437999 Property changes on: head/x11/nvidia-driver/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.11 \ No newline at end of property +1.12 \ No newline at end of property Index: head/x11/nvidia-driver/pkg-plist =================================================================== --- head/x11/nvidia-driver/pkg-plist (revision 163852) +++ head/x11/nvidia-driver/pkg-plist (revision 163853) @@ -1,121 +1,120 @@ @comment I can't add the below files to the package because pkg_delete @comment will complain when removing this package: @comment lib/modules/extensions/XXX-libglx.so.%%XLIBVERSION%% @comment lib/modules/extensions/XXX-libGLcore.so.%%XLIBVERSION%% @comment lib/XXX-libGL.a.%%XLIBVERSION%% @comment lib/XXX-libGL.so.1.%%XLIBVERSION%% @comment They are however restored when this package is removed: @unexec mv -f %D/lib/modules/extensions/XXX-libglx.so.%%%%.%%XSERVVERSION%% %D/lib/modules/extensions/libglx.so @unexec mv -f %D/lib/modules/extensions/XXX-libGLcore.so.%%%%.%%XSERVVERSION%% %D/lib/modules/extensions/libGLcore.so @unexec mv -f %D/lib/XXX-libGL.a.%%%%.%%XLIBVERSION%% %D/lib/libGL.a lib/libGL.so.1 @unexec mv -f %D/lib/XXX-libGL.so.1.%%%%.%%XLIBVERSION%% %D/lib/libGL.so.1 @exec ln -sf %D/lib/libGL.so.1 %D/lib/libGL.so @comment no rm -f %D/lib/libGL.so because default XFree needs this also lib/libGLcore.so.1 @exec ln -sf %D/lib/libGLcore.so.1 %D/lib/libGLcore.so @unexec rm -f %D/lib/libGLcore.so lib/libXvMCNVIDIA.so.1 @exec ln -sf %D/lib/libXvMCNVIDIA.so.1 %D/lib/libXvMCNVIDIA.so @unexec rm -f %D/lib/libXvMCNVIDIA.so @exec ln -sf %D/lib/libXvMCNVIDIA.so.1 %D/lib/libXvMCNVIDIA_dynamic.so.1 @unexec rm -f %D/lib/libXvMCNVIDIA_dynamic.so.1 lib/libnvidia-cfg.so.1 @exec ln -sf %D/lib/libnvidia-cfg.so.1 %D/lib/libnvidia-cfg.so @unexec rm -f %D/lib/libnvidia-cfg.so lib/libnvidia-tls.so.1 @exec ln -sf %D/lib/libnvidia-tls.so.1 %D/lib/libnvidia-tls.so @unexec rm -f %D/lib/libnvidia-tls.so lib/libXvMCNVIDIA.a lib/modules/drivers/nvidia_drv.o %%DRVSO%%lib/modules/drivers/nvidia_drv.so lib/modules/extensions/libglx.so.1 @exec ln -sf %D/lib/modules/extensions/libglx.so.1 %D/lib/modules/extensions/libglx.so -@unexec rm -f %D/lib/modules/extensions/libglx.so %%PORTDOCS%%%%DOCSDIR%%/html/appendix-a.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-b.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-c.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-d.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-e.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-f.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-g.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-h.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-i.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-j.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-k.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-l.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-m.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-n.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-o.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-p.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-q.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-r.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-s.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-t.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-u.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-v.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-w.html %%PORTDOCS%%%%DOCSDIR%%/html/appendix-x.html %%PORTDOCS%%%%DOCSDIR%%/html/chapter-01.html %%PORTDOCS%%%%DOCSDIR%%/html/chapter-02.html %%PORTDOCS%%%%DOCSDIR%%/html/chapter-03-section-02.html %%PORTDOCS%%%%DOCSDIR%%/html/chapter-03.html %%PORTDOCS%%%%DOCSDIR%%/html/chapter-04.html %%PORTDOCS%%%%DOCSDIR%%/html/chapter-05.html %%PORTDOCS%%%%DOCSDIR%%/html/chapter-06.html %%PORTDOCS%%%%DOCSDIR%%/html/chapter-07.html %%PORTDOCS%%%%DOCSDIR%%/html/chapter-08.html %%PORTDOCS%%%%DOCSDIR%%/html/chapter-09.html %%PORTDOCS%%%%DOCSDIR%%/html/index.html %%PORTDOCS%%%%DOCSDIR%%/html/part-01.html %%PORTDOCS%%%%DOCSDIR%%/html/part-02.html %%PORTDOCS%%%%DOCSDIR%%/html/part-03.html %%PORTDOCS%%%%DOCSDIR%%/html/preface-01.html %%PORTDOCS%%%%DOCSDIR%%/html/preface-02.html %%PORTDOCS%%@dirrm %%DOCSDIR%%/html %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.Linux %%PORTDOCS%%%%DOCSDIR%%/XF86Config.sample %%PORTDOCS%%%%DOCSDIR%%/license.txt %%PORTDOCS%%%%DOCSDIR%%/gl.h %%PORTDOCS%%%%DOCSDIR%%/glx.h %%PORTDOCS%%%%DOCSDIR%%/glext.h %%PORTDOCS%%%%DOCSDIR%%/glxtokens.h %%DIFFS%%%%PORTDOCS%%%%DOCSDIR%%/agp.ko-hints.diff %%DIFFS%%%%PORTDOCS%%%%DOCSDIR%%/machdep.c.diff %%DIFFS%%%%PORTDOCS%%%%DOCSDIR%%/vm_map.c_4.10.diff %%DIFFS%%%%PORTDOCS%%%%DOCSDIR%%/device_pager.c_4.10.diff %%DIFFS%%%%PORTDOCS%%%%DOCSDIR%%/vm_object.c_5.2.diff %%DIFFS%%%%PORTDOCS%%%%DOCSDIR%%/device_pager.c_5.2.diff %%PORTDOCS%%@dirrm %%DOCSDIR%% %%FREEBSD4%%@cwd /modules %%FREEBSD5%%@cwd /boot/modules nvidia.ko %%FREEBSD5%%@unexec kldxref %D %%FREEBSD4%%@cwd /dev %%FREEBSD4%%MAKEDEV.nvidia %%FREEBSD4%%@exec mknod /dev/nvidia0 c 180 0 %%FREEBSD4%%@exec chmod 0666 /dev/nvidia0 %%FREEBSD4%%@exec mknod /dev/nvidia1 c 180 1 %%FREEBSD4%%@exec chmod 0666 /dev/nvidia1 %%FREEBSD4%%@exec mknod /dev/nvidia2 c 180 2 %%FREEBSD4%%@exec chmod 0666 /dev/nvidia2 %%FREEBSD4%%@exec mknod /dev/nvidia3 c 180 3 %%FREEBSD4%%@exec chmod 0666 /dev/nvidia3 %%FREEBSD4%%@exec mknod /dev/nvidiactl c 180 255 %%FREEBSD4%%@exec chmod 0666 /dev/nvidiactl %%FREEBSD4%%@unexec rm -f /dev/nvidia0 %%FREEBSD4%%@unexec rm -f /dev/nvidia1 %%FREEBSD4%%@unexec rm -f /dev/nvidia2 %%FREEBSD4%%@unexec rm -f /dev/nvidia3 %%FREEBSD4%%@unexec rm -f /dev/nvidiactl %%LINUX%%@cwd %%LINUXBASE%% %%LINUX%%usr/lib/libGL.so.1.0.%%NVVERSION%% %%LINUX%%usr/lib/libGLcore.so.1.0.%%NVVERSION%% %%LINUX%%usr/lib/libnvidia-tls.so.1.0.%%NVVERSION%% %%LINUX%%@exec ln -sf %D/usr/lib/libGL.so.1.0.%%NVVERSION%% %D/usr/lib/libGL.so.1 %%LINUX%%@exec ln -sf %D/usr/lib/libGLcore.so.1.0.%%NVVERSION%% %D/usr/lib/libGLcore.so.1 %%LINUX%%@exec ln -sf %D/usr/lib/libnvidia-tls.so.1.0.%%NVVERSION%% %D/usr/lib/libnvidia-tls.so.1 %%LINUX%%@unexec rm -f %D/usr/lib/libGL.so.1 %%LINUX%%@unexec rm -f %D/usr/lib/libGLcore.so.1 %%LINUX%%@unexec rm -f %D/usr/lib/libnvidia-tls.so.1 Property changes on: head/x11/nvidia-driver/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.11 \ No newline at end of property +1.12 \ No newline at end of property