Index: graphics/libGL/bsd.mesalib.mk
===================================================================
RCS file: /home/ncvs/ports/graphics/libGL/bsd.mesalib.mk,v
retrieving revision 1.15
diff -u -r1.15 bsd.mesalib.mk
--- graphics/libGL/bsd.mesalib.mk	22 Aug 2009 00:22:54 -0000	1.15
+++ graphics/libGL/bsd.mesalib.mk	22 Dec 2009 05:50:15 -0000
@@ -17,8 +17,9 @@
 # $FreeBSD: ports/graphics/libGL/bsd.mesalib.mk,v 1.15 2009/08/22 00:22:54 amdmi3 Exp $
 #
 
-MESAVERSION=	7.4.4
+MESAVERSION=	7.6.1
 MASTER_SITES?=	SF/mesa3d/MesaLib/${PORTVERSION}:mesa \
+		ftp://freedesktop.org/pub/mesa/${PORTVERSION}/:mesa,glut,demos \
 		ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/:mesa,glut,demos
 MASTER_SITE_SUBDIR=	mesa3d
 DISTFILES=	MesaLib-${MESAVERSION}${EXTRACT_SUFX}:mesa
Index: graphics/libGL/distinfo
===================================================================
RCS file: /home/ncvs/ports/graphics/libGL/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- graphics/libGL/distinfo	24 Jun 2009 01:15:06 -0000	1.11
+++ graphics/libGL/distinfo	22 Dec 2009 05:50:15 -0000
@@ -1,3 +1,3 @@
-MD5 (MesaLib-7.4.4.tar.bz2) = b66528d314c574dccbe0ed963cac5e93
-SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
-SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
+MD5 (MesaLib-7.6.1.tar.bz2) = 7db4617e9e10ad3aca1b64339fd71b7d
+SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
+SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
Index: graphics/libGL/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/graphics/libGL/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- graphics/libGL/pkg-plist	25 Jan 2009 02:00:47 -0000	1.3
+++ graphics/libGL/pkg-plist	22 Dec 2009 05:50:15 -0000
@@ -12,6 +12,7 @@
 include/GL/osmesa.h
 include/GL/svgamesa.h
 include/GL/vms_x_fix.h
+include/GL/wglext.h
 include/GL/wmesa.h
 lib/libGL.so
 lib/libGL.so.1
Index: graphics/libGL/files/patch-configure
===================================================================
RCS file: graphics/libGL/files/patch-configure
diff -N graphics/libGL/files/patch-configure
--- graphics/libGL/files/patch-configure	10 Apr 2009 18:00:47 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- configure.orig	2009-03-28 00:59:46.000000000 +0000
-+++ configure	2009-04-05 11:53:44.000000000 +0000
-@@ -5739,7 +5739,7 @@
-     ;;
- *freebsd* | dragonfly*)
-     case "$host_cpu" in
--    i*86|x86_64) default_driver="dri";;
-+    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
-     esac
-     ;;
- esac
Index: graphics/libGLU/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/libGLU/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- graphics/libGLU/Makefile	20 Jun 2009 16:05:15 -0000	1.11
+++ graphics/libGLU/Makefile	22 Dec 2009 05:50:15 -0000
@@ -16,8 +16,8 @@
 
 do-install:
 	cd ${WRKSRC}/src/glu; ${GMAKE} install
