2 files changed, 156 insertions, 146 deletions

diff --git a/textproc/p5-Plagger/Makefile b/textproc/p5-Plagger/Makefile
index 66f78bb3d41c..c09946da6451 100644
--- a/textproc/p5-Plagger/Makefile
+++ b/textproc/p5-Plagger/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	plagger
-# Date created:				22 August 2006
-# Whom:					sumikawa@FreeBSD.org
-#
+# Created by: sumikawa@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	Plagger
 PORTVERSION=	0.7.17
@@ -14,7 +10,7 @@ MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sumikawa@FreeBSD.org
-COMMENT=	A pluggable RSS/Atom feed aggregator written in Perl
+COMMENT=	Pluggable RSS/Atom feed aggregator written in Perl
 
 USE_PERL5=	yes
 
@@ -44,323 +40,337 @@ BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
 		p5-URI-Fetch>=0:${PORTSDIR}/www/p5-URI-Fetch \
 		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
 
-OPTIONS=	BETTERENCODING "Better Encoding detection Support" on \
-		PODTESTING "POD Testing Support" off \
-		COOKIESHARING "Cookie sharing with Firefox Support" off \
-		LIBERALXML "Liberal XML parsing Support" on \
-		XPATH "XPath Support" on \
-		BETTERHTML "Better html to text formatter" on \
-		PRSJPNDATE "Parse Japanese datetime format" off \
-		PUBLISHEXCEL "Publish::Excel Support" off \
-		FILTERPIPE "Filter::Pipe Support" off \
-		PUBLISHPLANET "Publish::Planet Support" on \
-		PUBLISHCSV "Publish::CSV Support" off \
-		FILDEGYT "Filter-DegradeYouTube" off \
-		AUTHORNAME "Filter::ExtractAuthorName Support" off \
-		GUESSLANG "Filter::GuessLanguage Support" off \
-		GUESSTZ "Filter::GuessTimeZoneByDomain Support" off \
-		HTMLTIDY "Filter::HTMLTidy Support" off \
-		PUBLISHMT "Publish::MT Support" off \
-		PUBSERLZR "Publish-Serializer Support" off \
-		PUBICAL "Publish::iCal Support" off \
-		ROMANIZE "Filter::Romanize Support" off \
-		JAVASCRIPT "Publish::JavaScript Support" off \
-		EMOTICON "Filter::Emoticon Support" off \
-		FILHATENA "Filter::HatenaFormat Support" off \
-		FILHATKTAG "Filter::HatenaKeywordTag" off \
-		RULEFRESH "Rule::Fresh Support" on \
-		SUBSCOPML "Subscription::OPML Support" on \
-		FLICKRSEARCH "CustomFeed::FlickrSearch Support" off \
-		HATENABKMK "Filter::HatenaBookmarkUsersCount Support" off \
-		PALMDOC "Publish::PalmDoc Support" off \
-		PUBLISHSWF "Publish::SWF Support" off \
-		SUBSCRDBI "Subscription::DBI Support" off \
-		NOTIFYBEEP "Notify::Beep Support" off \
-		FILTERPPT "Filter::TTP Support" off \
-		KINOSEARCH "Search::KinoSearch Support" off \
-		PUBLISHGMAIL "Publish::Gmail Support" on \
-		PUBDELICIOUS "Publish::Delicious Support" off \
-		ESTRAIER "Search::Estraier Support" off \
-		SRCHGREP "Search::Grep" off \
-		PUBJSON "Publish::JSON Support" off \
-		FILSPAMASSN "Filter-SpamAssassin Support" off \
-		PROFANITY "Filter::Profanity Support" off \
-		HATENARSS "Subscription::HatenaRSS Support" off \
-		SUBSCRFOAF "Subscription::FOAF Support" off \
-		NOTIFYIRC "Notify::IRC Support" off \
-		HATENADIARY "Filter::HatenaDiaryKeywordLink Support" off \
-		LIVEDOOR "Subscription::LivedoorReader Support" off \
-		PINGSERVER "Subscription::PingServer Support" off \
-		IMAGEINFO "Filter::ImageInfo Support" off \
-		FILMRKDWN "Filter::Markdown Support" off \
-		PUBLISHIMAP "Publish::IMAP Support" off \
-		PUBLISHPDF "Publish::PDF Support" off \
-		BLOGLINES "Subscription::Bloglines Support" on \
-		BABELFISH "Filter::Babelfish Support" off \
-		CUSFEEDMIXI "CustomFeed::Mixi Support" off \
-		CUSTOMSVNLOG "CustomFeed::SVNLog Support" off \
-		NTFYNETSEND "Notify::NetSend Support" off \
-		FILHTMLSCRB "Filter::HTMLScrubber Support" on \
-		PLANETINI "Subscription::PlanetINI Support" off \
-		SUMMARYENG "Summary-English Support" off \
-		SUMJPN "Summary::Japanes" off \
-		SUMTEXTORG "Summary-TextOriginal Support" off
+OPTIONS_DEFINE=	BETTERENCODING PODTESTING COOKIESHARING LIBERALXML XPATH BETTERHTML PRSJPNDATE \
+		PRSJPNDATE PUBLISHEXCEL FILTERPIPE PUBLISHPLANET PUBLISHCSV FILDEGYT AUTHORNAME \
+		GUESSLANG GUESSTZ HTMLTIDY PUBLISHMT PUBSERLZR PUBICAL ROMANIZE JAVASCRIPT \
+		EMOTICON FILHATENA FILHATKTAG RULEFRESH SUBSCOPML HATENABKMK PALMDOC PUBLISHSWF \
+		SUBSCRDBI NOTIFYBEEP FILTERPPT KINOSEARCH PUBLISHGMAIL PUBDELICIOUS ESTRAIER \
+		SRCHGREP PUBJSON FILSPAMASSN PROFANITY HATENARSS SUBSCRFOAF NOTIFYIRC HATENADIARY \
+		LIVEDOOR PINGSERVER IMAGEINFO FILMRKDWN PUBLISHIMAP PUBLISHPDF BLOGLINES BABELFISH \
+		CUSFEEDMIXI CUSTOMSVNLOG NTFYNETSEND FILHTMLSCRB PLANETINI SUMMARYENG SUMJPN SUMTEXTORG \
+		DOCS EXAMPLES
+BETTERENCODING_DESC=	Better Encoding detection Support
+PODTESTINGPOD_DESC=	Testing Support
+COOKIESHARING_DESC=	Cookie sharing with Firefox Support
+LIBERALXML_DESC=	Liberal XML parsing Support
+XPATH_DESC=	XPath Support
+BETTERHTML_DESC=	Better html to text formatter
+PRSJPNDATE_DESC=	Parse Japanese datetime format
+PUBLISHEXCEL_DESC=	Publish::Excel Support
+FILTERPIPE_DESC=	Filter::Pipe Support
+PUBLISHPLANET_DESC=	Publish::Planet Support
+PUBLISHCSV_DESC=	Publish::CSV Support
+FILDEGYT_DESC=	Filter-DegradeYouTube
+AUTHORNAME_DESC=	Filter::ExtractAuthorName Support
+GUESSLANG_DESC=	Filter::GuessLanguage Support
+GUESSTZ_DESC=	Filter::GuessTimeZoneByDomain Support
+HTMLTIDY_DESC=	Filter::HTMLTidy Support
+PUBLISHMT_DESC=	Publish::MT Support
+PUBSERLZR_DESC=	Publish-Serializer Support
+PUBICAL_DESC=	Publish::iCal Support
+ROMANIZE_DESC=	Filter::Romanize Support
+JAVASCRIPT_DESC=	Publish::JavaScript Support
+EMOTICON_DESC=	Filter::Emoticon Support
+FILHATENA_DESC=	Filter::HatenaFormat Support
+FILHATKTAG_DESC=	Filter::HatenaKeywordTag
+RULEFRESH_DESC=	Rule::Fresh Support
+SUBSCOPML_DESC=	Subscription::OPML Support
+FLICKRSEARCH_DESC=	CustomFeed::FlickrSearch Support
+HATENABKMK_DESC=	Filter::HatenaBookmarkUsersCount Support
+PALMDOC_DESC=	Publish::PalmDoc Support
+PUBLISHSWF_DESC=	Publish::SWF Support
+SUBSCRDBI_DESC=	Subscription::DBI Support
+NOTIFYBEEP_DESC=	Notify::Beep Support
+FILTERPPT_DESC=	Filter::TTP Support
+KINOSEARCH_DESC=	Search::KinoSearch Support
+PUBLISHGMAIL_DESC=	Publish::Gmail Support
+PUBDELICIOUS_DESC=	Publish::Delicious Support
+ESTRAIER_DESC=	Search::Estraier Support
+SRCHGREP_DESC=	Search::Grep
+PUBJSON_DESC=	Publish::JSON Support
+FILSPAMASSN_DESC=	Filter-SpamAssassin Support
+PROFANITY_DESC=	Filter::Profanity Support
+HATENARSS_DESC=	Subscription::HatenaRSS Support
+SUBSCRFOAF_DESC=	Subscription::FOAF Support
+NOTIFYIRC_DESC=	Notify::IRC Support
+HATENADIARY_DESC=	Filter::HatenaDiaryKeywordLink Support
+LIVEDOOR_DESC=	Subscription::LivedoorReader Support
+PINGSERVER_DESC=	Subscription::PingServer Support
+IMAGEINFO_DESC=	Filter::ImageInfo Support
+FILMRKDWN_DESC=	Filter::Markdown Support
+PUBLISHIMAP_DESC=	Publish::IMAP Support
+PUBLISHPDF_DESC=	Publish::PDF Support
+BLOGLINES_DESC=	Subscription::Bloglines Support
+BABELFISH_DESC=	Filter::Babelfish Support
+CUSFEEDMIXI_DESC=	CustomFeed::Mixi Support
+CUSTOMSVNLOG_DESC=	CustomFeed::SVNLog Support
+NTFYNETSEND_DESC=	Notify::NetSend Support
+FILHTMLSCRB_DESC=	Filter::HTMLScrubber Support
+PLANETINI_DESC=	Subscription::PlanetINI Support
+SUMMARYENG_DESC=	Summary-English Support
+SUMJPN_DESC=	Summary::Japanes
+SUMTEXTORG_DESC=	Summary-TextOriginal Support
+
+OPTIONS_DEFAULT=	BETTERENCODING LIBERALXML XPATH BETTERHTML PUBLISHPLANET GUESSTZ \
+		EMOTICON RULEFRESH SUBSCOPML SUBSCRDBI PUBLISHGMAIL HATENARSS SUBSCRFOAF \
+		LIVEDOOR PINGSERVER BLOGLINES FILHTMLSCRB PLANETINI
 
 .include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_BETTERENCODING)
+.if ${PORT_OPTIONS:MBETTERENCODING}
 BUILD_DEPENDS+=	p5-Encode-Detect>=0:${PORTSDIR}/converters/p5-Encode-Detect
 .endif
 
-.if defined(WITH_PODTESTING)
+.if ${PORT_OPTIONS:MPODTESTING}
 BUILD_DEPENDS+=	p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
 		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
 .endif
 
-.if defined(WITH_COOKIESHARING)
+.if ${PORT_OPTIONS:MCOOKIESHARING}
 BUILD_DEPENDS+=	p5-HTTP-Cookies-Mozilla>=0:${PORTSDIR}/www/p5-HTTP-Cookies-Mozilla
 .endif
 
-.if !defined(WITHOUT_LIBERALXML)
+.if ${PORT_OPTIONS:MLIBERALXML}
 BUILD_DEPENDS+=	p5-XML-Liberal>=0:${PORTSDIR}/textproc/p5-XML-Liberal  \
 		p5-XML-RSS-Liberal>=0:${PORTSDIR}/textproc/p5-XML-RSS-Liberal
 .endif
 
-.if !defined(WITHOUT_XPATH)
+.if ${PORT_OPTIONS:MXPATH}
 BUILD_DEPENDS+=	p5-HTML-Tree>=0:${PORTSDIR}/www/p5-HTML-Tree \
 		p5-HTML-Format>=0:${PORTSDIR}/textproc/p5-HTML-Format
 .endif
 
-.if !defined(WITHOUT_BETTERHTML)
+.if ${PORT_OPTIONS:MBETTERHTML}
 BUILD_DEPENDS+=	p5-HTML-TreeBuilder-XPath>=0:${PORTSDIR}/www/p5-HTML-TreeBuilder-XPath
 .endif
 
-.if defined(WITH_PRSJPNDATE)
+.if ${PORT_OPTIONS:MPRSJPNDATE}
 BUILD_DEPENDS+=	ja-p5-DateTime-Format-Japanese>=0:${PORTSDIR}/japanese/p5-DateTime-Format-Japanese
 .endif
 
-.if defined(WITH_PUBLISHEXCEL)
+.if ${PORT_OPTIONS:MPUBLISHEXCEL}
 BUILD_DEPENDS+=	p5-Spreadsheet-WriteExcel>=0:${PORTSDIR}/textproc/p5-Spreadsheet-WriteExcel
 .endif
 
-.if defined(WITH_FILTERPIPE)
+.if ${PORT_OPTIONS:MFILTERPIPE}
 BUILD_DEPENDS+=	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run
 .endif
 
-.if defined(WITH_PUBLISHPLANET)
+.if ${PORT_OPTIONS:MPUBLISHPLANET}
 BUILD_DEPENDS+=	p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
 		p5-HTML-Scrubber>=0:${PORTSDIR}/www/p5-HTML-Scrubber
 .endif
 
