From owner-svn-ports-all@FreeBSD.ORG Thu May 8 22:41:01 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 81027995; Thu, 8 May 2014 22:41:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 62416DB6; Thu, 8 May 2014 22:41:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s48Mf1mR004497; Thu, 8 May 2014 22:41:01 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s48Mf1C6004483; Thu, 8 May 2014 22:41:01 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201405082241.s48Mf1C6004483@svn.freebsd.org> From: Raphael Kubo da Costa Date: Thu, 8 May 2014 22:41:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353362 - head/astro/wcslib X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2014 22:41:01 -0000 Author: rakuco Date: Thu May 8 22:41:00 2014 New Revision: 353362 URL: http://svnweb.freebsd.org/changeset/ports/353362 QAT: https://qat.redports.org/buildarchive/r353362/ Log: - Fix the plist when the CFITSIO option is on. - Use the new OPTIONS helpers to simplify the Makefile. Related to both, also stop automatically turning the CFITSIO option on when libcfitsio.so is installed: wcslib has had proper --with{out}-cfitsio options since version 4.4.4. This will turn off CFITSIO support for most people and indirectly fix their builds with astro/cfitsio-3.360-1 [1]. If people do choose to have it on, ports/189487 needs to be committed, otherwise there will be plist errors because wcslib's configure script will not be able to detect that cfitsio is installed and can be used. [1] http://lists.freebsd.org/pipermail/freebsd-ports/2014-May/092070.html Modified: head/astro/wcslib/Makefile head/astro/wcslib/pkg-plist Modified: head/astro/wcslib/Makefile ============================================================================== --- head/astro/wcslib/Makefile Thu May 8 22:24:50 2014 (r353361) +++ head/astro/wcslib/Makefile Thu May 8 22:41:00 2014 (r353362) @@ -3,7 +3,7 @@ PORTNAME= wcslib PORTVERSION= 4.13.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= astro MASTER_SITES= ftp://ftp.atnf.csiro.au/pub/software/wcslib/ @@ -23,24 +23,14 @@ PLIST_SUB= VERSION="${PORTVERSION}" # For most users it will not be required. OPTIONS_DEFINE= CFITSIO PGPLOT +OPTIONS_SUB= yes CFITSIO_DESC= Add cfitsio support (for tests only) PGPLOT_DESC= Add pgplot support (for tests only) -.include - -# The configure script unconditionally searches for the cftisio library -# and uses it if found. - -.if ${PORT_OPTIONS:MCFITSIO} || exists(${LOCALBASE}/lib/libcfitsio.so) -PLIST_SUB+= HPXCVT="" -LIB_DEPENDS+= libcfitsio.so:${PORTSDIR}/astro/cfitsio -.else -PLIST_SUB+= HPXCVT="@comment " -.endif - -.if ${PORT_OPTIONS:MPGPLOT} -LIB_DEPENDS+= libpgplot.so:${PORTSDIR}/graphics/pgplot -.endif +CFITSIO_CONFIGURE_WITH= cfitsio +CFITSIO_LIB_DEPENDS= libcfitsio.so:${PORTSDIR}/astro/cfitsio +PGPLOT_CONFIGURE_WITH= pgplot +PGPLOT_LIB_DEPENDS= libpgplot.so:${PORTSDIR}/graphics/pgplot post-patch: @${REINPLACE_CMD} -e 's#%%PKGDIR%%#${STAGEDIR}${PREFIX}/libdata#g' \ Modified: head/astro/wcslib/pkg-plist ============================================================================== --- head/astro/wcslib/pkg-plist Thu May 8 22:24:50 2014 (r353361) +++ head/astro/wcslib/pkg-plist Thu May 8 22:41:00 2014 (r353362) @@ -1,4 +1,5 @@ -%%HPXCVT%%bin/HPXcvt +%%CFITSIO%%bin/HPXcvt +%%CFITSIO%%bin/wcsware bin/fitshdr include/wcslib include/wcslib-%%VERSION%%/cel.h @@ -29,7 +30,9 @@ lib/libwcs.so lib/libwcs.so.%%VERSION%% lib/libwcs.so.4 libdata/pkgconfig/wcslib.pc +%%CFITSIO%%man/man1/HPXcvt.1.gz man/man1/fitshdr.1.gz +%%CFITSIO%%man/man1/wcsware.1.gz %%PORTDOCS%%%%DOCSDIR%%/html/functions_0x73.html %%PORTDOCS%%%%DOCSDIR%%/html/functions_vars_0x62.html %%PORTDOCS%%%%DOCSDIR%%/html/wcshdr_8h-source.html