+	@ ${MKDIR} ${PREFIX}/include/GL/
 	${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/
-	cd ${WRKSRC}/src/glu; ${GMAKE} install
 
 .include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 .include <bsd.port.mk>
Index: graphics/libGLU/distinfo
===================================================================
RCS file: /home/ncvs/ports/graphics/libGLU/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- graphics/libGLU/distinfo	24 Jun 2009 01:15:06 -0000	1.14
+++ graphics/libGLU/distinfo	22 Dec 2009 05:50:15 -0000
@@ -1,3 +1,3 @@
-MD5 (MesaLib-7.4.4.tar.bz2) = b66528d314c574dccbe0ed963cac5e93
-SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
-SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
+MD5 (MesaLib-7.6.1.tar.bz2) = 7db4617e9e10ad3aca1b64339fd71b7d
+SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
+SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
Index: graphics/libGLU/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/graphics/libGLU/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- graphics/libGLU/pkg-plist	23 Jan 2009 16:27:37 -0000	1.3
+++ graphics/libGLU/pkg-plist	22 Dec 2009 05:50:15 -0000
@@ -3,3 +3,4 @@
 lib/libGLU.so
 lib/libGLU.so.1
 libdata/pkgconfig/glu.pc
+@dirrmtry include/GL
Index: graphics/libGLU/files/patch-configure
===================================================================
RCS file: graphics/libGLU/files/patch-configure
diff -N graphics/libGLU/files/patch-configure
--- graphics/libGLU/files/patch-configure	10 Apr 2009 18:00:48 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- configure.orig	2009-03-28 00:59:46.000000000 +0000
-+++ configure	2009-04-05 11:53:44.000000000 +0000
-@@ -5739,7 +5739,7 @@
-     ;;
- *freebsd* | dragonfly*)
-     case "$host_cpu" in
--    i*86|x86_64) default_driver="dri";;
-+    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
-     esac
-     ;;
- esac
Index: graphics/libGLw/distinfo
===================================================================
RCS file: /home/ncvs/ports/graphics/libGLw/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- graphics/libGLw/distinfo	24 Jun 2009 01:15:06 -0000	1.10
+++ graphics/libGLw/distinfo	22 Dec 2009 05:50:15 -0000
@@ -1,3 +1,3 @@
-MD5 (MesaLib-7.4.4.tar.bz2) = b66528d314c574dccbe0ed963cac5e93
-SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
-SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
+MD5 (MesaLib-7.6.1.tar.bz2) = 7db4617e9e10ad3aca1b64339fd71b7d
+SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
+SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
Index: graphics/libGLw/files/patch-configure
===================================================================
RCS file: graphics/libGLw/files/patch-configure
diff -N graphics/libGLw/files/patch-configure
--- graphics/libGLw/files/patch-configure	10 Apr 2009 18:00:48 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- configure.orig	2009-03-28 00:59:46.000000000 +0000
-+++ configure	2009-04-05 11:53:44.000000000 +0000
-@@ -5739,7 +5739,7 @@
-     ;;
- *freebsd* | dragonfly*)
-     case "$host_cpu" in
--    i*86|x86_64) default_driver="dri";;
-+    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
-     esac
-     ;;
- esac
Index: graphics/libglut/distinfo
===================================================================
RCS file: /home/ncvs/ports/graphics/libglut/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- graphics/libglut/distinfo	24 Jun 2009 01:15:06 -0000	1.19
+++ graphics/libglut/distinfo	22 Dec 2009 05:50:15 -0000
@@ -1,6 +1,6 @@
-MD5 (MesaLib-7.4.4.tar.bz2) = b66528d314c574dccbe0ed963cac5e93
-SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
-SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
-MD5 (MesaGLUT-7.4.4.tar.bz2) = e14bbb52517e8121b31f1387515365ab
-SHA256 (MesaGLUT-7.4.4.tar.bz2) = 66c9486d73061ffd8d17a05b6e62851fec575867a99ad8cfc6137c2c16848c2e
-SIZE (MesaGLUT-7.4.4.tar.bz2) = 328900
+MD5 (MesaLib-7.6.1.tar.bz2) = 7db4617e9e10ad3aca1b64339fd71b7d
+SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
+SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
+MD5 (MesaGLUT-7.6.1.tar.bz2) = ca9aecb91f05b1da9fd7d5eeb19d47d7
+SHA256 (MesaGLUT-7.6.1.tar.bz2) = c828f572a4e5c521e87ef265c5d2f1f02ba99ea2307e6323aa8165b152e4eb9d
+SIZE (MesaGLUT-7.6.1.tar.bz2) = 321756
Index: graphics/libglut/files/patch-configure
===================================================================
RCS file: graphics/libglut/files/patch-configure
diff -N graphics/libglut/files/patch-configure
--- graphics/libglut/files/patch-configure	10 Apr 2009 18:00:48 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- configure.orig	2009-03-28 00:59:46.000000000 +0000
-+++ configure	2009-04-05 11:53:44.000000000 +0000
-@@ -5739,7 +5739,7 @@
-     ;;
- *freebsd* | dragonfly*)
-     case "$host_cpu" in
--    i*86|x86_64) default_driver="dri";;
-+    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
-     esac
-     ;;
- esac
Index: graphics/dri/distinfo
===================================================================
RCS file: /home/ncvs/ports/graphics/dri/distinfo,v
retrieving revision 1.17
diff -u -r1.17 distinfo
--- graphics/dri/distinfo	24 Jun 2009 01:15:07 -0000	1.17
+++ graphics/dri/distinfo	22 Dec 2009 05:50:15 -0000
@@ -1,3 +1,3 @@
-MD5 (MesaLib-7.4.4.tar.bz2) = b66528d314c574dccbe0ed963cac5e93
-SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
-SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
+MD5 (MesaLib-7.6.1.tar.bz2) = 7db4617e9e10ad3aca1b64339fd71b7d
+SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
+SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
Index: graphics/dri/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/graphics/dri/pkg-plist,v
retrieving revision 1.11
diff -u -r1.11 pkg-plist
--- graphics/dri/pkg-plist	24 Jan 2009 18:13:00 -0000	1.11
+++ graphics/dri/pkg-plist	22 Dec 2009 05:50:15 -0000
@@ -7,6 +7,7 @@
 lib/dri/r128_dri.so
 lib/dri/r200_dri.so
 lib/dri/r300_dri.so
+lib/dri/r600_dri.so
 lib/dri/radeon_dri.so
 lib/dri/savage_dri.so
 lib/dri/sis_dri.so
