update to 4.3.2

changes: bugfixes
added dependency on hdf

18 files changed, 469 insertions, 510 deletions

diff --git a/graphics/dx/Makefile b/graphics/dx/Makefile
index 6e2b05f3463..f7f074b59f9 100644
--- a/graphics/dx/Makefile
+++ b/graphics/dx/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.24 2004/01/24 15:46:43 grant Exp $
+# $NetBSD: Makefile,v 1.25 2004/04/20 22:11:48 drochner Exp $
 
-DISTNAME=	dx-4.2.0
-PKGREVISION=	3
+DISTNAME=	dx-4.3.2
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.research.ibm.com/dx/srcDownload/srcArchive/
+MASTER_SITES=	http://opendx.npaci.edu/source/
 
 MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.research.ibm.com/dx/
+HOMEPAGE=	http://www.opendx.org/
 COMMENT=	Open Visualization Data Explorer
 
 USE_BUILDLINK2=		yes
@@ -19,16 +18,15 @@ CONFIGURE_ENV+=		LEX="flex -l"
 # Ensure we export symbols in the linked shared object.
 LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 
-CPPFLAGS+=		-I${BUILDLINK_PREFIX.freetype-lib}/include/freetype
-
 # Override ARCH to avoid picking up a bad ${ARCH} during the build.
 MAKE_ENV+=		ARCH=""
 CONFIGURE_ENV+=		ARCH=""
 
+.include "../../devel/hdf/buildlink2.mk"
 .include "../../devel/netcdf/buildlink2.mk"
+.include "../../graphics/ImageMagick/buildlink2.mk"
 .include "../../graphics/MesaLib/buildlink2.mk"
 .include "../../graphics/glu/buildlink2.mk"
-.include "../../graphics/freetype-lib/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
 .include "../../graphics/tiff/buildlink2.mk"
diff --git a/graphics/dx/PLIST b/graphics/dx/PLIST
index 559b6f652d2..3de406262d0 100644
--- a/graphics/dx/PLIST
+++ b/graphics/dx/PLIST
@@ -1,122 +1,48 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/05 21:44:30 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/04/20 22:11:48 drochner Exp $
 bin/dx
-dx/lib_netbsd/arch.mak
-dx/lib_netbsd/libDXlite.a
-dx/lib_netbsd/libDXcallm.a
-dx/lib_netbsd/libDX.a
-dx/lib_netbsd/libDXL.a
-dx/lib/dx.mdf
-dx/lib/mdf2c.awk
-dx/lib/messages
-dx/lib/colors.txt
-dx/lib/dxfSaveCurrentImage.net
-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
-dx/bin_netbsd/tutor
-dx/bin_netbsd/builder
-dx/bin_netbsd/startupui
-dx/ui/icon50.dat
-dx/ui/icon50.xpm
-dx/ui/logo.dat
-dx/ui/logo.xpm
-dx/ui/ui.mdf
-dx/ui/Basic2D.cfg
-dx/ui/Basic2D.net
-dx/ui/Basic3D.cfg
-dx/ui/Basic3D.net
-dx/ui/FacesLoopsEdges.cfg
-dx/ui/FacesLoopsEdges.net
-dx/ui/GARMWName
-dx/ui/Gridded_2D_1var_notseries.cfg
-dx/ui/Gridded_2D_1var_notseries.net
-dx/ui/Gridded_2D_2ormorevar_notseries.cfg
-dx/ui/Gridded_2D_2ormorevar_notseries.net
-dx/ui/Gridded_3D_1var_notseries.cfg
-dx/ui/Gridded_3D_1var_notseries.net
-dx/ui/ReadImage.cfg
-dx/ui/Gridded_3D_2ormorevar_notseries.cfg
-dx/ui/Gridded_3D_2ormorevar_notseries.net
-dx/ui/ImportSpreadsheetMatrix.cfg
-dx/ui/ImportSpreadsheetMatrix.net
-dx/ui/ImportSpreadsheetTable.cfg
-dx/ui/ImportSpreadsheetTable.net
-dx/ui/ReadImage.net
-dx/ui/UnGridded_2D_1var_notseries.cfg
-dx/ui/UnGridded_2D_1var_notseries.net
-dx/ui/UnGridded_2D_2ormorevar_notseries.cfg
-dx/ui/UnGridded_2D_2ormorevar_notseries.net
-dx/ui/UnGridded_3D_1var_notseries.cfg
-dx/ui/UnGridded_3D_1var_notseries.net
-dx/ui/UnGridded_3D_2ormorevar_notseries.cfg
-dx/ui/UnGridded_3D_2ormorevar_notseries.net
-dx/ui/date.fmt
-dx/ui/decision.cfg
-dx/ui/decision.net
-dx/ui/editorWindow
-dx/ui/help.txt
-dx/ui/imageWindow
-dx/ui/support.txt
-dx/ui/syntax.txt
-dx/ui/testimp.net
-dx/ui/testssheet.net
-dx/ui/viewer.net
-dx/include/dx/UserInteractors.h
-dx/include/dx/advanced.h
-dx/include/dx/arch.h
-dx/include/dx/array.h
-dx/include/dx/arrayhandles.h
-dx/include/dx/basic.h
-dx/include/dx/cache.h
-dx/include/dx/camera.h
-dx/include/dx/clipped.h
-dx/include/dx/component.h
-dx/include/dx/dx.h
-dx/include/dx/error.h
-dx/include/dx/extract.h
-dx/include/dx/field.h
-dx/include/dx/geometry.h
-dx/include/dx/group.h
-dx/include/dx/grow.h
-dx/include/dx/hash.h
-dx/include/dx/helper.h
-dx/include/dx/image.h
-dx/include/dx/import.h
-dx/include/dx/invalid.h
-dx/include/dx/lexical.h
-dx/include/dx/light.h
-dx/include/dx/memory.h
-dx/include/dx/modflags.h
-dx/include/dx/object.h
-dx/include/dx/partition.h
-dx/include/dx/pending.h
-dx/include/dx/pick.h
-dx/include/dx/private.h
-dx/include/dx/rel_1_bc.h
-dx/include/dx/render.h
-dx/include/dx/resampling.h
-dx/include/dx/screen.h
-dx/include/dx/seglist.h
-dx/include/dx/string.h
-dx/include/dx/task.h
-dx/include/dx/timing.h
-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
-dx/help/quikidx
-dx/help/ugidx
-dx/help/svsmstrh
-dx/help/usrefidx
+dx/bin/url_handler.sh
+dx/bin_${LOWER_OPSYS}/builder
+dx/bin_${LOWER_OPSYS}/dxexec
+dx/bin_${LOWER_OPSYS}/dxui
+dx/bin_${LOWER_OPSYS}/prompter
+dx/bin_${LOWER_OPSYS}/startupui
+dx/bin_${LOWER_OPSYS}/tutor
+dx/doc/README
+dx/doc/README_SMP
+dx/doc/README_alphax
+dx/doc/README_aviion
+dx/doc/README_hp700
+dx/doc/README_ibm6000
+dx/doc/README_ibmpvs
+dx/doc/README_indigo
+dx/doc/README_intelnt
+dx/doc/README_sgi
+dx/doc/README_sgi4
+dx/doc/README_solaris
+dx/doc/README_sun4
+dx/fonts/README
+dx/fonts/area.dx
+dx/fonts/cyril_d.dx
+dx/fonts/fixed.dx
+dx/fonts/gothiceng_t.dx
+dx/fonts/gothicger_t.dx
+dx/fonts/gothicit_t.dx
+dx/fonts/greek_d.dx
+dx/fonts/greek_s.dx
+dx/fonts/italic_d.dx
+dx/fonts/italic_t.dx
+dx/fonts/pitman.dx
+dx/fonts/roman_d.dx
+dx/fonts/roman_dser.dx
+dx/fonts/roman_ext.dx
+dx/fonts/roman_s.dx
+dx/fonts/roman_sfix.dx
+dx/fonts/roman_tser.dx
+dx/fonts/script_d.dx
+dx/fonts/script_s.dx
+dx/fonts/variable.dx
 dx/help/GarHelpDir
 dx/help/HelpDir
 dx/help/HelpNotAvailable
