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.

5 files changed, 37 insertions, 37 deletions

diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index 12787abc1399..06c89bccbda4 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Version control system
 
 LICENSE=	GPLv2
 
-OPTIONS_DEFINE=		KERBEROS
-OPTIONS_DEFAULT=	KERBEROS
+OPTIONS_DEFINE=	KERBEROS EXAMPLES
+OPTIONS_DEFAULT=KERBEROS
 
 USES=		makeinfo tar:xz uidfix
 WRKSRC=		${WRKDIR}/call/cvs-build
@@ -37,6 +37,6 @@ BROKEN=	does not link
 .endif
 
 pre-install:
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/contrib
 
 .include <bsd.port.post.mk>
diff --git a/devel/cvs/pkg-plist b/devel/cvs/pkg-plist
index edbf7c3d9586..5d0460d83ced 100644
--- a/devel/cvs/pkg-plist
+++ b/devel/cvs/pkg-plist
@@ -2,24 +2,24 @@ bin/cvs
 bin/cvsbug
 man/man1/cvs.1.gz
 man/man8/cvsbug.8.gz
-%%EXAMPLESDIR%%/contrib/README
-%%EXAMPLESDIR%%/contrib/clmerge
-%%EXAMPLESDIR%%/contrib/cln_hist
-%%EXAMPLESDIR%%/contrib/commit_prep
-%%EXAMPLESDIR%%/contrib/cvs2vendor
-%%EXAMPLESDIR%%/contrib/cvs_acls
-%%EXAMPLESDIR%%/contrib/cvscheck
-%%EXAMPLESDIR%%/contrib/intro.doc
-%%EXAMPLESDIR%%/contrib/log
-%%EXAMPLESDIR%%/contrib/log_accum
-%%EXAMPLESDIR%%/contrib/mfpipe
-%%EXAMPLESDIR%%/contrib/rcs-to-cvs
-%%EXAMPLESDIR%%/contrib/rcslock
-%%EXAMPLESDIR%%/contrib/sccs2rcs
-%%EXAMPLESDIR%%/contrib/rcs2log
-%%EXAMPLESDIR%%/contrib/easy-import
-%%EXAMPLESDIR%%/contrib/cvscheck.man
-%%EXAMPLESDIR%%/contrib/cvshelp.man
-%%EXAMPLESDIR%%/contrib/descend.man
-@dirrm %%EXAMPLESDIR%%/contrib
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/clmerge
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/cln_hist
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/commit_prep
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/cvs2vendor
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/cvs_acls
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/cvscheck
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/intro.doc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/log
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/log_accum
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/mfpipe
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/rcs-to-cvs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/rcslock
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/sccs2rcs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/rcs2log
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/easy-import
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/cvscheck.man
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/cvshelp.man
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/descend.man
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/devel/elfio/pkg-plist b/devel/elfio/pkg-plist
index 89dcb82199c1..2d022ecd61fe 100644
--- a/devel/elfio/pkg-plist
+++ b/devel/elfio/pkg-plist
@@ -7,10 +7,10 @@ lib/libELFIO.a
 lib/libELFIO.la
 lib/libELFIO.so
 lib/libELFIO.so.0
-%%EXAMPLES%%%%EXAMPLESDIR%%/ELFDump.cpp
-%%EXAMPLES%%%%EXAMPLESDIR%%/RelocationTable.cpp
-%%EXAMPLES%%%%EXAMPLESDIR%%/Write.cpp
-%%EXAMPLES%%%%EXAMPLESDIR%%/WriteObj.cpp
-%%EXAMPLES%%%%EXAMPLESDIR%%/WriteObj2.cpp
-%%EXAMPLES%%%%EXAMPLESDIR%%/tutorial.cpp
-%%EXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ELFDump.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/RelocationTable.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Write.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/WriteObj.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/WriteObj2.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial.cpp
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/devel/gazpacho/Makefile b/devel/gazpacho/Makefile
index 256cc64c8b29..106d4d080944 100644
--- a/devel/gazpacho/Makefile
+++ b/devel/gazpacho/Makefile
@@ -21,7 +21,7 @@ USE_PYDISTUTILS=yes
 USES=		gettext
 DOCS=		AUTHORS ChangeLog CONTRIBUTORS COPYING README NEWS
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/doc/gazpacho/examples|${EXAMPLESDIR}|g' ${WRKSRC}/setup.py
diff --git a/devel/gazpacho/pkg-plist b/devel/gazpacho/pkg-plist
index 2387a689ad20..7d34c26241c4 100644
--- a/devel/gazpacho/pkg-plist
+++ b/devel/gazpacho/pkg-plist
@@ -246,10 +246,10 @@ share/applications/gazpacho.desktop
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%EXAMPLESDIR%%/helloworld.glade
-%%EXAMPLESDIR%%/helloworld.py
-%%EXAMPLESDIR%%/uimanager.glade
-%%EXAMPLESDIR%%/uimanager.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/helloworld.glade
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/helloworld.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/uimanager.glade
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/uimanager.py
 %%DATADIR%%/catalogs/base.xml
 %%DATADIR%%/glade/dummy.glade
 %%DATADIR%%/glade/preferences.glade
@@ -344,7 +344,7 @@ share/locale/zh_CN/LC_MESSAGES/gazpacho.mo
 @dirrm %%DATADIR%%/glade
 @dirrmtry %%DATADIR%%/catalogs
 @dirrmtry %%DATADIR%%
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/gazpacho/widgets/base/menueditor
 @dirrm %%PYTHON_SITELIBDIR%%/gazpacho/widgets/base
 @dirrmtry %%PYTHON_SITELIBDIR%%/gazpacho/widgets