[pkgsrc/trunk]: pkgsrc/graphics/MesaDemos Fix installation and add a missing ...

[bjs <bjs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/126e77a13b30
branches:  trunk
changeset: 547755:126e77a13b30
user:      bjs <bjs%pkgsrc.org@localhost>
date:      Wed Oct 01 22:25:53 2008 +0000

description:
Fix installation and add a missing file to PLIST.  PKGREVISION++

diffstat:

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

diffs (71 lines):

diff -r 7460cf4e7255 -r 126e77a13b30 graphics/MesaDemos/Makefile
--- a/graphics/MesaDemos/Makefile       Wed Oct 01 22:12:40 2008 +0000
+++ b/graphics/MesaDemos/Makefile       Wed Oct 01 22:25:53 2008 +0000
@@ -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_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 @@
                -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 -r 7460cf4e7255 -r 126e77a13b30 graphics/MesaDemos/PLIST
--- a/graphics/MesaDemos/PLIST  Wed Oct 01 22:12:40 2008 +0000
+++ b/graphics/MesaDemos/PLIST  Wed Oct 01 22:25:53 2008 +0000
@@ -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/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