@@ -243,7 +169,6 @@ dx/help/dxall1104
 dx/help/dxall1105
 dx/help/dxall1106
 dx/help/dxall1107
-dx/help/dxall12
 dx/help/dxall1108
 dx/help/dxall1109
 dx/help/dxall111
@@ -345,6 +270,7 @@ dx/help/dxall1196
 dx/help/dxall1197
 dx/help/dxall1198
 dx/help/dxall1199
+dx/help/dxall12
 dx/help/dxall120
 dx/help/dxall1200
 dx/help/dxall1201
@@ -469,7 +395,6 @@ dx/help/dxall1308
 dx/help/dxall1309
 dx/help/dxall131
 dx/help/dxall1310
-dx/help/dxall15
 dx/help/dxall1311
 dx/help/dxall1312
 dx/help/dxall1313
@@ -585,6 +510,7 @@ dx/help/dxall146
 dx/help/dxall147
 dx/help/dxall148
 dx/help/dxall149
+dx/help/dxall15
 dx/help/dxall150
 dx/help/dxall151
 dx/help/dxall152
@@ -620,13 +546,13 @@ dx/help/dxall180
 dx/help/dxall181
 dx/help/dxall182
 dx/help/dxall183
-dx/help/dxall19
 dx/help/dxall184
 dx/help/dxall185
 dx/help/dxall186
 dx/help/dxall187
 dx/help/dxall188
 dx/help/dxall189
+dx/help/dxall19
 dx/help/dxall190
 dx/help/dxall191
 dx/help/dxall192
@@ -1424,7 +1350,169 @@ dx/help/dxall998
 dx/help/dxall999
 dx/help/hlpalhtl
 dx/help/hlpall
+dx/help/mbidx
+dx/help/quikidx
 dx/help/spots
+dx/help/svsmstrh
+dx/help/ugidx
+dx/help/usrefidx
+dx/html/Help.idx
+dx/html/README.htm
+dx/html/README_SMP.htm
+dx/html/README_alphax.htm
+dx/html/README_hp700.htm
+dx/html/README_ibm6000.htm
+dx/html/README_intelnt.htm
+dx/html/README_sgi.htm
+dx/html/README_solaris.htm
+dx/html/allguide.htm
+dx/html/images/3dcurs.gif
+dx/html/images/adctlpt.gif
+dx/html/images/arch.gif
+dx/html/images/autoax.gif
+dx/html/images/autoexp.gif
+dx/html/images/brwswin.gif
+dx/html/images/camera.gif
+dx/html/images/cmaped.gif
+dx/html/images/cmputcfg.gif
+dx/html/images/colomap1.gif
+dx/html/images/colormap.gif
+dx/html/images/confgdb.gif
+dx/html/images/ctpanacc.gif
+dx/html/images/ctpangrp.gif
+dx/html/images/ctrlpan.gif
+dx/html/images/dataorg.gif
+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
+dx/html/images/genwave.gif
+dx/html/images/griddb.gif
+dx/html/images/gridtype.gif
+dx/html/images/grparts.gif
+dx/html/images/hand.gif
+dx/html/images/hdrdat.gif
+dx/html/images/hello1.gif
+dx/html/images/hello2.gif
+dx/html/images/helpwin.gif
+dx/html/images/htswork.gif
+dx/html/images/imagwin.gif
+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
+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
+dx/html/images/patrx2.gif
+dx/html/images/patry1.gif
+dx/html/images/patry2.gif
+dx/html/images/prodarxy.gif
+dx/html/images/prodarz.gif
+dx/html/images/prtimg.gif
+dx/html/images/quikovx.gif
+dx/html/images/reggrid.gif
+dx/html/images/rendopts.gif
+dx/html/images/reorient.gif
+dx/html/images/saveas.gif
+dx/html/images/savimg.gif
+dx/html/images/sealevel.gif
+dx/html/images/selattr.gif
+dx/html/images/selctint.gif
+dx/html/images/seqctrl.gif
+dx/html/images/setattr.gif
+dx/html/images/sgroup.gif
+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
+dx/html/images/strtsrv.gif
+dx/html/images/strtsrvo.gif
+dx/html/images/textint.gif
+dx/html/images/throtdb.gif
+dx/html/images/transfrm.gif
+dx/html/images/txtmesh.gif
+dx/html/images/usefle.gif
+dx/html/images/veclist.gif
+dx/html/images/vertord.gif
+dx/html/images/vrtordu1.gif
+dx/html/images/vrtordu2.gif
+dx/html/images/vuctrl.gif
+dx/html/images/wrpdgrid.gif
+dx/html/images/xgroup.gif
+dx/html/images/xgrpasgn.gif
+dx/html/images/xirega.gif
+dx/html/images/xmesha.gif
+dx/html/images/xmodf1.gif
+dx/html/images/xmodf10.gif
+dx/html/images/xmodf11.gif
+dx/html/images/xmodf12.gif
+dx/html/images/xmodf13.gif
+dx/html/images/xmodf2.gif
+dx/html/images/xmodf3.gif
+dx/html/images/xmodf4.gif
+dx/html/images/xmodf6.gif
+dx/html/images/xmodf7.gif
+dx/html/images/xmodf8.gif
+dx/html/images/xmodf9.gif
+dx/html/images/xmpmacro.gif
+dx/html/images/xproda.gif
+dx/html/index.htm
+dx/html/index.html
+dx/html/insguide.htm
+dx/html/notfound.htm
 dx/html/pages/insgu002.htm
 dx/html/pages/insgu003.htm
 dx/html/pages/insgu004.htm
