From fd959c7d6e612fba1dbc6276e192e436099ff1ba Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 5 Oct 2012 14:09:59 +0000
Subject: [PATCH] Finish converting perl@ ports to new Options Framework

---
 databases/p5-DBI/Makefile     | 13 +++++--------
 news/p5-News-Article/Makefile | 16 +++++++---------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/databases/p5-DBI/Makefile b/databases/p5-DBI/Makefile
index 8bc0e7909a2d..57eeef2100c2 100644
--- a/databases/p5-DBI/Makefile
+++ b/databases/p5-DBI/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-DBI
-# Date created:				October 17th 1996
-# Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
-#
+# Created by: James FitzGibbon <jfitz@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	DBI
 PORTVERSION=	1.622
@@ -17,7 +13,8 @@ COMMENT=	The perl5 Database Interface.  Required for DBD::* modules
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-OPTIONS=	PROXY "Build DBI::Proxy" off
+OPTIONS_DEFINE=	PROXY DOCS
+PROXY_DESC=	Build DBI::Proxy
 
 CONFLICTS=	p5-DBI-1.3*
 
@@ -76,12 +73,12 @@ MAN3=		Bundle::DBI.3 \
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_PROXY)
+.if ${PORT_OPTIONS:MPROXY}
 BUILD_DEPENDS+=	p5-PlRPC>=0.2001:${PORTSDIR}/net/p5-PlRPC
 RUN_DEPENDS+=	p5-PlRPC>=0.2001:${PORTSDIR}/net/p5-PlRPC
 .endif
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	Changes README
 
 post-install:
diff --git a/news/p5-News-Article/Makefile b/news/p5-News-Article/Makefile
index 5cf5a7c4ae0c..3dced38218cf 100644
--- a/news/p5-News-Article/Makefile
+++ b/news/p5-News-Article/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: p5-News-Article
-# Date created: January 2, 1998
-# Whom: Don Croyle <croyle@gelemna.org>
-#
+# Created by: Don Croyle <croyle@gelemna.org>
 # $FreeBSD$
-#
 
 PORTNAME=	News-Article
 PORTVERSION=	1.27
@@ -23,13 +19,15 @@ PERL_CONFIGURE=	yes
 MAN3=		News::Article.3 News::AutoReply.3 News::FormArticle.3 \
 		News::FormReply.3
 
-OPTIONS=	PGP_SIGN "PGP::Sign support for header signing" on
+OPTIONS_DEFINE=	PGP_SIGN
+OPTIONS_DEFAULT=	PGP_SIGN
+PGP_SIGN_DESC=	PGP::Sign support for header signing
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_PGP_SIGN)
+.if ${PORT_OPTIONS:MPGP_SIGN}
 BUILD_DEPENDS+=	p5-PGP-Sign>=0:${PORTSDIR}/security/p5-PGP-Sign
 RUN_DEPENDS+=	p5-PGP-Sign>=0:${PORTSDIR}/security/p5-PGP-Sign
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>