In some straightforward situations, protect examples behind PORTEXAMPLES,

adding EXAMPLES to OPTIONS_DEFINE where necessary. In a couple instances,
correct examples being controlled by the DOCS option.

11 files changed, 78 insertions, 78 deletions

diff --git a/mail/ask/Makefile b/mail/ask/Makefile
index 2e28d109e9a3..2907dc41d134 100644
--- a/mail/ask/Makefile
+++ b/mail/ask/Makefile
@@ -17,7 +17,7 @@ BINS=		askfilter asksetup utils/asksenders
 SUB_FILES=	pkg-message
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-extract:
 	@${REINPLACE_CMD} -E \
diff --git a/mail/ask/pkg-plist b/mail/ask/pkg-plist
index d6a19272ce5a..96bdc58a46f9 100644
--- a/mail/ask/pkg-plist
+++ b/mail/ask/pkg-plist
@@ -13,17 +13,17 @@ lib/ask/test.py
 man/man1/askfilter.1.gz
 man/man1/asksenders.1.gz
 man/man1/asksetup.1.gz
-%%EXAMPLESDIR%%/ask.rc
-%%EXAMPLESDIR%%/confirm_da.txt
-%%EXAMPLESDIR%%/confirm_de.txt
-%%EXAMPLESDIR%%/confirm_en.txt
-%%EXAMPLESDIR%%/confirm_es.txt
-%%EXAMPLESDIR%%/confirm_fi.txt
-%%EXAMPLESDIR%%/confirm_fr.txt
-%%EXAMPLESDIR%%/confirm_it.txt
-%%EXAMPLESDIR%%/confirm_nl.txt
-%%EXAMPLESDIR%%/confirm_ptbr.txt
-%%EXAMPLESDIR%%/ignorelist.txt
-%%EXAMPLESDIR%%/whitelist.txt
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ask.rc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/confirm_da.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/confirm_de.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/confirm_en.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/confirm_es.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/confirm_fi.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/confirm_fr.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/confirm_it.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/confirm_nl.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/confirm_ptbr.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ignorelist.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/whitelist.txt
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm lib/ask
diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index 9ecfddd96c9f..c2f9393c98ac 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 DOCS
+		QMAIL WEBUI LIGHTTPD DOCS EXAMPLES
 
 OPTIONS_MULTI=	DB
 OPTIONS_MULTI_DB=	MYSQL51 MYSQL55 PGSQL SQLITE2 SQLITE3
diff --git a/mail/dspam-devel/pkg-plist b/mail/dspam-devel/pkg-plist
index ba71190e81d7..3501922c0b34 100644
--- a/mail/dspam-devel/pkg-plist
+++ b/mail/dspam-devel/pkg-plist
@@ -106,23 +106,23 @@ libdata/pkgconfig/dspam.pc
 %%PORTDOCS%%%%DOCSDIR%%/UPDATING
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-4.1.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-space.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-speed.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/purge-4.1.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/purge.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/virtual_user_aliases.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/virtual_users.sql
-%%MYSQL%%@dirrm %%EXAMPLESDIR%%/mysql
-%%PGSQL%%%%EXAMPLESDIR%%/pgsql/pgsql_objects.sql
-%%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge.sql
-%%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge-pe.sql
-%%PGSQL%%%%EXAMPLESDIR%%/pgsql/virtual_users.sql
-%%PGSQL%%@dirrm %%EXAMPLESDIR%%/pgsql
-%%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge-2.sql
-%%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge-3.sql
-%%SQLITE%%@dirrm %%EXAMPLESDIR%%/sqlite
-@dirrmtry %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-4.1.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-space.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-speed.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/purge-4.1.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/purge.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/virtual_user_aliases.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/virtual_users.sql
+%%PORTEXAMPLES%%%%MYSQL%%@dirrm %%EXAMPLESDIR%%/mysql
+%%PORTEXAMPLES%%%%PGSQL%%%%EXAMPLESDIR%%/pgsql/pgsql_objects.sql
+%%PORTEXAMPLES%%%%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge.sql
+%%PORTEXAMPLES%%%%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge-pe.sql
+%%PORTEXAMPLES%%%%PGSQL%%%%EXAMPLESDIR%%/pgsql/virtual_users.sql
+%%PORTEXAMPLES%%%%PGSQL%%@dirrm %%EXAMPLESDIR%%/pgsql
+%%PORTEXAMPLES%%%%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge-2.sql
+%%PORTEXAMPLES%%%%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge-3.sql
+%%PORTEXAMPLES%%%%SQLITE%%@dirrm %%EXAMPLESDIR%%/sqlite
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
 %%WebUI%%%%WWWDIR%%/admins.sample
 %%WebUI%%%%WWWDIR%%/admin.cgi
 %%WebUI%%%%WWWDIR%%/admingraph.cgi
