1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00

- Update to 3.360

- Build and install static library
- Bump PORTREVISION for astro/cfitsio shlib change

Changes:	http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/docs/changes.txt
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2014-05-04 15:37:11 +00:00
parent 05328dea7c
commit d21f8c4177
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=352962
12 changed files with 26 additions and 54 deletions

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= cfitsio
PORTVERSION= 3.350
PORTREVISION= 1
PORTVERSION= 3.360
CATEGORIES= astro
MASTER_SITES= http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/ \
http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/oldvers/ \
@ -21,29 +20,32 @@ LIB_DEPENDS= libf2c.so:${PORTSDIR}/lang/f2c
OPTIONS_DEFINE= DOCS
ALL_TARGET= shared
CONFIGURE_ARGS= ac_cv_prog_FC="f2c"
ALL_TARGET= libcfitsio.a shared
CFLAGS+= -I${INCLUDEDIR}
CONFIGURE_ARGS= ZLIB_SOURCES="" ac_cv_prog_FC=f2c
GNU_CONFIGURE= yes
LDFLAGS+= -L${LIBDIR} -lz
USE_LDCONFIG= yes
USES= pkgconfig
WRKSRC= ${WRKDIR}/${PORTNAME}
PLIST_SUB= SHLIB_VER=${SHLIB_VER}
PLIST_SUB= SHLIB_MAJOR_VER=${SHLIB_MAJOR_VER} \
SHLIB_MINOR_VER=${SHLIB_MINOR_VER}
PORTDOCS= *
SHLIB_VER= 1.${PORTVERSION:S/0$//}
SHLIB_MAJOR_VER=2
SHLIB_MINOR_VER=${PORTVERSION:S/0$//}
post-patch:
@${MV} ${WRKSRC}/zlib.h ${WRKSRC}/zlib.h.dist
@${GREP} -lR "<malloc.\h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g'
@${REINPLACE_CMD} -e 's|$${ZLIB_SOURCES[:=a-z\.]*}||' ${WRKSRC}/Makefile.in
do-install:
cd ${WRKSRC}/ && ${INSTALL_DATA} drvrsmem.h fitsio.h fitsio2.h longnam.h ${STAGEDIR}${PREFIX}/include/
cd ${WRKSRC}/ && ${INSTALL_LIB} libcfitsio.so.${SHLIB_VER} ${STAGEDIR}${PREFIX}/lib/
cd ${WRKSRC}/ && ${INSTALL_LIB} libcfitsio.a libcfitsio.so.${SHLIB_MAJOR_VER}.${SHLIB_MINOR_VER} ${STAGEDIR}${PREFIX}/lib/
cd ${WRKSRC}/ && ${INSTALL_DATA} cfitsio.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
${LN} -fs libcfitsio.so.${SHLIB_VER} ${STAGEDIR}${PREFIX}/lib/libcfitsio.so.1
${LN} -fs libcfitsio.so.1 ${STAGEDIR}${PREFIX}/lib/libcfitsio.so
${LN} -fs libcfitsio.so.${SHLIB_MAJOR_VER}.${SHLIB_MINOR_VER} ${STAGEDIR}${PREFIX}/lib/libcfitsio.so.${SHLIB_MAJOR_VER}
${LN} -fs libcfitsio.so.${SHLIB_MAJOR_VER} ${STAGEDIR}${PREFIX}/lib/libcfitsio.so
${MKDIR} ${STAGEDIR}${DOCSDIR}/
${INSTALL_DATA} ${WRKSRC}/*.doc ${STAGEDIR}${DOCSDIR}/
${INSTALL_DATA} ${WRKSRC}/docs/*.doc ${STAGEDIR}${DOCSDIR}/
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (cfitsio3350.tar.gz) = eb195f227a21cb5c1334c14ec5de3cc1cfbea6255c772f62e3fb5111b078af0e
SIZE (cfitsio3350.tar.gz) = 4655732
SHA256 (cfitsio3360.tar.gz) = dffa8429fb561de3bae6eccc872298cb1305732e28bee96c6c6c29368e1171dc
SIZE (cfitsio3360.tar.gz) = 4650206

View File

@ -1,22 +0,0 @@
--- Makefile.in.orig 2013-07-09 00:43:01.000000000 +0800
+++ Makefile.in 2013-11-25 05:28:16.512550644 +0800
@@ -60,9 +60,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@
@@ -95,7 +93,7 @@
shared: libcfitsio${SHLIB_SUFFIX}
libcfitsio${SHLIB_SUFFIX}: ${OBJECTS}
- ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm ${LIBS}
+ ${SHLIB_LD} ${LDFLAGS} -o ${CFITSIO_SHLIB} ${OBJECTS} -lm -lz ${LIBS}
@if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
ln -sf ${CFITSIO_SHLIB_SONAME} $@; \

View File

@ -1,10 +0,0 @@
--- 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 */

View File

@ -2,7 +2,8 @@ include/drvrsmem.h
include/fitsio.h
include/fitsio2.h
include/longnam.h
lib/libcfitsio.a
lib/libcfitsio.so
lib/libcfitsio.so.1
lib/libcfitsio.so.%%SHLIB_VER%%
lib/libcfitsio.so.%%SHLIB_MAJOR_VER%%
lib/libcfitsio.so.%%SHLIB_MAJOR_VER%%.%%SHLIB_MINOR_VER%%
libdata/pkgconfig/cfitsio.pc

View File

@ -2,6 +2,7 @@
PORTNAME= kstars
PORTVERSION= ${KDE4_VERSION}
PORTREVISION= 1
CATEGORIES= astro kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}

View File

@ -3,7 +3,7 @@
PORTNAME= Astro-FITS-CFITSIO
PORTVERSION= 1.10
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= astro perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-

View File

@ -3,7 +3,7 @@
PORTNAME= wcslib
PORTVERSION= 4.13.4
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= astro
MASTER_SITES= ftp://ftp.atnf.csiro.au/pub/software/wcslib/

View File

@ -3,7 +3,7 @@
PORTNAME= gdal
PORTVERSION= 1.11.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= graphics geography
MASTER_SITES= http://download.osgeo.org/gdal/${PORTVERSION}/ \
ftp://ftp.remotesensing.org/pub/gdal/${PORTVERSION}/ \

View File

@ -3,7 +3,7 @@
PORTNAME= ufraw
PORTVERSION= 0.19.2
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}

View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-fits
PORTVERSION= 1.0.3
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

View File

@ -3,7 +3,7 @@
PORTNAME= kst
DISTVERSION= 2.0.6
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= science kde
MASTER_SITES= SF/${PORTNAME}/Kst%20${DISTVERSION:C/-r.*//}/