From d21f8c41774d87597ba680eceae7717b16e8b358 Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Sun, 4 May 2014 15:37:11 +0000 Subject: [PATCH] - 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 --- astro/cfitsio/Makefile | 26 ++++++++++++++------------ astro/cfitsio/distinfo | 4 ++-- astro/cfitsio/files/patch-Makefile.in | 22 ---------------------- astro/cfitsio/files/patch-fpackutil.c | 10 ---------- astro/cfitsio/pkg-plist | 5 +++-- astro/kstars/Makefile | 1 + astro/p5-Astro-FITS-CFITSIO/Makefile | 2 +- astro/wcslib/Makefile | 2 +- graphics/gdal/Makefile | 2 +- graphics/ufraw/Makefile | 2 +- math/octave-forge-fits/Makefile | 2 +- science/kst2/Makefile | 2 +- 12 files changed, 26 insertions(+), 54 deletions(-) delete mode 100644 astro/cfitsio/files/patch-Makefile.in delete mode 100644 astro/cfitsio/files/patch-fpackutil.c diff --git a/astro/cfitsio/Makefile b/astro/cfitsio/Makefile index 578fb217d685..cae05751d050 100644 --- a/astro/cfitsio/Makefile +++ b/astro/cfitsio/Makefile @@ -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 "" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e 's|||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 diff --git a/astro/cfitsio/distinfo b/astro/cfitsio/distinfo index a06611e045f5..01227b564ecc 100644 --- a/astro/cfitsio/distinfo +++ b/astro/cfitsio/distinfo @@ -1,2 +1,2 @@ -SHA256 (cfitsio3350.tar.gz) = eb195f227a21cb5c1334c14ec5de3cc1cfbea6255c772f62e3fb5111b078af0e -SIZE (cfitsio3350.tar.gz) = 4655732 +SHA256 (cfitsio3360.tar.gz) = dffa8429fb561de3bae6eccc872298cb1305732e28bee96c6c6c29368e1171dc +SIZE (cfitsio3360.tar.gz) = 4650206 diff --git a/astro/cfitsio/files/patch-Makefile.in b/astro/cfitsio/files/patch-Makefile.in deleted file mode 100644 index 3e7891a9000b..000000000000 --- a/astro/cfitsio/files/patch-Makefile.in +++ /dev/null @@ -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} $@; \ diff --git a/astro/cfitsio/files/patch-fpackutil.c b/astro/cfitsio/files/patch-fpackutil.c deleted file mode 100644 index f57cb920b039..000000000000 --- a/astro/cfitsio/files/patch-fpackutil.c +++ /dev/null @@ -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 - #include - #include -+#include - - /* #include "bzlib.h" only for experimental purposes */ - diff --git a/astro/cfitsio/pkg-plist b/astro/cfitsio/pkg-plist index 653cc79ec4f1..2e8d762f1513 100644 --- a/astro/cfitsio/pkg-plist +++ b/astro/cfitsio/pkg-plist @@ -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 diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile index b1a826bd81f6..19f4c76d9db8 100644 --- a/astro/kstars/Makefile +++ b/astro/kstars/Makefile @@ -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} diff --git a/astro/p5-Astro-FITS-CFITSIO/Makefile b/astro/p5-Astro-FITS-CFITSIO/Makefile index 67f5aa76874e..31bb11d33fbe 100644 --- a/astro/p5-Astro-FITS-CFITSIO/Makefile +++ b/astro/p5-Astro-FITS-CFITSIO/Makefile @@ -3,7 +3,7 @@ PORTNAME= Astro-FITS-CFITSIO PORTVERSION= 1.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= astro perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/astro/wcslib/Makefile b/astro/wcslib/Makefile index f632a4887c7f..600691aab38a 100644 --- a/astro/wcslib/Makefile +++ b/astro/wcslib/Makefile @@ -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/ diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile index bf2496c6079d..eab98648d108 100644 --- a/graphics/gdal/Makefile +++ b/graphics/gdal/Makefile @@ -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}/ \ diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile index 7385507d9747..979cbd9cdfe2 100644 --- a/graphics/ufraw/Makefile +++ b/graphics/ufraw/Makefile @@ -3,7 +3,7 @@ PORTNAME= ufraw PORTVERSION= 0.19.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} diff --git a/math/octave-forge-fits/Makefile b/math/octave-forge-fits/Makefile index 15f320286fd7..d5409b06cedf 100644 --- a/math/octave-forge-fits/Makefile +++ b/math/octave-forge-fits/Makefile @@ -3,7 +3,7 @@ PORTNAME= octave-forge-fits PORTVERSION= 1.0.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org diff --git a/science/kst2/Makefile b/science/kst2/Makefile index c59f935609ed..b15b3abad02c 100644 --- a/science/kst2/Makefile +++ b/science/kst2/Makefile @@ -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.*//}/