Add DOCS to OPTIONS_DEFINE to ports that check for PORT_OPTIONS:MDOCS.

44 files changed, 128 insertions, 114 deletions

diff --git a/mail/assp/Makefile b/mail/assp/Makefile
index c77736c..f8fd638 100644
--- a/mail/assp/Makefile
+++ b/mail/assp/Makefile
@@ -37,7 +37,7 @@ SUB_LIST=	ASSP_USER="${ASSP_USER}" ASSP_GROUP="${ASSP_GROUP}" \
 USE_RC_SUBR=	${PORTNAME}
 
 OPTIONS_DEFINE=	EMVALID LDAP SPF SRS SEND FBACKW CLAMAV DNSBL MYSQL \
-		MATCHRE SENDERB MIMEMOD SSL IPV6
+		MATCHRE SENDERB MIMEMOD SSL IPV6 DOCS
 
 EMVALID_DESC=	RFC822 recipient address validator
 LDAP_DESC=	LDAP validation of recipient addresses
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index dbefd89..34700b6 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -107,7 +107,7 @@ SUB_LIST:=	${PLIST_SUB}
 SUB_FILES+=	pkg-message crontab sharedindexupdate
 #SUB_FILES+=	pkg-install pkg-message crontab sharedindexupdate
 
-OPTIONS_DEFINE=	LDAP PROCMAIL SENDFAX UUCP IPV6 MAILDROPFLAGS
+OPTIONS_DEFINE=	LDAP PROCMAIL SENDFAX UUCP IPV6 MAILDROPFLAGS DOCS
 OPTIONS_GROUP=	WEBMAIL
 #OPTIONS_GROUP=	SYSTEM WEBMAIL
 #OPTIONS_GROUP_SYSTEM=	RCCONF MAILCONF PERIODIC
diff --git a/mail/crm114/Makefile b/mail/crm114/Makefile
index 4e8343e..e106d74 100644
--- a/mail/crm114/Makefile
+++ b/mail/crm114/Makefile
@@ -26,7 +26,7 @@ CRM114RELEASENAME=BlameMichelson
 USES=		gettext iconv
 USE_CSTD=gnu89
 
-OPTIONS_DEFINE=	NORMALIZEMIME
+OPTIONS_DEFINE=	NORMALIZEMIME DOCS EXAMPLES
 NORMALIZEMIME_DESC=	Normalize MIME encoding
 
 MAKE_ARGS=	CC="${CC}" prefix="${STAGEDIR}${PREFIX}" \
diff --git a/mail/crm114/pkg-plist b/mail/crm114/pkg-plist
index be2b4ac..036637b 100644
--- a/mail/crm114/pkg-plist
+++ b/mail/crm114/pkg-plist
@@ -18,20 +18,20 @@ bin/osbf-util
 %%PORTDOCS%%%%DOCSDIR%%/Macbeth_Act_IV.txt
 %%PORTDOCS%%%%DOCSDIR%%/The_Wind_in_the_Willows_Chap_1.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/reto_procmailrc.recipe
-%%EXAMPLESDIR%%/mailfilter.crm
-%%EXAMPLESDIR%%/mailfilter.cf
-%%EXAMPLESDIR%%/mailreaver.crm
-%%EXAMPLESDIR%%/mailtrainer.crm
-%%EXAMPLESDIR%%/maillib.crm
-%%EXAMPLESDIR%%/shuffle.crm
-%%EXAMPLESDIR%%/rewriteutil.crm
-%%EXAMPLESDIR%%/rewrites.mfp
-%%EXAMPLESDIR%%/whitelist.mfp
-%%EXAMPLESDIR%%/blacklist.mfp
-%%EXAMPLESDIR%%/priolist.mfp
-%%EXAMPLESDIR%%/priolist.mfp.example
-%%EXAMPLESDIR%%/blacklist.mfp.example
-%%EXAMPLESDIR%%/whitelist.mfp.example
-%%EXAMPLESDIR%%/crm114-mode.el
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/reto_procmailrc.recipe
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mailfilter.crm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mailfilter.cf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mailreaver.crm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mailtrainer.crm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/maillib.crm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shuffle.crm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rewriteutil.crm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rewrites.mfp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/whitelist.mfp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklist.mfp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/priolist.mfp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/priolist.mfp.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/blacklist.mfp.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/whitelist.mfp.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crm114-mode.el
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 1463327..311576a 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -42,7 +42,7 @@ MAKE_JOBS_UNSAFE=	yes
 OPTIONS_DEFINE=		AUTOCREATE AUTOSIEVE BDB DRAC IDLED \
 			LDAP_PTLOADER LISTEXT MURDER MYSQL \
 			NETSCAPEHACK NNTP PGSQL REPLICATION SNMP_5 \
