- Update X.org ports to 7.4+ (few ports are more recent than the katamari).

- Bump PORTREVISION for all ports depending on libglut since the shlib
version number went from 4 to 3.
- Bump PORTREVISION for all ports depending on libXaw as libXaw.so.8 isn't
installed anymore.
- Couple of ports fixes (mostly missing xorg components added to USE_XORG).

3 files changed, 120 insertions, 77 deletions

diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
index 203bdc13ec1b..518a4261e661 100644
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@@ -6,88 +6,39 @@
 #
 
 PORTNAME=	demos
-PORTVERSION=	7.0.4
+PORTVERSION=	${MESAVERSION}
 CATEGORIES=	graphics
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=	mesa3d
 PKGNAMEPREFIX=	mesa-
-DISTFILES=	MesaDemos-${PORTVERSION}${EXTRACT_SUFX} \
-		MesaLib-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	OpenGL demos distributed with Mesa
 
-LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
+USE_GL=		glu glut
+USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-MAKE_ARGS=	SHELL=${SH} \
-		SUBDIRS="progs/demos progs/xdemos"
-MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
-ALL_TARGET=	default
-WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}
-DATADIR=	${PREFIX}/share/mesa-demos
-
-DEMO_PROGS=	arbfplight arbfslight arbocclude bounce clearspd cubemap \
-		drawpix engine fire fogcoord fplight fslight gamma gearbox \
-		gears geartrain glinfo gloss glslnoise gltestperf glutfx \
-		ipers isosurf lodbias morph3d multiarb paltex pointblast \
-		ray readpix reflect renormal shadowtex singlebuffer spectex \
-		spriteblast stex3d streaming_rect teapot terrain tessdemo \
-		texcyl texdown texenv texobj trispd tunnel tunnel2 vao_demo \
-		winpos
-
-DEMO_IMAGES=	arch.rgb bw.rgb girl.rgb girl2.rgb reflect.rgb s128.rgb \
-		tile.rgb tree2.rgba tree3.rgb wrs_logo.rgb
-DEMO_DATA=	geartrain.dat isosurf.dat terrain.dat
-
-XDEMO_PROGS=	glthreads glxcontexts glxdemo glxgears glxgears_fbconfig \
-		glxheads glxinfo glxpbdemo glxpixmap glxswapcontrol manywin \
-		offset overlay pbdemo pbinfo wincopy xfont xrotfontdemo
-
-# Generate packing list
-PLIST_FILES=
-.for prog in ${DEMO_PROGS}
-PLIST_FILES+=	bin/${prog}
-.endfor
-.for prog in ${XDEMO_PROGS}
-PLIST_FILES+=	bin/${prog}
-.endfor
-.for img in ${DEMO_IMAGES}
-PLIST_FILES+=	%%DATADIR%%/images/${img}
-.endfor
-.for dat in ${DEMO_DATA}
-PLIST_FILES+=	%%DATADIR%%/data/${dat}
-.endfor
-PLIST_DIRS=	%%DATADIR%%/images %%DATADIR%%/data %%DATADIR%%
-
-post-extract:
-	${CP} ${FILESDIR}/config ${WRKSRC}/configs/current
-	${REINPLACE_CMD} -e 's|../images/|${DATADIR}/images/|g' \
-		-e 's|geartrain.dat|${DATADIR}/data/geartrain.dat|g' \
-		-e 's|terrain.dat|${DATADIR}/data/terrain.dat|g' \
-		-e 's|isosurf.dat|${DATADIR}/data/isosurf.dat|g' \
-		${WRKSRC}/progs/demos/*.c ${WRKSRC}/progs/xdemos/*.c
+DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
 
 do-install:
-	@for prog in ${DEMO_PROGS}; do \
-		${INSTALL_PROGRAM} ${WRKSRC}/progs/demos/$$prog \
-			${PREFIX}/bin ; \
-	done
-	@for prog in ${XDEMO_PROGS}; do \
-		${INSTALL_PROGRAM} ${WRKSRC}/progs/xdemos/$$prog \
-			${PREFIX}/bin ; \
+	@for i in demos xdemos; do \
+		cd ${WRKSRC}/progs/$$i; \
+		for j in `${MAKE} -V PROGS`; do \
+			echo ${INSTALL_PROGRAM} $$j ${PREFIX}/bin; \
+			${INSTALL_PROGRAM} $$j ${PREFIX}/bin; \
+		done; \
 	done
 	${MKDIR} ${DATADIR}/images ${DATADIR}/data
-	@for img in ${DEMO_IMAGES}; do \
-		${INSTALL_DATA} ${WRKSRC}/progs/images/$$img \
-			${DATADIR}/images ; \
-	done
-	@for dat in ${DEMO_DATA}; do \
-		${INSTALL_DATA} ${WRKSRC}/progs/demos/$$dat ${DATADIR}/data ; \
-	done
-
+	@cd ${WRKSRC}/progs/images; \
+		for i in `ls *.rgb*`; do \
+			echo ${INSTALL_DATA} $$i ${DATADIR}/images; \
+			${INSTALL_DATA} $$i ${DATADIR}/images; \
+		done
+	@cd ${WRKSRC}/progs/demos; \
+		for i in `ls *.dat`; do \
+			echo ${INSTALL_DATA} $$i ${DATADIR}/data; \
+			${INSTALL_DATA} $$i ${DATADIR}/data; \
+		done
+
+.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_NVIDIA_GL)
diff --git a/graphics/mesa-demos/distinfo b/graphics/mesa-demos/distinfo
index dc4d90323853..f30869aa90e4 100644
--- a/graphics/mesa-demos/distinfo
+++ b/graphics/mesa-demos/distinfo
@@ -1,6 +1,6 @@
-MD5 (MesaDemos-7.0.4.tar.bz2) = c1215b31c5f7b85f81eed3bfba07d556
-SHA256 (MesaDemos-7.0.4.tar.bz2) = 90830d6771821ac519a160cf7065119fcdb4e077ee5a66ce30bf0d4988b0e77a
-SIZE (MesaDemos-7.0.4.tar.bz2) = 1341624
-MD5 (MesaLib-7.0.4.tar.bz2) = 8d7bacbe0234742a5d08c8088c4619e9
-SHA256 (MesaLib-7.0.4.tar.bz2) = 93fc5f882defc02537e972c6c31616d271d174090179b1697701044989fe29cd
-SIZE (MesaLib-7.0.4.tar.bz2) = 3414357
+MD5 (MesaLib-7.2.tar.bz2) = 04d379292e023df0b0266825cb0dbde5
+SHA256 (MesaLib-7.2.tar.bz2) = a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2
+SIZE (MesaLib-7.2.tar.bz2) = 3341919
+MD5 (MesaDemos-7.2.tar.bz2) = 22e03dc4038cd63f32c21eb60994892b
+SHA256 (MesaDemos-7.2.tar.bz2) = 3d73988ad3e87f6084a4593cc6b3aac63aca3e893d3e9409d892a6f51558e4c4
+SIZE (MesaDemos-7.2.tar.bz2) = 1360304
diff --git a/graphics/mesa-demos/pkg-plist b/graphics/mesa-demos/pkg-plist
new file mode 100644
index 000000000000..ac2bb139d53d
--- /dev/null
+++ b/graphics/mesa-demos/pkg-plist
@@ -0,0 +1,92 @@
+bin/arbfplight
+bin/arbfslight
+bin/arbocclude
+bin/bounce
+bin/clearspd
+bin/copypix
+bin/corender
+bin/cubemap
+bin/drawpix
+bin/engine
+bin/fbo_firecube
+bin/fire
+bin/fogcoord
+bin/fplight
+bin/fslight
+bin/gamma
+bin/gearbox
+bin/gears
+bin/geartrain
+bin/glinfo
+bin/gloss
+bin/glslnoise
+bin/gltestperf
+bin/glthreads
+bin/glutfx
+bin/glxcontexts
+bin/glxdemo
+bin/glxgears
+bin/glxgears_fbconfig
+bin/glxgears_pixmap
+bin/glxheads
+bin/glxinfo
+bin/glxpbdemo
+bin/glxpixmap
+bin/glxsnoop
+bin/glxswapcontrol
+bin/ipers
+bin/isosurf
+bin/lodbias
+bin/manywin
+bin/morph3d
+bin/multiarb
+bin/offset
+bin/overlay
+bin/paltex
+bin/pbdemo
+bin/pbinfo
+bin/pointblast
+bin/rain
+bin/ray
+bin/readpix
+bin/reflect
+bin/renormal
+bin/shadowtex
+bin/sharedtex
+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/trispd
+bin/tunnel
+bin/tunnel2
+bin/vao_demo
+bin/wincopy
+bin/winpos
+bin/xfont
+bin/xrotfontdemo
+%%DATADIR%%/data/geartrain.dat
+%%DATADIR%%/data/isosurf.dat
+%%DATADIR%%/data/terrain.dat
+%%DATADIR%%/images/arch.rgb
+%%DATADIR%%/images/bw.rgb
+%%DATADIR%%/images/girl.rgb
+%%DATADIR%%/images/girl2.rgb
+%%DATADIR%%/images/reflect.rgb
+%%DATADIR%%/images/s128.rgb
+%%DATADIR%%/images/tile.rgb
+%%DATADIR%%/images/tree2.rgba
+%%DATADIR%%/images/tree3.rgb
+%%DATADIR%%/images/wrs_logo.rgb
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%