[128832] trunk/dports/science/ds9
aronnax at macports.org
aronnax at macports.org
Thu Nov 27 14:57:17 PST 2014
Revision: 128832
https://trac.macports.org/changeset/128832
Author: aronnax at macports.org
Date: 2014-11-27 14:57:17 -0800 (Thu, 27 Nov 2014)
Log Message:
-----------
ds9: update to 7.3.2
Modified Paths:
--------------
trunk/dports/science/ds9/Portfile
Added Paths:
-----------
trunk/dports/science/ds9/files/patch-Makefile.unix.diff
trunk/dports/science/ds9/files/patch-ds9_Makefile.unix.diff
Removed Paths:
-------------
trunk/dports/science/ds9/files/make.darwin64x86mavericks
trunk/dports/science/ds9/files/patch-Makefile.diff
trunk/dports/science/ds9/files/patch-ds9_Makefile.diff
Modified: trunk/dports/science/ds9/Portfile
===================================================================
--- trunk/dports/science/ds9/Portfile 2014-11-27 22:55:11 UTC (rev 128831)
+++ trunk/dports/science/ds9/Portfile 2014-11-27 22:57:17 UTC (rev 128832)
@@ -2,11 +2,9 @@
# $Id$
PortSystem 1.0
-PortGroup conflicts_build 1.0
name ds9
-version 7.2
-revision 5
+version 7.3.2
categories science
platforms darwin
maintainers aronnax
@@ -22,13 +20,9 @@
homepage http://hea-www.harvard.edu/RD/ds9
master_sites http://hea-www.harvard.edu/RD/ds9/download/source
distname ${name}.${version}
-checksums sha1 6df3b7de3f375294200bc2601a8129d3bb7a2ef1 \
- rmd160 73cbfe66a6a12282ff56e8de54d7bdb7bb060464
+checksums sha1 0348b733923871ef1d36da653dd3fd90d33a4c20 \
+ rmd160 e75938b87863b305983527d9ce1b70f4520a7a2f
-# 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_lib port:xorg-libX11 \
port:xorg-libXext \
port:xorg-libXt \
@@ -41,78 +35,48 @@
port:libiconv \
port:jbigkit \
port:zlib \
- port:libzip \
- port:zip \
- port:ast
+ port:libzip
+# FIXME: ast is currently statically linked
+depends_build-append port:ast \
+ port:zip
+
universal_variant no
worksrcdir saods9
-platform darwin 8 {
- set ds9platform tiger
-}
-platform darwin 9 {
- set ds9platform leopard
-}
-platform darwin 10 {
- set ds9platform snowleopard
-}
-platform darwin 11 {
- set ds9platform lion
-}
-platform darwin 12 {
- set ds9platform mountainlion
-}
-platform darwin 13 {
- set ds9platform mavericks
-}
platform darwin {
- if {${os.major} >= 14} {
+ if {${os.major} <= 10} {
depends_lib
depends_run
- pre-fetch {
- ui_error "$name does not build on Mavericks or later."
- error "unsupported platform"
- }
+ ui_error "$name requires Mac OS X Lion or later."
+ error "unsupported platform"
+ } elseif {${os.major} == 11} {
+ set ds9platform lion
+ } elseif {${os.major} == 12} {
+ set ds9platform mountainlion
+ } elseif {${os.major} >= 13} {
+ # The upstream tarball contains Makefiles for each Mac OS version.
+ # Currently, the newest Makefile is for Mavericks. Check this when
+ # a new upstream version is available.
+ set ds9platform mavericks
}
}
-if {${configure.build_arch} eq "ppc"} {
- set ds9arch ppc
-}
-if {${configure.build_arch} eq "ppc64"} {
- set ds9arch ppc
-}
-if {${configure.build_arch} eq "i386"} {
- set ds9arch x86
-}
-if {${configure.build_arch} eq "x86_64"} {
- set ds9arch 64x86
-}
+patchfiles patch-Makefile.unix.diff \
+ patch-ds9_Makefile.unix.diff
-patchfiles patch-Makefile.diff \
- patch-ds9_Makefile.diff
-
post-patch {
- # FIXME: Remove the following line once a Makefile for Mavericks is
- # 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
+ reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/ds9/Makefile.unix
}
-# Buggy C++
-compiler.blacklist *clang*
-
# The 'configure' stage for ds9 consists of copying or symbolically linking a
# platform-specific file to 'make.include'.
configure {
- file copy ${worksrcpath}/make.darwin${ds9arch}${ds9platform} ${worksrcpath}/make.include
+ file copy ${worksrcpath}/make.darwin${ds9platform} ${worksrcpath}/make.include
reinplace "s|-gstabs+||g" ${worksrcpath}/make.include
}
@@ -122,6 +86,7 @@
CXX=${configure.cxx} \
X11INCLUDE=${prefix}/include \
X11LIB=${prefix}/lib \
+ XFT_LIBS="-lXft -lfontconfig" \
CODESIGN=/usr/bin/true
destroot {
Deleted: trunk/dports/science/ds9/files/make.darwin64x86mavericks
===================================================================
--- trunk/dports/science/ds9/files/make.darwin64x86mavericks 2014-11-27 22:55:11 UTC (rev 128831)
+++ trunk/dports/science/ds9/files/make.darwin64x86mavericks 2014-11-27 22:57:17 UTC (rev 128832)
@@ -1,36 +0,0 @@
-# make sure installed: PKG_CONFIG for Xft, see notes
-
-OS = unix
-ARCH = darwin64x86mavericks
-
-X11INCLUDE=/usr/X11/include
-X11LIB = /usr/X11/lib
-EXTTCLFLAGS=--disable-corefoundation
-
-XX = -O2
-YY = -gstabs+ -fno-inline
-ZZ = -m64 -arch x86_64 -mmacosx-version-min=10.9
-
-AA = -fPIC -DHAVE_SYS_UN_H -DHAVE_SYS_SHM_H -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D__M64
-
-#OPTS = ${XX} ${ZZ}
-OPTS = ${YY} ${ZZ}
-NOPTS = ${YY} ${ZZ}
-
-CXX = g++
-CXXOPT = ${OPTS} ${AA}
-CXXNOPT = ${NOPTS} ${AA}
-
-CC = gcc
-CCOPT = ${OPTS} ${AA}
-CCNOPT = ${NOPTS} ${AA}
-
-ZCAT = gzcat
-
-CODESIGN = codesign
-ZIPFILE = ds9.zip
-FILTERCOMPILER = pcc-i386-snowleopard.tar.gz
-
-ASTFLAGS = star_cv_cnf_trail_type=long
-JOBS = 4
-
Deleted: trunk/dports/science/ds9/files/patch-Makefile.diff
===================================================================
--- trunk/dports/science/ds9/files/patch-Makefile.diff 2014-11-27 22:55:11 UTC (rev 128831)
+++ trunk/dports/science/ds9/files/patch-Makefile.diff 2014-11-27 22:57:17 UTC (rev 128832)
@@ -1,112 +0,0 @@
---- Makefile.orig 2013-05-16 19:26:06.000000000 -0700
-+++ Makefile 2013-05-16 21:39:24.000000000 -0700
-@@ -185,12 +185,12 @@
- build : dirs \
- tcl tk \
- tktable tkcon xmlrpc blt \
-- zlib tclxml tkimg tkmpeg html \
-+ tclxml tkimg tkmpeg html \
- xpa iis checkdns $(SIGNAL) funtools \
-- ast wcssubs \
-+ wcssubs \
- rice hcompress plio \
- $(OPTDIR) \
-- saotk zip zvfs ds9
-+ saotk zvfs ds9
-
- doc : FORCE
- @echo "Making Documentation..."
-@@ -288,11 +288,6 @@
- cp $(BLTDIR)/src/*.a lib/.
- cd $(BLTDIR)/src; cp $(BLTINCL) ../../include/.
-
--zlib : FORCE
-- @echo "Installing zlib..."
-- cd $(ZLIBDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --static
-- cd $(ZLIBDIR); $(MAKE) -j $(JOBS) install
--
- tclxml : FORCE
- @echo "Installing TCLXML..."
- cd $(TCLXMLDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --disable-shared --disable-threads --with-xml-static=1 $(TCLXMLFLAGS) --cache-file=$(CACHE)
-@@ -339,19 +334,10 @@
-
- funtools: FORCE
- @echo "Installing Funtools..."
-- cd $(FUNTOOLSDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --with-zlib=../../lib/libz.a --with-wcslib=../lib/libwcs.a --enable-mainlib $(FUNTOOLSFLAGS)
-+ cd $(FUNTOOLSDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --with-zlib=@prefix@/lib/libz.dylib --with-wcslib=../lib/libwcs.a --enable-mainlib $(FUNTOOLSFLAGS)
- cd $(FUNTOOLSDIR); $(MAKE) lib
- cp $(FUNTOOLSDIR)/libfuntools.a lib/.
-
--ast : FORCE
-- @echo "Installing AST..."
-- cd $(ASTDIR); \
-- touch aclocal.m4; sleep 1; \
-- touch Makefile.in; sleep 1; \
-- touch configure; \
-- ./configure --enable-shared=no --prefix=$(root) $(ASTFLAGS) CC='$(CC)' CFLAGS='$(OPTS) -I.'; \
-- $(MAKE) -j $(JOBS) ast.h install-libLTLIBRARIES install-nodist_includeHEADERS install-includeHEADERS
--
- wcssubs : FORCE
- @echo "Installing WCSSUBS..."
- cd $(WCSSUBSDIR); $(MAKE) -j $(JOBS) install
-@@ -378,14 +364,6 @@
- @echo "Installing SAOTK..."
- cd $(SAOTKDIR); $(MAKE) -j $(JOBS) install
-
--zip : FORCE
-- @echo "Installing ZIP..."
-- cd $(ZIPDIR); PREFIX=$(root) $(MAKE) -j $(JOBS) CC='$(CC)' CFLAGS='$(OPTS) -I. -DUNIX' LFLAGS1='$(OPTS)' -f unix/Makefile generic
-- cd $(ZIPDIR); PREFIX=$(root) $(MAKE) -j $(JOBS) CC='$(CC)' CFLAGS='$(OPTS) -I. -DUNIX' LFLAGS1='$(OPTS)' -f unix/Makefile install
-- cd $(ZIPDIR); $(RM) libzip.a
-- cd $(ZIPDIR); $(AR) -cr libzip.a $(ZIPOBJS)
-- cp $(ZIPDIR)/libzip.a lib/.
--
- zvfs : FORCE
- @echo "Installing ZVFS..."
- cd $(ZVFSDIR); $(MAKE)
-@@ -402,12 +380,12 @@
- distclean : filesclean \
- tclclean tkclean \
- tktableclean bltclean \
-- zlibclean tclxmlclean tkimgclean tkmpegclean htmlclean \
-+ tclxmlclean tkimgclean tkmpegclean htmlclean \
- xpaclean iisclean checkdnsclean $(SIGNALCLEAN) funtoolsclean \
-- astclean wcssubsclean \
-+ wcssubsclean \
- riceclean hcompressclean plioclean \
- $(OPTDIRCLEAN) \
-- saotkclean zipclean zvfsclean ds9clean srcclean \
-+ saotkclean zvfsclean ds9clean srcclean \
- dirsclean
-
- filesclean: FORCE
-@@ -429,9 +407,6 @@
- bltclean: FORCE
- cd $(BLTDIR); $(MAKE) distclean
-
--zlibclean: FORCE
-- cd $(ZLIBDIR); $(MAKE) distclean
--
- tclxmlclean: FORCE
- cd $(TCLXMLDIR); $(MAKE) distclean
-
-@@ -464,9 +439,6 @@
- funtoolsclean: FORCE
- cd $(FUNTOOLSDIR); $(MAKE) distclean
-
--astclean: FORCE
-- cd $(ASTDIR); $(MAKE) distclean
--
- wcssubsclean: FORCE
- cd $(WCSSUBSDIR); $(MAKE) distclean
-
-@@ -482,9 +454,6 @@
- saotkclean : FORCE
- cd $(SAOTKDIR); $(MAKE) distclean
-
--zipclean: FORCE
-- cd $(ZIPDIR); PREFIX=$(root) $(MAKE) -f unix/Makefile clean
--
- zvfsclean: FORCE
- cd $(ZVFSDIR); $(MAKE) distclean
-
Added: trunk/dports/science/ds9/files/patch-Makefile.unix.diff
===================================================================
--- trunk/dports/science/ds9/files/patch-Makefile.unix.diff (rev 0)
+++ trunk/dports/science/ds9/files/patch-Makefile.unix.diff 2014-11-27 22:57:17 UTC (rev 128832)
@@ -0,0 +1,20 @@
+--- 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 @@
+ tktable tkcon xmlrpc tkblt \
+ tclxml tkimg tkmpeg tkhtml \
+ xpa tcliis tclcheckdns signal funtools \
+- ast wcssubs \
++ wcssubs \
+ rice hcompress plio \
+ saotk zvfs ds9
+
+@@ -113,7 +113,7 @@
+ tktableclean tkbltclean \
+ tclxmlclean tkimgclean tkmpegclean tkhtmlclean \
+ xpaclean tcliisclean tclcheckdnsclean signalclean funtoolsclean \
+- astclean wcssubsclean \
++ wcssubsclean \
+ riceclean hcompressclean plioclean \
+ saotkclean zvfsclean ds9clean srcclean \
+ filesclean dirsclean
Deleted: trunk/dports/science/ds9/files/patch-ds9_Makefile.diff
===================================================================
--- trunk/dports/science/ds9/files/patch-ds9_Makefile.diff 2014-11-27 22:55:11 UTC (rev 128831)
+++ trunk/dports/science/ds9/files/patch-ds9_Makefile.diff 2014-11-27 22:57:17 UTC (rev 128832)
@@ -1,76 +0,0 @@
---- 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 \
- ../lib/libplio.a \
-- ../lib/libast.a \
-- ../lib/libast_err.a \
-- ../lib/libast_pal.a \
- ../lib/libsaotk.a \
- ../lib/libwcs.a \
- ../lib/libzvfs.a \
-- ../lib/libzip.a \
-- ../lib/libz.a \
- ../lib/libxpa.a \
- ../lib/libiis.a \
- ../lib/libcheckdns.a \
-@@ -142,7 +137,7 @@
- cp ds9Base ds9
-
- ds9.zip : $(FILES)
-- cd zipdir; ../../bin/zip -r9 ../ds9.zip *
-+ cd zipdir; zip -r9 ../ds9.zip *
-
- else
-
-@@ -374,9 +369,47 @@
- ds9Base : $(OBJS) $(LIBS)
- $(RM) $@
- $(CXX) ${OPTS} \
-- -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 \
- -lstdc++ -liconv
- endif
-
Added: trunk/dports/science/ds9/files/patch-ds9_Makefile.unix.diff
===================================================================
--- trunk/dports/science/ds9/files/patch-ds9_Makefile.unix.diff (rev 0)
+++ trunk/dports/science/ds9/files/patch-ds9_Makefile.unix.diff 2014-11-27 22:57:17 UTC (rev 128832)
@@ -0,0 +1,59 @@
+--- ds9/Makefile.unix.orig 2014-11-27 14:49:58.000000000 -0800
++++ ds9/Makefile.unix 2014-11-27 14:50:14.000000000 -0800
+@@ -43,9 +43,6 @@
+ ../lib/librice.a \
+ ../lib/libhcomp.a \
+ ../lib/libplio.a \
+- ../lib/libast.a \
+- ../lib/libast_err.a \
+- ../lib/libast_pal.a \
+ ../lib/libsaotk.a \
+ ../lib/libwcs.a \
+ ../lib/libzvfs.a \
+@@ -114,9 +111,44 @@
+ ds9Base : $(OBJS) $(LIBS)
+ $(RM) $@
+ $(CXX) ${OPTS} \
+- -o $@ $(OBJS) $(LIBS) \
++ -o $@ $(OBJS) \
++ ../lib/libsaotk.a \
++ ../lib/libtkhtml.a \
++ ../lib/$(TKMPEGDIR)/libtkmpeg1.0.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)/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 \
++ ../lib/libxpa.a \
++ ../lib/$(TCLIISDIR)/libtcliis1.0.a \
++ ../lib/$(TCLCHECKDNSDIR)/libtclcheckdns1.1.a \
++ ../lib/libsignal_ext.a \
++ ../lib/$(TKBLTDIR)/libtkblt3.0.a \
++ ../lib/libtk8.6.a \
++ ../lib/libtkstub8.6.a \
++ ../lib/libtcl8.6.a \
++ ../lib/libtclstub8.6.a \
+ -L$(X11LIB) -lX11 -lXext -lXft -lXrender -lXss -lfontconfig -lfreetype \
+- -lxml2
++ -lxml2 -ljbig
+
+ endif
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141127/e7e9ba85/attachment.html>
More information about the macports-changes
mailing list