Added a patch for ssh over X, fixed a bunch of install paths (including bug #294858), and cleaned a bit the ebuild

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

9 files changed, 485 insertions, 618 deletions

diff --git a/sci-visualization/opendx/ChangeLog b/sci-visualization/opendx/ChangeLog
index 66f079d4d527..9563f9671f8d 100644
--- a/sci-visualization/opendx/ChangeLog
+++ b/sci-visualization/opendx/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-visualization/opendx
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/ChangeLog,v 1.17 2009/11/27 18:17:00 bicatali Exp $
+
+*opendx-4.4.4-r3 (27 Nov 2009)
+
+  27 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org> -opendx-4.4.4.ebuild,
+  -opendx-4.4.4-r2.ebuild, +opendx-4.4.4-r3.ebuild,
+  -files/opendx-4.4.4-gcc43-fedora.patch, files/opendx-4.4.4-gcc43.patch,
+  -files/opendx-4.4.4-install.patch, +files/opendx-4.4.4-installpaths.patch,
+  +files/opendx-4.4.4-null.patch, -files/opendx-compressed-man.patch:
+  Added a patch for ssh over X, fixed a bunch of install paths (including
+  bug #294858), and cleaned a bit the ebuild
 
   08 Oct 2009; Sébastien Fabbro <bicatali@gentoo.org>
   +opendx-4.4.4-r2.ebuild, files/opendx-4.4.4-concurrent-make-fix.patch,
diff --git a/sci-visualization/opendx/Manifest b/sci-visualization/opendx/Manifest
index 204c8c823cc3..360b56e57406 100644
--- a/sci-visualization/opendx/Manifest
+++ b/sci-visualization/opendx/Manifest
@@ -5,25 +5,23 @@ AUX 20-opendx-revdep 44 RMD160 9b68b96b8f513a78a51249c7705d93d665bb3d2b SHA1 938
 AUX opendx-4.3.2-sys.h.patch 1200 RMD160 f3658ac7fd0582b69ab32df5cc23d77f8d5364c8 SHA1 b4eed91d8ad2df57241a74d4ef8452ad0d171296 SHA256 919299f0fbb6e9891a8792641ea58720ae6bb95d4ffc3f6a20cae7b8e2d1729b
 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-gcc43.patch 13310 RMD160 b98f8034d26db8440be8c8e02a06aaf24fb7030a SHA1 513a64535c04da9ab65db6b89318002171ef2e4c SHA256 8ca2296f7c36f0dd7dbaf185b3fdf68ea40a09695aaca6c0f65d3970286d225d
+AUX opendx-4.4.4-installpaths.patch 16596 RMD160 0048d9158b4a3afdcec7d5db7eca98efab640446 SHA1 2f87e10cbfff9ccbffb1abac2e0f1b735d897e7a SHA256 9f62630c4100cf125ae1f7d24fa372daa4e5b220c4d557330e7615300ef4e65e
 AUX opendx-4.4.4-libtool.patch 319 RMD160 2b501064b72e84f791ee3c3b3ac3bd83d6fd0de7 SHA1 6548dae81cb9fdf83f2a0a1095851ef40578de0e SHA256 1bde8364f7a40322f9812f0fbb0403ab8f52f946318bd548e7fa63dd887c291f
+AUX opendx-4.4.4-null.patch 584 RMD160 f1a9e2f1446ec2272ea82a16493af11e7a4cd31c SHA1 0d981e396918f1462040b44678f0b3c1ffa8098f SHA256 99edc0c8ef8e87adce6d0453449e15d3b2d134b686daf6ba56caa458c03816c2
 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 6706 RMD160 7ab075fde5d347f4e0b96cfbd41ee9d8e481aa5f SHA1 cd547ce6e02967709dee853df7ae5f23378ad0fe SHA256 b7c7dce5d17570dc3ba068676481ae30e96afb9d015d4732a42defd20f73ffec
+EBUILD opendx-4.4.4-r3.ebuild 2099 RMD160 13bcc0f1a04a7265a7bc547e5b6befdaba3b8f4f SHA1 23f262c7ac9f2f44d7042fd44f6754663a43ce04 SHA256 f18321300667fe9793fc15734d63fd11f770604e4c3d140aea09b9f89773f26d
+MISC ChangeLog 7208 RMD160 b8170f9f9e89b897054c0c749e61a16d7f37a1ae SHA1 2fe5bf8782e2988fb60a7d1163a11deb2048b139 SHA256 9411c3ee1c8a71d19b3d278d8d4e824100fc610476120cbd9560455ff9fc69cd
 MISC metadata.xml 944 RMD160 a70f0044d99e34217b361798981ef884b5bf251c SHA1 3627f383255130427eb1d73a43b563e409cb781a SHA256 c5b382e449be53cd96ad290e8ef5085368b4c6f49f81b23dd6c9f899114bc972
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkrOFAEACgkQ1ycZbhPLE2A6IACfW5tufA01K5t8jki7Vm3f/1C8
-n5IAn28/XpXCUEjjk9vVXYfhZIqyHUe9
-=FeYO
+iEYEARECAAYFAksQIS8ACgkQ1ycZbhPLE2CHRwCgs7o6yzXSU4ynnb8r82hEHHz4
+mHwAn2v9oxlfLVqbISXO+Db41kMWtG7T
+=8Kt4
 -----END PGP SIGNATURE-----
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
deleted file mode 100644
index 64a3d91fee6c..000000000000
--- a/sci-visualization/opendx/files/opendx-4.4.4-gcc43-fedora.patch
+++ /dev/null
@@ -1,315 +0,0 @@
-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-gcc43.patch b/sci-visualization/opendx/files/opendx-4.4.4-gcc43.patch
index 40349fe8ecb4..64a3d91fee6c 100644
--- a/sci-visualization/opendx/files/opendx-4.4.4-gcc43.patch
+++ b/sci-visualization/opendx/files/opendx-4.4.4-gcc43.patch
@@ -1,117 +1,315 @@
-diff -Naurp dx-4.4.4-orig/src/uipp/base/Application.h dx-4.4.4/src/uipp/base/Application.h
---- dx-4.4.4-orig/src/uipp/base/Application.h	2008-05-18 17:09:32.000000000 +0200
-+++ dx-4.4.4/src/uipp/base/Application.h	2008-05-18 17:26:10.000000000 +0200
+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,
++    friend int main( int          argc,
  		     char**       argv);
  
  
-diff -Naurp dx-4.4.4-orig/src/uipp/dxui/Main.C dx-4.4.4/src/uipp/dxui/Main.C
---- dx-4.4.4-orig/src/uipp/dxui/Main.C	2008-05-18 17:09:32.000000000 +0200
-+++ dx-4.4.4/src/uipp/dxui/Main.C	2008-05-18 17:25:13.000000000 +0200
-@@ -48,7 +48,7 @@ extern unsigned long _etext;
+@@ -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,
++int main( int          argc,
  	  char**       argv)
  {
  #if defined(HAVE_HCLXMINIT)
-@@ -104,7 +104,7 @@ int main(unsigned int argc,
- 
-     // add *tearOffModel:: XmTEAR_OFF_ENABLED/XmTEAR_OFF_DISABLED
-     XmRepTypeInstallTearOffModelConverter();
--    if (!theApplication->initialize(&argc, argv))
-+    if (!theApplication->initialize((unsigned int*)&argc, argv))
- 	exit(1);
- 
-     theApplication->handleEvents();
-diff -Naurp dx-4.4.4-orig/src/uipp/mb/Main.C dx-4.4.4/src/uipp/mb/Main.C
---- dx-4.4.4-orig/src/uipp/mb/Main.C	2008-05-18 17:09:32.000000000 +0200
-+++ dx-4.4.4/src/uipp/mb/Main.C	2008-05-18 17:24:57.000000000 +0200
-@@ -22,7 +22,7 @@ extern "C" void 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,
++int main( int          argc,
  	  char**       argv)
  {
  #if defined(HAVE_HCLXMINIT)
-@@ -39,7 +39,7 @@ int main(unsigned int argc,
- 	theApplication = new MBApplication("MB");
-     }
- 
--    theApplication->initialize(&argc, argv);
-+    theApplication->initialize((unsigned int*)&argc, argv);
-     theApplication->handleEvents();
+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);
  
-     delete theApplication;
-diff -Naurp dx-4.4.4-orig/src/uipp/prompter/Main.C dx-4.4.4/src/uipp/prompter/Main.C
---- dx-4.4.4-orig/src/uipp/prompter/Main.C	2008-05-18 17:09:32.000000000 +0200
-+++ dx-4.4.4/src/uipp/prompter/Main.C	2008-05-18 17:25:53.000000000 +0200
+     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,
++int main( int          argc,
  	  char**       argv)
  {
  #if defined(HAVE_HCLXMINIT)
-@@ -34,7 +34,7 @@ int main(unsigned int argc,
- 	theApplication = new GARApplication("GAR");
+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)
      }
+ }            
  
--    theApplication->initialize(&argc, argv);
-+    theApplication->initialize((unsigned int*)&argc, argv);
-     theApplication->handleEvents();
- 
-     delete theApplication;
-diff -Naurp dx-4.4.4-orig/src/uipp/startup/Main.C dx-4.4.4/src/uipp/startup/Main.C
---- dx-4.4.4-orig/src/uipp/startup/Main.C	2008-05-18 17:09:32.000000000 +0200
-+++ dx-4.4.4/src/uipp/startup/Main.C	2008-05-18 17:25:38.000000000 +0200
-@@ -14,7 +14,7 @@
- extern "C" void HCLXmInit();
- #endif
- 
--int main(unsigned int argc,
-+int main(int argc,
- 	  char**       argv)
+-boolean GARApplication::initialize(unsigned int* argcp,
++boolean GARApplication::initialize(int*      argcp,
+ 			       char**        argv)
  {
- #if defined(HAVE_HCLXMINIT)
-@@ -31,7 +31,7 @@ int main(unsigned int argc,
- 	theApplication = new StartupApplication("Startup");
-     }
- 
--    theApplication->initialize(&argc, argv);
-+    theApplication->initialize((unsigned int*)&argc, argv);
-     theApplication->handleEvents();
+     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);
  
-     delete theApplication;
-diff -Naurp dx-4.4.4-orig/src/uipp/tutor/Main.C dx-4.4.4/src/uipp/tutor/Main.C
---- dx-4.4.4-orig/src/uipp/tutor/Main.C	2008-05-18 17:09:32.000000000 +0200
-+++ dx-4.4.4/src/uipp/tutor/Main.C	2008-05-18 17:25:27.000000000 +0200
-@@ -31,7 +31,7 @@ extern "C" void HCLXmInit();
+     //
+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,
++int main( int          argc,
  	  char**       argv)
  {
  #if defined(HAVE_HCLXMINIT)
-@@ -58,7 +58,7 @@ int main(unsigned int argc,
- 	theApplication = new TutorApplication("DXTutor");
-     }
+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       
+ }            
  
--    if (!theApplication->initialize(&argc, argv))
-+    if (!theApplication->initialize((unsigned int*)&argc, argv))
- 	exit(1);
+-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);
  
-     theApplication->handleEvents();
+     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-installpaths.patch
index 342f6f88baad..a6b6d2ad38be 100644
--- a/sci-visualization/opendx/files/opendx-4.4.4-install.patch
+++ b/sci-visualization/opendx/files/opendx-4.4.4-installpaths.patch
@@ -1,6 +1,6 @@
 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
++++ dx-4.4.4/bin/dx.in	2009-11-06 11:47:32.190944177 +0100
 @@ -60,14 +60,7 @@ exit 1
  #
  longhelp() {
@@ -22,22 +22,92 @@ diff -up dx-4.4.4/bin/dx.in.r dx-4.4.4/bin/dx.in
  
  if [ -z "$DXROOT" ]; then
 -  prefix=@prefix@
-+  prefix=@libdir@
++  prefix=@datadir@
    DXROOT=$prefix/dx
  fi
  export DXROOT
+@@ -298,6 +291,13 @@ if [ -z "$DXDATA" ]; then
+   fi
+ fi
+ 
++if [ -z "$DXFONTS" ]; then
++  DXFONTS=$DXROOT/fonts
++  if [ -d "$DXFONTS" ]; then
++    export DXFONTS
++  fi
++fi
++
+ # if DXMACROS not set, default it to the usual unless dir doesn't exist
+ if [ -z "$DXMACROS" ]; then
+   DXMACROS=$DXROOT/samples/macros
 @@ -507,7 +507,7 @@ export DXARCH
  
  # default to running locally, from @prefix@/dx  
  exhost=$thishost
 -dxroot=@prefix@/dx
-+dxroot=@libdir@/dx
++dxroot=@datadir@/dx
  startup=1   # run the startup window by default
  
  
+@@ -1469,8 +1469,8 @@ done
+ 
+ # Now set some needed results 
+ 
+-dxexroot=$dxroot
+-dxuiroot=$dxroot
++dxexroot=@libdir@/dx
++dxuiroot=@libdir@/dx
+ dxexecdef="$dxexroot/bin_${exarch}/dxexec"
+ if test -z "$dxexec" ; then
+    dxexec=$dxexecdef
+@@ -1600,7 +1600,7 @@ fi
+ #
+ if test $tutor -eq 1 ; then
+   
+-  cmd="$DXROOT/bin_${uiarch}/tutor"
++  cmd="$DXEXECROOT/bin_${uiarch}/tutor"
+   if test $seecomline -eq 1 ; then
+     set
+     echo "$echoparms exec $cmd $xparms"
+@@ -1619,7 +1619,7 @@ if test $prompter -eq 1 ; then
+     prompterflags="$prompterflags -file \"$FileName\""
+   fi
+ 
+-  cmd="$DXROOT/bin_${uiarch}/prompter"
++  cmd="$DXEXECROOT/bin_${uiarch}/prompter"
+   if test $seecomline -eq 1 ; then
+     set
+     echo "$echoparms exec $cmd $prompterflags $xparms"
+@@ -1635,7 +1635,7 @@ fi
+ if test $startup -eq 1 ; then
+ 
+   
+-  cmd="$DXROOT/bin_${uiarch}/startupui"
++  cmd="$DXEXECROOT/bin_${uiarch}/startupui"
+   if test $seecomline -eq 1 ; then
+     set
+     echo "$echoparms exec $cmd $xparms $*"
+@@ -1649,7 +1649,7 @@ fi
+ #
+ if test $builder -eq 1 ; then
+ 
+-  cmd="$DXROOT/bin_${uiarch}/builder"
++  cmd="$DXEXECROOT/bin_${uiarch}/builder"
+   if test $seecomline -eq 1 ; then
+     set
+     echo "exec $cmd $xparms $motifcmd $motifbind $FileName"
+@@ -1674,7 +1674,7 @@ if test $encoder -eq 1 ; then
+   EncodedBase="${Base}-e"
+ 
+   echo "Creating encoded version of $FileName in ${EncodedBase}.net "
+-  cmd1="$DXROOT/bin_${uiarch}/dxencode" 
++  cmd1="$DXEXECROOT/bin_${uiarch}/dxencode" 
+   if test -f $CfgName ; then
+     echo "Copying $CfgName to ${EncodedBase}.cfg"
+     cmd2="cp $CfgName ${EncodedBase}.cfg"
 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
++++ dx-4.4.4/bin/Makefile.am	2009-11-06 11:47:32.192943219 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -48,18 +118,18 @@ diff -up dx-4.4.4/bin/Makefile.am.r dx-4.4.4/bin/Makefile.am
  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
++++ dx-4.4.4/bin/mdf2c.in	2009-11-06 11:47:32.194943239 +0100
 @@ -1,6 +1,6 @@
  #!/bin/sh
  # Configure is looking for the following line
 -prefix=@prefix@
-+prefix=@libdir@
++prefix=@datadir@
  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
++++ dx-4.4.4/doc/Makefile.am	2009-11-06 11:47:32.203697175 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -70,59 +140,76 @@ diff -up dx-4.4.4/doc/Makefile.am.r dx-4.4.4/doc/Makefile.am
  	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
++++ dx-4.4.4/fonts/Makefile.am	2009-11-06 11:47:32.204697430 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
 -fontdir = $(prefix)/dx/fonts
-+fontdir = $(libdir)/dx/fonts
++fontdir = $(datadir)/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
++++ dx-4.4.4/help/Makefile.am	2009-11-06 11:47:32.206696961 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
 -helpdir = $(prefix)/dx/help
-+helpdir = $(libdir)/dx/help
++helpdir = $(datadir)/dx/help
  
  EXTRA_DIST = $(helpfiles1) $(helpfiles2) $(helpfiles3) $(helpfiles4) $(helpfiles5)  \
  	$(helpfiles6) $(helpfiles7) $(helpfiles8) $(helpfiles9) $(helpfiles10)  \
+@@ -257,7 +257,7 @@ install-data-hook:
+ 		 $(LN_S) hlpalhtl svsmstrh ; \
+ 		 $(LN_S) hlpalhtl ugidx ; \
+ 		 $(LN_S) hlpalhtl usrefidx ; \
+-		 $(LN_S) HelpDir GarHelpDir ; \
++		 $(LN_S) HelpDir GARHelpDir ; \
+ 		 $(LN_S) HelpDir MBHelpDir ; \
+ 		 echo "cd $(DESTDIR)$(helpdir)" ; \
+ 		 echo "$(LN_S) hlpalhtl mbidx" ; \
+@@ -265,6 +265,6 @@ install-data-hook:
+ 		 echo "$(LN_S) hlpalhtl svsmstrh" ; \
+ 		 echo "$(LN_S) hlpalhtl ugidx" ; \
+ 		 echo "$(LN_S) hlpalhtl usrefidx" ; \
+-		 echo "$(LN_S) HelpDir GarHelpDir" ; \
++		 echo "$(LN_S) HelpDir GARHelpDir" ; \
+ 		 echo "$(LN_S) HelpDir MBHelpDir" ) \
+ 	'
 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
++++ dx-4.4.4/html/images/Makefile.am	2009-11-06 11:47:32.214944415 +0100
 @@ -1,5 +1,5 @@
  
 -imagesdir = $(prefix)/dx/html/images
-+imagesdir = $(libdir)/dx/html/images
++imagesdir = $(datadir)/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
++++ dx-4.4.4/html/Makefile.am	2009-11-06 11:47:32.216944434 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
 -htmldir = $(prefix)/dx/html
-+htmldir = $(libdir)/dx/html
++htmldir = $(datadir)/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
++++ dx-4.4.4/html/pages/Makefile.am	2009-11-06 11:47:32.217945666 +0100
 @@ -1,4 +1,4 @@
 -pagesdir = $(prefix)/dx/html/pages
-+pagesdir = $(libdir)/dx/html/pages
++pagesdir = $(datadir)/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
++++ dx-4.4.4/include/dx/Makefile.am	2009-11-06 11:47:32.222944494 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -133,7 +220,7 @@ diff -up dx-4.4.4/include/dx/Makefile.am.r dx-4.4.4/include/dx/Makefile.am
  	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
++++ dx-4.4.4/include/Makefile.am	2009-11-06 11:47:32.224942558 +0100
 @@ -1,4 +1,4 @@
 -dxincdir = $(prefix)/dx/include
 +dxincdir = $(prefix)/include
@@ -142,16 +229,16 @@ diff -up dx-4.4.4/include/Makefile.am.r dx-4.4.4/include/Makefile.am
  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
++++ dx-4.4.4/lib/Makefile.am	2009-11-06 11:47:32.225944279 +0100
 @@ -1,4 +1,4 @@
 -libsdir = $(prefix)/dx/lib
-+libsdir = $(libdir)/dx/lib
++libsdir = $(datadir)/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
++++ dx-4.4.4/man/Makefile.am	2009-11-06 11:47:32.227944298 +0100
 @@ -1,4 +1,4 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -160,18 +247,18 @@ diff -up dx-4.4.4/man/Makefile.am.r dx-4.4.4/man/Makefile.am
  
 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
++++ dx-4.4.4/man/manl/Makefile.am	2009-11-06 11:47:32.228944553 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
 -mandir = $(prefix)/dx/man
-+mandir = $(prefix)/man
++mandir = $(datadir)/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
++++ dx-4.4.4/src/exec/dxexec/Makefile.am	2009-11-06 11:47:32.229944807 +0100
 @@ -9,7 +9,7 @@ noinst_LTLIBRARIES = libDXEXEC.la
  libDXEXEC_la_SOURCES = main.c
  libDXEXEC_la_CFLAGS = $(AM_CFLAGS)
@@ -205,7 +292,7 @@ diff -up dx-4.4.4/src/exec/dxmods/Makefile.am.r dx-4.4.4/src/exec/dxmods/Makefil
  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
++++ dx-4.4.4/src/exec/libdx/Makefile.am	2009-11-06 11:47:32.234939235 +0100
 @@ -7,7 +7,7 @@ MICRO_VERSION=@MICRO_VERSION@
  #INCLUDES = -I../../../include  -D@ARCH@
  INCLUDES = -I${top_srcdir}/include  -D@ARCH@
@@ -217,7 +304,7 @@ diff -up dx-4.4.4/src/exec/libdx/Makefile.am.r dx-4.4.4/src/exec/libdx/Makefile.
  #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
++++ dx-4.4.4/src/exec/Makefile.am	2009-11-06 11:47:32.236940232 +0100
 @@ -1,6 +1,6 @@
  SUBDIRS = libdx dxmods hwrender dpexec dxexec
  
@@ -228,7 +315,7 @@ diff -up dx-4.4.4/src/exec/Makefile.am.r dx-4.4.4/src/exec/Makefile.am
  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
++++ dx-4.4.4/src/misc/Makefile.am	2009-11-06 11:47:32.236940232 +0100
 @@ -4,7 +4,7 @@ INCLUDES = -I${top_srcdir}/include -D@AR
  
  dxbindir = $(prefix)/bin
@@ -247,7 +334,7 @@ diff -up dx-4.4.4/src/misc/Makefile.am.r dx-4.4.4/src/misc/Makefile.am
  	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
++++ dx-4.4.4/src/uipp/dxl/Makefile.am	2009-11-06 11:47:32.236940232 +0100
 @@ -7,7 +7,7 @@ MICRO_VERSION=@MICRO_VERSION@
  
  INCLUDES = -I${top_srcdir}/include  -D@ARCH@
@@ -259,7 +346,7 @@ diff -up dx-4.4.4/src/uipp/dxl/Makefile.am.r dx-4.4.4/src/uipp/dxl/Makefile.am
  	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
++++ dx-4.4.4/src/uipp/dxui/Makefile.am	2009-11-06 11:47:32.237940486 +0100
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I${srcdir}/../base -I${top_srcdir}/include -I${srcdir}/../dxuilib -D@ARCH@
@@ -269,9 +356,52 @@ diff -up dx-4.4.4/src/uipp/dxui/Makefile.am.r dx-4.4.4/src/uipp/dxui/Makefile.am
  dxbin_PROGRAMS = dxui
  
  
+diff -up dx-4.4.4/src/uipp/java/Makefile.am.r dx-4.4.4/src/uipp/java/Makefile.am
+--- dx-4.4.4/src/uipp/java/Makefile.am.r	2006-03-27 20:06:09.000000000 +0200
++++ dx-4.4.4/src/uipp/java/Makefile.am	2009-11-06 11:47:32.238939763 +0100
+@@ -27,12 +27,12 @@
+ ## libtool and the -shrext flag to make this much more 
+ ## portable.
+ 
+-javadxdir = $(prefix)/dx/java/htmlpages
++javadxdir = $(libdir)/dx/java/htmlpages
+ javadx_DATA = dx.jar 
+-javasrvdir = $(prefix)/dx/java/server/class
++javasrvdir = $(libdir)/dx/java/server/class
+ javasrv_DATA = server.jar 
+ EXTRA_DIST = $(DX_SRCS) DXServer.java makeall.java makewrl.java exports.awk README
+-javalibdir = $(prefix)/dx/java/server/lib_@ARCH@
++javalibdir = $(libdir)/dx/java/server/lib_@ARCH@
+ 
+ javalib_DATA = @ANYDX@
+ SUBDIRS = server dx layout
+diff -up dx-4.4.4/src/uipp/java/server/macros/Makefile.am.r dx-4.4.4/src/uipp/java/server/macros/Makefile.am
+--- dx-4.4.4/src/uipp/java/server/macros/Makefile.am.r	1999-07-09 21:25:13.000000000 +0200
++++ dx-4.4.4/src/uipp/java/server/macros/Makefile.am	2009-11-06 11:47:32.238939763 +0100
+@@ -1,6 +1,6 @@
+ ##  Process this file with automake to produce Makefile.in
+ 
+-serverdatadir = $(prefix)/dx/java/server/dxmacros
++serverdatadir = $(libdir)/dx/java/server/dxmacros
+ 
+ serverdata_DATA = $(MACRO_FILES)
+ 
+diff -up dx-4.4.4/src/uipp/java/server/Makefile.am.r dx-4.4.4/src/uipp/java/server/Makefile.am
+--- dx-4.4.4/src/uipp/java/server/Makefile.am.r	2001-05-21 16:47:39.000000000 +0200
++++ dx-4.4.4/src/uipp/java/server/Makefile.am	2009-11-06 11:47:32.238939763 +0100
+@@ -1,6 +1,6 @@
+-srvbindir = $(prefix)/dx/java/server/bin
+-srvoutputdir = $(prefix)/dx/java/output
+-userhtmldir = $(prefix)/dx/java/user
++srvbindir = $(libdir)/dx/java/server/bin
++srvoutputdir = $(libdir)/dx/java/output
++userhtmldir = $(libdir)/dx/java/user
+ # the server script (in srvbindir) will actually cd and run from the class subdir so that java will find the classes
+ # the server will expect to find a file dxserver.paths there to tell the exec where to find .net files
+ srvrundir = $(srvbindir)/../class
 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
++++ dx-4.4.4/src/uipp/mb/Makefile.am	2009-11-06 11:47:32.239939528 +0100
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -I${srcdir}/../widgets -D@ARCH@
@@ -283,7 +413,7 @@ diff -up dx-4.4.4/src/uipp/mb/Makefile.am.r dx-4.4.4/src/uipp/mb/Makefile.am
  
 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
++++ dx-4.4.4/src/uipp/prompter/Makefile.am	2009-11-06 11:47:32.239939528 +0100
 @@ -2,7 +2,7 @@
  
  INCLUDES =  -I${srcdir}/../base -I${top_srcdir}/include -D@ARCH@
@@ -295,7 +425,7 @@ diff -up dx-4.4.4/src/uipp/prompter/Makefile.am.r dx-4.4.4/src/uipp/prompter/Mak
  
 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
++++ dx-4.4.4/src/uipp/startup/Makefile.am	2009-11-06 11:47:32.240940272 +0100
 @@ -2,7 +2,7 @@
  
  INCLUDES =  -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@
@@ -307,7 +437,7 @@ diff -up dx-4.4.4/src/uipp/startup/Makefile.am.r dx-4.4.4/src/uipp/startup/Makef
  
 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
++++ dx-4.4.4/src/uipp/tutor/Makefile.am	2009-11-06 11:47:32.240940272 +0100
 @@ -2,7 +2,7 @@
  
  INCLUDES = -I${top_srcdir}/include -I${srcdir}/../base -D@ARCH@
@@ -319,12 +449,12 @@ diff -up dx-4.4.4/src/uipp/tutor/Makefile.am.r dx-4.4.4/src/uipp/tutor/Makefile.
  
 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
++++ dx-4.4.4/src/uipp/ui/Makefile.am	2009-11-06 11:47:32.240940272 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
 -uidatadir = $(prefix)/dx/ui
-+uidatadir = $(libdir)/dx/ui
++uidatadir = $(datadir)/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-null.patch b/sci-visualization/opendx/files/opendx-4.4.4-null.patch
new file mode 100644
index 000000000000..5d3022a3a9d1
--- /dev/null
+++ b/sci-visualization/opendx/files/opendx-4.4.4-null.patch
@@ -0,0 +1,14 @@
+diff -up dx-4.4.4/src/exec/libdx/xwindow.c.null dx-4.4.4/src/exec/libdx/xwindow.c
+--- dx-4.4.4/src/exec/libdx/xwindow.c.null	2000-06-12 07:45:40.000000000 +0200
++++ dx-4.4.4/src/exec/libdx/xwindow.c	2009-11-08 15:10:13.000000000 +0100
+@@ -29,7 +29,9 @@ Error
+ DXRegisterWindowHandlerWithCheckProc(Error (*proc) (int, Pointer),
+ 		int (*check)(int, Pointer), Display *d, Pointer arg)
+ {
+-    int fd = ConnectionNumber(d);
++    int fd;
++    if (d) fd = ConnectionNumber(d);
++    else return ERROR;
+ 
+     if (! DXRegisterInputHandlerWithCheckProc(proc, check, fd, arg))
+ 	return ERROR;
diff --git a/sci-visualization/opendx/files/opendx-compressed-man.patch b/sci-visualization/opendx/files/opendx-compressed-man.patch
deleted file mode 100644
index c7535ccb51a3..000000000000
--- a/sci-visualization/opendx/files/opendx-compressed-man.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naurp dx-4.4.4-orig/bin/dx.in dx-4.4.4/bin/dx.in
---- dx-4.4.4-orig/bin/dx.in	2008-01-21 17:04:51.000000000 +0100
-+++ dx-4.4.4/bin/dx.in	2008-01-21 17:05:14.000000000 +0100
-@@ -60,8 +60,8 @@ exit 1
- #
- longhelp() {
- 
--if test -f "$dxroot/man/catl/dx.l" ; then
--    more "$dxroot/man/catl/dx.l"
-+if test -f "$dxroot"/man/catl/dx.l* ; then
-+    man "$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"
diff --git a/sci-visualization/opendx/opendx-4.4.4-r2.ebuild b/sci-visualization/opendx/opendx-4.4.4-r3.ebuild
index 44d0b66fca25..0d38cb10ba81 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r2.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r3.ebuild
@@ -1,10 +1,10 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/opendx-4.4.4-r3.ebuild,v 1.1 2009/11/27 18:17:00 bicatali Exp $
 
 EAPI=2
 
-inherit eutils flag-o-matic autotools multilib
+inherit eutils flag-o-matic autotools
 
 DESCRIPTION="A 3D data visualization tool"
 HOMEPAGE="http://www.opendx.org/"
@@ -36,14 +36,15 @@ S="${WORKDIR}/${P/open}"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-4.3.2-sys.h.patch"
-	epatch "${FILESDIR}/${P}-install.patch"
+	epatch "${FILESDIR}/${P}-installpaths.patch"
 	epatch "${FILESDIR}/${P}-xdg.patch"
-	epatch "${FILESDIR}/${P}-gcc43-fedora.patch"
+	epatch "${FILESDIR}/${P}-gcc43.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"
+	epatch "${FILESDIR}/${P}-null.patch"
 	eautoreconf
 }
 
@@ -57,13 +58,13 @@ src_configure() {
 	replace-flags -O3 -O2
 
 	# opendx uses this variable
-	local GENTOOARCH="${ARCH}"
 	unset ARCH
 
+	# javadx is currently broken. we may try to fix it someday.
 	econf \
-		"--libdir=/usr/$(get_libdir)" \
-		"--with-x" \
-		"--without-javadx" \
+		--libdir=/usr/$(get_libdir) \
+		--with-x \
+		--without-javadx \
 		$(use_with szip szlib) \
 		$(use_with cdf) \
 		$(use_with netcdf) \
@@ -71,22 +72,10 @@ src_configure() {
 		$(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;"
+	emake DESTDIR="${D}" install || die "emake install failed"
+	newicon src/uipp/ui/icon50.xpm ${PN}.xpm
+	make_desktop_entry dx "Open Data Explorer" ${PN}.xpm
 }
diff --git a/sci-visualization/opendx/opendx-4.4.4.ebuild b/sci-visualization/opendx/opendx-4.4.4.ebuild
deleted file mode 100644
index a8f192da9e32..000000000000
--- a/sci-visualization/opendx/opendx-4.4.4.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2008 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.ebuild,v 1.7 2008/09/14 11:25:38 spock Exp $
-
-# Set SMP="no" to force disable of SMP compilation.
-# Set SMP="yes" to force enable of SMP compilation.
-# Otherwise it will be autodetected from /usr/src/linux.
-
-inherit eutils flag-o-matic linux-info autotools
-
-DESCRIPTION="A 3D data visualization tool"
-HOMEPAGE="http://www.opendx.org/"
-SRC_URI="http://opendx.npaci.edu/source/${P/open}.tar.gz"
-
-#	There are a few jar files that can be added to enhance JX.
-#	These are java40.jar from the Netscape libraries
-#	(we've provided them in the OpenDX.org lib area) nscosmop211.jar
-#	from the Cosmo Player libs.
-#	http://opendx.npaci.edu/libs/
-#SRC_URI="${SRC_URI}
-#	http://opendx.npaci.edu/libs/netscape-java40.tar.gz
-#	http://opendx.npaci.edu/libs/cosmoplayer-jar.tar.gz"
-
-LICENSE="IPL-1"
-SLOT="0"
-# Should work on x86, ppc, alpha at least
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="hdf cdf netcdf tiff imagemagick szip" # java doc"
-
-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 )"
-
-# waiting on bug #36349 for media-libs/jasper in imagemagick
-# java support gives some trouble - deprecated api and other unresolved symbols
-#		java? ( virtual/jdk
-#				dev-java/java-config )"
-
-S="${WORKDIR}/${P/open}"
-
-smp() {
-	has "$1" "${SMP}"
-}
-
-smp_check() {
-	linux_chkconfig_present SMP
-}
-
-pkg_setup() {
-	if use imagemagick; then
-		if built_with_use media-gfx/imagemagick hdri; then
-			die "Please re-emerge imagemagick with USE=\"-hdri\" or compilation will fail"
-		fi
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	if has_version '>=sys-kernel/linux-headers-2.6.19' ; then
-		epatch "${FILESDIR}"/${PN}-4.3.2-sys.h.patch || die "Failed to apply sys.h patch."
-	fi
-
-	epatch "${FILESDIR}"/${PN}-compressed-man.patch
-	epatch "${FILESDIR}"/${PN}-4.4.4-gcc43.patch
-	epatch "${FILESDIR}"/${P}-libtool.patch
-	epatch "${FILESDIR}"/${P}-concurrent-make-fix.patch
-	eautoreconf || die "Failed running eautoreconf."
-}
-
-src_compile() {
-
-	local myconf="--with-x \
-		--host=${CHOST}"
-
-	# Check for SMP
-	# This needs to be done for /usr/src/linux, NOT the running kernel
-	# Allow override using smp().
-	if smp no
-	then
-		myconf="${myconf} --disable-smp-linux"
-		einfo "Disabling SMP capabilities"
-	elif smp yes || smp_check
-	then
-		myconf="${myconf} --enable-smp-linux"
-		einfo "Enabling SMP capabilities"
-	else
-		myconf="${myconf} --disable-smp-linux"
-		einfo "Disabling SMP capabilities"
-	fi
-
-	# 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
-
-	local morelibs=""
-	use szip && morelibs="-lsz"
-	# use java && myconf="${myconf} JNIPATH=$(java-config -O)/include:$(java-config -O)/include/linux"
-	econf LIBS="${morelibs}" \
-		`use_with cdf` \
-		`use_with netcdf` \
-		`use_with hdf` \
-		`use_with tiff` \
-		`use_with imagemagick magick` \
-		${myconf} || die
-
-	#		`use_with java javadx`
-	# This is broken
-	#	`use_enable doc installhtml`
-
-	emake || die
-	ARCH="${GENTOOARCH}"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	echo "MANPATH=/usr/dx/man" > 50opendx
-	doenvd 50opendx
-
-	# inform revdep-rebuild about binary locations
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/20-${PN}-revdep
-}