1 files changed, 22 insertions, 71 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)