According to the Porter's Handbook (5.12.2.3.) default options must be added to

OPTIONS_DEFINE. This policy has been implemented only recently that's why we
have many ports violating this policy.

This patch adds the default options specified in the Porter's Handbook to
OPTIONS_DEFINE where they are being used. Ports maintained by
gnome@FreeBSD.org, kde@FreeBSD.org and x11@FreeBSD.org have been excluded.

Approved by:    portmgr (bapt)

17 files changed, 45 insertions, 0 deletions

diff --git a/mail/bayespam/Makefile b/mail/bayespam/Makefile
index bc81f6fdf019..cacdf804761e 100644
--- a/mail/bayespam/Makefile
+++ b/mail/bayespam/Makefile
@@ -22,6 +22,9 @@ FILES_DOCS=	AUTHORS COPYING Changelog INSTALL README TODO \
 FILES_SCRIPTS=	bayes_process_email.pl bayes_spam_check.pl bayestest.pl
 
 NO_STAGE=	yes
+
+OPTIONS_DEFINE=	DOCS 
+
 .include <bsd.port.options.mk>
 
 post-patch:
diff --git a/mail/elmo-devel/Makefile b/mail/elmo-devel/Makefile
index fec3a6b3d62e..8226d328447b 100644
--- a/mail/elmo-devel/Makefile
+++ b/mail/elmo-devel/Makefile
@@ -24,6 +24,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+OPTIONS_DEFINE=	NLS 
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
diff --git a/mail/getmail/Makefile b/mail/getmail/Makefile
index c6dd445ce0fc..886a3868f6ca 100644
--- a/mail/getmail/Makefile
+++ b/mail/getmail/Makefile
@@ -19,6 +19,9 @@ MAN1=		getmail.1 getmail_fetch.1 getmail_maildir.1 getmail_mbox.1
 PORTDOCS=	README BUGS CHANGELOG THANKS TODO *.txt *.html *.css
 
 NO_STAGE=	yes
+
+OPTIONS_DEFINE=	DOCS EXAMPLES 
+
 .include <bsd.port.options.mk>
 
 post-install:
diff --git a/mail/gml/Makefile b/mail/gml/Makefile
index 9ad78cb136dd..8ea35dc15120 100644
--- a/mail/gml/Makefile
+++ b/mail/gml/Makefile
@@ -21,6 +21,9 @@ PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	README
 
 NO_STAGE=	yes
+
+OPTIONS_DEFINE=	DOCS 
+
 .include <bsd.port.options.mk>
 
 post-patch:
diff --git a/mail/milter-manager/Makefile b/mail/milter-manager/Makefile
index 96c4f1ecd5c4..9ed5bd6341c9 100644
--- a/mail/milter-manager/Makefile
+++ b/mail/milter-manager/Makefile
@@ -28,6 +28,9 @@ USE_LDCONFIG=	yes
 USE_RUBY=	yes
 
 NO_STAGE=	yes
+
+OPTIONS_DEFINE=	DOCS 
+
 .include <bsd.port.options.mk>
 
 MANLANG=	"" ja
diff --git a/mail/mutt_vc_query/Makefile b/mail/mutt_vc_query/Makefile
index 5118cce268c5..9410a21fe224 100644
--- a/mail/mutt_vc_query/Makefile
+++ b/mail/mutt_vc_query/Makefile
@@ -20,6 +20,8 @@ CFLAGS+=	-I${PREFIX}/include \
 PORTDOCS=	*
 PLIST_FILES=	bin/mutt_vc_query man/man1/mutt_vc_query.1.gz
 
+OPTIONS_DEFINE=	DOCS 
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
diff --git a/mail/postfixadmin/Makefile b/mail/postfixadmin/Makefile
index 4928cd3a86f1..ae807fc6ae93 100644
--- a/mail/postfixadmin/Makefile
+++ b/mail/postfixadmin/Makefile
@@ -25,6 +25,9 @@ MYSQLI_DESC=	MySQL 4.1+ back-end (use mysqli PHP extension)
 OPTIONS_DEFAULT=	MYSQL
 
 NO_STAGE=	yes
+
+OPTIONS_DEFINE=	DOCS 
+
 .include <bsd.port.options.mk>
 
 USE_PHP=	pcre session mbstring spl xmlrpc
diff --git a/mail/postgrey/Makefile b/mail/postgrey/Makefile
index a322a885fa14..cd58b7d43264 100644
--- a/mail/postgrey/Makefile
+++ b/mail/postgrey/Makefile
@@ -40,6 +40,9 @@ USES=		shebangfix perl5
 SHEBANG_FILES=	${WRKSRC}/postgrey
 
 NO_STAGE=	yes
