aboutsummaryrefslogtreecommitdiff
path: root/x11/nvidia-driver
diff options
context:
space:
mode:
authorAlexey Dokuchaev <danfe@FreeBSD.org>2007-07-23 15:46:06 +0000
committerAlexey Dokuchaev <danfe@FreeBSD.org>2007-07-23 15:46:06 +0000
commitbd0b7743ac8e81a10f9d68de7dbdee41ecb0a34c (patch)
tree98f1e51e574d113aab2b315245d42726c2da057f /x11/nvidia-driver
parentb022baf12a544f084caf7aa7c9967a5cad4c0d05 (diff)
downloadports-bd0b7743ac8e81a10f9d68de7dbdee41ecb0a34c.tar.gz
ports-bd0b7743ac8e81a10f9d68de7dbdee41ecb0a34c.zip
Notes
Diffstat (limited to 'x11/nvidia-driver')
-rw-r--r--x11/nvidia-driver/Makefile11
-rw-r--r--x11/nvidia-driver/files/pkg-message.in2
-rw-r--r--x11/nvidia-driver/pkg-plist10
3 files changed, 11 insertions, 12 deletions
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 61743a75b80e..4d6ba8e3c439 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -18,7 +18,6 @@ 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
USE_GL= gl
INSTALLS_SHLIB= yes
@@ -54,17 +53,17 @@ EXTRA_PATCHES+= ${FILESDIR}/7667-* \
.if ${X_WINDOW_SYSTEM} == "xorg"
MODULESDIR= lib/xorg/modules
-XORG_SUB= "@comment "
-XFREE86_SUB= ""
-.else
-MODULESDIR= lib/modules
XORG_SUB= ""
XFREE86_SUB= "@comment "
+.else
+MODULESDIR= lib/modules
+XORG_SUB= "@comment "
+XFREE86_SUB= ""
.endif
# 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
+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- || /usr/sbin/pkg_info -qO x11-servers/xorg-server-snap
XLIBVERSION!= /usr/sbin/pkg_info -O x11/XFree86-4-libraries 2>/dev/null | ${GREP} libraries- || /usr/sbin/pkg_info -O graphics/libGL 2>/dev/null | ${GREP} libGL- || true
PLIST_SUB+= XSERVVERSION=${XSERVVERSION} XLIBVERSION=${XLIBVERSION} \
diff --git a/x11/nvidia-driver/files/pkg-message.in b/x11/nvidia-driver/files/pkg-message.in
index 4f0cbca2fa94..db3d7205ac99 100644
--- a/x11/nvidia-driver/files/pkg-message.in
+++ b/x11/nvidia-driver/files/pkg-message.in
@@ -30,5 +30,5 @@ If X.org cannot start and reports
in /var/log/Xorg.0.log while actually you have ``options SYSVSHM''
enabled in kernel, the sysctl ``kern.ipc.shmall'' should be increased.
-See %%PREFIX%%/share/doc/NVIDIA_GLX-1.0/README for more information.
+See %%DOCSDIR%%/README for more information.
diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
index edde5179f945..50b07eb37b2e 100644
--- a/x11/nvidia-driver/pkg-plist
+++ b/x11/nvidia-driver/pkg-plist
@@ -5,15 +5,15 @@
@comment lib/XXX-libGL.a.%%XLIBVERSION%%
@comment lib/XXX-libGL.so.1.%%XLIBVERSION%%
@comment They are however restored when this package is removed:
-%%XFREE86%%@exec mv -f %D/%%MODULESDIR%%/extensions/libglx.la %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%%
-%%XFREE86%%@unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libglx.la
+%%XORG%%@exec mv -f %D/%%MODULESDIR%%/extensions/libglx.la %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%%
+%%XORG%%@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
-%%XFREE86%%@exec mv -f %D/%%MODULESDIR%%/extensions/libGLcore.la %D/%%MODULESDIR%%/extensions/XXX-libGLcore.la.%%%%.%%XSERVVERSION%%
-%%XFREE86%%@unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libGLcore.la.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libGLcore.la
+%%XORG%%@exec mv -f %D/%%MODULESDIR%%/extensions/libGLcore.la %D/%%MODULESDIR%%/extensions/XXX-libGLcore.la.%%%%.%%XSERVVERSION%%
+%%XORG%%@unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libGLcore.la.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libGLcore.la
@exec mv -f %D/%%MODULESDIR%%/extensions/libGLcore.so %D/%%MODULESDIR%%/extensions/XXX-libGLcore.so.%%%%.%%XSERVVERSION%%
@unexec mv -f %D/%%MODULESDIR%%/extensions/XXX-libGLcore.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/extensions/libGLcore.so
-%%XORG%%@unexec mv -f %D/lib/XXX-libGL.a.%%%%.%%XLIBVERSION%% %D/lib/libGL.a
+%%XFREE86%%@unexec mv -f %D/lib/XXX-libGL.a.%%%%.%%XLIBVERSION%% %D/lib/libGL.a
@exec mv -f %D/lib/libGL.so.1 %D/lib/XXX-libGL.so.1.%%%%.%%XLIBVERSION%%
lib/libGL.so.1
@unexec mv -f %D/lib/XXX-libGL.so.1.%%%%.%%XLIBVERSION%% %D/lib/libGL.so.1