7 files changed, 276 insertions, 261 deletions

diff --git a/graphics/opendx-samples/Makefile b/graphics/opendx-samples/Makefile
index 5c28fbdd8930..afab9fbb30e2 100644
--- a/graphics/opendx-samples/Makefile
+++ b/graphics/opendx-samples/Makefile
@@ -7,22 +7,28 @@
 #
 
 PORTNAME=	opendx-samples
-PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTVERSION=	4.4.0
 CATEGORIES=	graphics math
-MASTER_SITES=	http://www.research.ibm.com/dx/srcDownload/srcArchive/ \
-	        http://opendx.npaci.edu/source/
+MASTER_SITES=	http://opendx.npaci.edu/source/
 DISTNAME=	dxsamples-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Example files for IBM's OpenDX
 
+BUILD_DEPENDS=	dx:${PORTSDIR}/graphics/opendx
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	SHELL=/bin/sh
+USE_GMAKE=	yes
 
-# XXX
-# someone with some knowledge of Java should make this work
-post-configure:
-	@touch ${WRKSRC}/java/samples/samples.jar
+.if !defined(WITHOUT_JAVA)
+USE_JAVA=	1.3+
+PLIST_SUB+=	JAVA=""
+.else
+CONFIGURE_ARGS+=	--without-javadx
+PLIST_SUB+=	JAVA="@comment "
+.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/opendx-samples/distinfo b/graphics/opendx-samples/distinfo
index 71c913237079..744ee91ea91e 100644
--- a/graphics/opendx-samples/distinfo
+++ b/graphics/opendx-samples/distinfo
@@ -1,3 +1,3 @@
-MD5 (dxsamples-4.2.0.tar.gz) = 530feaf2a90011022fd778c951525377
-SHA256 (dxsamples-4.2.0.tar.gz) = 5b0ba60021a0ee1c2aa11e89c82adb1b09bd6e09f53cc2020ccc2bc32511d802
-SIZE (dxsamples-4.2.0.tar.gz) = 7560487
+MD5 (dxsamples-4.4.0.tar.gz) = e8f43722ca0a66282608bded7c0e4f93
+SHA256 (dxsamples-4.4.0.tar.gz) = ec2277facc8cf0f095a7fc4cb58391e053d5fd26c90d4711c927d2897dc455d9
+SIZE (dxsamples-4.4.0.tar.gz) = 7791659
diff --git a/graphics/opendx-samples/files/patch-configure b/graphics/opendx-samples/files/patch-configure
new file mode 100644
index 000000000000..c7b7a53b76cc
--- /dev/null
+++ b/graphics/opendx-samples/files/patch-configure
@@ -0,0 +1,22 @@
+--- configure.orig	Tue Jan  3 21:41:37 2006
++++ configure	Sat Jan 28 16:16:24 2006
+@@ -1937,7 +1937,7 @@
+ 
+   test -n "$DX" && break
+ done
+-
++  PORTARCH=`uname -p`
+   DXARCH=`$DX -whicharch`
+   echo "$as_me:$LINENO: result: found $DXARCH" >&5
+ echo "${ECHO_T}found $DXARCH" >&6
+@@ -2253,8 +2253,8 @@
+ fi
+ DX_JAR=""
+ DX_JAVA_CLASSPATH=""
+-if test -r "$DXINST/lib_$DXARCH/arch.mak" ; then
+-  DX_JAVA_CLASSPATH=`grep DX_JAVA_CLASSPATH $DXINST/lib_$DXARCH/arch.mak | sed -e "s/DX_JAVA_CLASSPATH =//" -e "s/ //"`
++if test -r "$DXINST/lib_$PORTARCH/arch.mak" ; then
++  DX_JAVA_CLASSPATH=`grep DX_JAVA_CLASSPATH $DXINST/lib_$PORTARCH/arch.mak | sed -e "s/DX_JAVA_CLASSPATH =//" -e "s/ //"`
+ fi
+ if test -r "$DXINST/java/htmlpages/dx.jar" ; then
+   DX_JAR="$DXINST/java/htmlpages/dx.jar"
diff --git a/graphics/opendx-samples/files/patch-java-nets-Makefile.am b/graphics/opendx-samples/files/patch-java-nets-Makefile.am
deleted file mode 100644
index 1b3b9b1c572b..000000000000
--- a/graphics/opendx-samples/files/patch-java-nets-Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -crN java/nets/Makefile.am java/nets/Makefile.am
-*** java/nets/Makefile.am	Tue Jan 18 17:18:25 2000
---- java/nets/Makefile.am	Tue Aug 12 23:28:39 2003
-***************
-*** 22,25 ****
-  
-  install-data-local:
-  	$(mkinstalldirs) $(DESTDIR)$(javanetsdir)
-! 	chmod 777 $(DESTDIR)$(javanetsdir)
---- 22,25 ----
-  
-  install-data-local:
-  	$(mkinstalldirs) $(DESTDIR)$(javanetsdir)
-! 	chmod 775 $(DESTDIR)$(javanetsdir)
-diff -crN dxsamples-4.2.0/java/nets/Makefile.in dxsamples-4.2.0.new/java/nets/Makefile.in
-*** java/nets/Makefile.in	Mon May 20 22:04:38 2002
---- java/nets/Makefile.in	Tue Aug 12 23:28:28 2003
-***************
-*** 204,210 ****
-  
-  install-data-local:
-  	$(mkinstalldirs) $(DESTDIR)$(javanetsdir)
-! 	chmod 777 $(DESTDIR)$(javanetsdir)
-  
-  # Tell versions [3.59,3.63) of GNU make to not export all variables.
-  # Otherwise a system limit (for SysV at least) may be exceeded.
---- 204,210 ----
-  
-  install-data-local:
-  	$(mkinstalldirs) $(DESTDIR)$(javanetsdir)
-! 	chmod 775 $(DESTDIR)$(javanetsdir)
-  
-  # Tell versions [3.59,3.63) of GNU make to not export all variables.
-  # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/graphics/opendx-samples/files/patch-java_nets_Makefile.in b/graphics/opendx-samples/files/patch-java_nets_Makefile.in
new file mode 100644
index 000000000000..d902f3787d67
--- /dev/null
+++ b/graphics/opendx-samples/files/patch-java_nets_Makefile.in
@@ -0,0 +1,11 @@
+--- java/nets/Makefile.in.orig	Tue Jan  3 21:41:27 2006
++++ java/nets/Makefile.in	Sat Jan 28 15:48:56 2006
+@@ -323,7 +323,7 @@
+ 
+ install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(javanetsdir)
+-	chmod 777 $(DESTDIR)$(javanetsdir)
++	chmod 775 $(DESTDIR)$(javanetsdir)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/graphics/opendx-samples/pkg-descr b/graphics/opendx-samples/pkg-descr
index 7bbf8a5dd2dd..0a10584a599f 100644
--- a/graphics/opendx-samples/pkg-descr
+++ b/graphics/opendx-samples/pkg-descr
@@ -1 +1,3 @@
 Example files for IBM's OpenDX.
