svn commit: r322233 - head/Mk

[Rene Ladan]

Author: rene
Date: Wed Jul  3 15:32:01 2013
New Revision: 322233
URL: http://svnweb.freebsd.org/changeset/ports/322233

Log:
  Switch the default Linux DRI port to linux-f10-dri and remove support
  for the unused USE_GL=linux (this avoids hardcoding the Linux DRI port).
  
  PR:		ports/180231
  Submitted by:	myself
  Approved by:	portmgr (bapt)

Modified:
  head/Mk/bsd.linux-apps.mk
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.linux-apps.mk
==============================================================================
--- head/Mk/bsd.linux-apps.mk	Wed Jul  3 15:12:04 2013	(r322232)
+++ head/Mk/bsd.linux-apps.mk	Wed Jul  3 15:32:01 2013	(r322233)
@@ -141,7 +141,7 @@ dbuslibs_PORT=		${PORTSDIR}/devel/linux$
 
 dri_f10_FILE=		${LINUXBASE}/usr/lib/libGL.so.1.2
 dri_DETECT=		${dri${LINUX_DIST_SUFFIX:S/-/_/}_FILE}
-dri_PORT=		${PORTSDIR}/graphics/linux-dri74
+dri_PORT=		${PORTSDIR}/graphics/linux${LINUX_DIST_SUFFIX}-dri
 dri_DEPENDS=		xorglibs
 
 esound_f10_FILE=	${LINUXBASE}/usr/lib/libesd.so.0.2.39

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Wed Jul  3 15:12:04 2013	(r322232)
+++ head/Mk/bsd.port.mk	Wed Jul  3 15:32:01 2013	(r322233)
@@ -352,7 +352,7 @@ FreeBSD_MAINTAINER=	portmgr at FreeBSD.org
 #				  MAKE_ENV are extended with a DISPLAY variable.
 #
 # USE_GL		- A list of Mesa or GL related dependencies needed by the port.
-#				  Supported components are: glut, glu, glw, gl and linux.
+#				  Supported components are: glut, glu, glw, and gl.
 #				  If set to "yes", this is equivalent to "glu". Note that
 #				  glew and glut depend on glu, glw and glu depend on gl.
 # USE_MOTIF		- If set, this port uses a Motif toolkit. Implies USE_XORG+= xpm
@@ -1933,7 +1933,6 @@ _GL_glu_LIB_DEPENDS=		GLU.1:${PORTSDIR}/
 _GL_glu_USE_XORG=		glproto dri2proto
 _GL_glw_LIB_DEPENDS=		GLw.1:${PORTSDIR}/graphics/libGLw
 _GL_glut_LIB_DEPENDS=		glut.12:${PORTSDIR}/graphics/freeglut
-_GL_linux_RUN_DEPENDS=		${LINUXBASE}/usr/lib/libGL.so.1.2:${PORTSDIR}/graphics/linux-dri74
 
 .if defined(USE_GL)
 . if ${USE_GL:L} == "yes"