[148468] trunk/dports/science/cfitsio

[jeremyhu at macports.org]

Revision: 148468
          https://trac.macports.org/changeset/148468
Author:   jeremyhu at macports.org
Date:     2016-05-09 22:48:48 -0700 (Mon, 09 May 2016)
Log Message:
-----------
cfitsio: Fix build failure on older systems that don't support cp -a

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

Modified: trunk/dports/science/cfitsio/Portfile
===================================================================
--- trunk/dports/science/cfitsio/Portfile	2016-05-10 05:40:48 UTC (rev 148467)
+++ trunk/dports/science/cfitsio/Portfile	2016-05-10 05:48:48 UTC (rev 148468)
@@ -32,7 +32,7 @@
 checksums           rmd160  515146dd69dfacc0a41f5d2727332c81b9fa501b \
                     sha256  62d3d8f38890275cc7a78f5e9a4b85d7053e75ae43e988f1e2390e539ba7f409
 
-patchfiles          patch-configure.diff
+patchfiles          patch-configure.diff patch-Makefile.in.diff
 
 compilers.choose    fc
 compilers.setup     -dragonegg

Modified: trunk/dports/science/cfitsio/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/science/cfitsio/files/patch-Makefile.in.diff	2016-05-10 05:40:48 UTC (rev 148467)
+++ trunk/dports/science/cfitsio/files/patch-Makefile.in.diff	2016-05-10 05:48:48 UTC (rev 148468)
@@ -1,15 +1,11 @@
 --- Makefile.in.orig	2012-07-17 15:38:34.000000000 -0500
 +++ Makefile.in	2012-10-08 18:42:23.000000000 -0500
-@@ -91,10 +91,10 @@
+@@ -110,7 +110,7 @@ lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
+ 		fi
  
- install:	libcfitsio.a $(INSTALL_DIRS)
- 		@if [ -f libcfitsio.a ]; then \
--			/bin/mv libcfitsio.a ${CFITSIO_LIB}; \
-+			/bin/cp libcfitsio.a ${CFITSIO_LIB}; \
- 		fi; \
- 		if [ -f libcfitsio${SHLIB_SUFFIX} ]; then \
--			/bin/mv libcfitsio${SHLIB_SUFFIX} ${CFITSIO_LIB}; \
-+			/bin/cp libcfitsio${SHLIB_SUFFIX} ${CFITSIO_LIB}; \
- 		fi; \
- 		/bin/cp fitsio.h fitsio2.h longnam.h drvrsmem.h ${CFITSIO_INCLUDE}/; \
+ install:	lib${PACKAGE}.a ${INSTALL_DIRS}
+-		/bin/cp -a lib${PACKAGE}* ${CFITSIO_LIB}
++		/bin/cp -pPR lib${PACKAGE}* ${CFITSIO_LIB}
+ 		/bin/cp fitsio.h fitsio2.h longnam.h drvrsmem.h ${CFITSIO_INCLUDE}
  		/bin/cp cfitsio.pc ${CFITSIO_LIB}/pkgconfig
+ 		@for task in ${FPACK_UTILS} ${UTILS}; do \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160509/539aec47/attachment.html>