@@ -2014,6 +2102,7 @@ dx/html/pages/refgu172.htm
 dx/html/pages/refgu173.htm
 dx/html/pages/refgu174.htm
 dx/html/pages/refgu175.htm
+dx/html/pages/refgu176.htm
 dx/html/pages/usrgu002.htm
 dx/html/pages/usrgu003.htm
 dx/html/pages/usrgu004.htm
@@ -2093,161 +2182,6 @@ 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
-dx/html/images/autoax.gif
-dx/html/images/autoexp.gif
-dx/html/images/brwswin.gif
-dx/html/images/camera.gif
-dx/html/images/cmaped.gif
-dx/html/images/cmputcfg.gif
-dx/html/images/colomap1.gif
-dx/html/images/colormap.gif
-dx/html/images/confgdb.gif
-dx/html/images/ctpanacc.gif
-dx/html/images/ctpangrp.gif
-dx/html/images/ctrlpan.gif
-dx/html/images/dataorg.gif
-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
-dx/html/images/genwave.gif
-dx/html/images/griddb.gif
-dx/html/images/gridtype.gif
-dx/html/images/grparts.gif
-dx/html/images/hand.gif
-dx/html/images/hdrdat.gif
-dx/html/images/hello1.gif
-dx/html/images/hello2.gif
-dx/html/images/helpwin.gif
-dx/html/images/htswork.gif
-dx/html/images/imagwin.gif
-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
-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
-dx/html/images/patrx2.gif
-dx/html/images/patry1.gif
-dx/html/images/patry2.gif
-dx/html/images/prodarxy.gif
-dx/html/images/prodarz.gif
-dx/html/images/prtimg.gif
-dx/html/images/quikovx.gif
-dx/html/images/reggrid.gif
-dx/html/images/rendopts.gif
-dx/html/images/reorient.gif
-dx/html/images/saveas.gif
-dx/html/images/savimg.gif
-dx/html/images/sealevel.gif
-dx/html/images/selattr.gif
-dx/html/images/selctint.gif
-dx/html/images/seqctrl.gif
-dx/html/images/setattr.gif
-dx/html/images/sgroup.gif
-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
-dx/html/images/strtsrv.gif
-dx/html/images/strtsrvo.gif
-dx/html/images/textint.gif
-dx/html/images/throtdb.gif
-dx/html/images/transfrm.gif
-dx/html/images/txtmesh.gif
-dx/html/images/usefle.gif
-dx/html/images/veclist.gif
-dx/html/images/vertord.gif
-dx/html/images/vrtordu1.gif
-dx/html/images/vrtordu2.gif
-dx/html/images/vuctrl.gif
-dx/html/images/wrpdgrid.gif
-dx/html/images/xgroup.gif
-dx/html/images/xgrpasgn.gif
-dx/html/images/xirega.gif
-dx/html/images/xmesha.gif
-dx/html/images/xmodf1.gif
-dx/html/images/xmodf10.gif
-dx/html/images/xmodf11.gif
-dx/html/images/xmodf12.gif
-dx/html/images/xmodf13.gif
-dx/html/images/xmodf2.gif
-dx/html/images/xmodf3.gif
-dx/html/images/xmodf4.gif
-dx/html/images/xmodf6.gif
-dx/html/images/xmodf7.gif
-dx/html/images/xmodf8.gif
-dx/html/images/xmodf9.gif
-dx/html/images/xmpmacro.gif
-dx/html/images/xproda.gif
-dx/html/README.htm
-dx/html/README_SMP.htm
-dx/html/README_alphax.htm
-dx/html/README_hp700.htm
-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
@@ -2257,58 +2191,131 @@ dx/html/srchidx.js
 dx/html/srchindx.htm
 dx/html/srchnav.htm
 dx/html/usrguide.htm
-dx/html/index.htm
-dx/html/index.html
-dx/man/manl/dx.l
+dx/include/dx/UserInteractors.h
+dx/include/dx/advanced.h
+dx/include/dx/arch.h
+dx/include/dx/array.h
+dx/include/dx/arrayhandles.h
+dx/include/dx/basic.h
+dx/include/dx/cache.h
+dx/include/dx/camera.h
+dx/include/dx/clipped.h
+dx/include/dx/component.h
+dx/include/dx/dx.h
+dx/include/dx/error.h
+dx/include/dx/extract.h
+dx/include/dx/field.h
+dx/include/dx/geometry.h
+dx/include/dx/group.h
+dx/include/dx/grow.h
+dx/include/dx/hash.h
+dx/include/dx/helper.h
+dx/include/dx/image.h
+dx/include/dx/import.h
+dx/include/dx/invalid.h
+dx/include/dx/lexical.h
+dx/include/dx/light.h
+dx/include/dx/memory.h
+dx/include/dx/modflags.h
+dx/include/dx/object.h
+dx/include/dx/partition.h
+dx/include/dx/pending.h
+dx/include/dx/pick.h
+dx/include/dx/private.h
+dx/include/dx/rel_1_bc.h
+dx/include/dx/render.h
+dx/include/dx/resampling.h
+dx/include/dx/screen.h
+dx/include/dx/seglist.h
+dx/include/dx/string.h
+dx/include/dx/task.h
+dx/include/dx/timing.h
+dx/include/dx/version.h
+dx/include/dx/xform.h
+dx/include/dxconfig.h
+dx/include/dxl.h
+dx/include/dxstereo.h
+dx/lib/colors.txt
+dx/lib/dx.mdf
+dx/lib/dxexec.def
+dx/lib/dxexec.exp
+dx/lib/dxexec.ifs
+dx/lib/dxexec.imp
+dx/lib/dxfSaveCurrentImage.net
+dx/lib/dxrc
+dx/lib/mdf2c.awk
+dx/lib/messages
+dx/lib/outboard.c
+dx/lib_${LOWER_OPSYS}/arch.mak
+dx/lib_${LOWER_OPSYS}/libDX.a
+dx/lib_${LOWER_OPSYS}/libDX.la
+dx/lib_${LOWER_OPSYS}/libDXL.a
+dx/lib_${LOWER_OPSYS}/libDXL.la
+dx/lib_${LOWER_OPSYS}/libDXcallm.a
+dx/lib_${LOWER_OPSYS}/libDXcallm.la
+dx/lib_${LOWER_OPSYS}/libDXlite.a
+dx/lib_${LOWER_OPSYS}/libDXlite.la
 dx/man/catl/dx.0
