Import from the science overlay. Thanks François Bissey for his efforts.

Package-Manager: portage-2.2_rc44/cvs/Linux x86_64

11 files changed, 970 insertions, 9 deletions

diff --git a/sci-visualization/opendx/ChangeLog b/sci-visualization/opendx/ChangeLog
index 73ea1155005c..66f079d4d527 100644
--- a/sci-visualization/opendx/ChangeLog
+++ b/sci-visualization/opendx/ChangeLog
@@ -1,6 +1,52 @@
 # ChangeLog for sci-visualization/opendx
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/ChangeLog,v 1.15 2008/09/14 11:25:38 spock Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/ChangeLog,v 1.16 2009/10/08 16:31:53 bicatali Exp $
+
+  08 Oct 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  +opendx-4.4.4-r2.ebuild, files/opendx-4.4.4-concurrent-make-fix.patch,
+  +files/opendx-4.4.4-dx-errno.patch,
+  +files/opendx-4.4.4-gcc43-fedora.patch, +files/opendx-4.4.4-install.patch,
+  +files/opendx-4.4.4-open.patch, +files/opendx-4.4.4-szip.patch,
+  +files/opendx-4.4.4-xdg.patch, metadata.xml:
+  Import from the science overlay. Thanks François Bissey for his efforts.
+
+  14 Jun 2009; François Bissey <f.r.bissey@massey.ac.nz>
+  opendx-4.4.4-r2.ebuild, +files/opendx-4.4.4-szip.patch:
+  Patch configure.ac to make szip a proper configure option
+
+  12 May 2009; François Bissey <f.r.bissey@massey.ac.nz>
+  files/opendx-4.4.4-concurrent-make-fix.patch:
+  make sure the concurent make fix _always_ works.
+
+*opendx-4.4.4-r2 (11 May 2009)
+
+  11 May 2009; François Bissey <f.r.bissey@massey.ac.nz>
+  opendx-4.4.4-r1.ebuild, +opendx-4.4.4-r2.ebuild,
+  +files/opendx-4.4.4-install.patch, +files/opendx-4.4.4-xdg.patch:
+  small clean up in opendx-4.4.4-r1, in r2 new layout for the installation
+  and replaced call to netscape/lynx etc... with xdg-open
+
+  19 Apr 2009; François Bissey <f.r.bissey@massey.ac.nz>
+  +files/opendx-4.4.4-dx-errno.patch,
+  +files/opendx-4.4.4-gcc43-fedora.patch, +files/opendx-4.4.4-open.patch,
+  -files/dx-errno.patch, -files/dx-gcc43-fedora.patch, -files/dx-open.patch,
+  opendx-4.4.4-r1.ebuild:
+  rename patches to something nicer. some cleaning of the ebuild structure.
+  introduce the smp keyword and simplify greatly the associated logic.
+
+*opendx-4.4.4-r1 (17 Apr 2009)
+
+  17 Apr 2009; François Bissey <f.r.bissey@massey.ac.nz>
+  +files/20-opendx-revdep, +files/opendx-4.3.2-sys.h.patch,
+  +files/opendx-4.4.4-concurrent-make-fix.patch,
+  +files/opendx-4.4.4-libtool.patch, +files/dx-errno.patch,
+  +files/dx-gcc43-fedora.patch, +files/dx-open.patch,
+  +files/opendx-compressed-man.patch, +metadata.xml,
+  +opendx-4.4.4-r1.ebuild:
+  Initial import in the overlay from the main tree. *port to EAPI2 *updated
+  gcc43 patch to upstream/fedora level *added an upstream patch to fix bug
+  #261438 *added a fedora patch to solve a problem dx use all CPU after
+  exiting *updated the source url to a working one
 
   14 Sep 2008; Michał Januszewski <spock@gentoo.org>
   +files/opendx-4.4.4-concurrent-make-fix.patch, opendx-4.4.4.ebuild:
diff --git a/sci-visualization/opendx/Manifest b/sci-visualization/opendx/Manifest
index 4065e8918e9b..204c8c823cc3 100644
--- a/sci-visualization/opendx/Manifest
+++ b/sci-visualization/opendx/Manifest
@@ -3,20 +3,27 @@ Hash: SHA1
 
 AUX 20-opendx-revdep 44 RMD160 9b68b96b8f513a78a51249c7705d93d665bb3d2b SHA1 9389ea70249fe8149a33944a07466dddc9c1ae8d SHA256 fa96c22f9e7870a60c27c02cceb6bb3782d40c07ac53f19d7be7941a12347a01
 AUX opendx-4.3.2-sys.h.patch 1200 RMD160 f3658ac7fd0582b69ab32df5cc23d77f8d5364c8 SHA1 b4eed91d8ad2df57241a74d4ef8452ad0d171296 SHA256 919299f0fbb6e9891a8792641ea58720ae6bb95d4ffc3f6a20cae7b8e2d1729b
-AUX opendx-4.4.4-concurrent-make-fix.patch 1191 RMD160 3baec5669230df96def294192eea372e59303537 SHA1 ec7b128b46bbf897ffbf0f08a12d36fb499f7241 SHA256 5c1cdc25105815a944cde02550aa7196155be6c07ac4fe697e7ff2ee7d4a6d14
+AUX opendx-4.4.4-concurrent-make-fix.patch 2388 RMD160 b30b7aa12a3d8c36b90e7d0fd4eb653a828203ee SHA1 786d37fda67bc4cb0ef96f2fbaac927123432658 SHA256 7ce46d4fe5dda470d4a165409de8c69c1bcda1a065ecf782dbe8e1b28ee88dcf
+AUX opendx-4.4.4-dx-errno.patch 340 RMD160 39928c8d031394cf59dd6dd06d25f26cd56482b7 SHA1 7be653fb8303a49a5788dee27323192c2127d199 SHA256 046fdd113d0c3c48b2c0efabe11423539e0ab8b0d567df2acfff93f5864ea7e4
+AUX opendx-4.4.4-gcc43-fedora.patch 13310 RMD160 b98f8034d26db8440be8c8e02a06aaf24fb7030a SHA1 513a64535c04da9ab65db6b89318002171ef2e4c SHA256 8ca2296f7c36f0dd7dbaf185b3fdf68ea40a09695aaca6c0f65d3970286d225d
 AUX opendx-4.4.4-gcc43.patch 4086 RMD160 27f18b5228d998e32033c2eff21fb56d53646386 SHA1 55a35cf83fab1828f0aadb0c27222be34ad50710 SHA256 8fdbf9e67f31671ca9e775f9bc22dd168ed981aaba43f9152b85b95592ca86af
+AUX opendx-4.4.4-install.patch 11982 RMD160 2136aca79e909dc28cc18c6fd821014e777c96ea SHA1 7a86aec33dc1d23ab9700dcd6f8cb9d7d08c512d SHA256 75f9ee934b19f9f67fdbfd16b9d52fb692bb4db3d1a1fc8cc666c7ac5c5e447f
 AUX opendx-4.4.4-libtool.patch 319 RMD160 2b501064b72e84f791ee3c3b3ac3bd83d6fd0de7 SHA1 6548dae81cb9fdf83f2a0a1095851ef40578de0e SHA256 1bde8364f7a40322f9812f0fbb0403ab8f52f946318bd548e7fa63dd887c291f
