Attachment 128054 Details for Bug 171954 – file.diff

[patch] file.diff

file.diff (text/plain), 3.72 KB, created by tkato432 on 2012-09-25 19:00:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2012-09-25 19:00:24 UTC

Size: 3.72 KB

patch

obsolete

>diff -urN /usr/ports/astro/cfitsio/Makefile astro/cfitsio/Makefile
>--- /usr/ports/astro/cfitsio/Makefile	2012-07-26 14:40:22.000000000 +0900
>+++ astro/cfitsio/Makefile	2012-09-25 03:15:28.000000000 +0900
>@@ -1,34 +1,38 @@
>-# New ports collection makefile for:	cfitsio
>-# Date created:				Fri Apr 30 16:49:36 CEST 2004
>-# Whom:					Markus Brueffer <markus@FreeBSD.org>
>-#
>+# Created by: Markus Brueffer <markus@FreeBSD.org>
> # $FreeBSD: ports/astro/cfitsio/Makefile,v 1.19 2012/07/26 05:40:22 bapt Exp $
>-#
> 
> 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@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'
>diff -urN /usr/ports/astro/cfitsio/distinfo astro/cfitsio/distinfo
>--- /usr/ports/astro/cfitsio/distinfo	2012-07-11 16:42:19.000000000 +0900
>+++ astro/cfitsio/distinfo	2012-08-10 00:49:30.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (cfitsio3300.tar.gz) = 7a2b5401c184297df1e44a4f4de564feff74d64d038918213526aa454db03f3e
>-SIZE (cfitsio3300.tar.gz) = 4660623
>+SHA256 (cfitsio3310.tar.gz) = e8a70bca202caa4773c4a50288622ef5398752de5a5e8fcfc232859f928ff5d9
>+SIZE (cfitsio3310.tar.gz) = 4664559
>diff -urN /usr/ports/astro/cfitsio/files/patch-Makefile.in astro/cfitsio/files/patch-Makefile.in
>--- /usr/ports/astro/cfitsio/files/patch-Makefile.in	1970-01-01 09:00:00.000000000 +0900
>+++ astro/cfitsio/files/patch-Makefile.in	2012-08-10 01:18:32.000000000 +0900
>@@ -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 \
>diff -urN /usr/ports/astro/cfitsio/files/patch-fpackutil.c astro/cfitsio/files/patch-fpackutil.c
>--- /usr/ports/astro/cfitsio/files/patch-fpackutil.c	1970-01-01 09:00:00.000000000 +0900
>+++ astro/cfitsio/files/patch-fpackutil.c	2012-08-10 01:29:14.000000000 +0900
>@@ -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 */
>+

Actions: View | Diff

Attachments on bug 171954: 128054