diff options
| author | danfe <danfe@FreeBSD.org> | 2008-03-20 14:59:15 +0000 |
|---|---|---|
| committer | danfe <danfe@FreeBSD.org> | 2008-03-20 14:59:15 +0000 |
| commit | ed41f01c30b3a90cf0d1f25e42d9cf8909e114fc (patch) | |
| tree | 5d12d5edef0c6df63d9e9de59d44a50700c1d043 /x11 | |
| parent | b5c57b62c2eff5efa564be5b9786e7d12234c068 (diff) | |
| download | FreeBSD-ports-ed41f01c30b3a90cf0d1f25e42d9cf8909e114fc.zip FreeBSD-ports-ed41f01c30b3a90cf0d1f25e42d9cf8909e114fc.tar.gz | |
GC remnants of XFree86 support.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/nvidia-driver/Makefile | 7 | ||||
| -rw-r--r-- | x11/nvidia-driver/pkg-plist | 13 |
2 files changed, 8 insertions, 12 deletions
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index d0ff6de..fdd8a52 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -23,6 +23,7 @@ USE_GL= gl USE_LDCONFIG= yes SUB_FILES+= pkg-message DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0 +MODULESDIR= lib/xorg/modules PORTDOCS= * OPTIONS= FREEBSD_AGP "Use FreeBSD AGP GART driver" off \ @@ -44,10 +45,6 @@ NVVERSION?= ${DISTVERSION:S/.//g}00 .include <bsd.port.pre.mk> -MODULESDIR= lib/xorg/modules -XORG_SUB= "" -XFREE86_SUB= "@comment " - # 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- || /usr/sbin/pkg_info -qO x11-servers/xorg-server-snap 2>/dev/null || true @@ -59,7 +56,7 @@ IGNORE= needs an X server implementation installed PLIST_SUB+= XSERVVERSION=${XSERVVERSION} XLIBVERSION=${XLIBVERSION} \ LINUXBASE=${LINUXBASE} SHLIB_VERSION=${PORTVERSION} \ - MODULESDIR=${MODULESDIR} XORG=${XORG_SUB} XFREE86=${XFREE86_SUB} + MODULESDIR=${MODULESDIR} .if !defined(WITHOUT_LINUX) # Add explicit X11 libraries dependency since USE_LINUX causes the port to diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist index 28afdf3..cf0340e 100644 --- a/x11/nvidia-driver/pkg-plist +++ b/x11/nvidia-driver/pkg-plist @@ -6,15 +6,14 @@ @comment lib/XXX-libGL.a.%%%%.%%XLIBVERSION%% @comment lib/XXX-libGL.so.1.%%%%.%%XLIBVERSION%% @comment They are however restored when this package is removed: -%%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.la %D/%%MODULESDIR%%/extensions/XXX-libglx.la.%%%%.%%XSERVVERSION%% +@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 -%%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.la %D/%%MODULESDIR%%/extensions/XXX-libGLcore.la.%%%%.%%XSERVVERSION%% +@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 -%%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 @@ -36,8 +35,8 @@ lib/libnvidia-tls.so.1 @unexec rm -f %D/lib/libnvidia-tls.so lib/libXvMCNVIDIA.a %%MODULESDIR%%/libnvidia-wfb.so.1 -%%XORG%%@exec mv -f %D/%%MODULESDIR%%/libwfb.so %D/%%MODULESDIR%%/XXX-libwfb.so.%%%%.%%XSERVVERSION%% && ln -sf libnvidia-wfb.so.1 %D/%%MODULESDIR%%/libwfb.so -%%XORG%%@unexec mv -f %D/%%MODULESDIR%%/XXX-libwfb.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/libwfb.so +@exec mv -f %D/%%MODULESDIR%%/libwfb.so %D/%%MODULESDIR%%/XXX-libwfb.so.%%%%.%%XSERVVERSION%% && ln -sf libnvidia-wfb.so.1 %D/%%MODULESDIR%%/libwfb.so +@unexec mv -f %D/%%MODULESDIR%%/XXX-libwfb.so.%%%%.%%XSERVVERSION%% %D/%%MODULESDIR%%/libwfb.so %%MODULESDIR%%/drivers/nvidia_drv.o %%MODULESDIR%%/drivers/nvidia_drv.so %%MODULESDIR%%/extensions/libglx.so.1 |
