diff options
| -rw-r--r-- | devel/cfitsio/Makefile | 4 | ||||
| -rw-r--r-- | devel/cfitsio/PLIST | 3 | ||||
| -rw-r--r-- | devel/cfitsio/distinfo | 12 | ||||
| -rw-r--r-- | devel/cfitsio/patches/patch-aa | 128 |
4 files changed, 73 insertions, 74 deletions
diff --git a/devel/cfitsio/Makefile b/devel/cfitsio/Makefile index 6a9036c86a4..2f437991adb 100644 --- a/devel/cfitsio/Makefile +++ b/devel/cfitsio/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.29 2015/04/08 16:23:27 hiramatsu Exp $ +# $NetBSD: Makefile,v 1.30 2016/06/18 09:06:11 mef Exp $ -DISTNAME= cfitsio3370 +DISTNAME= cfitsio3390 PKGNAME= ${DISTNAME:S/o3/o-3./} CATEGORIES= devel MASTER_SITES= http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/ diff --git a/devel/cfitsio/PLIST b/devel/cfitsio/PLIST index 1a21a0ae981..ea7301eb61b 100644 --- a/devel/cfitsio/PLIST +++ b/devel/cfitsio/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.7 2015/04/08 16:23:27 hiramatsu Exp $ +@comment $NetBSD: PLIST,v 1.8 2016/06/18 09:06:11 mef Exp $ +bin/testprog include/drvrsmem.h include/fitsio.h include/fitsio2.h diff --git a/devel/cfitsio/distinfo b/devel/cfitsio/distinfo index e412b16cda5..89f8f2129c3 100644 --- a/devel/cfitsio/distinfo +++ b/devel/cfitsio/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.13 2015/11/03 03:27:18 agc Exp $ +$NetBSD: distinfo,v 1.14 2016/06/18 09:06:11 mef Exp $ -SHA1 (cfitsio3370.tar.gz) = 48bd6389dcff3228508eec70384f2cae3a88ff32 -RMD160 (cfitsio3370.tar.gz) = 709e2d3e9d69abe84f93a8cbc343f05eddedf8b9 -SHA512 (cfitsio3370.tar.gz) = 97c820757513ac0c59c277b39b8f8a6d1cbc1b2d37ca8ee68d645533a37d25fcdba87e676eaaf3cfa557c34591e9476326d892e0f8c42d3e1372e1d6a4406d18 -Size (cfitsio3370.tar.gz) = 4738430 bytes -SHA1 (patch-aa) = f0942f57ba02fe62d373cbfe9315b3e1f87ab05f +SHA1 (cfitsio3390.tar.gz) = 818ee00793ae27dfc75752c2415d0a7230ad5066 +RMD160 (cfitsio3390.tar.gz) = 515146dd69dfacc0a41f5d2727332c81b9fa501b +SHA512 (cfitsio3390.tar.gz) = 9e72fe58e1b2e45dfad23c5a60f9056a4e958b3b567751c5284d5d89992f0a2721aa44ede8655f0e1595eaea9d6ba4644b001c54274764f9d05f890d471e4534 +Size (cfitsio3390.tar.gz) = 4755390 bytes +SHA1 (patch-aa) = cacbc44cd442096d094faef79a2bb47980df8543 SHA1 (patch-ad) = 761aedc2ae885c119ac2726ba89aaa7c193a8834 diff --git a/devel/cfitsio/patches/patch-aa b/devel/cfitsio/patches/patch-aa index 72dc88f4342..80d75b88f0a 100644 --- a/devel/cfitsio/patches/patch-aa +++ b/devel/cfitsio/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.5 2015/04/08 16:23:28 hiramatsu Exp $ +$NetBSD: patch-aa,v 1.6 2016/06/18 09:06:11 mef Exp $ Use libtool. ---- Makefile.in.orig 2014-06-04 03:51:29.000000000 +0900 -+++ Makefile.in 2015-04-08 21:11:43.000000000 +0900 -@@ -34,12 +34,13 @@ +--- Makefile.in.orig 2016-04-02 04:06:28.000000000 +0900 ++++ Makefile.in 2016-06-18 17:30:44.000000000 +0900 +@@ -37,14 +37,15 @@ INSTALL_DIRS = @INSTALL_ROOT@ ${CFITSIO_ SHELL = /bin/sh ARCHIVE = @ARCHIVE@ RANLIB = @RANLIB@ @@ -12,92 +12,90 @@ Use libtool. +CC = ${LIBTOOL} --mode=compile @CC@ +LD = ${LIBTOOL} --mode=link @CC@ CFLAGS = @CFLAGS@ + CPPFLAGS = @CPPFLAGS@ SSE_FLAGS = @SSE_FLAGS@ FC = @FC@ - LDFLAGS = $(CFLAGS) + LDFLAGS = @LDFLAGS@ + LDFLAGS_BIN = @LDFLAGS_BIN@ -DEFS = @DEFS@ +DEFS = @DEFS@ -Dunix LIBS = @LIBS@ FLEX = flex BISON = bison -@@ -89,11 +90,10 @@ +@@ -94,11 +95,11 @@ all: all-nofitsio: ${MAKE} stand_alone "FITSIO_SRC=" --stand_alone: libcfitsio.a -+stand_alone: libcfitsio.la +-stand_alone: lib${PACKAGE}.a ++stand_alone: lib${PACKAGE}.la --libcfitsio.a: ${OBJECTS} -- ${ARCHIVE} libcfitsio.a ${OBJECTS}; \ -- ${RANLIB} libcfitsio.a; -+libcfitsio.la: ${OBJECTS} +-lib${PACKAGE}.a: ${OBJECTS} +- ${ARCHIVE} $@ ${OBJECTS}; \ +- ${RANLIB} $@; ++lib${PACKAGE}.la: ${OBJECTS} ++ ${ARCHIVE} $lib${PACKAGE}.la ${OBJECTS}; \ + ${LIBTOOL} --mode=link @CC@ -o $@ ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info 3:0 - shared: libcfitsio${SHLIB_SUFFIX} + shared: lib${PACKAGE}${SHLIB_SUFFIX} -@@ -104,10 +104,10 @@ +@@ -109,10 +110,10 @@ lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS} ln -sf ${CFITSIO_SHLIB_SONAME} $@; \ fi --install: libcfitsio.a $(INSTALL_DIRS) -- /bin/cp -a libcfitsio* ${CFITSIO_LIB} +-install: lib${PACKAGE}.a ${INSTALL_DIRS} +- /bin/cp -a lib${PACKAGE}* ${CFITSIO_LIB} - /bin/cp fitsio.h fitsio2.h longnam.h drvrsmem.h ${CFITSIO_INCLUDE} - /bin/cp cfitsio.pc ${CFITSIO_LIB}/pkgconfig -+install: libcfitsio.la $(INSTALL_DIRS) ++install: lib${PACKAGE}.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 - - .c.o: - $(CC) -c -o ${<D}/${@F} $(CFLAGS) $(DEFS) $< -@@ -115,32 +115,32 @@ + @for task in ${FPACK_UTILS} ${UTILS}; do \ + if [ -f $$task ]; then \ + if [ ! -d ${CFITSIO_BIN} ]; then mkdir -p ${CFITSIO_BIN}; fi; \ +@@ -133,29 +134,29 @@ utils: ${FPACK_UTILS} ${UTILS} swapproc.o: swapproc.c - $(CC) -c $(CFLAGS) $(SSE_FLAGS) $(DEFS) $< + ${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $< --smem: smem.o libcfitsio.a ${OBJECTS} -- ${CC} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm -+smem: smem.o libcfitsio.la ${OBJECTS} +-smem: smem.o lib${PACKAGE}.a ${OBJECTS} +- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ++smem: smem.o lib${PACKAGE}.la ${OBJECTS} + ${LD} $(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} -+testprog: testprog.o libcfitsio.la ${OBJECTS} -+ ${LD} $(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 libcfitsio.a -lm ${LIBS} -+fpack: fpack.o fpackutil.o libcfitsio.la ${OBJECTS} -+ ${LD} $(CFLAGS) $(DEFS) -o fpack fpack.o fpackutil.o libcfitsio.a -lm ${LIBS} - --funpack: funpack.o fpackutil.o libcfitsio.a ${OBJECTS} -- ${CC} $(CFLAGS) $(DEFS) -o funpack funpack.o fpackutil.o libcfitsio.a -lm ${LIBS} -+funpack: funpack.o fpackutil.o libcfitsio.la ${OBJECTS} -+ ${LD} $(CFLAGS) $(DEFS) -o funpack funpack.o fpackutil.o libcfitsio.a -lm ${LIBS} - --fitscopy: fitscopy.o libcfitsio.a ${OBJECTS} -- ${CC} $(CFLAGS) $(DEFS) -o fitscopy fitscopy.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.a ${OBJECTS} -- ${CC} $(CFLAGS) $(DEFS) -o speed speed.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} +-testprog: testprog.o lib${PACKAGE}.a ${OBJECTS} +- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} ++testprog: testprog.o lib${PACKAGE}.la ${OBJECTS} ++ ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} + +-fpack: fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS} +- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS} ++fpack: fpack.o fpackutil.o lib${PACKAGE}.la ${OBJECTS} ++ ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS} + +-funpack: funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS} +- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS} ++funpack: funpack.o fpackutil.o lib${PACKAGE}.la ${OBJECTS} ++ ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS} + +-fitscopy: fitscopy.o lib${PACKAGE}.a ${OBJECTS} +- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} ++fitscopy: fitscopy.o lib${PACKAGE}.la ${OBJECTS} ++ ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} + +-speed: speed.o lib${PACKAGE}.a ${OBJECTS} +- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} ++speed: speed.o lib${PACKAGE}.la ${OBJECTS} ++ ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} + +-imcopy: imcopy.o lib${PACKAGE}.a ${OBJECTS} +- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} ++imcopy: imcopy.o lib${PACKAGE}.la ${OBJECTS} ++ ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} + +-cookbook: cookbook.o lib${PACKAGE}.a ${OBJECTS} +- ${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} ++cookbook: cookbook.o lib${PACKAGE}.la ${OBJECTS} ++ ${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS} eval: # Rebuild eval_* files from flex/bison source - $(FLEX) -t eval.l > eval_l.c1 + ${FLEX} -t eval.l > eval_l.c1 |