[106152] trunk/dports/science/ds9
aronnax at macports.org
aronnax at macports.org
Thu May 16 20:02:43 PDT 2013
Revision: 106152
https://trac.macports.org/changeset/106152
Author: aronnax at macports.org
Date: 2013-05-16 20:02:43 -0700 (Thu, 16 May 2013)
Log Message:
-----------
ds9: use libz, libzip provided by MacPorts, rather than the bundled sources
Modified Paths:
--------------
trunk/dports/science/ds9/Portfile
trunk/dports/science/ds9/files/patch-ds9_Makefile.diff
Added Paths:
-----------
trunk/dports/science/ds9/files/patch-Makefile.diff
Modified: trunk/dports/science/ds9/Portfile
===================================================================
--- trunk/dports/science/ds9/Portfile 2013-05-17 02:24:44 UTC (rev 106151)
+++ trunk/dports/science/ds9/Portfile 2013-05-17 03:02:43 UTC (rev 106152)
@@ -6,6 +6,7 @@
name ds9
version 7.2
+revision 1
categories science
platforms darwin
maintainers aronnax
@@ -39,7 +40,10 @@
port:freetype \
port:libxml2 \
port:libiconv \
- port:jbigkit
+ port:jbigkit \
+ port:zlib \
+ port:libzip \
+ port:zip
universal_variant no
@@ -74,8 +78,13 @@
set ds9arch 64x86
}
-patchfiles patch-ds9_Makefile.diff
+patchfiles patch-Makefile.diff \
+ patch-ds9_Makefile.diff
+post-patch {
+ reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/Makefile
+}
+
configure.compiler macports-gcc-4.7
# The 'configure' stage for ds9 consists of copying or symbolically linking a
Added: trunk/dports/science/ds9/files/patch-Makefile.diff
===================================================================
--- trunk/dports/science/ds9/files/patch-Makefile.diff (rev 0)
+++ trunk/dports/science/ds9/files/patch-Makefile.diff 2013-05-17 03:02:43 UTC (rev 106152)
@@ -0,0 +1,88 @@
+--- Makefile.orig 2013-05-16 19:26:06.000000000 -0700
++++ Makefile 2013-05-16 19:29:12.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 \
+ 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,7 +334,7 @@
+
+ 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/.
+
+@@ -378,14 +373,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 +389,12 @@
+ distclean : filesclean \
+ tclclean tkclean \
+ tktableclean bltclean \
+- zlibclean tclxmlclean tkimgclean tkmpegclean htmlclean \
++ tclxmlclean tkimgclean tkmpegclean htmlclean \
+ xpaclean iisclean checkdnsclean $(SIGNALCLEAN) funtoolsclean \
+ astclean wcssubsclean \
+ riceclean hcompressclean plioclean \
+ $(OPTDIRCLEAN) \
+- saotkclean zipclean zvfsclean ds9clean srcclean \
++ saotkclean zvfsclean ds9clean srcclean \
+ dirsclean
+
+ filesclean: FORCE
+@@ -429,9 +416,6 @@
+ bltclean: FORCE
+ cd $(BLTDIR); $(MAKE) distclean
+
+-zlibclean: FORCE
+- cd $(ZLIBDIR); $(MAKE) distclean
+-
+ tclxmlclean: FORCE
+ cd $(TCLXMLDIR); $(MAKE) distclean
+
+@@ -482,9 +466,6 @@
+ saotkclean : FORCE
+ cd $(SAOTKDIR); $(MAKE) distclean
+
+-zipclean: FORCE
+- cd $(ZIPDIR); PREFIX=$(root) $(MAKE) -f unix/Makefile clean
+-
+ zvfsclean: FORCE
+ cd $(ZVFSDIR); $(MAKE) distclean
+
Modified: trunk/dports/science/ds9/files/patch-ds9_Makefile.diff
===================================================================
--- trunk/dports/science/ds9/files/patch-ds9_Makefile.diff 2013-05-17 02:24:44 UTC (rev 106151)
+++ trunk/dports/science/ds9/files/patch-ds9_Makefile.diff 2013-05-17 03:02:43 UTC (rev 106152)
@@ -1,11 +1,29 @@
--- 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 @@
++++ ds9/Makefile 2013-05-16 19:46:25.000000000 -0700
+@@ -56,8 +56,6 @@
+ ../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 +140,7 @@
+ cp ds9Base ds9
+
+ ds9.zip : $(FILES)
+- cd zipdir; ../../bin/zip -r9 ../ds9.zip *
++ cd zipdir; zip -r9 ../ds9.zip *
+
+ else
+
+@@ -376,7 +374,7 @@
$(CXX) ${OPTS} \
-o $@ $(OBJS) $(LIBS) \
-L$(X11LIB) -lX11 -lXext -lXft -lXrender -lXss -lfontconfig -lfreetype \
- -lxml2 \
-+ -lxml2 -ljbig \
++ -lxml2 -ljbig -lz -lzip \
-lstdc++ -liconv
endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130516/88e205e0/attachment.html>
More information about the macports-changes
mailing list