[pkgsrc/trunk]: pkgsrc As discussed on tech-pkg@ revert for now the last upda...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/347026bebb64
branches:  trunk
changeset: 532181:347026bebb64
user:      seb <seb%pkgsrc.org@localhost>
date:      Mon Aug 13 11:18:28 2007 +0000

description:
As discussed on tech-pkg@ revert for now the last updates of the Mesa packages.

Downgraded graphics/MesaLib to 6.4.2nb3
Downgraded graphics/glu to 6.4.2
Downgraded graphics/glut to 6.4.2
Downgraded graphics/glx-utils to 6.4.2
Downgraded graphics/MesaDemos to 6.4.2
Downgraded graphics/Mesa to 6.4.2

Approved byg agc@.

diffstat:

 doc/CHANGES-2007                    |    8 +-
 graphics/Mesa/Makefile.common       |    5 +-
 graphics/Mesa/Makefile.lib          |    4 +-
 graphics/MesaDemos/Makefile         |   18 +-
 graphics/MesaDemos/PLIST            |   62 +--------
 graphics/MesaDemos/distinfo         |   26 ++--
 graphics/MesaDemos/patches/patch-ac |   14 +-
 graphics/MesaDemos/patches/patch-ah |   22 +-
 graphics/MesaDemos/patches/patch-ai |   10 +-
 graphics/MesaLib/Makefile           |    5 +-
 graphics/MesaLib/buildlink3.mk      |    6 +-
 graphics/MesaLib/distinfo           |   38 ++--
 graphics/MesaLib/hacks.mk           |    4 +-
 graphics/MesaLib/patches/patch-ac   |   14 +-
 graphics/MesaLib/patches/patch-ad   |   23 +-
 graphics/MesaLib/patches/patch-ae   |   10 +-
 graphics/MesaLib/patches/patch-af   |   10 +-
 graphics/MesaLib/patches/patch-ag   |   14 +-
 graphics/MesaLib/patches/patch-ah   |   36 ++--
 graphics/MesaLib/patches/patch-aj   |   21 ++-
 graphics/MesaLib/patches/patch-al   |  231 ++++++++++++++++++-----------------
 graphics/MesaLib/patches/patch-am   |   22 ++-
 graphics/glu/Makefile               |    4 +-
 graphics/glut/Makefile              |    4 +-
 graphics/glx-utils/distinfo         |    8 +-
 25 files changed, 294 insertions(+), 325 deletions(-)

diffs (truncated from 1686 to 300 lines):

diff -r 2033c49c50d7 -r 347026bebb64 doc/CHANGES-2007
--- a/doc/CHANGES-2007  Mon Aug 13 10:31:06 2007 +0000
+++ b/doc/CHANGES-2007  Mon Aug 13 11:18:28 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2007,v 1.1791 2007/08/13 10:31:54 abs Exp $
+$NetBSD: CHANGES-2007,v 1.1792 2007/08/13 11:18:28 seb Exp $
 
 Changes to the packages collection and infrastructure in 2007:
 
@@ -3276,3 +3276,9 @@
        Updated mail/postfix to 2.4.5 [martti 2007-08-13]
        Updated mail/postfix-current to 2.5-20070731 [martti 2007-08-13]
        Updated devel/cpuflags to 1.09 [abs 2007-08-13]
+       Downgraded graphics/MesaLib to 6.4.2nb3 [seb 2007-08-13]
+       Downgraded graphics/glu to 6.4.2 [seb 2007-08-13]
+       Downgraded graphics/glut to 6.4.2 [seb 2007-08-13]
+       Downgraded graphics/glx-utils to 6.4.2 [seb 2007-08-13]
+       Downgraded graphics/MesaDemos to 6.4.2 [seb 2007-08-13]
+       Downgraded graphics/Mesa to 6.4.2 [seb 2007-08-13]
diff -r 2033c49c50d7 -r 347026bebb64 graphics/Mesa/Makefile.common
--- a/graphics/Mesa/Makefile.common     Mon Aug 13 10:31:06 2007 +0000
+++ b/graphics/Mesa/Makefile.common     Mon Aug 13 11:18:28 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.56 2007/08/12 15:14:46 adam Exp $
+# $NetBSD: Makefile.common,v 1.57 2007/08/13 11:18:29 seb Exp $
 #
 # This Makefile fragment is included either directly or indirectly (through
 # Makefile.lib) by all packages that are built from the Mesa sources.
