Update cfitsio to version 3.100

leaf node.  Fixes build problem seen in bulk builds.

Four years worth of changes.

8 files changed, 85 insertions, 76 deletions

diff --git a/devel/cfitsio/Makefile b/devel/cfitsio/Makefile
index ac0928179c0..e202985c05c 100644
--- a/devel/cfitsio/Makefile
+++ b/devel/cfitsio/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2008/03/03 17:45:34 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2008/12/29 10:13:12 markd Exp $
 
-DISTNAME=	cfitsio2500
-PKGNAME=	cfitsio-2.500
-PKGREVISION=	1
+DISTNAME=	cfitsio3100
+PKGNAME=	cfitsio-3.100
 CATEGORIES=	devel
 MASTER_SITES=	ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/
 
@@ -14,23 +13,26 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:C/-.*//}
 GNU_CONFIGURE=	YES
-USE_LANGUAGES=	c fortran
+USE_LANGUAGES=	c # fortran
 USE_LIBTOOL=	YES
 
+PKGCONFIG_OVERRIDE+=	cfitsio.pc.in
+
 BUILD_TARGET=	all testprog
 
 INSTALLATION_DIRS=	include lib
 
 post-build:
 	cd ${WRKSRC}; \
-	./testprog | diff - testprog.out; \
+	./testprog > /dev/null; \
 	${CMP} testprog.fit testprog.std
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/cfitsio
 	cd ${WRKSRC}; \
 	${LIBTOOL} ${INSTALL_DATA} libcfitsio.la ${DESTDIR}${PREFIX}/lib; \
-	${INSTALL_DATA} *.h ${DESTDIR}${PREFIX}/include; \
+	${INSTALL_DATA} fitsio.h fitsio2.h longnam.h drvrsmem.h ${DESTDIR}${PREFIX}/include; \
+	${INSTALL_DATA} cfitsio.pc ${DESTDIR}${PREFIX}/lib/pkgconfig; \
 	${INSTALL_DATA} fitsio.doc ${DESTDIR}${PREFIX}/share/doc/cfitsio
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cfitsio/PLIST b/devel/cfitsio/PLIST
index 078c6aa11ac..c6bce236bd8 100644
--- a/devel/cfitsio/PLIST
+++ b/devel/cfitsio/PLIST
@@ -1,17 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2005/10/23 14:02:17 rillig Exp $
-include/cfortran.h
-include/compress.h
+@comment $NetBSD: PLIST,v 1.5 2008/12/29 10:13:12 markd Exp $
 include/drvrsmem.h
-include/eval_defs.h
-include/eval_tab.h
-include/f77_wrap.h
 include/fitsio.h
 include/fitsio2.h
-include/group.h
-include/grparser.h
 include/longnam.h
-include/region.h
-include/ricecomp.h
 lib/libcfitsio.la
+lib/pkgconfig/cfitsio.pc
 share/doc/cfitsio/fitsio.doc
 @dirrm share/doc/cfitsio
