ports/173818: [PATCH] astro/wcslib optionsng

[Chris Petrik]

>Number:         173818
>Category:       ports
>Synopsis:       [PATCH] astro/wcslib optionsng
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 21 23:30:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Chris Petrik
>Release:        
>Organization:
na
>Environment:
>Description:
Options NG Changes
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: wcslib/Makefile
===================================================================
--- wcslib/Makefile     (revision 305494)
+++ wcslib/Makefile     (working copy)
@@ -1,8 +1,4 @@
-# ex:ts=4
-# New ports collection makefile for:   wcslib
-# Date created:                                                        Wed Jul 15 10:09:45 EST 2009
-# Whom:                                                                        Tony Maher <tonymaher at optusnet.com.au>
-#
+# Created by: Tony Maher <tonymaher at optusnet.com.au>
 # $FreeBSD$

 PORTNAME=              wcslib
@@ -25,20 +21,23 @@
 # See makedefs.in which describes why you want to set the extra support.
 # For most users it will not be required.

-OPTIONS=               CFITSIO "Add cfitsio support (for tests only)" Off \
-                               PGPLOT  "Add pgplot support (for tests only)" Off
+.include <bsd.port.options.mk>

+OPTIONS_DEFINE=        CFITSIO PGPLOT
+CFITSIO_DESC=  Add cfitsio support (for tests only)
+PGPLOT_DESC=   Add pgplot support (for tests only)
+
 # The configure script unconditionally searches for the cftisio library
 # and uses it if found.

-.if defined(WITH_CFITSIO) || exists(${LOCALBASE}/lib/libcfitsio.so)
+.if ${PORT_OPTIONS:MCFITSIO}
 PLIST_SUB+=            HPXCVT=""
 LIB_DEPENDS+=  cfitsio:${PORTSDIR}/astro/cfitsio
 .else
 PLIST_SUB+=            HPXCVT="@comment "
 .endif

-.if defined(WITH_PGPLOT)
+.if ${PORT_OPTIONS:MPGPLOT}
 LIB_DEPENDS+=  pgplot.5:${PORTSDIR}/graphics/pgplot
 .endif


>Release-Note:
>Audit-Trail:
>Unformatted: