[106158] trunk/dports/science/ds9
aronnax at macports.org
aronnax at macports.org
Thu May 16 21:49:55 PDT 2013
Revision: 106158
https://trac.macports.org/changeset/106158
Author: aronnax at macports.org
Date: 2013-05-16 21:49:55 -0700 (Thu, 16 May 2013)
Log Message:
-----------
ds9: use MacPorts build of ast
Modified Paths:
--------------
trunk/dports/science/ds9/Portfile
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 2013-05-17 04:37:02 UTC (rev 106157)
+++ trunk/dports/science/ds9/Portfile 2013-05-17 04:49:55 UTC (rev 106158)
@@ -6,7 +6,7 @@
name ds9
version 7.2
-revision 1
+revision 2
categories science
platforms darwin
maintainers aronnax
@@ -29,7 +29,6 @@
# 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:xorg-libXt \
@@ -43,7 +42,8 @@
port:jbigkit \
port:zlib \
port:libzip \
- port:zip
+ port:zip \
+ port:ast
universal_variant no
@@ -85,7 +85,7 @@
reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/Makefile
}
-configure.compiler macports-gcc-4.7
+compiler.blacklist clang
# The 'configure' stage for ds9 consists of copying or symbolically linking a
# platform-specific file to 'make.include'.
@@ -97,7 +97,6 @@
build.args-append JOBS=${build.jobs} \
CC=${configure.cc} \
CXX=${configure.cxx} \
- FC=${configure.fc} \
X11INCLUDE=${prefix}/include \
X11LIB=${prefix}/lib \
CODESIGN=/usr/bin/true
Modified: trunk/dports/science/ds9/files/patch-Makefile.diff
===================================================================
--- trunk/dports/science/ds9/files/patch-Makefile.diff 2013-05-17 04:37:02 UTC (rev 106157)
+++ trunk/dports/science/ds9/files/patch-Makefile.diff 2013-05-17 04:49:55 UTC (rev 106158)
@@ -1,5 +1,5 @@
--- Makefile.orig 2013-05-16 19:26:06.000000000 -0700
-+++ Makefile 2013-05-16 19:29:12.000000000 -0700
++++ Makefile 2013-05-16 21:39:24.000000000 -0700
@@ -185,12 +185,12 @@
build : dirs \
tcl tk \
@@ -7,7 +7,8 @@
- zlib tclxml tkimg tkmpeg html \
+ tclxml tkimg tkmpeg html \
xpa iis checkdns $(SIGNAL) funtools \
- ast wcssubs \
+- ast wcssubs \
++ wcssubs \
rice hcompress plio \
$(OPTDIR) \
- saotk zip zvfs ds9
@@ -27,7 +28,7 @@
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,7 +334,7 @@
+@@ -339,19 +334,10 @@
funtools: FORCE
@echo "Installing Funtools..."
@@ -36,7 +37,19 @@
cd $(FUNTOOLSDIR); $(MAKE) lib
cp $(FUNTOOLSDIR)/libfuntools.a lib/.
-@@ -378,14 +373,6 @@
+-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
@@ -51,14 +64,15 @@
zvfs : FORCE
@echo "Installing ZVFS..."
cd $(ZVFSDIR); $(MAKE)
-@@ -402,12 +389,12 @@
+@@ -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 \
+- astclean wcssubsclean \
++ wcssubsclean \
riceclean hcompressclean plioclean \
$(OPTDIRCLEAN) \
- saotkclean zipclean zvfsclean ds9clean srcclean \
@@ -66,7 +80,7 @@
dirsclean
filesclean: FORCE
-@@ -429,9 +416,6 @@
+@@ -429,9 +407,6 @@
bltclean: FORCE
cd $(BLTDIR); $(MAKE) distclean
@@ -76,7 +90,17 @@
tclxmlclean: FORCE
cd $(TCLXMLDIR); $(MAKE) distclean
-@@ -482,9 +466,6 @@
+@@ -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
Modified: trunk/dports/science/ds9/files/patch-ds9_Makefile.diff
===================================================================
--- trunk/dports/science/ds9/files/patch-ds9_Makefile.diff 2013-05-17 04:37:02 UTC (rev 106157)
+++ trunk/dports/science/ds9/files/patch-ds9_Makefile.diff 2013-05-17 04:49:55 UTC (rev 106158)
@@ -1,6 +1,12 @@
--- ds9/Makefile.orig 2013-05-16 18:53:44.000000000 -0700
-+++ ds9/Makefile 2013-05-16 19:46:25.000000000 -0700
-@@ -56,8 +56,6 @@
++++ ds9/Makefile 2013-05-16 21:39:17.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 \
@@ -9,7 +15,7 @@
../lib/libxpa.a \
../lib/libiis.a \
../lib/libcheckdns.a \
-@@ -142,7 +140,7 @@
+@@ -142,7 +137,7 @@
cp ds9Base ds9
ds9.zip : $(FILES)
@@ -18,12 +24,13 @@
else
-@@ -376,7 +374,7 @@
+@@ -376,7 +371,8 @@
$(CXX) ${OPTS} \
-o $@ $(OBJS) $(LIBS) \
-L$(X11LIB) -lX11 -lXext -lXft -lXrender -lXss -lfontconfig -lfreetype \
- -lxml2 \
+ -lxml2 -ljbig -lz -lzip \
++ -last -last_err -last_pal \
-lstdc++ -liconv
endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130516/d9eafb13/attachment.html>
More information about the macports-changes
mailing list