-			SQLITE
+			SQLITE DOCS EXAMPLES
 OPTIONS_DEFAULT=	BDB
 OPTIONS_SUB=		yes
 AUTOCREATE_DESC=	Use autocreate INBOX patch (UoA)
diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist
index 4dcd506..cec25a2 100644
--- a/mail/cyrus-imapd23/pkg-plist
+++ b/mail/cyrus-imapd23/pkg-plist
@@ -119,7 +119,7 @@ man/man3/imclient.3.gz
 man/man5/cyrus.conf.5.gz
 man/man5/imapd.conf.5.gz
 man/man5/krb.equiv.5.gz
-%%EXAMPLESDIR%%/imapd.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/imapd.conf
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 36ea677..5af1d44 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -41,7 +41,7 @@ MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=		AUTOCREATE AUTOSIEVE BDB DRAC IDLED LDAP \
 			MURDER MYSQL NETSCAPEHACK NNTP PGSQL \
-			REPLICATION SNMP SQLITE
+			REPLICATION SNMP SQLITE DOCS EXAMPLES
 OPTIONS_DEFAULT=	BDB
 OPTIONS_SUB=		yes
 AUTOCREATE_DESC=	Use autocreate INBOX patch (UoA)
diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist
index 8c66c7b..4c89c0b 100644
--- a/mail/cyrus-imapd24/pkg-plist
+++ b/mail/cyrus-imapd24/pkg-plist
@@ -120,7 +120,7 @@ man/man3/imclient.3.gz
 man/man5/cyrus.conf.5.gz
 man/man5/imapd.conf.5.gz
 man/man5/krb.equiv.5.gz
-%%EXAMPLESDIR%%/imapd.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/imapd.conf
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
index e8a3424..4435240 100644
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@@ -39,6 +39,8 @@ SITE+=		${FILESDIR}/site.config.m4
 SITE_SUB+=	-e "s|%%PREFIX%%|${PREFIX}|g" \
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g"
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 WITHOUT_MILTER_CFLAGS=	yes
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 61c93fa..f9cf221 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -55,7 +55,7 @@ PROTOCOLS=	imap pop3
 # Default requirement for dovecot rc script
 _REQUIRE=	LOGIN
 
-OPTIONS_DEFINE=	KQUEUE SSL MANAGESIEVE GSSAPI VPOPMAIL BDB LDAP PGSQL MYSQL SQLITE
+OPTIONS_DEFINE=	KQUEUE SSL MANAGESIEVE GSSAPI VPOPMAIL BDB LDAP PGSQL MYSQL SQLITE DOCS
 OPTIONS_DEFAULT=	KQUEUE SSL MANAGESIEVE
 KQUEUE_DESC=		kqueue(2) support
 MANAGESIEVE_DESC=	ManageSieve support
diff --git a/mail/drac/Makefile b/mail/drac/Makefile
index da3490d..48f2d88 100644
--- a/mail/drac/Makefile
+++ b/mail/drac/Makefile
@@ -20,7 +20,7 @@ PLIST_FILES=	sbin/rpc.dracd include/drac.h lib/libdrac.a \
 USE_CSTD=	gnu89
 
 MAKE_JOBS_UNSAFE=	yes
-OPTIONS_DEFINE=		DB
+OPTIONS_DEFINE=		DB DOCS
 OPTIONS_RADIO=		MUA
 OPTIONS_RADIO_MUA=	POSTFIX EXIM
 POSTFIX_DESC=		Use POSTFIX
diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index f2d639d..ae3b52c 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -40,7 +40,7 @@ OPTIONS_DEFINE=	SYSLOG DEBUG VERBOSE_DEBUG BNR_DEBUG PREF_EXT DAEMON \
 		MYSQL_LOCAL PGSQL_LOCAL HASH EXTERNAL_LOOKUP \
 		USER_HOMEDIR TRUSTED_USERS VIRT_USERS LONG_USERNAMES \
 		LARGE_SCALE DOMAIN_SCALE NICESENDMAIL POSTFIX_MBC \