diff --git a/mail/dspam/pkg-plist b/mail/dspam/pkg-plist
index bb125584e8e8..2b9feecb5a26 100644
--- a/mail/dspam/pkg-plist
+++ b/mail/dspam/pkg-plist
@@ -92,23 +92,23 @@ libdata/pkgconfig/dspam.pc
 %%PORTDOCS%%%%DOCSDIR%%/UPDATING
 %%PORTDOCS%%%%DOCSDIR%%/UPGRADING
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-4.1.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-space.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-speed.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/purge-4.1.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/purge.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/virtual_user_aliases.sql
-%%MYSQL%%%%EXAMPLESDIR%%/mysql/virtual_users.sql
-%%MYSQL%%@dirrm %%EXAMPLESDIR%%/mysql
-%%PGSQL%%%%EXAMPLESDIR%%/pgsql/pgsql_objects.sql
-%%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge.sql
-%%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge-pe.sql
-%%PGSQL%%%%EXAMPLESDIR%%/pgsql/virtual_users.sql
-%%PGSQL%%@dirrm %%EXAMPLESDIR%%/pgsql
-%%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge-2.sql
-%%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge-3.sql
-%%SQLITE%%@dirrm %%EXAMPLESDIR%%/sqlite
-@dirrmtry %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-4.1.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-space.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-speed.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/purge-4.1.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/purge.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/virtual_user_aliases.sql
+%%PORTEXAMPLES%%%%MYSQL%%%%EXAMPLESDIR%%/mysql/virtual_users.sql
+%%PORTEXAMPLES%%%%MYSQL%%@dirrm %%EXAMPLESDIR%%/mysql
+%%PORTEXAMPLES%%%%PGSQL%%%%EXAMPLESDIR%%/pgsql/pgsql_objects.sql
+%%PORTEXAMPLES%%%%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge.sql
+%%PORTEXAMPLES%%%%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge-pe.sql
+%%PORTEXAMPLES%%%%PGSQL%%%%EXAMPLESDIR%%/pgsql/virtual_users.sql
+%%PORTEXAMPLES%%%%PGSQL%%@dirrm %%EXAMPLESDIR%%/pgsql
+%%PORTEXAMPLES%%%%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge-2.sql
+%%PORTEXAMPLES%%%%SQLITE%%%%EXAMPLESDIR%%/sqlite/purge-3.sql
+%%PORTEXAMPLES%%%%SQLITE%%@dirrm %%EXAMPLESDIR%%/sqlite
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
 %%WebUI%%%%WWWDIR%%/admins.sample
 %%WebUI%%%%WWWDIR%%/admin.cgi
 %%WebUI%%%%WWWDIR%%/admingraph.cgi
diff --git a/mail/libspf/Makefile b/mail/libspf/Makefile
index 32d021c52526..679deb87ff8f 100644
--- a/mail/libspf/Makefile
+++ b/mail/libspf/Makefile
@@ -21,7 +21,7 @@ USE_LDCONFIG=	yes
 
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	RFC_RECURSION LOGFILE_STATS DEBUG DOCS
+OPTIONS_DEFINE=	RFC_RECURSION LOGFILE_STATS DEBUG DOCS EXAMPLES
 RFC_RECURSION_DESC=	Change SPF recursion to 20 (as per RFC)
 LOGFILE_STATS_DESC=	Enables logfile stats
 
diff --git a/mail/libspf/pkg-plist b/mail/libspf/pkg-plist
index a9cd2e8ce100..4c0e6d833279 100644
--- a/mail/libspf/pkg-plist
+++ b/mail/libspf/pkg-plist
@@ -7,20 +7,20 @@ lib/libspf-1.0.so
 lib/libspf-1.0.so.0
 lib/libspf.a
 lib/libspf.la
