Update to 2.500 (should fix bulk build).

Changes since 2.037: 4 years of active development, and about 1000 lines
of NEWS included in changes.txt in the archive.

5 files changed, 87 insertions, 31 deletions

diff --git a/devel/cfitsio/Makefile b/devel/cfitsio/Makefile
index 5f11aa1c11c..9f7f24de03b 100644
--- a/devel/cfitsio/Makefile
+++ b/devel/cfitsio/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:13:28 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/09/08 13:32:31 wiz Exp $
 
-DISTNAME=	cfitsio2037
-PKGNAME=	cfitsio-2.0.37
+DISTNAME=	cfitsio2500
+PKGNAME=	cfitsio-2.500
 CATEGORIES=	devel
 MASTER_SITES=	ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/
 
 MAINTAINER=	tron@NetBSD.org
-HOMEPAGE=	http://legacy.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
+HOMEPAGE=	http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
 COMMENT=	FITS (flexible image transport system) file input and output
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:C/-.*//}
diff --git a/devel/cfitsio/PLIST b/devel/cfitsio/PLIST
index 3f7299efa0b..d684a0f93e9 100644
--- a/devel/cfitsio/PLIST
+++ b/devel/cfitsio/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:22:44 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/09/08 13:32:31 wiz Exp $
 lib/libcfitsio.a
 lib/libcfitsio.la
 lib/libcfitsio.so
@@ -14,9 +14,7 @@ include/fitsio.h
 include/fitsio2.h
 include/grparser.h
 include/group.h
-include/imcompress.h
 include/region.h
-include/pctype.h
 include/longnam.h
 include/ricecomp.h
 share/doc/cfitsio/fitsio.doc
diff --git a/devel/cfitsio/distinfo b/devel/cfitsio/distinfo
index 7c88e2d7cf7..8edad53bdf1 100644
--- a/devel/cfitsio/distinfo
+++ b/devel/cfitsio/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 00:44:13 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/09/08 13:32:31 wiz Exp $
 
-SHA1 (cfitsio2037.tar.gz) = 2a662db36ff8c927eb5b4e93e966ac39b35b44a9
-Size (cfitsio2037.tar.gz) = 1946415 bytes
-SHA1 (patch-aa) = c7eed82f4d49a63b195cb573ee9099b37eb76845
-SHA1 (patch-ab) = 12ac770326f04a762de6276a2e9405bb6778100f
+SHA1 (cfitsio2500.tar.gz) = b9c294b3705fe40d9057877f2f11baa2f598430b
+Size (cfitsio2500.tar.gz) = 2050459 bytes
+SHA1 (patch-aa) = 7ece0dc8537ddc98f9c46d2162145590ed7a00d3
+SHA1 (patch-ab) = ecfee3ba35fdf09a47dbac9e2ab44ba8b90a226c
diff --git a/devel/cfitsio/patches/patch-aa b/devel/cfitsio/patches/patch-aa
index aed1a6402e6..7194d9e12db 100644
--- a/devel/cfitsio/patches/patch-aa
+++ b/devel/cfitsio/patches/patch-aa
@@ -1,13 +1,14 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/07/31 16:47:04 tron Exp $
+$NetBSD: patch-aa,v 1.2 2004/09/08 13:32:31 wiz Exp $
 
---- Makefile.in.orig	Fri Feb  4 04:11:21 2000
-+++ Makefile.in	Mon Jul 31 18:38:07 2000
-@@ -21,11 +21,11 @@
+--- Makefile.in.orig	2003-06-19 21:34:17.000000000 +0200
++++ Makefile.in
+@@ -23,11 +23,12 @@ CFITSIO_INCLUDE =	@CFITSIO_PREFIX@/inclu
  
  SHELL =		/bin/sh
  RANLIB =	@RANLIB@
 -CC =		@CC@
-+CC =		${LIBTOOL} @CC@
++CC =		${LIBTOOL} --mode=compile @CC@
++LD =		${LIBTOOL} --mode=link @CC@
  CFLAGS =	@CFLAGS@
  FC =		@FC@
  LDFLAGS =	$(CFLAGS)
@@ -16,27 +17,84 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/07/31 16:47:04 tron Exp $
  LIBS =		@LIBS@
  FLEX =		flex
  BISON =		bison
-@@ -72,11 +72,10 @@
+@@ -73,46 +74,41 @@ 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 2:0
  
- install:	libcfitsio.a
- 		/bin/mv libcfitsio.a ${FTOOLS_LIB}
-@@ -86,7 +85,7 @@
- 		${CC} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm
+ shared: libcfitsio${SHLIB_SUFFIX}
+ 
+ libcfitsio${SHLIB_SUFFIX}: ${OBJECTS}
+ 		${SHLIB_LD} -o $@ ${OBJECTS}
  
- testprog:	testprog.o libcfitsio.a ${OBJECTS}
+-install:	libcfitsio.a ${CFITSIO_LIB} ${CFITSIO_INCLUDE}
+-		@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}/
+-
+-smem:		smem.o libcfitsio.a ${OBJECTS}
+-		${CC} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm
+-
+-testprog:	testprog.o libcfitsio.a ${OBJECTS}
 -		${CC} $(CFLAGS) $(DEFS) -o testprog testprog.o -L. -lcfitsio -lm ${LIBS}
-+		${CC} $(CFLAGS) $(DEFS) -o testprog testprog.o libcfitsio.la -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}
++		${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcfitsio.la ${CFITSIO_LIB}
++		${BSD_INSTALL_DATA} fitsio.h fitsio2.h longnam.h drvrsmem.h ${CFITSIO_INCLUDE}/
++
++smem:		smem.o libcfitsio.la ${OBJECTS}
++		${LD} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm
++
++testprog:	testprog.o libcfitsio.la ${OBJECTS}
++		${LD} $(CFLAGS) $(DEFS) -o testprog testprog.o libcfitsio.la -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/
+ 		/bin/rm -f y.tab.c y.tab.h
+ 
+ clean:
+-	-	/bin/rm -f *.o libcfitsio.a libcfitsio${SHLIB_SUFFIX} \
++	-	/bin/rm -f *.o libcfitsio.la libcfitsio${SHLIB_SUFFIX} \
+ 			smem testprog y.output
  
- fitscopy:	fitscopy.o libcfitsio.a ${OBJECTS}
- 		${CC} $(CFLAGS) $(DEFS) -o fitscopy fitscopy.o -L. -lcfitsio -lm ${LIBS}
+ distclean:	clean
diff --git a/devel/cfitsio/patches/patch-ab b/devel/cfitsio/patches/patch-ab
index 5d8dd30d8ea..af7567f7e43 100644
--- a/devel/cfitsio/patches/patch-ab
+++ b/devel/cfitsio/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2000/12/27 02:01:47 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2004/09/08 13:32:31 wiz Exp $
 
---- fitsio2.h.orig	Tue Jan 11 17:12:13 2000
+--- fitsio2.h.orig	2004-07-30 20:54:15.000000000 +0200
 +++ fitsio2.h
-@@ -68,6 +68,12 @@
+@@ -95,6 +95,12 @@
  #define BYTESWAPPED TRUE
  #define LONGSIZE 64