-		QMAIL WEBUI LIGHTTPD
+		QMAIL WEBUI LIGHTTPD DOCS
 
 OPTIONS_MULTI=	DB
 OPTIONS_MULTI_DB=	MYSQL51 MYSQL55 PGSQL SQLITE2 SQLITE3
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 99bdd23..cb33dbf 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -22,7 +22,7 @@ OPTIONS_DEFINE=	SYSLOG DEBUG VERBOSE_DEBUG BNR_DEBUG PREF_EXT DAEMON \
 		CLAMAV CLAMAV_LOCAL EXTERNAL_LOOKUP \
 		USER_HOMEDIR TRUSTED_USERS VIRT_USERS LONG_USERNAMES \
 		LARGE_SCALE DOMAIN_SCALE NICESENDMAIL POSTFIX_MBC \
-		QMAIL WEBUI LIGHTTPD
+		QMAIL WEBUI LIGHTTPD DOCS EXAMPLES
 
 OPTIONS_MULTI=	DB
 OPTIONS_MULTI_DB=	HASH MYSQL MYSQL_COMPRESS MYSQL_LOCAL \
diff --git a/mail/enma/Makefile b/mail/enma/Makefile
index c7596d5..3e57c80 100644
--- a/mail/enma/Makefile
+++ b/mail/enma/Makefile
@@ -32,6 +32,8 @@ MANLANG=	"" ja_JP.UTF-8
 PORTDOCS=	ChangeLog INSTALL LICENSE README
 SUB_FILES=	milter-enma
 
+OPTIONS_DEFINE=	DOCS
+
 .if defined(WITH_POSTFIX_MILTER) || defined(WITH_POSTFIX) || defined(WITH_POSTFIX_CURRENT)
 CONF_SUB=	${REINPLACE_CMD} -e '/milter\.postfix/s/false/true/' ${WRKSRC}/enma/etc/enma.conf.sample
 . if defined(WITH_POSTFIX_CURRENT)
diff --git a/mail/exim/options b/mail/exim/options
index 1df7e6e..2e318f3 100644
--- a/mail/exim/options
+++ b/mail/exim/options
@@ -6,6 +6,7 @@ OPTIONS_DEFINE+=	ALT_CONFIG_PREFIX \
 			DISABLE_D_OPT \
 			DKIM \
 			DMARC \
+			DOCS \
 			EMBEDDED_PERL \
 			EXIMON \
 			ICONV \
diff --git a/mail/ezmlm/Makefile b/mail/ezmlm/Makefile
index 9aa8b28..476da51 100644
--- a/mail/ezmlm/Makefile
+++ b/mail/ezmlm/Makefile
@@ -28,6 +28,8 @@ PROGRAMS=	ezmlm-make ezmlm-manage ezmlm-send ezmlm-reject ezmlm-return \
 		ezmlm-warn ezmlm-weed ezmlm-list ezmlm-sub ezmlm-unsub
 DOCS=		BLURB INSTALL README THANKS TODO
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.options.mk>
 
 post-patch:
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 45b0e11..30d8374 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -36,7 +36,7 @@ CONFIGURE_ARGS=	--enable-opie --enable-RPA --enable-SDPS \
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	X11 NLS NTLM GSSAPI POP2
+OPTIONS_DEFINE=	X11 NLS NTLM GSSAPI POP2 DOCS
 OPTIONS_DEFAULT=	GSSAPI
 OPTIONS_SUB=	yes
 X11_DESC=	Python/Tkinter dependencies for ``fetchmailconf''
diff --git a/mail/gld/Makefile b/mail/gld/Makefile
index 7b67d0c..fce4e8c 100644
--- a/mail/gld/Makefile
+++ b/mail/gld/Makefile
@@ -18,7 +18,7 @@ SUB_FILES=	pkg-message
 
 OPTIONS_SINGLE=	DB
 OPTIONS_SINGLE_DB=	MYSQL PGSQL
-OPTIONS_DEFINE=	LOCAL_DB_SERVER
+OPTIONS_DEFINE=	LOCAL_DB_SERVER DOCS
 OPTIONS_DEFAULT=	MYSQL
 LOCAL_DB_SERVER_DESC=	RUN_DEPEND also on selected DB server
 
