diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2009-11-04 06:25:14 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2009-11-04 06:25:14 +0000 |
| commit | b96c03a2942fbb8d06ff4d812874b0c00637b55c (patch) | |
| tree | d878e6640d0a86930a7233125710cad4f643a538 /sci-astronomy | |
| parent | version bump (diff) | |
| download | historical-b96c03a2942fbb8d06ff4d812874b0c00637b55c.tar.gz historical-b96c03a2942fbb8d06ff4d812874b0c00637b55c.tar.bz2 historical-b96c03a2942fbb8d06ff4d812874b0c00637b55c.zip | |
Version bump. Updated all patches, added icon and fix for tcl-8.5 (bug #267558)
Package-Manager: portage-2.2_rc48/cvs/Linux x86_64
Diffstat (limited to 'sci-astronomy')
17 files changed, 480 insertions, 823 deletions
diff --git a/sci-astronomy/ds9/ChangeLog b/sci-astronomy/ds9/ChangeLog index 4d2d0ab7965b..d43a4a06963b 100644 --- a/sci-astronomy/ds9/ChangeLog +++ b/sci-astronomy/ds9/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for sci-astronomy/ds9 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ChangeLog,v 1.19 2009/02/25 17:17:33 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ChangeLog,v 1.20 2009/11/04 06:25:14 bicatali Exp $ + +*ds9-5.7 (04 Nov 2009) + + 04 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org> + -files/ds9-5.1-gcc4.2-x86.patch, -ds9-5.2.ebuild, + -files/ds9-5.2-Makefile.patch, -files/ds9-5.2-gcc43.patch, + -files/ds9-5.4-gcc43.patch, -files/ds9-5.4-saotk.patch, -ds9-5.5.ebuild, + -files/ds9-5.5-main.patch, -files/ds9-5.5-makefile.patch, + -files/ds9-5.5-src.patch, +ds9-5.7.ebuild, +files/ds9-5.7-main.patch, + +files/ds9-5.7-makefile.patch, +files/ds9-5.7-saotk.patch, + +files/ds9-5.7-src.patch, +files/ds9-5.7-tcl85.patch, +files/ds9.png: + Version bump. Updated all patches, added icon and fix for tcl-8.5 (bug + #267558) 25 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org> -files/ds9-5.4-fitsy.patch, -files/ds9-5.4-main.patch, diff --git a/sci-astronomy/ds9/Manifest b/sci-astronomy/ds9/Manifest index 4515a3fd4e31..51212d6d9275 100644 --- a/sci-astronomy/ds9/Manifest +++ b/sci-astronomy/ds9/Manifest @@ -1,26 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX ds9-5.1-gcc4.2-x86.patch 1001 RMD160 c955fdf898c2fbcc10a4597b3147fd2f534ccb42 SHA1 71826d2027f5fbeca166fa30d7eff718a393645c SHA256 a890da6e6d93a9b246948c6088104e176a42ba796042039186d5aabfcab3f280 -AUX ds9-5.2-Makefile.patch 1726 RMD160 34e39e6144d1e8251b00faf6393983c9077455bf SHA1 ee40fa4a9511865ee778c73b3ef3565f5ef0a779 SHA256 ba1e1fac3aa45f72734fc23dc4b05c7fe00e464dce0a9c379b05e00f52a74757 -AUX ds9-5.2-gcc43.patch 5677 RMD160 e729c4a2644f4452e126e3903066eb1b68f8e4d0 SHA1 b473943c4772ac2e8f0e8da254aba2a49206a5b4 SHA256 2fba8aef2f9b42b5915e3f864fd84dedc38a6deb62655437f4f02e2e0fb3fa70 -AUX ds9-5.4-gcc43.patch 3088 RMD160 9cbde4184673d2c3eb3fc4da2947c1eac846f579 SHA1 8741209fbfd3b46ec1ff8ece7df67964c04416a3 SHA256 16f90115b05f2c5e4b3651e748683425453bb2b0395622a970d06b66975fdbd2 AUX ds9-5.4-htmlwidget.patch 1483 RMD160 8cc6b7ffb8f78d0172424720a10d0cae34a3d879 SHA1 31d37341d80f545da62f5b9af6bbc2f2b29d6381 SHA256 eb455cae898909705985030d4fec97f139a442fe0d557d5bea3ce7c0fdc96d6c -AUX ds9-5.4-saotk.patch 5400 RMD160 abfd44096cc329ae19350ae6bed50e05751fd7f8 SHA1 eb70b5cd98837ed21f0eeae293395c94686a0b33 SHA256 5bd91e719d5992502b65eb27309cde8c653175c3dba0c2db8e7cd674e652cbc8 -AUX ds9-5.5-main.patch 6809 RMD160 bbbf9e8a9d54fb8b802171b47b049bf8d7b61215 SHA1 1bb1dd4ebc04e082827795ef1b73ed6d203a34b1 SHA256 a58a6f2c04f578312277502059d51d9e21ca74464f9d03632fb0257c4a665de0 -AUX ds9-5.5-makefile.patch 879 RMD160 6d204ca28fd90a6dc00af5ff6436d5104b907499 SHA1 693b90b19c694e77767584e0a251b2aa7903ff66 SHA256 cf34e5117d83eb367043250d9e8aa9e9b350363a6f3194ab59077bad64e64fc7 -AUX ds9-5.5-src.patch 1678 RMD160 22e9fc46522e2acffd271006c405c9882144fe84 SHA1 e52494991bfe8d8b8462e4ffc4dea84c9e7948cb SHA256 28e355f46adc5f71356ada257bd8d91e430da8cc2369830239038f167f56e7c2 +AUX ds9-5.7-main.patch 8975 RMD160 451c48a584431190357224c65bdc26df077c1539 SHA1 686f1eb28c059a209bf9445c2f0d3e0bf6cc07ec SHA256 396daae22ffc2d83aae598df24f5e9633bed9b22417e2f3fa8b3cad36faeada2 +AUX ds9-5.7-makefile.patch 998 RMD160 d4debc34c21f9af654ec7c3c81f1600cbe896225 SHA1 1feb11091b3a8707535ffb073e7d5e5929429404 SHA256 6d96786533f288e14e4ed2a82bcfa0c37d1314a9d88c9500c779d95a97bf5f3f +AUX ds9-5.7-saotk.patch 4907 RMD160 bbadc06a9ae2a1eb397b1f649f84054e32f19c8d SHA1 b4c787d985f5895f53dcc7da4a166897ac72b1ca SHA256 974a2a214fe8ca516d2bd5c53061dd23e6112f63f1e9d49a5e7d5c83c4adbfb0 +AUX ds9-5.7-src.patch 1377 RMD160 9e768d3edd612e108d20da2aa01fc160b6a1b49e SHA1 23ab4788007067869d4ef2e01e0b4bae89e238d8 SHA256 847822b8f244afe1941ef69b5f3f05abea6a5eb2ae8b8d8b46fc47a3a5003a0d +AUX ds9-5.7-tcl85.patch 414 RMD160 b7a96449e52798bafab7661d5b682d4d8ac14baf SHA1 c843c1f0e1a710eab452b79c9b1b0d2f2e03a797 SHA256 554358ed24a1b537cccdadaade241362d38fe6d86e5b481c9b18e96f1ce655ea +AUX ds9.png 3622 RMD160 4429d2de155ff272d58dddd447ea193bb33a78ab SHA1 0d1b655ba190ac4067ddd7efb95cec023754f3af SHA256 ff5f38cfdfd59aee262ae3443fddf35d644b8604c9d6ab07eb96a137ee0a0d28 AUX make.gentoo 237 RMD160 b0de6c53dca48199106aaec86e950d517d94bfb7 SHA1 2ccddb02a71c97acc63ec48dccf2b904b2b5cc1b SHA256 15b7b6aebaf733c4e88818119938718a3a7b89c7a255452f4b0cbfa0a1061bd6 -DIST ds9.5.2.tar.gz 26540080 RMD160 3951e9d6ec4b5310ebf3d69324e35c028e38c16e SHA1 f887b6e6dac17146f35aed338bc389c34947da03 SHA256 1b4d2edf056f8448469b4cb26e3f21c850d564e9ed49abb46ecb053f548779dd -DIST ds9.5.5.tar.gz 27278806 RMD160 abcc1c71c62ac0ab3e81727ab55f561b0e174417 SHA1 ff83a450e86a3e9d252200b4cf4339a41626db87 SHA256 051cd9de22000a641acf4510d8bd7ecd4ec7cca5a2d1fe8745df6dec076b7f3f -EBUILD ds9-5.2.ebuild 1967 RMD160 0f1b3f91b587ce4f6b925c5a6c126b5452a7939e SHA1 8fd2e3451161dc5622480d5c0aed07a61136ae41 SHA256 e0f7659bb31c0bed23eb1fa4e89ec75272be48f089f6fb6f92fb6fed32e76c42 -EBUILD ds9-5.5.ebuild 1857 RMD160 6bd7c7b7884dd220aebea82d2d95cc28d72f040a SHA1 72162aee51ac9578b53fd65a9669a69d9e9b7bc6 SHA256 26c028108d81b7783b0ea9d62f15e94851c3ddfc4a9077c47849d6dd4e4b4953 -MISC ChangeLog 3654 RMD160 2ed6ef158420893e31a1a64fc22d5e49c17f90ea SHA1 474421158537d253f0092410e8307b5daf4d0645 SHA256 fb01d2430b9d4bb08935064713adb67ab1c6143550f3daad1f9895726fc0a225 +DIST ds9.5.7.tar.gz 35061076 RMD160 1be5c1d8e14b0add4859cf6ff354841c56b9ebe1 SHA1 5d976cd69ac1f0b7ac7d255acf9f94ff2f45b7a4 SHA256 39ce857c75d408b3fff3e9fec0a7face2f68e5234c4a9ad1b3f43eceb1a4e114 +EBUILD ds9-5.7.ebuild 1792 RMD160 c16b2ffae73ee58c2a08a90bcbabc95eb054f61d SHA1 05acd41b26b4b5cc9152b3e3698528d5c8fc53c0 SHA256 f64f46b298ee7ca8561ed44b1866de4d144acddddacae05dc7ae770ed4654d2b +MISC ChangeLog 4271 RMD160 7591b4528b915d6f808847955e9a9b8126c545c5 SHA1 0c19956bc6b58e315d6a81540ad68a43251343f3 SHA256 20be995f19087ede5939cc365c603ab7e1916e6bd7c31cf2b87033e0c0c866f2 MISC metadata.xml 1072 RMD160 3c839d72950b8eb3ab84920e86017f97f3b14799 SHA1 1cefcee915ef90f64beb486d298972981ea3891e SHA256 42893aa6c35591819017a8708062c88df98d27ab0466ec07d7603b46d6e3719e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.10 (GNU/Linux) +Version: GnuPG v2.0.13 (GNU/Linux) -iEYEARECAAYFAkmlfTgACgkQ1ycZbhPLE2D5DwCeI3259xJO3Q8ajHQodTG4cXun -FBsAnjSGYJQW04phfKbwub3F3eBPzJZu -=Gm5X +iEYEARECAAYFAkrxKFQACgkQ1ycZbhPLE2DIDgCfV1eQNEV1JQeUGUUsx03PkQwI +/LYAoIl2AuUFHhJCQB175NJGOqk4vn1B +=ms2d -----END PGP SIGNATURE----- diff --git a/sci-astronomy/ds9/ds9-5.2.ebuild b/sci-astronomy/ds9/ds9-5.2.ebuild deleted file mode 100644 index 83addf458d35..000000000000 --- a/sci-astronomy/ds9/ds9-5.2.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ds9-5.2.ebuild,v 1.3 2008/11/07 14:39:08 bicatali Exp $ - -inherit flag-o-matic eutils - -DESCRIPTION="Data visualization application for astronomical FITS images" -HOMEPAGE="http://hea-www.harvard.edu/RD/ds9" -SRC_URI="http://hea-www.harvard.edu/saord/download/${PN}/source/${PN}.${PV}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" -RDEPEND="x11-libs/libX11 - x11-libs/libXdmcp - x11-libs/libXau - !x11-libs/xpa" -DEPEND="${RDEPEND} - app-arch/zip" - -S="${WORKDIR}/sao${PN}" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}-gcc43.patch - - # patch to fix and speed up compilation (no man pages generation) - epatch "${FILESDIR}"/${P}-Makefile.patch - - # fix stack smashing on x86 with gcc-4.2 - use x86 && epatch "${FILESDIR}"/${PN}-5.1-gcc4.2-x86.patch - - # remove build-time dependency on etags (i.e. emacs or xemacs) - sed -i -e '/^all/s/TAGS//' saotk/*/Makefile || die "sed failed" - - # remove forced compilers and let defined ones propagate - sed -i -e '/^CC[[:space:]]/d' -e '/^CXX[[:space:]]/d' make.* -} - -src_compile() { - local ds9arch - case ${ARCH} in - x86) ds9arch=linux ;; - amd64) ds9arch=linux64 ;; - ppc) ds9arch=linuxppc ;; - x86-fbsd) ds9arch=freebsd ;; - *) die "ds9 not supported upstream for this architecture";; - esac - ln -s make.${ds9arch} make.include - - # This is a long and fragile compilation - # which recompiles tcl/tk, tkimg, blt, funtools, - # and a lot of other packages - emake -j1 OPTS="${CXXFLAGS}" \ - || die "emake failed" -} - -src_install () { - dobin bin/ds9 || die "failed installing ds9 binary" - dobin bin/xpa* || die "failed installing xpa* binaries" - doman man/man?/xpa* || die " failed installing man pages" - dodoc README acknowledgement || die "failed installing basic doc" - if use doc; then - dohtml -r doc/* || die "failed installing html doc" - fi -} diff --git a/sci-astronomy/ds9/ds9-5.5.ebuild b/sci-astronomy/ds9/ds9-5.7.ebuild index be6339181b75..15dcb102fbe2 100644 --- a/sci-astronomy/ds9/ds9-5.5.ebuild +++ b/sci-astronomy/ds9/ds9-5.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ds9-5.5.ebuild,v 1.3 2009/02/25 17:17:33 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/ds9/ds9-5.7.ebuild,v 1.1 2009/11/04 06:25:14 bicatali Exp $ EAPI=2 inherit eutils @@ -16,17 +16,16 @@ RDEPEND="dev-tcltk/blt >=dev-tcltk/tcllib-1.10 >=dev-tcltk/tclxml-3.1 dev-tcltk/tkcon - >=dev-tcltk/tkimg-1.3.1 + dev-tcltk/tkimg dev-tcltk/tktable x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/xpa - >=sci-astronomy/ast-4.6.2-r2 + sci-astronomy/ast sci-astronomy/funtools" DEPEND="${RDEPEND} - media-gfx/imagemagick dev-util/pkgconfig" S="${WORKDIR}/sao${PN}" @@ -34,12 +33,12 @@ S="${WORKDIR}/sao${PN}" src_prepare() { # some patches are adapted from fedora # most of them are to use system libraries instead of bundled-ones - epatch "${FILESDIR}"/${PN}-5.4-saotk.patch epatch "${FILESDIR}"/${PN}-5.4-htmlwidget.patch - epatch "${FILESDIR}"/${P}-main.patch - epatch "${FILESDIR}"/${P}-src.patch epatch "${FILESDIR}"/${P}-makefile.patch - epatch "${FILESDIR}"/${PN}-5.4-gcc43.patch + epatch "${FILESDIR}"/${P}-src.patch + epatch "${FILESDIR}"/${P}-main.patch + epatch "${FILESDIR}"/${P}-saotk.patch + epatch "${FILESDIR}"/${P}-tcl85.patch # remove build-time dependency on etags (i.e. emacs or xemacs) sed -i -e '/^all/s/TAGS//' saotk/*/Makefile || die "sed failed" @@ -56,7 +55,6 @@ src_install () { doins -r ds9/zipdir/zvfsmntpt/* || die dodoc README acknowledgement || die "failed installing basic doc" dosym ../../${PN}/doc /usr/share/doc/${PF}/html - convert doc/sun.gif ds9.png - doicon ds9.png + doicon "${FILESDIR}"/${PN}.png make_desktop_entry ds9 "SAOImage DS9" } diff --git a/sci-astronomy/ds9/files/ds9-5.1-gcc4.2-x86.patch b/sci-astronomy/ds9/files/ds9-5.1-gcc4.2-x86.patch deleted file mode 100644 index ce87e11cde1c..000000000000 --- a/sci-astronomy/ds9/files/ds9-5.1-gcc4.2-x86.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur saods9/make.linux saods9.new/make.linux ---- saods9/make.linux 2007-12-18 17:54:57.000000000 -0500 -+++ saods9.new/make.linux 2008-01-23 08:58:46.000000000 -0500 -@@ -9,15 +9,13 @@ - - # note: bug with gcc 4.1 and 4.2 - # can't use -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -+CXXOPT = ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -+CCOPT = ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -+ - #CXX = g++ --#CXXOPT = ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -+#CXXOPT = ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - #CC = gcc --#CCOPT = ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -- --CXX = g++34 --CXXOPT = ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 --CC = gcc34 --CCOPT = ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -+#CCOPT = ${OPTS} -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - - STRIP = strip - ZCAT = zcat diff --git a/sci-astronomy/ds9/files/ds9-5.2-Makefile.patch b/sci-astronomy/ds9/files/ds9-5.2-Makefile.patch deleted file mode 100644 index 55a2d0e9557c..000000000000 --- a/sci-astronomy/ds9/files/ds9-5.2-Makefile.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- Makefile.orig 2008-04-16 13:43:29.417500857 +0000 -+++ Makefile 2008-04-16 14:03:38.346474803 +0000 -@@ -237,23 +237,23 @@ - tcl : FORCE - @echo "Installing Tcl..." - cd $(TCLDIRDIR); CC='$(CC)' CFLAGS='$(OPTS) $(TCLOPTS)' LDFLAGS='$(LIBS)' ./configure $(TCLFLAGS) --disable-shared -- cd $(TCLDIRDIR); $(MAKE) install -+ cd $(TCLDIRDIR); $(MAKE) install-binaries install-libraries - - tk : FORCE - @echo "Installing Tk..." - cd $(TKDIRDIR); CC='$(CC)' CFLAGS='$(OPTS) $(TCLOPTS)' LDFLAGS='$(LIBS)' ./configure $(TCLFLAGS) --disable-shared -- cd $(TKDIRDIR); $(MAKE) install -+ cd $(TKDIRDIR); $(MAKE) install-binaries install-libraries - $(RM) -r lib/$(TKVER)/demos - - tktable : FORCE - @echo "Installing TkTable..." - cd $(TKTABLEDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure $(TKTABLEFLAGS) --disable-shared -- cd $(TKTABLEDIR); $(MAKE); $(MAKE) install -+ cd $(TKTABLEDIR); $(MAKE); $(MAKE) install-binaries install-libraries - - tcllib : FORCE - @echo "Installing TclLib..." - cd $(TCLLIBDIR); ./configure $(TCLLIBFLAGS) -- cd $(TCLLIBDIR); $(MAKE) install -+ cd $(TCLLIBDIR); $(MAKE) install-libraries - - tkcon : FORCE - @echo "Installing TkCon..." -@@ -295,7 +295,7 @@ - @echo "Installing XPA..." - cd $(XPADIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(OPTS) $(LIBS)' ./configure $(XPAFLAGS) --disable-shared - cd $(XPADIR); $(MAKE); $(MAKE) install -- cd bin; $(STRIP) xpa* -+ - - iis : FORCE - @echo "Installing IIS..." ---- ds9/Makefile.orig 2008-04-17 15:47:39.189030792 +0000 -+++ ds9/Makefile 2008-04-17 15:47:51.873753654 +0000 -@@ -152,7 +152,6 @@ - ds9 : null.zip ds9Base $(FILES) - $(RM) $@ - cp ds9Base ds9.zip -- $(STRIP) ds9.zip - cat null.zip >> ds9.zip - cd zipdir; zip -rA9 ../ds9.zip * - mv ds9.zip ds9 diff --git a/sci-astronomy/ds9/files/ds9-5.2-gcc43.patch b/sci-astronomy/ds9/files/ds9-5.2-gcc43.patch deleted file mode 100644 index 71d2db77028d..000000000000 --- a/sci-astronomy/ds9/files/ds9-5.2-gcc43.patch +++ /dev/null @@ -1,208 +0,0 @@ ---- iis/iistcl.C.orig 2008-04-16 13:53:34.315972056 +0000 -+++ iis/iistcl.C 2008-04-16 13:54:57.634895375 +0000 -@@ -4,7 +4,7 @@ - - #include <ctype.h> - #include <string.h> -- -+#include <cstdlib> - #include <iostream> - #include <sstream> - using namespace std; ---- saotk/widget/ps.C.orig 2008-04-16 14:09:20.865993878 +0000 -+++ saotk/widget/ps.C 2008-04-16 14:10:04.020453111 +0000 -@@ -4,6 +4,7 @@ - - #include "ps.h" - #include "util.h" -+#include <cstring> - - Filter::Filter() - { ---- saotk/frame/callback.C.orig 2008-04-16 14:23:03.661659706 +0000 -+++ saotk/frame/callback.C 2008-04-16 14:36:52.264879112 +0000 -@@ -2,8 +2,8 @@ - // Smithsonian Astrophysical Observatory, Cambridge, MA, USA - // For conditions of distribution and use, see copyright notice in "copyright" - --#include <string.h> --#include <iostream.h> -+#include <cstring> -+#include <iostream> - - #include "callback.h" - ---- saotk/frame/ciaoparser.C.orig 2008-04-16 15:12:42.535454290 +0000 -+++ saotk/frame/ciaoparser.C 2008-04-16 15:13:18.023725663 +0000 -@@ -128,9 +128,9 @@ - - #define FITSPTR (fr->findFits(1)) - --#include <math.h> --#include <string.h> --#include <iostream.h> -+#include <cmath> -+#include <cstring> -+#include <iostream> - - #include "framebase.h" - #include "fitsimage.h" ---- saotk/frame/ds9parser.C.orig 2008-04-16 15:12:42.535454290 +0000 -+++ saotk/frame/ds9parser.C 2008-04-16 15:13:40.601718953 +0000 -@@ -333,9 +333,9 @@ - #define FITSPTR (fr->findFits(globalTile)) - #define DISCARD_(x) {yyclearin; mkDiscard(x);} - --#include <math.h> --#include <string.h> --#include <iostream.h> -+#include <cmath> -+#include <cstring> -+#include <iostream> - - #include "framebase.h" - #include "fitsimage.h" ---- saotk/frame/fitsdata.C.orig 2008-04-16 15:09:33.746979438 +0000 -+++ saotk/frame/fitsdata.C 2008-04-16 15:11:28.432297279 +0000 -@@ -2,11 +2,11 @@ - // Smithsonian Astrophysical Observatory, Cambridge, MA, USA - // For conditions of distribution and use, see copyright notice in "copyright" - --#include <stdlib.h> --#include <limits.h> --#include <float.h> --#include <iostream.h> --#include <math.h> -+#include <cstdlib> -+#include <climits> -+#include <cfloat> -+#include <iostream> -+#include <cmath> - - #include "fitsdata.h" - #include "colorscale.h" ---- saotk/frame/inversescale.C.orig 2008-04-16 15:12:42.539452518 +0000 -+++ saotk/frame/inversescale.C 2008-04-16 15:13:56.113594982 +0000 -@@ -2,8 +2,8 @@ - // Smithsonian Astrophysical Observatory, Cambridge, MA, USA - // For conditions of distribution and use, see copyright notice in "copyright" - --#include <iostream.h> --#include <math.h> -+#include <iostream> -+#include <cmath> - - #include "inversescale.h" - #include "framebase.h" ---- saotk/frame/parser.C.orig 2008-04-16 15:12:42.539452518 +0000 -+++ saotk/frame/parser.C 2008-04-16 15:14:20.254970721 +0000 -@@ -708,9 +708,9 @@ - - #define FITSPTR (fr->findFits(1)) - --#include <math.h> --#include <string.h> --#include <iostream.h> -+#include <cmath> -+#include <cstring> -+#include <iostream> - - #include "framebase.h" - #include "frame.h" ---- saotk/frame/prosparser.C.orig 2008-04-16 15:12:42.543450746 +0000 -+++ saotk/frame/prosparser.C 2008-04-16 15:14:40.360116448 +0000 -@@ -155,9 +155,9 @@ - #define FITSPTR (fr->findFits(1)) - #define DISCARD_(x) {yyclearin; prosDiscard(x);} - --#include <math.h> --#include <string.h> --#include <iostream.h> -+#include <cmath> -+#include <cstring> -+#include <iostream> - - #include "framebase.h" - #include "fitsimage.h" ---- saotk/frame/saoparser.C.orig 2008-04-16 15:12:42.547448974 +0000 -+++ saotk/frame/saoparser.C 2008-04-16 15:14:56.133015294 +0000 -@@ -121,9 +121,9 @@ - #define FITSPTR (fr->findFits(1)) - #define DISCARD_(x) {yyclearin; saoDiscard(x);} - --#include <math.h> --#include <string.h> --#include <iostream.h> -+#include <cmath> -+#include <cstring> -+#include <iostream> - - #include "framebase.h" - #include "fitsimage.h" ---- saotk/frame/tngparser.C.orig 2008-04-16 15:12:42.547448974 +0000 -+++ saotk/frame/tngparser.C 2008-04-16 15:15:11.549893852 +0000 -@@ -167,9 +167,9 @@ - #define FITSPTR (fr->findFits(1)) - #define DISCARD_(x) {yyclearin; tngDiscard(x);} - --#include <math.h> --#include <string.h> --#include <iostream.h> -+#include <cmath> -+#include <cstring> -+#include <iostream> - - #include "framebase.h" - #include "fitsimage.h" ---- saotk/frame/xyparser.C.orig 2008-04-16 15:12:42.551447202 +0000 -+++ saotk/frame/xyparser.C 2008-04-16 15:15:28.970886617 +0000 -@@ -200,9 +200,9 @@ - - #define FITSPTR (fr->findFits(1)) - --#include <math.h> --#include <string.h> --#include <iostream.h> -+#include <cmath> -+#include <cstring> -+#include <iostream> - - #include "framebase.h" - #include "fitsimage.h" ---- saotk/colorbar/colorbarbase.C.orig 2008-04-16 15:41:10.236325709 +0000 -+++ saotk/colorbar/colorbarbase.C 2008-04-16 15:33:33.482296780 +0000 -@@ -11,6 +11,7 @@ - #include <X11/Xutil.h> - - #include "parser.H" -+#include <cstdlib> - - // Parser Stuff - #undef yyFlexLexer ---- saotk/colorbar/colorbar.C.orig 2008-04-16 15:27:48.890467306 +0000 -+++ saotk/colorbar/colorbar.C 2008-04-16 15:28:09.291629902 +0000 -@@ -2,8 +2,8 @@ - // Smithsonian Astrophysical Observatory, Cambridge, MA, USA - // For conditions of distribution and use, see copyright notice in "copyright" - --#include <stdlib.h> --#include <string.h> -+#include <cstdlib> -+#include <cstring> - - #include "colorbar.h" - #include "util.h" ---- saotk/util/conputs.C.orig 2008-04-16 15:41:48.354497940 +0000 -+++ saotk/util/conputs.C 2008-04-16 15:42:01.775262745 +0000 -@@ -1,3 +1,4 @@ -+#include <cstring> - #include <iostream> - using namespace std; - ---- ds9/ds9.C.orig 2008-04-16 15:45:04.281663192 +0000 -+++ ds9/ds9.C 2008-04-16 15:45:17.622423439 +0000 -@@ -1,3 +1,4 @@ -+#include <cstdlib> - #include <iostream> - using namespace std; - diff --git a/sci-astronomy/ds9/files/ds9-5.4-gcc43.patch b/sci-astronomy/ds9/files/ds9-5.4-gcc43.patch deleted file mode 100644 index 06d6ef5c5a17..000000000000 --- a/sci-astronomy/ds9/files/ds9-5.4-gcc43.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -Nur saods9.orig/ds9/ds9.C saods9/ds9/ds9.C ---- saods9.orig/ds9/ds9.C 2008-10-08 20:36:37.000000000 +0100 -+++ saods9/ds9/ds9.C 2008-11-04 11:46:44.000000000 +0000 -@@ -1,5 +1,7 @@ - #include <iostream> - #include <sstream> -+#include <cstring> -+#include <cstdlib> - using namespace std; - - #include <tcl.h> -diff -Nur saods9.orig/iis/iistcl.C saods9/iis/iistcl.C ---- saods9.orig/iis/iistcl.C 2008-06-02 22:27:50.000000000 +0100 -+++ saods9/iis/iistcl.C 2008-11-04 11:45:29.000000000 +0000 -@@ -7,6 +7,7 @@ - - #include <iostream> - #include <sstream> -+#include <cstdlib> - using namespace std; - - #include <tcl.h> -diff -Nur saods9.orig/saotk/fitsy++/card.C saods9/saotk/fitsy++/card.C ---- saods9.orig/saotk/fitsy++/card.C 2008-01-04 17:29:24.000000000 +0000 -+++ saods9/saotk/fitsy++/card.C 2008-11-04 11:45:29.000000000 +0000 -@@ -3,6 +3,7 @@ - // For conditions of distribution and use, see copyright notice in "copyright" - - #include "card.h" -+#include <string.h> - - FitsCard::FitsCard() - { -diff -Nur saods9.orig/saotk/fitsy++/compress.C saods9/saotk/fitsy++/compress.C ---- saods9.orig/saotk/fitsy++/compress.C 2008-06-05 21:37:51.000000000 +0100 -+++ saods9/saotk/fitsy++/compress.C 2008-11-04 11:45:29.000000000 +0000 -@@ -6,6 +6,7 @@ - #include "head.h" - #include "util.h" - #include "NaN.h" -+#include <string.h> - - FitsCompress::FitsCompress(FitsFile* fits) - { -diff -Nur saods9.orig/saotk/fitsy++/file.C saods9/saotk/fitsy++/file.C ---- saods9.orig/saotk/fitsy++/file.C 2008-06-03 15:46:25.000000000 +0100 -+++ saods9/saotk/fitsy++/file.C 2008-11-04 11:45:29.000000000 +0000 -@@ -6,6 +6,7 @@ - #include <sstream> - #include <iomanip> - using namespace std; -+#include <string.h> - - #include "file.h" - #include "util.h" -diff -Nur saods9.orig/saotk/fitsy++/iis.C saods9/saotk/fitsy++/iis.C ---- saods9.orig/saotk/fitsy++/iis.C 2008-01-04 17:29:24.000000000 +0000 -+++ saods9/saotk/fitsy++/iis.C 2008-11-04 11:45:29.000000000 +0000 -@@ -3,6 +3,7 @@ - // For conditions of distribution and use, see copyright notice in "copyright" - - #include "iis.h" -+#include <string.h> - - FitsIIS::FitsIIS(int width, int height) - { -diff -Nur saods9.orig/saotk/frame/frscale.C saods9/saotk/frame/frscale.C ---- saods9.orig/saotk/frame/frscale.C 2008-01-04 17:29:26.000000000 +0000 -+++ saods9/saotk/frame/frscale.C 2008-11-04 11:45:37.000000000 +0000 -@@ -3,6 +3,7 @@ - // For conditions of distribution and use, see copyright notice in "copyright" - - #include <string.h> -+#include <stdlib.h> - - #include "frscale.h" - -diff -Nur saods9.orig/saotk/widget/ps.C saods9/saotk/widget/ps.C ---- saods9.orig/saotk/widget/ps.C 2008-06-03 15:46:25.000000000 +0100 -+++ saods9/saotk/widget/ps.C 2008-11-04 11:52:06.000000000 +0000 -@@ -4,7 +4,8 @@ - - #include "ps.h" - #include "util.h" --#include "string.h" -+#include <cstring> -+using std::memcpy; - - Filter::Filter() - { ---- saods9.orig/saotk/colorbar/colorbarbase.C 2008-09-26 22:54:36.000000000 +0100 -+++ saods9/saotk/colorbar/colorbarbase.C 2008-11-04 18:10:13.000000000 +0000 -@@ -10,6 +10,7 @@ - - #include <X11/Xlib.h> - #include <X11/Xutil.h> -+#include <cstdlib> - - #include "parser.H" - diff --git a/sci-astronomy/ds9/files/ds9-5.5-main.patch b/sci-astronomy/ds9/files/ds9-5.5-main.patch deleted file mode 100644 index 707d884a2dab..000000000000 --- a/sci-astronomy/ds9/files/ds9-5.5-main.patch +++ /dev/null @@ -1,226 +0,0 @@ -diff -Nur saods9.orig/ds9/ds9.C saods9/ds9/ds9.C ---- saods9.orig/ds9/ds9.C 2009-02-16 17:06:50.000000000 +0000 -+++ saods9/ds9/ds9.C 2009-02-16 17:07:42.000000000 +0000 -@@ -11,8 +11,8 @@ - - void TclSetStartupScriptFileName(const char*); - -- int Zvfs_Init(Tcl_Interp*); -- int Zvfs_Mount(Tcl_Interp*, char*, char *); -+/* int Zvfs_Init(Tcl_Interp*); -+ int Zvfs_Mount(Tcl_Interp*, char*, char *);*/ - - int Blt_Init(Tcl_Interp*); - int Tktable_Init(Tcl_Interp*); -@@ -64,15 +64,15 @@ - appname = dupstr(argv[0]); - - // set default encoding dir -- Tcl_SetDefaultEncodingDir("./zvfsmntpt/tcl8.4"); -+ //Tcl_SetDefaultEncodingDir("./zvfsmntpt/tcl8.4"); - - // so that tcl and tk know where to find their libs - // we do it here before InitLibraryPath is called -- putenv((char*)"TCL_LIBRARY=./zvfsmntpt/tcl8.4"); -- putenv((char*)"TK_LIBRARY=./zvfsmntpt/tk8.4"); -+ //putenv((char*)"TCL_LIBRARY=./zvfsmntpt/tcl8.4"); -+ //putenv((char*)"TK_LIBRARY=./zvfsmntpt/tk8.4"); - - // invoke startup script -- TclSetStartupScriptFileName("./zvfsmntpt/src/ds9.tcl"); -+ TclSetStartupScriptFileName("/usr/share/ds9/src/ds9.tcl"); - } - - Tcl_Interp *global_interp; -@@ -91,13 +91,13 @@ - // We have to initialize the virtual filesystem before calling - // Tcl_Init(). Otherwise, Tcl_Init() will not be able to find - // its startup script files. -- if (Zvfs_Init(interp) == TCL_ERROR) -+/* if (Zvfs_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "zvfs", Zvfs_Init, - (Tcl_PackageInitProc*)NULL); -- -+*/ - // find current working directory, and set as mount point -- { -+/* { - Tcl_DString pwd; - Tcl_DStringInit(&pwd); - Tcl_GetCwd(interp, &pwd); -@@ -113,7 +113,7 @@ - #endif - Tcl_DStringFree(&pwd); - } -- -+*/ - // Initialize Tcl and Tk - if (Tcl_Init(interp)) - return TCL_ERROR; -@@ -121,7 +121,7 @@ - // Tk - if (Tk_Init(interp)) - return TCL_ERROR; -- Tcl_StaticPackage(interp,"Tk", Tk_Init, Tk_SafeInit); -+ //Tcl_StaticPackage(interp,"Tk", Tk_Init, Tk_SafeInit); - - { - Tcl_DString pwd; -@@ -131,7 +131,7 @@ - } - - // Blt -- if (Blt_Init(interp) == TCL_ERROR) -+ /*if (Blt_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "BLT", Blt_Init, - (Tcl_PackageInitProc*)NULL); -@@ -140,7 +140,7 @@ - if (Tktable_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "Tktable", Tktable_Init, -- (Tcl_PackageInitProc*)NULL); -+ (Tcl_PackageInitProc*)NULL); */ - - // Checkdns - if (Checkdns_Init(interp) == TCL_ERROR) -@@ -161,10 +161,10 @@ - (Tcl_PackageInitProc*)NULL); - - // Tclxpa -- if (Tclxpa_Init(interp) == TCL_ERROR) -+/* if (Tclxpa_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "Tclxpa", Tclxpa_Init, -- (Tcl_PackageInitProc*)NULL); -+ (Tcl_PackageInitProc*)NULL);*/ - - // IIS - if (Iis_Init(interp) == TCL_ERROR) -@@ -179,7 +179,7 @@ - (Tcl_PackageInitProc*)NULL); - - // Tkimg -- if (Tkimg_Init(interp) == TCL_ERROR) -+/* if (Tkimg_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "img", - Tkimg_Init,(Tcl_PackageInitProc*)NULL); -@@ -254,7 +254,7 @@ - if (Tkimgwindow_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "window", Tkimgwindow_Init, -- (Tcl_PackageInitProc*)NULL); -+ (Tcl_PackageInitProc*)NULL);*/ - - #ifdef _MACOSX - if (Tkmacosx_Init(interp) == TCL_ERROR) -@@ -271,11 +271,11 @@ - #endif - - // Variables -- Tcl_SetVar(interp, "auto_path", "./zvfsmntpt/tcl8.4 ./zvfsmntpt/tk8.4 ./zvfsmntpt/blt2.4 ./zvfsmntpt/tcllib1.6 ./zvfsmntpt/src", TCL_GLOBAL_ONLY); -+/* Tcl_SetVar(interp, "auto_path", "./zvfsmntpt/tcl8.4 ./zvfsmntpt/tk8.4 ./zvfsmntpt/blt2.4 ./zvfsmntpt/tcllib1.6 ./zvfsmntpt/src", TCL_GLOBAL_ONLY); - Tcl_SetVar(interp, "tcl_libPath", "./zvfsmntpt/tcl8.4", TCL_GLOBAL_ONLY); - Tcl_SetVar(interp, "blt_library", "./zvfsmntpt/blt2.4", TCL_GLOBAL_ONLY); - Tcl_SetVar(interp, "blt_libPath", "./zvfsmntpt/blt2.4", TCL_GLOBAL_ONLY); -- Tcl_SetVar2(interp, "env", "TK_TABLE_LIBRARY", "", TCL_GLOBAL_ONLY); -+ Tcl_SetVar2(interp, "env", "TK_TABLE_LIBRARY", "", TCL_GLOBAL_ONLY);*/ - - //Tcl_SetVar(interp, "tcl_rcFileName", "~/.wishrc", TCL_GLOBAL_ONLY); - -diff -Nur saods9.orig/ds9/Makefile saods9/ds9/Makefile ---- saods9.orig/ds9/Makefile 2009-02-16 17:06:50.000000000 +0000 -+++ saods9/ds9/Makefile 2009-02-16 17:33:47.000000000 +0000 -@@ -4,13 +4,7 @@ - #--------------------------defines - - ZDIR = zipdir/zvfsmntpt --FILES = $(ZDIR)/$(TCLVER) \ -- $(ZDIR)/$(TKVER) \ -- $(ZDIR)/$(BLTVER) \ -- $(ZDIR)/$(TCLLIBVER) \ -- $(ZDIR)/$(TKCONVER) \ -- $(ZDIR)/$(XMLRPCVER) \ -- $(ZDIR)/src \ -+FILES = $(ZDIR)/src \ - $(ZDIR)/msgs \ - $(ZDIR)/doc \ - $(ZDIR)/template -@@ -23,37 +17,13 @@ - ../lib/libsaotk.a \ - ../lib/libtkhtml.a \ - ../lib/libtkmpeg.a \ -- ../lib/$(TKIMGVER)/libtkimgwindow1.3.a \ -- ../lib/$(TKIMGVER)/libtkimgjpeg1.3.a \ -- ../lib/$(TKIMGVER)/libjpegtcl1.0.a \ -- ../lib/$(TKIMGVER)/libtkimgtiff1.3.a \ -- ../lib/$(TKIMGVER)/libtifftcl3.6.1.a \ -- ../lib/$(TKIMGVER)/libtkimgpng1.3.a \ -- ../lib/$(TKIMGVER)/libpngtcl1.2.6.a \ -- ../lib/$(TKIMGVER)/libtkimgppm1.3.a \ -- ../lib/$(TKIMGVER)/libtkimggif1.3.a \ -- ../lib/$(TKIMGVER)/libtkimgbmp1.3.a \ -- ../lib/$(TKIMGVER)/libtkimgxbm1.3.a \ -- ../lib/$(TKIMGVER)/libzlibtcl1.2.1.a \ -- ../lib/$(TKIMGVER)/libtkimg1.3.a \ -- ../lib/$(TKTABLEVER)/libTktable2.9.a \ -- ../lib/libfuntools.a \ - ../lib/librice.a \ - ../lib/libhcomp.a \ - ../lib/libplio.a \ -- ../lib/libast.a \ - ../lib/libsaotk.a \ -- ../lib/libwcs.a \ - ../lib/libsla.a \ -- ../lib/libzvfs.a \ -- ../lib/libzip.a \ -- ../lib/libz.a \ -- ../lib/libxpa.a \ - ../lib/libiis.a \ -- ../lib/libcheckdns.a \ -- ../lib/libBLT24.a \ -- ../lib/libtk8.4.a \ -- ../lib/libtcl8.4.a -+ ../lib/libcheckdns.a - endif - - ifeq ($(OS),windows) -@@ -168,14 +138,9 @@ - ds9.zip : $(FILES) - cd zipdir; zip -r9 ../ds9.zip * - else --ds9 : null.zip ds9Base $(FILES) -+ds9 : ds9Base $(FILES) - $(RM) $@ -- cp ds9Base ds9.zip -- $(STRIP) ds9.zip -- cat null.zip >> ds9.zip -- cd zipdir; zip -rA9 ../ds9.zip * -- mv ds9.zip ds9 -- cp ds9 ../bin/. -+ cp ds9Base ../bin/ds9 - - debug : null.zip ds9Base $(FILES) - $(RM) $@ -@@ -382,7 +347,18 @@ - /usr/lib/amd64/libdl.so - rm -f libstdc++.a - endif -- -+# For gentoo -+ifeq ($(ARCH),gentoo) -+ds9Base : $(OBJS) $(LIBS) -+ $(RM) $@ -+ $(CXX) ${OPTS} ${LDFLAGS} \ -+ -o $@ $(OBJS) $(LIBS) \ -+ -L$(X11LIB) -lX11 \ -+ -ldl -lpthread \ -+ -ltk -ltcl -lBLT24 \ -+ -lfuntools `pkg-config --libs wcstools` -lz \ -+ `ast_link` -+endif - #--------------------------linux - - ifneq (,$(findstring linux,$(ARCH))) diff --git a/sci-astronomy/ds9/files/ds9-5.5-makefile.patch b/sci-astronomy/ds9/files/ds9-5.5-makefile.patch deleted file mode 100644 index f165ec831dc6..000000000000 --- a/sci-astronomy/ds9/files/ds9-5.5-makefile.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- saods9.orig/Makefile 2009-02-16 17:06:48.000000000 +0000 -+++ saods9/Makefile 2009-02-16 18:06:01.000000000 +0000 -@@ -35,8 +35,7 @@ - --with-tk=$(root)/$(TKDIRDIR) $(XFLAGS) - XPAFLAGS = --prefix $(root) --with-tcl=$(root)/$(TCLDIRDIR) \ - $(XFLAGS) -- HTMLFLAGS = --prefix $(root) --with-tcl=$(root)/$(TCLDIR) \ -- --with-tk=$(root)/$(TKDIR) $(XFLAGS) -+ HTMLFLAGS = --prefix $(root) $(XFLAGS) - FUNTOOLSFLAGS = --prefix $(root) --with-zlib=../../lib/libz.a \ - --with-wcslib=../lib/libwcs.a --enable-mainlib - endif -@@ -197,11 +196,9 @@ - all : build - - build : dirs \ -- tcl tk \ -- tktable tcllib tkcon xmlrpc blt \ -- zlib \ -- tkimg tkmpeg html xpa iis checkdns \ -- funtools sla ast wcssubs rice hcompress plio $(OPTDIR) saotk zip zvfs ds9 -+ xmlrpc \ -+ tkmpeg html iis checkdns \ -+ sla rice hcompress plio $(OPTDIR) saotk ds9 - - doc : FORCE - @echo "Making Documentation..." diff --git a/sci-astronomy/ds9/files/ds9-5.5-src.patch b/sci-astronomy/ds9/files/ds9-5.5-src.patch deleted file mode 100644 index 559dc01e29cb..000000000000 --- a/sci-astronomy/ds9/files/ds9-5.5-src.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- saods9.orig/src/ds9.tcl 2009-02-16 17:06:47.000000000 +0000 -+++ saods9/src/ds9.tcl 2009-02-16 18:37:18.000000000 +0000 -@@ -224,25 +224,29 @@ - # initialize, depending on how we are running: choices are zvfs, or wish - # for now, its not possible to change the current work directory since - # all of the paths are relative --if {![catch {package present zvfs}]} { -- set ds9(root) "zvfsmntpt" -+if {![catch {package present checkdns}]} { -+ set ds9(root) "/usr/share/ds9" - -- source $ds9(root)/tcl8.4/msgcat1.3/msgcat.tcl -- source $ds9(root)/tcl8.4/http2.5/http.tcl -- -- source $ds9(root)/tk8.4/tearoff.tcl -- -- source $ds9(root)/tcllib1.10/base64/base64.tcl -- source $ds9(root)/tcllib1.10/log/log.tcl -- source $ds9(root)/tcllib1.10/ftp/ftp.tcl -- source $ds9(root)/tcllib1.10/textutil/repeat.tcl -- source $ds9(root)/tcllib1.10/textutil/tabify.tcl -- -- source $ds9(root)/tkcon2.5/tkcon.tcl -- source $ds9(root)/xmlrpc0.3/xmlrpc.tcl -- -- source $ds9(root)/blt2.4/graph.tcl -- source $ds9(root)/blt2.4/tabset.tcl -+ package require msgcat -+ package require http -+ package require base64 -+ package require log -+ package require ftp -+ package require textutil::repeat -+ package require textutil::tabify -+ package require tkcon -+ package require BLT -+ package require Tktable -+ package require tclxpa -+ package require img::base -+ package require img::jpeg -+ package require img::tiff -+ package require img::png -+ package require img::gif -+ package require img::ppm -+ package require img::bmp -+ package require img::xbm -+ package require img::window - - source $ds9(root)/src/source.tcl - diff --git a/sci-astronomy/ds9/files/ds9-5.7-main.patch b/sci-astronomy/ds9/files/ds9-5.7-main.patch new file mode 100644 index 000000000000..588aa6dcab67 --- /dev/null +++ b/sci-astronomy/ds9/files/ds9-5.7-main.patch @@ -0,0 +1,318 @@ +diff -Nur saods9.orig/ds9/ds9.C saods9/ds9/ds9.C +--- saods9.orig/ds9/ds9.C 2009-11-04 02:32:16.000000000 +0000 ++++ saods9/ds9/ds9.C 2009-11-04 02:58:59.000000000 +0000 +@@ -13,8 +13,6 @@ + + void TclSetStartupScriptFileName(const char*); + +- int Zvfs_Init(Tcl_Interp*); +- int Zvfs_Mount(Tcl_Interp*, char*, char *); + + int Blt_Init(Tcl_Interp*); + int Tktable_Init(Tcl_Interp*); +@@ -73,15 +71,13 @@ + appname = dupstr(argv[0]); + + // set default encoding dir +- Tcl_SetDefaultEncodingDir("./zvfsmntpt/tcl8.4"); + + // so that tcl and tk know where to find their libs + // we do it here before InitLibraryPath is called +- putenv((char*)"TCL_LIBRARY=./zvfsmntpt/tcl8.4"); +- putenv((char*)"TK_LIBRARY=./zvfsmntpt/tk8.4"); ++ + + // invoke startup script +- TclSetStartupScriptFileName("./zvfsmntpt/src/ds9.tcl"); ++ TclSetStartupScriptFileName("/usr/share/ds9/ds9.tcl"); + } + + Tcl_Interp *global_interp; +@@ -100,31 +96,8 @@ + // We have to initialize the virtual filesystem before calling + // Tcl_Init(). Otherwise, Tcl_Init() will not be able to find + // its startup script files. +- if (Zvfs_Init(interp) == TCL_ERROR) +- return TCL_ERROR; +- Tcl_StaticPackage (interp, "zvfs", Zvfs_Init, +- (Tcl_PackageInitProc*)NULL); + + // find current working directory, and set as mount point +- { +- Tcl_DString pwd; +- Tcl_DStringInit(&pwd); +- Tcl_GetCwd(interp, &pwd); +-#ifdef ZIPFILE +- ostringstream str; +- str << (char *)Tcl_GetNameOfExecutable() +- << "/../ds9.zip" +- << ends; +- if( Zvfs_Mount(interp, (char*)str.str().c_str(), Tcl_DStringValue(&pwd)) != TCL_OK ){ +- cerr << "ERROR: The auxiliary ds9 file 'ds9.zip' is missing. If you moved the ds9 program from its original location, please also move the zip file to the same place." << endl; +- exit(1); +- } +-#else +- Zvfs_Mount(interp, (char *)Tcl_GetNameOfExecutable(), +- Tcl_DStringValue(&pwd)); +-#endif +- Tcl_DStringFree(&pwd); +- } + + // Initialize Tcl and Tk + if (Tcl_Init(interp)) +@@ -133,7 +106,6 @@ + // Tk + if (Tk_Init(interp)) + return TCL_ERROR; +- Tcl_StaticPackage(interp,"Tk", Tk_Init, Tk_SafeInit); + + { + Tcl_DString pwd; +@@ -142,18 +114,6 @@ + Tcl_DStringFree(&pwd); + } + +- // Blt +- if (Blt_Init(interp) == TCL_ERROR) +- return TCL_ERROR; +- Tcl_StaticPackage (interp, "BLT", Blt_Init, +- (Tcl_PackageInitProc*)NULL); +- +- // Tktable +- if (Tktable_Init(interp) == TCL_ERROR) +- return TCL_ERROR; +- Tcl_StaticPackage (interp, "Tktable", Tktable_Init, +- (Tcl_PackageInitProc*)NULL); +- + // Checkdns + if (Checkdns_Init(interp) == TCL_ERROR) + return TCL_ERROR; +@@ -171,13 +131,6 @@ + return TCL_ERROR; + Tcl_StaticPackage (interp, "tkhtml", Tkhtml_Init, + (Tcl_PackageInitProc*)NULL); +- +- // Tclxpa +- if (Tclxpa_Init(interp) == TCL_ERROR) +- return TCL_ERROR; +- Tcl_StaticPackage (interp, "Tclxpa", Tclxpa_Init, +- (Tcl_PackageInitProc*)NULL); +- + // IIS + if (Iis_Init(interp) == TCL_ERROR) + return TCL_ERROR; +@@ -194,84 +147,6 @@ + if (Tclxml_Init(interp) == TCL_ERROR) + return TCL_ERROR; + +- // Tkimg +- if (Tkimg_Init(interp) == TCL_ERROR) +- return TCL_ERROR; +- Tcl_StaticPackage (interp, "img", +- Tkimg_Init,(Tcl_PackageInitProc*)NULL); +- +- // zlibtcl +- if (Zlibtcl_Init(interp) == TCL_ERROR) +- return TCL_ERROR; +- Tcl_StaticPackage (interp, "zlibtcl", Zlibtcl_Init, +- (Tcl_PackageInitProc*)NULL); +- +- // jpegtcl +- if (Jpegtcl_Init(interp) == TCL_ERROR) +- return TCL_ERROR; +- Tcl_StaticPackage (interp, "jpegtcl", Jpegtcl_Init, +- (Tcl_PackageInitProc*)NULL); +- +- // Tkimgjpeg +- if (Tkimgjpeg_Init(interp) == TCL_ERROR) +- return TCL_ERROR; +- Tcl_StaticPackage (interp, "jpeg", Tkimgjpeg_Init, +- (Tcl_PackageInitProc*)NULL); +- +- // Tifftcl +- if (Tifftcl_Init(interp) == TCL_ERROR) +- return TCL_ERROR; +- Tcl_StaticPackage (interp, "tifftcl", Tifftcl_Init, +- (Tcl_PackageInitProc*)NULL); +- +- // Tkimgtiff +- if (Tkimgtiff_Init(interp) == TCL_ERROR) +- return TCL_ERROR; +- Tcl_StaticPackage (interp, "tiff", Tkimgtiff_Init, +- (Tcl_PackageInitProc*)NULL); +- +- // Pngtcl +- if (Pngtcl_Init(interp) == TCL_ERROR) +- return TCL_ERROR; +- Tcl_StaticPackage (interp, "pngtcl", Pngtcl_Init, +- (Tcl_PackageInitProc*)NULL); +- +- // Tkimgpng +- if (Tkimgpng_Init(interp) == TCL_ERROR) +- return TCL_ERROR; +- Tcl_StaticPackage (interp, "png", Tkimgpng_Init, +- (Tcl_PackageInitProc*)NULL); +- +- // Tkimggif +- if (Tkimggif_Init(interp) == TCL_ERROR) +- return TCL_ERROR; +- Tcl_StaticPackage (interp, "gif", Tkimggif_Init, +- (Tcl_PackageInitProc*)NULL); +- +- // Tkimgppm +- if (Tkimgppm_Init(interp) == TCL_ERROR) +- return TCL_ERROR; +- Tcl_StaticPackage (interp, "ppm", Tkimgppm_Init, +- (Tcl_PackageInitProc*)NULL); +- +- // Tkimgbmp +- if (Tkimgbmp_Init(interp) == TCL_ERROR) +- return TCL_ERROR; +- Tcl_StaticPackage (interp, "bmp", Tkimgbmp_Init, +- (Tcl_PackageInitProc*)NULL); +- +- // Tkimgxbm +- if (Tkimgxbm_Init(interp) == TCL_ERROR) +- return TCL_ERROR; +- Tcl_StaticPackage (interp, "xbm", Tkimgxbm_Init, +- (Tcl_PackageInitProc*)NULL); +- +- // Tkimgwindow +- if (Tkimgwindow_Init(interp) == TCL_ERROR) +- return TCL_ERROR; +- Tcl_StaticPackage (interp, "window", Tkimgwindow_Init, +- (Tcl_PackageInitProc*)NULL); +- + // Signal_Ext + #ifndef _WIN32 + if (Signal_ext_Init(interp) == TCL_ERROR) +@@ -294,15 +169,6 @@ + (Tcl_PackageInitProc*)NULL); + #endif + +- // Variables +- Tcl_SetVar(interp, "auto_path", "./zvfsmntpt/tcl8.4 ./zvfsmntpt/tk8.4 ./zvfsmntpt/blt2.4 ./zvfsmntpt/tcllib1.6 ./zvfsmntpt/src", TCL_GLOBAL_ONLY); +- Tcl_SetVar(interp, "tcl_libPath", "./zvfsmntpt/tcl8.4", TCL_GLOBAL_ONLY); +- Tcl_SetVar(interp, "blt_library", "./zvfsmntpt/blt2.4", TCL_GLOBAL_ONLY); +- Tcl_SetVar(interp, "blt_libPath", "./zvfsmntpt/blt2.4", TCL_GLOBAL_ONLY); +- Tcl_SetVar2(interp, "env", "TK_TABLE_LIBRARY", "", TCL_GLOBAL_ONLY); +- +- //Tcl_SetVar(interp, "tcl_rcFileName", "~/.wishrc", TCL_GLOBAL_ONLY); +- + return TCL_OK; + } + +diff -Nur saods9.orig/ds9/Makefile saods9/ds9/Makefile +--- saods9.orig/ds9/Makefile 2009-11-04 02:32:16.000000000 +0000 ++++ saods9/ds9/Makefile 2009-11-04 03:10:28.000000000 +0000 +@@ -4,12 +4,7 @@ + #--------------------------defines + + ZDIR = zipdir/zvfsmntpt +-FFILES = $(ZDIR)/$(TCLVER) \ +- $(ZDIR)/$(TKVER) \ +- $(ZDIR)/$(BLTVER) \ +- $(ZDIR)/$(TCLLIBVER) \ +- $(ZDIR)/$(TKCONVER) \ +- $(ZDIR)/$(XMLRPCVER) \ ++FFILES = \ + $(ZDIR)/src \ + $(ZDIR)/msgs \ + $(ZDIR)/doc \ +@@ -30,39 +25,14 @@ + ../lib/libsaotk.a \ + ../lib/libtkhtml.a \ + ../lib/libtkmpeg.a \ +- ../lib/$(TCLXMLVER)/libTclxml3.2.a \ +- ../lib/$(TKIMGVER)/libtkimgwindow1.3.a \ +- ../lib/$(TKIMGVER)/libtkimgjpeg1.3.a \ +- ../lib/$(TKIMGVER)/libjpegtcl1.0.a \ +- ../lib/$(TKIMGVER)/libtkimgtiff1.3.a \ +- ../lib/$(TKIMGVER)/libtifftcl3.6.1.a \ +- ../lib/$(TKIMGVER)/libtkimgpng1.3.a \ +- ../lib/$(TKIMGVER)/libpngtcl1.2.6.a \ +- ../lib/$(TKIMGVER)/libtkimgppm1.3.a \ +- ../lib/$(TKIMGVER)/libtkimggif1.3.a \ +- ../lib/$(TKIMGVER)/libtkimgbmp1.3.a \ +- ../lib/$(TKIMGVER)/libtkimgxbm1.3.a \ +- ../lib/$(TKIMGVER)/libzlibtcl1.2.1.a \ +- ../lib/$(TKIMGVER)/libtkimg1.3.a \ +- ../lib/$(TKTABLEVER)/libTktable2.9.a \ +- ../lib/libfuntools.a \ + ../lib/librice.a \ + ../lib/libhcomp.a \ + ../lib/libplio.a \ +- ../lib/libast.a \ + ../lib/libsaotk.a \ +- ../lib/libwcs.a \ + ../lib/libsla.a \ +- ../lib/libzvfs.a \ +- ../lib/libzip.a \ +- ../lib/libz.a \ +- ../lib/libxpa.a \ + ../lib/libiis.a \ + ../lib/libcheckdns.a \ +- ../lib/libsignal_ext.a \ +- ../lib/libBLT24.a \ +- ../lib/libtk8.4.a \ +- ../lib/libtcl8.4.a ++ ../lib/libsignal_ext.a + endif + + ifeq ($(OS),windows) +@@ -165,12 +135,9 @@ + ifneq (,$(findstring leopard,$(ARCH))) + CXXFLAGS = $(CXXOPT) -I. -I../include -I$(X11INCLUDE) -DZIPFILE + +-ds9 : ds9Base ds9.zip ++ds9 : ds9Base + $(RM) $@ +- cp ds9Base ds9 +- strip ds9 +- cp ds9 ../bin/. +- cp ds9.zip ../bin/. ++ cp ds9Base ../bin/ds9 + cd ../bin; $(CODESIGN) -s "SAOImage DS9" ds9 + + debug : ds9Base ds9.zip +@@ -180,14 +147,9 @@ + ds9.zip : $(FILES) + cd zipdir; zip -r9 ../ds9.zip * + else +-ds9 : null.zip ds9Base $(FILES) ++ds9 : ds9Base $(FILES) + $(RM) $@ +- cp ds9Base ds9.zip +- strip ds9.zip +- cat null.zip >> ds9.zip +- cd zipdir; zip -rA9 ../ds9.zip * +- mv ds9.zip ds9 +- cp ds9 ../bin/. ++ cp ds9Base ../bin/ds9 + + debug : null.zip ds9Base $(FILES) + $(RM) $@ +@@ -359,6 +321,23 @@ + + #--------------------------linux + ++# for gentoo: get rid of bundled libs ++ifneq (,$(findstring gentoo,$(ARCH))) ++ds9Base : $(OBJS) $(LIBS) ++ $(RM) $@ ++ rm -f libstdc++.a ++ ln -s `$(CXX) -print-file-name=libstdc++.a` . ++ $(CXX) ${LDFLAGS} \ ++ $(OBJS) $(LIBS) -o $@ \ ++ -Wl,-Bstatic -L. -lstdc++ \ ++ -Wl,-Bdynamic -L$(X11LIB) -lX11 \ ++ -ldl -lpthread -lxml2 -L/usr/lib/$(TCLXMLVER) -lTclxml3.2 \ ++ -ltk -ltcl -lBLT24 \ ++ -lfuntools `pkg-config --libs wcstools` -lz \ ++ `ast_link` ++ rm -f libstdc++.a ++endif ++ + ifneq (,$(findstring linux,$(ARCH))) + ds9Base : $(OBJS) $(LIBS) + $(RM) $@ diff --git a/sci-astronomy/ds9/files/ds9-5.7-makefile.patch b/sci-astronomy/ds9/files/ds9-5.7-makefile.patch new file mode 100644 index 000000000000..567d2e8f975f --- /dev/null +++ b/sci-astronomy/ds9/files/ds9-5.7-makefile.patch @@ -0,0 +1,31 @@ +--- saods9.orig/Makefile 2009-11-04 02:32:17.000000000 +0000 ++++ saods9/Makefile 2009-11-04 02:39:27.000000000 +0000 +@@ -177,14 +177,12 @@ + all : build + + build : dirs \ +- tcl tk \ +- tktable tcllib tkcon xmlrpc blt \ +- zlib tclxml tkimg tkmpeg html \ +- xpa iis checkdns $(SIGNAL) funtools \ +- sla ast wcssubs \ ++ xmlrpc \ ++ tkmpeg html \ ++ iis checkdns $(SIGNAL) funtools \ ++ sla \ + rice hcompress plio \ +- $(OPTDIR) \ +- saotk zip zvfs ds9 ++ saotk ds9 + + doc : FORCE + @echo "Making Documentation..." +@@ -299,7 +297,7 @@ + + html : FORCE + @echo "Installing HTMLWIDGET..." +- cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' $(PREHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) --with-tcl=$(root)/$(TCLDIR) --with-tk=$(root)/$(TKDIR) $(XFLAGS) --enable-shared=no ++ cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' $(PREHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) $(XFLAGS) --enable-shared=no + cd $(HTMLDIR); $(MAKE) + cp $(HTMLDIR)/libtkhtml.a lib/. + diff --git a/sci-astronomy/ds9/files/ds9-5.4-saotk.patch b/sci-astronomy/ds9/files/ds9-5.7-saotk.patch index e7a97a26cd1c..98467a4c1e9b 100644 --- a/sci-astronomy/ds9/files/ds9-5.4-saotk.patch +++ b/sci-astronomy/ds9/files/ds9-5.7-saotk.patch @@ -1,6 +1,6 @@ diff -Nur saods9.orig/saotk/fitsy++/Makefile saods9/saotk/fitsy++/Makefile ---- saods9.orig/saotk/fitsy++/Makefile 2007-12-28 22:07:11.000000000 +0000 -+++ saods9/saotk/fitsy++/Makefile 2008-11-03 23:06:28.000000000 +0000 +--- saods9.orig/saotk/fitsy++/Makefile 2009-11-04 02:32:17.000000000 +0000 ++++ saods9/saotk/fitsy++/Makefile 2009-11-04 06:26:59.000000000 +0000 @@ -3,8 +3,8 @@ CXXFLAGS = $(CXXOPT) -I. -I.. -I../vector -I../util \ @@ -12,47 +12,10 @@ diff -Nur saods9.orig/saotk/fitsy++/Makefile saods9/saotk/fitsy++/Makefile SS = \ alloc.C \ -diff -Nur saods9.orig/saotk/frame/Makefile saods9/saotk/frame/Makefile ---- saods9.orig/saotk/frame/Makefile 2008-09-23 20:47:09.000000000 +0100 -+++ saods9/saotk/frame/Makefile 2008-11-03 23:11:01.000000000 +0000 -@@ -4,8 +4,7 @@ - CXXFLAGS = $(CXXOPT) -w \ - -I. -I.. -I../widget -I../vector -I../list -I../fitsy++ -I../util \ - -I../../include -I$(X11INCLUDE) \ -- -I../../$(FUNTOOLSDIR)/util \ -- -I../../$(ASTDIR) -+ -I/usr/include/funtools/util - - SS = \ - annulus.C \ -diff -Nur saods9.orig/saotk/util/tkpostscript.h saods9/saotk/util/tkpostscript.h ---- saods9.orig/saotk/util/tkpostscript.h 2008-02-20 22:26:21.000000000 +0000 -+++ saods9/saotk/util/tkpostscript.h 2008-11-04 09:58:00.000000000 +0000 -@@ -4,7 +4,7 @@ - - // this is copied from tkCanvPs.c - --#include "../../tk8.4.18/generic/tkCanvas.h" -+#include </usr/lib/tk8.4/include/generic/tkCanvas.h> - - typedef struct TkPostscriptInfo { - int x, y, width, height; /* Area to print, in canvas pixel -diff -Nur saods9.orig/saotk/widget/ps.h saods9/saotk/widget/ps.h ---- saods9.orig/saotk/widget/ps.h 2008-01-04 17:29:27.000000000 +0000 -+++ saods9/saotk/widget/ps.h 2008-11-04 09:59:00.000000000 +0000 -@@ -13,7 +13,7 @@ - #include "zlib.h" - extern int DebugGZ; - --#if defined( __alpha) || defined(__mips64) || defined(__sparcv9) || defined(__M64) -+#if defined( __alpha) || defined(__mips64) || defined(__sparcv9) || defined(__M64) || defined(__LP64__) - #define BIT32 int - #else - #define BIT32 long -diff -ur saods9.orig/saotk/frame/fitsimage.C saods9/saotk/frame/fitsimage.C ---- saods9.orig/saotk/frame/fitsimage.C 2007-05-22 20:36:50.000000000 +0200 -+++ saods9/saotk/frame/fitsimage.C 2008-11-04 16:36:40.000000000 +0100 -@@ -31,7 +31,99 @@ +diff -Nur saods9.orig/saotk/frame/fitsimage.C saods9/saotk/frame/fitsimage.C +--- saods9.orig/saotk/frame/fitsimage.C 2009-11-04 02:32:17.000000000 +0000 ++++ saods9/saotk/frame/fitsimage.C 2009-11-04 06:26:59.000000000 +0000 +@@ -26,7 +26,99 @@ // this is kluge to speed up doug minks wcssubs 'ksearch' routine extern "C" { FitsHead* wcshead = NULL; @@ -153,3 +116,28 @@ diff -ur saods9.orig/saotk/frame/fitsimage.C saods9/saotk/frame/fitsimage.C char* findit(char* cards, char* key) { +diff -Nur saods9.orig/saotk/frame/Makefile saods9/saotk/frame/Makefile +--- saods9.orig/saotk/frame/Makefile 2009-11-04 02:32:17.000000000 +0000 ++++ saods9/saotk/frame/Makefile 2009-11-04 06:28:21.000000000 +0000 +@@ -5,8 +5,7 @@ + -I. -I.. -I../widget -I../vector -I../list -I../fitsy++ -I../util \ + -I../../include -I$(X11INCLUDE) \ + -I../../$(FUNTOOLSDIR)/util \ +- -I/usr/include/libxml2 \ +- -I../../$(ASTDIR) ++ -I/usr/include/libxml2 + + SS = \ + annulus.C \ +diff -Nur saods9.orig/saotk/widget/ps.h saods9/saotk/widget/ps.h +--- saods9.orig/saotk/widget/ps.h 2009-11-04 02:32:17.000000000 +0000 ++++ saods9/saotk/widget/ps.h 2009-11-04 06:26:59.000000000 +0000 +@@ -13,7 +13,7 @@ + #include "zlib.h" + extern int DebugGZ; + +-#if defined( __alpha) || defined(__mips64) || defined(__sparcv9) || defined(__M64) ++#if defined( __alpha) || defined(__mips64) || defined(__sparcv9) || defined(__M64) || defined(__LP64__) + #define BIT32 int + #else + #define BIT32 long diff --git a/sci-astronomy/ds9/files/ds9-5.7-src.patch b/sci-astronomy/ds9/files/ds9-5.7-src.patch new file mode 100644 index 000000000000..d60870b2f942 --- /dev/null +++ b/sci-astronomy/ds9/files/ds9-5.7-src.patch @@ -0,0 +1,52 @@ +--- saods9.orig/src/ds9.tcl 2009-11-04 02:32:17.000000000 +0000 ++++ saods9/src/ds9.tcl 2009-11-04 02:50:39.000000000 +0000 +@@ -34,24 +34,34 @@ + option add {*Label*BorderWidth} 2 + + # initialize +-set ds9(root) "zvfsmntpt" ++set ds9(root) "/usr/share/ds9" + +-source $ds9(root)/tcl8.4/msgcat1.3/msgcat.tcl +-source $ds9(root)/tcl8.4/http2.5/http.tcl ++package require msgcat ++package require http + +-source $ds9(root)/tk8.4/tearoff.tcl ++package require tearoff + +-source $ds9(root)/tcllib1.10/base64/base64.tcl +-source $ds9(root)/tcllib1.10/log/log.tcl +-source $ds9(root)/tcllib1.10/ftp/ftp.tcl +-source $ds9(root)/tcllib1.10/textutil/repeat.tcl +-source $ds9(root)/tcllib1.10/textutil/tabify.tcl +- +-source $ds9(root)/tkcon2.5/tkcon.tcl +-source $ds9(root)/xmlrpc0.3/xmlrpc.tcl +- +-source $ds9(root)/blt2.4/graph.tcl +-source $ds9(root)/blt2.4/tabset.tcl ++package require base64 ++package require log ++package require ftp ++package require textutil::repeat ++package require textutil::tabify ++ ++package require tkcon ++package require xmlrpc ++ ++package require BLT ++package require Tktable ++package require tclxpa ++package require img::base ++package require img::jpeg ++package require img::tiff ++package require img::png ++package require img::gif ++package require img::ppm ++package require img::bmp ++package require img::xbm ++package require img::window + + source $ds9(root)/src/source.tcl + diff --git a/sci-astronomy/ds9/files/ds9-5.7-tcl85.patch b/sci-astronomy/ds9/files/ds9-5.7-tcl85.patch new file mode 100644 index 000000000000..dde993922a54 --- /dev/null +++ b/sci-astronomy/ds9/files/ds9-5.7-tcl85.patch @@ -0,0 +1,13 @@ +--- saods9.orig/htmlwidget/makemake.tcl.in 2005-11-09 01:06:08.000000000 +0100 ++++ saods9/htmlwidget/makemake.tcl.in 2008-01-12 01:09:50.000000000 +0100 +@@ -360,9 +360,7 @@ + + # A target to build everything. + # +-set all ${PFX}hwish${TEXE} +-lappend all ${PFX}hv${TEXE} +-lappend all ${PFX}ss${TEXE} ++set all libtkhtml.a + if {"@ENABLE_SHLIB@"=="1"} { + lappend all tkhtml@TARGET_SHLIB_EXT@ + # lappend all tkhtml.so diff --git a/sci-astronomy/ds9/files/ds9.png b/sci-astronomy/ds9/files/ds9.png Binary files differnew file mode 100644 index 000000000000..875195e75f1a --- /dev/null +++ b/sci-astronomy/ds9/files/ds9.png |
