Limited Update to Mesa3D 7.6.1 and libdrm 2.4.17.

[MEMO]
In this commit, no version changed.  But if you put
'WITHOUT_NOUVEAU' on /etc/make.conf, you can use
new version of Mesa3D and libdrm.

Discussed with:	rnoland on freebsd-ports/freebsd-x11.

27 files changed, 143 insertions, 44 deletions

diff --git a/KNOBS b/KNOBS
index 1b57f6d6f1bf..257f02b969c5 100644
--- a/KNOBS
+++ b/KNOBS
@@ -83,6 +83,7 @@ NCURSES			Adds ncurses console graphics support
 NHC98			Prefer/use nhc98 Haskell compiler
 NIS			Support for NIS/YP
 NLS			Native Language Support via gettext utilities
+NOUVEAU			Use MesaLib 7.4.4/libdrm 2.4.12 with xf86-video-nouveau
 NVIDIA_GL		Use libGL provided by NVidia binary drivers
 OGG			OGG multimedia container format
 OPENAL			Adds OpenAL support
diff --git a/UPDATING b/UPDATING
index 14954865aa95..ef59fb5b75f1 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,25 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20100207:
+  AFFECTS: users of Mesa3D libraries and x11-drivers/xf86-video-nouveau
+  AUTHOR: nork@FreeBSD.org
+
+  If you want to use Mesa3D 7.6.1 and libdrm 2.4.17 rather than 7.4.4
+  and 2.4.12, you must define WITHOUT_NOUVEAU global macro, at least,
+  enabled on graphics/libGL*, graphics/libglut, graphics/dri,
+  graphics/mesa-demos and graphics/libdrm.  And please give up using
+  x11-drivers/xf86-video-nouveau.
+
+  In this time, I can't enable latest Mesa3D and libdrm, because these
+  break xf86-video-nouveau.  But old(current?) Mesa3D and libdrm don't
+  break any drivers.
+
+  for AMD Radeon HD 2xxx/3xxx/4xxx users
+  If you use AMD Radeon HD [234]xxx series, please define WITHOUT_NOVEAU
+  global macro.  You can use OpenGL Hardware Accelerator feature on
+  these series.
+
 20100206:
   AFFECTS: users of net/samba4-devel
   AUTHOR: timur@FreeBSD.org
diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index 7d2625a2c7a8..2c84289ddc07 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -21,6 +21,10 @@ MAKE_JOBS_UNSAFE=	yes
 
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
 
+.ifdef	WITH_NOUVEAU
+EXTRA_PATCHES=	mesalib74-configure
+.endif
+
 do-install:
 	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
 
diff --git a/graphics/dri/distinfo b/graphics/dri/distinfo
index 0e8176eee482..b44fb336d3ad 100644
--- a/graphics/dri/distinfo
+++ b/graphics/dri/distinfo
@@ -1,3 +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 (MesaLib-7.6.1.tar.bz2) = 7db4617e9e10ad3aca1b64339fd71b7d
+SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
+SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
diff --git a/graphics/dri/files/patch-configure b/graphics/dri/files/mesalib74-configure
index af45b71f21c3..af45b71f21c3 100644
--- a/graphics/dri/files/patch-configure
+++ b/graphics/dri/files/mesalib74-configure
diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist
index 7098c35c5c05..8a12d059e36b 100644
--- a/graphics/dri/pkg-plist
+++ b/graphics/dri/pkg-plist
@@ -7,6 +7,7 @@ lib/dri/mga_dri.so
 lib/dri/r128_dri.so
 lib/dri/r200_dri.so
 lib/dri/r300_dri.so
+%%MESALIB76%%lib/dri/r600_dri.so
 lib/dri/radeon_dri.so
 lib/dri/savage_dri.so
 lib/dri/sis_dri.so
diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile
index b3bbb25c04cd..24f8e4892bbb 100644
--- a/graphics/libGL/Makefile
+++ b/graphics/libGL/Makefile
@@ -17,6 +17,10 @@ LIB_DEPENDS+=	drm:${PORTSDIR}/graphics/libdrm \
 
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto:both
 
+.ifdef	WITH_NOUVEAU
+EXTRA_PATCHES=	mesalib74-configure
+.endif
+
 do-install:
 	${RM} ${WRKSRC}/include/GL/glu*.h
 	cd ${WRKSRC}/src/mesa; ${GMAKE} install-libgl
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
index a3e95cde64d9..acf8594290e9 100644
--- a/graphics/libGL/bsd.mesalib.mk
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -12,37 +12,50 @@
 #    - graphics/libGL
 #    - graphics/libGLU
 #    - graphics/libGLw
+#    - graphics/libglut
 #    - graphics/dri
 #
 # $FreeBSD$
 #
 
-MESAVERSION=	7.4.4
-MASTER_SITES?=	SF/mesa3d/MesaLib/${PORTVERSION}:mesa \
-		ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/:mesa,glut,demos
+MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
+MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
+
+.ifdef	WITHOUT_NOUVEAU
+MESABASEVERSION=	7.6.1
+MESASUBVERSION=
+PLIST_SUB+=		MESALIB76= MESALIB74="@comment "
+.else
+MESABASEVERSION=	7.4.4
+MESASUBVERSION=
+PLIST_SUB+=		MESALIB74= MESALIB76="@comment "
+.endif
+
+MASTER_SITES?=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut,demos
 MASTER_SITE_SUBDIR=	mesa3d
-DISTFILES=	MesaLib-${MESAVERSION}${EXTRACT_SUFX}:mesa
+DISTFILES=		MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
 MAINTAINER?=	x11@FreeBSD.org
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
+USE_BZIP2=		yes
+USE_GMAKE=		yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
-		LDFLAGS=-L${LOCALBASE}/lib
+				LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--disable-gallium
 
-ALL_TARGET=	default
+ALL_TARGET=		default
 
-#MAKE_ARGS=	SHELL=${SH}
-#CFLAGS+=	-DUSE_XSHM -DHZ=100
+#MAKE_ARGS=		SHELL=${SH}
+#CFLAGS+=		-DUSE_XSHM -DHZ=100
 
-#FILESDIR=	${.CURDIR}/../../graphics/libGL/files
-WRKSRC=		${WRKDIR}/Mesa-${MESAVERSION}
+#FILESDIR=		${.CURDIR}/../../graphics/libGL/files
+WRKSRC=			${WRKDIR}/Mesa-${MESABASEVERSION}
 
 .if !defined(ARCH)
-ARCH!=		uname -p
+ARCH!=			uname -p
 .endif
 
 .if ${ARCH} == alpha
@@ -51,7 +64,7 @@ FAST_MATH=
 FAST_MATH=      -ffast-math
 .endif
 