+AUX opendx-4.4.4-open.patch 1671 RMD160 9c4ba9d2735049c841c32ab2efa2d778ce80044a SHA1 f59ba51b5e301f4bf20512835adadd3c65f2fd29 SHA256 0b0cbc06ecc8e44d32f16000c6ee2c09b70b7cfbf44ee71a50165dad19314403
+AUX opendx-4.4.4-szip.patch 1482 RMD160 67bef3dade274ac78011bc23913dd8b7724ee13d SHA1 edfb38bb5c73d340716dc6e8ccd01eea0ee5de1a SHA256 c330e0fc642d4f5004fd3173532e2f7223499dc612be298a53b41f423b021a23
+AUX opendx-4.4.4-xdg.patch 785 RMD160 ee1a8bce4a352c7bf3335f5e13bd81664f3fd7c3 SHA1 001cb1ee444631926b43857aac137ce2d9336ba2 SHA256 93e50b0da16f3d28c016fa95ee49530322e83f8527b45abd7415bb14365600c1
 AUX opendx-compressed-man.patch 496 RMD160 670de4ea728a3f9b5c02f7950ce88c58d1073a7b SHA1 56dd8a6d9710264ae3b45358ad2eb48ad00d6d98 SHA256 2877bd95b592548c1a0a532b49131b84f5ab1077714ef16d768f3e33f50d6aab
 DIST dx-4.3.2.tar.gz 9904514 RMD160 855c9ce1bdd953873178eb2840b68cd35cf2b0a2 SHA1 e05c28b8db33c9e647bede27d1cc3cfd4146d524 SHA256 e128562b952687e988b93e36a59af2aa5aaf6d491a88d583fce89d3979e96515
 DIST dx-4.4.4.tar.gz 9676049 RMD160 db4cff78c9712a6e1e19265b0f42fdb87ab5ff7b SHA1 c8e4d72d169675c66acd2135599b211d80810f76 SHA256 a9915e17d49c5499edd3df69ffeac0b7ba24f8b38ddf7509712b48eb3c21f1ff
 EBUILD opendx-4.3.2-r1.ebuild 3265 RMD160 82c61c6979175d1fd3f4f6090ceb9dd7e42fcc18 SHA1 6242c282c982e034ad24351c11188906d9bd5783 SHA256 4ab8258bfc54aa188ff6bb7e7d827caebd57597248d059d0c91c1a3755b828af
+EBUILD opendx-4.4.4-r2.ebuild 2236 RMD160 e5d28d0e69d14d5b239a98b7d6302e386e758cb7 SHA1 7bd5fa91595a379b81eee8e77e62a7e5699f403d SHA256 c788c55b2939d6add28ef304e20cf3baaf85489381ea97d1eaa1312f93f2e7f4
 EBUILD opendx-4.4.4.ebuild 3674 RMD160 5869d1ec5aa2a0ddeef443c392648ed4bc8fb2a7 SHA1 48401bc6db94e0c05b5a49e736700ff0d71c3b76 SHA256 7780ca73f0ff53e973b281d7024ad6f48abab627a8bdd40d1417ccabd1ef209c
-MISC ChangeLog 4503 RMD160 a5936dedee47edec43a4c906bfeef5e45ed78321 SHA1 5ef4938b5ec0cb2583783a057d62144c8365f8f9 SHA256 78390e2c9e9e72dab493e7686355eef72cf03e65dafcf7d59e8b3f0c83464fa1
-MISC metadata.xml 361 RMD160 404d4eb0602277959498f65685d76eb4350a470d SHA1 f683e24f437dc6a5254d2d4c814c48cfd7d3740e SHA256 1be0f8158e35295c498714d8ad1b780a6fc749bee37bdbb13ad9eb163bbf38f0
+MISC ChangeLog 6706 RMD160 7ab075fde5d347f4e0b96cfbd41ee9d8e481aa5f SHA1 cd547ce6e02967709dee853df7ae5f23378ad0fe SHA256 b7c7dce5d17570dc3ba068676481ae30e96afb9d015d4732a42defd20f73ffec
+MISC metadata.xml 944 RMD160 a70f0044d99e34217b361798981ef884b5bf251c SHA1 3627f383255130427eb1d73a43b563e409cb781a SHA256 c5b382e449be53cd96ad290e8ef5085368b4c6f49f81b23dd6c9f899114bc972
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkjM9I0ACgkQchej4aZK9/fImQCcCFjvVBu02CR/l2nzWs1D75h6
-8qoAn2gw3s6vjPlbIv3JQgveiohFkK/1
-=L1Rh
+iEYEARECAAYFAkrOFAEACgkQ1ycZbhPLE2A6IACfW5tufA01K5t8jki7Vm3f/1C8
+n5IAn28/XpXCUEjjk9vVXYfhZIqyHUe9
+=FeYO
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-concurrent-make-fix.patch b/sci-visualization/opendx/files/opendx-4.4.4-concurrent-make-fix.patch
index 816b72c104a7..ba2c9c8c43c4 100644
--- a/sci-visualization/opendx/files/opendx-4.4.4-concurrent-make-fix.patch
+++ b/sci-visualization/opendx/files/opendx-4.4.4-concurrent-make-fix.patch
@@ -31,3 +31,36 @@ diff -Nuarp dx-4.4.4-orig/src/exec/dxmods/local.mk dx-4.4.4/src/exec/dxmods/loca
  
  .y.h:
  	$(YACC) $(YFLAGS) -d ${srcdir}/$*.y
