svn commit: r353239 - head/astro/cfitsio

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Thu May  8 03:03:38 2014
New Revision: 353239
URL: http://svnweb.freebsd.org/changeset/ports/353239
QAT: https://qat.redports.org/buildarchive/r353239/

Log:
  - Build cfitsio compress/uncompress C files in zlib/
  - Bump PORTREVISION for package change
  
  Tested by:	cperciva, marino

Modified:
  head/astro/cfitsio/Makefile

Modified: head/astro/cfitsio/Makefile
==============================================================================
--- head/astro/cfitsio/Makefile	Thu May  8 01:54:28 2014	(r353238)
+++ head/astro/cfitsio/Makefile	Thu May  8 03:03:38 2014	(r353239)
@@ -3,6 +3,7 @@
 
 PORTNAME=	cfitsio
 PORTVERSION=	3.360
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/ \
 		http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/oldvers/ \
@@ -22,8 +23,9 @@ OPTIONS_DEFINE=	DOCS
 
 ALL_TARGET=	libcfitsio.a shared
 CFLAGS+=	-I${INCLUDEDIR}
-CONFIGURE_ARGS=	ZLIB_SOURCES="" ac_cv_prog_FC=f2c
+CONFIGURE_ARGS=	ac_cv_prog_FC=f2c
 GNU_CONFIGURE=	yes
+MAKE_ARGS=	ZLIB_SOURCES="zlib/zcompress.c zlib/zuncompress.c"
 LDFLAGS+=	-L${LIBDIR} -lz
 USE_LDCONFIG=	yes
 USES=		pkgconfig
@@ -36,9 +38,6 @@ PORTDOCS=	*
 SHLIB_MAJOR_VER=2
 SHLIB_MINOR_VER=${PORTVERSION:S/0$//}
 
-post-patch:
-	@${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.a libcfitsio.so.${SHLIB_MAJOR_VER}.${SHLIB_MINOR_VER} ${STAGEDIR}${PREFIX}/lib/