mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-21 08:42:23 +00:00
Code Issues Releases Activity

- Make plist substitution knobs named coherently with X system used,

Browse Source 
previously they were somewhat misleading (logic remains the same) [1]
- Take xorg-server-snap into account, previously having it installed
  would break pkg-list logic (libglx.so wasn't backed up/restored
  properly) [2]
- Utilize DOCSDIR macro in pkg-message.in
- Drop currently noop USE_X_PREFIX

Discussed with:	flz [1]
Suggested by:	flz [2]
This commit is contained in:
Alexey Dokuchaev 2007-07-23 15:46:06 +00:00
parent b022baf12a
commit bd0b7743ac
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=196136
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
x11/nvidia-driver/Makefile
View File

@ -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} \

2
x11/nvidia-driver/files/pkg-message.in
View File

@ -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.

10
x11/nvidia-driver/pkg-plist
View File

@ -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