@@ -11,11 +11,12 @@
 
 # When changing this version, please run "make distinfo" in the following
 # package directories:
+#
 #      graphics/MesaLib
 #      graphics/MesaDemos
 #      graphics/glx-utils
 #
-MESA_VERSION=  7.0.1
+MESA_VERSION=  6.4.2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.mesa3d.org/
diff -r 2033c49c50d7 -r 347026bebb64 graphics/Mesa/Makefile.lib
--- a/graphics/Mesa/Makefile.lib        Mon Aug 13 10:31:06 2007 +0000
+++ b/graphics/Mesa/Makefile.lib        Mon Aug 13 11:18:28 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.lib,v 1.5 2007/08/12 15:14:47 adam Exp $
+# $NetBSD: Makefile.lib,v 1.6 2007/08/13 11:18:30 seb Exp $
 #
 # This Makefile fragment is included by all packages that build libraries
 # from the Mesa sources.
@@ -45,7 +45,7 @@
 .PHONY: Mesa-install-libs
 pre-install: Mesa-install-libs
 Mesa-install-libs:
-       ${TEST} -z ${INSTLIBS:M*:Q}"" || ${ECHO_MSG} "Installing libraries."
+       @${TEST} -z ${INSTLIBS:M*:Q}"" || ${ECHO_MSG} "Installing libraries."
        @for lib in "" ${INSTLIBS}; do                                  \
                ${TEST} -n "$$lib" || continue;                         \
                ${SETENV} ${MAKE_ENV}                                   \
diff -r 2033c49c50d7 -r 347026bebb64 graphics/MesaDemos/Makefile
--- a/graphics/MesaDemos/Makefile       Mon Aug 13 10:31:06 2007 +0000
+++ b/graphics/MesaDemos/Makefile       Mon Aug 13 11:18:28 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2007/08/12 15:14:47 adam Exp $
+# $NetBSD: Makefile,v 1.31 2007/08/13 11:18:32 seb Exp $
 
 PKGNAME=       MesaDemos-${MESA_VERSION}
 COMMENT=       OpenGL examples and Demos
@@ -18,19 +18,19 @@
 .include "../../graphics/Mesa/buildlink3.mk"
 
 pre-build:
-       cd ${WRKSRC} && rm -fr src
+       cd ${WRKSRC} && ${RM} -fr src
 
 do-install:
        ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir}
-       cd ${WRKSRC}/progs && pax       \
+       cd ${WRKSRC}/progs && ${PAX}            \
                -s ',^./.*Makefile.*,,' \
-               -s ',^./CVS.*,,'        \
-               -s ',^./.*\.o$$,,'      \
-               -s ',^./\.libs.*,,'     \
-               -s ',^./\.deps.*,,'     \
-               -s ',^./.*\.orig$$,,'   \
+               -s ',^./CVS.*,,'                \
+               -s ',^./.*\.o$$,,'              \
+               -s ',^./\.libs.*,,'             \
+               -s ',^./\.deps.*,,'             \
+               -s ',^./.*\.orig$$,,'           \
                -rw . ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}/${dir}
-       chmod -R a+rX ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}
+       ${CHMOD} -R a+rX ${DESTDIR}${PREFIX}/share/examples/${PKGNAME_NOREV}
 
 .include "../../x11/libXi/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
diff -r 2033c49c50d7 -r 347026bebb64 graphics/MesaDemos/PLIST
--- a/graphics/MesaDemos/PLIST  Mon Aug 13 10:31:06 2007 +0000
+++ b/graphics/MesaDemos/PLIST  Mon Aug 13 11:18:28 2007 +0000
@@ -1,12 +1,10 @@
-@comment $NetBSD: PLIST,v 1.9 2007/08/12 15:14:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2007/08/13 11:18:34 seb Exp $
 share/examples/${PKGNAME}/beos/GLInfo.cpp
 share/examples/${PKGNAME}/beos/demo.cpp
 share/examples/${PKGNAME}/beos/sample.cpp
 share/examples/${PKGNAME}/demos/README
 share/examples/${PKGNAME}/demos/arbfplight
 share/examples/${PKGNAME}/demos/arbfplight.c