-%%EXAMPLESDIR%%/examples/Sendmail/sendmail.cf
-%%EXAMPLESDIR%%/examples/Sendmail/sendmail.mc.example
-%%EXAMPLESDIR%%/examples/Sendmail/spf.m4
-%%EXAMPLESDIR%%/examples/qmail/control/spfaction
-%%EXAMPLESDIR%%/examples/qmail/control/spfbestguess
-%%EXAMPLESDIR%%/examples/qmail/control/spfdebugstate
-%%EXAMPLESDIR%%/examples/qmail/control/spfexplainstate
-%%EXAMPLESDIR%%/examples/qmail/control/spfexplanation
-%%EXAMPLESDIR%%/examples/qmail/control/spfguessstate
-%%EXAMPLESDIR%%/examples/qmail/control/spfheaderstate
-%%EXAMPLESDIR%%/examples/qmail/control/spftarpit
-%%EXAMPLESDIR%%/examples/qmail/control/spftarpittime
-%%EXAMPLESDIR%%/examples/qmail/control/spftrustedforwarder
-%%EXAMPLESDIR%%/examples/qmail/control/spftrustedstate
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/Sendmail/sendmail.cf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/Sendmail/sendmail.mc.example
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/Sendmail/spf.m4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/qmail/control/spfaction
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/qmail/control/spfbestguess
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/qmail/control/spfdebugstate
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/qmail/control/spfexplainstate
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/qmail/control/spfexplanation
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/qmail/control/spfguessstate
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/qmail/control/spfheaderstate
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/qmail/control/spftarpit
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/qmail/control/spftarpittime
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/qmail/control/spftrustedforwarder
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/qmail/control/spftrustedstate
 %%DATADIR%%/patches/Courier-MTA/courier-0.45.4-spf.diff
 %%DATADIR%%/patches/Postfix/2.1.x/postfix-2.1.4-libspf-1.0-RC6.diff
 %%DATADIR%%/patches/Postfix/README
@@ -51,8 +51,8 @@ lib/libspf.la
 @dirrm %%DATADIR%%/patches/Courier-MTA
 @dirrm %%DATADIR%%/patches
 @dirrm %%DATADIR%%
-@dirrm %%EXAMPLESDIR%%/examples/qmail/control
-@dirrm %%EXAMPLESDIR%%/examples/qmail
-@dirrm %%EXAMPLESDIR%%/examples/Sendmail
-@dirrm %%EXAMPLESDIR%%/examples
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/examples/qmail/control
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/examples/qmail
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/examples/Sendmail
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/examples
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/mail/pymsgauth/Makefile b/mail/pymsgauth/Makefile
index 7109f1205ad9..f4a04f589815 100644
--- a/mail/pymsgauth/Makefile
+++ b/mail/pymsgauth/Makefile
@@ -20,7 +20,7 @@ SUB_FILES=	pkg-message
 DOCS=		BUGS CHANGELOG pymsgauth.txt pymsgauth.html
 EXAMPLES=	pymsgauthrc-example
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
diff --git a/mail/pymsgauth/pkg-plist b/mail/pymsgauth/pkg-plist
index d89b10709098..03c52937e725 100644
--- a/mail/pymsgauth/pkg-plist
+++ b/mail/pymsgauth/pkg-plist
@@ -11,6 +11,6 @@ bin/pymsgauth-mail
 %%PORTDOCS%%%%DOCSDIR%%/pymsgauth.html
 %%PORTDOCS%%%%DOCSDIR%%/pymsgauth.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/pymsgauthrc-example
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pymsgauthrc-example
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%DATADIR%%
diff --git a/mail/qmail-notify/Makefile b/mail/qmail-notify/Makefile
index 6c51f091d54a..6d6b1740d826 100644
--- a/mail/qmail-notify/Makefile
+++ b/mail/qmail-notify/Makefile
@@ -23,10 +23,10 @@ do-configure:
 	${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}"	> ${WRKSRC}/conf-ld
 
 do-install:
-	cd ${WRKSRC} && ./installer
+	(cd ${WRKSRC} && ./installer)
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR})
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/mail/qmail-notify/pkg-plist b/mail/qmail-notify/pkg-plist
index 53a196634694..09684fe9b343 100644
--- a/mail/qmail-notify/pkg-plist
+++ b/mail/qmail-notify/pkg-plist
@@ -1,7 +1,7 @@
 bin/qmail-notify
-%%EXAMPLESDIR%%/cron.hourly
-%%EXAMPLESDIR%%/message.txt
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cron.hourly
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/message.txt
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO