commit: 25473a4b4fbceefd699e0decab7baea6b0e030f0 Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com> AuthorDate: Sat Jan 10 21:34:09 2015 +0000 Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com> CommitDate: Sat Jan 10 21:34:09 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=dev/bircoph.git;a=commit;h=25473a4b
opendx: in tree now --- profiles/categories | 1 - sci-visualization/opendx/ChangeLog | 229 -------------- sci-visualization/opendx/Manifest | 15 - .../opendx/files/opendx-4.3.2-sys.h.patch | 23 -- .../files/opendx-4.4.4-concurrent-make-fix.patch | 66 ----- .../opendx/files/opendx-4.4.4-dx-errno.patch | 11 - .../opendx/files/opendx-4.4.4-gcc43.patch | 315 -------------------- .../opendx/files/opendx-4.4.4-installpaths.patch | 330 --------------------- .../opendx/files/opendx-4.4.4-libtool.patch | 11 - .../opendx/files/opendx-4.4.4-magick.patch | 41 --- .../opendx/files/opendx-4.4.4-null.patch | 14 - .../opendx/files/opendx-4.4.4-open.patch | 34 --- .../opendx/files/opendx-4.4.4-szip.patch | 55 ---- .../opendx/files/opendx-4.4.4-xdg.patch | 26 -- sci-visualization/opendx/metadata.xml | 23 -- sci-visualization/opendx/opendx-4.4.4-r5.ebuild | 82 ----- 16 files changed, 1276 deletions(-) diff --git a/profiles/categories b/profiles/categories index 06fb07d..056aef8 100644 --- a/profiles/categories +++ b/profiles/categories @@ -22,7 +22,6 @@ net-libs net-misc net-print sci-geosciences -sci-visualization sys-apps sys-boot sys-cluster diff --git a/sci-visualization/opendx/ChangeLog b/sci-visualization/opendx/ChangeLog deleted file mode 100644 index e6af7dd..0000000 --- a/sci-visualization/opendx/ChangeLog +++ /dev/null @@ -1,229 +0,0 @@ -# ChangeLog for sci-visualization/opendx -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/opendx/ChangeLog,v 1.28 2012/10/24 19:45:22 ulm Exp $ - - 24 Oct 2012; Ulrich Müller <[email protected]> opendx-4.4.4-r4.ebuild: - Update dependency after package move from x11-libs/openmotif to - x11-libs/motif. - - 01 Aug 2012; Sébastien Fabbro <[email protected]> - +files/opendx-4.4.4-magick.patch, -files/20-opendx-revdep, - opendx-4.4.4-r4.ebuild: - Build for newer imagemagick and add possibility for graphicsmagick as well, - fixing bug #314375. Keyword for x86-linux, switch to EAPI 4 - - 15 Feb 2012; Kacper Kowalik <[email protected]> opendx-4.4.4-r4.ebuild: - Add prefix love. Thanks to Richard Yao <[email protected]> for the patch. - Fixes bug 403771 - - 19 Nov 2010; Sébastien Fabbro <[email protected]> opendx-4.4.4-r4.ebuild: - Remove the no hdri restriction on imagemagick dependency. Thanks Jaroslaw - Kalinowski (bug #344819) - - 10 Oct 2010; Ulrich Mueller <[email protected]> opendx-4.4.4-r4.ebuild: - Fix openmotif dependency. - - 09 Mar 2010; Jonathan Callen <[email protected]> opendx-4.4.4-r4.ebuild: - QA: When not using an absolute path, you MUST NOT use a file extension - (.png, .svg, or .xpm) on the icon name for make_desktop_entry - - 20 Jan 2010; Markus Meier <[email protected]> opendx-4.4.4-r4.ebuild: - amd64 stable, bug #299835 - - 18 Jan 2010; Sébastien Fabbro <[email protected]> - opendx-4.3.2-r1.ebuild, opendx-4.4.4-r4.ebuild: - Added dependencies for OpenGL (bug #299835). Replaced IPL-1 license to IBM - since they are the same (bug #301180) - - 17 Jan 2010; Christian Faulhammer <[email protected]> - opendx-4.4.4-r4.ebuild: - stable x86, bug 299835 - - 12 Jan 2010; nixnut <[email protected]> opendx-4.4.4-r4.ebuild: - ppc stable #299835 - -*opendx-4.4.4-r4 (03 Dec 2009) - - 03 Dec 2009; Sébastien Fabbro <[email protected]> - -opendx-4.4.4-r3.ebuild, +opendx-4.4.4-r4.ebuild, - files/opendx-4.4.4-installpaths.patch: - Revision bump for the install paths according to bug #295395. Thanks - Francois Bissey to follow-up - -*opendx-4.4.4-r3 (27 Nov 2009) - - 27 Nov 2009; Sébastien Fabbro <[email protected]> -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 <[email protected]> - +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 <[email protected]> - 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 <[email protected]> - 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 <[email protected]> - 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 <[email protected]> - +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 <[email protected]> - +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 <[email protected]> - +files/opendx-4.4.4-concurrent-make-fix.patch, opendx-4.4.4.ebuild: - Fix concurrent make (bug #230535). - - 06 Aug 2008; Ulrich Mueller <[email protected]> metadata.xml: - Add USE flag description to metadata wrt GLEP 56. - - 29 Jun 2008; Markus Dittrich <[email protected]> - +files/opendx-4.4.4-libtool.patch, opendx-4.4.4.ebuild: - Added libtool-2.2* compatibility patch (fixes bug #229901). - - 18 May 2008; Michał Januszewski <[email protected]> - +files/opendx-4.4.4-gcc43.patch, opendx-4.4.4.ebuild: - Add a patch to allow compilation with GCC 4.3. - - 05 Apr 2008; Markus Dittrich <[email protected]> opendx-4.3.2-r1.ebuild, - opendx-4.4.4.ebuild: - Need to call linux-info_pkg_setup to pick up the correct environment - variables (fixed bug #216243). - - 26 Mar 2008; Markus Dittrich <[email protected]> opendx-4.3.2-r1.ebuild, - opendx-4.4.4.ebuild: - Added check for imagemagick's hdri useflag which breaks compilation - (see bug #214058). - - 28 Feb 2008; Markus Dittrich <[email protected]> - +files/20-opendx-revdep, opendx-4.3.2-r1.ebuild, opendx-4.4.4.ebuild: - Added file to make revdep-rebuild aware of opendx binary paths - (see bug #211553). - -*opendx-4.4.4 (21 Jan 2008) - - 21 Jan 2008; Michał Januszewski <[email protected]> - +files/opendx-compressed-man.patch, +opendx-4.4.4.ebuild: - Version bump. - - 22 Jul 2007; Donnie Berkholz <[email protected]>; - opendx-4.3.2-r1.ebuild: - Drop virtual/x11 references. - - 19 Jul 2007; Jeff Gardner <[email protected]> - +files/opendx-4.3.2-sys.h.patch, -files/opendx-sys.h.patch, - opendx-4.3.2-r1.ebuild: - Fix patch name. - - 19 Jul 2007; Jeff Gardner <[email protected]> +files/opendx-sys.h.patch, - opendx-4.3.2-r1.ebuild: - Add patch to fix compilation with >=linux headers-2.6.19. See bug 185828. - - 22 Feb 2007; Markus Ullmann <[email protected]> ChangeLog: - Redigest for Manifest2 - - 09 Apr 2006; Marcus D. Hanwell <[email protected]> -opendx-4.3.2.ebuild: - Prune old version. - - 29 Jan 2006; Marcus D. Hanwell <[email protected]> +metadata.xml, - +opendx-4.3.2.ebuild, +opendx-4.3.2-r1.ebuild: - Moved from media-gfx/opendx to sci-visualization/opendx. - - 26 Jan 2006; Karol Wojtaszek <[email protected]> - opendx-4.3.2-r1.ebuild: - Stable on amd64, bug #118683 - - 14 Dec 2005; Donnie Berkholz <[email protected]>; - opendx-4.3.2-r1.ebuild: - Add modular X dependencies. - - 28 Aug 2005; Simon Stelling <[email protected]> ChangeLog: - added ~amd64 keyword - - 20 Aug 2005; Michael Hanselmann <[email protected]> - opendx-4.3.2-r1.ebuild: - Stable on ppc (bug #101923). - - 25 Jul 2005; Donnie Berkholz <[email protected]>; - opendx-4.3.2-r1.ebuild: - Stable on x86. - - 25 Jul 2005; Donnie Berkholz <[email protected]>; - opendx-4.3.2-r1.ebuild: - Update to use linux-info.eclass and to check for SMP properly. - - 24 May 2005; Donnie Berkholz <[email protected]>; - opendx-4.3.2-r1.ebuild: - (#82672) Filter -finline-functions and -O3. - - 28 Dec 2004; Olivier Fisette <[email protected]> : - Dependency update: dev-libs/szip -> sci-libs/szip. - - 28 Dec 2004; Olivier Fisette <[email protected]> : - Dependency update: dev-libs/szip -> sci-libs/szip. - - 28 Dec 2004; Olivier Fisette <[email protected]> opendx-4.3.2-r1.ebuild: - Dependency update: dev-libs/szip -> sci-libs/szip. - - 28 Dec 2004; Olivier Fisette <[email protected]> opendx-4.3.2.ebuild: - Dependency update: dev-libs/szip -> sci-libs/szip. - - 28 Dec 2004; Olivier Fisette <[email protected]> opendx-4.3.2-r1.ebuild: - Dependency update: dev-libs/hdf -> sci-libs/hdf. - - 28 Dec 2004; Olivier Fisette <[email protected]> opendx-4.3.2.ebuild: - Dependency update: dev-libs/hdf -> sci-libs/hdf. - -*opendx-4.3.2-r1 (24 May 2004) - - 24 May 2004; Patrick Kursawe <[email protected]> opendx-4.3.2-r1.ebuild: - Making szip dependency optional - - 16 Mar 2004; Patrick Kursawe <[email protected]> opendx-4.3.2.ebuild: - Fixing bug #44727 by adding szip as dependency. - - 15 Mar 2004; David Holm <[email protected]> opendx-4.3.2.ebuild: - Added to ~ppc. - -*opendx-4.3.2 (14 Mar 2004) - - 14 Mar 2004; Donnie Berkholz <[email protected]>; metadata.xml, - opendx-4.3.2.ebuild: - Initial commit to close #22217. Ebuild by myself and Patrick Kursawe - <[email protected]>. diff --git a/sci-visualization/opendx/Manifest b/sci-visualization/opendx/Manifest deleted file mode 100644 index 969aff2..0000000 --- a/sci-visualization/opendx/Manifest +++ /dev/null @@ -1,15 +0,0 @@ -AUX opendx-4.3.2-sys.h.patch 1200 SHA256 919299f0fbb6e9891a8792641ea58720ae6bb95d4ffc3f6a20cae7b8e2d1729b SHA512 b874bea7a7470b14c9e91e1b5e361316cffa9d5af6391510eaa7ba1377de897519f62bf95f422b0b0f74ba29c84e14a9bb73c79d34bf66618fdb67b574a7f89e WHIRLPOOL 3c0c33fde7dd510e21c6efe973558f3bef18415819b48a300ca213030f803e20f7918ffe5bbd12b31b5faa2fd448111e924078173a270780b42fbedd5a5a761a -AUX opendx-4.4.4-concurrent-make-fix.patch 2388 SHA256 7ce46d4fe5dda470d4a165409de8c69c1bcda1a065ecf782dbe8e1b28ee88dcf SHA512 738f567f19710a746e23bf4f9b76c5b20420008f9bad7d297ca74d45b65ac8766228387db5d77b214ebe6e87ab88d13bfc798dfcbf668cfd246d392fb0deb898 WHIRLPOOL a5c038c8e1a87d6a662920ead4eb3d88836c31d942b158e4f3c73d585bc553d4dbc3d5f97fbbddb1c9417ed8ffc5b34d40f97880e8c2cbeb9dd945e7fc49c0d5 -AUX opendx-4.4.4-dx-errno.patch 340 SHA256 046fdd113d0c3c48b2c0efabe11423539e0ab8b0d567df2acfff93f5864ea7e4 SHA512 9a23d0fd98b7e70202032e09a2ccd04f54b13331f03b83c2de61dc63d009a921b892ce1f7570f15d834471f16fb3c23bfaa28b66db86104d7a8c205aee5456b3 WHIRLPOOL 363f5eaccfa14c04ccf4b58fe1f359d97cec8079e6eacc9bfabf2bd817c2f9e261cbef2f09c4989e903ce61bb3835a83d1eccc2eb7419097db2bb887391dfc92 -AUX opendx-4.4.4-gcc43.patch 13310 SHA256 8ca2296f7c36f0dd7dbaf185b3fdf68ea40a09695aaca6c0f65d3970286d225d SHA512 b61e2cf13092b72f0e575491ceabadf00158a58f0af7d09d28858f96b06d2d6062c025e527b89c3860d945608554a318c00415d6153af6f70792bb5504ec3945 WHIRLPOOL 3bf6e8b49a438751b00a28c030a07474b5f692ea79e077d8cb4df5622abd083f18fa782bcc954100017194db376bc520ab05c889d482a2824cd549aa0ffbaef4 -AUX opendx-4.4.4-installpaths.patch 11983 SHA256 57c8e3654353f759728b9b2ca7665fa04a354bad13f0c2015e270d1f22ccdffd SHA512 a06e21431540138a412ad80168d493495cc2808b2d677efc1055b40875610b94e2089dc58f1d1b693eae590e35c95281d17fcaa9af322e3638dccc6d003c5cff WHIRLPOOL cf6809ede03896cee459c06eb745b97e0902c69f18658cfd42f5c6e59fee0f80e67ff02cd69bb786a66613adb8b338fbee7c9b93f0fc5fcf79c708e79d2faaae -AUX opendx-4.4.4-libtool.patch 319 SHA256 1bde8364f7a40322f9812f0fbb0403ab8f52f946318bd548e7fa63dd887c291f SHA512 a98d7a19f1e9c096bc9e7ffdfb9e7a6237bf3599a4f6c29aa3994a0c91653e7369626e86ea69f0d32d6b6dcecb9bc889a888fcddde81d9ca52272be49e957864 WHIRLPOOL 690aa67d6c4f12c1aa146394563ed0b68f8ee809d27e1eba47ae5ab885a46377157a47c89ad806fadbb8cb0fafe4173fdfadb37f5bc3058ca05b3974d8c606e6 -AUX opendx-4.4.4-magick.patch 1366 SHA256 5b6e246839366fda21d94af4e139bcb7c86f63f8dc55ac1aa1e72ca72fafe978 SHA512 8f69f91a92780f8152d813e64439b5207dd11bc907a463469168e963445ed4d314f3d862fce3c200957992da4f60d8c0450f7cdb34d385dc807a38da12c48639 WHIRLPOOL 62b84b4c1eb67141108d4665b88d59a1cf5db84df03f718a742f43441bedcf8ce789539bdf1aa77518b24b589272a1bd9262413c637f27cedd72555a3565dc0b -AUX opendx-4.4.4-null.patch 584 SHA256 99edc0c8ef8e87adce6d0453449e15d3b2d134b686daf6ba56caa458c03816c2 SHA512 9af10aebd267b181be4ade5009987cffaeabc5e1ff68343e63f836722098ffffa813a8b0c6c514b088221dbb5c4a654dd3a756449069fa0ef8edebc8cffb35b5 WHIRLPOOL 16b8ef20ef47badcbc8a594997215edee83667180dac273f05aeeee38d8758cd83b1539c1857dd47c4a588838e91f1bac89e0338f220cfaac3a47be872e71778 -AUX opendx-4.4.4-open.patch 1671 SHA256 0b0cbc06ecc8e44d32f16000c6ee2c09b70b7cfbf44ee71a50165dad19314403 SHA512 a35889802f28fc7fa91e887c8c8fc9fc6c7757c877e7469f1b01835de2c8c59c3f29a52e3dc6f30587dfd45f30b0783679273af28820c0120c28733dfed12a38 WHIRLPOOL 69f8a246ed2b91203457219040fd40cddc389955ebddeb0665d7a590052e244a115f9b86ce602584b1dde844df848a3abaf7ed5d71d54b4907e48ba67236b5bb -AUX opendx-4.4.4-szip.patch 1482 SHA256 c330e0fc642d4f5004fd3173532e2f7223499dc612be298a53b41f423b021a23 SHA512 2805e914729d06e50fc3c4a5f05bba77f4f26fd3419e1439fc0ae0d16805cfa7934ede9a3af47cad4cb571f9d3ebd0087d9d9bfb91615d51f31647131ff75b9e WHIRLPOOL 86d2f930baacf5ab68400fb7ebc170b9af9005e3e061bb2f06fe44b11ffefd4d6cdd2fd025f19b48af3c7e61de306fe321c832a396c894363f3146a9721847d9 -AUX opendx-4.4.4-xdg.patch 785 SHA256 93e50b0da16f3d28c016fa95ee49530322e83f8527b45abd7415bb14365600c1 SHA512 8aa9dd05fa2d6fe90b85db8b0676cecb0c183cccc6bd229b4c8f5527eff9c23749c1ba8eafdd9baba16bb97ce5d6acfbac41a70ac4dc896b88cfad95c771d793 WHIRLPOOL 43b906145f324230d8255a746a66ebf4c99aef9df65325f857d302f5161f13fd9836666a3af4a8e05977e2f9e139fe80946801a533ae145384f772163431cb28 -DIST dx-4.4.4.tar.gz 9676049 SHA256 a9915e17d49c5499edd3df69ffeac0b7ba24f8b38ddf7509712b48eb3c21f1ff SHA512 e6ef0075a696c442fd4615eb32b9ebd3f85728321a33297e3402b19bbc6210953a6599d643fc0a20bc349fbc72411326c69187223ee0e65560603d8e6f7527ee WHIRLPOOL 6d6931fabfb054ff06464649b2b2ce5f094aa6d0c28f0f2e6ee22176ef4749d78f102ed9d0c27cf3c84ea10038d4502d908ec7a95a597d32f21574b277a54fa0 -EBUILD opendx-4.4.4-r5.ebuild 2057 SHA256 d11a16e141cec04c324abbc302d76030fbd00c6b0331b9e5fced145fed546ccd SHA512 fa803d3f66fc6e91b8eafb5210332ca79ac451bfd29e8c0e9a87f3db47d325b8165357845366230b3af609db1d0411eb31132609f0346e2aa41b70d78bc4c0e4 WHIRLPOOL efa07eab4df6d09af508251b593db89cce79a1e1bef9eff718af825526f43cd7eb2728c921e282933f537c6b191cc92a0e52048639c7fce649adac5d52ea7d6d -MISC ChangeLog 9116 SHA256 f0340560cc604a61a86d491675f539c7c40c4823943a41c79a4358a2b299464e SHA512 0def7641a3476dcb5362fdbd5e2b407d16aa61d120f1cac54fc02e02543a16594a213bc8c6298aa7deb125de75ae6c97e12bda3ed1e4491b2fef15dab8716177 WHIRLPOOL 792613904ac7ad08f392f874667eebdb47d46e00c51b033dfa3c8ba8faf8fa9470a79fbd0402af5fbaa95f1d48883019ad538244f93e94d1b58ab02635694d0b -MISC metadata.xml 944 SHA256 c5b382e449be53cd96ad290e8ef5085368b4c6f49f81b23dd6c9f899114bc972 SHA512 43133bc016658001ce1e520b7e1eed7cce39860a8a2e6d70a28f6975de93207c9ef2cf1af359b4aaacdb1fe4f7499e1a062a19d229f4ad0930c6f378a0d28307 WHIRLPOOL 6551af1bef56c6d76708959ae99d60394f9b9c6a096a154210f52d315da9ec059a2f6246aef039e9f57e6cfab709b1e5f9eb7440d87e4639f4bbd5e6e4f2fa2a diff --git a/sci-visualization/opendx/files/opendx-4.3.2-sys.h.patch b/sci-visualization/opendx/files/opendx-4.3.2-sys.h.patch deleted file mode 100644 index 93bf18e..0000000 --- a/sci-visualization/opendx/files/opendx-4.3.2-sys.h.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -aurN dx-4.3.2-orig/configure.ac dx-4.3.2/configure.ac ---- dx-4.3.2-orig/configure.ac 2007-07-19 00:59:55.000000000 -0500 -+++ dx-4.3.2/configure.ac 2007-07-19 01:02:34.000000000 -0500 -@@ -1004,7 +1004,7 @@ - Xm/ScrolledWP.h Xm/SelectioB.h Xm/SeparatoG.h Xm/SeparatoGP.h Xm/Separator.h \ - Xm/Text.h Xm/TextF.h Xm/ToggleB.h Xm/ToggleBG.h Xm/Xm.h Xm/XmP.h Xm/XmStrDefs.h \ - gl.h gl/device.h gl/gl.h invent.h iop/afb.h iop/mov.h iop/pfs.h license.h \ -- linux/kernel.h linux/sys.h math.h mingw32/dir.h mon.h net/if_arp.h net/route.h \ -+ linux/kernel.h math.h mingw32/dir.h mon.h net/if_arp.h net/route.h \ - os2.h setjmp.h starbase.c.h stddef.h stdio.h synch.h sys/access.h \ - sys/ipc.h sys/m88kbcs.h sys/mman.h sys/mode.h sys/pstat.h sys/resource.h \ - sys/svs.h sys/sysconfig.h sys/syslimits.h sys/sysmacros.h ulocks.h x11/xlibxtra.h \ -diff -aurN dx-4.3.2-orig/src/exec/libdx/memory.c dx-4.3.2/src/exec/libdx/memory.c ---- dx-4.3.2-orig/src/exec/libdx/memory.c 2007-07-19 00:59:54.000000000 -0500 -+++ dx-4.3.2/src/exec/libdx/memory.c 2007-07-19 01:01:57.000000000 -0500 -@@ -66,7 +66,6 @@ - - #if linux - #include <linux/kernel.h> --#include <linux/sys.h> - #include <sys/sysinfo.h> - #endif - 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 deleted file mode 100644 index ba2c9c8..0000000 --- a/sci-visualization/opendx/files/opendx-4.4.4-concurrent-make-fix.patch +++ /dev/null @@ -1,66 +0,0 @@ -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 2008-09-11 22:31:38.000000000 +0200 -+++ dx-4.4.4/src/exec/dxmods/local.mk 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 -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 deleted file mode 100644 index 70c1b28..0000000 --- a/sci-visualization/opendx/files/opendx-4.4.4-dx-errno.patch +++ /dev/null @@ -1,11 +0,0 @@ -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.patch b/sci-visualization/opendx/files/opendx-4.4.4-gcc43.patch deleted file mode 100644 index 64a3d91..0000000 --- a/sci-visualization/opendx/files/opendx-4.4.4-gcc43.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-installpaths.patch b/sci-visualization/opendx/files/opendx-4.4.4-installpaths.patch deleted file mode 100644 index 3c0b6d9..0000000 --- a/sci-visualization/opendx/files/opendx-4.4.4-installpaths.patch +++ /dev/null @@ -1,330 +0,0 @@ -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 = $(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 -@@ -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-libtool.patch b/sci-visualization/opendx/files/opendx-4.4.4-libtool.patch deleted file mode 100644 index 2a5aad6..0000000 --- a/sci-visualization/opendx/files/opendx-4.4.4-libtool.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur dx-4.4.4/configure.ac dx-4.4.4.new/configure.ac ---- dx-4.4.4/configure.ac 2006-08-21 17:56:08.000000000 -0400 -+++ dx-4.4.4.new/configure.ac 2008-06-29 07:31:08.000000000 -0400 -@@ -10,6 +10,7 @@ - AM_INIT_AUTOMAKE - AC_DISABLE_SHARED - AC_PROG_LIBTOOL -+AC_PROG_CXX - - VERSION_STRING="04.4.4000" - MAJOR_VERSION=4 diff --git a/sci-visualization/opendx/files/opendx-4.4.4-magick.patch b/sci-visualization/opendx/files/opendx-4.4.4-magick.patch deleted file mode 100644 index 5680bb0..0000000 --- a/sci-visualization/opendx/files/opendx-4.4.4-magick.patch +++ /dev/null @@ -1,41 +0,0 @@ -newer magick libraries, use pkg-config, add possibility to link with -graphicsmagick, fix for as-needed - ---- dx-4.4.4.orig/src/exec/dxmods/_im_image.c -+++ dx-4.4.4/src/exec/dxmods/_im_image.c -@@ -329,7 +329,7 @@ - DestroyImageInfo(new_frame_info); - DestroyImageInfo(image_info); - #if MagickLibVersion > 0x0537 -- DestroyConstitute(); -+ ConstituteComponentTerminus(); - #endif - DXSetError(ERROR_INTERNAL, "reason = %s, description = %s", - image->exception.reason, -@@ -346,7 +346,7 @@ - DestroyImageInfo(new_frame_info); - DestroyImageInfo(image_info); - #if MagickLibVersion > 0x0537 -- DestroyConstitute(); -+ ConstituteComponentTerminus(); - #endif - DXErrorReturn( ERROR_INTERNAL , "out of memory allocating buffer _im_image.c"); - } -@@ -375,7 +375,7 @@ - DestroyImageInfo(image_info); - DestroyImageInfo(new_frame_info); - #if MagickLibVersion > 0x0537 -- DestroyConstitute(); -+ ConstituteComponentTerminus(); - #endif - - DEBUGMESSAGE("back from DestroyImage"); -@@ -491,7 +491,7 @@ - DestroyImage(image); - DestroyImageInfo(image_info); - #if MagickLibVersion > 0x0537 -- DestroyConstitute(); -+ ConstituteComponentTerminus(); - #endif - } - return (OK); diff --git a/sci-visualization/opendx/files/opendx-4.4.4-null.patch b/sci-visualization/opendx/files/opendx-4.4.4-null.patch deleted file mode 100644 index 5d3022a..0000000 --- a/sci-visualization/opendx/files/opendx-4.4.4-null.patch +++ /dev/null @@ -1,14 +0,0 @@ -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-4.4.4-open.patch b/sci-visualization/opendx/files/opendx-4.4.4-open.patch deleted file mode 100644 index b62ebd0..0000000 --- a/sci-visualization/opendx/files/opendx-4.4.4-open.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index 5e63d4e..0000000 --- a/sci-visualization/opendx/files/opendx-4.4.4-szip.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- 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 deleted file mode 100644 index c5b38f2..0000000 --- a/sci-visualization/opendx/files/opendx-4.4.4-xdg.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index 0105237..0000000 --- a/sci-visualization/opendx/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!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> - <flag name='hdf'>Add support for the Hierarchical Data Format - (<pkg>sci-libs/hdf</pkg>)</flag> -</use> -</pkgmetadata> diff --git a/sci-visualization/opendx/opendx-4.4.4-r5.ebuild b/sci-visualization/opendx/opendx-4.4.4-r5.ebuild deleted file mode 100644 index 042e01f..0000000 --- a/sci-visualization/opendx/opendx-4.4.4-r5.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2015 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-r4.ebuild,v 1.11 2012/10/24 19:45:23 ulm Exp $ - -EAPI=5 - -MYP=dx-${PV} -inherit eutils flag-o-matic autotools multilib - -DESCRIPTION="3D data visualization tool" -HOMEPAGE="http://www.opendx.org/"; -SRC_URI="http://opendx.sdsc.edu/source/${MYP}.tar.gz"; - -LICENSE="IBM" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="hdf cdf netcdf tiff imagemagick szip smp" - -RDEPEND="x11-libs/libXmu - x11-libs/libXi - x11-libs/libXp - x11-libs/libXpm - >=x11-libs/motif-2.3:0 - virtual/opengl - virtual/glu - szip? ( sci-libs/szip ) - hdf? ( sci-libs/hdf ) - cdf? ( sci-libs/cdf ) - netcdf? ( sci-libs/netcdf ) - tiff? ( media-libs/tiff ) - imagemagick? ( media-gfx/imagemagick )" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${MYP}" - -src_prepare() { - epatch "${FILESDIR}/${PN}-4.3.2-sys.h.patch" - epatch "${FILESDIR}/${P}-installpaths.patch" - epatch "${FILESDIR}/${P}-xdg.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 -} - -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 - unset ARCH - - # javadx is currently broken. we may try to fix it someday. - econf \ - --libdir="${EPREFIX}"/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) -} - -src_install() { - default - newicon src/uipp/ui/icon50.xpm ${PN}.xpm - make_desktop_entry dx "Open Data Explorer" -}
