Update to 8.2.0.

PR:		196092

5 files changed, 24 insertions, 49 deletions

diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
index a6d94d70a662..03c325e6646b 100644
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@@ -2,39 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	mesa-demos
-PORTVERSION=	8.1.0
-PORTREVISION=	3
+PORTVERSION=	8.2.0
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/demos/${PORTVERSION}/
-DISTFILES=	mesa-demos-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	OpenGL demos distributed with Mesa
 
-USES=		gmake pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
-USE_GL=		glu glut glew
-USE_XORG=	glproto x11 xext xi xxf86vm xdamage xfixes dri2proto
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
-
-CONFIGURE_ARGS+=--disable-egl --disable-gles2 --disable-wayland \
-		--disable-gbm --disable-vg --disable-osmesa \
-		--with-system-data-files
-
-DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
-
-OPTIONS_DEFINE=	NVIDIA
-NVIDIA_DESC=	Use NVIDIA's libraries
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \
-		${WRKSRC}/configure
+USES=		gmake pkgconfig tar:bzip2
+USE_GL=		glew glu glut
+USE_XORG=	dri2proto glproto x11 xdamage xext xfixes xi xxf86vm
 
-.include <bsd.port.options.mk>
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if ${PORT_OPTIONS:MNVIDIA}
-CFLAGS+=	-DWITH_NVIDIA_GL=1
-.endif
+CONFIGURE_ARGS+=--disable-egl --disable-gbm --disable-gles2 \
+		--disable-osmesa --disable-vg --disable-wayland \
+		--with-system-data-files
 
 .include <bsd.port.mk>
diff --git a/graphics/mesa-demos/distinfo b/graphics/mesa-demos/distinfo
index b12a2c4de69c..e31d2da45464 100644
--- a/graphics/mesa-demos/distinfo
+++ b/graphics/mesa-demos/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mesa-demos-8.1.0.tar.bz2) = 9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828
-SIZE (mesa-demos-8.1.0.tar.bz2) = 10045237
+SHA256 (mesa-demos-8.2.0.tar.bz2) = e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92
+SIZE (mesa-demos-8.2.0.tar.bz2) = 10071635
diff --git a/graphics/mesa-demos/files/patch-src-glsl-Makefile.in b/graphics/mesa-demos/files/patch-src-glsl-Makefile.in
index ebc0d2b23c1e..2db427ea3e85 100644
--- a/graphics/mesa-demos/files/patch-src-glsl-Makefile.in
+++ b/graphics/mesa-demos/files/patch-src-glsl-Makefile.in
@@ -1,6 +1,6 @@
---- src/glsl/Makefile.in.orig	2013-02-24 12:12:04.000000000 +0100
-+++ src/glsl/Makefile.in	2013-03-08 14:06:19.689158671 +0100
-@@ -75,7 +75,7 @@
+--- src/glsl/Makefile.in.orig	2014-07-05 05:13:28.000000000 -0400
++++ src/glsl/Makefile.in	2015-04-17 16:41:57.556848000 -0400
+@@ -103,7 +103,7 @@
  build_triplet = @build@
  host_triplet = @host@
  @HAVE_GLUT_TRUE@bin_PROGRAMS = array$(EXEEXT) bezier$(EXEEXT) \
@@ -9,7 +9,7 @@
  @HAVE_GLUT_TRUE@	blinking-teapot$(EXEEXT) convolutions$(EXEEXT) \
  @HAVE_GLUT_TRUE@	deriv$(EXEEXT) fragcoord$(EXEEXT) \
  @HAVE_GLUT_TRUE@	fsraytrace$(EXEEXT) \
-@@ -120,9 +120,9 @@
+@@ -149,9 +149,9 @@
  bezier_SOURCES = bezier.c
  bezier_OBJECTS = bezier.$(OBJEXT)
  bezier_DEPENDENCIES = ../util/libutil.la
@@ -22,7 +22,7 @@
  blinking_teapot_SOURCES = blinking-teapot.c
  blinking_teapot_OBJECTS = blinking-teapot.$(OBJEXT)
  blinking_teapot_DEPENDENCIES = ../util/libutil.la
-@@ -460,7 +460,7 @@
+@@ -535,7 +535,7 @@
  samplers_array_SOURCES = samplers.c
  samplers_array_CFLAGS = $(AM_CFLAGS) -DSAMPLERS_ARRAY
  array_LDADD = ../util/libutil.la
