[106150] trunk/dports/science/ds9
aronnax at macports.org
aronnax at macports.org
Thu May 16 19:13:05 PDT 2013
Revision: 106150
https://trac.macports.org/changeset/106150
Author: aronnax at macports.org
Date: 2013-05-16 19:13:05 -0700 (Thu, 16 May 2013)
Log Message:
-----------
ds9: update to 7.2
Modified Paths:
--------------
trunk/dports/science/ds9/Portfile
Added Paths:
-----------
trunk/dports/science/ds9/files/patch-ds9_Makefile.diff
Removed Paths:
-------------
trunk/dports/science/ds9/files/patch-Makefile.diff
trunk/dports/science/ds9/files/patch-grid25dbase.C.diff
trunk/dports/science/ds9/files/patch-grid3dbase.C.diff
Modified: trunk/dports/science/ds9/Portfile
===================================================================
--- trunk/dports/science/ds9/Portfile 2013-05-16 21:50:44 UTC (rev 106149)
+++ trunk/dports/science/ds9/Portfile 2013-05-17 02:13:05 UTC (rev 106150)
@@ -2,13 +2,14 @@
# $Id$
PortSystem 1.0
+PortGroup conflicts_build 1.0
name ds9
-version 7.1
+version 7.2
categories science
platforms darwin
maintainers aronnax
-license GPL-2
+license GPL-3+
description SAOImage DS9 astronomical imaging and visualization application
long_description \
SAOImage DS9 is an astronomical imaging and data visualization \
@@ -18,13 +19,17 @@
configurable and extensible via XPA and SAMP.
homepage http://hea-www.harvard.edu/RD/ds9
-master_sites http://hea-www.harvard.edu/saord/download/ds9/source/
+master_sites http://hea-www.harvard.edu/RD/ds9/download/source
distname ${name}.${version}
-checksums sha1 417543d6fd67d4507f4bbe098e22456e11c9373f \
- rmd160 6b65af16dfb6320c4d3629b83acda1f2a79dca49
+checksums sha1 6df3b7de3f375294200bc2601a8129d3bb7a2ef1 \
+ rmd160 73cbfe66a6a12282ff56e8de54d7bdb7bb060464
-depends_build-append port:gcc45
-depends_lib-append port:xorg-libX11 \
+# FIXME: until we figure out how to build ds9 without its bundled tcl/tk, we
+# conflict at build time with MacPorts' tcl/tk.
+conflicts_build tcl tk
+
+depends_build port:gcc47
+depends_lib port:xorg-libX11 \
port:xorg-libXext \
port:Xft2 \
port:xrender \
@@ -32,7 +37,8 @@
port:fontconfig \
port:freetype \
port:libxml2 \
- port:libiconv
+ port:libiconv \
+ port:jbigkit
universal_variant no
@@ -67,16 +73,9 @@
set ds9arch 64x86
}
-# FIXME: The second and third patches have been contributed upstream and can be
-# removed in a future release of ds9.
-patchfiles patch-Makefile.diff \
- patch-grid25dbase.C.diff \
- patch-grid3dbase.C.diff
+patchfiles patch-ds9_Makefile.diff
-# The 'ast' component apparently checks for a working Fortran compiler,
-# even though there appears to be no Fortran code. Is it possible to remove this
-# dependency?
-configure.fc ${prefix}/bin/gfortran-mp-4.5
+configure.compiler macports-gcc-4.7
# The 'configure' stage for ds9 consists of copying or symbolically linking a
# platform-specific file to 'make.include'.
@@ -84,9 +83,7 @@
file copy ${worksrcpath}/make.darwin${ds9arch}${ds9platform} ${worksrcpath}/make.include
}
-# Disable parallel build.
-build.jobs 1
-
+use_parallel_build no
build.args-append JOBS=${build.jobs} \
CC=${configure.cc} \
CXX=${configure.cxx} \
Deleted: trunk/dports/science/ds9/files/patch-Makefile.diff
===================================================================
--- trunk/dports/science/ds9/files/patch-Makefile.diff 2013-05-16 21:50:44 UTC (rev 106149)
+++ trunk/dports/science/ds9/files/patch-Makefile.diff 2013-05-17 02:13:05 UTC (rev 106150)
@@ -1,11 +0,0 @@
---- Makefile.orig 2012-11-06 01:57:29.000000000 -0800
-+++ Makefile 2012-11-06 01:58:38.000000000 -0800
-@@ -306,7 +306,7 @@
-
- libtiff : FORCE
- @echo "Installing LIBTIFF..."
-- cd $(TKIMGDIR)/compat/libtiff; CC='$(CC)' CFLAGS='$(OPTS)' CXX='$(CC)' CXXFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --disable-shared --cache-file=$(LOCALCACHE)
-+ cd $(TKIMGDIR)/compat/libtiff; CC='$(CC)' CFLAGS='$(OPTS)' CXX='$(CC)' CXXFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --disable-shared --cache-file=$(LOCALCACHE) --disable-jbig --disable-jpeg
- cd $(TKIMGDIR)/compat/libtiff; $(MAKE) -j $(JOBS) ; $(MAKE) install
-
- tkmpeg : FORCE
Added: trunk/dports/science/ds9/files/patch-ds9_Makefile.diff
===================================================================
--- trunk/dports/science/ds9/files/patch-ds9_Makefile.diff (rev 0)
+++ trunk/dports/science/ds9/files/patch-ds9_Makefile.diff 2013-05-17 02:13:05 UTC (rev 106150)
@@ -0,0 +1,11 @@
+--- ds9/Makefile.orig 2013-05-16 18:53:44.000000000 -0700
++++ ds9/Makefile 2013-05-16 18:58:59.000000000 -0700
+@@ -376,7 +376,7 @@
+ $(CXX) ${OPTS} \
+ -o $@ $(OBJS) $(LIBS) \
+ -L$(X11LIB) -lX11 -lXext -lXft -lXrender -lXss -lfontconfig -lfreetype \
+- -lxml2 \
++ -lxml2 -ljbig \
+ -lstdc++ -liconv
+ endif
+
Deleted: trunk/dports/science/ds9/files/patch-grid25dbase.C.diff
===================================================================
--- trunk/dports/science/ds9/files/patch-grid25dbase.C.diff 2013-05-16 21:50:44 UTC (rev 106149)
+++ trunk/dports/science/ds9/files/patch-grid25dbase.C.diff 2013-05-17 02:13:05 UTC (rev 106150)
@@ -1,20 +0,0 @@
---- saotk/util/grid25dbase.C.orig 2012-11-05 23:10:38.000000000 -0800
-+++ saotk/util/grid25dbase.C 2012-11-05 23:11:02.000000000 -0800
-@@ -26,14 +26,13 @@
- int Grid25dBase::gLine(int n, float* x, float* y)
- {
- Frame3dBase* pp = (Frame3dBase*)parent_;
-- Vector vv[n];
- float xx[n];
- float yy[n];
-
- for (int ii=0; ii<n; ii++) {
-- vv[ii] = pp->mapFromRef(Vector(x[ii],y[ii]),Coord::WIDGET);
-- xx[ii] = vv[ii][0];
-- yy[ii] = vv[ii][1];
-+ Vector vv = pp->mapFromRef(Vector(x[ii],y[ii]),Coord::WIDGET);
-+ xx[ii] = vv[0];
-+ yy[ii] = vv[1];
- }
-
- switch (renderMode_) {
Deleted: trunk/dports/science/ds9/files/patch-grid3dbase.C.diff
===================================================================
--- trunk/dports/science/ds9/files/patch-grid3dbase.C.diff 2013-05-16 21:50:44 UTC (rev 106149)
+++ trunk/dports/science/ds9/files/patch-grid3dbase.C.diff 2013-05-17 02:13:05 UTC (rev 106150)
@@ -1,20 +0,0 @@
---- saotk/util/grid3dbase.C.orig 2012-11-05 23:09:41.000000000 -0800
-+++ saotk/util/grid3dbase.C 2012-11-05 23:09:51.000000000 -0800
-@@ -24,14 +24,13 @@
-
- int Grid3dBase::gLine(int n, float* x, float* y, float* z)
- {
-- Vector3d vv[n];
- float xx[n];
- float yy[n];
-
- for (int ii=0; ii<n; ii++) {
-- vv[ii] = Vector3d(x[ii],y[ii],z[ii])*mx_;
-- xx[ii] = vv[ii][0];
-- yy[ii] = vv[ii][1];
-+ Vector3d vv = Vector3d(x[ii],y[ii],z[ii])*mx_;
-+ xx[ii] = vv[0];
-+ yy[ii] = vv[1];
- }
-
- switch (renderMode_) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130516/c5451b26/attachment-0001.html>
More information about the macports-changes
mailing list