svn commit: r352962 - in head: astro/cfitsio astro/cfitsio/files astro/kstars astro/p5-Astro-FITS-CFITSIO astro/wcslib graphics/gdal graphics/ufraw math/octave-forge-fits science/kst2

Sunpoet Po-Chuan Hsieh sunpoet at FreeBSD.org
Sun May 4 15:37:14 UTC 2014 

Author: sunpoet
Date: Sun May  4 15:37:11 2014
New Revision: 352962
URL: http://svnweb.freebsd.org/changeset/ports/352962
QAT: https://qat.redports.org/buildarchive/r352962/

Log:
  - 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

Deleted:
  head/astro/cfitsio/files/
Modified:
  head/astro/cfitsio/Makefile
  head/astro/cfitsio/distinfo
  head/astro/cfitsio/pkg-plist
  head/astro/kstars/Makefile
  head/astro/p5-Astro-FITS-CFITSIO/Makefile
  head/astro/wcslib/Makefile
  head/graphics/gdal/Makefile
  head/graphics/ufraw/Makefile
  head/math/octave-forge-fits/Makefile
  head/science/kst2/Makefile

Modified: head/astro/cfitsio/Makefile
==============================================================================
--- head/astro/cfitsio/Makefile	Sun May  4 15:31:38 2014	(r352961)
+++ head/astro/cfitsio/Makefile	Sun May  4 15:37:11 2014	(r352962)
@@ -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/
 
 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>

Modified: head/astro/cfitsio/distinfo
==============================================================================
--- head/astro/cfitsio/distinfo	Sun May  4 15:31:38 2014	(r352961)
+++ head/astro/cfitsio/distinfo	Sun May  4 15:37:11 2014	(r352962)
@@ -1,2 +1,2 @@
-SHA256 (cfitsio3350.tar.gz) = eb195f227a21cb5c1334c14ec5de3cc1cfbea6255c772f62e3fb5111b078af0e
-SIZE (cfitsio3350.tar.gz) = 4655732
+SHA256 (cfitsio3360.tar.gz) = dffa8429fb561de3bae6eccc872298cb1305732e28bee96c6c6c29368e1171dc
+SIZE (cfitsio3360.tar.gz) = 4650206

Modified: head/astro/cfitsio/pkg-plist
==============================================================================
--- head/astro/cfitsio/pkg-plist	Sun May  4 15:31:38 2014	(r352961)
+++ head/astro/cfitsio/pkg-plist	Sun May  4 15:37:11 2014	(r352962)
@@ -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

Modified: head/astro/kstars/Makefile
==============================================================================
--- head/astro/kstars/Makefile	Sun May  4 15:31:38 2014	(r352961)
+++ head/astro/kstars/Makefile	Sun May  4 15:37:11 2014	(r352962)
@@ -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}

Modified: head/astro/p5-Astro-FITS-CFITSIO/Makefile
==============================================================================
--- head/astro/p5-Astro-FITS-CFITSIO/Makefile	Sun May  4 15:31:38 2014	(r352961)
+++ head/astro/p5-Astro-FITS-CFITSIO/Makefile	Sun May  4 15:37:11 2014	(r352962)
@@ -3,7 +3,7 @@
 
 PORTNAME=	Astro-FITS-CFITSIO
 PORTVERSION=	1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-

Modified: head/astro/wcslib/Makefile
==============================================================================
--- head/astro/wcslib/Makefile	Sun May  4 15:31:38 2014	(r352961)
+++ head/astro/wcslib/Makefile	Sun May  4 15:37:11 2014	(r352962)
@@ -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/
 

Modified: head/graphics/gdal/Makefile
==============================================================================
--- head/graphics/gdal/Makefile	Sun May  4 15:31:38 2014	(r352961)
+++ head/graphics/gdal/Makefile	Sun May  4 15:37:11 2014	(r352962)
@@ -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}/ \

Modified: head/graphics/ufraw/Makefile
==============================================================================
--- head/graphics/ufraw/Makefile	Sun May  4 15:31:38 2014	(r352961)
+++ head/graphics/ufraw/Makefile	Sun May  4 15:37:11 2014	(r352962)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ufraw
 PORTVERSION=	0.19.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 

Modified: head/math/octave-forge-fits/Makefile
==============================================================================
--- head/math/octave-forge-fits/Makefile	Sun May  4 15:31:38 2014	(r352961)
+++ head/math/octave-forge-fits/Makefile	Sun May  4 15:37:11 2014	(r352962)
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-fits
 PORTVERSION=	1.0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 
 MAINTAINER=	stephen at FreeBSD.org

Modified: head/science/kst2/Makefile
==============================================================================
--- head/science/kst2/Makefile	Sun May  4 15:31:38 2014	(r352961)
+++ head/science/kst2/Makefile	Sun May  4 15:37:11 2014	(r352962)
@@ -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.*//}/

More information about the svn-ports-all mailing list