From owner-svn-ports-head@FreeBSD.ORG  Fri Jul 20 22:08:57 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 17DE4106564A;
	Fri, 20 Jul 2012 22:08:56 +0000 (UTC)
	(envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 55D228FC15;
	Fri, 20 Jul 2012 22:08:56 +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 q6KM8u5C043607;
	Fri, 20 Jul 2012 22:08:56 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6KM8uTD043605;
	Fri, 20 Jul 2012 22:08:56 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201207202208.q6KM8uTD043605@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 20 Jul 2012 22:08:56 +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: r301254 - head/print/pnm2ppa
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: Fri, 20 Jul 2012 22:08:57 -0000

Author: bapt
Date: Fri Jul 20 22:08:55 2012
New Revision: 301254
URL: http://svn.freebsd.org/changeset/ports/301254

Log:
  Convert to new options framework

Modified:
  head/print/pnm2ppa/Makefile

Modified: head/print/pnm2ppa/Makefile
==============================================================================
--- head/print/pnm2ppa/Makefile	Fri Jul 20 22:06:49 2012	(r301253)
+++ head/print/pnm2ppa/Makefile	Fri Jul 20 22:08:55 2012	(r301254)
@@ -14,7 +14,8 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert PNM images to PPA for some HP printers
 
-OPTIONS=	A4SIZE "Set A4 (not Letter) as a default paper size" off
+OPTIONS_DEFINE=	A4SIZE
+A4SIZE_DESC=	Set A4 (not Letter) as a default paper size
 
 USE_GHOSTSCRIPT_RUN=	yes
 USE_GMAKE=	yes
@@ -28,7 +29,7 @@ PKGDEINSTALL=	${PKGINSTALL}
 
 .include <bsd.port.pre.mk>
 
-.if defined(A4) || defined(WITH_A4SIZE)
+.if defined(A4) || !empty(PORT_OPTIONS:MA4SIZE}
 RUN_DEPENDS=	enscript:${PORTSDIR}/print/enscript-a4
 .else
 RUN_DEPENDS=	enscript:${PORTSDIR}/print/enscript-letter