2 files changed, 24 insertions, 29 deletions

diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
index e46cc6bb05e0..b263701f15c6 100644
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	demos
-PORTVERSION=	6.4.1
+PORTVERSION=	6.5.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mesa3d/
@@ -19,41 +19,39 @@ COMMENT=	OpenGL demos distributed with Mesa
 
 LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
 
-BROKEN=		Does not compile
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2006-12-01
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 ALL_TARGET=
-MAKE_ARGS=	SUBDIRS="progs/demos progs/osdemos"
+MAKE_ARGS=	SUBDIRS="progs/demos"
 WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}
 DATADIR=	${PREFIX}/share/mesa-demos
 
-DEMO_PROGS=	bounce clearspd cubemap drawpix fire gamma gears geartrain \
-		glinfo gloss gltestperf glutfx ipers isosurf lodbias morph3d \
-		multiarb occlude paltex pixeltex pointblast ray \
-		readpix reflect renormal shadowtex spectex stex3d teapot \
-		terrain tessdemo texcyl texdown texenv texobj trispd tunnel \
-		tunnel2
-DEMO_IMAGES=	bw.rgb girl.rgb reflect.rgb s128.rgb tile.rgb tree2.rgba \
-		tree3.rgb wrs_logo.rgb
+DEMO_PROGS=	glinfo winpos gamma renormal glutfx paltex clearspd glslnoise \
+		singlebuffer bounce spectex readpix arbocclude texobj texdown \
+		lodbias texcyl vao_demo arbfslight fplight fogcoord trispd \
+		drawpix multiarb cubemap tessdemo pointblast gltestperf \
+		arbfplight gears spriteblast gloss terrain gearbox teapot \
+		ipers reflect shadowtex texenv fire stex3d ray morph3d \
+		isosurf engine tunnel tunnel2 geartrain
+
+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
 
 # Generate packing list
-PLIST_FILES=	bin/osdemo
+PLIST_FILES=
 .for prog in ${DEMO_PROGS}
 PLIST_FILES+=	bin/${prog}
 .endfor
 .for img in ${DEMO_IMAGES}
-PLIST_FILES+=	share/mesa-demos/images/${img}
+PLIST_FILES+=	%%DATADIR%%/images/${img}
 .endfor
 .for dat in ${DEMO_DATA}
-PLIST_FILES+=	share/mesa-demos/data/${dat}
+PLIST_FILES+=	%%DATADIR%%/data/${dat}
 .endfor
-PLIST_DIRS=	share/mesa-demos/images share/mesa-demos/data share/mesa-demos
+PLIST_DIRS=	%%DATADIR%%/images %%DATADIR%%/data %%DATADIR%%
 
 post-extract:
 	${CP} ${FILESDIR}/config ${WRKSRC}/configs/current
@@ -68,10 +66,7 @@ do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/progs/demos/$$prog \
 			${PREFIX}/bin ; \
 	done
-	${INSTALL_PROGRAM} ${WRKSRC}/progs/osdemos/osdemo \
-		${PREFIX}/bin ; \
-	${MKDIR} ${PREFIX}/share/mesa-demos/images
-	${MKDIR} ${PREFIX}/share/mesa-demos/data
+	${MKDIR} ${DATADIR}/images ${DATADIR}/data
 	@for img in ${DEMO_IMAGES}; do \
 		${INSTALL_DATA} ${WRKSRC}/progs/images/$$img \
 			${DATADIR}/images ; \
@@ -83,7 +78,7 @@ do-install:
 .include <bsd.port.pre.mk>
 
 .if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE=         does not build with XFree86
+IGNORE=		does not build with XFree86
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/mesa-demos/distinfo b/graphics/mesa-demos/distinfo
index f14ef024e6b9..2db4127cfbec 100644
--- a/graphics/mesa-demos/distinfo
+++ b/graphics/mesa-demos/distinfo
@@ -1,6 +1,6 @@
-MD5 (MesaDemos-6.4.1.tar.bz2) = 99df1fdcb98d391666b476ca6f1dda8a
-SHA256 (MesaDemos-6.4.1.tar.bz2) = f716751f1b750b186c08295cd40762ba98ece01f87eaf5b8db22fcb91c14bb14
-SIZE (MesaDemos-6.4.1.tar.bz2) = 819391
-MD5 (MesaLib-6.4.1.tar.bz2) = ea148c828ec6f645526451db1b8556f1
-SHA256 (MesaLib-6.4.1.tar.bz2) = 2c1c8784cccab416a52ef9512e3539a0063b88dcc9b0abbcf1a407f9808758cf
-SIZE (MesaLib-6.4.1.tar.bz2) = 2913887
+MD5 (MesaDemos-6.5.1.tar.bz2) = 0f2794baf7a9d98b22caea9f78c6942d
+SHA256 (MesaDemos-6.5.1.tar.bz2) = a12ad72a123c39ee3412d76690dd2c077216811065f06431c68677957a7e919e
+SIZE (MesaDemos-6.5.1.tar.bz2) = 1319453
+MD5 (MesaLib-6.5.1.tar.bz2) = c46f2c6646a270911b791dd8e1c2d977
+SHA256 (MesaLib-6.5.1.tar.bz2) = e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0
+SIZE (MesaLib-6.5.1.tar.bz2) = 3138257