[148197] trunk/dports/science/cfitsio

29 Apr 2016

Revision: 148197
          https://trac.macports.org/changeset/148197
Author:   mps@macports.org
Date:     2016-04-29 06:33:14 -0700 (Fri, 29 Apr 2016)
Log Message:
-----------
cfitsio: bump to 3.390

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	2016-04-29 12:31:10 UTC (rev 148196)
+++ trunk/dports/science/cfitsio/Portfile	2016-04-29 13:33:14 UTC (rev 148197)
@@ -5,7 +5,7 @@
 PortGroup           compilers 1.0
 
 name                cfitsio
-version             3.340
+version             3.390
 categories          science
 license             zlib MIT {LGPL Noncommercial}
 platforms           darwin
@@ -29,11 +29,10 @@
 distname            ${name}[strsed ${version} {g/\.//}]
 worksrcdir          ${name}
 
-checksums           rmd160  6969940d71e4beef68daa004b5e829cd37c8a131 \
-                    sha256  a228c1867a97ec3a3b2fec133f84b529475240300f7a72f1cf2e22d00eda7bb3
+checksums           rmd160  515146dd69dfacc0a41f5d2727332c81b9fa501b \
+                    sha256  62d3d8f38890275cc7a78f5e9a4b85d7053e75ae43e988f1e2390e539ba7f409
 
-patchfiles          patch-Makefile.in.diff \
-                    patch-configure.diff
+patchfiles          patch-configure.diff
 
 compilers.choose    fc
 compilers.setup     -dragonegg
@@ -60,9 +59,6 @@
     eval xinstall -m 644 \
         ${worksrcpath}/README \
         [glob ${worksrcpath}/*.txt] \
-        [glob ${worksrcpath}/*.ps] \
-        [glob ${worksrcpath}/*.doc] \
-        [glob ${worksrcpath}/*.tex] \
         ${docdir}
 }
 

Modified: trunk/dports/science/cfitsio/files/patch-configure.diff
===================================================================
--- trunk/dports/science/cfitsio/files/patch-configure.diff	2016-04-29 12:31:10 UTC (rev 148196)
+++ trunk/dports/science/cfitsio/files/patch-configure.diff	2016-04-29 13:33:14 UTC (rev 148197)
@@ -1,28 +1,31 @@
---- configure.orig	2012-04-13 14:16:16.000000000 -0500
-+++ configure	2012-06-20 08:40:10.000000000 -0500
-@@ -3670,9 +3670,9 @@
+--- configure.orig	2016-04-29 08:11:26.000000000 -0500
++++ configure	2016-04-29 08:21:19.000000000 -0500
+@@ -4486,10 +4486,10 @@
          # Build for i386 & x86_64 architectures on Darwin 10.x or newer:
  
-         case $system in
--            Darwin-[56789]*)
+         case $host in
+-            *darwin[56789]*)
 -                ;;
              *)
-+                ;;
+-
++            ;;
 +            idontthinkso)
- 
++            
                  # Test to see whether the C compiler accepts the "-arch"
                  # flags for building "universal" binaries (Apple XCode only):
-@@ -3891,10 +3891,10 @@
-   darwin)
- 
-     case $system in
--        Darwin-[56789]*)
--            SHLIB_LD="$CC -dynamiclib"
+                 SAVE_CFLAGS="$CFLAGS"
+@@ -4723,10 +4723,10 @@
+     CFITSIO_SHLIB="lib\${PACKAGE}.\${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}\${SHLIB_SUFFIX}"
+     CFITSIO_SHLIB_SONAME="lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX}"
+     case $host in
+-        *darwin[56789]*)
+-            SHLIB_LD="$CC -dynamiclib -install_name lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
 -            ;;
-         *)
-+            SHLIB_LD="$CC -dynamiclib -install_name @@MPORTS_PREFIX@@/lib/libcfitsio.dylib"
-+            ;;
-+        idontthinkso)
+-        *)
++         *)
++             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"
+             SHLIB_LD="$CC -dynamiclib $C_UNIV_SWITCH -headerpad_max_install_names -install_name @rpath/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
              ;;

    

mps＠macports.org

tags

participants (1)