Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 29 Dec 2012 22:42:35 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r309637 - head/astro/xtide
Message-ID:  <201212292242.qBTMgZIk064435@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Sat Dec 29 22:42:34 2012
New Revision: 309637
URL: http://svnweb.freebsd.org/changeset/ports/309637

Log:
  Convert to new options framework
  Trim headers
  
  PR:		ports/173816
  Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com>
  Approved by:	maintainer timeout (1 month)

Modified:
  head/astro/xtide/Makefile

Modified: head/astro/xtide/Makefile
==============================================================================
--- head/astro/xtide/Makefile	Sat Dec 29 22:36:25 2012	(r309636)
+++ head/astro/xtide/Makefile	Sat Dec 29 22:42:34 2012	(r309637)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   xtide
-# Date created:        30 August 1997
-# Whom:                Brion Moss <brion@queeg.com>
-#
+# Created by: Brion Moss <brion@queeg.com>
 # $FreeBSD$
-#
 
 PORTNAME=	xtide
 PORTVERSION=	2.12.1
@@ -37,19 +33,18 @@ TCD_DISTNAME=	libtcd-2.2.5
 HARM_DISTNAME=	harmonics-dwf-20120302
 WVS_DISTNAME=	wvs
 
-OPTIONS=	WVS "Use world vector shoreline data (big file!)" Off
+OPTIONS_DEFINE=	WVS X11
+WVS_DESC=	Use world vector shoreline data (big file!)
 
 .include <bsd.port.options.mk>
-.include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_WVS)
+.if ${PORT_OPTIONS:MWVS}
 DISTFILES+=	${WVS_DISTNAME}${EXTRACT_SUFX}
 PLIST_SUB+=	WVS=""
-.else
-PLIST_SUB+=	WVS="@comment "
+.elsePLIST_SUB+=	WVS="@comment "
 .endif
 
-.if defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 PKGNAMESUFFIX+=	-nox11
 ALL_TARGET+=	tide xttpd
 PLIST_SUB+=	X11="@comment "
@@ -83,7 +78,7 @@ post-configure:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tide ${PREFIX}/bin
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 	${INSTALL_PROGRAM} ${WRKSRC}/xtide ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/xtide.1 ${MANPREFIX}/man/man1
 .endif
@@ -100,7 +95,7 @@ post-install:
 	${CHMOD} 644 ${PREFIX}/etc/xtide.conf
 .endif
 
-.if !defined(WITHOUT_WVS)
+.if ${PORT_OPTIONS:MWVS}
 	@${MKDIR} ${DATADIR}/wvs
 	${INSTALL_DATA} ${WRKDIR}/wvs1.dat ${DATADIR}/wvs
 	${INSTALL_DATA} ${WRKDIR}/wvs12.dat ${DATADIR}/wvs
@@ -110,4 +105,4 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/wvsfull.dat ${DATADIR}/wvs
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212292242.qBTMgZIk064435>