18 files changed, 31 insertions, 7 deletions

diff --git a/mail/archiveopteryx-devel/Makefile b/mail/archiveopteryx-devel/Makefile
index 752143ca5a37..06215dae68ac 100644
--- a/mail/archiveopteryx-devel/Makefile
+++ b/mail/archiveopteryx-devel/Makefile
@@ -42,6 +42,8 @@ PLIST_SUB+=	GROUPS="${GROUPS}"
 
 JAM?=		${LOCALBASE}/bin/jam
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 # force Clang when on FreeBSD
diff --git a/mail/archiveopteryx/Makefile b/mail/archiveopteryx/Makefile
index b03bb1728639..2f3e3fda266f 100644
--- a/mail/archiveopteryx/Makefile
+++ b/mail/archiveopteryx/Makefile
@@ -36,6 +36,8 @@ PLIST_SUB+=	GROUPS="${GROUPS}"
 JAM?=		${LOCALBASE}/bin/jam
 JAMARG+=	-dx
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
 # force Clang when on FreeBSD
diff --git a/mail/exim-doc-html/Makefile b/mail/exim-doc-html/Makefile
index 303a20f81a18..b8721c1f1d7a 100644
--- a/mail/exim-doc-html/Makefile
+++ b/mail/exim-doc-html/Makefile
@@ -24,6 +24,8 @@ AVAILABLE_FORMATS=	html \
 					postscript
 NO_BUILD=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 .if make(makesum) && !defined(FETCH_ALL)
 .error "You forgot to define FETCH_ALL to create the sane distinfo"
 .endif
diff --git a/mail/fastforward/Makefile b/mail/fastforward/Makefile
index f98698d6af08..0f18cd9e7880 100644
--- a/mail/fastforward/Makefile
+++ b/mail/fastforward/Makefile
@@ -19,6 +19,8 @@ PORTDOCS=	ALIASES
 
 PLIST_FILES=	${FILES:S,^,bin/,} ${FILES:S,^,man/man1/,:S,$,.1.gz,} ${FILES:S,^,man/cat1/,:S,$,.0.gz,}
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 .for binfile in ${FILES}
 	${INSTALL_PROGRAM} ${WRKSRC}/${binfile} ${STAGEDIR}${PREFIX}/bin/${binfile}
diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile
index 62116eedac31..246560acb761 100644
--- a/mail/imapfilter/Makefile
+++ b/mail/imapfilter/Makefile
@@ -30,6 +30,8 @@ MAKE_ARGS=	PREFIX=${PREFIX} \
 		MANDIR=${MANPREFIX}/man \
 		LIBLUA=-llua-${LUA_VER}
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} 's|-ldl ||' ${WRKSRC}/src/Makefile
 
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index fd05bf28ba68..5edf2dfb17f3 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -40,7 +40,7 @@ OPTIONS_SUB=		yes
 OPTIONS_SINGLE=		RESOLV
 OPTIONS_SINGLE_RESOLV=	STOCK_RESOLVER UNBOUND
 OPTIONS_DEFINE=		FILTER CURL GNUTLS JANSSON LDNS LMDB LUA MEMCACHED \
-			BDB_BASE OPENDBX OPENLDAP POPAUTH QUERY_CACHE SASL
+			BDB_BASE OPENDBX OPENLDAP POPAUTH QUERY_CACHE SASL DOCS
 OPTIONS_DEFAULT=	FILTER LUA UNBOUND
 
 STOCK_RESOLVER_DESC=	Use the stock resolver library
@@ -100,8 +100,6 @@ QUERY_CACHE_CONFIGURE_ENABLE=	query_cache
 SASL_DESC=		Enable SASL authentication with LDAP
 SASL_CONFIGURE_WITH=	sasl
 
-DOCS_CONFIGURE_ON=	--docdir=${WRKDIR}/doc
-
 MAKE_ARGS+=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
 MAKE_ENV=	INSTALL_STRIP_FLAG=${STRIP}
 
diff --git a/mail/opendmarc/Makefile b/mail/opendmarc/Makefile
index fdbcd20c1b9f..2a6f92f252fb 100644
--- a/mail/opendmarc/Makefile
+++ b/mail/opendmarc/Makefile
@@ -30,7 +30,7 @@ USE_RC_SUBR=	opendmarc
 
 GNU_CONFIGURE=	yes
 
-OPTIONS_DEFINE=		SPF
+OPTIONS_DEFINE=		SPF DOCS
 OPTIONS_DEFAULT=	SPF
 
 SPF_DESC=		Enable support for SPF record checking
diff --git a/mail/openemm2013/Makefile b/mail/openemm2013/Makefile
index 3422f1a239b9..4ac8bb8956fc 100644
--- a/mail/openemm2013/Makefile
+++ b/mail/openemm2013/Makefile
@@ -67,6 +67,8 @@ ANT_TARGETS=	build
 ANT_BUILD_PARAM=	-Dbuild=${WRKSRC}/target -Doe.home=${WRKSRC}/target -Dcatalina.home=${TOMCATDIR} -Dsrc=${WRKSRC} -f openemm_build.xml
 JAVA_BUILD=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 do-extract:
 	@cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${DISTNAME}.tar.gz ${EXTRACT_AFTER_ARGS}
 
diff --git a/mail/openemm2015/Makefile b/mail/openemm2015/Makefile
index 71a7c916fe01..aa04b8766248 100644
--- a/mail/openemm2015/Makefile
+++ b/mail/openemm2015/Makefile
@@ -64,6 +64,8 @@ ANT_TARGETS=	build
 ANT_BUILD_PARAM=	-Dbuild=${WRKSRC}/target -Doe.home=${WRKSRC}/target -Dbin=${WRKSRC}/target/bin -Dcatalina.home=${TOMCATDIR} -Dsrc=${WRKSRC} -f openemm_build.xml
 JAVA_BUILD=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 do-extract:
 	@cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${DISTNAME}.tar.gz ${EXTRACT_AFTER_ARGS}
 
