From owner-svn-ports-head@FreeBSD.ORG  Sun Sep 16 17:01:25 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2FE1F106566B;
	Sun, 16 Sep 2012 17:01:25 +0000 (UTC)
	(envelope-from dinoex@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 017678FC08;
	Sun, 16 Sep 2012 17:01:25 +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 q8GH1ONX035337;
	Sun, 16 Sep 2012 17:01:24 GMT (envelope-from dinoex@svn.freebsd.org)
Received: (from dinoex@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8GH1OBZ035334;
	Sun, 16 Sep 2012 17:01:24 GMT (envelope-from dinoex@svn.freebsd.org)
Message-Id: <201209161701.q8GH1OBZ035334@svn.freebsd.org>
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Sun, 16 Sep 2012 17:01:24 +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: r304370 - head/misc/magicpoint
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sun, 16 Sep 2012 17:01:25 -0000

Author: dinoex
Date: Sun Sep 16 17:01:24 2012
New Revision: 304370
URL: http://svn.freebsd.org/changeset/ports/304370

Log:
  - use OPTIONS_DEFINE

Modified:
  head/misc/magicpoint/Makefile

Modified: head/misc/magicpoint/Makefile
==============================================================================
--- head/misc/magicpoint/Makefile	Sun Sep 16 16:43:34 2012	(r304369)
+++ head/misc/magicpoint/Makefile	Sun Sep 16 17:01:24 2012	(r304370)
@@ -24,11 +24,6 @@ WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-vflib --enable-locale
 
-OPTIONS+=	FREETYPE	"With FreeType support"			on \
-		XFT		"With Xft2 support"			on \
-		GIF		"With gif image support"		off \
-		IMLIB		"With Imlib exclusive image processing" off
-
 MAN1=	mgp.1 mgp2ps.1 mgpembed.1 mgpnet.1 xwintoppm.1 xmindpath.1
 
 PORTDOCS=	${DOCS} sample emacs-lisp scripts
@@ -46,9 +41,14 @@ EMACS_LISPS=	mgp-mode.el
 EMACS_LISPS_MGP=COPYING README mgp.el mgp.sty sample.tex
 SAMPLE_SCRIPTS=	eqn2eps.sh tex2eps.sh mgp2html.pl mgp2latex.pl
 
-.include <bsd.port.pre.mk>
 
-.if defined(WITH_FREETYPE)
+OPTIONS_DEFINE=FREETYPE XFT GIF IMLIB
+OPTIONS_DEFAULT=FREETYPE XFT
+NO_OPTIONS_SORT=yes
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MFREETYPE}
 # Only freetype 1.x is supported
 USE_FREETYPE=		yes
 CONFIGURE_ARGS+=	--enable-freetype \
@@ -57,14 +57,14 @@ CONFIGURE_ARGS+=	--enable-freetype \
 CONFIGURE_ARGS+=	--disable-freetype
 .endif
 
-.if defined(WITH_XFT)
+.if ${PORT_OPTIONS:MXFT}
 USE_XORG+=	xft
 CONFIGURE_ARGS+=	--enable-xft2
 .else
 CONFIGURE_ARGS+=	--disable-xft2
 .endif
 
-.if defined(WITH_GIF)
+.if ${PORT_OPTIONS:MGIF}
 LIB_DEPENDS+=	gif.5:${PORTSDIR}/graphics/giflib
 CONFIGURE_ARGS+=	--enable-gif
 CFLAGS+=	-I${LOCALBASE}/include
@@ -72,7 +72,7 @@ CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--disable-gif
 .endif
 
-.if defined(WITH_IMLIB)
+.if ${PORT_OPTIONS:MIMLIB}
 USE_GNOME=	imlib
 CONFIGURE_ARGS+=	--enable-imlib
 .else
@@ -113,4 +113,4 @@ post-install:
 		${INSTALL_SCRIPT} ${SAMPLE_SCRIPTS} ${DOCSDIR}/scripts/
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>