-share/examples/${PKGNAME}/demos/arbfslight
-share/examples/${PKGNAME}/demos/arbfslight.c
 share/examples/${PKGNAME}/demos/arbocclude
 share/examples/${PKGNAME}/demos/arbocclude.c
 share/examples/${PKGNAME}/demos/bounce
@@ -18,21 +16,14 @@
 share/examples/${PKGNAME}/demos/descrip.mms
 share/examples/${PKGNAME}/demos/drawpix
 share/examples/${PKGNAME}/demos/drawpix.c
-share/examples/${PKGNAME}/demos/engine
-share/examples/${PKGNAME}/demos/engine.c
-share/examples/${PKGNAME}/demos/extfuncs.h
 share/examples/${PKGNAME}/demos/fire
 share/examples/${PKGNAME}/demos/fire.c
 share/examples/${PKGNAME}/demos/fogcoord
 share/examples/${PKGNAME}/demos/fogcoord.c
 share/examples/${PKGNAME}/demos/fplight
 share/examples/${PKGNAME}/demos/fplight.c
-share/examples/${PKGNAME}/demos/fslight
-share/examples/${PKGNAME}/demos/fslight.c
 share/examples/${PKGNAME}/demos/gamma
 share/examples/${PKGNAME}/demos/gamma.c
-share/examples/${PKGNAME}/demos/gearbox
-share/examples/${PKGNAME}/demos/gearbox.c
 share/examples/${PKGNAME}/demos/gears
 share/examples/${PKGNAME}/demos/gears.c
 share/examples/${PKGNAME}/demos/geartrain
@@ -42,8 +33,6 @@
 share/examples/${PKGNAME}/demos/glinfo.c
 share/examples/${PKGNAME}/demos/gloss
 share/examples/${PKGNAME}/demos/gloss.c
-share/examples/${PKGNAME}/demos/glslnoise
-share/examples/${PKGNAME}/demos/glslnoise.c
 share/examples/${PKGNAME}/demos/gltestperf
 share/examples/${PKGNAME}/demos/gltestperf.c
 share/examples/${PKGNAME}/demos/glutfx
@@ -59,11 +48,14 @@
 share/examples/${PKGNAME}/demos/morph3d.c
 share/examples/${PKGNAME}/demos/multiarb
 share/examples/${PKGNAME}/demos/multiarb.c
+share/examples/${PKGNAME}/demos/occlude
 share/examples/${PKGNAME}/demos/occlude.c
 share/examples/${PKGNAME}/demos/paltex
 share/examples/${PKGNAME}/demos/paltex.c
 share/examples/${PKGNAME}/demos/particles.cxx
 share/examples/${PKGNAME}/demos/particles.h
+share/examples/${PKGNAME}/demos/pixeltex
+share/examples/${PKGNAME}/demos/pixeltex.c
 share/examples/${PKGNAME}/demos/pointblast
 share/examples/${PKGNAME}/demos/pointblast.c
 share/examples/${PKGNAME}/demos/rain.cxx
@@ -81,16 +73,12 @@
 share/examples/${PKGNAME}/demos/shadowtex.c
 share/examples/${PKGNAME}/demos/showbuffer.c
 share/examples/${PKGNAME}/demos/showbuffer.h
-share/examples/${PKGNAME}/demos/singlebuffer
-share/examples/${PKGNAME}/demos/singlebuffer.c
 share/examples/${PKGNAME}/demos/spectex
 share/examples/${PKGNAME}/demos/spectex.c
 share/examples/${PKGNAME}/demos/spriteblast
 share/examples/${PKGNAME}/demos/spriteblast.c
 share/examples/${PKGNAME}/demos/stex3d
 share/examples/${PKGNAME}/demos/stex3d.c
-share/examples/${PKGNAME}/demos/streaming_rect
-share/examples/${PKGNAME}/demos/streaming_rect.c
 share/examples/${PKGNAME}/demos/teapot
 share/examples/${PKGNAME}/demos/teapot.c
 share/examples/${PKGNAME}/demos/terrain