-.if defined(WITH_PUBLISHCSV)
+.if ${PORT_OPTIONS:MPUBLISHCSV}
 BUILD_DEPENDS+=	p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV
 .endif
 
-.if defined(WITH_FILDEGYT)
+.if ${PORT_OPTIONS:MFILDEGYT}
 BUILD_DEPENDS+=	p5-WebService-YouTube>=0:${PORTSDIR}/www/p5-WebService-YouTube
 .endif
 
-.if defined(WITH_AUTHORNAME)
+.if ${PORT_OPTIONS:MAUTHORNAME}
 BUILD_DEPENDS+=	p5-Email-Address>=0:${PORTSDIR}/mail/p5-Email-Address
 .endif
 
-.if defined(WITH_GUESSLANG)
+.if ${PORT_OPTIONS:MGUESSLANG}
 BUILD_DEPENDS+=	p5-Lingua-ZH-HanDetect>=0:${PORTSDIR}/chinese/p5-Lingua-ZH-HanDetect \
 		p5-Text-Language-Guess>=0:${PORTSDIR}/textproc/p5-Text-Language-Guess
 .endif
 
-.if defined(WITH_GUESSTZ)
+.if ${PORT_OPTIONS:MGUESSTZ}
 BUILD_DEPENDS+=	p5-IP-Country>=0:${PORTSDIR}/net/p5-IP-Country
 .endif
 
-.if defined(WITH_HTMLTIDY)
+.if ${PORT_OPTIONS:MHTMLTIDY}
 BUILD_DEPENDS+=	p5-HTML-Tidy>=0:${PORTSDIR}/textproc/p5-HTML-Tidy
 .endif
 
-.if defined(WITH_PUBLISHMT)
+.if ${PORT_OPTIONS:MPUBLISHMT}
 BUILD_DEPENDS+=	p5-Net-MovableType>=0:${PORTSDIR}/net/p5-Net-MovableType
 .endif
 
-.if defined(WITH_PUBSERLZR)
+.if ${PORT_OPTIONS:MPUBSERLZR}
 BUILD_DEPENDS+=	p5-Data-Serializer>=0:${PORTSDIR}/devel/p5-Data-Serializer
 .endif
 
-.if defined(WITH_PUBICAL)
+.if ${PORT_OPTIONS:MPUBICAL}
 BUILD_DEPENDS+=	p5-Data-ICal>=0:${PORTSDIR}/deskutils/p5-Data-ICal \
 		p5-DateTime-Format-ICal>=0:${PORTSDIR}/devel/p5-DateTime-Format-ICal
 .endif
 
-.if defined(WITH_ROMANIZE)
+.if ${PORT_OPTIONS:MROMANIZE}
 BUILD_DEPENDS+=	ja-p5-Text-Kakasi>=0:${PORTSDIR}/japanese/p5-Text-Kakasi
 .endif
 
-.if defined(WITH_JAVASCRIPT)
+.if ${PORT_OPTIONS:MJAVASCRIPT}
 BUILD_DEPENDS+=	p5-Template-Plugin-JavaScript>=0:${PORTSDIR}/www/p5-Template-Plugin-JavaScript
 .endif
 
-.if defined(WITH_EMOTICON)
+.if ${PORT_OPTIONS:MEMOTICON}
 BUILD_DEPENDS+=	p5-Text-Emoticon>=0:${PORTSDIR}/textproc/p5-Text-Emoticon
 .endif
 
-.if defined(WITH_FILHATENA)
+.if ${PORT_OPTIONS:MFILHATENA}
 BUILD_DEPENDS+=	p5-Text-Hatena>=0:${PORTSDIR}/textproc/p5-Text-Hatena
 .endif
 
-.if defined(WITH_FILHATKTAG)
+.if ${PORT_OPTIONS:MFILHATKTAG}
 BUILD_DEPENDS+=	p5-Hatena-Keyword>=0:${PORTSDIR}/textproc/p5-Hatena-Keyword
 .endif
 
-.if !defined(WITHOUT_RULEFRESH)
+.if ${PORT_OPTIONS:MRULEFRESH}
 BUILD_DEPENDS+=	p5-Time-Duration-Parse>=0:${PORTSDIR}/devel/p5-Time-Duration-Parse
 .endif
 
-.if !defined(WITHOUT_SUBSCOPML)
+.if ${PORT_OPTIONS:MSUBSCOPML}
 BUILD_DEPENDS+=	p5-XML-OPML>=0:${PORTSDIR}/textproc/p5-XML-OPML
 .endif
 
-.if defined(WITH_FLICKRSEARCH)
+.if ${PORT_OPTIONS:MFLICKRSEARCH}
 BUILD_DEPENDS+=	p5-Flickr-API>=0:${PORTSDIR}/www/p5-Flickr-API \
 		p5-DateTime-Format-Epoch>=0:${PORTSDIR}/devel/p5-DateTime-Format-Epoch
 .endif
 
-.if defined(WITH_HATENABKMK)
+.if ${PORT_OPTIONS:MHATENABKMK}
 BUILD_DEPENDS+=	p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
 .endif
 
-.if defined(WITH_PALMDOC)
+.if ${PORT_OPTIONS:MPALMDOC}
 BUILD_DEPENDS+=	p5-Palm-PalmDoc>=0:${PORTSDIR}/palm/p5-Palm-PalmDoc
 .endif
 
-.if defined(WITH_PUBLISHSWF)
+.if ${PORT_OPTIONS:MPUBLISHSWF}
 BUILD_DEPENDS+=	p5-SWF-Builder>=0:${PORTSDIR}/graphics/p5-SWF-Builder \
 		libtext-wrapi18n-perl>=0:${PORTSDIR}/textproc/libtext-wrapi18n-perl
 .endif
 
-.if defined(WITH_SUBSCRDBI)
+.if ${PORT_OPTIONS:MSUBSCRDBI}
 BUILD_DEPENDS+=	p5-DBIx-Class>=0:${PORTSDIR}/databases/p5-DBIx-Class
 .endif
 
-.if defined(WITH_NOTIFYBEEP)
+.if ${PORT_OPTIONS:MNOTIFYBEEP}
 BUILD_DEPENDS+=	p5-Audio-Beep>=0:${PORTSDIR}/audio/p5-Audio-Beep
 .endif
 
-.if defined(WITH_FILTERPPT)
+.if ${PORT_OPTIONS:MFILTERPPT}
 BUILD_DEPENDS+=	p5-URI-Find>=0:${PORTSDIR}/textproc/p5-URI-Find
 .endif
 
-.if defined(WITH_KINOSEARCH)
+.if ${PORT_OPTIONS:MKINOSEARCH}
 BUILD_DEPENDS+=	p5-KinoSearch>=0:${PORTSDIR}/textproc/p5-KinoSearch
 .endif
 
-.if !defined(WITHOUT_PUBLISHGMAIL)
+.if ${PORT_OPTIONS:MPUBLISHGMAIL}
 BUILD_DEPENDS+=	p5-Net-SMTP-TLS>=0:${PORTSDIR}/mail/p5-Net-SMTP-TLS \
 		p5-MIME-Lite>=0:${PORTSDIR}/mail/p5-MIME-Lite \
 		p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
 .endif
 
-.if defined(WITH_PUBDELICIOUS)
+.if ${PORT_OPTIONS:MPUBDELICIOUS}
 BUILD_DEPENDS+=	p5-Net-Delicious>=0:${PORTSDIR}/net/p5-Net-Delicious
 .endif
 
-.if defined(WITH_ESTRAIER)
+.if ${PORT_OPTIONS:MESTRAIER}
 BUILD_DEPENDS+=	p5-Search-Estraier>=0:${PORTSDIR}/textproc/p5-Search-Estraier
 .endif
 
-.if defined(WITH_SRCHGREP)
+.if ${PORT_OPTIONS:MSRCHGREP}
 BUILD_DEPENDS+=	p5-File-Grep>=0:${PORTSDIR}/devel/p5-File-Grep
 .endif
 
-.if defined(WITH_PUBJSON)
+.if ${PORT_OPTIONS:MPUBJSON}
 BUILD_DEPENDS+=	p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
 .endif
 
-.if defined(WITH_FILSPAMASSN)
+.if ${PORT_OPTIONS:MFILSPAMASSN}
 BUILD_DEPENDS+=	p5-Mail-SpamAssassin>=0:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 .endif
 
-.if defined(WITH_PROFANITY)
+.if ${PORT_OPTIONS:MPROFANITY}
 BUILD_DEPENDS+=	p5-Regexp-Common-profanity_us>=0:${PORTSDIR}/textproc/p5-Regexp-Common-profanity_us
 .endif
 
-.if defined(WITH_HATENARSS)
+.if ${PORT_OPTIONS:MHATENARSS}
 BUILD_DEPENDS+=	p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize
 .endif
 
-.if defined(WITH_SUBSCRFOAF)
+.if ${PORT_OPTIONS:MSUBSCRFOAF}
 BUILD_DEPENDS+=	p5-XML-FOAF>=0:${PORTSDIR}/textproc/p5-XML-FOAF
 .endif
 
-.if defined(WITH_NOTIFYIRC)
+.if ${PORT_OPTIONS:MNOTIFYIRC}
 BUILD_DEPENDS+=	p5-POE-Component-IRC>=0:${PORTSDIR}/irc/p5-POE-Component-IRC \
 		p5-POE-Component-IKC>=0:${PORTSDIR}/devel/p5-POE-Component-IKC
 .endif
 
-.if defined(WITH_HATENADIARY)
+.if ${PORT_OPTIONS:MHATENADIARY}
 BUILD_DEPENDS+=	p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
 .endif
 
