update to 4.2.0

changes: mostly bugfixes afaict, improved OpenGL support

4 files changed, 29 insertions, 33 deletions

diff --git a/graphics/dxsamples/Makefile b/graphics/dxsamples/Makefile
index b1006da76a3..673965f140f 100644
--- a/graphics/dxsamples/Makefile
+++ b/graphics/dxsamples/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2002/03/13 17:37:05 fredb Exp $
+# $NetBSD: Makefile,v 1.9 2002/12/05 21:44:31 drochner Exp $
 
-DISTNAME=	dxsamples-4.1.3
-PKGREVISION=	1
+DISTNAME=	dxsamples-4.2.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.research.ibm.com/dx/srcDownload/srcArchive/
 
diff --git a/graphics/dxsamples/PLIST b/graphics/dxsamples/PLIST
index 9ef850e33c1..1ea7bc801cc 100644
--- a/graphics/dxsamples/PLIST
+++ b/graphics/dxsamples/PLIST
@@ -1,16 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/05 22:24:22 drochner Exp $
-dx/samples/callmodule/Makefile_alphax
-dx/samples/callmodule/Makefile_aviion
-dx/samples/callmodule/Makefile_hp700
-dx/samples/callmodule/Makefile_ibm6000
-dx/samples/callmodule/Makefile_intelnt
-dx/samples/callmodule/Makefile_sgi
-dx/samples/callmodule/Makefile_solaris
-dx/samples/callmodule/Makefile_sun4
+@comment $NetBSD: PLIST,v 1.3 2002/12/05 21:44:32 drochner Exp $
 dx/samples/callmodule/Readme
 dx/samples/callmodule/Simple.c
 dx/samples/callmodule/ThunderStreamlines.c
-dx/samples/callmodule/callmodule_make
+dx/samples/callmodule/makefile
 dx/samples/callmodule/renderimage.c
 dx/samples/callmodule/xapp_supervise.c
 dx/samples/data/2D2ormorevarnotseries.data
@@ -244,16 +236,6 @@ dx/samples/outboard/watchsocket.c
 dx/samples/outboard/watchsocket.cfg
 dx/samples/outboard/watchsocket.mdf
 dx/samples/outboard/watchsocket.net
-dx/samples/program_guide/Makefile_alphax
-dx/samples/program_guide/Makefile_aviion
-dx/samples/program_guide/Makefile_hp700
-dx/samples/program_guide/Makefile_ibm6000
-dx/samples/program_guide/Makefile_ibmpvs
-dx/samples/program_guide/Makefile_intelnt
-dx/samples/program_guide/Makefile_os2
-dx/samples/program_guide/Makefile_sgi
-dx/samples/program_guide/Makefile_solaris
-dx/samples/program_guide/Makefile_sun4
 dx/samples/program_guide/Readme
 dx/samples/program_guide/add.c
 dx/samples/program_guide/add.cfg
@@ -295,6 +277,7 @@ dx/samples/program_guide/hello_errorchecking.net
 dx/samples/program_guide/hello_loadable.mdf
 dx/samples/program_guide/hello_outboard.mdf
 dx/samples/program_guide/helloerr.mdf
+dx/samples/program_guide/makefile
 dx/samples/program_guide/makex.c
 dx/samples/program_guide/makex.cfg
 dx/samples/program_guide/makex.mb
@@ -686,6 +669,8 @@ dx/samples/programs/Legend.cfg
 dx/samples/programs/Legend.net
 dx/samples/programs/Light.cfg
 dx/samples/programs/Light.net
+dx/samples/programs/LightingColorSelector.cfg
+dx/samples/programs/LightingColorSelector.net
 dx/samples/programs/MISC/CensusData.cfg
 dx/samples/programs/MISC/CensusData.net
 dx/samples/programs/MISC/ExampleSMP.cfg
@@ -818,6 +803,8 @@ dx/samples/programs/RENDERING/FatLines.cfg
 dx/samples/programs/RENDERING/FatLines.net
 dx/samples/programs/RENDERING/Isolate.cfg
 dx/samples/programs/RENDERING/Isolate.net