diff --git a/mail/gubby/Makefile b/mail/gubby/Makefile
index 4885e04..76fe190 100644
--- a/mail/gubby/Makefile
+++ b/mail/gubby/Makefile
@@ -14,7 +14,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 LDFLAGS+=	-lncurses
 CFLAGS+=	-fno-exceptions -fno-rtti
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 do-build:
 	cd ${WRKSRC} && \
@@ -44,10 +44,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gubby ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/gubby.1 ${STAGEDIR}${PREFIX}/man/man1
 
-.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.TXT ${STAGEDIR}${DOCSDIR}/README
-.endif
 
 .include <bsd.port.mk>
diff --git a/mail/hashcash/Makefile b/mail/hashcash/Makefile
index 5ee7a6c..d3d6508 100644
--- a/mail/hashcash/Makefile
+++ b/mail/hashcash/Makefile
@@ -26,6 +26,8 @@ ALL_TARGET=	generic
 
 MAKE_ENV+= STAGEDIR=${STAGEDIR}
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MDOCS}
diff --git a/mail/mailfront/Makefile b/mail/mailfront/Makefile
index 6216af9c..0bc33c7 100644
--- a/mail/mailfront/Makefile
+++ b/mail/mailfront/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Mail server network protocol front-ends
 
 LIB_DEPENDS=	libcvm-v2client.so:${PORTSDIR}/security/cvm
 
-OPTIONS_DEFINE=	LUA
+OPTIONS_DEFINE=	LUA DOCS
 
 OPTIONS_DEFAULT=LUA
 OPTIONS_SUB=	yes
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 3d0e152..cef0efa 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -54,7 +54,7 @@ SUB_LIST=	DATADIR=${DATADIR} \
 		ETC_FILES="${ETC_FILES}" \
 		MCP_FILES="${MCP_FILES}"
 
-OPTIONS_DEFINE=		SPAMASSASSIN CLAMAV CLAMAVMODULE BDC
+OPTIONS_DEFINE=		SPAMASSASSIN CLAMAV CLAMAVMODULE BDC DOCS
 SPAMASSASSIN_DESC=	Install SpamAssassin
 CLAMAV_DESC=		Install ClamAV
 CLAMAVMODULE_DESC=	Install ClamAV Module
diff --git a/mail/meta1/Makefile b/mail/meta1/Makefile
index 2b8fad6..7dc9377 100644
--- a/mail/meta1/Makefile
+++ b/mail/meta1/Makefile
@@ -43,7 +43,7 @@ EXTRA_SBIN=	libcheck/noroot libconf/tree libmta/statit \
 META1CONFDIR?=	${PREFIX}/etc/meta1
 NOLOGIN_CMD?=	/usr/sbin/nologin
 
-OPTIONS_DEFINE=	BDB PMILTER DKIM MSP SASL2 SASL2AUTHD TLS
+OPTIONS_DEFINE=	BDB PMILTER DKIM MSP SASL2 SASL2AUTHD TLS DOCS
 OPTIONS_DEFAULT=	BDB PMILTER DKIM SASL2 TLS
 NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
diff --git a/mail/milter-bogom/Makefile b/mail/milter-bogom/Makefile
index 459a542..442f0c6 100644
--- a/mail/milter-bogom/Makefile
+++ b/mail/milter-bogom/Makefile
@@ -26,6 +26,8 @@ PLIST_FILES=	sbin/bogom \
 
 PORTDOCS=	README CHANGELOG
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.options.mk>
 
 post-patch:
diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index e644777..4858ea5 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -29,7 +29,7 @@ MAKE_JOBS_UNSAFE=	yes
 # installed port preference over it.
 ##
 
-OPTIONS_DEFINE=		MANPAGES SPF GEOIP CURL LDAP P0F POSTFIX
+OPTIONS_DEFINE=		MANPAGES SPF GEOIP CURL LDAP P0F POSTFIX DOCS EXAMPLES
 OPTIONS_DEFAULT=	MANPAGES
 SPF_DESC=		SPF support
 CURL_DESC=		curl support
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 5208e25..cd799ba 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -62,7 +62,7 @@ LITE=	YES
 .if defined (LITE)
 OPTIONS_UNSET=	NLS DOCS EXAMPLES
 .else
