[gentoo-commits] gentoo-x86 commit in sci-astronomy/ds9/files: ds9-5.7-src.patch ds9.png ds9-5.7-saotk.patch ds9-5.7-makefile.patch ds9-5.7-main.patch ds9-5.7-tcl85.patch ds9-5.5-makefile.patch ds9-5.4-saotk.patch ds9-5.2-Makefile.patch ds9-5.4-gcc43.patch ds9-5.2-gcc43.patch ds9-5.5-src.patch ds9-5.5-main.patch ds9-5.1-gcc4.2-x86.patch

[Sebastien Fabbro (bicatali)]

bicatali    09/11/04 06:25:14

  Added:                ds9-5.7-src.patch ds9.png ds9-5.7-saotk.patch
                        ds9-5.7-makefile.patch ds9-5.7-main.patch
                        ds9-5.7-tcl85.patch
  Removed:              ds9-5.5-makefile.patch ds9-5.4-saotk.patch
                        ds9-5.2-Makefile.patch ds9-5.4-gcc43.patch
                        ds9-5.2-gcc43.patch ds9-5.5-src.patch
                        ds9-5.5-main.patch ds9-5.1-gcc4.2-x86.patch
  Log:
  Version bump. Updated all patches, added icon and fix for tcl-8.5 (bug #267558)
  (Portage version: 2.2_rc48/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-astronomy/ds9/files/ds9-5.7-src.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/ds9/files/ds9-5.7-src.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/ds9/files/ds9-5.7-src.patch?rev=1.1&content-type=text/plain

Index: ds9-5.7-src.patch
===================================================================
--- 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
 



1.1                  sci-astronomy/ds9/files/ds9.png

	<<Binary file>>


1.1                  sci-astronomy/ds9/files/ds9-5.7-saotk.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/ds9/files/ds9-5.7-saotk.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/ds9/files/ds9-5.7-saotk.patch?rev=1.1&content-type=text/plain

Index: ds9-5.7-saotk.patch
===================================================================
diff -Nur saods9.orig/saotk/fitsy++/Makefile saods9/saotk/fitsy++/Makefile
--- 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 \
 	-I../../include -I$(X11INCLUDE) \
-	-I../../$(FUNTOOLSDIR)/filter -I../../$(FUNTOOLSDIR)/fitsy \
-	-I../../$(FUNTOOLSDIR)/util
+	-I/usr/include/funtools/filter -I/usr/include/funtools/fitsy \
+	-I/usr/include/funtools/util -I/usr/include/wcs
 
 SS	= \
 	alloc.C \
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;
-  char* ksearchh(char*, char*);
+  char* ksearchh(char* hstring, char* keyword)
+  {
+/* Find entry for keyword keyword in FITS header string hstring.
+   (the keyword may have a maximum of eight letters)
+   NULL is returned if the keyword is not found */
+
+/* char *hstring; character string containing fits-style header
+               information in the format <keyword>= <value> {/ <comment>}
+               the default is that each entry is 80 characters long;
+               however, lines may be of arbitrary length terminated by
+               nulls, carriage returns or linefeeds, if packed is true.  */
+/*char *keyword; character string containing the name of the variable
+               to be returned.  ksearch searches for a line beginning
+               with this string.  The string may be a character
+               literal or a character variable terminated by a null
+               or '$'.  it is truncated to 8 characters. */
+{
+    char *loc, *headnext, *headlast, *pval, *lc, *line;
+    int icol, nextchar, lkey, nleft, lhead, lmax;
+
+#ifdef USE_SAOLIB
+       int iel=1, ip=1, nel, np, ier;
+       char *get_fits_head_str();
+
+       if( !use_saolib ){
+#endif
+
+    pval = 0;
+static int lhead0 = 0;
+/* Find current length of header string */
+    if (lhead0)
+       lmax = lhead0;
+    else
+       lmax = 256000;
+    for (lhead = 0; lhead < lmax; lhead++) {
+       if (hstring[lhead] == (char) 0)
+           break;
+       }
+
+/* Search header string for variable name */
+    headlast = hstring + lhead;
+    headnext = hstring;
+    pval = NULL;
+    while (headnext < headlast) {
+       nleft = headlast - headnext;
+       loc = strncsrch (headnext, keyword, nleft);
+
+       /* Exit if keyword is not found */
+       if (loc == NULL) {
+           break;
+           }
+
+       icol = (loc - hstring) % 80;
+       lkey = strlen (keyword);
+       nextchar = (int) *(loc + lkey);
+
+       /* If this is not in the first 8 characters of a line, keep searching */
+       if (icol > 7)
+           headnext = loc + 1;
+
+       /* If parameter name in header is longer, keep searching */
+       else if (nextchar != 61 && nextchar > 32 && nextchar < 127)
+           headnext = loc + 1;
+
+       /* If preceeding characters in line are not blanks, keep searching */
+       else {
+           line = loc - icol;
+           for (lc = line; lc < loc; lc++) {
+               if (*lc != ' ')
+                   headnext = loc + 1;
+               }
+
+       /* Return pointer to start of line if match */
+           if (loc >= headnext) {
+               pval = line;
+               break;
+               }
+           }
+       }
+/* Return pointer to calling program */
+       return (pval);
+
+#ifdef USE_SAOLIB
+       }
+       else {
+           if (get_fits_head_str(keyword,iel,ip,&nel,&np,&ier,hstring) != NULL)
+               return(hstring);
+           else
+               return(NULL);
+           }
+#endif
+}
+}
 
   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



1.1                  sci-astronomy/ds9/files/ds9-5.7-makefile.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/ds9/files/ds9-5.7-makefile.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/ds9/files/ds9-5.7-makefile.patch?rev=1.1&content-type=text/plain

Index: ds9-5.7-makefile.patch
===================================================================
--- 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/.
 



1.1                  sci-astronomy/ds9/files/ds9-5.7-main.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/ds9/files/ds9-5.7-main.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/ds9/files/ds9-5.7-main.patch?rev=1.1&content-type=text/plain

Index: ds9-5.7-main.patch
===================================================================
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) $@



1.1                  sci-astronomy/ds9/files/ds9-5.7-tcl85.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/ds9/files/ds9-5.7-tcl85.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/ds9/files/ds9-5.7-tcl85.patch?rev=1.1&content-type=text/plain

Index: ds9-5.7-tcl85.patch
===================================================================
--- 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