Date: Sat, 6 May 2006 14:26:50 -0300 From: "Alejandro Pulver" <alepulver@FreeBSD.org> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/96883: [UPDATE] x11/nvidia-driver: depend on native xorg-libraries when USE_LINUX Message-ID: <1146936410.9579@phobos.mars.bsd> Resent-Message-ID: <200605061730.k46HUJDE085368@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 96883
>Category: ports
>Synopsis: [UPDATE] x11/nvidia-driver: depend on native xorg-libraries when USE_LINUX
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat May 06 17:30:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Alejandro Pulver
>Release: FreeBSD 6.0-RELEASE-p6 i386
>Organization:
>Environment:
System: FreeBSD 6.0-RELEASE-p6 #0: Tue Apr 4 22:29:05 ART 2006
ale@phobos.mars.bsd:/usr/src/sys/i386/compile/ATHLON-PHOBOS
>Description:
- 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 will make updating easier.
>How-To-Repeat:
>Fix:
--- nvidia-driver.diff begins here ---
Index: x11/nvidia-driver/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/nvidia-driver/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- x11/nvidia-driver/Makefile 20 Mar 2006 16:08:46 -0000 1.44
+++ x11/nvidia-driver/Makefile 6 May 2006 17:16:44 -0000
@@ -23,7 +23,6 @@
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 @@
LINUXBASE=${LINUXBASE} NVVERSION=${NVVERSION}
.if !defined(WITHOUT_LINUX)
+# Manually add xorg-libraries dependency since USE_LINUX causes the port to
+# depend on the Linux xorg-libraries rather than the native ones.
+LIB_DEPENDS+= X11.6:${X_LIBRARIES_PORT}
USE_LINUX= yes
-USE_XLIB= yes
PLIST_SUB+= LINUX=""
.else
PLIST_SUB+= LINUX="@comment "
--- nvidia-driver.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1146936410.9579>