@@ -106,8 +94,6 @@
 share/examples/${PKGNAME}/demos/texenv.c
 share/examples/${PKGNAME}/demos/texobj
 share/examples/${PKGNAME}/demos/texobj.c
-share/examples/${PKGNAME}/demos/trackball.c
-share/examples/${PKGNAME}/demos/trackball.h
 share/examples/${PKGNAME}/demos/trispd
 share/examples/${PKGNAME}/demos/trispd.c
 share/examples/${PKGNAME}/demos/tunnel
@@ -115,44 +101,11 @@
 share/examples/${PKGNAME}/demos/tunnel2
 share/examples/${PKGNAME}/demos/tunnel2.c
 share/examples/${PKGNAME}/demos/tunneldat.h
-share/examples/${PKGNAME}/demos/vao_demo
-share/examples/${PKGNAME}/demos/vao_demo.c
 share/examples/${PKGNAME}/demos/winpos
 share/examples/${PKGNAME}/demos/winpos.c
-share/examples/${PKGNAME}/fbdev/glfbdevtest.c
 share/examples/${PKGNAME}/ggi/asc-view.c
 share/examples/${PKGNAME}/ggi/gears.c
 share/examples/${PKGNAME}/ggi/gears2.c
-share/examples/${PKGNAME}/glsl/CH06-brick.frag.txt
-share/examples/${PKGNAME}/glsl/CH06-brick.vert.txt
-share/examples/${PKGNAME}/glsl/CH11-bumpmap.frag.txt
-share/examples/${PKGNAME}/glsl/CH11-bumpmap.vert.txt
-share/examples/${PKGNAME}/glsl/CH11-toyball.frag.txt
-share/examples/${PKGNAME}/glsl/CH11-toyball.vert.txt
-share/examples/${PKGNAME}/glsl/CH18-mandel.frag.txt
-share/examples/${PKGNAME}/glsl/CH18-mandel.vert.txt
-share/examples/${PKGNAME}/glsl/brick
-share/examples/${PKGNAME}/glsl/brick.c
-share/examples/${PKGNAME}/glsl/bump
-share/examples/${PKGNAME}/glsl/bump.c
-share/examples/${PKGNAME}/glsl/cubemap.frag.txt
-share/examples/${PKGNAME}/glsl/deriv
-share/examples/${PKGNAME}/glsl/deriv.c
-share/examples/${PKGNAME}/glsl/extfuncs.h
-share/examples/${PKGNAME}/glsl/mandelbrot
-share/examples/${PKGNAME}/glsl/mandelbrot.c
-share/examples/${PKGNAME}/glsl/noise
-share/examples/${PKGNAME}/glsl/noise.c
-share/examples/${PKGNAME}/glsl/readtex.c
-share/examples/${PKGNAME}/glsl/readtex.h
-share/examples/${PKGNAME}/glsl/reflect.vert.txt
-share/examples/${PKGNAME}/glsl/shadowtex.frag.txt
-share/examples/${PKGNAME}/glsl/simple.vert.txt
-share/examples/${PKGNAME}/glsl/texdemo1
-share/examples/${PKGNAME}/glsl/texdemo1.c
-share/examples/${PKGNAME}/glsl/toyball
-share/examples/${PKGNAME}/glsl/toyball.c
-share/examples/${PKGNAME}/images/arch.rgb
 share/examples/${PKGNAME}/images/bw.rgb
 share/examples/${PKGNAME}/images/girl.rgb
 share/examples/${PKGNAME}/images/girl2.rgb
@@ -165,8 +118,6 @@
 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
@@ -361,7 +312,6 @@
 share/examples/${PKGNAME}/util/README
 share/examples/${PKGNAME}/util/dumpstate.c
 share/examples/${PKGNAME}/util/errcheck.c
-share/examples/${PKGNAME}/util/extfuncs.h
 share/examples/${PKGNAME}/util/glstate.c
 share/examples/${PKGNAME}/util/glstate.h
 share/examples/${PKGNAME}/util/glutskel.c
@@ -373,8 +323,6 @@
 share/examples/${PKGNAME}/util/readtex.h
 share/examples/${PKGNAME}/util/showbuffer.c
 share/examples/${PKGNAME}/util/showbuffer.h
