[128902] trunk/dports/science/ds9

[aronnax at macports.org]

Revision: 128902
          https://trac.macports.org/changeset/128902
Author:   aronnax at macports.org
Date:     2014-11-29 11:43:13 -0800 (Sat, 29 Nov 2014)
Log Message:
-----------
ds9: build against non-bundled versions of more libraries

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

Modified: trunk/dports/science/ds9/Portfile
===================================================================
--- trunk/dports/science/ds9/Portfile	2014-11-29 19:41:33 UTC (rev 128901)
+++ trunk/dports/science/ds9/Portfile	2014-11-29 19:43:13 UTC (rev 128902)
@@ -5,7 +5,7 @@
 
 name                    ds9
 version                 7.3.2
-revision                2
+revision                3
 categories              science
 platforms               darwin
 maintainers             aronnax
@@ -38,8 +38,10 @@
                         port:zlib \
                         port:libzip
 
-# FIXME: ast is currently statically linked
-depends_build-append    port:ast
+# FIXME: all of these libraries are statically linked
+depends_build-append    port:ast \
+                        port:funtools \
+                        port:xpa
 
 universal_variant       no
 
@@ -102,7 +104,7 @@
 
 destroot {
     xinstall ${worksrcpath}/bin/ds9 ${destroot}${prefix}/bin
-    exec cp -r ${worksrcpath}/ds9/zipdir/zvfsmntpt ${destroot}${prefix}/share/ds9
+    copy ${worksrcpath}/ds9/zipdir/zvfsmntpt ${destroot}${prefix}/share/ds9
 }
 
 livecheck.url           ${homepage}/site/Download.html

Modified: trunk/dports/science/ds9/files/patch-Makefile.unix.diff
===================================================================
--- trunk/dports/science/ds9/files/patch-Makefile.unix.diff	2014-11-29 19:41:33 UTC (rev 128901)
+++ trunk/dports/science/ds9/files/patch-Makefile.unix.diff	2014-11-29 19:43:13 UTC (rev 128902)
@@ -1,20 +1,30 @@
---- Makefile.unix.orig	2014-11-27 14:40:14.000000000 -0800
-+++ Makefile.unix	2014-11-27 14:40:53.000000000 -0800
-@@ -10,7 +10,7 @@
+--- Makefile.unix.orig	2014-11-29 01:42:56.000000000 -0800
++++ Makefile.unix	2014-11-29 01:43:15.000000000 -0800
+@@ -9,10 +9,10 @@
+ 	tcl tk \
  	tktable tkcon xmlrpc tkblt \
  	tclxml tkimg tkmpeg tkhtml \
- 	xpa tcliis tclcheckdns signal funtools \
+-	xpa tcliis tclcheckdns signal funtools \
 -	ast wcssubs \
++	tcliis tclcheckdns signal \
 +	wcssubs \
  	rice hcompress plio \
- 	saotk zvfs ds9
+-	saotk zvfs ds9
++	saotk ds9
  
-@@ -113,7 +113,7 @@
+ tcl	: FORCE
+ 	@echo "Installing Tcl..."
+@@ -112,10 +112,10 @@
+ distclean : tclclean tkclean \
  	tktableclean tkbltclean \
  	tclxmlclean tkimgclean tkmpegclean tkhtmlclean \
- 	xpaclean tcliisclean tclcheckdnsclean signalclean funtoolsclean \
+-	xpaclean tcliisclean tclcheckdnsclean signalclean funtoolsclean \
 -	astclean wcssubsclean \
++	tcliisclean tclcheckdnsclean signalclean \
 +	wcssubsclean \
  	riceclean hcompressclean plioclean \
- 	saotkclean zvfsclean ds9clean srcclean \
+-	saotkclean zvfsclean ds9clean srcclean \
++	saotkclean ds9clean srcclean \
  	filesclean dirsclean
+ 
+ #--------------------------distribution

Modified: trunk/dports/science/ds9/files/patch-ds9_Makefile.unix.diff
===================================================================
--- trunk/dports/science/ds9/files/patch-ds9_Makefile.unix.diff	2014-11-29 19:41:33 UTC (rev 128901)
+++ trunk/dports/science/ds9/files/patch-ds9_Makefile.unix.diff	2014-11-29 19:43:13 UTC (rev 128902)
@@ -1,6 +1,10 @@
---- ds9/Makefile.unix.orig	2014-11-28 11:38:57.000000000 -0800
-+++ ds9/Makefile.unix	2014-11-28 11:39:43.000000000 -0800
-@@ -43,9 +43,6 @@
+--- ds9/Makefile.unix.orig	2014-11-29 01:44:37.000000000 -0800
++++ ds9/Makefile.unix	2014-11-29 01:45:19.000000000 -0800
+@@ -39,17 +39,11 @@
+ 	../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 \
@@ -9,8 +13,12 @@
 -	../lib/libast_pal.a \
  	../lib/libsaotk.a \
  	../lib/libwcs.a \
- 	../lib/libzvfs.a \
-@@ -104,8 +101,6 @@
+-	../lib/libzvfs.a \
+-	../lib/libxpa.a \
+ 	../lib/$(TCLIISDIR)/libtcliis1.0.a \
+ 	../lib/$(TCLCHECKDNSDIR)/libtclcheckdns1.1.a \
+ 	../lib/libsignal_ext.a \
+@@ -104,8 +98,6 @@
  	strip ds9Base
  	cp ds9Base ds9
  	cp ds9 ../bin/.
@@ -19,7 +27,7 @@
  
  debug	: ds9Base ds9.zip
  	$(RM) $@
-@@ -114,9 +109,44 @@
+@@ -114,9 +106,43 @@
  ds9Base	: $(OBJS) $(LIBS)
  	$(RM) $@
  	$(CXX) ${OPTS} \
@@ -41,17 +49,16 @@
 +	../lib/$(TKIMGVER)/libzlibtcl1.2.5.a \
 +	../lib/$(TKIMGVER)/libtkimg1.4.a \
 +	../lib/libtiff.a \
-+	../lib/libfuntools.a \
++	-lfuntools \
 +	../lib/librice.a \
 +	../lib/libhcomp.a \
 +	../lib/libplio.a \
-+	/opt/local/lib/libast.a \
-+	/opt/local/lib/libast_err.a \
-+	/opt/local/lib/libast_pal.a \
++	@prefix@/lib/libast.a \
++	@prefix@/lib/libast_err.a \
++	@prefix@/lib/libast_pal.a \
 +	../lib/libsaotk.a \
 +	../lib/libwcs.a \
-+	../lib/libzvfs.a \
-+	../lib/libxpa.a \
++	-lxpa \
 +	../lib/$(TCLIISDIR)/libtcliis1.0.a \
 +	../lib/$(TCLCHECKDNSDIR)/libtclcheckdns1.1.a \
 +	../lib/libsignal_ext.a \
@@ -66,7 +73,7 @@
  
  endif
  
-@@ -152,7 +182,6 @@
+@@ -152,7 +178,6 @@
  
  ds9.zip	: $(FILES)
  	cd zipdir; find . -depth -name "CVS" -exec rm -r {} \;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141129/ce1f0116/attachment.html>