Add DOCS option for ports with PORTDOCS in plist.

12 files changed, 59 insertions, 46 deletions

diff --git a/mail/annoyance-filter/Makefile b/mail/annoyance-filter/Makefile
index 90474de680a2..0643dbe80ced 100644
--- a/mail/annoyance-filter/Makefile
+++ b/mail/annoyance-filter/Makefile
@@ -18,6 +18,8 @@ DOCS=		COPYING INSTALL README *.pdf
 
 CFLAGS=		${CPPFLAGS}
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}-run ${STAGEDIR}${PREFIX}/bin
diff --git a/mail/archivemail/Makefile b/mail/archivemail/Makefile
index b223abd28717..9c4920718ac4 100644
--- a/mail/archivemail/Makefile
+++ b/mail/archivemail/Makefile
@@ -16,6 +16,8 @@ NO_BUILD=	yes
 DOCS=		CHANGELOG FAQ NEWS README TODO
 EXAMPLES=	test_archivemail examples/archivemail_all
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/archivemail ${STAGEDIR}${PREFIX}/bin/archivemail
 	${INSTALL_MAN} ${WRKSRC}/archivemail.1 ${STAGEDIR}${MANPREFIX}/man/man1
diff --git a/mail/bmf/Makefile b/mail/bmf/Makefile
index a9baad14256c..2aa554a51722 100644
--- a/mail/bmf/Makefile
+++ b/mail/bmf/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Fst Bayesian Mail Filter compatible with maildrop and procmail
 
 HAS_CONFIGURE=	yes
 
-OPTIONS_DEFINE=		BDB MYSQL DEBUG
-OPTIONS_DEFAULT=	BDB
+OPTIONS_DEFINE=	BDB MYSQL DEBUG DOCS
+OPTIONS_DEFAULT=BDB
 
 BDB_USE=	BDB=40+
 BDB_CONFIGURE_WITH=	libdb
diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index 9365150b397c..720b05032450 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -35,6 +35,8 @@ CONFIGURE_ENV=	REHASH="${PERL} ${SCRIPTDIR}/c_rehash"
 
 INSTALL_TARGET=	install-strip
 
+OPTIONS_DEFINE=	DOCS
+
 post-extract:
 		@${MKDIR} ${WRKDIR}/ncursesw
 		${LN} -s ${LOCALBASE}/include/ncurses/ncurses.h ${WRKDIR}/ncursesw/curses.h
diff --git a/mail/ez-pine-gpg/Makefile b/mail/ez-pine-gpg/Makefile
index 880ce7051b21..0064c4ee7dab 100644
--- a/mail/ez-pine-gpg/Makefile
+++ b/mail/ez-pine-gpg/Makefile
@@ -17,6 +17,8 @@ RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 WRKSRC=	${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
 	(cd ${WRKSRC} && ./install ${STAGEDIR}${PREFIX}/bin)
 
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 1288825ee0eb..a955d648fb66 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -60,7 +60,7 @@ OPTIONS_MULTI=		AUTHLIB
 AUTHLIB_DESC=		Courier Auth Library support
 .endif
 
-OPTIONS_DEFINE+=	DOVECOTAUTH FAM GDBM IDN MAILWRAPPER
+OPTIONS_DEFINE+=	DOVECOTAUTH FAM GDBM IDN MAILWRAPPER DOCS
 
 DOVECOTAUTH_DESC=	Dovecot Authentication support
 MAILWRAPPER_DESC=	Let configure guess which sendmail binary to use
diff --git a/mail/ruby-rfilter/Makefile b/mail/ruby-rfilter/Makefile
index e67be6c0a540..9c9537e4d650 100644
--- a/mail/ruby-rfilter/Makefile
+++ b/mail/ruby-rfilter/Makefile
@@ -20,6 +20,8 @@ RUBY_SETUP=	install.rb
 
 DOCS=		NEWS README THANKS TODO doc
 
+OPTIONS_DEFINE=	DOCS
+
 post-extract:
 	${FIND} ${WRKSRC} -name '*~' -delete
 
diff --git a/mail/ruby-rmail/Makefile b/mail/ruby-rmail/Makefile
index 599c1cc43a31..a1a4f61faca5 100644
--- a/mail/ruby-rmail/Makefile
+++ b/mail/ruby-rmail/Makefile
@@ -18,6 +18,8 @@ RUBY_SETUP=	install.rb
 
 DOCS=		NEWS NOTES README THANKS TODO doc
 
+OPTIONS_DEFINE=	DOCS
+
 post-extract:
 	${FIND} ${WRKSRC} -name '*~' -delete
 
diff --git a/mail/squirrelmail-decode/Makefile b/mail/squirrelmail-decode/Makefile
index 1cd776562808..bdc5a09fbe35 100644
--- a/mail/squirrelmail-decode/Makefile
+++ b/mail/squirrelmail-decode/Makefile
@@ -1,27 +1,29 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=		squirrelmail-decode
+PORTNAME=	squirrelmail-decode
 PORTVERSION=	1.2
-CATEGORIES=		mail www
+CATEGORIES=	mail www
 MASTER_SITES=	SF/squirrelmail/decode/${PORTVERSION}
 DIST_SUBDIR=	squirrelmail
 
-MAINTAINER=		adamw@FreeBSD.org
-COMMENT=		Decoders to display extra character sets in SquirrelMail
+MAINTAINER=	adamw@FreeBSD.org
+COMMENT=	Decoders to display extra character sets in SquirrelMail
 
-LICENSE=		GPLv2
+LICENSE=	GPLv2
 
 RUN_DEPENDS=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
 
-USES=			tar:bzip2
-NO_BUILD=		yes
+USES=		tar:bzip2
+NO_BUILD=	yes
 
-DOCSDIR=		${PREFIX}/share/doc/squirrelmail/decode
+DOCSDIR=	${PREFIX}/share/doc/squirrelmail/decode
 
 # if you were using WITHOUT_WWWDIR, use SQUIRRELDIR=${PREFIX}/squirrelmail
 SQUIRRELDIR?=	${PREFIX}/www/squirrelmail
-PLIST_SUB=		SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}"
+PLIST_SUB=	SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}"
+
+OPTIONS_DEFINE=	DOCS
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${SQUIRRELDIR}/functions/decode
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 83e4950986d9..f332cf5faebc 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -25,7 +25,7 @@ USES=		gettext tar:bzip2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}.stable/${PORTNAME}
 
