From owner-svn-ports-all@FreeBSD.ORG  Thu Dec 13 07:53:20 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 D2025455;
 Thu, 13 Dec 2012 07:53:20 +0000 (UTC)
 (envelope-from bapt@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 B590F8FC08;
 Thu, 13 Dec 2012 07:53:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBD7rKsC079832;
 Thu, 13 Dec 2012 07:53:20 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBD7rKN2079831;
 Thu, 13 Dec 2012 07:53:20 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201212130753.qBD7rKN2079831@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 13 Dec 2012 07:53:20 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308829 - head/graphics/qiv
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Thu, 13 Dec 2012 07:53:20 -0000

Author: bapt
Date: Thu Dec 13 07:53:20 2012
New Revision: 308829
URL: http://svnweb.freebsd.org/changeset/ports/308829

Log:
  Convert to new option framework

Modified:
  head/graphics/qiv/Makefile

Modified: head/graphics/qiv/Makefile
==============================================================================
--- head/graphics/qiv/Makefile	Thu Dec 13 07:51:40 2012	(r308828)
+++ head/graphics/qiv/Makefile	Thu Dec 13 07:53:20 2012	(r308829)
@@ -1,10 +1,5 @@
-# New ports collection makefile for:	qiv
-# Date created:		25 December 1998
-# Whom:			Bill Fumerola <billf@chc-chimes.com>
-#
-# $Carpetsmoker: ports/graphics/qiv/Makefile,v 1.2 2008/01/26 15:24:30 carpetsmoker Exp $
+# Created by: Bill Fumerola <billf@chc-chimes.com>
 # $FreeBSD$
-#
 
 PORTNAME=	qiv
 PORTVERSION=	2.2.4
@@ -26,19 +21,19 @@ USE_GNOME=	gtk20
 
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	XINERAMA "use multiple monitors" off
+OPTIONS_DEFINE=	XINERAMA
 
 MAN1=		qiv.1
 PLIST_FILES=	bin/qiv
 USE_XORG+=	x11
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 pre-configure:
-.if ! defined(WITH_XINERAMA)
-	@${REINPLACE_CMD} 's|GTD.*=|#|' ${WRKSRC}/Makefile
-.else
+.if ${PORT_OPTIONS:MXINERAMA}
 USE_XORG+=	xinerama
+.else
+	@${REINPLACE_CMD} 's|GTD.*=|#|' ${WRKSRC}/Makefile
 .endif
 
 do-configure:
@@ -52,4 +47,4 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/qiv ${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/qiv.1 ${MAN1PREFIX}/man/man1/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>