From 8a94a2252d34196008a2bf943f7e46c0aa148960 Mon Sep 17 00:00:00 2001
From: bjs <bjs@pkgsrc.org>
Date: Wed, 1 Oct 2008 22:25:53 +0000
Subject: Fix installation and add a missing file to PLIST.  PKGREVISION++

---
 graphics/MesaDemos/Makefile | 21 ++++++++++++---------
 graphics/MesaDemos/PLIST    |  3 ++-
 2 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'graphics')

diff --git a/graphics/MesaDemos/Makefile b/graphics/MesaDemos/Makefile
index 7e3b164714d..751c7f551ff 100644
--- a/graphics/MesaDemos/Makefile
+++ b/graphics/MesaDemos/Makefile
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.33 2008/07/27 00:03:42 bjs Exp $
+# $NetBSD: Makefile,v 1.34 2008/10/01 22:25:53 bjs Exp $
 
 PKGNAME=	MesaDemos-${MESA_VERSION}
+PKGREVISION=	1
 COMMENT=	OpenGL examples and Demos
 
+
 # We include Makefile.lib here to pull in the configuration machinery.
 #
 .include "../../graphics/Mesa/Makefile.lib"
@@ -12,19 +14,15 @@ BUILD_DIRS=	progs
 BUILD_TARGET=	default
 EGDIR=		${PREFIX}/share/examples/${PKGNAME_NOREV}
 
+AUTO_MKDIRS=	yes
+
 .include "../../graphics/Mesa/buildlink3.mk"
 
 pre-build:
 	cd ${WRKSRC} && ${RM} -fr src
 	${CP} ${WRKSRC}/configs/pkgsrc ${WRKSRC}/configs/current
-###
-### XXX remove this when it's unnecessary
-###
-pre-install:
-	${CHMOD} -x ${DESTDIR}${EGDIR}/demos/glslnoise.c
 
 do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}/${dir}
 	cd ${WRKSRC}/progs && pax		\
 		-s ',^./.*Makefile.*,,'	\
 		-s ',^./CVS.*,,'		\
@@ -32,9 +30,14 @@ do-install:
 		-s ',^./\.libs.*,,'		\
 		-s ',^./\.deps.*,,'		\
 		-s ',^./.*\.orig$$,,'		\
-		-rw . ${DESTDIR}${EGDIR}/${PKGNAME_NOREV}/${dir}
-	${CHMOD} -R a+rX ${DESTDIR}${EGDIR}/${PKGNAME_NOREV}
+		-rw . ${DESTDIR}${EGDIR}/${dir}
+	${CHMOD} -R a+rX ${DESTDIR}${EGDIR}
 
+###
+### XXX remove this when it's unnecessary
+###
+post-install:
+	${CHMOD} -x ${DESTDIR}${EGDIR}/demos/glslnoise.c
 .include "../../x11/libXi/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 
diff --git a/graphics/MesaDemos/PLIST b/graphics/MesaDemos/PLIST
index 55c27f9fdb6..a21cdcaca28 100644
--- a/graphics/MesaDemos/PLIST
+++ b/graphics/MesaDemos/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2008/07/27 00:03:42 bjs Exp $
+@comment $NetBSD: PLIST,v 1.12 2008/10/01 22:25:53 bjs Exp $
 share/examples/${PKGNAME}/beos/GLInfo.cpp
 share/examples/${PKGNAME}/beos/demo.cpp
 share/examples/${PKGNAME}/beos/sample.cpp
@@ -166,6 +166,7 @@ share/examples/${PKGNAME}/osdemos/osdemo.c
 share/examples/${PKGNAME}/osdemos/osdemo16.c
 share/examples/${PKGNAME}/osdemos/osdemo32.c
 share/examples/${PKGNAME}/osdemos/ostest1.c
+share/examples/${PKGNAME}/osdemos/readtex.c
 share/examples/${PKGNAME}/redbook/README
 share/examples/${PKGNAME}/redbook/aaindex
 share/examples/${PKGNAME}/redbook/aaindex.c
-- 
cgit v1.2.3