Version bump, removed some older versions

(Portage version: 2.1.4.4)

6 files changed, 276 insertions, 404 deletions

diff --git a/sci-libs/cfitsio/ChangeLog b/sci-libs/cfitsio/ChangeLog
index fb47506bd669..6c86cf8307f8 100644
--- a/sci-libs/cfitsio/ChangeLog
+++ b/sci-libs/cfitsio/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-libs/cfitsio
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/ChangeLog,v 1.19 2008/06/13 07:11:19 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/ChangeLog,v 1.20 2008/06/18 21:47:57 bicatali Exp $
+
+*cfitsio-3.090 (18 Jun 2008)
+
+  18 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/cfitsio-3.006-configure.patch,
+  -files/cfitsio-3.060-autotools.patch,
+  +files/cfitsio-3.090-autotools.patch, -cfitsio-3.006.ebuild,
+  -cfitsio-3.060.ebuild, +cfitsio-3.090.ebuild:
+  Version bump, removed some older versions
 
   13 Jun 2008; Stephanie Lockwood-Childs <wormo@gentoo.org>
   cfitsio-2.510-r2.ebuild, cfitsio-3.080.ebuild:
diff --git a/sci-libs/cfitsio/cfitsio-3.006.ebuild b/sci-libs/cfitsio/cfitsio-3.006.ebuild
deleted file mode 100644
index 524211c345ca..000000000000
--- a/sci-libs/cfitsio/cfitsio-3.006.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-3.006.ebuild,v 1.5 2008/05/31 13:26:35 markusle Exp $
-
-inherit eutils multilib toolchain-funcs
-
-IUSE="doc"
-
-DESCRIPTION="C and Fortran library for manipulating FITS files"
-HOMEPAGE="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
-SRC_URI="ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${PN}${PV//.}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND="virtual/libc"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-configure.patch || die "epatch failed"
-}
-
-src_compile() {
-	econf --host=${CHOST} --prefix="${D}"usr --libdir="${D}"usr/$(get_libdir) || die "econf failed"
-	make || die "make failed"
-	make shared fitscopy imcopy listhead
-}
-
-src_install () {
-	dodir /usr/include
-	dolib.so libcfitsio.so.*
-	dolib.a libcfitsio.a
-	dobin fitscopy imcopy listhead
-	dodoc changes.txt README
-
-	if use doc; then
-		dodoc *.ps cookbook.*
-	fi
-
-	insinto /usr/include
-	doins fitsio.h fitsio2.h longnam.h drvrsmem.h
-	cd "${D}"/usr/$(get_libdir)
-	    dosym libcfitsio.so.0.0 /usr/$(get_libdir)/libcfitsio.so
-	    dosym libcfitsio.so.0.0 /usr/$(get_libdir)/libcfitsio.so.0
-}
diff --git a/sci-libs/cfitsio/cfitsio-3.060.ebuild b/sci-libs/cfitsio/cfitsio-3.090.ebuild
index 207cc499de54..83a3de67cc79 100644
--- a/sci-libs/cfitsio/cfitsio-3.060.ebuild
+++ b/sci-libs/cfitsio/cfitsio-3.090.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-3.060.ebuild,v 1.2 2008/01/24 15:18:58 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-3.090.ebuild,v 1.1 2008/06/18 21:47:57 bicatali Exp $
 
 inherit eutils fortran autotools
 
@@ -8,12 +8,13 @@ DESCRIPTION="C and Fortran library for manipulating FITS files"
 HOMEPAGE="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
 SRC_URI="ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${PN}${PV//.}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc fortran"
 
 DEPEND="fortran? ( dev-lang/cfortran )"
+RDEPEND=""
 
 S="${WORKDIR}/${PN}"
 
@@ -43,22 +44,9 @@ src_compile() {
 	emake || die "emake failed"
 }
 