-share/examples/${PKGNAME}/util/trackball.c
-share/examples/${PKGNAME}/util/trackball.h
 share/examples/${PKGNAME}/util/winpos.c
 share/examples/${PKGNAME}/windml/readtex.c
 share/examples/${PKGNAME}/windml/uglaccum.c
@@ -396,6 +344,7 @@
 share/examples/${PKGNAME}/xdemos/descrip.mms
 share/examples/${PKGNAME}/xdemos/glthreads
 share/examples/${PKGNAME}/xdemos/glthreads.c
+share/examples/${PKGNAME}/xdemos/glwdemo.c
 share/examples/${PKGNAME}/xdemos/glxcontexts
 share/examples/${PKGNAME}/xdemos/glxcontexts.c
 share/examples/${PKGNAME}/xdemos/glxdemo
@@ -433,6 +382,7 @@
 share/examples/${PKGNAME}/xdemos/vtest.c
 share/examples/${PKGNAME}/xdemos/wincopy
 share/examples/${PKGNAME}/xdemos/wincopy.c
+share/examples/${PKGNAME}/xdemos/xdemo
 share/examples/${PKGNAME}/xdemos/xdemo.c
 share/examples/${PKGNAME}/xdemos/xfont
 share/examples/${PKGNAME}/xdemos/xfont.c
diff -r 2033c49c50d7 -r 347026bebb64 graphics/MesaDemos/distinfo
--- a/graphics/MesaDemos/distinfo       Mon Aug 13 10:31:06 2007 +0000
+++ b/graphics/MesaDemos/distinfo       Mon Aug 13 11:18:28 2007 +0000
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.17 2007/08/12 15:14:47 adam Exp $
+$NetBSD: distinfo,v 1.18 2007/08/13 11:18:35 seb Exp $
 
-SHA1 (Mesa-7.0.1/MesaDemos-7.0.1.tar.bz2) = 4d6cb158b58dbda9411d00e99a01031e13cae2ec
-RMD160 (Mesa-7.0.1/MesaDemos-7.0.1.tar.bz2) = 58537c690d811da09f788bf9b5b5bd999e5445c6
-Size (Mesa-7.0.1/MesaDemos-7.0.1.tar.bz2) = 1340949 bytes
-SHA1 (Mesa-7.0.1/MesaGLUT-7.0.1.tar.bz2) = ee63b2b1804106a05efaffd3da2dee7637d0eecb
-RMD160 (Mesa-7.0.1/MesaGLUT-7.0.1.tar.bz2) = 1c84391874e013145529fee43763ff9f57a88dc9
-Size (Mesa-7.0.1/MesaGLUT-7.0.1.tar.bz2) = 315599 bytes
-SHA1 (Mesa-7.0.1/MesaLib-7.0.1.tar.bz2) = deb1002cf377ba8bd9407bd3cf573f8c8be31671
-RMD160 (Mesa-7.0.1/MesaLib-7.0.1.tar.bz2) = b44fd8ebffd17aa72c3b6cca1c2924e66787aa78
-Size (Mesa-7.0.1/MesaLib-7.0.1.tar.bz2) = 3343538 bytes
+SHA1 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 4f042bdf38c9eb62e04660bd18566e7ca50d8640
+RMD160 (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 6bf1afc0d3bd3f5e3b5c1a019838f40603446509
+Size (Mesa-6.4.2/MesaLib-6.4.2.tar.bz2) = 2913009 bytes
+SHA1 (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = f136387c3076cfb24a40a7e41cacc43359493771
+RMD160 (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = 46ab4c40107ba2765bc944b026ed9f584f8c432e
+Size (Mesa-6.4.2/MesaGLUT-6.4.2.tar.bz2) = 270291 bytes
+SHA1 (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 35b1ff78fc1bd1c303be754ad2ff4252ad6c0258
+RMD160 (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 82e1dafd39abbe1c0e1de49adcff00dec19c6c1a
+Size (Mesa-6.4.2/MesaDemos-6.4.2.tar.bz2) = 814178 bytes
 SHA1 (patch-aa) = 4be9b5fadff758d3bcaea22abc5a61e89ccadbe0
 SHA1 (patch-ab) = 50050f26563f739a54173ab75b2d24b4ca4529f4