@@ -31,16 +31,16 @@
  bezier_LDADD = ../util/libutil.la
  brick_LDADD = ../util/libutil.la
  bump_LDADD = ../util/libutil.la
-@@ -602,9 +602,9 @@
- bezier$(EXEEXT): $(bezier_OBJECTS) $(bezier_DEPENDENCIES) $(EXTRA_bezier_DEPENDENCIES) 
+@@ -684,9 +684,9 @@
  	@rm -f bezier$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(bezier_OBJECTS) $(bezier_LDADD) $(LIBS)
+ 
 -bitmap$(EXEEXT): $(bitmap_OBJECTS) $(bitmap_DEPENDENCIES) $(EXTRA_bitmap_DEPENDENCIES) 
 -	@rm -f bitmap$(EXEEXT)
 -	$(AM_V_CCLD)$(LINK) $(bitmap_OBJECTS) $(bitmap_LDADD) $(LIBS)
 +bitmap_demo$(EXEEXT): $(bitmap_demo_OBJECTS) $(bitmap_demo_DEPENDENCIES) $(EXTRA_bitmap_demo_DEPENDENCIES) 
 +	@rm -f bitmap_demo$(EXEEXT)
 +	$(AM_V_CCLD)$(LINK) $(bitmap_demo_OBJECTS) $(bitmap_demo_LDADD) $(LIBS)
+ 
  blinking-teapot$(EXEEXT): $(blinking_teapot_OBJECTS) $(blinking_teapot_DEPENDENCIES) $(EXTRA_blinking_teapot_DEPENDENCIES) 
  	@rm -f blinking-teapot$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(blinking_teapot_OBJECTS) $(blinking_teapot_LDADD) $(LIBS)
diff --git a/graphics/mesa-demos/files/patch-src-xdemos-glxpixmap.c b/graphics/mesa-demos/files/patch-src-xdemos-glxpixmap.c
deleted file mode 100644
index 4d2220163ebf..000000000000
--- a/graphics/mesa-demos/files/patch-src-xdemos-glxpixmap.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/xdemos/glxpixmap.c.orig	Fri Apr  6 22:29:09 2007
-+++ src/xdemos/glxpixmap.c	Fri Apr  6 22:38:33 2007
-@@ -105,7 +105,7 @@
-     *   to render correctly.  This is because Mesa allows RGB rendering
-     *   into any kind of visual, not just TrueColor or DirectColor.
-     */
--#ifdef GLX_MESA_pixmap_colormap
-+#if defined(GLX_MESA_pixmap_colormap) && !defined(WITH_NVIDIA_GL)
-    if (strstr(glXQueryExtensionsString(dpy, 0), "GLX_MESA_pixmap_colormap")) {
-       /* stand-alone Mesa, specify the colormap */
-       glxpm = glXCreateGLXPixmapMESA( dpy, visinfo, pm, attr.colormap );
diff --git a/graphics/mesa-demos/pkg-plist b/graphics/mesa-demos/pkg-plist
index cd4586b78ac0..3706c1f01339 100644
--- a/graphics/mesa-demos/pkg-plist
+++ b/graphics/mesa-demos/pkg-plist
@@ -86,6 +86,7 @@ bin/glxpixmap
 bin/glxsnoop
 bin/glxswapcontrol
 bin/gs-tri
+bin/gsraytrace
 bin/identity
 bin/ipers
 bin/isosurf
@@ -99,8 +100,8 @@ bin/line-userclip
 bin/line-userclip-clip
 bin/line-userclip-nop
 bin/line-userclip-nop-clip
-bin/line-xor
 bin/line-wide
+bin/line-xor
 bin/lineloop
 bin/lineloop-clip
 bin/lineloop-elts
@@ -233,9 +234,10 @@ bin/tri-logicop-xor
 bin/tri-mask-tri
 bin/tri-multitex-vbo
 bin/tri-orig
-bin/tri-query
 bin/tri-point-line-clipped
+bin/tri-query
 bin/tri-repeat
+bin/tri-rotate
 bin/tri-scissor-tri
 bin/tri-square
 bin/tri-stencil
@@ -280,9 +282,9 @@ bin/vbo-drawarrays-2101010
 bin/vbo-drawelements
 bin/vbo-drawrange
 bin/vbo-noninterleaved
+bin/vbo-tri
 bin/vert-or-frag-only
 bin/vert-tex
-bin/vbo-tri
 bin/vertexrate
 bin/vp-array
 bin/vp-array-hf