summaryrefslogtreecommitdiff
path: root/x11/nvidia-driver
diff options
context:
space:
mode:
authorAlexey Dokuchaev <danfe@FreeBSD.org>2006-05-29 13:39:09 +0000
committerAlexey Dokuchaev <danfe@FreeBSD.org>2006-05-29 13:39:09 +0000
commited6dd533f5f8daefddd0b1d175b4b8909233ffee (patch)
treecd91938e5ede9d578d31bdef7575535744cc84dc /x11/nvidia-driver
parent- Update to 2.6 (diff)
- Remove unneeded PKGMESSAGE override (SUB_FILEs does it automatically)
- Add a dependency to the native xorg-libraries when the LINUX option is enabled (it causes USE_XLIB to depend on Linux libraries instead of the native ones). This should aid in updating process. PR: ports/96883 Submitted by: alepulver
Notes
Notes: svn path=/head/; revision=163842
Diffstat (limited to 'x11/nvidia-driver')
-rw-r--r--x11/nvidia-driver/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 18a5c30b7e4f..b3bdf16efbd0 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -23,7 +23,6 @@ USE_X_PREFIX= yes
NO_PACKAGE= should be recompiled for a particular FreeBSD kernel
INSTALLS_SHLIB= yes
SUB_FILES+= pkg-message
-PKGMESSAGE= ${WRKDIR}/pkg-message
DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0
OPTIONS= FREEBSD_AGP "Use FreeBSD AGP GART driver" off \
@@ -103,8 +102,10 @@ 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
-USE_XLIB= yes
PLIST_SUB+= LINUX=""
.else
PLIST_SUB+= LINUX="@comment "