diff --git a/devel/cfitsio/buildlink3.mk b/devel/cfitsio/buildlink3.mk
new file mode 100644
index 00000000000..097cc8db586
--- /dev/null
+++ b/devel/cfitsio/buildlink3.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.1 2008/12/29 10:13:12 markd Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+CFITSIO_BUILDLINK3_MK:=	${CFITSIO_BUILDLINK3_MK}+
+
+.if ${BUILDLINK_DEPTH} == "+"
+BUILDLINK_DEPENDS+=	cfitsio
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncfitsio}
+BUILDLINK_PACKAGES+=	cfitsio
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}cfitsio
+
+.if ${CFITSIO_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.cfitsio+=	cfitsio>=3.100
+BUILDLINK_PKGSRCDIR.cfitsio?=	../../devel/cfitsio
+.endif	# CFITSIO_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/cfitsio/distinfo b/devel/cfitsio/distinfo
index 00f8a04961d..af00ecc06e7 100644
--- a/devel/cfitsio/distinfo
+++ b/devel/cfitsio/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.6 2005/06/16 12:58:52 hira Exp $
+$NetBSD: distinfo,v 1.7 2008/12/29 10:13:12 markd Exp $
 
-SHA1 (cfitsio2500.tar.gz) = b9c294b3705fe40d9057877f2f11baa2f598430b
-RMD160 (cfitsio2500.tar.gz) = 4be86aa902d9a54644eeca2a6d8113a1003cc0c8
-Size (cfitsio2500.tar.gz) = 2050459 bytes
-SHA1 (patch-aa) = 7ece0dc8537ddc98f9c46d2162145590ed7a00d3
-SHA1 (patch-ab) = ecfee3ba35fdf09a47dbac9e2ab44ba8b90a226c
-SHA1 (patch-ac) = 69c816ca34b09683e01a6ab68b32f0fa2e8cfd02
+SHA1 (cfitsio3100.tar.gz) = a0586a5411e2882165d55c46e66473f555142e07
+RMD160 (cfitsio3100.tar.gz) = cd2d944ad73c74053ecd4c78b7efe5195cc8d43b
+Size (cfitsio3100.tar.gz) = 3022189 bytes
+SHA1 (patch-aa) = 1df7c1f293a1d6b7b651afda943e7243f94c7469
+SHA1 (patch-ad) = c8b232580b40c3c2a8d5b4aace74026d7b561689
diff --git a/devel/cfitsio/patches/patch-aa b/devel/cfitsio/patches/patch-aa
index 7194d9e12db..8584278eb83 100644
--- a/devel/cfitsio/patches/patch-aa
+++ b/devel/cfitsio/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/09/08 13:32:31 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2008/12/29 10:13:12 markd Exp $
 
---- Makefile.in.orig	2003-06-19 21:34:17.000000000 +0200
+--- Makefile.in.orig	2008-01-15 07:30:51.000000000 +1300
 +++ Makefile.in
-@@ -23,11 +23,12 @@ CFITSIO_INCLUDE =	@CFITSIO_PREFIX@/inclu
+@@ -29,11 +29,12 @@ INSTALL_DIRS	= $(DESTDIR)@INSTALL_ROOT@ 
  
  SHELL =		/bin/sh
  RANLIB =	@RANLIB@
@@ -17,33 +17,33 @@ $NetBSD: patch-aa,v 1.2 2004/09/08 13:32:31 wiz Exp $
  LIBS =		@LIBS@
  FLEX =		flex
  BISON =		bison
-@@ -73,46 +74,41 @@ all:
+@@ -79,53 +80,47 @@ all:
  all-nofitsio:
  		${MAKE} stand_alone "FITSIO_SRC="
  
 -stand_alone:	libcfitsio.a
 +stand_alone:	libcfitsio.la
-+
-+libcfitsio.la:	${OBJECTS}
-+		${LIBTOOL} --mode=link @CC@ -o $@ ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info 2:0
  
 -libcfitsio.a:	${OBJECTS}
 -		ar rv libcfitsio.a ${OBJECTS}; \
 -		${RANLIB} libcfitsio.a;
++libcfitsio.la:	${OBJECTS}
++		${LIBTOOL} --mode=link @CC@ -o $@ ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info 3:0
  
  shared: libcfitsio${SHLIB_SUFFIX}
  
  libcfitsio${SHLIB_SUFFIX}: ${OBJECTS}
  		${SHLIB_LD} -o $@ ${OBJECTS}
  
--install:	libcfitsio.a ${CFITSIO_LIB} ${CFITSIO_INCLUDE}
+-install:	libcfitsio.a $(INSTALL_DIRS)
 -		@if [ -f libcfitsio.a ]; then \
 -			/bin/mv libcfitsio.a ${CFITSIO_LIB}; \
 -		fi; \
 -		if [ -f libcfitsio${SHLIB_SUFFIX} ]; then \
 -			/bin/mv libcfitsio${SHLIB_SUFFIX} ${CFITSIO_LIB}; \
 -		fi; \
--		/bin/cp fitsio.h fitsio2.h longnam.h drvrsmem.h ${CFITSIO_INCLUDE}/
+-		/bin/cp fitsio.h fitsio2.h longnam.h drvrsmem.h ${CFITSIO_INCLUDE}/; \
+-		/bin/cp cfitsio.pc ${CFITSIO_LIB}/pkgconfig
 -
 -smem:		smem.o libcfitsio.a ${OBJECTS}
 -		${CC} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm
@@ -51,45 +51,58 @@ $NetBSD: patch-aa,v 1.2 2004/09/08 13:32:31 wiz Exp $
 -testprog:	testprog.o libcfitsio.a ${OBJECTS}
 -		${CC} $(CFLAGS) $(DEFS) -o testprog testprog.o -L. -lcfitsio -lm ${LIBS}
 -
+-fpack:		fpack.o fpackutil.o libcfitsio.a ${OBJECTS}
+-		${CC} $(CFLAGS) $(DEFS) -o fpack fpack.o fpackutil.o -L. -lcfitsio -lm ${LIBS}
+-
+-funpack:	funpack.o fpackutil.o libcfitsio.a ${OBJECTS}
+-		${CC} $(CFLAGS) $(DEFS) -o funpack funpack.o fpackutil.o -L. -lcfitsio -lm ${LIBS}
+-
 -fitscopy:	fitscopy.o libcfitsio.a ${OBJECTS}
 -		${CC} $(CFLAGS) $(DEFS) -o fitscopy fitscopy.o -L. -lcfitsio -lm ${LIBS}
 -
 -speed:		speed.o libcfitsio.a ${OBJECTS}
 -		${CC} $(CFLAGS) $(DEFS) -o speed speed.o -L. -lcfitsio -lm ${LIBS}
-+install:	libcfitsio.la ${CFITSIO_LIB} ${CFITSIO_INCLUDE}
++install:	libcfitsio.la $(INSTALL_DIRS)
 +		${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcfitsio.la ${CFITSIO_LIB}
 +		${BSD_INSTALL_DATA} fitsio.h fitsio2.h longnam.h drvrsmem.h ${CFITSIO_INCLUDE}/
-+
++		${BSD_INSTALL_DATA} cfitsio.pc ${CFITSIO_LIB}/pkgconfig
+ 
+-imcopy:		imcopy.o libcfitsio.a ${OBJECTS}
+-		${CC} $(CFLAGS) $(DEFS) -o imcopy imcopy.o -L. -lcfitsio -lm ${LIBS}
 +smem:		smem.o libcfitsio.la ${OBJECTS}
 +		${LD} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm
-+
+ 
+-listhead:	listhead.o libcfitsio.a ${OBJECTS}
+-		${CC} $(CFLAGS) $(DEFS) -o listhead listhead.o -L. -lcfitsio -lm ${LIBS}
 +testprog:	testprog.o libcfitsio.la ${OBJECTS}
 +		${LD} $(CFLAGS) $(DEFS) -o testprog testprog.o libcfitsio.la -lm ${LIBS}
+ 
+-cookbook:	cookbook.o libcfitsio.a ${OBJECTS}
+-		${CC} $(CFLAGS) $(DEFS) -o cookbook cookbook.o -L. -lcfitsio -lm ${LIBS}
++fpack:		fpack.o fpackutil.o libcfitsio.la ${OBJECTS}
++		${LD} $(CFLAGS) $(DEFS) -o fpack fpack.o fpackutil.o -L. -lcfitsio -lm ${LIBS}
++
++funpack:	funpack.o fpackutil.o libcfitsio.la ${OBJECTS}
++		${LD} $(CFLAGS) $(DEFS) -o funpack funpack.o fpackutil.o -L. -lcfitsio -lm ${LIBS}
 +
 +fitscopy:	fitscopy.o libcfitsio.la ${OBJECTS}
 +		${LD} $(CFLAGS) $(DEFS) -o fitscopy fitscopy.o -L. -lcfitsio -lm ${LIBS}
 +
 +speed:		speed.o libcfitsio.la ${OBJECTS}
 +		${LD} $(CFLAGS) $(DEFS) -o speed speed.o -L. -lcfitsio -lm ${LIBS}
- 
--imcopy:		imcopy.o libcfitsio.a ${OBJECTS}
--		${CC} $(CFLAGS) $(DEFS) -o imcopy imcopy.o -L. -lcfitsio -lm ${LIBS}
++
 +imcopy:		imcopy.o libcfitsio.la ${OBJECTS}
 +		${LD} $(CFLAGS) $(DEFS) -o imcopy imcopy.o -L. -lcfitsio -lm ${LIBS}
- 
--listhead:	listhead.o libcfitsio.a ${OBJECTS}
--		${CC} $(CFLAGS) $(DEFS) -o listhead listhead.o -L. -lcfitsio -lm ${LIBS}
++
 +listhead:	listhead.o libcfitsio.la ${OBJECTS}
 +		${LD} $(CFLAGS) $(DEFS) -o listhead listhead.o -L. -lcfitsio -lm ${LIBS}
- 
--cookbook:	cookbook.o libcfitsio.a ${OBJECTS}
--		${CC} $(CFLAGS) $(DEFS) -o cookbook cookbook.o -L. -lcfitsio -lm ${LIBS}
++
 +cookbook:	cookbook.o libcfitsio.la ${OBJECTS}
 +		${LD} $(CFLAGS) $(DEFS) -o cookbook cookbook.o -L. -lcfitsio -lm ${LIBS}
  
  eval:		# Rebuild eval_* files from flex/bison source
  		$(FLEX) -t eval.l > eval_l.c1
-@@ -124,7 +120,7 @@ eval:		# Rebuild eval_* files from flex/
+@@ -137,7 +132,7 @@ eval:		# Rebuild eval_* files from flex/
  		/bin/rm -f y.tab.c y.tab.h
  
  clean:
diff --git a/devel/cfitsio/patches/patch-ab b/devel/cfitsio/patches/patch-ab
deleted file mode 100644
index af7567f7e43..00000000000
--- a/devel/cfitsio/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/09/08 13:32:31 wiz Exp $
-
---- fitsio2.h.orig	2004-07-30 20:54:15.000000000 +0200
-+++ fitsio2.h
-@@ -95,6 +95,12 @@
- #define BYTESWAPPED TRUE
- #define LONGSIZE 64
- 
-+#elif defined(__alpha) && defined(__NetBSD__)
-+ 
-+#define MACHINE ALPHA_OSF
-+#define BYTESWAPPED TRUE
-+#define LONGSIZE 64
-+
- #elif defined(ultrix) && defined(unix)
-  
- #define MACHINE ULTRIX
diff --git a/devel/cfitsio/patches/patch-ac b/devel/cfitsio/patches/patch-ac
deleted file mode 100644
index bf287e5cc38..00000000000
--- a/devel/cfitsio/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/06/16 12:58:52 hira Exp $
-
---- fitsio.h.orig	2005-03-01 19:40:45.000000000 +0100
-+++ fitsio.h
-@@ -38,7 +38,7 @@
- 
- #include <stdio.h>
- 
--#if defined(linux) || defined(__APPLE__)
-+#if defined(linux) || defined(__APPLE__) || defined(__sgi)
- #  include <sys/types.h>  /* apparently needed on debian linux systems */
- #endif                    /* to define off_t                           */
- 
diff --git a/devel/cfitsio/patches/patch-ad b/devel/cfitsio/patches/patch-ad
new file mode 100644
index 00000000000..ee6430ece06
--- /dev/null
+++ b/devel/cfitsio/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2008/12/29 10:13:12 markd Exp $
+
+--- cfortran.h.orig	2008-05-20 05:28:41.000000000 +1200
++++ cfortran.h
+@@ -177,6 +177,9 @@ only C calling FORTRAN subroutines will 
+ #if defined(__APPLE__)                         /* 11/2002 (CFITSIO) */
+ #define f2cFortran
+ #endif
++#if defined(__NetBSD__)                         /* 11/2002 (CFITSIO) */
++#define f2cFortran
++#endif
+ #if defined(__hpux)             /* 921107: Use __hpux instead of __hp9000s300 */
+ #define       hpuxFortran       /*         Should also allow hp9000s7/800 use.*/
+ #endif