[79558] trunk/dports/science/cfitsio

[ryandesign at macports.org]

Revision: 79558
          http://trac.macports.org/changeset/79558
Author:   ryandesign at macports.org
Date:     2011-06-18 02:14:28 -0700 (Sat, 18 Jun 2011)
Log Message:
-----------
cfitsio: update to 3.280, disable new upstream code that interferes with MacPorts arch selection code

Modified Paths:
--------------
    trunk/dports/science/cfitsio/Portfile
    trunk/dports/science/cfitsio/files/patch-configure.diff

Modified: trunk/dports/science/cfitsio/Portfile
===================================================================
--- trunk/dports/science/cfitsio/Portfile	2011-06-18 07:12:52 UTC (rev 79557)
+++ trunk/dports/science/cfitsio/Portfile	2011-06-18 09:14:28 UTC (rev 79558)
@@ -3,7 +3,7 @@
 PortSystem        1.0
 
 name              cfitsio
-version           3.270
+version             3.280
 categories        science
 platforms         darwin
 maintainers       nomaintainer
@@ -25,9 +25,8 @@
 worksrcdir        ${name}
 #dist_subdir       ${name}/${version}_${revision}
 
-checksums         md5 2a72b323de3f40ad1a671f2167500336 \
-                  sha1 af959982ba76fce8dd01897ea95cbeb4536424cb \
-                  rmd160 ebcf0c5e22263089680a99ba2db2991e37ba2695
+checksums           sha1    1f86e23808c68dc5aa144bd2622de0189beadead \
+                    rmd160  66df553d36e1ea51261a9fa6407760014487c535
 
 patchfiles        patch-configure.diff
 

Modified: trunk/dports/science/cfitsio/files/patch-configure.diff
===================================================================
--- trunk/dports/science/cfitsio/files/patch-configure.diff	2011-06-18 07:12:52 UTC (rev 79557)
+++ trunk/dports/science/cfitsio/files/patch-configure.diff	2011-06-18 09:14:28 UTC (rev 79558)
@@ -1,11 +1,28 @@
---- configure	2011-01-15 16:28:28.000000000 -0600
-+++ configure	2011-01-15 16:28:41.000000000 -0600
-@@ -3769,7 +3769,7 @@
-     SHLIB_SUFFIX=".dll"
-     ;;
+--- configure.orig	2011-05-13 12:58:22.000000000 -0500
++++ configure	2011-06-18 04:10:13.000000000 -0500
+@@ -3600,9 +3600,9 @@
+         # Build for i386 & x86_64 architectures on Darwin 10.x or newer:
+ 
+         case $system in
+-            Darwin-[56789]*)
+-                ;;
+             *)
++                ;;
++            idontthinkso)
+ 
+                 # Test to see whether the C compiler accepts the "-arch"
+                 # flags for building "universal" binaries (Apple XCode only):
+@@ -3823,10 +3823,10 @@
    darwin)
--    SHLIB_LD="$CC -dynamiclib"
-+    SHLIB_LD="$CC -dynamiclib -install_name @@MPORTS_PREFIX@@/lib/libcfitsio.dylib"
-     SHLIB_SUFFIX=".dylib"
-     lhea_shlib_cflags="-fPIC -fno-common"
-     ;;
+ 
+     case $system in
+-        Darwin-[56789]*)
+-            SHLIB_LD="$CC -dynamiclib"
+-            ;;
+         *)
++            SHLIB_LD="$CC -dynamiclib -install_name @@MPORTS_PREFIX@@/lib/libcfitsio.dylib"
++            ;;
++        idontthinkso)
+             # Build for i386 & x86_64 architectures on Darwin 10.x or newer:
+             SHLIB_LD="$CC -dynamiclib $C_UNIV_SWITCH"
+             ;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110618/e6305b7d/attachment.html>