+
+WWW: http://www.opendx.org/
diff --git a/graphics/opendx-samples/pkg-plist b/graphics/opendx-samples/pkg-plist
index f70d44a315a3..05e07c43ef20 100644
--- a/graphics/opendx-samples/pkg-plist
+++ b/graphics/opendx-samples/pkg-plist
@@ -1,200 +1,203 @@
-dx/java/htmlpages/AutoInsurance.html
-dx/java/htmlpages/AutoInsurance1.0.0.gif
-dx/java/htmlpages/AutoInsurance2.0.0.gif
-dx/java/htmlpages/AutoInsurance3.0.0.gif
-dx/java/htmlpages/CCNet2.html
-dx/java/htmlpages/CCNet23.0.0.gif
-dx/java/htmlpages/CCNet24.0.0.gif
-dx/java/htmlpages/CCNet25.0.0.gif
-dx/java/htmlpages/Demo4.gif
-dx/java/htmlpages/GroceryList.html
-dx/java/htmlpages/GroceryList2.0.0.gif
-dx/java/htmlpages/GroceryList3.0.0.gif
-dx/java/htmlpages/GroceryList4.0.0.gif
-dx/java/htmlpages/GroceryList4.0.1.gif
-dx/java/htmlpages/GroceryList4.0.2.gif
-dx/java/htmlpages/GroceryList4.0.3.gif
-dx/java/htmlpages/GroceryList4.0.4.gif
-dx/java/htmlpages/GroceryList4.0.5.gif
-dx/java/htmlpages/GroceryList4.0.6.gif
-dx/java/htmlpages/GroceryList4.0.7.gif
-dx/java/htmlpages/GroceryList4.0.8.gif
-dx/java/htmlpages/HomeOwn.html
-dx/java/htmlpages/HomeOwn1.0.0.gif
-dx/java/htmlpages/HomeOwn2.0.0.gif
-dx/java/htmlpages/HomeOwn3.0.0.gif
-dx/java/htmlpages/HomeOwn4.0.0.gif
-dx/java/htmlpages/HomeOwn4.0.1.gif
-dx/java/htmlpages/HomeOwn4.0.2.gif
-dx/java/htmlpages/HomeOwn4.0.3.gif
-dx/java/htmlpages/HomeOwn4.0.4.gif
-dx/java/htmlpages/HomeOwn4.0.5.gif
-dx/java/htmlpages/HomeOwn4.0.6.gif
-dx/java/htmlpages/HomeOwn4.0.7.gif
-dx/java/htmlpages/HomeOwn4.0.8.gif
-dx/java/htmlpages/MRI_2.html
-dx/java/htmlpages/MRI_21.0.0.gif
-dx/java/htmlpages/MRI_22.0.0.gif
-dx/java/htmlpages/MRI_22.0.1.gif
-dx/java/htmlpages/MRI_22.0.2.gif
-dx/java/htmlpages/MRI_22.0.3.gif
-dx/java/htmlpages/MRI_22.0.4.gif
-dx/java/htmlpages/MRI_22.0.5.gif
-dx/java/htmlpages/MRI_22.0.6.gif
-dx/java/htmlpages/MRI_22.0.7.gif
-dx/java/htmlpages/MRI_22.0.8.gif
-dx/java/htmlpages/Makefile.am
-dx/java/htmlpages/Makefile.in
-dx/java/htmlpages/Makefile.sample
-dx/java/htmlpages/MutualFund.html
-dx/java/htmlpages/MutualFund10.0.0.gif
-dx/java/htmlpages/MutualFund2.0.0.gif
-dx/java/htmlpages/MutualFund3.0.0.gif
-dx/java/htmlpages/Navigation.html
-dx/java/htmlpages/Navigation1.0.0.gif
-dx/java/htmlpages/Navigation6.0.0.gif
-dx/java/htmlpages/Navigation7.0.0.gif
-dx/java/htmlpages/ScatterData.html
-dx/java/htmlpages/ScatterData3.0.0.gif
-dx/java/htmlpages/ScatterData4.0.0.gif
-dx/java/htmlpages/ScatterData4.0.1.gif
-dx/java/htmlpages/ScatterData4.0.2.gif
-dx/java/htmlpages/ScatterData4.0.3.gif
-dx/java/htmlpages/ScatterData4.0.4.gif
-dx/java/htmlpages/ScatterData4.0.5.gif
-dx/java/htmlpages/ScatterData4.0.6.gif
-dx/java/htmlpages/ScatterData4.0.7.gif
-dx/java/htmlpages/ScatterData4.0.8.gif
-dx/java/htmlpages/Status.htm
-dx/java/htmlpages/Status.html
-dx/java/htmlpages/Streamline.html
-dx/java/htmlpages/Streamline2.0.0.gif
-dx/java/htmlpages/Streamline3.0.0.gif
-dx/java/htmlpages/Streamline3.0.1.gif
-dx/java/htmlpages/Streamline3.0.2.gif
-dx/java/htmlpages/Streamline3.0.3.gif
-dx/java/htmlpages/Streamline3.0.4.gif
-dx/java/htmlpages/Streamline3.0.5.gif
-dx/java/htmlpages/Streamline3.0.6.gif
-dx/java/htmlpages/Streamline3.0.7.gif
-dx/java/htmlpages/Streamline3.0.8.gif
-dx/java/htmlpages/Streamline7.0.0.gif
-dx/java/htmlpages/ThunderGlyphSheet.htm
-dx/java/htmlpages/ThunderGlyphSheet.html
-dx/java/htmlpages/ThunderGlyphSheet2.0.0.wrl
-dx/java/htmlpages/ThunderGlyphSheet3.0.0.gif
-dx/java/htmlpages/Topo.gif
-dx/java/htmlpages/Topo.html
-dx/java/htmlpages/Topo2.0.0.gif
-dx/java/htmlpages/Topo3.0.0.gif
-dx/java/htmlpages/Topo3.0.1.gif
-dx/java/htmlpages/Topo3.0.2.gif
-dx/java/htmlpages/Topo3.0.3.gif
-dx/java/htmlpages/Topo3.0.4.gif
-dx/java/htmlpages/Topo3.0.5.gif
-dx/java/htmlpages/Topo3.0.6.gif
-dx/java/htmlpages/Topo3.0.7.gif
-dx/java/htmlpages/Topo3.0.8.gif
-dx/java/htmlpages/Topo4.0.0.gif
-dx/java/htmlpages/activex.htm
-dx/java/htmlpages/ddi.html
-dx/java/htmlpages/ddi5.0.0.gif
-dx/java/htmlpages/ddi7.0.0.gif
-dx/java/htmlpages/ddi8.0.0.gif
-dx/java/htmlpages/earlier.htm
-dx/java/htmlpages/gordon.html
-dx/java/htmlpages/gordon1.0.0.gif
-dx/java/htmlpages/gordon2.0.0.gif
-dx/java/htmlpages/hedge.html
-dx/java/htmlpages/hedge3.0.0.gif
-dx/java/htmlpages/ibmqw.html
-dx/java/htmlpages/ibmqw1.0.0.gif
-dx/java/htmlpages/ibmqw2.0.0.gif
-dx/java/htmlpages/npvcall.html
-dx/java/htmlpages/npvcall3.0.0.gif
-dx/java/htmlpages/optval.html
-dx/java/htmlpages/optval1.0.0.gif
-dx/java/htmlpages/pagea.gif
-dx/java/htmlpages/pagea2.gif
-dx/java/htmlpages/pagea3.gif
-dx/java/htmlpages/perp1.0.0.gif
-dx/java/htmlpages/perp1.0.1.gif
-dx/java/htmlpages/perp1.0.2.gif
-dx/java/htmlpages/perp1.0.3.gif
-dx/java/htmlpages/perp1.0.4.gif
-dx/java/htmlpages/perp1.0.5.gif
-dx/java/htmlpages/perp1.0.6.gif
-dx/java/htmlpages/perp1.0.7.gif
-dx/java/htmlpages/perp1.0.8.gif
-dx/java/htmlpages/toc.htm
-dx/java/htmlpages/wacc.html
-dx/java/htmlpages/wacc1.0.0.gif
-dx/java/server/nets/AutoInsurance.cfg
-dx/java/server/nets/AutoInsurance.net
-dx/java/server/nets/CCNet2.cfg
-dx/java/server/nets/CCNet2.net
-dx/java/server/nets/GroceryList.cfg
-dx/java/server/nets/GroceryList.net
-dx/java/server/nets/HomeOwn.cfg
-dx/java/server/nets/HomeOwn.net
-dx/java/server/nets/MRI_2.cfg
-dx/java/server/nets/MRI_2.net
-dx/java/server/nets/MutualFund.cfg
-dx/java/server/nets/MutualFund.net
-dx/java/server/nets/Navigation.cfg
-dx/java/server/nets/Navigation.net
-dx/java/server/nets/ScatterData.cfg
-dx/java/server/nets/ScatterData.net
-dx/java/server/nets/Streamline.cfg
-dx/java/server/nets/Streamline.net
-dx/java/server/nets/ThunderGlyphSheet.cfg
-dx/java/server/nets/ThunderGlyphSheet.net
-dx/java/server/nets/Topo.cfg
-dx/java/server/nets/Topo.net
-dx/java/server/nets/ddi.cfg
-dx/java/server/nets/ddi.net
-dx/java/server/nets/gordon.cfg
-dx/java/server/nets/gordon.net
-dx/java/server/nets/hedge.cfg
-dx/java/server/nets/hedge.net
-dx/java/server/nets/ibmqw.cfg
-dx/java/server/nets/ibmqw.net
-dx/java/server/nets/npvcall.cfg
-dx/java/server/nets/npvcall.net
-dx/java/server/nets/optval.cfg
-dx/java/server/nets/optval.net
-dx/java/server/nets/wacc.cfg
-dx/java/server/nets/wacc.net
-dx/java/server/userdata/AutoInsurance.txt
-dx/java/server/userdata/CCAll.dx
-dx/java/server/userdata/Makefile.am
-dx/java/server/userdata/Norm.dx
-dx/java/server/userdata/apt.txt
-dx/java/server/userdata/arf.txt
-dx/java/server/userdata/asr.txt
-dx/java/server/userdata/enhigh.cxn
-dx/java/server/userdata/enhigh.txt
-dx/java/server/userdata/enlow.cxn
-dx/java/server/userdata/enlow.txt
-dx/java/server/userdata/ibm94.txt
-dx/java/server/userdata/ibm95.txt
-dx/java/server/userdata/ibm96.txt
-dx/java/server/userdata/mf1.txt
-dx/java/server/userdata/npvcall.cm
-dx/java/server/userdata/npvcall2.cm
-dx/java/server/userdata/option.cm
-dx/java/server/usermacros/ClassifyMacro.net
-dx/java/server/usermacros/Legend2Macro.net
-dx/java/server/usermacros/MOSFromLongLat.net
-dx/java/server/usermacros/Makefile.am
-dx/java/server/usermacros/bschols.net
-dx/java/server/usermacros/kmeansmacro.net
-dx/java/server/usermacros/logn.net
-dx/java/server/usermacros/optsurf.net
-dx/java/server/usermacros/pdflogn.net
-dx/java/server/usermacros/prunemac.net
-dx/java/server/usermacros/vhwymac.net
-dx/samples/callmodule/Readme
+%%JAVA%%dx/java/htmlpages/AutoInsurance.html
+%%JAVA%%dx/java/htmlpages/AutoInsurance1.0.0.gif
+%%JAVA%%dx/java/htmlpages/AutoInsurance2.0.0.gif
+%%JAVA%%dx/java/htmlpages/AutoInsurance3.0.0.gif
+%%JAVA%%dx/java/htmlpages/CCNet2.html
+%%JAVA%%dx/java/htmlpages/CCNet23.0.0.gif
+%%JAVA%%dx/java/htmlpages/CCNet24.0.0.gif
+%%JAVA%%dx/java/htmlpages/CCNet25.0.0.gif
+%%JAVA%%dx/java/htmlpages/Demo4.gif
+%%JAVA%%dx/java/htmlpages/GroceryList.html
+%%JAVA%%dx/java/htmlpages/GroceryList2.0.0.gif
+%%JAVA%%dx/java/htmlpages/GroceryList3.0.0.gif
+%%JAVA%%dx/java/htmlpages/GroceryList4.0.0.gif
+%%JAVA%%dx/java/htmlpages/GroceryList4.0.1.gif
+%%JAVA%%dx/java/htmlpages/GroceryList4.0.2.gif
+%%JAVA%%dx/java/htmlpages/GroceryList4.0.3.gif
+%%JAVA%%dx/java/htmlpages/GroceryList4.0.4.gif
+%%JAVA%%dx/java/htmlpages/GroceryList4.0.5.gif
+%%JAVA%%dx/java/htmlpages/GroceryList4.0.6.gif
+%%JAVA%%dx/java/htmlpages/GroceryList4.0.7.gif
+%%JAVA%%dx/java/htmlpages/GroceryList4.0.8.gif
+%%JAVA%%dx/java/htmlpages/HomeOwn.html
+%%JAVA%%dx/java/htmlpages/HomeOwn1.0.0.gif
+%%JAVA%%dx/java/htmlpages/HomeOwn2.0.0.gif
+%%JAVA%%dx/java/htmlpages/HomeOwn3.0.0.gif
+%%JAVA%%dx/java/htmlpages/HomeOwn4.0.0.gif
+%%JAVA%%dx/java/htmlpages/HomeOwn4.0.1.gif
+%%JAVA%%dx/java/htmlpages/HomeOwn4.0.2.gif
+%%JAVA%%dx/java/htmlpages/HomeOwn4.0.3.gif
+%%JAVA%%dx/java/htmlpages/HomeOwn4.0.4.gif
+%%JAVA%%dx/java/htmlpages/HomeOwn4.0.5.gif
+%%JAVA%%dx/java/htmlpages/HomeOwn4.0.6.gif
+%%JAVA%%dx/java/htmlpages/HomeOwn4.0.7.gif
+%%JAVA%%dx/java/htmlpages/HomeOwn4.0.8.gif
+%%JAVA%%dx/java/htmlpages/MRI_2.html
+%%JAVA%%dx/java/htmlpages/MRI_21.0.0.gif
+%%JAVA%%dx/java/htmlpages/MRI_22.0.0.gif
+%%JAVA%%dx/java/htmlpages/MRI_22.0.1.gif
+%%JAVA%%dx/java/htmlpages/MRI_22.0.2.gif
+%%JAVA%%dx/java/htmlpages/MRI_22.0.3.gif
+%%JAVA%%dx/java/htmlpages/MRI_22.0.4.gif
+%%JAVA%%dx/java/htmlpages/MRI_22.0.5.gif
+%%JAVA%%dx/java/htmlpages/MRI_22.0.6.gif
+%%JAVA%%dx/java/htmlpages/MRI_22.0.7.gif
+%%JAVA%%dx/java/htmlpages/MRI_22.0.8.gif
+%%JAVA%%dx/java/htmlpages/Makefile.am
+%%JAVA%%dx/java/htmlpages/Makefile.in
+%%JAVA%%dx/java/htmlpages/Makefile.sample
+%%JAVA%%dx/java/htmlpages/MutualFund.html
+%%JAVA%%dx/java/htmlpages/MutualFund10.0.0.gif
+%%JAVA%%dx/java/htmlpages/MutualFund2.0.0.gif
+%%JAVA%%dx/java/htmlpages/MutualFund3.0.0.gif
+%%JAVA%%dx/java/htmlpages/Navigation.html
+%%JAVA%%dx/java/htmlpages/Navigation1.0.0.gif
+%%JAVA%%dx/java/htmlpages/Navigation6.0.0.gif
+%%JAVA%%dx/java/htmlpages/Navigation7.0.0.gif
+%%JAVA%%dx/java/htmlpages/ScatterData.html
+%%JAVA%%dx/java/htmlpages/ScatterData3.0.0.gif
+%%JAVA%%dx/java/htmlpages/ScatterData4.0.0.gif
+%%JAVA%%dx/java/htmlpages/ScatterData4.0.1.gif
+%%JAVA%%dx/java/htmlpages/ScatterData4.0.2.gif
+%%JAVA%%dx/java/htmlpages/ScatterData4.0.3.gif
+%%JAVA%%dx/java/htmlpages/ScatterData4.0.4.gif
+%%JAVA%%dx/java/htmlpages/ScatterData4.0.5.gif
+%%JAVA%%dx/java/htmlpages/ScatterData4.0.6.gif
+%%JAVA%%dx/java/htmlpages/ScatterData4.0.7.gif
+%%JAVA%%dx/java/htmlpages/ScatterData4.0.8.gif
+%%JAVA%%dx/java/htmlpages/Status.htm
+%%JAVA%%dx/java/htmlpages/Status.html
+%%JAVA%%dx/java/htmlpages/Streamline.html
+%%JAVA%%dx/java/htmlpages/Streamline2.0.0.gif
+%%JAVA%%dx/java/htmlpages/Streamline3.0.0.gif
+%%JAVA%%dx/java/htmlpages/Streamline3.0.1.gif
+%%JAVA%%dx/java/htmlpages/Streamline3.0.2.gif
+%%JAVA%%dx/java/htmlpages/Streamline3.0.3.gif
+%%JAVA%%dx/java/htmlpages/Streamline3.0.4.gif
+%%JAVA%%dx/java/htmlpages/Streamline3.0.5.gif
+%%JAVA%%dx/java/htmlpages/Streamline3.0.6.gif
+%%JAVA%%dx/java/htmlpages/Streamline3.0.7.gif
+%%JAVA%%dx/java/htmlpages/Streamline3.0.8.gif
+%%JAVA%%dx/java/htmlpages/Streamline7.0.0.gif
+%%JAVA%%dx/java/htmlpages/ThunderGlyphSheet.htm
+%%JAVA%%dx/java/htmlpages/ThunderGlyphSheet.html
+%%JAVA%%dx/java/htmlpages/ThunderGlyphSheet2.0.0.wrl
+%%JAVA%%dx/java/htmlpages/ThunderGlyphSheet3.0.0.gif
+%%JAVA%%dx/java/htmlpages/Topo.gif
+%%JAVA%%dx/java/htmlpages/Topo.html
+%%JAVA%%dx/java/htmlpages/Topo2.0.0.gif
+%%JAVA%%dx/java/htmlpages/Topo3.0.0.gif
+%%JAVA%%dx/java/htmlpages/Topo3.0.1.gif
+%%JAVA%%dx/java/htmlpages/Topo3.0.2.gif
+%%JAVA%%dx/java/htmlpages/Topo3.0.3.gif
+%%JAVA%%dx/java/htmlpages/Topo3.0.4.gif
+%%JAVA%%dx/java/htmlpages/Topo3.0.5.gif
+%%JAVA%%dx/java/htmlpages/Topo3.0.6.gif
+%%JAVA%%dx/java/htmlpages/Topo3.0.7.gif
+%%JAVA%%dx/java/htmlpages/Topo3.0.8.gif
+%%JAVA%%dx/java/htmlpages/Topo4.0.0.gif
+%%JAVA%%dx/java/htmlpages/activex.htm
+%%JAVA%%dx/java/htmlpages/ddi.html
+%%JAVA%%dx/java/htmlpages/ddi5.0.0.gif
+%%JAVA%%dx/java/htmlpages/ddi7.0.0.gif
+%%JAVA%%dx/java/htmlpages/ddi8.0.0.gif
+%%JAVA%%dx/java/htmlpages/earlier.htm
+%%JAVA%%dx/java/htmlpages/gordon.html
+%%JAVA%%dx/java/htmlpages/gordon1.0.0.gif
+%%JAVA%%dx/java/htmlpages/gordon2.0.0.gif
+%%JAVA%%dx/java/htmlpages/hedge.html
+%%JAVA%%dx/java/htmlpages/hedge3.0.0.gif
+%%JAVA%%dx/java/htmlpages/ibmqw.html
+%%JAVA%%dx/java/htmlpages/ibmqw1.0.0.gif
+%%JAVA%%dx/java/htmlpages/ibmqw2.0.0.gif
+%%JAVA%%dx/java/htmlpages/javadx-badge.gif
+%%JAVA%%dx/java/htmlpages/javadx-hd.gif
+%%JAVA%%dx/java/htmlpages/javadx-smhd.gif
+%%JAVA%%dx/java/htmlpages/npvcall.html
+%%JAVA%%dx/java/htmlpages/npvcall3.0.0.gif
+%%JAVA%%dx/java/htmlpages/optval.html
+%%JAVA%%dx/java/htmlpages/optval1.0.0.gif
+%%JAVA%%dx/java/htmlpages/pagea.gif
+%%JAVA%%dx/java/htmlpages/pagea2.gif
+%%JAVA%%dx/java/htmlpages/pagea3.gif
+%%JAVA%%dx/java/htmlpages/perp1.0.0.gif
+%%JAVA%%dx/java/htmlpages/perp1.0.1.gif
+%%JAVA%%dx/java/htmlpages/perp1.0.2.gif
+%%JAVA%%dx/java/htmlpages/perp1.0.3.gif
+%%JAVA%%dx/java/htmlpages/perp1.0.4.gif
+%%JAVA%%dx/java/htmlpages/perp1.0.5.gif
+%%JAVA%%dx/java/htmlpages/perp1.0.6.gif
+%%JAVA%%dx/java/htmlpages/perp1.0.7.gif
+%%JAVA%%dx/java/htmlpages/perp1.0.8.gif
+%%JAVA%%dx/java/htmlpages/samples.jar
+%%JAVA%%dx/java/htmlpages/toc.htm
+%%JAVA%%dx/java/htmlpages/wacc.html
+%%JAVA%%dx/java/htmlpages/wacc1.0.0.gif
+%%JAVA%%dx/java/server/nets/AutoInsurance.cfg
+%%JAVA%%dx/java/server/nets/AutoInsurance.net
+%%JAVA%%dx/java/server/nets/CCNet2.cfg
+%%JAVA%%dx/java/server/nets/CCNet2.net
+%%JAVA%%dx/java/server/nets/GroceryList.cfg
+%%JAVA%%dx/java/server/nets/GroceryList.net
+%%JAVA%%dx/java/server/nets/HomeOwn.cfg
+%%JAVA%%dx/java/server/nets/HomeOwn.net
+%%JAVA%%dx/java/server/nets/MRI_2.cfg
+%%JAVA%%dx/java/server/nets/MRI_2.net
+%%JAVA%%dx/java/server/nets/MutualFund.cfg
+%%JAVA%%dx/java/server/nets/MutualFund.net
+%%JAVA%%dx/java/server/nets/Navigation.cfg
+%%JAVA%%dx/java/server/nets/Navigation.net
+%%JAVA%%dx/java/server/nets/ScatterData.cfg
+%%JAVA%%dx/java/server/nets/ScatterData.net
+%%JAVA%%dx/java/server/nets/Streamline.cfg
+%%JAVA%%dx/java/server/nets/Streamline.net
+%%JAVA%%dx/java/server/nets/ThunderGlyphSheet.cfg
+%%JAVA%%dx/java/server/nets/ThunderGlyphSheet.net
+%%JAVA%%dx/java/server/nets/Topo.cfg
+%%JAVA%%dx/java/server/nets/Topo.net
+%%JAVA%%dx/java/server/nets/ddi.cfg
+%%JAVA%%dx/java/server/nets/ddi.net
+%%JAVA%%dx/java/server/nets/gordon.cfg
+%%JAVA%%dx/java/server/nets/gordon.net
+%%JAVA%%dx/java/server/nets/hedge.cfg
+%%JAVA%%dx/java/server/nets/hedge.net
+%%JAVA%%dx/java/server/nets/ibmqw.cfg
+%%JAVA%%dx/java/server/nets/ibmqw.net
+%%JAVA%%dx/java/server/nets/npvcall.cfg
+%%JAVA%%dx/java/server/nets/npvcall.net
+%%JAVA%%dx/java/server/nets/optval.cfg
+%%JAVA%%dx/java/server/nets/optval.net
+%%JAVA%%dx/java/server/nets/wacc.cfg
+%%JAVA%%dx/java/server/nets/wacc.net
+%%JAVA%%dx/java/server/userdata/AutoInsurance.txt
+%%JAVA%%dx/java/server/userdata/CCAll.dx
+%%JAVA%%dx/java/server/userdata/Makefile.am
+%%JAVA%%dx/java/server/userdata/Norm.dx
+%%JAVA%%dx/java/server/userdata/apt.txt
+%%JAVA%%dx/java/server/userdata/arf.txt
+%%JAVA%%dx/java/server/userdata/asr.txt
+%%JAVA%%dx/java/server/userdata/enhigh.cxn
+%%JAVA%%dx/java/server/userdata/enhigh.txt
+%%JAVA%%dx/java/server/userdata/enlow.cxn
+%%JAVA%%dx/java/server/userdata/enlow.txt
+%%JAVA%%dx/java/server/userdata/ibm94.txt
+%%JAVA%%dx/java/server/userdata/ibm95.txt
+%%JAVA%%dx/java/server/userdata/ibm96.txt
+%%JAVA%%dx/java/server/userdata/mf1.txt
+%%JAVA%%dx/java/server/userdata/npvcall.cm
+%%JAVA%%dx/java/server/userdata/npvcall2.cm
+%%JAVA%%dx/java/server/userdata/option.cm
+%%JAVA%%dx/java/server/usermacros/ClassifyMacro.net
+%%JAVA%%dx/java/server/usermacros/Legend2Macro.net
+%%JAVA%%dx/java/server/usermacros/MOSFromLongLat.net
+%%JAVA%%dx/java/server/usermacros/bschols.net
+%%JAVA%%dx/java/server/usermacros/kmeansmacro.net
+%%JAVA%%dx/java/server/usermacros/logn.net
+%%JAVA%%dx/java/server/usermacros/optsurf.net
+%%JAVA%%dx/java/server/usermacros/pdflogn.net
+%%JAVA%%dx/java/server/usermacros/prunemac.net
+%%JAVA%%dx/java/server/usermacros/vhwymac.net
+dx/samples/callmodule/README
 dx/samples/callmodule/Simple.c
 dx/samples/callmodule/ThunderStreamlines.c
 dx/samples/callmodule/makefile