-OPTIONS_DEFINE=	DATABASE LDAP
+OPTIONS_DEFINE=	DATABASE LDAP DOCS
 DATABASE_DESC=	PEAR database support (must also install a driver)
 
 # if you were using WITHOUT_WWWDIR, use SQUIRRELDIR=${PREFIX}/squirrelmail
@@ -37,9 +37,9 @@ USERS=		${SMUSER}
 GROUPS=		${SMGROUP}
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} \
-			SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}" \
-			SMUSER=${SMUSER} \
-			SMGROUP=${SMGROUP}
+		SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}" \
+		SMUSER=${SMUSER} \
+		SMGROUP=${SMGROUP}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	SQUIRRELDIR=${SQUIRRELDIR} SMUSER=${SMUSER} SMGROUP=${SMGROUP}
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index e770db4525f9..de97f9de745e 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -13,9 +13,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python-based SPAM reduction system
 
-.if defined(WITH_CDB)
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cdbmodule.so:${PORTSDIR}/databases/py-cdb
-.endif
+OPTIONS_DEFINE=	CDB DOCS EXAMPLES
+CDB_RUN_DEPENDS=${PYTHON_SITELIBDIR}/cdbmodule.so:${PORTSDIR}/databases/py-cdb
 
 USE_PYTHON=	yes
 
diff --git a/mail/tmda/pkg-plist b/mail/tmda/pkg-plist
index 86b8fc39bab9..7bd279f86915 100644
--- a/mail/tmda/pkg-plist
+++ b/mail/tmda/pkg-plist
@@ -100,33 +100,33 @@ bin/tmda-sendmail
 @dirrm %%PYTHON_SITELIBDIR%%/TMDA/pythonlib
 @dirrm %%PYTHON_SITELIBDIR%%/TMDA/Queue
 @dirrm %%PYTHON_SITELIBDIR%%/TMDA
-%%EXAMPLESDIR%%/collectaddys
-%%EXAMPLESDIR%%/def2html
-%%EXAMPLESDIR%%/dot-tmda/README
-%%EXAMPLESDIR%%/dot-tmda/config
-%%EXAMPLESDIR%%/dot-tmda/crypt_key
-%%EXAMPLESDIR%%/dot-tmda/filters/incoming
-%%EXAMPLESDIR%%/dot-tmda/filters/outgoing
-%%EXAMPLESDIR%%/dot-tmda/lists/blacklist
-%%EXAMPLESDIR%%/dot-tmda/lists/confirmed
-%%EXAMPLESDIR%%/dot-tmda/lists/whitelist
-%%EXAMPLESDIR%%/printcdb
-%%EXAMPLESDIR%%/printdbm
-%%EXAMPLESDIR%%/sendit.sh
-%%EXAMPLESDIR%%/smtp-check-sender
-%%EXAMPLESDIR%%/tmda.el
-%%EXAMPLESDIR%%/tofmipd.init
-%%EXAMPLESDIR%%/tofmipd.sysconfig
-%%EXAMPLESDIR%%/update-internaldomains
-%%EXAMPLESDIR%%/vadduser-tmda
-%%EXAMPLESDIR%%/vmailmgr-vdir.sh
-%%EXAMPLESDIR%%/vpopmail-vdir.sh
-%%EXAMPLESDIR%%/vtmdarc
-%%EXAMPLESDIR%%/wrapfd3.sh
-@dirrm %%EXAMPLESDIR%%/dot-tmda/lists
-@dirrm %%EXAMPLESDIR%%/dot-tmda/filters
-@dirrm %%EXAMPLESDIR%%/dot-tmda
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/collectaddys
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/def2html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot-tmda/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot-tmda/config
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot-tmda/crypt_key
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot-tmda/filters/incoming
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot-tmda/filters/outgoing
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot-tmda/lists/blacklist
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot-tmda/lists/confirmed
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot-tmda/lists/whitelist
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printcdb
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/printdbm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sendit.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smtp-check-sender
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tmda.el
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tofmipd.init
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tofmipd.sysconfig
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/update-internaldomains
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vadduser-tmda
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vmailmgr-vdir.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vpopmail-vdir.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vtmdarc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wrapfd3.sh
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dot-tmda/lists
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dot-tmda/filters
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dot-tmda
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%DATADIR%%/bounce_expired_dated.txt
 %%DATADIR%%/bounce_fail_dated.txt
 %%DATADIR%%/bounce_fail_keyword.txt