Index: graphics/dri/files/patch-configure
===================================================================
RCS file: graphics/dri/files/patch-configure
diff -N graphics/dri/files/patch-configure
--- graphics/dri/files/patch-configure	10 Apr 2009 18:00:47 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- configure.orig	2009-03-28 00:59:46.000000000 +0000
-+++ configure	2009-04-05 11:53:44.000000000 +0000
-@@ -5739,7 +5739,7 @@
-     ;;
- *freebsd* | dragonfly*)
-     case "$host_cpu" in
--    i*86|x86_64) default_driver="dri";;
-+    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
-     esac
-     ;;
- esac
Index: graphics/mesa-demos/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/mesa-demos/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- graphics/mesa-demos/Makefile	26 Nov 2009 00:44:57 -0000	1.27
+++ graphics/mesa-demos/Makefile	22 Dec 2009 05:50:15 -0000
@@ -10,7 +10,7 @@
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	mesa-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	x11@FreeBSD.org
 COMMENT=	OpenGL demos distributed with Mesa
 
 USE_GL=		glu glut
Index: graphics/mesa-demos/distinfo
===================================================================
RCS file: /home/ncvs/ports/graphics/mesa-demos/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- graphics/mesa-demos/distinfo	24 Jun 2009 01:15:07 -0000	1.21
+++ graphics/mesa-demos/distinfo	22 Dec 2009 05:50:15 -0000
@@ -1,6 +1,6 @@
-MD5 (MesaLib-7.4.4.tar.bz2) = b66528d314c574dccbe0ed963cac5e93
-SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
-SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
-MD5 (MesaDemos-7.4.4.tar.bz2) = 628142ec9a54cd28cc027e6ce26cff47
-SHA256 (MesaDemos-7.4.4.tar.bz2) = 2b055f1b364795caec122092dedca9ac3ecce4fcf61947f52a286a681e9d1111
-SIZE (MesaDemos-7.4.4.tar.bz2) = 1367659
+MD5 (MesaLib-7.6.1.tar.bz2) = 7db4617e9e10ad3aca1b64339fd71b7d
+SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
+SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
+MD5 (MesaDemos-7.6.1.tar.bz2) = a4226f06732a02556fcf6be290b86dff
+SHA256 (MesaDemos-7.6.1.tar.bz2) = d2368fc86d032dc6478df70f99b114abdf6c0c1da57bf1d3927ab179876f9c4b
+SIZE (MesaDemos-7.6.1.tar.bz2) = 1547790
Index: graphics/mesa-demos/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/graphics/mesa-demos/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- graphics/mesa-demos/pkg-plist	24 Jan 2009 18:13:01 -0000	1.4
+++ graphics/mesa-demos/pkg-plist	22 Dec 2009 05:50:15 -0000
@@ -6,9 +6,11 @@
 bin/copypix
 bin/corender
 bin/cubemap
+bin/dinoshade
 bin/drawpix
 bin/engine
 bin/fbo_firecube
+bin/fbotexture
 bin/fire
 bin/fogcoord
 bin/fplight
@@ -19,11 +21,9 @@
 bin/geartrain
 bin/glinfo
 bin/gloss
-bin/glslnoise
 bin/glsync
 bin/gltestperf
 bin/glthreads
-bin/glutfx
 bin/glxcontexts
 bin/glxdemo
 bin/glxgears
@@ -41,12 +41,14 @@
 bin/manywin
 bin/morph3d
 bin/multiarb
+bin/multictx
 bin/offset
 bin/overlay
 bin/paltex
 bin/pbdemo
 bin/pbinfo
 bin/pointblast
+bin/projtex
 bin/rain
 bin/ray
 bin/readpix
@@ -54,19 +56,18 @@
 bin/renormal
 bin/shadowtex
 bin/sharedtex
+bin/sharedtex_mt
 bin/singlebuffer
 bin/spectex
 bin/spriteblast
 bin/stex3d
-bin/streaming_rect
 bin/teapot
 bin/terrain
 bin/tessdemo
 bin/texcyl
-bin/texdown
 bin/texenv
-bin/texobj
 bin/texture_from_pixmap
+bin/textures
 bin/trispd
 bin/tunnel
 bin/tunnel2
Index: graphics/mesa-demos/files/patch-configure
===================================================================
RCS file: graphics/mesa-demos/files/patch-configure
diff -N graphics/mesa-demos/files/patch-configure
--- graphics/mesa-demos/files/patch-configure	10 Apr 2009 18:00:49 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- configure.orig	2009-03-28 00:59:46.000000000 +0000
-+++ configure	2009-04-05 11:53:44.000000000 +0000
-@@ -5739,7 +5739,7 @@
-     ;;
- *freebsd* | dragonfly*)
-     case "$host_cpu" in
--    i*86|x86_64) default_driver="dri";;
-+    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
-     esac
-     ;;
- esac