-dx/fonts/Readme
-dx/fonts/area.dx
-dx/fonts/cyril_d.dx
-dx/fonts/fixed.dx
-dx/fonts/gothiceng_t.dx
-dx/fonts/gothicger_t.dx
-dx/fonts/gothicit_t.dx
-dx/fonts/greek_d.dx
-dx/fonts/greek_s.dx
-dx/fonts/italic_d.dx
-dx/fonts/italic_t.dx
-dx/fonts/pitman.dx
-dx/fonts/roman_d.dx
-dx/fonts/roman_dser.dx
-dx/fonts/roman_ext.dx
-dx/fonts/roman_s.dx
-dx/fonts/roman_sfix.dx
-dx/fonts/roman_tser.dx
-dx/fonts/script_d.dx
-dx/fonts/script_s.dx
-dx/fonts/variable.dx
-dx/doc/README
-dx/doc/README_SMP
-dx/doc/README_alphax
-dx/doc/README_aviion
-dx/doc/README_hp700
-dx/doc/README_ibm6000
-dx/doc/README_ibmpvs
-dx/doc/README_indigo
-dx/doc/README_intelnt
-dx/doc/README_sgi
-dx/doc/README_sgi4
-dx/doc/README_solaris
-dx/doc/README_sun4
-@dirrm dx/lib_netbsd
-@dirrm dx/lib
-@dirrm dx/bin_netbsd
+dx/man/manl/dx.l
+dx/ui/Basic2D.cfg
+dx/ui/Basic2D.net
+dx/ui/Basic3D.cfg
+dx/ui/Basic3D.net
+dx/ui/FacesLoopsEdges.cfg
+dx/ui/FacesLoopsEdges.net
+dx/ui/GARMWName
+dx/ui/Gridded_2D_1var_notseries.cfg
+dx/ui/Gridded_2D_1var_notseries.net
+dx/ui/Gridded_2D_2ormorevar_notseries.cfg
+dx/ui/Gridded_2D_2ormorevar_notseries.net
+dx/ui/Gridded_3D_1var_notseries.cfg
+dx/ui/Gridded_3D_1var_notseries.net
+dx/ui/Gridded_3D_2ormorevar_notseries.cfg
+dx/ui/Gridded_3D_2ormorevar_notseries.net
+dx/ui/ImportSpreadsheetMatrix.cfg
+dx/ui/ImportSpreadsheetMatrix.net
+dx/ui/ImportSpreadsheetTable.cfg
+dx/ui/ImportSpreadsheetTable.net
+dx/ui/ReadImage.cfg
+dx/ui/ReadImage.net
+dx/ui/UnGridded_2D_1var_notseries.cfg
+dx/ui/UnGridded_2D_1var_notseries.net
+dx/ui/UnGridded_2D_2ormorevar_notseries.cfg
+dx/ui/UnGridded_2D_2ormorevar_notseries.net
+dx/ui/UnGridded_3D_1var_notseries.cfg
+dx/ui/UnGridded_3D_1var_notseries.net
+dx/ui/UnGridded_3D_2ormorevar_notseries.cfg
+dx/ui/UnGridded_3D_2ormorevar_notseries.net
+dx/ui/date.fmt
+dx/ui/decision.cfg
+dx/ui/decision.net
+dx/ui/editorWindow
+dx/ui/help.txt
+dx/ui/icon50.dat
+dx/ui/icon50.xpm
+dx/ui/imageWindow
+dx/ui/logo.dat
+dx/ui/logo.xpm
+dx/ui/support.txt
+dx/ui/syntax.txt
+dx/ui/testimp.net
+dx/ui/testssheet.net
+dx/ui/ui.mdf
+dx/ui/viewer.net
 @dirrm dx/ui
+@dirrm dx/man/manl
+@dirrm dx/man/catl
+@dirrm dx/man
+@dirrm dx/lib_${LOWER_OPSYS}
+@dirrm dx/lib
 @dirrm dx/include/dx
 @dirrm dx/include
-@dirrm dx/bin
-@dirrm dx/help
 @dirrm dx/html/pages
 @dirrm dx/html/images
 @dirrm dx/html
-@dirrm dx/man/manl
-@dirrm dx/man/catl
-@dirrm dx/man
+@dirrm dx/help
 @dirrm dx/fonts
 @dirrm dx/doc
+@dirrm dx/bin_${LOWER_OPSYS}
+@dirrm dx/bin
 @dirrm dx
diff --git a/graphics/dx/distinfo b/graphics/dx/distinfo
index 669b82012d1..2f6094e624c 100644
--- a/graphics/dx/distinfo
+++ b/graphics/dx/distinfo
@@ -1,17 +1,15 @@
-$NetBSD: distinfo,v 1.8 2003/11/16 15:58:52 cube Exp $
+$NetBSD: distinfo,v 1.9 2004/04/20 22:11:48 drochner Exp $
 
-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 (dx-4.3.2.tar.gz) = e05c28b8db33c9e647bede27d1cc3cfd4146d524
+Size (dx-4.3.2.tar.gz) = 9904514 bytes
+SHA1 (patch-ab) = 3daeff45ae9a15d556895b6c7a60edee1e00ec61
+SHA1 (patch-ac) = 4702813a5fa9efc48e947ec0b2ce4099c303d521
+SHA1 (patch-ad) = 4a1a74772d4c9fd6838a52ae210f4562e6d4591e
+SHA1 (patch-ae) = c9c63152d4e87be5016026858636a2e774580c96
 SHA1 (patch-af) = 4873080df4c3f055f5b30c349ccd9e9cf70f12e1
 SHA1 (patch-aj) = accb0b163687c73c68ad00b50b66c2d7252e487f