-OPTIONS_DEFINE=	COMPRESSED_FOLDERS SASL DEBUG FLOCK \
+OPTIONS_DEFINE=	COMPRESSED_FOLDERS SASL DEBUG DOCS EXAMPLES FLOCK \
 		GPGME GREETING_PATCH GSSAPI HTML ICONV IDN IFDEF_PATCH \
 		IMAP_HEADER_CACHE LOCALES_FIX MAILBOX_MANPAGES \
 		MAILDIR_HEADER_CACHE MAILDIR_MTIME_PATCH \
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index b4c924e..a377586 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -25,7 +25,7 @@ COMMENT?=	The Mongrel of Mailers (part Elm, Pine, Mush, mh, etc.)
 CONFLICTS?=	ja-mutt-[0-9]* ja-mutt-devel-[0-9]* mutt-devel-[0-9]* mutt-devel-lite-[0-9]* mutt-lite-[0-9]* zh-mutt-devel-[0-9]* mutt-[^1].[^4]*
 PKGNAMESUFFIX=	14
 
-OPTIONS_DEFINE=	NLS LOCALES_FIX MUTT_XFACE MUTT_FLOCK MUTT_ICONV GSSAPI
+OPTIONS_DEFINE=	NLS LOCALES_FIX MUTT_XFACE MUTT_FLOCK MUTT_ICONV GSSAPI DOCS EXAMPLES
 OPTIONS_DEFAULT=	MUTT_FLOCK MUTT_ICONV GSSAPI
 
 OPTIONS_RADIO=		CONS
diff --git a/mail/mutt14/pkg-plist b/mail/mutt14/pkg-plist
index 828b085..8d0f601 100644
--- a/mail/mutt14/pkg-plist
+++ b/mail/mutt14/pkg-plist
@@ -8,55 +8,55 @@ man/man1/mutt.1.gz
 man/man1/mutt_dotlock.1.gz
 man/man5/mbox.5.gz
 man/man5/muttrc.5.gz
-%%DOCSDIR%%/COPYRIGHT
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/GPL
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/PGP-Notes.txt
-%%DOCSDIR%%/README
-%%DOCSDIR%%/README.SECURITY
-%%DOCSDIR%%/README.SSL
-%%DOCSDIR%%/TODO
-%%DOCSDIR%%/applying-patches.txt
-%%DOCSDIR%%/devel-notes.txt
-%%DOCSDIR%%/manual.txt
-%%DOCSDIR%%/patch-notes.txt
-%%DOCSDIR%%/html/manual.html
-%%DOCSDIR%%/html/manual-1.html
-%%DOCSDIR%%/html/manual-2.html
-%%DOCSDIR%%/html/manual-3.html
-%%DOCSDIR%%/html/manual-4.html
-%%DOCSDIR%%/html/manual-5.html
-%%DOCSDIR%%/html/manual-6.html
-%%DOCSDIR%%/html/manual-7.html
-%%EXAMPLESDIR%%/Mush.rc
-%%EXAMPLESDIR%%/Pine.rc
-%%EXAMPLESDIR%%/Tin.rc
-%%EXAMPLESDIR%%/gpg.rc
-%%EXAMPLESDIR%%/iconv/iconv.aix-3.2.5.rc
-%%EXAMPLESDIR%%/iconv/iconv.aix-4.1.5.rc
-%%EXAMPLESDIR%%/iconv/iconv.aix-4.2.0.rc
-%%EXAMPLESDIR%%/iconv/iconv.aix-4.3.2.rc
-%%EXAMPLESDIR%%/iconv/iconv.freebsd-3.3.rc
-%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.3.rc
-%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.90.rc
-%%EXAMPLESDIR%%/iconv/iconv.hpux-10.01.rc
-%%EXAMPLESDIR%%/iconv/iconv.hpux-10.20.rc
-%%EXAMPLESDIR%%/iconv/iconv.hpux-11.00.rc
-%%EXAMPLESDIR%%/iconv/iconv.irix-6.5.rc
-%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0a.rc
-%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0d.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.4.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.5.1.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6-cjk.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6.rc
-%%EXAMPLESDIR%%/iconv/iconv.solaris-2.7.rc
-%%EXAMPLESDIR%%/pgp2.rc
-%%EXAMPLESDIR%%/pgp6.rc
-%%EXAMPLESDIR%%/sample.mailcap
-%%EXAMPLESDIR%%/sample.muttrc
-%%EXAMPLESDIR%%/sample.muttrc-tlr
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/GPL
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/PGP-Notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.SECURITY
+%%PORTDOCS%%%%DOCSDIR%%/README.SSL
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/applying-patches.txt
+%%PORTDOCS%%%%DOCSDIR%%/devel-notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/manual.txt
+%%PORTDOCS%%%%DOCSDIR%%/patch-notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-5.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-6.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-7.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Mush.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Pine.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Tin.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gpg.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-3.2.5.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-4.1.5.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-4.2.0.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.aix-4.3.2.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.freebsd-3.3.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.3.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.90.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.hpux-10.01.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.hpux-10.20.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.hpux-11.00.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.irix-6.5.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0a.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0d.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.4.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.5.1.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6-cjk.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iconv/iconv.solaris-2.7.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp2.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pgp6.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.mailcap
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.muttrc-tlr
 %%NLS%%share/locale/bg/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/mutt.mo