+
+OPTIONS_DEFINE=	DOCS 
+
 .include <bsd.port.options.mk>
 
 post-patch:
diff --git a/mail/qmail-activedir/Makefile b/mail/qmail-activedir/Makefile
index bdf189d5e2da..d44e36483973 100644
--- a/mail/qmail-activedir/Makefile
+++ b/mail/qmail-activedir/Makefile
@@ -30,6 +30,9 @@ WANT_OPENLDAP_VER=	${WITH_OPENLDAP_VER}
 .endif
 
 NO_STAGE=	yes
+
+OPTIONS_DEFINE=	DOCS 
+
 .include <bsd.port.options.mk>
 
 post-patch:
diff --git a/mail/sma/Makefile b/mail/sma/Makefile
index 6df79a2240a9..ee856ddeb034 100644
--- a/mail/sma/Makefile
+++ b/mail/sma/Makefile
@@ -14,6 +14,8 @@ ALL_TARGET=	sma
 SAMPLEFILES=	sma.conf
 DOCSFILES=	BUGS COPYRIGHT HISTORY README TODO
 
+OPTIONS_DEFINE=	DOCS EXAMPLES 
+
 .include <bsd.port.options.mk>
 
 do-configure:
diff --git a/mail/spamd/Makefile b/mail/spamd/Makefile
index f63d4d27a31f..2712065ef8d0 100644
--- a/mail/spamd/Makefile
+++ b/mail/spamd/Makefile
@@ -51,6 +51,9 @@ SUB_LIST=	PREFIX=${PREFIX} \
 		${PLIST_SUB}
 
 NO_STAGE=	yes
+
+OPTIONS_DEFINE=	DOCS 
+
 .include <bsd.port.options.mk>
 
 pre-install:
diff --git a/mail/spamstats/Makefile b/mail/spamstats/Makefile
index 8567ce15e26b..31d158c881ea 100644
--- a/mail/spamstats/Makefile
+++ b/mail/spamstats/Makefile
@@ -26,6 +26,8 @@ post-patch:
 	@${REINPLACE_CMD} -i '' -e 's|mail.log|maillog|g' \
 		${WRKSRC}/${PORTNAME}${PORTVERSION}.pl
 
+OPTIONS_DEFINE=	DOCS 
+
 .include <bsd.port.options.mk>
 
 do-install:
diff --git a/mail/svnmailer/Makefile b/mail/svnmailer/Makefile
index c018e968701b..2c0314949a4c 100644
--- a/mail/svnmailer/Makefile
+++ b/mail/svnmailer/Makefile
@@ -24,6 +24,9 @@ MAN1=		svn-mailer.1
 PORTDOCS=	*
 
 NO_STAGE=	yes
+
+OPTIONS_DEFINE=	DOCS 
+
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MDOCS}
diff --git a/mail/vqregister/Makefile b/mail/vqregister/Makefile
index e79d33f1d16a..73616b8e4d84 100644
--- a/mail/vqregister/Makefile
+++ b/mail/vqregister/Makefile
@@ -23,6 +23,8 @@ NEED_ROOT=	yes
 
 DOCS=		CONFIG CONTRIBUTORS FORM HISTORY TEMPLATE
 
+OPTIONS_DEFINE=	DOCS 
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
diff --git a/mail/wmpop3lb/Makefile b/mail/wmpop3lb/Makefile
index 43268a44947a..7e961118ed41 100644
--- a/mail/wmpop3lb/Makefile
+++ b/mail/wmpop3lb/Makefile
@@ -30,6 +30,8 @@ post-patch:
 			  -e "s,/usr/X11R6,${LOCALBASE},g" \
 		${BUILD_WRKSRC}/Makefile
 
+OPTIONS_DEFINE=	DOCS 
+
 .include <bsd.port.options.mk>
 
 do-install:
diff --git a/mail/xf-spf/Makefile b/mail/xf-spf/Makefile
index f21d0a9c7720..7760ad172dfc 100644
--- a/mail/xf-spf/Makefile
+++ b/mail/xf-spf/Makefile
@@ -24,6 +24,9 @@ PLIST_SUB=	QMAIL_PREFIX=${QMAIL_PREFIX}
 PORTDOCS=	README TODO CHANGELOG COPYRIGHT
 
 NO_STAGE=	yes
+
+OPTIONS_DEFINE=	DOCS 
+
 .include <bsd.port.options.mk>
 
 post-install:
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index 768377770bc2..8242012dc77d 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -16,6 +16,9 @@ USE_XORG=	xaw
 MAN1=		xmailbox.1
 
 NO_STAGE=	yes
+
+OPTIONS_DEFINE=	DOCS 
+
 .include <bsd.port.options.mk>
 
 post-patch: