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

[Colin Percival]

On 05/04/14 08:37, Sunpoet Po-Chuan Hsieh wrote:
> 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
> 
> 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)
> +CONFIGURE_ARGS=	ZLIB_SOURCES="" ac_cv_prog_FC=f2c
>  GNU_CONFIGURE=	yes
> +LDFLAGS+=	-L${LIBDIR} -lz
> ...
>  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


This seems to have broken the port -- on FreeBSD 10.0-RELEASE at least, and I'm
assuming all older releases as well.  The zlib included in the port has
functionality (e.g., compress2mem_from_mem) which our zlib doesn't have, and
with the port's zlib disabled, dependent ports will fail to build (astro/kstars,
which uses libcfitsio) or install (astro/wcslib, which detects the nonfunctional
libcfitsio and decides not use it, resulting the the wrong plist).

-- 
Colin Percival
Security Officer Emeritus, FreeBSD | The power to serve
Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid