Index: head/databases/p5-DBI/Makefile
===================================================================
--- head/databases/p5-DBI/Makefile	(revision 305300)
+++ head/databases/p5-DBI/Makefile	(revision 305301)
@@ -1,93 +1,90 @@
-# 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
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 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*
 
 PERL_CONFIGURE=	yes
 
 MAN1=		dbilogstrip.1 dbiprof.1 dbiproxy.1
 MAN3=		Bundle::DBI.3 \
 		DBD::DBM.3 \
 		DBD::File.3 \
 		DBD::File::Developers.3 \
 		DBD::File::HowTo.3 \
 		DBD::File::Roadmap.3 \
 		DBD::Gofer.3 \
 		DBD::Gofer::Policy::Base.3 \
 		DBD::Gofer::Policy::classic.3 \
 		DBD::Gofer::Policy::pedantic.3 \
 		DBD::Gofer::Policy::rush.3 \
 		DBD::Gofer::Transport::Base.3 \
 		DBD::Gofer::Transport::null.3 \
 		DBD::Gofer::Transport::pipeone.3 \
 		DBD::Gofer::Transport::stream.3 \
 		DBD::Proxy.3 \
 		DBD::Sponge.3 \
 		DBI.3 \
 		DBI::Const::GetInfo::ANSI.3 \
 		DBI::Const::GetInfo::ODBC.3 \
 		DBI::Const::GetInfoReturn.3 \
 		DBI::Const::GetInfoType.3 \
 		DBI::DBD.3 \
 		DBI::DBD::Metadata.3 \
 		DBI::DBD::SqlEngine.3 \
 		DBI::DBD::SqlEngine::HowTo.3 \
 		DBI::DBD::SqlEngine::Developers.3 \
 		DBI::FAQ.3 \
 		DBI::Gofer::Execute.3 \
 		DBI::Gofer::Request.3 \
 		DBI::Gofer::Response.3 \
 		DBI::Gofer::Serializer::DataDumper.3 \
 		DBI::Gofer::Serializer::Base.3 \
 		DBI::Gofer::Serializer::Storable.3 \
 		DBI::Gofer::Transport::Base.3 \
 		DBD::Gofer::Transport::corostream.3 \
 		DBI::Gofer::Transport::pipeone.3 \
 		DBI::Gofer::Transport::stream.3 \
 		DBI::Profile.3 \
 		DBI::ProfileData.3 \
 		DBI::ProfileDumper.3 \
 		DBI::ProfileDumper::Apache.3 \
 		DBI::ProfileSubs.3 \
 		DBI::ProxyServer.3 \
 		DBI::PurePerl.3 \
 		DBI::SQL::Nano.3 \
 		DBI::Util::CacheMemory.3 \
 		DBI::W32ODBC.3 \
 		Win32::DBIODBC.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:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
 .endif
 
 .include <bsd.port.mk>
Index: head/news/p5-News-Article/Makefile
===================================================================
--- head/news/p5-News-Article/Makefile	(revision 305300)
+++ head/news/p5-News-Article/Makefile	(revision 305301)
@@ -1,35 +1,33 @@
-# 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
 PORTREVISION=	2
 CATEGORIES=	news perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Object for handling Usenet articles in mail or news form
 
 BUILD_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
 RUN_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
 
 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>