@@ -216,8 +219,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
@@ -360,10 +363,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
@@ -412,11 +417,12 @@ dx/samples/outboard/Makefile_hp700
 dx/samples/outboard/Makefile_ibm6000
 dx/samples/outboard/Makefile_ibmpvs
 dx/samples/outboard/Makefile_intelnt
+dx/samples/outboard/Makefile_linux
 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
@@ -431,7 +437,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
@@ -978,6 +984,8 @@ dx/samples/programs/PickPlot.cfg
 dx/samples/programs/PickPlot.net
 dx/samples/programs/PickStreamline.cfg
 dx/samples/programs/PickStreamline.net
+dx/samples/programs/PlotColumn.cfg
+dx/samples/programs/PlotColumn.net
 dx/samples/programs/PlotGroupOfLines.cfg
 dx/samples/programs/PlotGroupOfLines.net
 dx/samples/programs/PlotLine.cfg
@@ -994,6 +1002,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
@@ -1014,7 +1023,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
@@ -1103,6 +1111,8 @@ dx/samples/programs/SIMPLE/MapToPlane.cfg
 dx/samples/programs/SIMPLE/MapToPlane.net
 dx/samples/programs/SIMPLE/MarkUnmark.cfg
 dx/samples/programs/SIMPLE/MarkUnmark.net
+dx/samples/programs/SIMPLE/PlotColumn.cfg
+dx/samples/programs/SIMPLE/PlotColumn.net
 dx/samples/programs/SIMPLE/Post.cfg
 dx/samples/programs/SIMPLE/Post.net
 dx/samples/programs/SIMPLE/QuantizeImage.cfg
@@ -1314,8 +1324,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
@@ -1365,7 +1375,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
@@ -1380,7 +1390,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
@@ -1395,10 +1405,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
@@ -1408,7 +1418,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
@@ -1515,7 +1525,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
@@ -1524,6 +1534,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
@@ -1556,6 +1568,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
@@ -1602,10 +1615,5 @@ dx/samples/util/plot3d/README
 @dirrm dx/samples/data
 @dirrm dx/samples/callmodule
 @dirrm dx/samples
-@dirrm dx/java/server/usermacros
-@dirrm dx/java/server/userdata
-@dirrm dx/java/server/nets
-@dirrm dx/java/server
-@dirrm dx/java/htmlpages
-@dirrm dx/java
-@unexec rmdir %B 2>/dev/null || true
+%%JAVA%%@dirrm dx/java/server/usermacros
+%%JAVA%%@dirrm dx/java/server/userdata