-.if defined(WITH_LIVEDOOR)
+.if ${PORT_OPTIONS:MLIVEDOOR}
 BUILD_DEPENDS+=	p5-WWW-Mechanize>=0:${PORTSDIR}/www/p5-WWW-Mechanize \
 		p5-YAML-Syck>=0:${PORTSDIR}/textproc/p5-YAML-Syck
 .endif
 
-.if defined(WITH_PINGSERVER)
+.if ${PORT_OPTIONS:MPINGSERVER}
 BUILD_DEPENDS+=	p5-HTML-RSSAutodiscovery>=0:${PORTSDIR}/www/p5-HTML-RSSAutodiscovery
 .endif
 
-.if defined(WITH_IMAGEINFO)
+.if ${PORT_OPTIONS:MIMAGEINFO}
 BUILD_DEPENDS+=	p5-Image-Info>=0:${PORTSDIR}/graphics/p5-Image-Info
 .endif
 
-.if defined(WITH_FILMRKDWN)
+.if ${PORT_OPTIONS:MFILMRKDWN}
 BUILD_DEPENDS+=	p5-Text-Markdown>=0:${PORTSDIR}/textproc/p5-Text-Markdown
 .endif
 
-.if defined(WITH_PUBLISHIMAP)
+.if ${PORT_OPTIONS:MPUBLISHIMAP}
 BUILD_DEPENDS+=	p5-Mail-IMAPClient>=0:${PORTSDIR}/mail/p5-Mail-IMAPClient
 .endif
 
-.if defined(WITH_PUBLISHPDF)
+.if ${PORT_OPTIONS:MPUBLISHPDF}
 BUILD_DEPENDS+=	p5-PDF-FromHTML>=0:${PORTSDIR}/textproc/p5-PDF-FromHTML
 .endif
 
-.if defined(WITH_BLOGLINES)
+.if ${PORT_OPTIONS:MBLOGLINES}
 BUILD_DEPENDS+=	p5-WebService-Bloglines>=0:${PORTSDIR}/www/p5-WebService-Bloglines
 .endif
 
-.if defined(WITH_BABELFISH)
+.if ${PORT_OPTIONS:MBABELFISH}
 BUILD_DEPENDS+=	p5-WWW-Babelfish>=0:${PORTSDIR}/www/p5-WWW-Babelfish
 .endif
 
-.if defined(WITH_CUSFEEDMIXI)
+.if ${PORT_OPTIONS:MCUSFEEDMIXI}
 BUILD_DEPENDS+=	p5-WWW-Mixi>=0:${PORTSDIR}/www/p5-WWW-Mixi
 .endif
 
-.if defined(WITH_CUSTOMSVNLOG)
+.if ${PORT_OPTIONS:MCUSTOMSVNLOG}
 BUILD_DEPENDS+=	p5-subversion>=0:${PORTSDIR}/devel/p5-subversion
 .endif
 
-.if defined(WITH_NTFYNETSEND)
+.if ${PORT_OPTIONS:MNTFYNETSEND}
 BUILD_DEPENDS+=	p5-Net-NetSend>=0:${PORTSDIR}/net-im/p5-Net-NetSend
 .endif
 
-.if defined(WITH_FILHTMLSCRB)
+.if ${PORT_OPTIONS:MFILHTMLSCRB}
 BUILD_DEPENDS+=	p5-HTML-Scrubber>=0:${PORTSDIR}/www/p5-HTML-Scrubber
 .endif
 
-.if defined(WITH_PLANETINI)
+.if ${PORT_OPTIONS:MPLANETINI}
 BUILD_DEPENDS+=	p5-Config-INI-Simple>=0:${PORTSDIR}/devel/p5-Config-INI-Simple
 .endif
 
-.if defined(WITH_SUMMARYENG)
+.if ${PORT_OPTIONS:MSUMMARYENG}
 BUILD_DEPENDS+=	p5-Lingua-EN-Summarize>=0:${PORTSDIR}/textproc/p5-Lingua-EN-Summarize
 .endif
 