@@ -84,7 +84,7 @@ man/man5/muttrc.5.gz
 %%NLS%%share/locale/uk/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/mutt.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/mutt.mo
-@dirrm %%EXAMPLESDIR%%/iconv
-@dirrm %%EXAMPLESDIR%%
-@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/iconv
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/noattach/Makefile b/mail/noattach/Makefile
index aa56dca..23a5c5b 100644
--- a/mail/noattach/Makefile
+++ b/mail/noattach/Makefile
@@ -15,6 +15,8 @@ CFLAGS+=	${PTHREAD_CFLAGS:S=""==}
 DOCSFILES=	AUTHORS THANKS INSTALL NEWS README TODO ChangeLog
 SAMPLEFILES=	README noattach.patterns noattach.patterns.johncon
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 .include <bsd.port.pre.mk>
 
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index bd81545..9ca1ca2 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -34,7 +34,7 @@ PORTDOCS=	*
 OPTIONS_SINGLE=		RESOLV
 OPTIONS_SINGLE_RESOLV=	STOCK_RESOLVER UNBOUND
 OPTIONS_DEFINE=		FILTER GNUTLS LUA MEMCACHED BDB_BASE OPENDBX OPENLDAP \
-			POPAUTH QUERY_CACHE STATS DEBUG
+			POPAUTH QUERY_CACHE STATS DEBUG DOCS
 OPTIONS_DEFAULT=	FILTER LUA UNBOUND
 
 STOCK_RESOLVER_DESC=	Use the stock resolver library
diff --git a/mail/phplist/Makefile b/mail/phplist/Makefile
index 000383f..8d0bbca 100644
--- a/mail/phplist/Makefile
+++ b/mail/phplist/Makefile
@@ -26,6 +26,8 @@ PORTDOCS=	BUGS INSTALL NEWS PEOPLE README README.batches \
 
 SUB_FILES=	phplist
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.options.mk>
 
 post-extract:
diff --git a/mail/postfix-logwatch/Makefile b/mail/postfix-logwatch/Makefile
index adbdb29..8bec84b 100644
--- a/mail/postfix-logwatch/Makefile
+++ b/mail/postfix-logwatch/Makefile
@@ -22,12 +22,12 @@ USE_PERL5=	run
 NO_BUILD=	yes
 SHEBANG_FILES=	${PORTNAME}
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
-	@cd ${WRKSRC} && ${REINPLACE_CMD} -e '\
-		s!/usr/local/etc!${ETCDIR}! \
-		' ${PORTNAME} ${PORTNAME}.1 README
+	@(cd ${WRKSRC} && \
+		${REINPLACE_CMD} -e 's!/usr/local/etc!${ETCDIR}' \
+		${PORTNAME} ${PORTNAME}.1 README)
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
@@ -36,16 +36,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample
 
 post-install:
-	@if [ ! -f ${ETCDIR}/${PORTNAME}.conf ]; then \
-		${CP} -p ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample ${STAGEDIR}${ETCDIR}/${PORTNAME}.conf; \
-	fi
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
-.endif
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/mail/py-spambayes/Makefile b/mail/py-spambayes/Makefile
index f3e19ca..d4db6e1 100644
--- a/mail/py-spambayes/Makefile
+++ b/mail/py-spambayes/Makefile
@@ -45,6 +45,8 @@ PORTDOCS=	CHANGELOG.txt \
 		utilities/ \
 		contrib/
 
