aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrançois Bissey <francois@vrooom.(none)>2009-05-11 23:28:50 +1200
committerFrançois Bissey <francois@vrooom.(none)>2009-05-11 23:31:44 +1200
commit47ae284d838d7ac5b63a8fbe4cc2324802044768 (patch)
treeb70848c0a2d163068362dacc19a43463ad17a088 /sci-visualization/opendx
parentfixed bug 266470 (diff)
downloadsci-47ae284d838d7ac5b63a8fbe4cc2324802044768.tar.gz
sci-47ae284d838d7ac5b63a8fbe4cc2324802044768.tar.bz2
sci-47ae284d838d7ac5b63a8fbe4cc2324802044768.zip
new revision of opendx and import of a new version of opendx-samples to cope with it.
Diffstat (limited to 'sci-visualization/opendx')
-rw-r--r--sci-visualization/opendx/ChangeLog10
-rw-r--r--sci-visualization/opendx/Manifest7
-rw-r--r--sci-visualization/opendx/files/opendx-4.4.4-install.patch330
-rw-r--r--sci-visualization/opendx/files/opendx-4.4.4-xdg.patch26
-rw-r--r--sci-visualization/opendx/opendx-4.4.4-r1.ebuild3
-rw-r--r--sci-visualization/opendx/opendx-4.4.4-r2.ebuild100
6 files changed, 472 insertions, 4 deletions
diff --git a/sci-visualization/opendx/ChangeLog b/sci-visualization/opendx/ChangeLog
index a08eb49f9..633536444 100644
--- a/sci-visualization/opendx/ChangeLog
+++ b/sci-visualization/opendx/ChangeLog
@@ -1,7 +1,15 @@
# ChangeLog for sci-visualization/opendx
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 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 $
+*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,
diff --git a/sci-visualization/opendx/Manifest b/sci-visualization/opendx/Manifest
index aecc45562..c05715ad6 100644
--- a/sci-visualization/opendx/Manifest
+++ b/sci-visualization/opendx/Manifest
@@ -3,10 +3,13 @@ AUX opendx-4.3.2-sys.h.patch 1200 RMD160 f3658ac7fd0582b69ab32df5cc23d77f8d5364c
AUX opendx-4.4.4-concurrent-make-fix.patch 1191 RMD160 3baec5669230df96def294192eea372e59303537 SHA1 ec7b128b46bbf897ffbf0f08a12d36fb499f7241 SHA256 5c1cdc25105815a944cde02550aa7196155be6c07ac4fe697e7ff2ee7d4a6d14
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-install.patch 11982 RMD160 2136aca79e909dc28cc18c6fd821014e777c96ea SHA1 7a86aec33dc1d23ab9700dcd6f8cb9d7d08c512d SHA256 75f9ee934b19f9f67fdbfd16b9d52fb692bb4db3d1a1fc8cc666c7ac5c5e447f
AUX opendx-4.4.4-libtool.patch 319 RMD160 2b501064b72e84f791ee3c3b3ac3bd83d6fd0de7 SHA1 6548dae81cb9fdf83f2a0a1095851ef40578de0e SHA256 1bde8364f7a40322f9812f0fbb0403ab8f52f946318bd548e7fa63dd887c291f
AUX opendx-4.4.4-open.patch 1671 RMD160 9c4ba9d2735049c841c32ab2efa2d778ce80044a SHA1 f59ba51b5e301f4bf20512835adadd3c65f2fd29 SHA256 0b0cbc06ecc8e44d32f16000c6ee2c09b70b7cfbf44ee71a50165dad19314403
+AUX opendx-4.4.4-xdg.patch 785 RMD160 ee1a8bce4a352c7bf3335f5e13bd81664f3fd7c3 SHA1 001cb1ee444631926b43857aac137ce2d9336ba2 SHA256 93e50b0da16f3d28c016fa95ee49530322e83f8527b45abd7415bb14365600c1
AUX opendx-compressed-man.patch 496 RMD160 670de4ea728a3f9b5c02f7950ce88c58d1073a7b SHA1 56dd8a6d9710264ae3b45358ad2eb48ad00d6d98 SHA256 2877bd95b592548c1a0a532b49131b84f5ab1077714ef16d768f3e33f50d6aab
DIST dx-4.4.4.tar.gz 9676049 RMD160 db4cff78c9712a6e1e19265b0f42fdb87ab5ff7b SHA1 c8e4d72d169675c66acd2135599b211d80810f76 SHA256 a9915e17d49c5499edd3df69ffeac0b7ba24f8b38ddf7509712b48eb3c21f1ff
-EBUILD opendx-4.4.4-r1.ebuild 2402 RMD160 b54251d75954388868f635d6562297dcc526e990 SHA1 4da39d1cb036bb3318b04f15f69f8d2d053a02ac SHA256 b76fd099f6df17bb236f9cd03c4c23e1f153a6c46b386aa9f95bda68d36138c5
-MISC ChangeLog 5171 RMD160 9ca08ef1bf644b71b8bbccdfcb317f0b35decdb6 SHA1 5be25579b9dae5d6c12a0b09eaae81d520ee1759 SHA256 b6e5b68124f5dbc33151045fc55f4291008ce898305ae9f6a6ebacdd007b112a
+EBUILD opendx-4.4.4-r1.ebuild 2403 RMD160 b3949b577be1888d71ea220e111da11fe59fa4d2 SHA1 6392a006d33e9205fbed11408a458c97c1a37360 SHA256 788ab5b20cd81b19b4c34cce650dac91a4eff4ea12a31b750cae08d527716203
+EBUILD opendx-4.4.4-r2.ebuild 2351 RMD160 98132fc06af505010e4bd32e3b39d44f218bd4de SHA1 9ef227620e29582575209fb491332d173d14f75a SHA256 9fb59baa21606b308716795d3292e60cc73935f3ee2deee529f41df326b8a507
+MISC ChangeLog 5935 RMD160 fefaec754a60713a3e43dc6c1fe3a04e4dcb224f SHA1 a972c58478143cf010b712e6c7c0cb7d00632c31 SHA256 e1118594f66d2f4a0d7a15a98c02122a98bb34b79ed2c98b2fa3ad440ee68c44
MISC metadata.xml 361 RMD160 404d4eb0602277959498f65685d76eb4350a470d SHA1 f683e24f437dc6a5254d2d4c814c48cfd7d3740e SHA256 1be0f8158e35295c498714d8ad1b780a6fc749bee37bdbb13ad9eb163bbf38f0
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 000000000..342f6f88b
--- /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-xdg.patch b/sci-visualization/opendx/files/opendx-4.4.4-xdg.patch
new file mode 100644
index 000000000..c5b38f274
--- /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/opendx-4.4.4-r1.ebuild b/sci-visualization/opendx/opendx-4.4.4-r1.ebuild
index 9f1bfaf80..c87e01a3b 100644
--- a/sci-visualization/opendx/opendx-4.4.4-r1.ebuild
+++ b/sci-visualization/opendx/opendx-4.4.4-r1.ebuild
@@ -6,9 +6,10 @@
# Set SMP="yes" to force enable of SMP compilation.
# Otherwise it will be autodetected from /usr/src/linux.
+EAPI=2
+
inherit eutils flag-o-matic autotools
-EAPI=2
DESCRIPTION="A 3D data visualization tool"
HOMEPAGE="http://www.opendx.org/"
SRC_URI="http://opendx.sdsc.edu/source/${P/open}.tar.gz"
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 000000000..cb992117a
--- /dev/null
+++ b/sci-visualization/opendx/opendx-4.4.4-r2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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"
+
+ 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
+
+ local morelibs=""
+ use szip && morelibs="-lsz"
+ econf LIBS="${morelibs}" \
+ "--libdir=/usr/$(get_libdir)" \
+ "--with-x" \
+ "--without-javadx" \
+ $(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;"
+}
+
+pkg_postinst() {
+ elog "This version of the opendx ebuild is still under development."
+ elog "suggestions, comments and offer of help welcome"
+ elog "post a message in gentoo-science or pop up on irc on #gentoo-science"
+}