-.if defined(WITH_SUMJPN)
+.if ${PORT_OPTIONS:MSUMJPN}
 BUILD_DEPENDS+=	ja-p5-Lingua-JA-Summarize-Extract>=0:${PORTSDIR}/japanese/p5-Lingua-JA-Summarize-Extract
 .endif
 
-.if defined(WITH_SUMTEXTORG)
+.if ${PORT_OPTIONS:MSUMTEXTORG}
 BUILD_DEPENDS+=	p5-Text-Original>=0:${PORTSDIR}/textproc/p5-Text-Original
 .endif
 
@@ -549,9 +559,9 @@ post-patch:
 	${RM} ${WRKSRC}/lib/Plagger/Plugin/Publish/Feed.pm.orig
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/*.yaml ${EXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/examples/*.yaml ${EXAMPLESDIR}
 .endif
 	@${MKDIR} ${DATADIR}/assets
 	(cd ${WRKSRC}/assets; ${TAR} cfz - . | ${TAR} zxf - -C ${DATADIR}/assets)
diff --git a/textproc/p5-Plagger/pkg-plist b/textproc/p5-Plagger/pkg-plist
index 8b7269e610b4..1ba5e1602869 100644
--- a/textproc/p5-Plagger/pkg-plist
+++ b/textproc/p5-Plagger/pkg-plist
@@ -237,21 +237,21 @@ bin/plagger-ircbot
 %%SITE_PERL%%/Plagger/Util.pm
 %%SITE_PERL%%/Plagger/Walker.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plagger/.packlist
-%%PORTDOCS%%%%EXAMPLESDIR%%/atode.yaml
-%%PORTDOCS%%%%EXAMPLESDIR%%/bloglines2gmail.yaml
-%%PORTDOCS%%%%EXAMPLESDIR%%/iefav2opml.yaml
-%%PORTDOCS%%%%EXAMPLESDIR%%/irc.yaml
-%%PORTDOCS%%%%EXAMPLESDIR%%/livedoorreader2gmail.yaml
-%%PORTDOCS%%%%EXAMPLESDIR%%/planet-old.yaml
-%%PORTDOCS%%%%EXAMPLESDIR%%/planet.yaml
-%%PORTDOCS%%%%EXAMPLESDIR%%/podcast.yaml
-%%PORTDOCS%%%%EXAMPLESDIR%%/rss2email.yaml
-%%PORTDOCS%%%%EXAMPLESDIR%%/schema.yaml
-%%PORTDOCS%%%%EXAMPLESDIR%%/search.yaml
-%%PORTDOCS%%%%EXAMPLESDIR%%/weather-notify.yaml
-%%PORTDOCS%%%%EXAMPLESDIR%%/xoxo-planet.yaml
-%%PORTDOCS%%%%EXAMPLESDIR%%/xoxo2opml.yaml
-%%PORTDOCS%%%%EXAMPLESDIR%%/yapcvideo.yaml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/atode.yaml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bloglines2gmail.yaml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iefav2opml.yaml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/irc.yaml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/livedoorreader2gmail.yaml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/planet-old.yaml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/planet.yaml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/podcast.yaml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rss2email.yaml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/schema.yaml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/search.yaml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/weather-notify.yaml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xoxo-planet.yaml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xoxo2opml.yaml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/yapcvideo.yaml
 %%DATADIR%%/assets/common/html.tt
 %%DATADIR%%/assets/common/mail.tt
 %%DATADIR%%/assets/plugins/CustomFeed-Script/domain-expire.pl
@@ -506,7 +506,7 @@ bin/plagger-ircbot
 @dirrm %%SITE_PERL%%/Plagger/Cache
 @dirrm %%SITE_PERL%%/Plagger
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Plagger
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%/assets/plugins/Widget-Simple
 @dirrm %%DATADIR%%/assets/plugins/Subscription-Planet
 @dirrm %%DATADIR%%/assets/plugins/Search-Spotlight