+OPTIONS_DEFINE=	DOCS
+
 post-extract:
 	@${CHMOD} -Rf u+w ${WRKSRC}
 
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 74f9a54..29318a0 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -179,6 +179,8 @@ PATCH_SITES+=	${MASTER_SITE_LOCAL:S/$/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls
 PATCH_SITE_SUBDIR+=	bdrewery/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip
 PATCH_SITES+=	http://mirror.shatow.net/freebsd/qmail/:DEFAULT,dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota,blockexec,doublebounce,spf,spf_tls,localtime,qmtpc_outgoingip
 
+OPTIONS_DEFINE+=DOCS
+
 .if !defined(BARRIER_SMTP_AUTH_PATCH)
 SMTP_AUTH_VERSION=	0.31
 SMTP_AUTH_DIR=		${WRKDIR}/qmail-smtpd-auth-${SMTP_AUTH_VERSION}
diff --git a/mail/raysfilter/Makefile b/mail/raysfilter/Makefile
index 8cb9cbf..deaeaa8 100644
--- a/mail/raysfilter/Makefile
+++ b/mail/raysfilter/Makefile
@@ -18,6 +18,8 @@ BINFILES=	mf-reset mf-start mf-stop mf-archive mf-analyze mf-memory
 DOCSFILES=	rays-filter.html install.html configure.html operate.html \
 		utilities.html GNU-public-licence.txt copyright.txt README
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index fecefca..2dce2aa 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -30,7 +30,7 @@ PLIST_SUB+=	PREFIX=${PREFIX:S=${PREFIX}/==} MANPREFIX=${MANPREFIX:S=$=/=:S=${PRE
 PKGMESSAGE=	${WRKSRC}/pkg-message
 MILTER_SOVER?=	6
 
-OPTIONS_DEFINE?=	SHMEM SEM LA NIS IPV6 TLS SASL SASLAUTHD LDAP BDB SOCKETMAP CYRUSLOOKUP PICKY_HELO_CHECK MILTER MILTER_SHARED MILTER_POOL
+OPTIONS_DEFINE?=	SHMEM SEM LA NIS IPV6 TLS SASL SASLAUTHD LDAP BDB SOCKETMAP CYRUSLOOKUP PICKY_HELO_CHECK MILTER MILTER_SHARED MILTER_POOL DOCS
 OPTIONS_DEFAULT?=	SHMEM SEM LA NIS IPV6 PICKY_HELO_CHECK MILTER MILTER_SHARED MILTER_POOL
 NO_OPTIONS_SORT=yes
 SHMEM_DESC=		System V shared memory support
diff --git a/mail/sentinel/Makefile b/mail/sentinel/Makefile
index 6ed5f6a..0eb54d9 100644
--- a/mail/sentinel/Makefile
+++ b/mail/sentinel/Makefile
@@ -17,6 +17,8 @@ NEED_ROOT=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
diff --git a/mail/sid-milter/Makefile b/mail/sid-milter/Makefile
index 0e1c663..1296224 100644
--- a/mail/sid-milter/Makefile
+++ b/mail/sid-milter/Makefile
@@ -28,7 +28,7 @@ IGNORE=		your system does not support sysvipc
 .endif
 .endif
 
-OPTIONS_DEFINE=	LIBAR NH_MFROM
+OPTIONS_DEFINE=	LIBAR NH_MFROM DOCS
 LIBAR_DESC=	build and install libar
 NH_MFROM_DESC=	use NH_MFROM
 
diff --git a/mail/simscan/Makefile b/mail/simscan/Makefile
index c526b82..d832646 100644
--- a/mail/simscan/Makefile
+++ b/mail/simscan/Makefile
@@ -28,7 +28,7 @@ SUB_LIST=	QMAIL_PREFIX=${QMAIL_PREFIX} \
 PLIST_SUB=	QMAIL_PREFIX=${QMAIL_PREFIX} \
 		SIMSCAN_DIR=${PORTNAME}
 
-OPTIONS_DEFINE=	CLAMAV RIPMIME SPAMD USER DOMAIN ATTACH DROPMSG PASSTHRU HEADERS DSPAM
+OPTIONS_DEFINE=	CLAMAV RIPMIME SPAMD USER DOMAIN ATTACH DROPMSG PASSTHRU HEADERS DSPAM DOCS
 OPTIONS_DEFAULT=	CLAMAV RIPMIME
 CLAMAV_DESC=	Support for ClamAV Virus Scanning
 RIPMIME_DESC=	Ripmime Processing (if Clamav ScanMail disabled)
diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile
index f9fb30a..958ab1a 100644
--- a/mail/spamass-milter/Makefile
+++ b/mail/spamass-milter/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 LICENSE=	GPLv2
 
 
-OPTIONS_DEFINE=	ADDAUTH_PATCH REJECTTEXT_PATCH LDAP SENDMAIL_PORT IPV6
+OPTIONS_DEFINE=	ADDAUTH_PATCH REJECTTEXT_PATCH LDAP SENDMAIL_PORT IPV6 DOCS
 ADDAUTH_PATCH_DESC=	Bypass checks for SMTP AUTH connections
 REJECTTEXT_PATCH_DESC=	Customize SMTP reject message
 SENDMAIL_PORT_DESC=	Build against sendmail port
diff --git a/mail/spamilter/Makefile b/mail/spamilter/Makefile
index 074c746..849367e 100644
--- a/mail/spamilter/Makefile
+++ b/mail/spamilter/Makefile
@@ -37,7 +37,7 @@ PLIST_FILES+=	bin/dnsblchk bin/dnsblupd bin/ipfwmtad bin/mxlookup \
 PORTDOCS=	Changelog INSTALL LICENSE docs.html docs.txt db.rcpt \
 		db.rdnsbl db.sndr policy.html spamilter.rc
 
-OPTIONS_DEFINE=	SMTP_AFTER_POP3 PAM LIBSPF
+OPTIONS_DEFINE=	SMTP_AFTER_POP3 PAM LIBSPF DOCS
 SMTP_AFTER_POP3_DESC=	SMTP after POP3
 LIBSPF_DESC=	build with libspf
 
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 0e9ef15..20f8625 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 CFLAGS:=	-I${LOCALBASE}/include -L${LOCALBASE}/lib ${CFLAGS:S/^[:space:]*//}
 CXXFLAGS:=	-I${LOCALBASE}/include ${CXXFLAGS:S/^[:space:]*//}
 
-OPTIONS_DEFINE=	CACHEDIR FAM GDBM GZIP HTTPS HTTPS_LOGIN ISPELL MIMETYPES SENTRENAME CHARSET
+OPTIONS_DEFINE=	CACHEDIR FAM GDBM GZIP HTTPS HTTPS_LOGIN ISPELL MIMETYPES SENTRENAME CHARSET DOCS
 OPTIONS_DEFAULT=	CACHEDIR FAM GZIP SENTRENAME
 CACHEDIR_DESC=	Cache logins
 FAM_DESC=	Build in fam support for IDLE command
diff --git a/mail/tkrat2/Makefile b/mail/tkrat2/Makefile
index 6df5ed4..4ed6a78 100644
--- a/mail/tkrat2/Makefile
+++ b/mail/tkrat2/Makefile
@@ -28,7 +28,7 @@ CONFIGURE_ARGS=	--with-tcl-config=${PREFIX}/lib/tcl8.4 \
 		--prefix=${PREFIX}
 MAKE_ARGS+=	-j2 -B
 
-OPTIONS=	DOCS
+OPTIONS_DEFINE=	DOCS
 
 DOCFILES=	CONFIGURATION COPYRIGHT README doc/interface doc/userprocs \
 		doc/userproc.example
diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile
index d4a5a54..a5b1186 100644
--- a/mail/tpop3d/Makefile
+++ b/mail/tpop3d/Makefile
@@ -19,7 +19,7 @@ CONFIGURE_ARGS=	--enable-auth-other \
 		--enable-tls \
 		--with-mailspool-directory=/var/mail
 
-OPTIONS_DEFINE=	LDAP PERLAUTH PASSWDAUTH FLATAUTH GDBMAUTH MAILDIR MBOXINDICES DRAC FIX_PERLAUTH
+OPTIONS_DEFINE=	LDAP PERLAUTH PASSWDAUTH FLATAUTH GDBMAUTH MAILDIR MBOXINDICES DRAC FIX_PERLAUTH DOCS
 OPTIONS_RADIO=	DB
 OPTIONS_RADIO_DB=	MYSQL PGSQL
 DB_DESC=		Authentication database