svn commit: r308052 - in head/astro/cfitsio: . files
Armin Pirkovitsch
sperber at FreeBSD.org
Sat Dec 1 00:00:27 UTC 2012
Author: sperber
Date: Sat Dec 1 00:00:26 2012
New Revision: 308052
URL: http://svnweb.freebsd.org/changeset/ports/308052
Log:
- Update to version 3.310
- Update MASTER_SITES
- Add LICENSE
- Add MAKE_JOBS_SAFE
- Trim Makefile header
PR: ports/171954
Submitted by: KATO Tsuguru <tkato432 _at_ yahoo.com>
Approved by: beat (mentor)
Feature safe: yes
Added:
head/astro/cfitsio/files/
head/astro/cfitsio/files/patch-Makefile.in (contents, props changed)
head/astro/cfitsio/files/patch-fpackutil.c (contents, props changed)
Modified:
head/astro/cfitsio/Makefile (contents, props changed)
head/astro/cfitsio/distinfo (contents, props changed)
Modified: head/astro/cfitsio/Makefile
==============================================================================
--- head/astro/cfitsio/Makefile Sat Dec 1 00:00:20 2012 (r308051)
+++ head/astro/cfitsio/Makefile Sat Dec 1 00:00:26 2012 (r308052)
@@ -1,34 +1,38 @@
-# New ports collection makefile for: cfitsio
-# Date created: Fri Apr 30 16:49:36 CEST 2004
-# Whom: Markus Brueffer <markus at FreeBSD.org>
-#
+# Created by: Markus Brueffer <markus at FreeBSD.org>
# $FreeBSD$
-#
PORTNAME= cfitsio
-PORTVERSION= 3.300
+PORTVERSION= 3.310
CATEGORIES= astro
-MASTER_SITES= ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/ \
- ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/oldvers/
+MASTER_SITES= ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/%SUBDIR%/ \
+ http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/%SUBDIR%/
+MASTER_SITE_SUBDIR= . oldvers
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}
MAINTAINER= ports at FreeBSD.org
COMMENT= Library for reading and writing files in FITS data format
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/License.txt
+
LIB_DEPENDS= f2c:${PORTSDIR}/lang/f2c
OPTIONS_DEFINE= DOCS
WRKSRC= ${WRKDIR}/${PORTNAME}
+USE_PKGCONFIG= build
GNU_CONFIGURE= yes
CONFIGURE_ARGS= ac_cv_prog_FC="f2c"
ALL_TARGET= shared
USE_LDCONFIG= yes
-USE_PKGCONFIG= yes
+MAKE_JOBS_SAFE= yes
.include <bsd.port.options.mk>
+post-extract:
+ @cd ${WRKSRC} && ${MV} zlib.h zlib.h.dist
+
post-patch:
@${GREP} -lR "<malloc.\h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
's|<malloc\.h>|<stdlib.h>|g'
Modified: head/astro/cfitsio/distinfo
==============================================================================
--- head/astro/cfitsio/distinfo Sat Dec 1 00:00:20 2012 (r308051)
+++ head/astro/cfitsio/distinfo Sat Dec 1 00:00:26 2012 (r308052)
@@ -1,2 +1,2 @@
-SHA256 (cfitsio3300.tar.gz) = 7a2b5401c184297df1e44a4f4de564feff74d64d038918213526aa454db03f3e
-SIZE (cfitsio3300.tar.gz) = 4660623
+SHA256 (cfitsio3310.tar.gz) = e8a70bca202caa4773c4a50288622ef5398752de5a5e8fcfc232859f928ff5d9
+SIZE (cfitsio3310.tar.gz) = 4664559
Added: head/astro/cfitsio/files/patch-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/astro/cfitsio/files/patch-Makefile.in Sat Dec 1 00:00:26 2012 (r308052)
@@ -0,0 +1,22 @@
+--- Makefile.in.orig 2012-07-18 05:38:34.000000000 +0900
++++ Makefile.in 2012-08-10 01:18:07.000000000 +0900
+@@ -52,9 +52,7 @@
+ 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 zuncompress.c zcompress.c \
+- adler32.c crc32.c inffast.c inftrees.c trees.c zutil.c \
+- deflate.c infback.c inflate.c uncompr.c \
++ pliocomp.c fits_hcompress.c fits_hdecompress.c zuncompress.c zcompress.c
+
+ SOURCES = ${CORE_SOURCES} @F77_WRAPPERS@
+
+@@ -87,7 +85,7 @@
+ shared: libcfitsio${SHLIB_SUFFIX}
+
+ libcfitsio${SHLIB_SUFFIX}: ${OBJECTS}
+- ${SHLIB_LD} ${LDFLAGS} -o $@ ${OBJECTS} -lm ${LIBS}
++ ${SHLIB_LD} ${LDFLAGS} -o $@ ${OBJECTS} -lm -lz ${LIBS}
+
+ install: libcfitsio.a $(INSTALL_DIRS)
+ @if [ -f libcfitsio.a ]; then \
Added: head/astro/cfitsio/files/patch-fpackutil.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/astro/cfitsio/files/patch-fpackutil.c Sat Dec 1 00:00:26 2012 (r308052)
@@ -0,0 +1,10 @@
+--- fpackutil.c.orig 2012-07-18 05:36:42.000000000 +0900
++++ fpackutil.c 2012-08-10 01:28:12.000000000 +0900
+@@ -5,6 +5,7 @@
+ #include <time.h>
+ #include <float.h>
+ #include <signal.h>
++#include <ctype.h>
+
+ /* #include "bzlib.h" only for experimental purposes */
+
More information about the svn-ports-all
mailing list