-SHA1 (patch-am) = 7f4517be0eb24d8f32c3dbd6e20ad005e7c64fa1
-SHA1 (patch-an) = ec5eb1d7b090e5bb0ef0d9f82f4706720d723a52
-SHA1 (patch-ap) = 06c04dfb585891499bd2d26078e6bfb118172dcd
+SHA1 (patch-am) = 45f1320ac827165e8a89aebdcffe245a7f84e6b5
+SHA1 (patch-an) = e7eb5d67c9c9c5492be94b02afc4eb7856da77dc
+SHA1 (patch-ap) = d67158b45960b86cad02d2364158d1667990c294
 SHA1 (patch-ar) = cafb9f3eec34cc3909eea194c644497ad53960ca
-SHA1 (patch-as) = 3ef53092e58cf09fe0b60a453c9c00df4b9546d6
-SHA1 (patch-at) = 158c05f4c30e92a1c5ca470f763f1038c2c34418
-SHA1 (patch-au) = 7e5e6a865e15d70aaf05daa98b31fff99f3a84f2
+SHA1 (patch-ba) = 4c8a7bbc12f5c0fd4e0ff496dc6232df4693a664
diff --git a/graphics/dx/patches/patch-ab b/graphics/dx/patches/patch-ab
index 19485b3d3dc..f2131632bda 100644
--- a/graphics/dx/patches/patch-ab
+++ b/graphics/dx/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2002/02/05 22:23:32 drochner Exp $
+$NetBSD: patch-ab,v 1.5 2004/04/20 22:11:48 drochner Exp $
 
---- configure.orig	Thu Jun  7 17:09:59 2001
-+++ configure	Tue Feb  5 12:18:11 2002
-@@ -1330,6 +1330,8 @@
+--- configure.orig	2003-09-26 22:13:01.000000000 +0000
++++ configure	2004-04-20 19:09:10.000000000 +0000
+@@ -18614,6 +18614,8 @@
  	    ac_cv_dx_arch=unknown
  	    if test $unameS = "FreeBSD" ; then
  		ac_cv_dx_arch=freebsd
@@ -11,11 +11,3 @@ $NetBSD: patch-ab,v 1.4 2002/02/05 22:23:32 drochner Exp $
  	    elif test `echo $unameS | tr A-Z a-z | sed "s/^.*cygwin.*$/yes/"` = "yes" ; then
  		ac_cv_dx_arch=cygwin
  	    elif test $unameS = "Linux" ; then
-@@ -4021,6 +4023,7 @@
-   ac_cv_have_x="have_x=yes \
- 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-   echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
-+  eval "$ac_cv_have_x"
- fi
- 
- if test "$x_includes" != "" ; then
diff --git a/graphics/dx/patches/patch-ac b/graphics/dx/patches/patch-ac
index 800815f3cd4..66dae30dd2f 100644
--- a/graphics/dx/patches/patch-ac
+++ b/graphics/dx/patches/patch-ac
@@ -1,25 +1,26 @@
-$NetBSD: patch-ac,v 1.2 2002/02/05 22:23:32 drochner Exp $
+$NetBSD: patch-ac,v 1.3 2004/04/20 22:11:48 drochner Exp $
 
---- bin/dxworker.in.orig	Tue May  8 17:01:28 2001
-+++ bin/dxworker.in	Tue Feb  5 12:19:49 2002
-@@ -29,6 +29,12 @@
+--- bin/dx.in.orig	2004-04-20 19:20:17.000000000 +0000
++++ bin/dx.in	2004-04-20 19:21:58.000000000 +0000
+@@ -346,6 +346,12 @@
  
-     breaksw
+     ;;
  
-+  case NetBSD:
-+    set exarch=netbsd
-+    set uiarch=netbsd
++  NetBSD)
++    exarch=netbsd
++    uiarch=netbsd
 +
-+    breaksw
++    ;;
 +
-   case AIX*:
-     set exarch=ibm6000
-     set uiarch=ibm6000
-@@ -1464,6 +1470,7 @@
-   case alphax:
-   case linux:
-   case freebsd:
-+  case netbsd:
-   case macos:
-     breaksw
-   
+   AIX*)
+     exarch=ibm6000
+     uiarch=ibm6000
+@@ -1823,7 +1829,7 @@
+       echo "WARNING!  This machine appears to NOT be a model 7xx/8xx"
+       echo "Continuing, but unexpected errors may result."
+     fi ;;
+-  sun4|solaris|aviion|alphax|linux|freebsd|macos|cygwin)
++  sun4|solaris|aviion|alphax|linux|freebsd|netbsd|macos|cygwin)
+     ;;
+   *)
+     echo "DX user interface does not run on this architecture"
diff --git a/graphics/dx/patches/patch-ad b/graphics/dx/patches/patch-ad
index 32615eb1989..9571c9da550 100644
--- a/graphics/dx/patches/patch-ad
+++ b/graphics/dx/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.2 2002/02/05 22:23:32 drochner Exp $
+$NetBSD: patch-ad,v 1.3 2004/04/20 22:11:48 drochner Exp $
 
---- include/dx/arch.h.orig	Mon May 21 07:06:57 2001
-+++ include/dx/arch.h	Tue Feb  5 12:21:36 2002
-@@ -175,7 +175,7 @@
+--- include/dx/arch.h.orig	2003-07-12 00:12:02.000000000 +0000
++++ include/dx/arch.h	2004-04-20 19:22:51.000000000 +0000
+@@ -180,7 +180,7 @@
  /* 
   * FreeBSD (and probably NetBSD and OpenBSD)
   */
diff --git a/graphics/dx/patches/patch-ae b/graphics/dx/patches/patch-ae
index e589acd1f29..8a1042ae754 100644
--- a/graphics/dx/patches/patch-ae
+++ b/graphics/dx/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.2 2002/02/05 22:23:32 drochner Exp $
+$NetBSD: patch-ae,v 1.3 2004/04/20 22:11:48 drochner Exp $
 
---- src/exec/dpexec/loader.c.orig	Mon May 21 07:06:58 2001
-+++ src/exec/dpexec/loader.c	Tue Feb  5 13:22:41 2002
+--- src/exec/dpexec/loader.c.orig	2003-10-29 17:34:13.000000000 +0000
++++ src/exec/dpexec/loader.c	2004-04-20 19:23:40.000000000 +0000
 @@ -38,21 +38,19 @@
  #include <stdio.h>
  #include <stdlib.h>
