Date: Sun, 23 Sep 2012 11:48:06 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r304733 - in head/x11/nvidia-driver: . files Message-ID: <201209231148.q8NBm6IM089214@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Sun Sep 23 11:48:06 2012 New Revision: 304733 URL: http://svn.freebsd.org/changeset/ports/304733 Log: - After conversion to new OPTIONS framework, adjust pkg-message accordingly - Check for DOCS in PORT_OPTIONS instead of NOPORTDOCS while here Modified: head/x11/nvidia-driver/Makefile head/x11/nvidia-driver/files/pkg-message.in Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Sun Sep 23 10:49:45 2012 (r304732) +++ head/x11/nvidia-driver/Makefile Sun Sep 23 11:48:06 2012 (r304733) @@ -146,7 +146,7 @@ post-patch: .SILENT s/name libvdpau/&_nvidia/' ${WRKSRC}/lib/Makefile .endif # Do not build any binaries (native nvidia-settings and nvidia-xconfig are -# provided by corresponding ports) and manuals +# provided by corresponding ports) and manual pages .if ${NVVERSION} < 974600 || ${NVVERSION} >= 1952200 ${REINPLACE_CMD} -E 's/(extension).*/\1/' ${WRKSRC}/x11/Makefile .else @@ -154,7 +154,7 @@ post-patch: .SILENT .endif ${REINPLACE_CMD} -e '/bin/d ; /man/d' ${WRKSRC}/x11/Makefile # Conditionally install documentation (but you generally want it) -.if defined(NOPORTDOCS) +.if ! ${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -E 's/(x11).*/\1/ ; /doc/d' ${WRKSRC}/Makefile .endif # Adjust installation paths of some conflicting files (shared also between Modified: head/x11/nvidia-driver/files/pkg-message.in ============================================================================== --- head/x11/nvidia-driver/files/pkg-message.in Sun Sep 23 10:49:45 2012 (r304732) +++ head/x11/nvidia-driver/files/pkg-message.in Sun Sep 23 11:48:06 2012 (r304733) @@ -9,15 +9,15 @@ or adding to your /boot/loader.conf. -If you build this port with WITH_FREEBSD_AGP=yes, make sure you have +If you build this port with FreeBSD AGP GART driver, make sure you have agp.ko kernel module installed and loaded, since nvidia.ko will depend -on it, or have your kernel compiled with "device agp". Otherwise the -NVidia kernel module will not load. Also, care to specify correct +on it, or have your kernel compiled with "device agp". Otherwise, the +NVidia kernel module will not load. Also, please set correct value for ``Option "NvAGP"'' in ``Device'' section of your X11 configuration file. -When building with Linux compatibility (WITH_LINUX=yes), make sure -linux.ko is available as well (or have it compiled in kernel). It can -be loaded via /boot/loader.conf, or later in boot process if you add +When building with Linux compatibility support, make sure that linux.ko +module is available as well (or have it compiled in kernel). It can be +loaded via /boot/loader.conf, or later in the boot process if you add linux_enable="YES"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209231148.q8NBm6IM089214>