76 files changed, 9 insertions, 13 deletions

diff --git a/security/chrootuid/files/patch-ab b/security/chrootuid/files/patch-Makefile
index 0c2d31bc12e2..0c2d31bc12e2 100644
--- a/security/chrootuid/files/patch-ab
+++ b/security/chrootuid/files/patch-Makefile
diff --git a/security/chrootuid/files/patch-aa b/security/chrootuid/files/patch-chrootuid.1
index d3a48f10cbf8..d3a48f10cbf8 100644
--- a/security/chrootuid/files/patch-aa
+++ b/security/chrootuid/files/patch-chrootuid.1
diff --git a/security/chrootuid/files/patch-ac b/security/chrootuid/files/patch-chrootuid.c
index cd8409e00a2a..cd8409e00a2a 100644
--- a/security/chrootuid/files/patch-ac
+++ b/security/chrootuid/files/patch-chrootuid.c
diff --git a/security/cops/files/patch-ab b/security/cops/files/patch-makefile
index 7e02909ab1e8..7e02909ab1e8 100644
--- a/security/cops/files/patch-ab
+++ b/security/cops/files/patch-makefile
diff --git a/security/cops/files/patch-aa b/security/cops/files/patch-perl__cops
index 53a8e007bd75..53a8e007bd75 100644
--- a/security/cops/files/patch-aa
+++ b/security/cops/files/patch-perl__cops
diff --git a/security/fakebo/files/patch-ab b/security/fakebo/files/patch-fakebo.c
index 12c64f4fe089..12c64f4fe089 100644
--- a/security/fakebo/files/patch-ab
+++ b/security/fakebo/files/patch-fakebo.c
diff --git a/security/fwbuilder/files/patch-aa b/security/fwbuilder/files/patch-qmake.inc.in
index 51f25b4b7b64..51f25b4b7b64 100644
--- a/security/fwbuilder/files/patch-aa
+++ b/security/fwbuilder/files/patch-qmake.inc.in
diff --git a/security/identify/files/patch-aa b/security/identify/files/patch-Makefile
index 40a923b1a659..40a923b1a659 100644
--- a/security/identify/files/patch-aa
+++ b/security/identify/files/patch-Makefile
diff --git a/security/identify/files/patch-ab b/security/identify/files/patch-identify.c
index 75cb4dcb71f0..75cb4dcb71f0 100644
--- a/security/identify/files/patch-ab
+++ b/security/identify/files/patch-identify.c
diff --git a/security/keynote/files/patch-ac b/security/keynote/files/patch-Makefile.in
index a5aa8394cf13..a5aa8394cf13 100644
--- a/security/keynote/files/patch-ac
+++ b/security/keynote/files/patch-Makefile.in
diff --git a/security/keynote/files/patch-ad b/security/keynote/files/patch-configure
index ec214e9b19ff..ec214e9b19ff 100644
--- a/security/keynote/files/patch-ad
+++ b/security/keynote/files/patch-configure
diff --git a/security/keynote/files/patch-ag b/security/keynote/files/patch-keynote-ver.y
index 6b5a46ce77af..6b5a46ce77af 100644
--- a/security/keynote/files/patch-ag
+++ b/security/keynote/files/patch-keynote-ver.y
diff --git a/security/keynote/files/patch-af b/security/keynote/files/patch-keynote.y
index 5a56488f747c..5a56488f747c 100644
--- a/security/keynote/files/patch-af
+++ b/security/keynote/files/patch-keynote.y
diff --git a/security/keynote/files/patch-ae b/security/keynote/files/patch-man__keynote.4
index c4f90a02bbc5..c4f90a02bbc5 100644
--- a/security/keynote/files/patch-ae
+++ b/security/keynote/files/patch-man__keynote.4
diff --git a/security/krb5-appl/files/patch-appl::bsd::Makefile.in b/security/krb5-appl/files/patch-appl__bsd__Makefile.in
index 2b7510072d90..2b7510072d90 100644
--- a/security/krb5-appl/files/patch-appl::bsd::Makefile.in
+++ b/security/krb5-appl/files/patch-appl__bsd__Makefile.in
diff --git a/security/krb5-appl/files/patch-appl::bsd::klogind.M b/security/krb5-appl/files/patch-appl__bsd__klogind.M
index 1d48bb21db10..1d48bb21db10 100644
--- a/security/krb5-appl/files/patch-appl::bsd::klogind.M
+++ b/security/krb5-appl/files/patch-appl__bsd__klogind.M
diff --git a/security/krb5-appl/files/patch-appl::gssftp::ftp::ftp_var.h b/security/krb5-appl/files/patch-appl__gssftp__ftp__ftp_var.h
index efb2721cd5e8..efb2721cd5e8 100644
--- a/security/krb5-appl/files/patch-appl::gssftp::ftp::ftp_var.h
+++ b/security/krb5-appl/files/patch-appl__gssftp__ftp__ftp_var.h
diff --git a/security/krb5-appl/files/patch-appl::telnet::telnetd::Makefile.in b/security/krb5-appl/files/patch-appl__telnet__telnetd__Makefile.in
index 784cf5991d94..784cf5991d94 100644
--- a/security/krb5-appl/files/patch-appl::telnet::telnetd::Makefile.in
+++ b/security/krb5-appl/files/patch-appl__telnet__telnetd__Makefile.in
diff --git a/security/krb5-appl/files/patch-appl::telnet::telnetd::telnetd.8 b/security/krb5-appl/files/patch-appl__telnet__telnetd__telnetd.8
index fc9068bd71f4..fc9068bd71f4 100644
--- a/security/krb5-appl/files/patch-appl::telnet::telnetd::telnetd.8
+++ b/security/krb5-appl/files/patch-appl__telnet__telnetd__telnetd.8
diff --git a/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c b/security/krb5-appl/files/patch-appl__telnet__telnetd__utility.c
index 2e754e7294ba..2e754e7294ba 100644
--- a/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c
+++ b/security/krb5-appl/files/patch-appl__telnet__telnetd__utility.c
diff --git a/security/krb5-appl/files/patch-ba b/security/krb5-appl/files/patch-bsd__login.c
index 15a341cdaf59..15a341cdaf59 100644
--- a/security/krb5-appl/files/patch-ba
+++ b/security/krb5-appl/files/patch-bsd__login.c
diff --git a/security/krb5-appl/files/patch-ai b/security/krb5-appl/files/patch-gssftp__ftpd__ftpd.c
index a8860362805b..a8860362805b 100644
--- a/security/krb5-appl/files/patch-ai
+++ b/security/krb5-appl/files/patch-gssftp__ftpd__ftpd.c
diff --git a/security/krb5-appl/files/patch-aj b/security/krb5-appl/files/patch-gssftp__ftpd__logwtmp.c
index 997041c77f9e..997041c77f9e 100644
--- a/security/krb5-appl/files/patch-aj
+++ b/security/krb5-appl/files/patch-gssftp__ftpd__logwtmp.c
diff --git a/security/krb5-appl/files/patch-ay b/security/krb5-appl/files/patch-libpty__getpty.c
index 262474d0b4a7..262474d0b4a7 100644
--- a/security/krb5-appl/files/patch-ay
+++ b/security/krb5-appl/files/patch-libpty__getpty.c
diff --git a/security/krb5-appl/files/patch-bb b/security/krb5-appl/files/patch-telnet__telnet__Makefile.in
index 915db004a33f..915db004a33f 100644
--- a/security/krb5-appl/files/patch-bb
+++ b/security/krb5-appl/files/patch-telnet__telnet__Makefile.in
diff --git a/security/krb5-maint/files/patch-av b/security/krb5-maint/files/patch-clients__ksu__Makefile.in
index e86eb930d129..e86eb930d129 100644
--- a/security/krb5-maint/files/patch-av
+++ b/security/krb5-maint/files/patch-clients__ksu__Makefile.in
diff --git a/security/krb5-maint/files/patch-config::pre.in b/security/krb5-maint/files/patch-config__pre.in
index bdd183e98ad4..bdd183e98ad4 100644
--- a/security/krb5-maint/files/patch-config::pre.in
+++ b/security/krb5-maint/files/patch-config__pre.in
diff --git a/security/krb5-maint/files/patch-config::shlib.conf b/security/krb5-maint/files/patch-config__shlib.conf
index 55f967d8a505..55f967d8a505 100644
--- a/security/krb5-maint/files/patch-config::shlib.conf
+++ b/security/krb5-maint/files/patch-config__shlib.conf
diff --git a/security/krb5-maint/files/patch-lib::gssapi::krb5::import_name.c b/security/krb5-maint/files/patch-lib__gssapi__krb5__import_name.c
index 40f116af2196..40f116af2196 100644
--- a/security/krb5-maint/files/patch-lib::gssapi::krb5::import_name.c
+++ b/security/krb5-maint/files/patch-lib__gssapi__krb5__import_name.c
diff --git a/security/krb5/files/patch-av b/security/krb5/files/patch-clients__ksu__Makefile.in
index 7ec54abdc076..7ec54abdc076 100644
--- a/security/krb5/files/patch-av
+++ b/security/krb5/files/patch-clients__ksu__Makefile.in
diff --git a/security/krb5/files/patch-config::pre.in b/security/krb5/files/patch-config__pre.in
index bdd183e98ad4..bdd183e98ad4 100644
--- a/security/krb5/files/patch-config::pre.in
+++ b/security/krb5/files/patch-config__pre.in
diff --git a/security/krb5/files/patch-config::shlib.conf b/security/krb5/files/patch-config__shlib.conf
index 805e56e91e7f..805e56e91e7f 100644
--- a/security/krb5/files/patch-config::shlib.conf
+++ b/security/krb5/files/patch-config__shlib.conf
diff --git a/security/krb5/files/patch-lib::gssapi::krb5::import_name.c b/security/krb5/files/patch-lib__gssapi__krb5__import_name.c
index 40f116af2196..40f116af2196 100644
--- a/security/krb5/files/patch-lib::gssapi::krb5::import_name.c
+++ b/security/krb5/files/patch-lib__gssapi__krb5__import_name.c
diff --git a/security/l0pht-watch/files/patch-aa b/security/l0pht-watch/files/patch-Makefile
index 71bee0618872..71bee0618872 100644
--- a/security/l0pht-watch/files/patch-aa
+++ b/security/l0pht-watch/files/patch-Makefile
diff --git a/security/l0pht-watch/files/patch-ab b/security/l0pht-watch/files/patch-check_tmp.c
index eb73a0d7650b..eb73a0d7650b 100644
--- a/security/l0pht-watch/files/patch-ab
+++ b/security/l0pht-watch/files/patch-check_tmp.c
diff --git a/security/l0pht-watch/files/patch-ac b/security/l0pht-watch/files/patch-check_tmp.h
index 0e7fff7b85ea..0e7fff7b85ea 100644
--- a/security/l0pht-watch/files/patch-ac
+++ b/security/l0pht-watch/files/patch-check_tmp.h
diff --git a/security/l0pht-watch/files/patch-ad b/security/l0pht-watch/files/patch-list_utils.c
index 53cb6c124043..53cb6c124043 100644
--- a/security/l0pht-watch/files/patch-ad
+++ b/security/l0pht-watch/files/patch-list_utils.c
diff --git a/security/nessus-libraries/files/patch-aa b/security/nessus-libraries/files/patch-Makefile
index 8c451b0d137e..8c451b0d137e 100644
--- a/security/nessus-libraries/files/patch-aa
+++ b/security/nessus-libraries/files/patch-Makefile
diff --git a/security/nessus-libraries/files/patch-ac b/security/nessus-libraries/files/patch-libpcap-nessus__configure
index d99314b84a2a..d99314b84a2a 100644
--- a/security/nessus-libraries/files/patch-ac
+++ b/security/nessus-libraries/files/patch-libpcap-nessus__configure
diff --git a/security/nessus/files/patch-aa b/security/nessus/files/patch-nessus-mkcert-client.in
index 102778eb2117..102778eb2117 100644
--- a/security/nessus/files/patch-aa
+++ b/security/nessus/files/patch-nessus-mkcert-client.in
diff --git a/security/nessus/files/patch-ab b/security/nessus/files/patch-nessus-mkcert.in
index 97c1601ff14d..97c1601ff14d 100644
--- a/security/nessus/files/patch-ab
+++ b/security/nessus/files/patch-nessus-mkcert.in
diff --git a/security/openssl/files/patch-ak b/security/openssl/files/patch-apps__Makefile
index 77e810e497c6..77e810e497c6 100644
--- a/security/openssl/files/patch-ak
+++ b/security/openssl/files/patch-apps__Makefile
diff --git a/security/openssl/files/patch-ad b/security/openssl/files/patch-crypto__md5__md5.c
index cd606a304160..cd606a304160 100644
--- a/security/openssl/files/patch-ad
+++ b/security/openssl/files/patch-crypto__md5__md5.c
diff --git a/security/pam_ldap/files/patch-aa b/security/pam_ldap/files/patch-Makefile.in
index 3b54f9d9549b..3b54f9d9549b 100644
--- a/security/pam_ldap/files/patch-aa
+++ b/security/pam_ldap/files/patch-Makefile.in
diff --git a/security/pam_ldap/files/patch-ab b/security/pam_ldap/files/patch-pam_ldap.c
index eeb031a603c4..eeb031a603c4 100644
--- a/security/pam_ldap/files/patch-ab
+++ b/security/pam_ldap/files/patch-pam_ldap.c
diff --git a/security/pgp/files/patch-aa b/security/pgp/files/patch-makefile
index 0c2ce188ef15..0c2ce188ef15 100644
--- a/security/pgp/files/patch-aa
+++ b/security/pgp/files/patch-makefile
diff --git a/security/pktsuckers/files/patch-aa b/security/pktsuckers/files/patch-Makefile
index 634ffb9ba72f..634ffb9ba72f 100644
--- a/security/pktsuckers/files/patch-aa
+++ b/security/pktsuckers/files/patch-Makefile
diff --git a/security/proxycheck/files/patch-ac b/security/proxycheck/files/patch-proxycheck.1
index 0bd29f0557cd..0bd29f0557cd 100644
--- a/security/proxycheck/files/patch-ac
+++ b/security/proxycheck/files/patch-proxycheck.1
diff --git a/security/proxycheck/files/patch-ab b/security/proxycheck/files/patch-proxycheck.c
index 50002060e30e..50002060e30e 100644
--- a/security/proxycheck/files/patch-ab
+++ b/security/proxycheck/files/patch-proxycheck.c
diff --git a/security/rdigest/files/patch-aa b/security/rdigest/files/patch-Makefile.in
index cb5a6e1f303a..cb5a6e1f303a 100644
--- a/security/rdigest/files/patch-aa
+++ b/security/rdigest/files/patch-Makefile.in
diff --git a/security/rdigest/files/patch-ab b/security/rdigest/files/patch-digest.1
index 3098b1d69af0..3098b1d69af0 100644
--- a/security/rdigest/files/patch-ab
+++ b/security/rdigest/files/patch-digest.1
diff --git a/security/rdigest/files/patch-ac b/security/rdigest/files/patch-digest.c
index bf6ee0d604a2..bf6ee0d604a2 100644
--- a/security/rdigest/files/patch-ac
+++ b/security/rdigest/files/patch-digest.c
diff --git a/security/slush/files/patch-aa b/security/slush/files/patch-Makefile.in
index 1055033acfa9..1055033acfa9 100644
--- a/security/slush/files/patch-aa
+++ b/security/slush/files/patch-Makefile.in
diff --git a/security/slush/files/patch-ab b/security/slush/files/patch-slush.c
index 35bdb47ece44..35bdb47ece44 100644
--- a/security/slush/files/patch-ab
+++ b/security/slush/files/patch-slush.c
diff --git a/security/slush/files/patch-ac b/security/slush/files/patch-slushd.c
index c1f97deabe00..c1f97deabe00 100644
--- a/security/slush/files/patch-ac
+++ b/security/slush/files/patch-slushd.c
diff --git a/security/sslwrap/files/patch-aa b/security/sslwrap/files/patch-Makefile
index ec6ed8ba6ab5..ec6ed8ba6ab5 100644
--- a/security/sslwrap/files/patch-aa
+++ b/security/sslwrap/files/patch-Makefile
diff --git a/security/steghide/files/patch-aa b/security/steghide/files/patch-Makefile.in
index e2c74d5cb4c8..e2c74d5cb4c8 100644
--- a/security/steghide/files/patch-aa
+++ b/security/steghide/files/patch-Makefile.in
diff --git a/security/strobe/files/patch-aa b/security/strobe/files/patch-Makefile
index 358253d29192..358253d29192 100644
--- a/security/strobe/files/patch-aa
+++ b/security/strobe/files/patch-Makefile
diff --git a/security/strobe/files/patch-ab b/security/strobe/files/patch-strobe.c
index d837bb999738..d837bb999738 100644
--- a/security/strobe/files/patch-ab
+++ b/security/strobe/files/patch-strobe.c
diff --git a/security/super/files/patch-06 b/security/super/files/patch-localsys.h_1
index 552b9a406102..552b9a406102 100644
--- a/security/super/files/patch-06
+++ b/security/super/files/patch-localsys.h_1
diff --git a/security/super/files/patch-localsys.h b/security/super/files/patch-localsys.h_2
index 15bdac0317ab..15bdac0317ab 100644
--- a/security/super/files/patch-localsys.h
+++ b/security/super/files/patch-localsys.h_2
diff --git a/security/tripwire-131/files/patch-ab b/security/tripwire-131/files/patch-Makefile
index f483f4a8f79b..f483f4a8f79b 100644
--- a/security/tripwire-131/files/patch-ab
+++ b/security/tripwire-131/files/patch-Makefile
diff --git a/security/tripwire-131/files/patch-aa b/security/tripwire-131/files/patch-include-config.h
index d3ad42fc3b81..d3ad42fc3b81 100644
--- a/security/tripwire-131/files/patch-aa
+++ b/security/tripwire-131/files/patch-include-config.h
diff --git a/security/tripwire-131/files/patch-ac b/security/tripwire-131/files/patch-sigs-sha-sha.c
index bad090157860..bad090157860 100644
--- a/security/tripwire-131/files/patch-ac
+++ b/security/tripwire-131/files/patch-sigs-sha-sha.c
diff --git a/security/tripwire-131/files/patch-ad b/security/tripwire-131/files/patch-src-Makefile
index 07d151ecd0ac..07d151ecd0ac 100644
--- a/security/tripwire-131/files/patch-ad
+++ b/security/tripwire-131/files/patch-src-Makefile
diff --git a/security/tripwire-131/files/patch-ba b/security/tripwire-131/files/patch-src-config.parse.c
index 1148d21c0890..1148d21c0890 100644
--- a/security/tripwire-131/files/patch-ba
+++ b/security/tripwire-131/files/patch-src-config.parse.c
diff --git a/security/tripwire-131/files/patch-bb b/security/tripwire-131/files/patch-src-dbase.build.c
index 8cc8988284fb..8cc8988284fb 100644
--- a/security/tripwire-131/files/patch-bb
+++ b/security/tripwire-131/files/patch-src-dbase.build.c
diff --git a/security/tripwire-131/files/patch-bc b/security/tripwire-131/files/patch-src-siggen.c
index 8bc36ac70a0e..8bc36ac70a0e 100644
--- a/security/tripwire-131/files/patch-bc
+++ b/security/tripwire-131/files/patch-src-siggen.c
diff --git a/security/tripwire-131/files/patch-bd b/security/tripwire-131/files/patch-src-utils.c
index 3b025e3b07ce..3b025e3b07ce 100644
--- a/security/tripwire-131/files/patch-bd
+++ b/security/tripwire-131/files/patch-src-utils.c
diff --git a/security/tripwire12/files/patch-ab b/security/tripwire12/files/patch-Makefile
index 4c9bc53f16e1..4c9bc53f16e1 100644
--- a/security/tripwire12/files/patch-ab
+++ b/security/tripwire12/files/patch-Makefile
diff --git a/security/tripwire12/files/patch-aa b/security/tripwire12/files/patch-include-config.h
index 38bd704c1f1c..38bd704c1f1c 100644
--- a/security/tripwire12/files/patch-aa
+++ b/security/tripwire12/files/patch-include-config.h
diff --git a/security/tripwire12/files/patch-ac b/security/tripwire12/files/patch-sigs-sha-sha.c
index bad090157860..bad090157860 100644
--- a/security/tripwire12/files/patch-ac
+++ b/security/tripwire12/files/patch-sigs-sha-sha.c
diff --git a/security/vida/files/patch-aa b/security/vida/files/patch-include.h
index 45e2373ad4a4..45e2373ad4a4 100644
--- a/security/vida/files/patch-aa
+++ b/security/vida/files/patch-include.h
diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index bdc1aed4db3f..53623940442c 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -20,9 +20,7 @@ EXAMPLES=	vncviewer.zbd vncserver.zbd server.key server.id client1.key \
 		client2.key clients.id
 DOCS=		README.txt LICENCE.txt CHANGES.txt zebedee.html ftpgw.tcl.html
 
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} \
@@ -40,11 +38,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${e} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for d in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/security/zebedee/files/patch-aa b/security/zebedee/files/patch-Makefile
index 047e600ad712..047e600ad712 100644
--- a/security/zebedee/files/patch-aa
+++ b/security/zebedee/files/patch-Makefile
diff --git a/security/zebedee/pkg-plist b/security/zebedee/pkg-plist
index bd5e9b6d2972..1ce9811b5db7 100644
--- a/security/zebedee/pkg-plist
+++ b/security/zebedee/pkg-plist
@@ -3,17 +3,17 @@ bin/zebedee
 etc/server.zbd.sample
 man/man1/ftpgw.tcl.1.gz
 man/man1/zebedee.1.gz
-%%EXAMPLESDIR%%/client1.key
-%%EXAMPLESDIR%%/client2.key
-%%EXAMPLESDIR%%/clients.id
-%%EXAMPLESDIR%%/server.id
-%%EXAMPLESDIR%%/server.key
-%%EXAMPLESDIR%%/vncserver.zbd
-%%EXAMPLESDIR%%/vncviewer.zbd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/client1.key
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/client2.key
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clients.id
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server.id
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server.key
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vncserver.zbd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vncviewer.zbd
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENCE.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/ftpgw.tcl.html
 %%PORTDOCS%%%%DOCSDIR%%/zebedee.html
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%