-COMPONENT=	${PORTNAME:L:C/^lib//:C/mesa-//}
+COMPONENT=		${PORTNAME:L:C/^lib//:C/mesa-//}
 
 .if ${COMPONENT:Mglut} == ""
 . if ${COMPONENT:Mglu} == ""
@@ -60,8 +73,7 @@ CONFIGURE_ARGS+=	--disable-glu --disable-glut
 CONFIGURE_ARGS+=	--disable-glut
 . endif
 .else
-MASTER_SITES+=	SF/mesa3d/MesaGLUT/${MESAVERSION}:glut
-DISTFILES+=	MesaGLUT-${MESAVERSION}${EXTRACT_SUFX}:glut
+DISTFILES+=		MesaGLUT-${MESADISTVERSION}${EXTRACT_SUFX}:glut
 .endif
 
 .if ${COMPONENT:Mglw} == ""
@@ -73,8 +85,7 @@ CONFIGURE_ARGS+=	--enable-motif
 .if ${COMPONENT:Mdemos} == ""
 CONFIGURE_ARGS+=	--with-demos=no
 .else
-MASTER_SITES+=	SF/mesa3d/MesaDemos/${MESAVERSION}:demos
-DISTFILES+=	MesaDemos-${MESAVERSION}${EXTRACT_SUFX}:demos
+DISTFILES+=		MesaDemos-${MESADISTVERSION}${EXTRACT_SUFX}:demos
 CONFIGURE_ARGS+=	--with-demos=demos,xdemos
 .endif
 
diff --git a/graphics/libGL/distinfo b/graphics/libGL/distinfo
index 0e8176eee482..b44fb336d3ad 100644
--- a/graphics/libGL/distinfo
+++ b/graphics/libGL/distinfo
@@ -1,3 +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 (MesaLib-7.6.1.tar.bz2) = 7db4617e9e10ad3aca1b64339fd71b7d
+SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
+SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
diff --git a/graphics/libGL/files/patch-configure b/graphics/libGL/files/mesalib74-configure
index af45b71f21c3..af45b71f21c3 100644
--- a/graphics/libGL/files/patch-configure
+++ b/graphics/libGL/files/mesalib74-configure
diff --git a/graphics/libGL/pkg-plist b/graphics/libGL/pkg-plist
index a63eaaa78a06..b07eac0fa6cd 100644
--- a/graphics/libGL/pkg-plist
+++ b/graphics/libGL/pkg-plist
@@ -1,17 +1,18 @@
 include/GL/dmesa.h
 include/GL/ggimesa.h
-include/GL/gl_mangle.h
 include/GL/gl.h
+include/GL/gl_mangle.h
 include/GL/glext.h
 include/GL/glfbdev.h
-include/GL/glx_mangle.h
 include/GL/glx.h
+include/GL/glx_mangle.h
 include/GL/glxext.h
 include/GL/mesa_wgl.h
 include/GL/mglmesa.h
 include/GL/osmesa.h
 include/GL/svgamesa.h
 include/GL/vms_x_fix.h
+%%MESALIB76%%include/GL/wglext.h
 include/GL/wmesa.h
 lib/libGL.so
 lib/libGL.so.1
diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile
index b39ab7574fe5..accdeb74936a 100644
--- a/graphics/libGLU/Makefile
+++ b/graphics/libGLU/Makefile
@@ -14,6 +14,10 @@ COMMENT=	OpenGL utility library
 USE_GL=		gl
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
 
+.ifdef	WITH_NOUVEAU
+EXTRA_PATCHES=	mesalib74-configure
+.endif
+
 do-install:
 	cd ${WRKSRC}/src/glu; ${GMAKE} install
 	${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/
diff --git a/graphics/libGLU/distinfo b/graphics/libGLU/distinfo
index 0e8176eee482..b44fb336d3ad 100644
--- a/graphics/libGLU/distinfo
+++ b/graphics/libGLU/distinfo
@@ -1,3 +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 (MesaLib-7.6.1.tar.bz2) = 7db4617e9e10ad3aca1b64339fd71b7d
+SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
+SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
diff --git a/graphics/libGLU/files/patch-configure b/graphics/libGLU/files/mesalib74-configure
index af45b71f21c3..af45b71f21c3 100644
--- a/graphics/libGLU/files/patch-configure
+++ b/graphics/libGLU/files/mesalib74-configure
diff --git a/graphics/libGLw/Makefile b/graphics/libGLw/Makefile
index fa52387467da..0801794354f4 100644
--- a/graphics/libGLw/Makefile
+++ b/graphics/libGLw/Makefile
@@ -17,6 +17,10 @@ LIB_DEPENDS+=	Xm.3:${PORTSDIR}/x11-toolkits/open-motif
 USE_GL=		gl
 USE_XORG=	glproto xt x11 xext xxf86vm xdamage xfixes dri2proto
 
+.ifdef	WITH_NOUVEAU
+EXTRA_PATCHES=	mesalib74-configure
+.endif
+
 do-install:
 	cd ${WRKSRC}/src/glw; ${GMAKE} install
 
diff --git a/graphics/libGLw/distinfo b/graphics/libGLw/distinfo
index 0e8176eee482..b44fb336d3ad 100644
--- a/graphics/libGLw/distinfo
+++ b/graphics/libGLw/distinfo
@@ -1,3 +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 (MesaLib-7.6.1.tar.bz2) = 7db4617e9e10ad3aca1b64339fd71b7d
+SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
+SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
diff --git a/graphics/libGLw/files/patch-configure b/graphics/libGLw/files/mesalib74-configure
index af45b71f21c3..af45b71f21c3 100644
--- a/graphics/libGLw/files/patch-configure
+++ b/graphics/libGLw/files/mesalib74-configure
diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
index 2d69dffdca78..7c93d799ad3f 100644
--- a/graphics/libdrm/Makefile
+++ b/graphics/libdrm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libdrm
-PORTVERSION=	2.4.12
+PORTVERSION=	${LIBDRM_VERSION}
 CATEGORIES=	graphics x11
 MASTER_SITES=	http://dri.freedesktop.org/libdrm/
 
@@ -22,7 +22,16 @@ USE_LDCONFIG=	yes
 
 MAKE_JOBS_SAFE=	yes
 
+.ifdef	WITHOUT_NOUVEAU
+LIBDRM_VERSION=	2.4.17
+CONFIGURE_ARGS=	--disable-nouveau-experimental-api \
+		--disable-radeon-experimental-api
+PLIST_SUB+=	NEW= OLD="@comment "
+.else
+LIBDRM_VERSION=	2.4.12
 CONFIGURE_ARGS=	--enable-nouveau-experimental-api
+PLIST_SUB+=	OLD= NEW="@comment "
+.endif
 
 pre-patch:
 	@${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' \
diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo
index d10186d2c93a..d6e79db263fa 100644
--- a/graphics/libdrm/distinfo
+++ b/graphics/libdrm/distinfo
@@ -1,3 +1,6 @@
 MD5 (libdrm-2.4.12.tar.bz2) = 15d26219c046377d5fcb1cb37e7b03a2
 SHA256 (libdrm-2.4.12.tar.bz2) = 89e3b16aff13c5219d13b08f9143793f74777b752d87c760ec6e52fb8676bd31
 SIZE (libdrm-2.4.12.tar.bz2) = 414175
+MD5 (libdrm-2.4.17.tar.bz2) = 667d81f993f7fd8a1b1b1b830a28a748
+SHA256 (libdrm-2.4.17.tar.bz2) = b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a
+SIZE (libdrm-2.4.17.tar.bz2) = 408882
diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist
index 209876f2b13d..3cfad1e6846d 100644
--- a/graphics/libdrm/pkg-plist
+++ b/graphics/libdrm/pkg-plist
@@ -4,25 +4,25 @@ include/drm/drm_sarea.h
 include/drm/i915_drm.h
 include/drm/mach64_drm.h
 include/drm/mga_drm.h
-include/drm/nouveau_drm.h
-include/drm/nouveau_drmif.h
+%%OLD%%include/drm/nouveau_drm.h
+%%OLD%%include/drm/nouveau_drmif.h
 include/drm/r128_drm.h
-include/drm/r300_reg.h
+%%OLD%%include/drm/r300_reg.h
 include/drm/radeon_drm.h
 include/drm/savage_drm.h
 include/drm/sis_drm.h
-include/drm/via_3d_reg.h
+%%OLD%%include/drm/via_3d_reg.h
 include/drm/via_drm.h
-include/drm/xgi_drm.h
+%%OLD%%include/drm/xgi_drm.h
 include/intel_bufmgr.h
-include/nouveau/nouveau_bo.h
-include/nouveau/nouveau_channel.h
-include/nouveau/nouveau_class.h
-include/nouveau/nouveau_device.h
-include/nouveau/nouveau_grobj.h
-include/nouveau/nouveau_notifier.h
-include/nouveau/nouveau_pushbuf.h
-include/nouveau/nouveau_resource.h
+%%OLD%%include/nouveau/nouveau_bo.h
+%%OLD%%include/nouveau/nouveau_channel.h
+%%OLD%%include/nouveau/nouveau_class.h
+%%OLD%%include/nouveau/nouveau_device.h
+%%OLD%%include/nouveau/nouveau_grobj.h
+%%OLD%%include/nouveau/nouveau_notifier.h
+%%OLD%%include/nouveau/nouveau_pushbuf.h
+%%OLD%%include/nouveau/nouveau_resource.h
 include/xf86drm.h
 include/xf86drmMode.h
 lib/libdrm.la
@@ -31,11 +31,11 @@ lib/libdrm.so.2
 lib/libdrm_intel.la
 lib/libdrm_intel.so
 lib/libdrm_intel.so.1
-lib/libdrm_nouveau.la
-lib/libdrm_nouveau.so
-lib/libdrm_nouveau.so.1
+%%OLD%%lib/libdrm_nouveau.la
+%%OLD%%lib/libdrm_nouveau.so
+%%OLD%%lib/libdrm_nouveau.so.1
 libdata/pkgconfig/libdrm.pc
 libdata/pkgconfig/libdrm_intel.pc
-libdata/pkgconfig/libdrm_nouveau.pc
+%%OLD%%libdata/pkgconfig/libdrm_nouveau.pc
 @dirrm include/drm
-@dirrm include/nouveau
+%%OLD%%@dirrm include/nouveau
diff --git a/graphics/libglut/Makefile b/graphics/libglut/Makefile
index 1b8ea547cf55..1e682c71a8be 100644
--- a/graphics/libglut/Makefile
+++ b/graphics/libglut/Makefile
@@ -15,6 +15,10 @@ COMMENT=	OpenGL utility toolkit
 USE_GL=		glu
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes xi xmu dri2proto
 
+.ifdef	WITH_NOUVEAU
+EXTRA_PATCHES=	mesalib74-configure
+.endif
+
 do-install:
 	cd ${WRKSRC}/src/glut/glx; ${GMAKE} install
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
diff --git a/graphics/libglut/distinfo b/graphics/libglut/distinfo
index 376246972f11..f7e3f9790877 100644
--- a/graphics/libglut/distinfo
+++ b/graphics/libglut/distinfo
@@ -4,3 +4,9 @@ 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
diff --git a/graphics/libglut/files/patch-configure b/graphics/libglut/files/mesalib74-configure
index af45b71f21c3..af45b71f21c3 100644
--- a/graphics/libglut/files/patch-configure
+++ b/graphics/libglut/files/mesalib74-configure
diff --git a/graphics/mesa-demos/distinfo b/graphics/mesa-demos/distinfo
index 288e243f4057..f2bdb0067e27 100644
--- a/graphics/mesa-demos/distinfo
+++ b/graphics/mesa-demos/distinfo
@@ -4,3 +4,9 @@ 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
diff --git a/graphics/mesa-demos/files/patch-configure b/graphics/mesa-demos/files/mesalib74-configure
index af45b71f21c3..af45b71f21c3 100644
--- a/graphics/mesa-demos/files/patch-configure
+++ b/graphics/mesa-demos/files/mesalib74-configure
diff --git a/graphics/mesa-demos/pkg-plist b/graphics/mesa-demos/pkg-plist
index b06bf58d42d2..f72940389afe 100644
--- a/graphics/mesa-demos/pkg-plist
+++ b/graphics/mesa-demos/pkg-plist
@@ -6,9 +6,11 @@ bin/clearspd
 bin/copypix
 bin/corender
 bin/cubemap
+%%MESALIB76%%bin/dinoshade
 bin/drawpix
 bin/engine
 bin/fbo_firecube
+%%MESALIB76%%bin/fbotexture
 bin/fire
 bin/fogcoord
 bin/fplight
@@ -19,11 +21,11 @@ bin/gears
 bin/geartrain
 bin/glinfo
 bin/gloss
-bin/glslnoise
+%%MESALIB74%%bin/glslnoise
 bin/glsync
 bin/gltestperf
 bin/glthreads
-bin/glutfx
+%%MESALIB74%%bin/glutfx
 bin/glxcontexts
 bin/glxdemo
 bin/glxgears
@@ -41,12 +43,14 @@ bin/lodbias
 bin/manywin
 bin/morph3d
 bin/multiarb
+%%MESALIB76%%bin/multictx
 bin/offset
 bin/overlay
 bin/paltex
 bin/pbdemo
 bin/pbinfo
 bin/pointblast
+%%MESALIB76%%bin/projtex
 bin/rain
 bin/ray
 bin/readpix
@@ -54,19 +58,21 @@ bin/reflect
 bin/renormal
 bin/shadowtex
 bin/sharedtex
+%%MESALIB76%%bin/sharedtex_mt
 bin/singlebuffer
 bin/spectex
 bin/spriteblast
 bin/stex3d
-bin/streaming_rect
+%%MESALIB74%%bin/streaming_rect
 bin/teapot
 bin/terrain
 bin/tessdemo
 bin/texcyl
-bin/texdown
+%%MESALIB74%%bin/texdown
 bin/texenv
-bin/texobj
+%%MESALIB74%%bin/texobj
 bin/texture_from_pixmap
+%%MESALIB76%%bin/textures
 bin/trispd
 bin/tunnel
 bin/tunnel2
diff --git a/x11-drivers/xf86-video-nouveau/Makefile b/x11-drivers/xf86-video-nouveau/Makefile
index 63891f3fed33..401567f9f58e 100644
--- a/x11-drivers/xf86-video-nouveau/Makefile
+++ b/x11-drivers/xf86-video-nouveau/Makefile
@@ -20,6 +20,10 @@ MAN4=		nouveau.4x
 
 MAKE_JOBS_SAFE=	yes
 
+.if defined(WITHOUT_NOUVEAU)
+BROKEN=		Please disable WITHOUT_NOUVEAU global macro.
+.endif
+
 post-configure:
 	${REINPLACE_CMD} '/NV_DRIVER_DATE/s/".*"/"${SNAPDATE}.${SNAPREV}"/' ${WRKSRC}/config.h