+dx/samples/programs/RENDERING/LightingColorSelector.cfg
+dx/samples/programs/RENDERING/LightingColorSelector.net
 dx/samples/programs/RENDERING/SharedCamera.cfg
 dx/samples/programs/RENDERING/SharedCamera.net
 dx/samples/programs/RENDERING/TextureMapOpenGL.cfg
@@ -1175,6 +1162,14 @@ dx/samples/scripts/Verify
 dx/samples/scripts/WriteImage
 dx/samples/scripts/interop
 dx/samples/scripts/scriptexample
+dx/samples/stereo/StereoMacro.net
+dx/samples/stereo/StereoState.net
+dx/samples/stereo/TestStereo.cfg
+dx/samples/stereo/TestStereo.net
+dx/samples/stereo/src/makefile
+dx/samples/stereo/src/mycams.c
+dx/samples/stereo/src/mymodes.c
+dx/samples/stereo/stereo.html
 dx/samples/supervise/complexdemo/ReadMe
 dx/samples/supervise/complexdemo/data/frags.dx
 dx/samples/supervise/complexdemo/demo
@@ -1380,6 +1375,8 @@ dx/samples/util/plot3d/README
 @dirrm dx/samples/supervise/complexdemo/data
 @dirrm dx/samples/supervise/complexdemo
 @dirrm dx/samples/supervise
+@dirrm dx/samples/stereo/src
+@dirrm dx/samples/stereo
 @dirrm dx/samples/scripts
 @dirrm dx/samples/programs/SUPERVISE
 @dirrm dx/samples/programs/SIMPLE
diff --git a/graphics/dxsamples/distinfo b/graphics/dxsamples/distinfo
index acc0edcdb91..4fc37a4cd67 100644
--- a/graphics/dxsamples/distinfo
+++ b/graphics/dxsamples/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2002/02/05 22:24:22 drochner Exp $
+$NetBSD: distinfo,v 1.4 2002/12/05 21:44:32 drochner Exp $
 
-SHA1 (dxsamples-4.1.3.tar.gz) = 0637237928aff260ab0cbb90b193c76acd011441
-Size (dxsamples-4.1.3.tar.gz) = 7526973 bytes
-SHA1 (patch-ab) = 1e8e25fb44b22a50fb340940b52aed5e25178d68
+SHA1 (dxsamples-4.2.0.tar.gz) = 1e2d99c5537f83129c81823d963cc74df8d51b8c
+Size (dxsamples-4.2.0.tar.gz) = 7560487 bytes
+SHA1 (patch-ab) = e27259c95bae0d63919841ddc801e7db6f4211db
diff --git a/graphics/dxsamples/patches/patch-ab b/graphics/dxsamples/patches/patch-ab
index 9d2a0b9994e..b8de996fef4 100644
--- a/graphics/dxsamples/patches/patch-ab
+++ b/graphics/dxsamples/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2002/02/05 22:24:23 drochner Exp $
+$NetBSD: patch-ab,v 1.3 2002/12/05 21:44:32 drochner Exp $
 
---- Makefile.in.orig	Thu Jun  7 21:32:30 2001
-+++ Makefile.in	Tue Feb  5 16:12:13 2002
-@@ -71,7 +71,7 @@
+--- Makefile.in.orig	Mon May 20 22:04:34 2002
++++ Makefile.in	Thu Dec  5 22:10:59 2002
+@@ -76,7 +76,7 @@
  SHELL = @SHELL@
  VERSION = @VERSION@
  
--SUBDIRS = callmodule data dxlink java macros 	  outboard program_guide programs scripts 	  supervise tutorial user util 
-+SUBDIRS = callmodule data dxlink macros 	  outboard program_guide programs scripts 	  supervise tutorial user util 
+-SUBDIRS = callmodule data dxlink java macros 	  outboard program_guide programs scripts 	  supervise tutorial user util stereo
++SUBDIRS = callmodule data dxlink macros 	  outboard program_guide programs scripts 	  supervise tutorial user util stereo
  
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs