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.

2 files changed, 74 insertions, 74 deletions

diff --git a/www/zen-cart/Makefile b/www/zen-cart/Makefile
index 014725346ff..4d9c8f8d6e8 100644
--- a/www/zen-cart/Makefile
+++ b/www/zen-cart/Makefile
@@ -19,31 +19,31 @@ USE_PHP=	yes
 WANT_PHP_WEB=	yes
 DOS2UNIX_REGEX=	.*\.php
 
-EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	WWWDIR="${WWWDIR}" PORTNAME="${PORTNAME}"
-PLIST_SUB+=	WWWDIR=${WWWDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} EXAMPLESDIR_REL=${EXAMPLESDIR_REL} \
-			PORTNAME=${PORTNAME}
+PLIST_SUB+=	WWWDIR=${WWWDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} PORTNAME=${PORTNAME}
+
+OPTIONS_DEFINE=	EXAMPLES
 
 do-install:
-	@if [ ! -d ${STAGEDIR}${WWWDIR} ]; then ${MKDIR} ${STAGEDIR}${WWWDIR} ; fi
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${EXAMPLESDIR} && ${RM} -rf ${WRKSRC}/docs
-	@cd ${WRKSRC} && ${MV} vbv_learn_more.html ${STAGEDIR}${EXAMPLESDIR}/
-	@cd ${WRKSRC} && ${MV} mcs_learn_more.html ${STAGEDIR}${EXAMPLESDIR}/
-	@cd ${WRKSRC} && ${MV} robots_example.txt ${STAGEDIR}${EXAMPLESDIR}/
-	@cd ${WRKSRC} && ${MV} install.txt ${STAGEDIR}${EXAMPLESDIR}/
-	@cd ${WRKSRC} && ${MV} nddbc.html ${STAGEDIR}${EXAMPLESDIR}/
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
-	@${CHMOD} -R 0755 ${STAGEDIR}${WWWDIR}
-	@${CHMOD} 0777 ${STAGEDIR}${WWWDIR}/cache
-	@cd ${STAGEDIR}${WWWDIR}/images && ${FIND} . -type d -exec ${CHMOD} 0777 {} \;
-	@cd ${STAGEDIR}${WWWDIR}/includes/languages/english && ${FIND} html_includes -type d -exec ${CHMOD} 0777 {} \;
-	@${CHMOD} 0777 ${STAGEDIR}${WWWDIR}/media
-	@${CHMOD} 0777 ${STAGEDIR}${WWWDIR}/pub
-	@${CHMOD} 0777 ${STAGEDIR}${WWWDIR}/admin/backups
-	@${CHMOD} 0777 ${STAGEDIR}${WWWDIR}/admin/images/graphs
+	@${MKDIR} ${STAGEDIR}${WWWDIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${EXAMPLESDIR} && ${RM} -rf ${WRKSRC}/docs
+	(cd ${WRKSRC} && ${MV} vbv_learn_more.html ${STAGEDIR}${EXAMPLESDIR}/)
+	(cd ${WRKSRC} && ${MV} mcs_learn_more.html ${STAGEDIR}${EXAMPLESDIR}/)
+	(cd ${WRKSRC} && ${MV} robots_example.txt ${STAGEDIR}${EXAMPLESDIR}/)
+	(cd ${WRKSRC} && ${MV} install.txt ${STAGEDIR}${EXAMPLESDIR}/)
+	(cd ${WRKSRC} && ${MV} nddbc.html ${STAGEDIR}${EXAMPLESDIR}/)
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/)
+	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
+	${CHMOD} -R 0755 ${STAGEDIR}${WWWDIR}
+	${CHMOD} 0777 ${STAGEDIR}${WWWDIR}/cache
+	(cd ${STAGEDIR}${WWWDIR}/images && ${FIND} . -type d -exec ${CHMOD} 0777 {} \;)
+	(cd ${STAGEDIR}${WWWDIR}/includes/languages/english && ${FIND} html_includes -type d -exec ${CHMOD} 0777 {} \;)
+	${CHMOD} 0777 ${STAGEDIR}${WWWDIR}/media
+	${CHMOD} 0777 ${STAGEDIR}${WWWDIR}/pub
+	${CHMOD} 0777 ${STAGEDIR}${WWWDIR}/admin/backups
+	${CHMOD} 0777 ${STAGEDIR}${WWWDIR}/admin/images/graphs
 	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
 	@${ECHO_CMD} '@exec ${CHMOD} -R 0755 ${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
 	@${ECHO_CMD} '@exec ${CHMOD} 0777 ${WWWDIR}/cache' >> ${TMPPLIST}