diff --git a/mail/ovs/Makefile b/mail/ovs/Makefile
index fcf0f6921fd6..85d9e8904c9b 100644
--- a/mail/ovs/Makefile
+++ b/mail/ovs/Makefile
@@ -35,6 +35,8 @@ PLIST_SUB=	CGIDIR=${CGIDIR:S,${PREFIX}/,,} WWWROOT=${WWWROOT:S,${PREFIX}/,,} \
 
 PORTDOCS=	README CHANGES COPYING CHANGES.old README.old
 
+OPTIONS_DEFINE=	DOCS
+
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You may set following options:"
diff --git a/mail/policyd2/Makefile b/mail/policyd2/Makefile
index b87eda5c6908..599d76d131de 100644
--- a/mail/policyd2/Makefile
+++ b/mail/policyd2/Makefile
@@ -32,7 +32,7 @@ SHEBANG_FILES=	cbpadmin \
 WWWDIR=		${PREFIX}/www/policyd
 PORTDOCS=	AUTHORS ChangeLog INSTALL TODO WISHLIST
 
-OPTIONS_DEFINE=	MYSQL PGSQL SQLITE WEBUI
+OPTIONS_DEFINE=	MYSQL PGSQL SQLITE WEBUI DOCS
 OPTIONS_DEFAULT=MYSQL WEBUI
 MYSQL_DESC=	Add a dependency on DBD::mysql
 PGSQL_DESC=	Add a dependency on DBD::Pg
diff --git a/mail/postfix-policyd-sf/Makefile b/mail/postfix-policyd-sf/Makefile
index 033e4dde8292..d782040804df 100644
--- a/mail/postfix-policyd-sf/Makefile
+++ b/mail/postfix-policyd-sf/Makefile
@@ -34,6 +34,8 @@ PLIST_FILES=	sbin/${REALNAME}-cleanup \
 		sbin/${REALNAME} \
 		etc/${REALNAME}.conf.sample
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,policyd.pid,postfix-policyd-sf.pid,' \
 		${WRKSRC}/policyd.conf
diff --git a/mail/pysieved/Makefile b/mail/pysieved/Makefile
index ff5a2718b441..c5fbe4da9ced 100644
--- a/mail/pysieved/Makefile
+++ b/mail/pysieved/Makefile
@@ -23,6 +23,8 @@ SUB_LIST=	PORTNAME=${PORTNAME} PYTHON_CMD=${PYTHON_CMD}
 
 PORTDOCS=	COPYING README README.Dovecot THANKS
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	${REINPLACE_CMD} \
 		's!/usr/bin/env python!${PYTHON_CMD}!' \
diff --git a/mail/ratelimit-policyd/Makefile b/mail/ratelimit-policyd/Makefile
index 5c04d9670b0a..1f921908300c 100644
--- a/mail/ratelimit-policyd/Makefile
+++ b/mail/ratelimit-policyd/Makefile
@@ -36,6 +36,8 @@ PLIST_FILES=	bin/ratelimit-policyd.pl \
 PORTDATA=	mysql-schema.sql
 PORTDOCS=	README.md
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g" ${WRKSRC}/rc.d/ratelimit-policyd
 	${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g" ${WRKSRC}/ratelimit-policyd.pl
diff --git a/mail/sieve-connect/Makefile b/mail/sieve-connect/Makefile
index c77405a87619..6b39d8000f8b 100644
--- a/mail/sieve-connect/Makefile
+++ b/mail/sieve-connect/Makefile
@@ -30,6 +30,8 @@ PLIST_FILES=	bin/sieve-connect \
 
 PORTDOCS=	ChangeLog README.md TODO
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/sieve-connect \
 		${STAGEDIR}${PREFIX}/bin/sieve-connect
diff --git a/mail/slapd-cyrus/Makefile b/mail/slapd-cyrus/Makefile
index 9537f9ad0430..73995b4682ba 100644
--- a/mail/slapd-cyrus/Makefile
+++ b/mail/slapd-cyrus/Makefile
@@ -28,6 +28,8 @@ PLIST_SUB=	SITE_PERL_REL=${SITE_PERL_REL} \
 
 PORTDOCS=	slapd-cyrus.conf.sample
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
 	${INSTALL_DATA} -m 0444 ${WRKSRC}/t/etc/slapd.conf.dist \
diff --git a/mail/spmfilter-clamav/Makefile b/mail/spmfilter-clamav/Makefile
index 409fe463e407..d831b21db94e 100644
--- a/mail/spmfilter-clamav/Makefile
+++ b/mail/spmfilter-clamav/Makefile
@@ -19,7 +19,7 @@ CMAKE_ARGS+=	--no-warn-unused-cli \
 
 USE_LDCONFIG=	${PREFIX}/lib/spmfilter
 
-OPTIONS_DEFINE=	DEBUG
+OPTIONS_DEFINE=	DEBUG DOCS
 
 DEBUG_CMAKE_ON=	-DENABLE_DEBUG=TRUE
 
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index 0d85773c254f..ae6ff7413c88 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -99,7 +99,7 @@ USE_RC_SUBR=	sympa
 
 CONFLICTS=	sympa-5*
 
-OPTIONS_DEFINE=	FASTCGI APACHE
+OPTIONS_DEFINE=	FASTCGI APACHE DOCS
 OPTIONS_DEFAULT=APACHE
 OPTIONS_RADIO=	DATABASE
 OPTIONS_RADIO_DATABASE=	PGSQL SYBASE MYSQL