diff options
| -rw-r--r-- | graphics/dx/Makefile | 5 | ||||
| -rw-r--r-- | graphics/dx/PLIST | 40 | ||||
| -rw-r--r-- | graphics/dx/distinfo | 12 | ||||
| -rw-r--r-- | graphics/dx/patches/patch-aa | 30 | ||||
| -rw-r--r-- | graphics/dx/patches/patch-am | 12 | ||||
| -rw-r--r-- | graphics/dx/patches/patch-aq | 30 | ||||
| -rw-r--r-- | graphics/dx/patches/patch-at | 12 | ||||
| -rw-r--r-- | graphics/dxsamples/Makefile | 5 | ||||
| -rw-r--r-- | graphics/dxsamples/PLIST | 37 | ||||
| -rw-r--r-- | graphics/dxsamples/distinfo | 8 | ||||
| -rw-r--r-- | graphics/dxsamples/patches/patch-ab | 12 |
11 files changed, 87 insertions, 116 deletions
diff --git a/graphics/dx/Makefile b/graphics/dx/Makefile index 7cee40aed39..7655fcbe38b 100644 --- a/graphics/dx/Makefile +++ b/graphics/dx/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.17 2002/09/22 00:49:32 jlam Exp $ +# $NetBSD: Makefile,v 1.18 2002/12/05 21:44:30 drochner Exp $ -DISTNAME= dx-4.1.3 -PKGREVISION= 1 +DISTNAME= dx-4.2.0 CATEGORIES= graphics MASTER_SITES= http://www.research.ibm.com/dx/srcDownload/srcArchive/ diff --git a/graphics/dx/PLIST b/graphics/dx/PLIST index e21d14ea7c6..559b6f652d2 100644 --- a/graphics/dx/PLIST +++ b/graphics/dx/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/02/05 22:23:32 drochner Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/12/05 21:44:30 drochner Exp $ bin/dx dx/lib_netbsd/arch.mak dx/lib_netbsd/libDXlite.a @@ -14,6 +14,7 @@ dx/lib/dxrc dx/lib/dxexec.exp dx/lib/outboard.c dx/bin/dx +dx/bin/url_handler.sh dx/bin_netbsd/dxexec dx/bin_netbsd/dxui dx/bin_netbsd/prompter @@ -108,6 +109,7 @@ dx/include/dx/version.h dx/include/dx/xform.h dx/include/dxl.h dx/include/dxconfig.h +dx/include/dxstereo.h dx/bin/dxworker dx/bin/mdf2c dx/help/mbidx @@ -1837,6 +1839,7 @@ dx/html/pages/qikgu031.htm dx/html/pages/qikgu032.htm dx/html/pages/qikgu033.htm dx/html/pages/qikgu034.htm +dx/html/pages/qikgu035.htm dx/html/pages/refgu002.htm dx/html/pages/refgu003.htm dx/html/pages/refgu004.htm @@ -2087,6 +2090,9 @@ dx/html/pages/usrgu074.htm dx/html/pages/usrgu075.htm dx/html/pages/usrgu076.htm dx/html/pages/usrgu077.htm +dx/html/pages/usrgu078.htm +dx/html/pages/usrgu079.htm +dx/html/pages/usrgu080.htm dx/html/images/3dcurs.gif dx/html/images/adctlpt.gif dx/html/images/arch.gif @@ -2107,18 +2113,38 @@ dx/html/images/datapr1.gif dx/html/images/datdpnd.gif dx/html/images/dialint.gif dx/html/images/dinhd.gif +dx/html/images/dxdawn.gif dx/html/images/dxicon8.gif dx/html/images/example1.gif dx/html/images/excutgrp.gif dx/html/images/exticon.gif dx/html/images/filesel.gif dx/html/images/findtool.gif +dx/html/images/flcgh_01.gif +dx/html/images/flcgh_02.gif +dx/html/images/flcgh_02d.gif +dx/html/images/flcgh_03.gif +dx/html/images/flcgh_03d.gif +dx/html/images/flcgh_04.gif +dx/html/images/flcgh_04d.gif +dx/html/images/flcgh_05.gif +dx/html/images/flcgh_05d.gif +dx/html/images/flcgh_06.gif +dx/html/images/flcgh_07.gif +dx/html/images/flcgh_08.gif +dx/html/images/flcgh_09.gif +dx/html/images/flcgh_10.gif +dx/html/images/flcgh_11.gif dx/html/images/fldobj.gif dx/html/images/flehole.gif dx/html/images/flesurf.gif dx/html/images/flexmp.gif dx/html/images/flseldb.gif dx/html/images/flselint.gif +dx/html/images/foot-fc.gif +dx/html/images/foot-qs.gif +dx/html/images/foot-ug.gif +dx/html/images/foot-ur.gif dx/html/images/fragment.gif dx/html/images/framctrl.gif dx/html/images/fulldp.gif @@ -2137,6 +2163,7 @@ dx/html/images/impconf.gif dx/html/images/inputcfg.gif dx/html/images/intlabl.gif dx/html/images/irggrid.gif +dx/html/images/javatls.gif dx/html/images/macrname.gif dx/html/images/majcomp.gif dx/html/images/map.gif @@ -2144,8 +2171,11 @@ dx/html/images/map2plan.gif dx/html/images/mapdform.gif dx/html/images/matpa1.gif dx/html/images/matpa2.gif +dx/html/images/matpa3.gif +dx/html/images/matpa4.gif dx/html/images/modbuild.gif dx/html/images/navigate.gif +dx/html/images/opacintg.gif dx/html/images/opendb.gif dx/html/images/optbox.gif dx/html/images/patrx1.gif @@ -2171,6 +2201,7 @@ dx/html/images/shcomps.gif dx/html/images/simfdp.gif dx/html/images/skwdgrid.gif dx/html/images/slidint.gif +dx/html/images/spacer.gif dx/html/images/startup.gif dx/html/images/stepint.gif dx/html/images/strngint.gif @@ -2213,11 +2244,18 @@ dx/html/README_ibm6000.htm dx/html/README_intelnt.htm dx/html/README_sgi.htm dx/html/README_solaris.htm +dx/html/Help.idx dx/html/allguide.htm dx/html/insguide.htm +dx/html/notfound.htm dx/html/proguide.htm dx/html/qikguide.htm dx/html/refguide.htm +dx/html/search.js +dx/html/srchhelp.htm +dx/html/srchidx.js +dx/html/srchindx.htm +dx/html/srchnav.htm dx/html/usrguide.htm dx/html/index.htm dx/html/index.html diff --git a/graphics/dx/distinfo b/graphics/dx/distinfo index d4c039b7589..b795f7ff59e 100644 --- a/graphics/dx/distinfo +++ b/graphics/dx/distinfo @@ -1,18 +1,16 @@ -$NetBSD: distinfo,v 1.6 2002/02/13 12:43:56 drochner Exp $ +$NetBSD: distinfo,v 1.7 2002/12/05 21:44:31 drochner Exp $ -SHA1 (dx-4.1.3.tar.gz) = 23891ee3768b4b4325c2e354f878b875cef171cd -Size (dx-4.1.3.tar.gz) = 8877359 bytes -SHA1 (patch-aa) = 9f5df5486aba5dfba818f1160c1ead696ec0eca3 +SHA1 (dx-4.2.0.tar.gz) = 792d472e854b0d6afd516f41cc22a5f28346a381 +Size (dx-4.2.0.tar.gz) = 9335729 bytes SHA1 (patch-ab) = 49b390e1888677377a9503a54d38ea00dbc04378 SHA1 (patch-ac) = b0ff15184f0adb7c1509abf9ecd57faa237ee99d SHA1 (patch-ad) = d74616cd629add7136386d7f77fae6e6f01cc1a6 SHA1 (patch-ae) = 9e96e45140ad1c0a5262ac9afb32b01ac56f065e SHA1 (patch-af) = 4873080df4c3f055f5b30c349ccd9e9cf70f12e1 SHA1 (patch-aj) = accb0b163687c73c68ad00b50b66c2d7252e487f -SHA1 (patch-am) = 4362765ea0c18d0f067c7d7205cabb1608b20d29 +SHA1 (patch-am) = 7f4517be0eb24d8f32c3dbd6e20ad005e7c64fa1 SHA1 (patch-an) = ec5eb1d7b090e5bb0ef0d9f82f4706720d723a52 SHA1 (patch-ap) = 06c04dfb585891499bd2d26078e6bfb118172dcd -SHA1 (patch-aq) = e044d43a5e5548bf5311c531ddf0e7b431866235 SHA1 (patch-ar) = cafb9f3eec34cc3909eea194c644497ad53960ca SHA1 (patch-as) = 3ef53092e58cf09fe0b60a453c9c00df4b9546d6 -SHA1 (patch-at) = 375db4aa47ad90f41c402f3364e6e0934702a2f1 +SHA1 (patch-at) = 158c05f4c30e92a1c5ca470f763f1038c2c34418 diff --git a/graphics/dx/patches/patch-aa b/graphics/dx/patches/patch-aa deleted file mode 100644 index 5362909676a..00000000000 --- a/graphics/dx/patches/patch-aa +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2002/02/05 22:23:32 drochner Exp $ - ---- src/exec/libdx/message.c.orig Tue Feb 5 12:56:40 2002 -+++ src/exec/libdx/message.c Tue Feb 5 13:05:08 2002 -@@ -21,20 +21,18 @@ - #include <stdlib.h> - #include <string.h> - --#if defined(HAVE_SYS_ERRNO_H) --#include <sys/errno.h> --#endif -- - #if defined(HAVE_ERRNO_H) - #include <errno.h> -+#elif defined(HAVE_SYS_ERRNO_H) -+#include <sys/errno.h> - #endif - -+#if !defined(HAVE_SYS_ERRLIST) - #if defined(HAVE__SYS_ERRLIST) - #define sys_errlist _sys_errlist --#endif -- --#if ! (defined(HAVE_SYS_ERRLIST) || defined(HAVE__SYS_ERRLIST)) -+#else - extern char *sys_errlist[]; -+#endif - #endif - - #if defined(HAVE_IO_H) diff --git a/graphics/dx/patches/patch-am b/graphics/dx/patches/patch-am index 9e83771019b..1a331482f41 100644 --- a/graphics/dx/patches/patch-am +++ b/graphics/dx/patches/patch-am @@ -1,13 +1,13 @@ -$NetBSD: patch-am,v 1.3 2002/02/05 22:23:33 drochner Exp $ +$NetBSD: patch-am,v 1.4 2002/12/05 21:44:31 drochner Exp $ ---- src/uipp/dxuilib/PacketIF.C.orig Tue May 8 17:01:40 2001 -+++ src/uipp/dxuilib/PacketIF.C Tue Feb 5 12:30:34 2002 -@@ -1370,7 +1370,7 @@ +--- src/uipp/dxuilib/PacketIF.C.orig Sat Mar 2 06:04:55 2002 ++++ src/uipp/dxuilib/PacketIF.C Thu Dec 5 20:29:34 2002 +@@ -1429,7 +1429,7 @@ int fd; int sts; int oldPort; --#if !defined(linux) && !defined(cygwin) && !defined(freebsd) && !defined(macos) -+#if !defined(linux) && !defined(cygwin) && !defined(freebsd) && !defined(macos) && !defined(__NetBSD__) +-#if !defined(linux) && !defined(cygwin) && !defined(freebsd) && !defined(macos) && !defined(solaris) ++#if !defined(linux) && !defined(cygwin) && !defined(freebsd) && !defined(macos) && !defined(solaris) && !defined(__NetBSD__) extern int errno; #endif int tries; diff --git a/graphics/dx/patches/patch-aq b/graphics/dx/patches/patch-aq deleted file mode 100644 index 27afd21cefb..00000000000 --- a/graphics/dx/patches/patch-aq +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2002/02/05 22:23:33 drochner Exp $ - ---- src/exec/libdx/edfio.c.orig Tue Feb 5 13:06:47 2002 -+++ src/exec/libdx/edfio.c Tue Feb 5 13:08:55 2002 -@@ -16,20 +16,18 @@ - #include <stdarg.h> - #include <stdlib.h> - --#if defined(HAVE_SYS_ERRNO_H) --#include <sys/errno.h> --#endif -- - #if defined(HAVE_ERRNO_H) - #include <errno.h> -+#elif defined(HAVE_SYS_ERRNO_H) -+#include <sys/errno.h> - #endif - -+#if !defined(HAVE_SYS_ERRLIST) - #if defined(HAVE__SYS_ERRLIST) - #define sys_errlist _sys_errlist --#endif -- --#if ! (defined(HAVE_SYS_ERRLIST) || defined(HAVE__SYS_ERRLIST)) -+#else - extern char *sys_errlist[]; -+#endif - #endif - - #if defined(HAVE_SYS_FILE_H) diff --git a/graphics/dx/patches/patch-at b/graphics/dx/patches/patch-at index 6d6f9ea3d68..8fda59e89fc 100644 --- a/graphics/dx/patches/patch-at +++ b/graphics/dx/patches/patch-at @@ -1,8 +1,8 @@ -$NetBSD: patch-at,v 1.1 2002/02/13 12:43:57 drochner Exp $ +$NetBSD: patch-at,v 1.2 2002/12/05 21:44:31 drochner Exp $ ---- src/uipp/dxuilib/Network.C.orig Mon May 22 18:02:44 2000 -+++ src/uipp/dxuilib/Network.C Wed Feb 13 12:54:36 2002 -@@ -1191,11 +1191,7 @@ +--- src/uipp/dxuilib/Network.C.orig Thu Dec 5 21:05:06 2002 ++++ src/uipp/dxuilib/Network.C Thu Dec 5 21:05:45 2002 +@@ -1194,11 +1194,7 @@ extern FILE* yyin; /* parser input stream */ @@ -12,5 +12,5 @@ $NetBSD: patch-at,v 1.1 2002/02/13 12:43:57 drochner Exp $ extern int yylineno; /* lexer line number */ -#endif - extern int yyparse(); - } + extern int yylexerstate; + 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 |