-src_test() {
-	einfo "Testing cfitsio"
-	./testprog > testprog.lis
-	diff testprog.lis testprog.out || die "test failed"
-	cmp testprog.fit testprog.std  || die "failed"
-	if use fortran; then
-		einfo "Testing cfitsio fortran wrappers"
-		./testf77 > testf77.lis
-		diff testf77.lis testf77.out || die "test failed"
-		cmp testf77.fit testf77.std  || die "failed"
-	fi
-}
-
 src_install () {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc changes.txt README License.txt cfitsio.doc || die "dodoc failed"
+	dodoc changes.txt README cfitsio.doc || die "dodoc failed"
 	insinto /usr/share/doc/${PF}/examples
 	doins cookbook.c testprog.c speed.c smem.c || die "install examples failed"
 	use doc && dodoc cfitsio.ps quick.ps
diff --git a/sci-libs/cfitsio/files/cfitsio-3.006-configure.patch b/sci-libs/cfitsio/files/cfitsio-3.006-configure.patch
deleted file mode 100644
index 285f9811c806..000000000000
--- a/sci-libs/cfitsio/files/cfitsio-3.006-configure.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- Makefile.in.orig	2006-05-16 20:54:31.000000000 -0700
-+++ Makefile.in	2006-05-16 20:56:02.000000000 -0700
-@@ -19,8 +19,8 @@
- #
- 
- CFITSIO_PREFIX	= @CFITSIO_PREFIX@
--CFITSIO_LIB	= ${CFITSIO_PREFIX}/lib
--CFITSIO_INCLUDE	= ${CFITSIO_PREFIX}/include
-+CFITSIO_LIB	= ${CFITSIO_PREFIX}/${LIBDIR}
-+CFITSIO_INCLUDE	= ${CFITSIO_PREFIX}/${INCLUDEDIR}
- 
- SHELL =		/bin/sh
- RANLIB =	@RANLIB@
-@@ -146,4 +146,4 @@
- objs: ${CORE_OBJECTS}
- 
- ${CFITSIO_PREFIX} ${CFITSIO_LIB} ${CFITSIO_INCLUDE}:
--	@if [ ! -d $@ ]; then mkdir $@; fi
-+	@if [ ! -d $@ ]; then mkdir -p $@; fi
---- configure.orig	2006-05-16 20:54:04.000000000 -0700
-+++ configure	2006-05-16 21:13:01.000000000 -0700
-@@ -1252,6 +1252,8 @@
-     ;;
-   lnx)
-     SHLIB_LD=":"
-+    LD_FLAGS="-shared -Wl,-soname,libcfitsio.so.0.0"
-+    SHLIB_SUFFIX=".so.0.0"
-     ;;
-   osf)
-     SHLIB_LD="ld -shared -expect_unresolved '*'"
-@@ -1271,7 +1273,7 @@
- # Darwin uses gcc (=cc), but needs different flags (see above)
- # if test "x$GCC" = xyes; then
- if test "x$GCC" = xyes && test "x$EXT" != xdarwin && test "x$EXT" != xcygwin; then
--  SHLIB_LD="$CC -shared"
-+  SHLIB_LD="gcc -shared -Wl,-soname,libcfitsio.so.0.0"
-   lhea_shlib_cflags='-fPIC'
- fi
- if test "x$lhea_shlib_cflags" != x; then
diff --git a/sci-libs/cfitsio/files/cfitsio-3.060-autotools.patch b/sci-libs/cfitsio/files/cfitsio-3.060-autotools.patch
deleted file mode 100644
index f454bfca83ce..000000000000
--- a/sci-libs/cfitsio/files/cfitsio-3.060-autotools.patch
+++ /dev/null
@@ -1,298 +0,0 @@
---- Makefile.am 	1970-01-01 01:00:00.000000000 +0100
-+++ Makefile.am	2008-01-24 14:48:14.000000000 +0000
-@@ -0,0 +1,44 @@
-+lib_LTLIBRARIES = libcfitsio.la
-+
-+C_SOURCES = \
-+	buffers.c cfileio.c checksum.c compress.c drvrfile.c drvrmem.c \
-+	drvrnet.c drvrsmem.c drvrgsiftp.c editcol.c edithdu.c eval_l.c \
-+	eval_y.c eval_f.c fitscore.c getcol.c getcolb.c getcold.c getcole.c \
-+	getcoli.c getcolj.c getcolk.c getcoll.c getcols.c getcolsb.c \
-+	getcoluk.c getcolui.c getcoluj.c getkey.c group.c grparser.c \
-+	histo.c iraffits.c \
-+	modkey.c putcol.c putcolb.c putcold.c putcole.c putcoli.c \
-+	putcolj.c putcolk.c putcoluk.c putcoll.c putcols.c putcolsb.c \
-+	putcolu.c putcolui.c putcoluj.c putkey.c region.c scalnull.c \
-+	swapproc.c wcssub.c wcsutil.c imcompress.c quantize.c ricecomp.c \
-+	pliocomp.c fits_hcompress.c fits_hdecompress.c
-+
-+F77_SOURCES=
-+if ENABLE_FORTRAN
-+F77_SOURCES += f77_wrap1.c f77_wrap2.c f77_wrap3.c f77_wrap4.c f77_wrap.h
-+endif
-+
-+include_HEADERS = fitsio.h fitsio2.h longnam.h drvrsmem.h
-+libcfitsio_la_SOURCES = $(C_SOURCES) $(F77_SOURCES) $(include_HEADERS)
-+libcfitsio_la_LDFLAGS = -no-undefined -version-info 3:0:0
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = cfitsio.pc
-+
-+LDADD = libcfitsio.la
-+noinst_PROGRAMS = testprog speed cookbook smem
-+bin_PROGRAMS = fitscopy imcopy listhead
-+
-+testprog_SOURCES = testprog.c
-+speed_SOURCES = speed.c
-+cookbook_SOURCES = cookbook.c
-+smem_SOURCES = smem.c
-+
-+fitscopy_SOURCES = fitscopy.c
-+listhead_SOURCES = listhead.c
-+imcopy_SOURCES = imcopy.c
-+
-+if ENABLE_FORTRAN
-+noinst_PROGRAMS += testf77
-+testf77_SOURCES = testf77.f
-+endif
---- configure.ac 	1970-01-01 01:00:00.000000000 +0100
-+++ configure.ac	2008-01-24 14:46:39.000000000 +0000
-@@ -0,0 +1,230 @@
-+AC_PREREQ(2.59)
-+AC_INIT(cfitsio, 3.060, pence@tetra.gsfc.nasa.gov)
-+AC_CONFIG_SRCDIR([fitscore.c])
-+AM_INIT_AUTOMAKE([foreign])
-+
-+AC_PROG_LIBTOOL
-+SHARED_VERSION_INFO="3:0:0"
-+AC_MSG_CHECKING([whether to enable fortran api])
-+AC_ARG_ENABLE([fortran],
-+	      AS_HELP_STRING([--enable-fortran], [Build the fortran API]),
-+	      [ENABLE_FORTRAN=$enableval 
-+	       AC_MSG_RESULT([$enableval])],
-+	      [ENABLE_FORTRAN=no
-+	       AC_MSG_RESULT([no])])
-+
-+if test x"$ENABLE_FORTRAN" = "xyes" ; then
-+  AC_PROG_F77
-+  if test $F77 = 'g77'; then
-+      cfortran_def=g77Fortran
-+  elif test $F77 = 'ifort' ; then
-+      cfortran_def=INTEL_COMPILER
-+  elif test $F77 = 'gfortran' ; then
-+      cfortran_def=gFortran
-+  elif test $F77 = 'pgif77' ; then
-+      cfortran_def=pgiFortran
-+  else
-+      cfortran_def=f2cFortran
-+  fi
-+  CFORTRAN_CPPFLAGS="-D$cfortran_def"
-+fi
-+
-+AC_SUBST([ENABLE_FORTRAN])
-+AM_CONDITIONAL([ENABLE_FORTRAN], test "x$ENABLE_FORTRAN" = "xyes")
-+
-+# taken from original configure.in
-+# determine system type
-+#--------------------------------------------------------------------
-+
-+AC_PROGRAM_CHECK(uname_found, uname, 1, 0)
-+if test $uname_found -eq 0 ; then
-+    echo "cfitsio: No uname found; setting system type to unknown."
-+    system="unknown"
-+else
-+    system=`uname -s`-`uname -r`
-+fi
-+case $system in
-+    Darwin-*)
-+	# For large file support (but may break Absoft compilers):
-+	AC_DEFINE(_LARGEFILE_SOURCE)
-+	AC_DEFINE(_FILE_OFFSET_BITS,64)
-+	;;
-+    HP-UX-*)
-+	if test x"$CFORTRAN_CPPFLAGS" = x ; then
-+		CFORTRAN_CPPFLAGS="-Dappendus"
-+	fi
-+	CPPFLAGS="$CPPFLAGS -DPG_PPU"
-+	LIBPRE="-Wl,"
-+	;;
-+    SunOS-5*)
-+	if test x"$CFORTRAN_CPPFLAGS" = x ; then
-+		CFORTRAN_CPPFLAGS="-Dsolaris"
-+	fi
-+	# For large file support:
-+	AC_DEFINE(_LARGEFILE_SOURCE)
-+	AC_DEFINE(_FILE_OFFSET_BITS, 64)
-+	;;
-+    IRIX*)
-+	CPPFLAGS="$CPPFLAGS -DHAVE_POSIX_SIGNALS"
-+	;;
-+    Linux*)
-+	AC_DEFINE(_LARGEFILE_SOURCE)
-+	AC_DEFINE(_FILE_OFFSET_BITS,64)
-+	;;
-+    CYGWIN*)
-+	CPPFLAGS="$CPPFLAGS -DHAVE_POSIX_SIGNALS"
-+	;;
-+    *)
-+	;;
-+esac
-+
-+if test x"$ENABLE_FORTRAN" = "xyes" ; then
-+   CPPFLAGS="$CPPFLAGS $CFORTRAN_CPPFLAGS"
-+fi
-+
-+case $CC in
-+	gcc)
-+		GCCVERSION="`gcc -dumpversion 2>&1`"
-+		AC_SUBST(GCCVERSION)
-+		changequote(,)
-+		if test `echo $GCCVERSION | grep -c '2\.[45678]'` -gt 0
-+		then
-+		    CFLAGS=`echo $CFLAGS | sed 's:-O[^ ]* *::'`
-+#		    AC_MSG_WARN(This gcc is pretty old. Disabling optimization to be safe.)
-+		fi
-+		changequote([,])
-+		;;
-+	cc)
-+		echo "cfitsio: Old CFLAGS is $CFLAGS"
-+		CFLAGS=`echo $CFLAGS | sed -e "s/-g/-O/"`
-+		case $system in
-+		    SunOS-5*)
-+			changequote(,)
-+			if test `echo $CFLAGS | grep -c fast` -gt 0
-+			then
-+			   echo "cfitsio: Replacing -fast with -O3"
-+			   CFLAGS=`echo $CFLAGS | sed 's:-fast:-O3:'`
-+			fi
-+			changequote([,])
-+			CFLAGS="$CFLAGS -DHAVE_ALLOCA_H -DHAVE_POSIX_SIGNALS"
-+			;;
-+		    *)
-+			echo "== No special changes for $system"
-+			;;
-+		esac
-+		echo "New CFLAGS is $CFLAGS"
-+		;;
-+	*)
-+		# Don't do anything now
-+		;;
-+esac
-+
-+
-+# ================= test for the unix ftruncate function ================
-+
-+AC_MSG_CHECKING("whether ftruncate works")
-+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>
-+]], [[
-+ftruncate(0, 0);
-+]])],[
-+AC_DEFINE(HAVE_FTRUNCATE)
-+AC_MSG_RESULT("yes")
-+],[AC_MSG_RESULT("no") ])
-+
-+# ---------------------------------------------------------
-+# some systems define long long for 64-bit ints
-+# ---------------------------------------------------------
-+
-+AC_MSG_CHECKING("whether long long is defined")
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
-+]], [[
-+long long filler;
-+]])],[
-+AC_DEFINE(HAVE_LONGLONG)
-+AC_MSG_RESULT("yes")
-+],[AC_MSG_RESULT("no") ])
-+
-+# ==================== SHARED MEMORY DRIVER SECTION =======================
-+#
-+# 09-Mar-98 : modified by JB/ISDC
-+# 3 checks added to support autoconfiguration of shared memory
-+# driver. First generic check is made whether shared memory is supported
-+# at all, then 2 more specific checks are made (architecture dependent).
-+# Currently tested on : sparc-solaris, intel-linux, sgi-irix, dec-alpha-osf
-+
-+# -------------------------------------------------------------------------
-+# check is System V IPC is supported on this machine
-+# -------------------------------------------------------------------------
-+
-+AC_MSG_CHECKING("whether system V style IPC services are supported")
-+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/ipc.h>
-+#include <sys/shm.h>
-+#include <sys/sem.h>
-+]], [[
-+shmat(0, 0, 0);
-+shmdt(0);
-+shmget(0, 0, 0);
-+semget(0, 0, 0);
-+]])],
-+[AC_DEFINE(HAVE_SHMEM_SERVICES)
-+AC_MSG_RESULT("yes")],
-+[AC_MSG_RESULT("no") ])
-+
-+
-+# -------------------------------------------------------------------------
-+# some systems define flock_t, for others we have to define it ourselves
-+# -------------------------------------------------------------------------
-+
-+AC_MSG_CHECKING("do we have flock_t defined in sys/fcntl.h")
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/fcntl.h>
-+]], [[
-+flock_t filler;
-+]])],[
-+AC_DEFINE(HAVE_FLOCK_T)
-+AC_MSG_RESULT("yes")
-+],[AC_MSG_RESULT("no") ])
-+
-+if test "$HAVE_FLOCK_T" != 1; then
-+   AC_MSG_CHECKING("do we have flock_t defined in sys/flock.h")
-+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/flock.h>
-+   ]], [[
-+   flock_t filler;
-+   ]])],[
-+   AC_DEFINE(HAVE_FLOCK_T)
-+   AC_MSG_RESULT("yes")
-+   ],[AC_MSG_RESULT("no") ])
-+fi
-+
-+# -------------------------------------------------------------------------
-+# there are some idiosyncrasies with semun defs (used in semxxx). Solaris
-+# does not define it at all
-+# -------------------------------------------------------------------------
-+
-+AC_MSG_CHECKING("do we have union semun defined")
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/ipc.h>
-+#include <sys/shm.h>
-+#include <sys/sem.h>
-+]], [[
-+union semun filler;
-+]])],[
-+AC_DEFINE(HAVE_UNION_SEMUN)
-+AC_MSG_RESULT("yes")
-+],[AC_MSG_RESULT("no") ])
-+
-+# ==================== END OF SHARED MEMORY DRIVER SECTION ================
-+# ================= test for the unix networking functions ================
-+
-+AC_SEARCH_LIBS([gethostbyname], [nsl], cfitsio_have_nsl=1, cfitsio_have_nsl=0)
-+AC_SEARCH_LIBS([connect], [socket], cfitsio_have_socket=1,
-+	       cfitsio_have_socket=0, [-lnsl])
-+
-+if test "$cfitsio_have_nsl" = 1 -a "$cfitsio_have_socket" = 1; then
-+   AC_DEFINE(HAVE_NET_SERVICES)
-+fi
-+
-+# ==================== END OF unix networking SECTION ================
-+
-+# this quick check will add -lm to LIBS
-+AC_CHECK_LIB(m, cos)
-+AC_CONFIG_FILES([Makefile cfitsio.pc])
-+AC_OUTPUT
---- cfitsio.pc.in.orig	2006-07-24 15:35:56.000000000 +0100
-+++ cfitsio.pc.in	2008-01-24 14:23:31.000000000 +0000
-@@ -1,10 +1,10 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=${exec_prefix}/lib
--includedir=${prefix}/include
-+libdir=@libdir@
-+includedir=@includedir@
- 
--Name: cfitsio
-+Name: @PACKAGE_NAME@
- Description: FITS File Subroutine Library
--Version: 3.006
--Libs: -L${libdir} -lcfitsio @LIBS@ -lm
-+Version: @PACKAGE_VERSION@
-+Libs: -L${libdir} -lcfitsio @LIBS@
- Cflags: -I${includedir}
diff --git a/sci-libs/cfitsio/files/cfitsio-3.090-autotools.patch b/sci-libs/cfitsio/files/cfitsio-3.090-autotools.patch
new file mode 100644
index 000000000000..10726e9e1b79
--- /dev/null
+++ b/sci-libs/cfitsio/files/cfitsio-3.090-autotools.patch
@@ -0,0 +1,261 @@
+--- configure.ac.absent	1970-01-01 01:00:00.000000000 +0100
++++ configure.ac	2008-06-02 01:08:32.000000000 +0100
+@@ -0,0 +1,158 @@
++AC_PREREQ(2.59)
++AC_INIT([cfitsio], [3.090], [pence@tetra.gsfc.nasa.gov])
++AC_CONFIG_SRCDIR([fitscore.c])
++AM_INIT_AUTOMAKE([foreign])
++
++
++AC_PROG_LIBTOOL
++dnl no api version info, so simply copy package version
++SHARED_VERSION_INFO="3:0:0"
++AC_SUBST(SHARED_VERSION_INFO)
++
++AC_PROG_YACC
++AC_PROG_LEX
++
++AC_MSG_CHECKING([whether to enable fortran interface])
++AC_ARG_ENABLE([fortran],
++   AS_HELP_STRING([--enable-fortran], [Build the fortran interface]),
++   [ENABLE_FORTRAN=$enableval
++    AC_MSG_RESULT([$enableval])],
++   [ENABLE_FORTRAN=no 
++    AC_MSG_RESULT([no])]
++)
++
++if test x"$ENABLE_FORTRAN" = x"yes" ; then
++  AC_PROG_F77
++  if test x$F77 = xg77; then
++      cfortran_def=g77Fortran
++  elif test x$F77 = xifort ; then
++      cfortran_def=INTEL_COMPILER
++  elif test x$F77 = xgfortran ; then
++      cfortran_def=gFortran
++  elif test x$F77 = xpgf77 ; then
++      cfortran_def=pgiFortran
++  else
++      cfortran_def=f2cFortran
++  fi
++  CPPFLAGS_FORTRAN="-D$cfortran_def"
++  AC_SUBST(CPPFLAGS_FORTRAN)
++fi
++AC_SUBST([ENABLE_FORTRAN])
++AM_CONDITIONAL([ENABLE_FORTRAN], test "x$ENABLE_FORTRAN" = "xyes")
++
++AC_CANONICAL_HOST
++case $host in
++    *apple*darwin*)
++	dnl may break Absoft compilers
++	AC_DEFINE(_LARGEFILE_SOURCE, [1], 
++		  [Define to 1 if you have large file support])
++	AC_DEFINE(_FILE_OFFSET_BITS, [64],
++ 		  [Offsets bits in files])
++	;;
++    *hppa*)
++	CPPFLAGS_EXTRA="-DPG_PPU"
++	;;
++    *sunos5*)
++	AC_DEFINE(_LARGEFILE_SOURCE, [1], 
++		  [Define to 1 if you have large file support])
++	AC_DEFINE(_FILE_OFFSET_BITS, [64],
++ 		  [Offsets bits in files])
++	CPPFLAGS_EXTRA="-DHAVE_ALLOCA_H -DHAVE_POSIX_SIGNALS"
++	;;
++    *irix*)
++	CPPFLAGS_EXTRA="-DHAVE_POSIX_SIGNALS"
++	;;
++    *linux*)
++	AC_DEFINE(_LARGEFILE_SOURCE, [1], 
++		  [Define to 1 if you have large file support])
++	AC_DEFINE(_FILE_OFFSET_BITS, [64],
++ 		  [Offsets bits in files])
++	;;
++    *cygwin*)
++	CPPFLAGS_EXTRA="-DHAVE_POSIX_SIGNALS"
++	;;
++    *)
++	;;
++esac
++AC_SUBST(CPPFLAGS_EXTRA)
++
++AC_CHECK_FUNCS([ftruncate])
++AC_CHECK_FUNCS([shmat shmdt shmget], 
++    AC_DEFINE(HAVE_SHMEM_SERVICES, [1],
++	[Define to yes if you have shared memory functions])
++)
++AC_CHECK_FUNCS([gethostbyname connect],
++   [AC_DEFINE(HAVE_NET_SERVICES, [1], 
++       [Define to 1 if you have network functions])]
++)
++AC_CHECK_TYPE(long long,
++   [AC_DEFINE(HAVE_LONGLONG, [1], 
++   	[Define to 1 if your compiler supports long long])]
++)
++dnl check for flock_t
++AC_COMPILE_IFELSE(
++	[AC_LANG_PROGRAM([[
++#include <sys/fcntl.h>
++			]], [[
++flock_t filler;
++			]])],
++	[AC_DEFINE(HAVE_FLOCK_T, 1, [if you have flock_t])
++	 AC_MSG_RESULT("yes")],
++	[AC_MSG_RESULT("no") ])
++
++if test "$HAVE_FLOCK_T" != 1; then
++   AC_COMPILE_IFELSE([
++	AC_LANG_PROGRAM([[
++#include <sys/flock.h>
++			]], [[
++flock_t filler;
++			]])],
++	[AC_DEFINE(HAVE_FLOCK_T, 1, [if you have flock_t])
++	 AC_MSG_RESULT("yes")],
++	[AC_MSG_RESULT("no") ])
++fi
++
++# check for union semun type
++AC_CHECK_TYPE(union semun,
++   AC_DEFINE(HAVE_UNION_SEMUN, [1],
++	[Define to 1 if you have semun in sys/sem.h]),,[
++#include <sys/types.h>
++#include <sys/ipc.h>
++#include <sys/sem.h>
++		]
++)
++
++dnl this quick check will add -lm to LIBS
++AC_CHECK_LIB(m, cos)
++
++AC_ARG_WITH(gsiftp-flavour,
++  [ --with-gsiftp-flavour[[=PATH]] Enable Globus Toolkit gsiftp protocol support ],
++  [ if test "x$withval" != "xno"; then
++
++        if test "x$withval" != "xyes" ; then
++            GSIFTP_FLAVOUR=${withval}
++        fi
++        AC_DEFINE(GSIFTP_FLAVOUR, [1], 
++	    [Define to 1 if you want Globus Toolkit architecture])
++    fi
++  ]
++)
++
++AC_ARG_WITH(gsiftp,
++    [ --with-gsiftp[[=PATH]] Enable Globus Toolkit gsiftp protocol support ],
++    [ if test "x$withval" != "xno"; then
++        if test "x$withval" != "xyes" ; then
++            CPPFLAGS_GLOBUS="-I${withval}/include/${GSIFTP_FLAVOUR}"
++            LIBS_GLOBUS="-L${withval}/lib -lglobus_ftp_client_${GSIFTP_FLAVOUR}"
++            HAVE_GSIFTP=yes
++        fi
++        AC_DEFINE(HAVE_GSIFTP, [1],
++	    [Define if you want Globus Toolkit gsiftp protocol support])
++    fi
++  ]
++)
++
++AC_SUBST(CPPFLAGS_GLOBUS)
++AC_SUBST(LIBS_GLOBUS)
++AC_CONFIG_FILES([Makefile cfitsio.pc])
++AC_OUTPUT
+--- Makefile.am.absent	1970-01-01 01:00:00.000000000 +0100
++++ Makefile.am	2008-06-02 01:07:45.000000000 +0100
+@@ -0,0 +1,79 @@
++lib_LTLIBRARIES = libcfitsio.la
++
++C_SOURCES = \
++	buffers.c cfileio.c checksum.c compress.c drvrfile.c drvrmem.c \
++	drvrnet.c drvrsmem.c drvrgsiftp.c editcol.c edithdu.c eval_l.c \
++	eval_y.c eval_f.c fitscore.c getcol.c getcolb.c getcold.c getcole.c \
++	getcoli.c getcolj.c getcolk.c getcoll.c getcols.c getcolsb.c \
++	getcoluk.c getcolui.c getcoluj.c getkey.c group.c grparser.c \
++	histo.c iraffits.c \
++	modkey.c putcol.c putcolb.c putcold.c putcole.c putcoli.c \
++	putcolj.c putcolk.c putcoluk.c putcoll.c putcols.c putcolsb.c \
++	putcolu.c putcolui.c putcoluj.c putkey.c region.c scalnull.c \
++	swapproc.c wcssub.c wcsutil.c imcompress.c quantize.c ricecomp.c \
++	pliocomp.c fits_hcompress.c fits_hdecompress.c
++
++F77_SOURCES=
++if ENABLE_FORTRAN
++F77_SOURCES += f77_wrap1.c f77_wrap2.c f77_wrap3.c f77_wrap4.c f77_wrap.h
++endif
++AM_YFLAGS = -d -v
++
++include_HEADERS = fitsio.h fitsio2.h longnam.h drvrsmem.h
++libcfitsio_la_SOURCES = $(C_SOURCES) $(F77_SOURCES) $(include_HEADERS)
++libcfitsio_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
++libcfitsio_la_CPPFLAGS = @CPPFLAGS_FORTRAN@ @CPPFLAGS_EXTRA@ @CPPFLAGS_GLOBUS@
++libcfitsio_la_LIBADD = @LIBS_GLOBUS@
++
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = cfitsio.pc
++
++LDADD = libcfitsio.la
++bin_PROGRAMS = fitscopy imcopy listhead
++fitscopy_SOURCES = fitscopy.c
++listhead_SOURCES = listhead.c
++imcopy_SOURCES = imcopy.c
++
++# tests
++check_PROGRAMS = testprog
++noinst_PROGRAMS =  speed cookbook smem
++testprog_SOURCES = testprog.c
++speed_SOURCES = speed.c
++cookbook_SOURCES = cookbook.c
++smem_SOURCES = smem.c
++
++if ENABLE_FORTRAN
++check_PROGRAMS += testf77
++testf77_SOURCES = testf77.f
++endif
++
++check-local: $(check_PROGRAMS)
++	@total=0; failed=0; \
++	for i in $(check_PROGRAMS); do \
++		echo "--- Testing $$i ---"; \
++		./$$i${EXEEXT} > my_$$i.out; \
++		diff $$i.out my_$$i.out; \
++		cmp $$i.fit $$i.std; \
++		if [ "x$$?" = "x0" ]; then \
++			echo "Test \`$$i' PASSED."; \
++		else \
++			echo "Test \`$$i' FAILED!!!"; \
++			failed=$$(($$failed + 1)); \
++		fi; \
++		total=$$(($$total + 1)); \
++	done; \
++	if [ $$failed -gt 0 ]; then \
++		echo "*** ERROR: $$failed/$$total tests failed!!!"; \
++		echo ""; \
++		exit 1; \
++	fi
++
++eval:
++	@$(LEX) -t eval.l > eval_l.c1; \
++	sed -e 's/yy/ff/g' -e 's/YY/FF/g' eval_l.c1 > eval_l.c; \
++	rm -f eval_l.c1; \
++	$(YACC) -d -v -y eval.y; \
++	sed -e 's/yy/ff/g' -e 's/YY/FF/g' y.tab.c > eval_y.c; \
++	sed -e 's/yy/ff/g' -e 's/YY/FF/g' y.tab.h > eval_tab.h; \
++	rm -f y.tab.c y.tab.h
+--- cfitsio.pc.in.orig	2008-06-02 01:20:50.000000000 +0100
++++ cfitsio.pc.in	2008-06-02 01:22:14.000000000 +0100
+@@ -1,10 +1,10 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=${exec_prefix}/lib
+-includedir=${prefix}/include
++libdir=@libdir@
++includedir=@includedir@
+ 
+-Name: cfitsio
++Name: @PACKAGE_NAME@
+ Description: FITS File Subroutine Library
+-Version: 3.006
+-Libs: -L${libdir} -lcfitsio @LIBS@ -lm
++Version: @PACKAGE_VERSION@
++Libs: -L${libdir} -lcfitsio @LIBS@
+ Cflags: -I${includedir}