From owner-svn-ports-head@FreeBSD.ORG  Tue Jan  8 16:31:51 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 048CB3AC;
 Tue,  8 Jan 2013 16:31:51 +0000 (UTC) (envelope-from wxs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D3FE8B5F;
 Tue,  8 Jan 2013 16:31:50 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r08GVohj027789;
 Tue, 8 Jan 2013 16:31:50 GMT (envelope-from wxs@svn.freebsd.org)
Received: (from wxs@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r08GVo54027788;
 Tue, 8 Jan 2013 16:31:50 GMT (envelope-from wxs@svn.freebsd.org)
Message-Id: <201301081631.r08GVo54027788@svn.freebsd.org>
From: Wesley Shields <wxs@FreeBSD.org>
Date: Tue, 8 Jan 2013 16:31:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r310100 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Jan 2013 16:31:51 -0000

Author: wxs
Date: Tue Jan  8 16:31:50 2013
New Revision: 310100
URL: http://svnweb.freebsd.org/changeset/ports/310100

Log:
  Trim header.
  Convert to new options.
  
  PR:		ports/173818
  Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com>
  Approved by:	maintainer timeout

Modified:
  head/astro/wcslib/Makefile   (contents, props changed)

Modified: head/astro/wcslib/Makefile
==============================================================================
--- head/astro/wcslib/Makefile	Tue Jan  8 16:24:07 2013	(r310099)
+++ head/astro/wcslib/Makefile	Tue Jan  8 16:31:50 2013	(r310100)
@@ -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@optusnet.com.au>
-#
+# Created by: Tony Maher <tonymaher@optusnet.com.au>
 # $FreeBSD$
 
 PORTNAME=		wcslib
@@ -25,20 +21,23 @@ MAN1=			fitshdr.1
 # 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
+OPTIONS_DEFINE=		CFITSIO PGPLOT
+CFITSIO_DESC=	Add cfitsio support (for tests only)
+PGPLOT_DESC=	Add pgplot support (for tests only)
+
+.include <bsd.port.options.mk>
 
 # 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} || exists(${LOCALBASE}/lib/libcfitsio.so)
 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
 
@@ -47,7 +46,7 @@ post-patch:
 		${WRKSRC}/GNUmakefile
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	(cd ${WRKSRC}/ && ${INSTALL_DATA} CHANGES README COPYING COPYING.LESSER wcslib.pdf ${DOCSDIR})
 	@${MKDIR} ${DOCSDIR}/html