@@ -29,21 +29,3 @@ $NetBSD: patch-ae,v 1.2 2002/02/05 22:23:32 drochner Exp $
  
  
  #include <sys/stat.h> 
-@@ -88,7 +86,7 @@
- #endif /* hp700 */
- 
- 
--#if defined(sun4) || defined(solaris) || defined(sgi) || defined(alphax) || defined(aviion) || defined(linux) || defined(cygwin) || defined(freebsd) || defined(macos)
-+#if defined(sun4) || defined(solaris) || defined(sgi) || defined(alphax) || defined(aviion) || defined(linux) || defined(cygwin) || defined(freebsd) || defined(macos) || defined(__NetBSD__)
- 
- #include <dlfcn.h>
- typedef void *Handle;
-@@ -571,7 +569,7 @@
- #endif  /* hp700 */
- 
- 
--#if defined(sun4) || defined(solaris) || defined(sgi) || defined(alphax) || defined(aviion) || defined(linux) || defined(cygwin) || defined(freebsd) || defined(macos)
-+#if defined(sun4) || defined(solaris) || defined(sgi) || defined(alphax) || defined(aviion) || defined(linux) || defined(cygwin) || defined(freebsd) || defined(macos) || defined(__NetBSD__)
- 
- 
- #define __ROUTINES_DEF
diff --git a/graphics/dx/patches/patch-am b/graphics/dx/patches/patch-am
index 1a331482f41..b1162e5e371 100644
--- a/graphics/dx/patches/patch-am
+++ b/graphics/dx/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.4 2002/12/05 21:44:31 drochner Exp $
+$NetBSD: patch-am,v 1.5 2004/04/20 22:11:48 drochner Exp $
 
---- 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 @@
+--- src/uipp/dxuilib/PacketIF.C.orig	2003-09-26 17:38:11.000000000 +0000
++++ src/uipp/dxuilib/PacketIF.C	2004-04-20 19:26:00.000000000 +0000
+@@ -1418,7 +1418,7 @@
      int fd;
      int sts;
      int oldPort;
diff --git a/graphics/dx/patches/patch-an b/graphics/dx/patches/patch-an
index 114aff2afef..a508cef7b16 100644
--- a/graphics/dx/patches/patch-an
+++ b/graphics/dx/patches/patch-an
@@ -1,16 +1,15 @@
-$NetBSD: patch-an,v 1.1 2001/02/26 19:00:56 wiz Exp $
+$NetBSD: patch-an,v 1.2 2004/04/20 22:11:48 drochner Exp $
 
---- man/catl/Makefile.in.orig	Wed Apr  5 21:02:18 2000
-+++ man/catl/Makefile.in
-@@ -132,9 +132,9 @@
+--- man/catl/Makefile.in.orig	2003-09-26 22:19:38.000000000 +0000
++++ man/catl/Makefile.in	2004-04-20 19:29:31.000000000 +0000
+@@ -213,8 +213,8 @@
  	@list='$(cat_DATA)'; for p in $$list; do \
- 	  if test -f $(srcdir)/$$p; then \
- 	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(catdir)/$$p"; \
--	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(catdir)/$$p; \
-+	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(catdir)/dx.0; \
- 	  else if test -f $$p; then \
--	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(catdir)/$$p"; \
-+	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(catdir)/dx.0"; \
- 	    $(INSTALL_DATA) $$p $(DESTDIR)$(catdir)/$$p; \
- 	  fi; fi; \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(catDATA_INSTALL) $$d$$p $(DESTDIR)$(catdir)/$$f"; \
+-	  $(catDATA_INSTALL) $$d$$p $(DESTDIR)$(catdir)/$$f; \
++	  echo " $(catDATA_INSTALL) $$d$$p $(DESTDIR)$(catdir)/dx.0"; \
++	  $(catDATA_INSTALL) $$d$$p $(DESTDIR)$(catdir)/dx.0; \
  	done
+ 
+ uninstall-catDATA:
diff --git a/graphics/dx/patches/patch-ap b/graphics/dx/patches/patch-ap
index 4a731e2da7b..353737ce670 100644
--- a/graphics/dx/patches/patch-ap
+++ b/graphics/dx/patches/patch-ap
@@ -1,14 +1,14 @@
-$NetBSD: patch-ap,v 1.1 2001/02/26 19:00:56 wiz Exp $
+$NetBSD: patch-ap,v 1.2 2004/04/20 22:11:48 drochner Exp $
 
---- src/exec/dxexec/Makefile.in.orig	Wed Apr  5 21:01:12 2000
-+++ src/exec/dxexec/Makefile.in
-@@ -139,7 +139,8 @@
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- src/exec/dxexec/Makefile.in.orig	2003-09-26 22:22:50.000000000 +0000
++++ src/exec/dxexec/Makefile.in	2004-04-20 19:31:41.000000000 +0000
+@@ -219,7 +219,8 @@
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+ 	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
--LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 +CXXLD = $(CXX)
-+LINK = $(CXXLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
- DIST_COMMON =  Makefile.am Makefile.in
- 
- 
++LINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DIST_SOURCES = $(libDXEXEC_la_SOURCES) $(dxexec_SOURCES)
+ DIST_COMMON = Makefile.am Makefile.in
diff --git a/graphics/dx/patches/patch-as b/graphics/dx/patches/patch-as
deleted file mode 100644
index b915eb64868..00000000000
--- a/graphics/dx/patches/patch-as
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-as,v 1.1 2002/02/05 22:23:33 drochner Exp $
-
---- src/exec/dpexec/remote.c.orig	Tue Feb  5 15:19:40 2002
-+++ src/exec/dpexec/remote.c	Tue Feb  5 15:27:11 2002
-@@ -103,14 +103,18 @@
- Error ExHostToFQDN( const char host[], char fqdn[MAXHOSTNAMELEN] )
- {
-     struct hostent *hp, *hp2;
-+    void *addr;
- 
-     hp = gethostbyname(host);
-     if ( hp == NULL || hp->h_addr_list[0] == NULL ) {
-        DXUIMessage("ERROR", "gethostbyname returned error");
-        return ERROR;
-     }
--    hp2 = gethostbyaddr( hp->h_addr_list[0], sizeof(struct in_addr),
-+    addr = malloc(hp->h_length);
-+    memcpy(addr, hp->h_addr_list[0], hp->h_length);
-+    hp2 = gethostbyaddr(addr, hp->h_length,
-                         AF_INET );
-+    free(addr);
-     if ( hp2 == NULL || hp2->h_name == NULL ) {
-        DXUIMessage("ERROR", "gethostbyaddr returned error");
-        return ERROR;
diff --git a/graphics/dx/patches/patch-at b/graphics/dx/patches/patch-at
deleted file mode 100644
index 8fda59e89fc..00000000000
--- a/graphics/dx/patches/patch-at
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-at,v 1.2 2002/12/05 21:44:31 drochner Exp $
-
---- 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	  */
- 
--#if defined(USING_BISON)
--int yylineno;
--#else
- extern int yylineno;			/* lexer line number      */
--#endif
- 
- extern int yylexerstate;
- 
diff --git a/graphics/dx/patches/patch-au b/graphics/dx/patches/patch-au
deleted file mode 100644
index 23870a53933..00000000000
--- a/graphics/dx/patches/patch-au
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-au,v 1.1 2003/11/16 15:58:52 cube Exp $
-
---- src/uipp/widgets/NumberInput.h.orig	2002-01-13 18:48:48.000000000 +0100
-+++ src/uipp/widgets/NumberInput.h
-@@ -11,8 +11,7 @@
- #include <ctype.h>	/*  issspace(), isdigit(), isalnum()  */
- #include <stdlib.h>	/*  strtod()  */
- #include <errno.h>	/*  errno, ERANGE  */
--#define XK_MISCELLANY 1
--#include <X11/keysymdef.h>
-+#include <X11/keysym.h>
- 
- #if defined(__cplusplus) || defined(c_plusplus)
- extern "C" {
diff --git a/graphics/dx/patches/patch-ba b/graphics/dx/patches/patch-ba
new file mode 100644
index 00000000000..b79593bd1ed
--- /dev/null
+++ b/graphics/dx/patches/patch-ba
@@ -0,0 +1,31 @@
+$NetBSD: patch-ba,v 1.1 2004/04/20 22:11:48 drochner Exp $
+
+--- src/exec/libdx/memory.c.orig	2004-04-20 20:55:28.000000000 +0000
++++ src/exec/libdx/memory.c	2004-04-20 21:05:24.000000000 +0000
+@@ -70,7 +70,7 @@
+ #include <sys/sysinfo.h>
+ #endif
+ 
+-#if freebsd
++#if defined(freebsd) || defined(__NetBSD__)
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+ #endif
+@@ -1073,7 +1073,7 @@
+ #define LARGE(x) ((ulong)x>=(ulong)large)
+ #endif
+ 
+-#ifdef freebsd
++#if defined(freebsd) || defined(__NetBSD__)
+ #define initvalues
+ #define SMALL_BASE    0               /* use data segment */
+ #define SMALL_GET     _dxfgetmem      /* expand by using DosSetMem */
+@@ -1449,7 +1449,7 @@
+ 	}
+ #endif
+ 
+-#if freebsd
++#if defined(freebsd) || defined(__NetBSD__)
+   int mib[2],hw_physmem;
+   size_t len;
+   
diff --git a/graphics/dxsamples/Makefile b/graphics/dxsamples/Makefile
index 189d0b50984..c05812a37ae 100644
--- a/graphics/dxsamples/Makefile
+++ b/graphics/dxsamples/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2004/01/24 15:46:43 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/20 22:11:48 drochner Exp $
 
-DISTNAME=	dxsamples-4.2.0
+DISTNAME=	dxsamples-4.3.2
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.research.ibm.com/dx/srcDownload/srcArchive/
+MASTER_SITES=	http://opendx.npaci.edu/source/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.research.ibm.com/dx/
diff --git a/graphics/dxsamples/PLIST b/graphics/dxsamples/PLIST
index 1ea7bc801cc..da337e498ff 100644
--- a/graphics/dxsamples/PLIST
+++ b/graphics/dxsamples/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/05 21:44:32 drochner Exp $
-dx/samples/callmodule/Readme
+@comment $NetBSD: PLIST,v 1.4 2004/04/20 22:11:48 drochner Exp $
+dx/samples/callmodule/README
 dx/samples/callmodule/Simple.c
 dx/samples/callmodule/ThunderStreamlines.c
 dx/samples/callmodule/makefile
@@ -21,8 +21,8 @@ dx/samples/data/MOS_states.dx
 dx/samples/data/MOS_zips.dx
 dx/samples/data/MRI.data
 dx/samples/data/Polylines.dx
+dx/samples/data/README
 dx/samples/data/ROM_ozone.dx
-dx/samples/data/Readme
 dx/samples/data/background.tiff
 dx/samples/data/block_example.data
 dx/samples/data/block_example.general
@@ -165,10 +165,12 @@ dx/samples/dxlink/Makefile_aviion
 dx/samples/dxlink/Makefile_hp700
 dx/samples/dxlink/Makefile_ibm6000
 dx/samples/dxlink/Makefile_intelnt
+dx/samples/dxlink/Makefile_linux
+dx/samples/dxlink/Makefile_macos
 dx/samples/dxlink/Makefile_sgi
 dx/samples/dxlink/Makefile_solaris
 dx/samples/dxlink/Makefile_sun4
-dx/samples/dxlink/Readme
+dx/samples/dxlink/README
 dx/samples/dxlink/Sealevel150.rgb
 dx/samples/dxlink/Sealevel150.size
 dx/samples/dxlink/cappediso150.rgb
@@ -221,7 +223,7 @@ dx/samples/outboard/Makefile_os2
 dx/samples/outboard/Makefile_sgi
 dx/samples/outboard/Makefile_solaris
 dx/samples/outboard/Makefile_sun4
-dx/samples/outboard/Readme
+dx/samples/outboard/README
 dx/samples/outboard/async.c
 dx/samples/outboard/async.mdf
 dx/samples/outboard/dummy.c
@@ -236,7 +238,7 @@ dx/samples/outboard/watchsocket.c
 dx/samples/outboard/watchsocket.cfg
 dx/samples/outboard/watchsocket.mdf
 dx/samples/outboard/watchsocket.net
-dx/samples/program_guide/Readme
+dx/samples/program_guide/README
 dx/samples/program_guide/add.c
 dx/samples/program_guide/add.cfg
 dx/samples/program_guide/add.mb
@@ -799,6 +801,7 @@ dx/samples/programs/ProbeText.cfg
 dx/samples/programs/ProbeText.net
 dx/samples/programs/QuantizeImage.cfg
 dx/samples/programs/QuantizeImage.net
+dx/samples/programs/README
 dx/samples/programs/RENDERING/FatLines.cfg
 dx/samples/programs/RENDERING/FatLines.net
 dx/samples/programs/RENDERING/Isolate.cfg
@@ -819,7 +822,6 @@ dx/samples/programs/RENDERING/VolumeRendering.cfg
 dx/samples/programs/RENDERING/VolumeRendering.net
 dx/samples/programs/RENDERING/VolumeRenderingSimple.cfg
 dx/samples/programs/RENDERING/VolumeRenderingSimple.net
-dx/samples/programs/Readme
 dx/samples/programs/Reduce.cfg
 dx/samples/programs/Reduce.net
 dx/samples/programs/Refine.cfg
@@ -1119,8 +1121,8 @@ dx/samples/scripts/Partition
 dx/samples/scripts/Plot
 dx/samples/scripts/Post
 dx/samples/scripts/Print
+dx/samples/scripts/README
 dx/samples/scripts/ReadImage
-dx/samples/scripts/Readme
 dx/samples/scripts/Reduce
 dx/samples/scripts/Refine
 dx/samples/scripts/Regrid
@@ -1170,7 +1172,7 @@ 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/README
 dx/samples/supervise/complexdemo/data/frags.dx
 dx/samples/supervise/complexdemo/demo
 dx/samples/supervise/complexdemo/interactors/Makefile
@@ -1185,7 +1187,7 @@ dx/samples/supervise/complexdemo/nets/ShowSelected.net
 dx/samples/supervise/complexdemo/nets/hiliteObject.net
 dx/samples/supervise/complexdemo/nets/peruDX.cfg
 dx/samples/supervise/complexdemo/nets/peruDX.net
-dx/samples/supervise/imagedemo/ReadMe
+dx/samples/supervise/imagedemo/README
 dx/samples/supervise/imagedemo/demo
 dx/samples/supervise/imagedemo/demo.cfg
 dx/samples/supervise/imagedemo/demo.net
@@ -1200,10 +1202,10 @@ dx/samples/supervise/interactors/Makefile_ibm6000
 dx/samples/supervise/interactors/Makefile_sgi
 dx/samples/supervise/interactors/Makefile_solaris
 dx/samples/supervise/interactors/Makefile_sun4
-dx/samples/supervise/interactors/ReadMe
+dx/samples/supervise/interactors/README
 dx/samples/supervise/interactors/module_make
 dx/samples/supervise/interactors/myinteractors.c
-dx/samples/supervise/mediumdemo/ReadMe
+dx/samples/supervise/mediumdemo/README
 dx/samples/supervise/mediumdemo/demo
 dx/samples/supervise/mediumdemo/interactors/Makefile
 dx/samples/supervise/mediumdemo/interactors/Makefile_alphax
@@ -1213,7 +1215,7 @@ dx/samples/supervise/mediumdemo/interactors/Makefile_sgi
 dx/samples/supervise/mediumdemo/interactors/Makefile_solaris
 dx/samples/supervise/mediumdemo/interactors/interactors.c
 dx/samples/supervise/mediumdemo/interactors/module_make
-dx/samples/supervise/simpledemo/ReadMe
+dx/samples/supervise/simpledemo/README
 dx/samples/supervise/simpledemo/demo
 dx/samples/supervise/simpledemo/demo.cfg
 dx/samples/supervise/simpledemo/demo.net
@@ -1320,7 +1322,7 @@ dx/samples/user/Makefile_outboard_intelnt
 dx/samples/user/Makefile_outboard_sgi
 dx/samples/user/Makefile_outboard_solaris
 dx/samples/user/Makefile_outboard_sun4
-dx/samples/user/Readme
+dx/samples/user/README
 dx/samples/user/add.c
 dx/samples/user/hello.c
 dx/samples/user/hello_loadable.mdf
@@ -1329,6 +1331,8 @@ dx/samples/user/user_inboard.mdf
 dx/samples/user/user_loadable.mdf
 dx/samples/user/user_outboard.mdf
 dx/samples/util/Makefile.sample
+dx/samples/util/biorad-pic/PIC2dx.c
+dx/samples/util/biorad-pic/README
 dx/samples/util/dxf/MANIFEST
 dx/samples/util/dxf/Makefile.sample
 dx/samples/util/dxf/README
@@ -1361,6 +1365,7 @@ dx/samples/util/plot3d/README
 @dirrm dx/samples/util/mpeg
 @dirrm dx/samples/util/fluent
 @dirrm dx/samples/util/dxf
+@dirrm dx/samples/util/biorad-pic
 @dirrm dx/samples/util
 @dirrm dx/samples/user
 @dirrm dx/samples/tutorial
diff --git a/graphics/dxsamples/distinfo b/graphics/dxsamples/distinfo
index 4fc37a4cd67..6fddb16684b 100644
--- a/graphics/dxsamples/distinfo
+++ b/graphics/dxsamples/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2002/12/05 21:44:32 drochner Exp $
+$NetBSD: distinfo,v 1.5 2004/04/20 22:11:48 drochner Exp $
 
-SHA1 (dxsamples-4.2.0.tar.gz) = 1e2d99c5537f83129c81823d963cc74df8d51b8c
-Size (dxsamples-4.2.0.tar.gz) = 7560487 bytes
-SHA1 (patch-ab) = e27259c95bae0d63919841ddc801e7db6f4211db
+SHA1 (dxsamples-4.3.2.tar.gz) = 7fbfe06d0bc049d998985983199b6a6f65312fef
+Size (dxsamples-4.3.2.tar.gz) = 7708621 bytes
+SHA1 (patch-ab) = b7589a20e32e85943aa9dc03c65353c26fe6c3a7
diff --git a/graphics/dxsamples/patches/patch-ab b/graphics/dxsamples/patches/patch-ab
index b8de996fef4..d8c8d241835 100644
--- a/graphics/dxsamples/patches/patch-ab
+++ b/graphics/dxsamples/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2002/12/05 21:44:32 drochner Exp $
+$NetBSD: patch-ab,v 1.4 2004/04/20 22:11:48 drochner Exp $
 
---- 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@
+--- Makefile.in.orig	2003-10-28 17:24:16.000000000 +0000
++++ Makefile.in	2004-04-20 21:22:05.000000000 +0000
+@@ -101,7 +101,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
  
--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
+-SUBDIRS = callmodule data dxlink java macros \
++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