+diff -Nuarp dx-4.4.4-orig/src/exec/dxmods/local.mk dx-4.4.4/src/exec/dxmods/local.mk
+--- dx-4.4.4-orig/src/exec/dxmods/local.mk.in	2008-09-11 22:31:38.000000000 +0200
++++ dx-4.4.4/src/exec/dxmods/local.mk.in	2008-09-11 22:33:44.000000000 +0200
+@@ -14,15 +14,15 @@ user.c:  dx.mdf
+ 
+ dxcm.mdf:  ${srcdir}/dxmdf.src
+ 	-rm -f dxcm.mdf
+-	cp ${srcdir}/dxmdf.src tmp.c
+-	$(CPP) $(INCLUDES) $(MDF) $(DEFS) tmp.c > dxcm.mdf
+-	-rm -f tmp.c
++	cp ${srcdir}/dxmdf.src tmp-dxcm.c
++	$(CPP) $(INCLUDES) $(MDF) $(DEFS) tmp-dxcm.c > dxcm.mdf
++	-rm -f tmp-dxcm.c
+ 
+ dx.mdf:  ${srcdir}/dxmdf.src
+ 	echo MYINC: $(MYINC)
+ 	-rm -f dx.mdf
+-	cp ${srcdir}/dxmdf.src tmp.c
+-	$(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS tmp.c > dx.mdf
++	cp ${srcdir}/dxmdf.src tmp-dx.c
++	$(CPP) $(INCLUDES) $(MYINC) $(MDF) $(DEFS) -DCPLUSPLUS_UI -DEXECUTIVE_MODS tmp-dx.c > dx.mdf
+ 	@echo '/^ *$$/{' > stripl.sed
+ 	@echo 'N' >> stripl.sed
+ 	@echo '/^ *\\n *$$/D' >> stripl.sed
+@@ -30,7 +30,7 @@ dx.mdf:  ${srcdir}/dxmdf.src
+ 	cat dx.mdf |sed '/^#/d' > tmp.mdf
+ 	cat tmp.mdf |sed -f stripl.sed > dx.mdf
+ 	@rm -f stripl.sed tmp.mdf
+-	-rm -f tmp.c
++	-rm -f tmp-dx.c
+ 
+ .y.h:
+ 	$(YACC) $(YFLAGS) -d ${srcdir}/$*.y
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-dx-errno.patch b/sci-visualization/opendx/files/opendx-4.4.4-dx-errno.patch
new file mode 100644
index 000000000000..70c1b28f0e40
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-dx-errno.patch
@@ -0,0 +1,11 @@
+diff -up dx-4.4.4/src/exec/dpexec/lex.c.errno dx-4.4.4/src/exec/dpexec/lex.c
+--- dx-4.4.4/src/exec/dpexec/lex.c.errno	2006-01-09 23:57:34.000000000 +0100
++++ dx-4.4.4/src/exec/dpexec/lex.c	2009-01-26 19:16:20.000000000 +0100
+@@ -504,6 +504,7 @@ int yylex(YYSTYPE *lvalp)
+     for (;;)
+     {
+ 	yyleng = 0;
++	errno = 0;
+  
+ 	c = input();
+  
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-gcc43-fedora.patch b/sci-visualization/opendx/files/opendx-4.4.4-gcc43-fedora.patch
new file mode 100644
index 000000000000..64a3d91fee6c
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-gcc43-fedora.patch
@@ -0,0 +1,315 @@
+diff -up dx-4.4.4/src/uipp/startup/StartupApplication.C.gcc43 dx-4.4.4/src/uipp/startup/StartupApplication.C
+--- dx-4.4.4/src/uipp/startup/StartupApplication.C.gcc43	2005-11-10 20:48:22.000000000 +0100
++++ dx-4.4.4/src/uipp/startup/StartupApplication.C	2008-01-07 21:55:03.000000000 +0100
+@@ -117,7 +117,7 @@ InitializeSignals(void)
+ #endif       
+ }            
+ 
+-boolean StartupApplication::initialize(unsigned int* argcp,
++boolean StartupApplication::initialize(int*  argcp,
+ 			       char**        argv)
+ {
+     ASSERT(argcp);
+diff -up dx-4.4.4/src/uipp/startup/StartupApplication.h.gcc43 dx-4.4.4/src/uipp/startup/StartupApplication.h
+--- dx-4.4.4/src/uipp/startup/StartupApplication.h.gcc43	2003-09-20 07:33:56.000000000 +0200
++++ dx-4.4.4/src/uipp/startup/StartupApplication.h	2008-01-07 21:50:47.000000000 +0100
+@@ -84,7 +84,7 @@ class StartupApplication : public IBMApp
+     // Overrides the Application class version:
+     //   Initializes Xt Intrinsics with option list (switches).
+     //
+-    virtual boolean initialize(unsigned int* argcp, char**argv);
++    virtual boolean initialize(int* argcp, char**argv);
+ 
+     CommandScope       *commandScope;   // command scope
+ 
+diff -up dx-4.4.4/src/uipp/startup/Main.C.gcc43 dx-4.4.4/src/uipp/startup/Main.C
+--- dx-4.4.4/src/uipp/startup/Main.C.gcc43	2000-05-16 20:53:07.000000000 +0200
++++ dx-4.4.4/src/uipp/startup/Main.C	2008-01-07 19:57:58.000000000 +0100
+@@ -14,7 +14,7 @@
+ extern "C" void HCLXmInit();
+ #endif
+ 
+-int main(unsigned int argc,
++int main( int          argc,
+ 	  char**       argv)
+ {
+ #if defined(HAVE_HCLXMINIT)
+diff -up dx-4.4.4/src/uipp/base/Application.C.gcc43 dx-4.4.4/src/uipp/base/Application.C
+--- dx-4.4.4/src/uipp/base/Application.C.gcc43	2005-11-09 19:56:17.000000000 +0100
++++ dx-4.4.4/src/uipp/base/Application.C	2008-01-07 22:39:15.000000000 +0100
+@@ -136,7 +136,7 @@ void Application::installDefaultResource
+     //this->setDefaultResources(baseWidget, Application::DefaultResources);
+ }
+ 
+-boolean Application::initializeWindowSystem(unsigned int *argcp, char **argv) 
++boolean Application::initializeWindowSystem(int *argcp, char **argv) 
+ {
+ 
+     //
+@@ -149,7 +149,7 @@ boolean Application::initializeWindowSys
+ 	     NULL,			// command line options table
+ 	     0,				// number of entries in options table
+ #if XtSpecificationRelease > 4
+-	     (int*)argcp,
++	     argcp,
+ #else
+ 	     argcp,
+ #endif
+@@ -235,7 +235,7 @@ boolean Application::initializeWindowSys
+     return TRUE;
+ }
+ 
+-void Application::parseCommand(unsigned int* argcp, char** argv,
++void Application::parseCommand(int* argcp, char** argv,
+                                XrmOptionDescList optlist, int optlistsize)
+ {
+     char res_file[256];
+@@ -280,7 +280,7 @@ void Application::parseCommand(unsigned 
+     //
+ }
+ 
+-boolean Application::initialize(unsigned int* argcp, char** argv)
++boolean Application::initialize(int* argcp, char** argv)
+ {
+     //
+     // Initialize the window system if not done already.
+diff -up dx-4.4.4/src/uipp/base/Application.h.gcc43 dx-4.4.4/src/uipp/base/Application.h
+--- dx-4.4.4/src/uipp/base/Application.h.gcc43	2005-11-09 19:26:29.000000000 +0100
++++ dx-4.4.4/src/uipp/base/Application.h	2008-01-07 21:49:49.000000000 +0100
+@@ -49,7 +49,7 @@ class Application : public UIComponent, 
+     //
+     // The main program needs to access protected member functions.
+     //
+-    friend int main(unsigned int argc,
++    friend int main( int          argc,
+ 		     char**       argv);
+ 
+ 
+@@ -71,9 +71,9 @@ class Application : public UIComponent, 
+     //
+     // Initialize the window system.
+     //
+-    virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv);
++    virtual boolean initializeWindowSystem(int *argcp, char **argv);
+ 
+-    virtual void parseCommand(unsigned int* argcp, char** argv,
++    virtual void parseCommand(int* argcp, char** argv,
+ 			       XrmOptionDescList optlist, int optlistsize);
+ 
+     //
+@@ -145,7 +145,7 @@ class Application : public UIComponent, 
+     // Initializes any Application specfic state.  This routine should 
+     // be called by main() or subclasses only.
+     //
+-    virtual boolean initialize(unsigned int* argcp, char** argv);
++    virtual boolean initialize(int* argcp, char** argv);
+ 
+     //
+     // Allow others to access our event processing mechanism
+diff -up dx-4.4.4/src/uipp/base/IBMApplication.C.gcc43 dx-4.4.4/src/uipp/base/IBMApplication.C
+--- dx-4.4.4/src/uipp/base/IBMApplication.C.gcc43	2004-04-02 22:32:43.000000000 +0200
++++ dx-4.4.4/src/uipp/base/IBMApplication.C	2008-01-07 21:53:29.000000000 +0100
+@@ -349,7 +349,7 @@ int status;
+ }
+ 
+ 
+-boolean IBMApplication::initializeWindowSystem(unsigned int *argcp, char **argv)
++boolean IBMApplication::initializeWindowSystem(int *argcp, char **argv)
+ {
+ 
+     if (!this->Application::initializeWindowSystem(argcp, argv))
+@@ -375,7 +375,7 @@ boolean IBMApplication::initializeWindow
+     return TRUE;
+ }
+ 
+-boolean IBMApplication::initialize(unsigned int* argcp,
++boolean IBMApplication::initialize(int*          argcp,
+ 				   char**        argv)
+ {
+     if (!this->Application::initialize(argcp,argv))
+diff -up dx-4.4.4/src/uipp/base/IBMApplication.h.gcc43 dx-4.4.4/src/uipp/base/IBMApplication.h
+--- dx-4.4.4/src/uipp/base/IBMApplication.h.gcc43	2003-09-20 07:35:22.000000000 +0200
++++ dx-4.4.4/src/uipp/base/IBMApplication.h	2008-01-07 21:50:19.000000000 +0100
+@@ -77,7 +77,7 @@ class IBMApplication : public Applicatio
+     //
+     // Initialize the window system.
+     //
+-    virtual boolean initializeWindowSystem(unsigned int *argcp, char **argv);
++    virtual boolean initializeWindowSystem(int *argcp, char **argv);
+ 
+     //
+     // Protected member data:
+@@ -88,7 +88,7 @@ class IBMApplication : public Applicatio
+ 
+     HelpWin		*helpWindow;
+ 
+-    boolean initialize(unsigned int* argcp, char** argv);
++    boolean initialize(int* argcp, char** argv);
+ 
+     //
+     // Load application specific action routines
+diff -up dx-4.4.4/src/uipp/tutor/TutorApplication.h.gcc43 dx-4.4.4/src/uipp/tutor/TutorApplication.h
+--- dx-4.4.4/src/uipp/tutor/TutorApplication.h.gcc43	1999-05-10 17:46:30.000000000 +0200
++++ dx-4.4.4/src/uipp/tutor/TutorApplication.h	2008-01-07 21:49:29.000000000 +0100
+@@ -69,7 +69,7 @@ class TutorApplication : public IBMAppli
+     // Overrides the Application class version:
+     //   Initializes Xt Intrinsics with option list (switches).
+     //
+-    virtual boolean initialize(unsigned int* argcp,
++    virtual boolean initialize(int*       argcp,
+ 			    char**        argv);
+ 
+     //
+diff -up dx-4.4.4/src/uipp/tutor/Main.C.gcc43 dx-4.4.4/src/uipp/tutor/Main.C
+--- dx-4.4.4/src/uipp/tutor/Main.C.gcc43	2000-05-16 20:53:15.000000000 +0200
++++ dx-4.4.4/src/uipp/tutor/Main.C	2008-01-07 19:57:39.000000000 +0100
+@@ -31,7 +31,7 @@ extern "C" void HCLXmInit();
+ //
+ const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
+  
+-int main(unsigned int argc,
++int main( int          argc,
+ 	  char**       argv)
+ {
+ #if defined(HAVE_HCLXMINIT)
+diff -up dx-4.4.4/src/uipp/tutor/TutorApplication.C.gcc43 dx-4.4.4/src/uipp/tutor/TutorApplication.C
+--- dx-4.4.4/src/uipp/tutor/TutorApplication.C.gcc43	2006-05-08 18:20:14.000000000 +0200
++++ dx-4.4.4/src/uipp/tutor/TutorApplication.C	2008-01-07 21:56:09.000000000 +0100
+@@ -196,7 +196,7 @@ InitializeSignals(void)
+ #endif       
+ }            
+ 
+-boolean TutorApplication::initialize(unsigned int* argcp,
++boolean TutorApplication::initialize(int*    argcp,
+ 			       char**        argv)
+ {
+     ASSERT(argcp);
+diff -up dx-4.4.4/src/uipp/widgets/MultiText.h.gcc43 dx-4.4.4/src/uipp/widgets/MultiText.h
+--- dx-4.4.4/src/uipp/widgets/MultiText.h.gcc43	2006-01-03 01:12:34.000000000 +0100
++++ dx-4.4.4/src/uipp/widgets/MultiText.h	2008-01-07 19:06:27.000000000 +0100
+@@ -91,7 +91,7 @@ typedef struct _XmMultiTextClassRec* XmM
+ #define XmNsmoothScroll		"smoothScroll"
+ #define XmNwaitCursorCount	"waitCursorCount"
+ 
+-#if !(defined(_Xm_h) || defined(XM_H))
++#if !(defined(_Xm_h) || defined(XM_H) || defined(_XM_XM_H))
+ #define XmNmarginHeight		"marginHeight"
+ #define XmNmarginWidth		"marginWidth"
+ #define XmNwordWrap		"wordWrap"
+@@ -109,7 +109,7 @@ typedef struct _XmMultiTextClassRec* XmM
+ #define XmCSmoothScroll		"SmoothScroll"
+ #define XmCWaitCursorCount	"WaitCursorCount"
+ 
+-#if !(defined(_Xm_h) || defined(XM_H))
++#if !(defined(_Xm_h) || defined(XM_H) || defined(_XM_XM_H))
+ #define XmCMarginHeight		"MarginHeight"
+ #define XmCMarginWidth		"MarginWidth"
+ #define XmCWordWrap		"WordWrap"
+diff -up dx-4.4.4/src/uipp/dxui/Main.C.gcc43 dx-4.4.4/src/uipp/dxui/Main.C
+--- dx-4.4.4/src/uipp/dxui/Main.C.gcc43	2005-12-07 18:50:53.000000000 +0100
++++ dx-4.4.4/src/uipp/dxui/Main.C	2008-01-07 19:57:21.000000000 +0100
+@@ -48,7 +48,7 @@ extern unsigned long _etext;
+ //
+ const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
+  
+-int main(unsigned int argc,
++int main( int          argc,
+ 	  char**       argv)
+ {
+ #if defined(HAVE_HCLXMINIT)
+diff -up dx-4.4.4/src/uipp/prompter/GARApplication.h.gcc43 dx-4.4.4/src/uipp/prompter/GARApplication.h
+--- dx-4.4.4/src/uipp/prompter/GARApplication.h.gcc43	2003-09-20 07:33:21.000000000 +0200
++++ dx-4.4.4/src/uipp/prompter/GARApplication.h	2008-01-07 21:49:05.000000000 +0100
+@@ -129,7 +129,7 @@ class GARApplication : public IBMApplica
+     // Overrides the Application class version:
+     //   Initializes Xt Intrinsics with option list (switches).
+     //
+-    virtual boolean initialize(unsigned int* argcp,
++    virtual boolean initialize(int*       argcp,
+ 			    char**        argv);
+ 
+     CommandScope       *commandScope;   // command scope
+diff -up dx-4.4.4/src/uipp/prompter/Main.C.gcc43 dx-4.4.4/src/uipp/prompter/Main.C
+--- dx-4.4.4/src/uipp/prompter/Main.C.gcc43	2000-05-16 20:52:59.000000000 +0200
++++ dx-4.4.4/src/uipp/prompter/Main.C	2008-01-07 19:57:01.000000000 +0100
+@@ -17,7 +17,7 @@ extern "C" void HCLXmInit();
+ #endif
+ 
+ 
+-int main(unsigned int argc,
++int main( int          argc,
+ 	  char**       argv)
+ {
+ #if defined(HAVE_HCLXMINIT)
+diff -up dx-4.4.4/src/uipp/prompter/GARApplication.C.gcc43 dx-4.4.4/src/uipp/prompter/GARApplication.C
+--- dx-4.4.4/src/uipp/prompter/GARApplication.C.gcc43	2006-05-08 18:20:13.000000000 +0200
++++ dx-4.4.4/src/uipp/prompter/GARApplication.C	2008-01-07 21:54:28.000000000 +0100
+@@ -198,7 +198,7 @@ InitializeSignals(void)
+     }
+ }            
+ 
+-boolean GARApplication::initialize(unsigned int* argcp,
++boolean GARApplication::initialize(int*      argcp,
+ 			       char**        argv)
+ {
+     ASSERT(argcp);
+diff -up dx-4.4.4/src/uipp/dxuilib/DXApplication.h.gcc43 dx-4.4.4/src/uipp/dxuilib/DXApplication.h
+--- dx-4.4.4/src/uipp/dxuilib/DXApplication.h.gcc43	2006-05-08 18:20:10.000000000 +0200
++++ dx-4.4.4/src/uipp/dxuilib/DXApplication.h	2008-01-07 21:14:12.000000000 +0100
+@@ -372,7 +372,7 @@ class DXApplication : public IBMApplicat
+     // Overrides the Application class version:
+     //   Initializes Xt Intrinsics with option list (switches).
+     //
+-    virtual boolean initialize(unsigned int* argcp,
++    virtual boolean initialize(int*       argcp,
+ 			    char**        argv);
+ 
+     //
+diff -up dx-4.4.4/src/uipp/dxuilib/DXApplication.C.gcc43 dx-4.4.4/src/uipp/dxuilib/DXApplication.C
+--- dx-4.4.4/src/uipp/dxuilib/DXApplication.C.gcc43	2006-06-22 21:45:34.000000000 +0200
++++ dx-4.4.4/src/uipp/dxuilib/DXApplication.C	2008-01-07 21:32:56.000000000 +0100
+@@ -2248,7 +2248,7 @@ void DXApplication::installDefaultResour
+     this->setDefaultResources(baseWidget, _defaultDXResources);
+     this->IBMApplication::installDefaultResources(baseWidget);
+ }
+-boolean DXApplication::initialize(unsigned int* argcp,
++boolean DXApplication::initialize(int* argcp,
+ 								  char**        argv)
+ {
+ 	boolean wasSetBusy = FALSE;
+diff -up dx-4.4.4/src/uipp/mb/Main.C.gcc43 dx-4.4.4/src/uipp/mb/Main.C
+--- dx-4.4.4/src/uipp/mb/Main.C.gcc43	2000-05-20 19:49:40.000000000 +0200
++++ dx-4.4.4/src/uipp/mb/Main.C	2008-01-07 19:56:41.000000000 +0100
+@@ -22,7 +22,7 @@ extern "C" void HCLXmInit();
+ //
+ const char *AssertMsgString = "Internal error detected at \"%s\":%d.\n";
+ 
+-int main(unsigned int argc,
++int main( int          argc,
+ 	  char**       argv)
+ {
+ #if defined(HAVE_HCLXMINIT)
+diff -up dx-4.4.4/src/uipp/mb/MBApplication.C.gcc43 dx-4.4.4/src/uipp/mb/MBApplication.C
+--- dx-4.4.4/src/uipp/mb/MBApplication.C.gcc43	2006-05-08 18:20:13.000000000 +0200
++++ dx-4.4.4/src/uipp/mb/MBApplication.C	2008-01-07 21:51:15.000000000 +0100
+@@ -117,7 +117,7 @@ InitializeSignals(void)
+ #endif       
+ }            
+ 
+-boolean MBApplication::initialize(unsigned int* argcp,
++boolean MBApplication::initialize(int*       argcp,
+ 			       char**        argv)
+ {
+     ASSERT(argcp);
+diff -up dx-4.4.4/src/uipp/mb/MBApplication.h.gcc43 dx-4.4.4/src/uipp/mb/MBApplication.h
+--- dx-4.4.4/src/uipp/mb/MBApplication.h.gcc43	1999-05-10 17:46:25.000000000 +0200
++++ dx-4.4.4/src/uipp/mb/MBApplication.h	2008-01-07 21:48:38.000000000 +0100
+@@ -51,7 +51,7 @@ class MBApplication : public IBMApplicat
+     // Overrides the Application class version:
+     //   Initializes Xt Intrinsics with option list (switches).
+     //
+-    virtual boolean initialize(unsigned int* argcp,
++    virtual boolean initialize(int*       argcp,
+ 			    char**        argv);
+ 
+     static MBResource	resource;
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-install.patch b/sci-visualization/opendx/files/opendx-4.4.4-install.patch
new file mode 100644
index 000000000000..342f6f88baad
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-install.patch
@@ -0,0 +1,330 @@
+diff -up dx-4.4.4/bin/dx.in.r dx-4.4.4/bin/dx.in
+--- dx-4.4.4/bin/dx.in.r	2004-05-31 18:12:05.000000000 +0200
++++ dx-4.4.4/bin/dx.in	2009-01-26 23:57:11.000000000 +0100
+@@ -60,14 +60,7 @@ exit 1
+ #
+ longhelp() {
+ 
+-if test -f "$dxroot/man/catl/dx.l" ; then
+-    more "$dxroot/man/catl/dx.l"
+-else
+-    echo "cannot find $dxroot/man/catl/dx.l"
+-    echo "set the DXROOT environment variable to the root of the"
+-    echo "dx installation tree and try again."
+-fi
+-exit 1
++man dx
+ 
+ cat << EOFlonghelp
+ command line parameters:
+@@ -286,7 +279,7 @@ fi
+ 
+ 
+ if [ -z "$DXROOT" ]; then
+-  prefix=@prefix@
++  prefix=@libdir@
+   DXROOT=$prefix/dx
+ fi
+ export DXROOT
+@@ -507,7 +507,7 @@ export DXARCH
+ 
+ # default to running locally, from @prefix@/dx  
+ exhost=$thishost
+-dxroot=@prefix@/dx
++dxroot=@libdir@/dx
+ startup=1   # run the startup window by default
+ 
+ 
+diff -up dx-4.4.4/bin/Makefile.am.r dx-4.4.4/bin/Makefile.am
+--- dx-4.4.4/bin/Makefile.am.r	2003-07-12 02:11:37.000000000 +0200
++++ dx-4.4.4/bin/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-dxbindir = $(prefix)/dx/bin
++dxbindir = $(libdir)/dx/bin
+ bindir = $(prefix)/bin
+ 
+ EXTRA_SCRIPTS = mdf2c dx
+diff -up dx-4.4.4/bin/mdf2c.in.r dx-4.4.4/bin/mdf2c.in
+--- dx-4.4.4/bin/mdf2c.in.r	1999-12-14 05:13:04.000000000 +0100
++++ dx-4.4.4/bin/mdf2c.in	2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ # Configure is looking for the following line
+-prefix=@prefix@
++prefix=@libdir@
+ DFLTROOT=$prefix/dx
+ root=${DXROOT=${DXEXECROOT=$DFLTROOT}}
+ 
+diff -up dx-4.4.4/doc/Makefile.am.r dx-4.4.4/doc/Makefile.am
+--- dx-4.4.4/doc/Makefile.am.r	1999-04-05 13:57:03.000000000 +0200
++++ dx-4.4.4/doc/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-docdir = $(prefix)/dx/doc
++docdir = $(datadir)/dx/doc
+ 
+ doc_DATA = \
+ 	README README_SMP README_alphax README_aviion README_hp700 \
+diff -up dx-4.4.4/fonts/Makefile.am.r dx-4.4.4/fonts/Makefile.am
+--- dx-4.4.4/fonts/Makefile.am.r	2003-07-12 02:11:37.000000000 +0200
++++ dx-4.4.4/fonts/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-fontdir = $(prefix)/dx/fonts
++fontdir = $(libdir)/dx/fonts
+ 
+ font_DATA = \
+ 	README area.dx cyril_d.dx \
+diff -up dx-4.4.4/help/Makefile.am.r dx-4.4.4/help/Makefile.am
+--- dx-4.4.4/help/Makefile.am.r	2003-07-12 02:11:37.000000000 +0200
++++ dx-4.4.4/help/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-helpdir = $(prefix)/dx/help
++helpdir = $(libdir)/dx/help
+ 
+ EXTRA_DIST = $(helpfiles1) $(helpfiles2) $(helpfiles3) $(helpfiles4) $(helpfiles5)  \
+ 	$(helpfiles6) $(helpfiles7) $(helpfiles8) $(helpfiles9) $(helpfiles10)  \
+diff -up dx-4.4.4/html/images/Makefile.am.r dx-4.4.4/html/images/Makefile.am
+--- dx-4.4.4/html/images/Makefile.am.r	2002-04-01 10:51:13.000000000 +0200
++++ dx-4.4.4/html/images/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,5 +1,5 @@
+ 
+-imagesdir = $(prefix)/dx/html/images
++imagesdir = $(libdir)/dx/html/images
+ 
+ images1 = \
+ 	3dcurs.gif adctlpt.gif arch.gif autoax.gif autoexp.gif		\
+diff -up dx-4.4.4/html/Makefile.am.r dx-4.4.4/html/Makefile.am
+--- dx-4.4.4/html/Makefile.am.r	2003-07-12 02:11:39.000000000 +0200
++++ dx-4.4.4/html/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-htmldir = $(prefix)/dx/html
++htmldir = $(libdir)/dx/html
+ 
+ SUBDIRS = pages images
+ 
+diff -up dx-4.4.4/html/pages/Makefile.am.r dx-4.4.4/html/pages/Makefile.am
+--- dx-4.4.4/html/pages/Makefile.am.r	2002-06-20 06:38:03.000000000 +0200
++++ dx-4.4.4/html/pages/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,4 +1,4 @@
+-pagesdir = $(prefix)/dx/html/pages
++pagesdir = $(libdir)/dx/html/pages
+ 
+ pages1 = \
+ 	insgu002.htm insgu003.htm insgu004.htm insgu005.htm insgu006.htm \
+diff -up dx-4.4.4/include/dx/Makefile.am.r dx-4.4.4/include/dx/Makefile.am
+--- dx-4.4.4/include/dx/Makefile.am.r	1999-05-26 01:35:16.000000000 +0200
++++ dx-4.4.4/include/dx/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-dxincdir = $(prefix)/dx/include/dx
++dxincdir = $(prefix)/include/dx
+  
+ dxinc_HEADERS = \
+ 	UserInteractors.h advanced.h arch.h array.h arrayhandles.h \
+diff -up dx-4.4.4/include/Makefile.am.r dx-4.4.4/include/Makefile.am
+--- dx-4.4.4/include/Makefile.am.r	2006-04-09 05:44:49.000000000 +0200
++++ dx-4.4.4/include/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,4 +1,4 @@
+-dxincdir = $(prefix)/dx/include
++dxincdir = $(prefix)/include
+ SUBDIRS = dx
+ dxinc_HEADERS = dxl.h dxstereo.h
+ nodist_dxinc_HEADERS = dxconfig.h
+diff -up dx-4.4.4/lib/Makefile.am.r dx-4.4.4/lib/Makefile.am
+--- dx-4.4.4/lib/Makefile.am.r	2003-08-22 01:22:13.000000000 +0200
++++ dx-4.4.4/lib/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,4 +1,4 @@
+-libsdir = $(prefix)/dx/lib
++libsdir = $(libdir)/dx/lib
+ 
+ libs_DATA = colors.txt dxexec.def dxexec.exp dxexec.imp dxexec.ifs \
+ 	dxfSaveCurrentImage.net dxrc mdf2c.awk messages outboard.c
+diff -up dx-4.4.4/man/Makefile.am.r dx-4.4.4/man/Makefile.am
+--- dx-4.4.4/man/Makefile.am.r	1999-04-03 18:31:28.000000000 +0200
++++ dx-4.4.4/man/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,4 +1,4 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-SUBDIRS = manl catl
++SUBDIRS = manl
+ 
+diff -up dx-4.4.4/man/manl/Makefile.am.r dx-4.4.4/man/manl/Makefile.am
+--- dx-4.4.4/man/manl/Makefile.am.r	2002-05-20 06:47:06.000000000 +0200
++++ dx-4.4.4/man/manl/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-mandir = $(prefix)/dx/man
++mandir = $(prefix)/man
+ 
+ man_MANS = dx.l
+ EXTRA_DIST = $(man_MANS)
+diff -up dx-4.4.4/src/exec/dxexec/Makefile.am.r dx-4.4.4/src/exec/dxexec/Makefile.am
+--- dx-4.4.4/src/exec/dxexec/Makefile.am.r	2006-01-11 17:24:39.000000000 +0100
++++ dx-4.4.4/src/exec/dxexec/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -9,7 +9,7 @@ noinst_LTLIBRARIES = libDXEXEC.la
+ libDXEXEC_la_SOURCES = main.c
+ libDXEXEC_la_CFLAGS = $(AM_CFLAGS)
+ 
+-bindir = $(prefix)/dx/bin_@ARCH@
++bindir = $(libdir)/dx/bin_@ARCH@
+ bin_PROGRAMS = dxexec
+ 
+ dxexec_LDADD = ../dpexec/libDPEXEC.la ../dxmods/libDXMODS.la ../dxmods/user.lo \
+diff -up dx-4.4.4/src/exec/dxmods/Makefile.am.r dx-4.4.4/src/exec/dxmods/Makefile.am
+--- dx-4.4.4/src/exec/dxmods/Makefile.am.r	2003-08-19 00:51:10.000000000 +0200
++++ dx-4.4.4/src/exec/dxmods/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,8 +1,8 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+ INCLUDES = -I${top_srcdir}/include -I${srcdir}/../dpexec -I$(BUILDBASE)/include -D@ARCH@
+ 
+-dxmdfdir = $(prefix)/dx/lib
++dxmdfdir = $(libdir)/dx/lib
+ noinst_LTLIBRARIES = libDXMODS.la libusercm.la libuser.la libDXMODSN.la
+ SUFFIXES = .c .y .c .s .h .o 
+ 
+@@ -13,6 +14,8 @@ DISTCLEANFILES = dx.mdf dxcm.mdf user.c 
+ 
+ dxmdf_DATA = dx.mdf
+ 
++user.c: dx.mdf
++
+ _complex.o: _compparse.h
+ 
+ HEADERS1 = \
+diff -up dx-4.4.4/src/exec/libdx/Makefile.am.r dx-4.4.4/src/exec/libdx/Makefile.am
+--- dx-4.4.4/src/exec/libdx/Makefile.am.r	2006-03-27 20:56:53.000000000 +0200
++++ dx-4.4.4/src/exec/libdx/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -7,7 +7,7 @@ MICRO_VERSION=@MICRO_VERSION@
+ #INCLUDES = -I../../../include  -D@ARCH@
+ INCLUDES = -I${top_srcdir}/include  -D@ARCH@
+ 
+-dxlibdir = $(prefix)/dx/lib_@ARCH@
++dxlibdir = $(libdir)/dx/lib_@ARCH@
+ 
+ noinst_LTLIBRARIES = libLIBDX.la libcallm.la libmem.la
+ #dxlib_LIBRARIES = libDXlite.a 
+diff -up dx-4.4.4/src/exec/Makefile.am.r dx-4.4.4/src/exec/Makefile.am
+--- dx-4.4.4/src/exec/Makefile.am.r	2003-09-17 00:40:40.000000000 +0200
++++ dx-4.4.4/src/exec/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ SUBDIRS = libdx dxmods hwrender dpexec dxexec
+ 
+-dxlibdir = $(prefix)/dx/lib_@ARCH@
++dxlibdir = $(libdir)/dx/lib_@ARCH@
+ 
+ MAJOR_VERSION=@MAJOR_VERSION@
+ MINOR_VERSION=@MINOR_VERSION@
+diff -up dx-4.4.4/src/misc/Makefile.am.r dx-4.4.4/src/misc/Makefile.am
+--- dx-4.4.4/src/misc/Makefile.am.r	2003-07-12 02:12:13.000000000 +0200
++++ dx-4.4.4/src/misc/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -4,7 +4,7 @@ INCLUDES = -I${top_srcdir}/include -D@AR
+ 
+ dxbindir = $(prefix)/bin
+ noinst_PROGRAMS = dxlocal
+-archmakdir = $(prefix)/dx/lib_$(ARCH)
++archmakdir = $(libdir)/dx/lib_$(ARCH)
+ archmak_DATA = arch.mak
+ 
+ dxlocal_SOURCES = dx.c utils.c
+@@ -15,5 +15,5 @@ install-exec-local: 
+ 	if test ! -z "@INSTALL_BIN_PROGRAM@" ; then		         \
+ 		$(mkinstalldirs) $(prefix)/bin ;                	         \
+ 		$(INSTALL) dxlocal@EXEEXT@ 				         \
+-		$(prefix)/dx/bin_$(ARCH)/@INSTALL_BIN_PROGRAM@@EXEEXT@ ; \
++		$(libdir)/dx/bin_$(ARCH)/@INSTALL_BIN_PROGRAM@@EXEEXT@ ; \
+ 	fi
+diff -up dx-4.4.4/src/uipp/dxl/Makefile.am.r dx-4.4.4/src/uipp/dxl/Makefile.am
+--- dx-4.4.4/src/uipp/dxl/Makefile.am.r	2003-07-12 02:12:16.000000000 +0200
++++ dx-4.4.4/src/uipp/dxl/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -7,7 +7,7 @@ MICRO_VERSION=@MICRO_VERSION@
+ 
+ INCLUDES = -I${top_srcdir}/include  -D@ARCH@
+ 
+-dxlibdir = $(prefix)/dx/lib_@ARCH@
++dxlibdir = $(libdir)/dx/lib_@ARCH@
+ 
+ noinst_HEADERS = \
+ 	dxlP.h \
+diff -up dx-4.4.4/src/uipp/dxui/Makefile.am.r dx-4.4.4/src/uipp/dxui/Makefile.am
+--- dx-4.4.4/src/uipp/dxui/Makefile.am.r	2003-07-12 02:12:17.000000000 +0200
++++ dx-4.4.4/src/uipp/dxui/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -I${srcdir}/../dxuilib -D@ARCH@
+ 
+-dxbindir = $(prefix)/dx/bin_@ARCH@
++dxbindir = $(libdir)/dx/bin_@ARCH@
+ dxbin_PROGRAMS = dxui
+ 
+ 
+diff -up dx-4.4.4/src/uipp/mb/Makefile.am.r dx-4.4.4/src/uipp/mb/Makefile.am
+--- dx-4.4.4/src/uipp/mb/Makefile.am.r	2003-08-20 16:21:33.000000000 +0200
++++ dx-4.4.4/src/uipp/mb/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -I${srcdir}/../widgets -D@ARCH@
+ 
+-dxbindir = $(prefix)/dx/bin_@ARCH@
++dxbindir = $(libdir)/dx/bin_@ARCH@
+ 
+ dxbin_PROGRAMS = builder
+ 
+diff -up dx-4.4.4/src/uipp/prompter/Makefile.am.r dx-4.4.4/src/uipp/prompter/Makefile.am
+--- dx-4.4.4/src/uipp/prompter/Makefile.am.r	2003-11-04 05:20:14.000000000 +0100
++++ dx-4.4.4/src/uipp/prompter/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ INCLUDES =  -I${srcdir}/../base -I${top_srcdir}/include -D@ARCH@
+ 
+-dxbindir = $(prefix)/dx/bin_@ARCH@
++dxbindir = $(libdir)/dx/bin_@ARCH@
+ 
+ dxbin_PROGRAMS = prompter
+ 
+diff -up dx-4.4.4/src/uipp/startup/Makefile.am.r dx-4.4.4/src/uipp/startup/Makefile.am
+--- dx-4.4.4/src/uipp/startup/Makefile.am.r	2003-07-12 02:12:29.000000000 +0200
++++ dx-4.4.4/src/uipp/startup/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ INCLUDES =  -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@
+ 
+-dxbindir = $(prefix)/dx/bin_@ARCH@
++dxbindir = $(libdir)/dx/bin_@ARCH@
+ 
+ dxbin_PROGRAMS = startupui
+ 
+diff -up dx-4.4.4/src/uipp/tutor/Makefile.am.r dx-4.4.4/src/uipp/tutor/Makefile.am
+--- dx-4.4.4/src/uipp/tutor/Makefile.am.r	2003-07-12 02:12:29.000000000 +0200
++++ dx-4.4.4/src/uipp/tutor/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -2,7 +2,7 @@
+ 
+ INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@
+ 
+-dxbindir = $(prefix)/dx/bin_@ARCH@
++dxbindir = $(libdir)/dx/bin_@ARCH@
+ 
+ dxbin_PROGRAMS = tutor
+ 
+diff -up dx-4.4.4/src/uipp/ui/Makefile.am.r dx-4.4.4/src/uipp/ui/Makefile.am
+--- dx-4.4.4/src/uipp/ui/Makefile.am.r	2001-04-12 16:29:02.000000000 +0200
++++ dx-4.4.4/src/uipp/ui/Makefile.am	2009-01-26 23:57:11.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-uidatadir = $(prefix)/dx/ui
++uidatadir = $(libdir)/dx/ui
+ 
+ DATA1 = \
+ 	icon50.dat icon50.xpm logo.dat logo.xpm ui.mdf Basic2D.cfg Basic2D.net \
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-open.patch b/sci-visualization/opendx/files/opendx-4.4.4-open.patch
new file mode 100644
index 000000000000..b62ebd094be7
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-open.patch
@@ -0,0 +1,34 @@
+diff -up dx-4.4.4/src/exec/libdx/fileio.c.open dx-4.4.4/src/exec/libdx/fileio.c
+--- dx-4.4.4/src/exec/libdx/fileio.c.open	2006-01-05 23:55:47.000000000 +0100
++++ dx-4.4.4/src/exec/libdx/fileio.c	2008-09-24 19:16:30.000000000 +0200
+@@ -263,7 +263,7 @@ Error _dxffile_open(char *name, int rw)
+ 	case 2:/* read/write */
+ 		fd = open(name, O_RDWR);
+ 		if (fd < 0) {
+-			fd = open(name, O_WRONLY | O_CREAT);
++			fd = open(name, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
+ 			if (fd < 0) {
+ 				DXSetError(ERROR_DATA_INVALID, 
+ 				"can't open/create file '%s'", name);
+diff -up dx-4.4.4/src/exec/libdx/plock.c.open dx-4.4.4/src/exec/libdx/plock.c
+--- dx-4.4.4/src/exec/libdx/plock.c.open	2002-07-17 06:48:18.000000000 +0200
++++ dx-4.4.4/src/exec/libdx/plock.c	2008-09-24 19:16:30.000000000 +0200
+@@ -37,7 +37,8 @@ struct seminfo *__buf;      /* buffer fo
+ 
+ #define SEM_FLAGS  	 (IPC_CREAT | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
+ #define SHM_FLAGS  	 (IPC_CREAT | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
+-#define OPEN_FLAGS 	 (O_CREAT | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
++#define OPEN_FLAGS	 (O_CREAT)
++#define OPEN_MODE 	 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
+ #define IS_MINE(a)	 (locks->_owner[a] == getpid())
+ #define SET_OWNER(a)	 (locks->_owner[a] = getpid())
+ #define CLEAR_OWNER(a)	 (locks->_owner[a] = 0)
+@@ -268,7 +269,7 @@ PLockInit()
+ 
+     if (stat(LOCKFILE, &statbuf))
+     {
+-        int fd = open(LOCKFILE, OPEN_FLAGS);
++        int fd = open(LOCKFILE, OPEN_FLAGS, OPEN_MODE);
+ 	if (fd < 0)
+ 	{
+ 	    fprintf(stderr, "initLocks: error accessing locks shared block: open\n");
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-szip.patch b/sci-visualization/opendx/files/opendx-4.4.4-szip.patch
new file mode 100644
index 000000000000..5e63d4e6b210
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-szip.patch
@@ -0,0 +1,55 @@
+--- configure.ac.orig	2009-06-14 22:10:24.000000000 +1200
++++ configure.ac	2009-06-14 22:26:29.000000000 +1200
+@@ -148,6 +148,12 @@ AC_ARG_WITH(netcdf,
+ 	      [with_netcdf=$withval],
+ 	      [with_netcdf='yes'])
+ 
++# Enable szip.
++AC_ARG_WITH(szlib,
++	      [  --with-szlib            Use szlib library for external szlib I/O (default is yes)],
++	      [with_szlib=$withval],
++	      [with_szlib='yes'])
++
+ # Enable 64-bit arenas, if supported
+ AC_ARG_WITH(large-arenas,
+               [  --with-large-arenas     enable 64-bit arenas, when available (default is no)],
+@@ -790,6 +796,39 @@ fi
+ 
+ 
+ #
++# Check for szlib
++#
++have_szlib='no'
++LIB_SZLIB=''
++if test "$with_szlib" != 'no'
++then
++    AS_MESSAGE([checking for szlib ......])
++    failed=0;
++    passed=0;
++    AC_CHECK_HEADERS(szlib.h, passed=`expr $passed + 1`,failed=`expr $failed + 1`)
++    AC_CHECK_LIB(sz, SZ_BufftoBuffCompress,passed=`expr $passed + 1`,failed=`expr $failed + 1`,)
++    AC_MSG_CHECKING(if szlib package is complete)
++    if test $passed -gt 0
++    then
++    if test $failed -gt 0
++    then
++	AC_MSG_RESULT(no -- some components failed test)
++        have_szlib='no (failed tests)'
++    else
++	LIB_SZLIB='-lsz'
++	LIBS="$LIB_SZLIB $LIBS"
++	FMT_LIBS="$FMT_LIBS libsz.a"
++	AC_DEFINE(HAVE_LIBSZIP, 1, [Define to 1 if you have the SZLIB libraries])
++	AC_MSG_RESULT(yes)
++        have_szlib='yes'
++    fi
++    else
++        AC_MSG_RESULT(no)
++    fi
++fi
++
++
++#
+ # Check for IMAGEMAGICK
+ #
+ have_magick='no'
diff --git a/sci-visualization/opendx/files/opendx-4.4.4-xdg.patch b/sci-visualization/opendx/files/opendx-4.4.4-xdg.patch
new file mode 100644
index 000000000000..c5b38f274bcd
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-xdg.patch
@@ -0,0 +1,26 @@
+diff -up bin/url_handler.sh.orig bin/url_handler.sh
+--- bin/url_handler.sh.orig	2009-05-02 23:21:08.000000000 +1200
++++ bin/url_handler.sh	2009-05-02 23:24:25.000000000 +1200
+@@ -27,21 +27,7 @@ case $method in
+ 	mailto)	mutt `echo "$url" | sed 's;^[^:]*:\(.*\);\1;'`
+ 		;;
+ 
+-        *)      use_xbrowser=n
+-		case "$DISPLAY" in
+-                   :0)       use_xbrowser=y
+-                             ;;
+-                   :0.*)     use_xbrowser=y
+-                             ;;
+-                   unix:0.*) use_xbrowser=y
+-                             ;;
+-                esac
+-		if [ $use_xbrowser = n ]; then
+-			lynx "$url" 
+-		else
+-			netscape -remote "openURL($url)" 2> /dev/null || \
+-			(netscape "$url" &)
+-                fi
++        *) xdg-open "$url"
+ 		;;
+ esac
+ 
diff --git a/sci-visualization/opendx/metadata.xml b/sci-visualization/opendx/metadata.xml
index 016c1159bb6c..010523757606 100644
--- a/sci-visualization/opendx/metadata.xml
+++ b/sci-visualization/opendx/metadata.xml
@@ -2,6 +2,18 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
+<longdescription lang='en'>
+  The Open Data Explorer brings together dynamic computational
+  and rendering tools in a dynamic, programmable framework that
+  enables users to rapidly create visualizations of highly complex
+  data from disparate sources.
+     
+  Data Explorer can be used to add visualization capabilities to
+  existing applications. It is used by companies and institutions for
+  applications in a large variety of visualization fields including
+  computational fluid dynamics, medical imagery, computational
+  chemistry, and engineering analysis.
+</longdescription>
 <use>
   <flag name='cdf'>Add support for <pkg>sci-libs/cdf</pkg> data exchange
     format</flag>
diff --git a/sci-visualization/opendx/opendx-4.4.4-r2.ebuild b/sci-visualization/opendx/opendx-4.4.4-r2.ebuild
new file mode 100644
index 000000000000..44d0b66fca25
--- /dev/null
+++ b/sci-visualization/opendx/opendx-4.4.4-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/opendx-4.4.4-r2.ebuild,v 1.1 2009/10/08 16:31:53 bicatali Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic autotools multilib
+
+DESCRIPTION="A 3D data visualization tool"
+HOMEPAGE="http://www.opendx.org/"
+SRC_URI="http://opendx.sdsc.edu/source/${P/open}.tar.gz"
+
+LICENSE="IPL-1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="hdf cdf netcdf tiff imagemagick szip smp"
+
+DEPEND="x11-libs/libXmu
+	x11-libs/libXi
+	x11-libs/libXp
+	x11-libs/libXpm
+	x11-libs/openmotif
+	szip? ( sci-libs/szip )
+	hdf? ( sci-libs/hdf )
+	cdf? ( sci-libs/cdf )
+	netcdf? ( sci-libs/netcdf )
+	tiff? ( media-libs/tiff )
+	imagemagick? ( >=media-gfx/imagemagick-5.3.4[-hdri] )"
+
+RDEPEND="${DEPEND}"
+# waiting on bug #36349 for media-libs/jasper in imagemagick
+
+S="${WORKDIR}/${P/open}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-4.3.2-sys.h.patch"
+	epatch "${FILESDIR}/${P}-install.patch"
+	epatch "${FILESDIR}/${P}-xdg.patch"
+	epatch "${FILESDIR}/${P}-gcc43-fedora.patch"
+	epatch "${FILESDIR}/${P}-dx-errno.patch"
+	epatch "${FILESDIR}/${P}-libtool.patch"
+	epatch "${FILESDIR}/${P}-concurrent-make-fix.patch"
+	epatch "${FILESDIR}/${P}-open.patch"
+	epatch "${FILESDIR}/${P}-szip.patch"
+	eautoreconf
+}
+
+src_configure() {
+	# check flag filtering
+	# with gcc 3.3.2 I had an infinite loop on src/exec/libdx/zclipQ.c
+	append-flags -fno-strength-reduce
+
+	# (#82672)
+	filter-flags -finline-functions
+	replace-flags -O3 -O2
+
+	# opendx uses this variable
+	local GENTOOARCH="${ARCH}"
+	unset ARCH
+
+	econf \
+		"--libdir=/usr/$(get_libdir)" \
+		"--with-x" \
+		"--without-javadx" \
+		$(use_with szip szlib) \
+		$(use_with cdf) \
+		$(use_with netcdf) \
+		$(use_with hdf) \
+		$(use_with tiff) \
+		$(use_with imagemagick magick) \
+		$(use_enable smp smp-linux)
+
+	ARCH="${GENTOOARCH}"
+	# javadx is currently broken. we may try to fix it someday.
+}
+
+src_compile() {
+	local GENTOOARCH="${ARCH}"
+	unset ARCH
+
+	emake || die
+	ARCH="${GENTOOARCH}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	newicon "src/uipp/ui/icon50.xpm" "${PN}.xpm"
+	make_desktop_entry dx "openDX" "${PN}.xpm" "DataVisualization;Education;Science;"
+}