diff options
| author | danfe <danfe@FreeBSD.org> | 2012-09-23 19:48:06 +0800 |
|---|---|---|
| committer | danfe <danfe@FreeBSD.org> | 2012-09-23 19:48:06 +0800 |
| commit | 3891bc8acecdcfe691c34f2c83b5f2853435fd86 (patch) | |
| tree | a3bf6102335132a8b1313f3fe7170e529648ff33 /x11/nvidia-driver | |
| parent | a3802ecc8f1e49b32901e699aabaa5ae944b5cdb (diff) | |
| download | freebsd-ports-gnome-3891bc8acecdcfe691c34f2c83b5f2853435fd86.tar.gz freebsd-ports-gnome-3891bc8acecdcfe691c34f2c83b5f2853435fd86.tar.zst freebsd-ports-gnome-3891bc8acecdcfe691c34f2c83b5f2853435fd86.zip | |
- After conversion to new OPTIONS framework, adjust pkg-message accordingly
- Check for DOCS in PORT_OPTIONS instead of NOPORTDOCS while here
Diffstat (limited to 'x11/nvidia-driver')
| -rw-r--r-- | x11/nvidia-driver/Makefile | 4 | ||||
| -rw-r--r-- | x11/nvidia-driver/files/pkg-message.in | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 4aa1c3500b71..cb82cb3093f6 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -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 diff --git a/x11/nvidia-driver/files/pkg-message.in b/x11/nvidia-driver/files/pkg-message.in index 474cf8717a08..cba37e80e046 100644 --- a/x11/nvidia-driver/files/pkg-message.in +++ b/x11/nvidia-driver/files/pkg-message.in @@ -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" |