diff --git a/www/zen-cart/pkg-plist b/www/zen-cart/pkg-plist
index 47de0d46962..1108ffa830b 100644
--- a/www/zen-cart/pkg-plist
+++ b/www/zen-cart/pkg-plist
@@ -4,58 +4,58 @@ www/%%PORTNAME%%/includes/dist-configure.php
 @unexec if cmp -s %D/www/%%PORTNAME%%/admin/includes/dist-configure.php %D/www/%%PORTNAME%%/admin/includes/configure.php; then rm -f %D/www/%%PORTNAME%%/admin/includes/configure.php; fi
 www/%%PORTNAME%%/admin/includes/dist-configure.php
 @exec if [ ! -f %D/www/%%PORTNAME%%/admin/includes/configure.php ] ; then cp -p %D/%F %B/configure.php; fi
-%%EXAMPLESDIR_REL%%/docs/.htaccess
-%%EXAMPLESDIR_REL%%/docs/0.about_zen_cart.html
-%%EXAMPLESDIR_REL%%/docs/1.readme_installation.html
-%%EXAMPLESDIR_REL%%/docs/2.readme_how_to_upgrade.html
-%%EXAMPLESDIR_REL%%/docs/3.readme_paypal_ipn.html
-%%EXAMPLESDIR_REL%%/docs/4.readme_html_email_templates.html
-%%EXAMPLESDIR_REL%%/docs/5.renaming_the_admin_directory.html
-%%EXAMPLESDIR_REL%%/docs/INSTALL.TXT
-%%EXAMPLESDIR_REL%%/docs/changelog-v1-3-0-1.html
-%%EXAMPLESDIR_REL%%/docs/changelog-v1-3-0-2.html
-%%EXAMPLESDIR_REL%%/docs/changelog-v1-3-0.html
-%%EXAMPLESDIR_REL%%/docs/changelog-v1-3-5.html
-%%EXAMPLESDIR_REL%%/docs/changelog-v1-3-6.html
-%%EXAMPLESDIR_REL%%/docs/changelog-v1-3-7-1.html
-%%EXAMPLESDIR_REL%%/docs/changelog-v1-3-7.html
-%%EXAMPLESDIR_REL%%/docs/changelog-v1-3-8.html
-%%EXAMPLESDIR_REL%%/docs/changelog-v1-3-9a.html
-%%EXAMPLESDIR_REL%%/docs/changelog-v1-3-9b.html
-%%EXAMPLESDIR_REL%%/docs/changelog-v1-3-9c.html
-%%EXAMPLESDIR_REL%%/docs/changelog-v1-3-9d.html
-%%EXAMPLESDIR_REL%%/docs/changelog-v1-3-9e.html
-%%EXAMPLESDIR_REL%%/docs/changelog-v1-3-9f.html
-%%EXAMPLESDIR_REL%%/docs/changelog-v1-3-9g.html
-%%EXAMPLESDIR_REL%%/docs/changelog-v1-3-9h.html
-%%EXAMPLESDIR_REL%%/docs/important_site_security_recommendations.html
-%%EXAMPLESDIR_REL%%/docs/index.html
-%%EXAMPLESDIR_REL%%/install.txt
-%%EXAMPLESDIR_REL%%/mcs_learn_more.html
-%%EXAMPLESDIR_REL%%/nddbc.html
-%%EXAMPLESDIR_REL%%/docs/osi-certified-120x100.png
-%%EXAMPLESDIR_REL%%/docs/product_types_readme.html
-%%EXAMPLESDIR_REL%%/docs/read_me_jscript.html
-%%EXAMPLESDIR_REL%%/docs/read_me_onload.html
-%%EXAMPLESDIR_REL%%/docs/readme_css_system.html
-%%EXAMPLESDIR_REL%%/robots_example.txt
-%%EXAMPLESDIR_REL%%/vbv_learn_more.html
-%%EXAMPLESDIR_REL%%/docs/whatsnew_1.3.0.1.html
-%%EXAMPLESDIR_REL%%/docs/whatsnew_1.3.0.2.html
-%%EXAMPLESDIR_REL%%/docs/whatsnew_1.3.0.html
-%%EXAMPLESDIR_REL%%/docs/whatsnew_1.3.5.html
-%%EXAMPLESDIR_REL%%/docs/whatsnew_1.3.6.html
-%%EXAMPLESDIR_REL%%/docs/whatsnew_1.3.7-1.html
-%%EXAMPLESDIR_REL%%/docs/whatsnew_1.3.7.html
-%%EXAMPLESDIR_REL%%/docs/whatsnew_1.3.8.html
-%%EXAMPLESDIR_REL%%/docs/whatsnew_1.3.9a.html
-%%EXAMPLESDIR_REL%%/docs/whatsnew_1.3.9b.html
-%%EXAMPLESDIR_REL%%/docs/whatsnew_1.3.9c.html
-%%EXAMPLESDIR_REL%%/docs/whatsnew_1.3.9d.html
-%%EXAMPLESDIR_REL%%/docs/whatsnew_1.3.9e.html
-%%EXAMPLESDIR_REL%%/docs/whatsnew_1.3.9f.html
-%%EXAMPLESDIR_REL%%/docs/whatsnew_1.3.9g.html
-%%EXAMPLESDIR_REL%%/docs/whatsnew_1.3.9h.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/.htaccess
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/0.about_zen_cart.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/1.readme_installation.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/2.readme_how_to_upgrade.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/3.readme_paypal_ipn.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/4.readme_html_email_templates.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/5.renaming_the_admin_directory.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/INSTALL.TXT
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/changelog-v1-3-0-1.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/changelog-v1-3-0-2.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/changelog-v1-3-0.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/changelog-v1-3-5.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/changelog-v1-3-6.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/changelog-v1-3-7-1.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/changelog-v1-3-7.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/changelog-v1-3-8.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/changelog-v1-3-9a.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/changelog-v1-3-9b.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/changelog-v1-3-9c.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/changelog-v1-3-9d.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/changelog-v1-3-9e.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/changelog-v1-3-9f.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/changelog-v1-3-9g.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/changelog-v1-3-9h.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/important_site_security_recommendations.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/index.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/install.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mcs_learn_more.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nddbc.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/osi-certified-120x100.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/product_types_readme.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/read_me_jscript.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/read_me_onload.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/readme_css_system.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/robots_example.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vbv_learn_more.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/whatsnew_1.3.0.1.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/whatsnew_1.3.0.2.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/whatsnew_1.3.0.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/whatsnew_1.3.5.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/whatsnew_1.3.6.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/whatsnew_1.3.7-1.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/whatsnew_1.3.7.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/whatsnew_1.3.8.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/whatsnew_1.3.9a.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/whatsnew_1.3.9b.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/whatsnew_1.3.9c.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/whatsnew_1.3.9d.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/whatsnew_1.3.9e.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/whatsnew_1.3.9f.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/whatsnew_1.3.9g.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/docs/whatsnew_1.3.9h.html
 www/%%PORTNAME%%/admin/.htaccess
 www/%%PORTNAME%%/admin/admin.php
 www/%%PORTNAME%%/admin/alert_page.php
@@ -2036,5 +2036,5 @@ www/%%PORTNAME%%/zc_install/version.php
 @dirrmtry www/%%PORTNAME%%/admin/backups
 @dirrmtry www/%%PORTNAME%%/admin
 @dirrmtry www/%%PORTNAME%%
-@dirrm %%EXAMPLESDIR_REL%%/docs
-@dirrm %%EXAMPLESDIR_REL%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/docs
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%