diff options
author | Sebastien Fabbro <bicatali@gentoo.org> | 2009-10-08 16:31:53 +0000 |
---|---|---|
committer | Sebastien Fabbro <bicatali@gentoo.org> | 2009-10-08 16:31:53 +0000 |
commit | d89dcb3987dbd30524dec853cccef1df4c487ec1 (patch) | |
tree | 98efe6978d97695bebd4e1c19ec1bf8e9901d67d | |
parent | Revision bump. Add support for logfile rotation. Closes bug #262035. (diff) | |
download | gentoo-2-d89dcb3987dbd30524dec853cccef1df4c487ec1.tar.gz gentoo-2-d89dcb3987dbd30524dec853cccef1df4c487ec1.tar.bz2 gentoo-2-d89dcb3987dbd30524dec853cccef1df4c487ec1.zip |
Import from the science overlay. Thanks François Bissey for his efforts.
(Portage version: 2.2_rc44/cvs/Linux x86_64)
10 files changed, 956 insertions, 2 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/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;" +} |