Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 14 Sep 2009 14:20:42 +0400
From:      Boris Samorodov <bsam@ipt.ru>
To:        mva@FreeBSD.org, sean-freebsd@farley.org, acm@FreeBSD.org, hernan.di.pietro@gmail.com
Cc:        freebsd-emulation@FreeBSD.org
Subject:   changes in linux ports infrastructure
Message-ID:  <80173957@bb.ipt.ru>

next in thread | raw e-mail | index | archive | help
Dear linux ports maintainers,

I've just committed a new graphics/linux-f10-libGLU port and
apropriate changes to linux ports infrastructure. I'm going
to commit the following patch which uses the new port and
its infrastructure.

The main goal is to give users of linux nvidia drivers to
use more recent libGLU packages.

Those changes do not touch default packages but imho it will
be good to commit the patch before 8.0-RELEASE. Please, give
it a try and submit a followup. Thanks!

-----
Index: games/linux-coldwar-demo/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/linux-coldwar-demo/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- games/linux-coldwar-demo/Makefile	7 Jun 2009 15:23:52 -0000	1.4
+++ games/linux-coldwar-demo/Makefile	14 Sep 2009 09:42:24 -0000
@@ -31,8 +31,8 @@
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_NVIDIA)
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
-		${LINUXBASE}/usr/X11R6/lib/libGLU.so.1:${PORTSDIR}/graphics/linux-libGLU
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+USE_LINUX_APPS+=libglu
 .else
 USE_LINUX_APPS+=dri
 .endif
Index: games/linux-darwinia-demo/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/linux-darwinia-demo/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- games/linux-darwinia-demo/Makefile	7 Jun 2009 15:23:52 -0000	1.5
+++ games/linux-darwinia-demo/Makefile	14 Sep 2009 09:42:24 -0000
@@ -31,8 +31,8 @@
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_NVIDIA)
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
-		${LINUXBASE}/usr/X11R6/lib/libGLU.so.1:${PORTSDIR}/graphics/linux-libGLU
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+USE_LINUX_APPS+=libglu
 .else
 USE_LINUX_APPS+=dri
 .endif
Index: games/linux-defcon/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/linux-defcon/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- games/linux-defcon/Makefile	7 Jun 2009 15:23:52 -0000	1.4
+++ games/linux-defcon/Makefile	14 Sep 2009 09:42:24 -0000
@@ -29,8 +29,8 @@
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_NVIDIA)
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
-		${LINUXBASE}/usr/X11R6/lib/libGLU.so.1:${PORTSDIR}/graphics/linux-libGLU
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+USE_LINUX_APPS+=libglu
 .else
 USE_LINUX_APPS+=dri
 .endif
Index: games/linux-gorky17-demo/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/linux-gorky17-demo/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- games/linux-gorky17-demo/Makefile	7 Jun 2009 15:23:53 -0000	1.4
+++ games/linux-gorky17-demo/Makefile	14 Sep 2009 09:42:24 -0000
@@ -32,8 +32,8 @@
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_NVIDIA)
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
-		${LINUXBASE}/usr/X11R6/lib/libGLU.so.1:${PORTSDIR}/graphics/linux-libGLU
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+USE_LINUX_APPS+=libglu
 .else
 USE_LINUX_APPS+=dri
 .endif
Index: games/linux-nwnclient/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/linux-nwnclient/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- games/linux-nwnclient/Makefile	7 Jun 2009 15:23:53 -0000	1.18
+++ games/linux-nwnclient/Makefile	14 Sep 2009 09:42:24 -0000
@@ -20,8 +20,8 @@
 RUN_DEPENDS=	${LOCALBASE}/share/nwndata/NWNv129.txt:${PORTSDIR}/games/nwndata
 
 .ifdef WITH_NVIDIA_GL
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
-		${LINUXBASE}/usr/X11R6/lib/libGLU.so.1:${PORTSDIR}/graphics/linux-libGLU
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+USE_LINUX_APPS+=libglu
 .else
 USE_LINUX_APPS+=dri
 .endif
Index: games/linux-savage/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/linux-savage/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- games/linux-savage/Makefile	7 Jun 2009 15:23:53 -0000	1.9
+++ games/linux-savage/Makefile	14 Sep 2009 09:42:24 -0000
@@ -40,8 +40,8 @@
 
 .if defined(WITH_NVIDIA_GL)
 .	if !exists(${LINUXBASE}/usr/X11R6/lib/libGL.so.1)
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
-		${LINUXBASE}/usr/X11R6/lib/libGLU.so.1:${PORTSDIR}/graphics/linux-libGLU
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+USE_LINUX_APPS+=libglu
 .	endif
 .else
 USE_LINUX_APPS+=dri
Index: games/linux-savage-samuraiwars/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/linux-savage-samuraiwars/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- games/linux-savage-samuraiwars/Makefile	7 Jun 2009 15:23:53 -0000	1.3
+++ games/linux-savage-samuraiwars/Makefile	14 Sep 2009 09:42:24 -0000
@@ -39,8 +39,8 @@
 
 .if defined(WITH_NVIDIA_GL)
 .	if !exists(${LINUXBASE}/usr/X11R6/lib/libGL.so.1)
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
-		${LINUXBASE}/usr/X11R6/lib/libGLU.so.1:${PORTSDIR}/graphics/linux-libGLU
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+USE_LINUX_APPS+=libglu
 .	endif
 .else
 USE_LINUX_APPS+=dri
Index: games/linux-uplink-demo/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/linux-uplink-demo/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- games/linux-uplink-demo/Makefile	7 Jun 2009 15:23:54 -0000	1.5
+++ games/linux-uplink-demo/Makefile	14 Sep 2009 09:42:24 -0000
@@ -34,8 +34,8 @@
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_NVIDIA)
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
-		${LINUXBASE}/usr/X11R6/lib/libGLU.so.1:${PORTSDIR}/graphics/linux-libGLU
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+USE_LINUX_APPS+=libglu
 .else
 USE_LINUX_APPS+=dri
 .endif
Index: graphics/linux-ac3d/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/linux-ac3d/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- graphics/linux-ac3d/Makefile	7 Jun 2009 15:23:54 -0000	1.25
+++ graphics/linux-ac3d/Makefile	14 Sep 2009 09:42:24 -0000
@@ -19,8 +19,8 @@
 COMMENT=	Easy to use and powerful 3D graphics modeller (trial version)
 
 .ifdef(WITH_NVIDIA_GL)
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
-		${LINUXBASE}/usr/X11R6/lib/libGLU.so.1:${PORTSDIR}/graphics/linux-libGLU
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+USE_LINUX_APPS+=libglu
 .else
 USE_LINUX_APPS+=dri
 .endif

-----

-- 
WBR, Boris Samorodov (bsam)
Research Engineer, http://www.ipt.ru Telephone & Internet SP
FreeBSD Committer, http://www.FreeBSD.org The Power To Serve



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?80173957>