[30984] trunk/dports/devel/cfitsio

[source_changes at macosforge.org]

Revision: 30984
          http://trac.macosforge.org/projects/macports/changeset/30984
Author:   ryandesign at macports.org
Date:     2007-11-12 23:53:18 -0800 (Mon, 12 Nov 2007)

Log Message:
-----------
cfitsio:

 * update to 3.060
 * install documentation to a versioned directory
 * use their "make install" now (patched to support DESTDIR)

See #12350.

Modified Paths:
--------------
    trunk/dports/devel/cfitsio/Portfile

Added Paths:
-----------
    trunk/dports/devel/cfitsio/files/patch-Makefile.in.diff

Removed Paths:
-------------
    trunk/dports/devel/cfitsio/files/patch-configure

Modified: trunk/dports/devel/cfitsio/Portfile
===================================================================
--- trunk/dports/devel/cfitsio/Portfile	2007-11-13 07:46:58 UTC (rev 30983)
+++ trunk/dports/devel/cfitsio/Portfile	2007-11-13 07:53:18 UTC (rev 30984)
@@ -2,7 +2,7 @@
 
 PortSystem			1.0
 name				cfitsio
-version				3.040
+version				3.060
 categories			devel
 maintainers			nomaintainer
 description			C/Fortran access to FITS data files
@@ -20,32 +20,32 @@
 
 homepage			http://heasarc.gsfc.nasa.gov/fitsio/
 master_sites		ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/
-distname			${name}3040
+distname			${name}[strsed ${version} {g/\.//}]
 
 worksrcdir			${name}
 
-checksums			md5 ae8e5e7e3d38cf5de7d1228b40faa62d
+checksums \
+	${distname}${extract.suffix} \
+		md5 b7ab291d227c60b17a19a1c028dc649c \
+		sha1 ec92c0d4402d2a7cf13f514c1be77665c43e0147 \
+		rmd160 2c85f7fe1ddce8f83d5b2bdbf30c681fe0db0d87
 
-# For the g77 compiler
 depends_build		port:gcc42
 
-patchfiles			patch-configure
+patchfiles			patch-Makefile.in.diff
 
 configure.cflags	-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 configure.fc		${prefix}/bin/gfortran-mp-4.2
 
 build.target		all shared
 
-destroot {
-	xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
-	xinstall -m 644 -W ${worksrcpath} libcfitsio.a libcfitsio.dylib \
-		${destroot}${prefix}/lib
+post-destroot {
 	system "ranlib ${destroot}${prefix}/lib/libcfitsio.a"
-	xinstall -m 644 -W ${worksrcpath} fitsio.h fitsio2.h longnam.h \
-		drvrsmem.h ${destroot}${prefix}/include
-	eval xinstall -m 644 README [glob ${worksrcpath}/*.txt] \
+	set docdir ${destroot}${prefix}/share/doc/${name}-${version}
+	xinstall -m 755 -d ${docdir}
+	eval xinstall -m 644 ${worksrcpath}/README [glob ${worksrcpath}/*.txt] \
 		[glob ${worksrcpath}/*.ps] [glob ${worksrcpath}/*.doc] \
 		[glob ${worksrcpath}/*.toc] [glob ${worksrcpath}/*.tex] \
-		${destroot}${prefix}/share/doc/${name}
+		${docdir}
 }
 

Added: trunk/dports/devel/cfitsio/files/patch-Makefile.in.diff
===================================================================
--- trunk/dports/devel/cfitsio/files/patch-Makefile.in.diff	                        (rev 0)
+++ trunk/dports/devel/cfitsio/files/patch-Makefile.in.diff	2007-11-13 07:53:18 UTC (rev 30984)
@@ -0,0 +1,17 @@
+--- Makefile.in.orig	2007-11-13 01:43:12.000000000 -0600
++++ Makefile.in	2007-11-13 01:45:35.000000000 -0600
+@@ -20,10 +20,11 @@
+ 
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
++DESTDIR		=
+ CFITSIO_PREFIX	= $(prefix)
+-CFITSIO_LIB	= $(exec_prefix)/lib
+-CFITSIO_INCLUDE	= $(prefix)/include
+-INSTALL_DIRS	= @INSTALL_ROOT@ ${CFITSIO_LIB} ${CFITSIO_LIB}/pkgconfig ${CFITSIO_INCLUDE}
++CFITSIO_LIB	= $(DESTDIR)$(exec_prefix)/lib
++CFITSIO_INCLUDE	= $(DESTDIR)$(prefix)/include
++INSTALL_DIRS	= $(DESTDIR)@INSTALL_ROOT@ ${CFITSIO_LIB} ${CFITSIO_LIB}/pkgconfig ${CFITSIO_INCLUDE}
+ 
+ 
+ SHELL =		/bin/sh

Deleted: trunk/dports/devel/cfitsio/files/patch-configure
===================================================================
--- trunk/dports/devel/cfitsio/files/patch-configure	2007-11-13 07:46:58 UTC (rev 30983)
+++ trunk/dports/devel/cfitsio/files/patch-configure	2007-11-13 07:53:18 UTC (rev 30984)
@@ -1,11 +0,0 @@
---- configure.orig	2004-07-26 12:22:09.000000000 -0600
-+++ configure	2006-01-18 01:14:59.000000000 -0700
-@@ -1220,7 +1220,7 @@
-     SHLIB_SUFFIX=".dll"
-     ;;
-   darwin)
--    SHLIB_LD="cc -dynamiclib"
-+    SHLIB_LD="cc -dynamiclib -Wl,-install_name,\${CFITSIO_LIB}/libcfitsio\${SHLIB_SUFFIX}"
-     SHLIB_SUFFIX=".dylib"
-     lhea_shlib_cflags="-fPIC -fno-common"
-     ;;

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071112/2480672b/attachment.html