Index: Makefile
===================================================================
--- Makefile	(revision 353466)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	cfitsio
 PORTVERSION=	3.360
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	astro
 MASTER_SITES=	http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/ \
 		http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/oldvers/ \
@@ -24,8 +24,8 @@
 ALL_TARGET=	libcfitsio.a shared
 CFLAGS+=	-I${INCLUDEDIR}
 CONFIGURE_ARGS=	ac_cv_prog_FC=f2c
-CONFIGURE_ENV=	LIBS="-L${LIBDIR} -lz"
 GNU_CONFIGURE=	yes
+LDFLAGS+=	-L${LIBDIR} -lz
 MAKE_ARGS=	ZLIB_SOURCES="zlib/zcompress.c zlib/zuncompress.c"
 USE_LDCONFIG=	yes
 USES=		pkgconfig
@@ -38,6 +38,9 @@
 SHLIB_MAJOR_VER=2
 SHLIB_MINOR_VER=${PORTVERSION:S/0$//}
 
+post-patch:
+	@${REINPLACE_CMD} -e '/^Libs.private: / s|$$| -lz|' ${WRKSRC}/cfitsio.pc.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/