[119151] trunk/dports/science/ds9

[aronnax at macports.org]

Revision: 119151
          https://trac.macports.org/changeset/119151
Author:   aronnax at macports.org
Date:     2014-04-18 01:22:28 -0700 (Fri, 18 Apr 2014)
Log Message:
-----------
ds9: enable plotting grids by correctly linking libast and libsaotk, closes #40928

Modified Paths:
--------------
    trunk/dports/science/ds9/Portfile
    trunk/dports/science/ds9/files/patch-ds9_Makefile.diff

Modified: trunk/dports/science/ds9/Portfile
===================================================================
--- trunk/dports/science/ds9/Portfile	2014-04-18 08:21:45 UTC (rev 119150)
+++ trunk/dports/science/ds9/Portfile	2014-04-18 08:22:28 UTC (rev 119151)
@@ -6,7 +6,7 @@
 
 name                    ds9
 version                 7.2
-revision                4
+revision                5
 categories              science
 platforms               darwin
 maintainers             aronnax
@@ -43,7 +43,8 @@
                         port:zlib \
                         port:libzip \
                         port:zip \
-                        port:ast
+                        port:ast \
+                        port:pgplot
 
 universal_variant       no
 
@@ -99,6 +100,11 @@
     # included upstream
     file copy ${filespath}/make.darwin64x86mavericks ${worksrcpath}
     reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/Makefile
+
+    # FIXME: We have to statically link libast because libast needs to call
+    # functions that are defined in the static libsaotk. Probably best to
+    # eventually make libsaotk a dynamic library.
+    reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/ds9/Makefile
 }
 
 # Buggy C++

Modified: trunk/dports/science/ds9/files/patch-ds9_Makefile.diff
===================================================================
--- trunk/dports/science/ds9/files/patch-ds9_Makefile.diff	2014-04-18 08:21:45 UTC (rev 119150)
+++ trunk/dports/science/ds9/files/patch-ds9_Makefile.diff	2014-04-18 08:22:28 UTC (rev 119151)
@@ -1,5 +1,5 @@
---- ds9/Makefile.orig	2013-05-16 18:53:44.000000000 -0700
-+++ ds9/Makefile	2013-05-16 21:39:17.000000000 -0700
+--- ds9/Makefile.orig	2014-04-18 00:11:43.000000000 -0700
++++ ds9/Makefile	2014-04-18 01:17:01.000000000 -0700
 @@ -50,14 +50,9 @@
  	../lib/librice.a \
  	../lib/libhcomp.a \
@@ -24,13 +24,53 @@
  
  else
  
-@@ -376,7 +371,8 @@
+@@ -374,9 +369,47 @@
+ ds9Base	: $(OBJS) $(LIBS)
+ 	$(RM) $@
  	$(CXX) ${OPTS} \
- 	-o $@ $(OBJS) $(LIBS) \
+-	-o $@ $(OBJS) $(LIBS) \
++	-o $@ $(OBJS) \
++	../lib/libsaotk.a \
++	../lib/libtkhtml.a \
++	../lib/libtkmpeg.a \
++	../lib/$(TCLXMLVER)/libTclxml3.2.a \
++	../lib/$(TKTABLEVER)/libTktable2.10.a \
++	../lib/$(TKIMGVER)/libtkimgpng1.4.a \
++	../lib/$(TKIMGVER)/libpngtcl1.4.3.a \
++	../lib/$(TKIMGVER)/libtkimgtiff1.4.a \
++	../lib/$(TKIMGVER)/libtifftcl3.9.4.a \
++	../lib/$(TKIMGVER)/libtkimgjpeg1.4.a \
++	../lib/$(TKIMGVER)/libjpegtcl8.2.a \
++	../lib/$(TKIMGVER)/libtkimggif1.4.a \
++	../lib/$(TKIMGVER)/libtkimgppm1.4.a \
++	../lib/$(TKIMGVER)/libtkimgwindow1.4.a \
++	../lib/$(TKIMGVER)/libzlibtcl1.2.5.a \
++	../lib/$(TKIMGVER)/libtkimg1.4.a \
++	../lib/libtiff.a \
++	../lib/libfuntools.a \
++	../lib/librice.a \
++	../lib/libhcomp.a \
++	../lib/libplio.a \
++	@prefix@/lib/libast.a \
++	@prefix@/lib/libast_err.a \
++	@prefix@/lib/libast_pal.a \
++	../lib/libsaotk.a \
++	../lib/libwcs.a \
++	../lib/libzvfs.a \
++	-lzip \
++	-lz \
++	../lib/libxpa.a \
++	../lib/libiis.a \
++	../lib/libcheckdns.a \
++	../lib/libsignal_ext.a \
++	../lib/libxxlib.a \
++	../lib/libBLTX30.a \
++	../lib/libBLTCore30.a \
++	../lib/libtk8.5.a \
++	../lib/libtcl8.5.a \
  	-L$(X11LIB) -lX11 -lXext -lXft -lXrender -lXss -lfontconfig -lfreetype \
 -	-lxml2 \
-+	-lxml2 -ljbig -lz -lzip \
-+	-last -last_err -last_ems -last_drama -last_grf3d -last_grf_2.0 -last_grf_3.2 -last_grf_5.6 -last_pgplot -last_pgplot3d \
++	-lxml2 -ljbig \
  	-lstdc++ -liconv
  endif
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140418/63c70954/attachment.html>