From owner-svn-ports-all@FreeBSD.ORG  Sun Oct  7 14:38:40 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 600F6106566C;
	Sun,  7 Oct 2012 14:38:40 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 307298FC08;
	Sun,  7 Oct 2012 14:38:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q97EceEZ016139;
	Sun, 7 Oct 2012 14:38:40 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q97EcdbZ016137;
	Sun, 7 Oct 2012 14:38:40 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201210071438.q97EcdbZ016137@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 7 Oct 2012 14:38:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r305486 - head/astro/xplanet
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Oct 2012 14:38:40 -0000

Author: eadler
Date: Sun Oct  7 14:38:39 2012
New Revision: 305486
URL: http://svn.freebsd.org/changeset/ports/305486

Log:
  Convert to OptionsNG
  
  Approved by:	novel (maintainer)

Modified:
  head/astro/xplanet/Makefile

Modified: head/astro/xplanet/Makefile
==============================================================================
--- head/astro/xplanet/Makefile	Sun Oct  7 14:28:55 2012	(r305485)
+++ head/astro/xplanet/Makefile	Sun Oct  7 14:38:39 2012	(r305486)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    xplanet
-# Date created:		22 Feb 2000
-# Whom:			darius@dons.net.au
-#
+# Created by: darius@dons.net.au
 # $FreeBSD$
-#
 
 PORTNAME=	xplanet
 PORTVERSION=	1.3.0
@@ -21,61 +17,56 @@ CONFIGURE_ARGS=	--with-map-extension=jpg
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lm"
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-OPTIONS=	FREETYPE "Enable Freetype support" on \
-		PANGO "Enable PANGO support" on \
-		GIF "Enable GIF support" on \
-		JPEG "Enable JPEG support" on \
-		PNG "Enable PNG support" on \
-		PNM "Enable PNM support" on \
-		TIFF "Enable TIFF support" on
+OPTIONS_DEFINE=	FREETYPE PANGO GIF JPEG PNG PNM TIFF
+OPTIONS_DEFAULT= FREETYPE PANGO GIF JPEG PNG PNM TIFF
 
 MAN1=	xplanet.1
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_FREETYPE)
+.if ${PORT_OPTIONS:MFREETYPE}
 CONFIGURE_ARGS+=	--with-freetype
 LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
 .else
 CONFIGURE_ARGS+=	--without-freetype
 .endif
 
-.if !defined(WITHOUT_PANGO)
+.if ${PORT_OPTIONS:MPANGO}
 CONFIGURE_ARGS+=	--with-pango
 USE_GNOME+=	pango
 .else
 CONFIGURE_ARGS+=	--without-pango
 .endif
 
-.if !defined(WITHOUT_GIF)
+.if ${PORT_OPTIONS:MGIF}
 CONFIGURE_ARGS+=	--with-gif
 LIB_DEPENDS+=	gif.5:${PORTSDIR}/graphics/giflib
 .else
 CONFIGURE_ARGS+=	--without-gif
 .endif
 
-.if !defined(WITHOUT_JPEG)
+.if ${PORT_OPTIONS:MJPEG}
 CONFIGURE_ARGS+=	--with-jpeg
 LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
 .else
 CONFIGURE_ARGS+=	--without-jpeg
 .endif
 
-.if !defined(WITHOUT_PNG)
+.if ${PORT_OPTIONS:MPNG}
 CONFIGURE_ARGS+=	--with-png
 LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
 .else
 CONFIGURE_ARGS+=	--without-png
 .endif
 
-.if !defined(WITHOUT_PNM)
+.if ${PORT_OPTIONS:MPNM}
 CONFIGURE_ARGS+=	--with-pnm
 LIB_DEPENDS+=	netpbm.1:${PORTSDIR}/graphics/netpbm
 .else
 CONFIGURE_ARGS+=	--without-pnm
 .endif
 
-.if !defined(WITHOUT_TIFF)
+.if ${PORT_OPTIONS:MTIFF}
 CONFIGURE_ARGS+=	--with-tiff
 LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff
 .else