7 files changed, 29 insertions, 23 deletions

diff --git a/irc/iroffer-lamm/Makefile b/irc/iroffer-lamm/Makefile
index fb44e539bf4b..0e437c76bd5f 100644
--- a/irc/iroffer-lamm/Makefile
+++ b/irc/iroffer-lamm/Makefile
@@ -25,9 +25,12 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/convertxdccfile ${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/iroffer ${PREFIX}/bin/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
+	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${DOCSDIR}/
+.endif
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/dynip.sh ${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/iroffer.cron ${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/sample.config ${EXAMPLESDIR}/
diff --git a/irc/iroffer-lamm/pkg-plist b/irc/iroffer-lamm/pkg-plist
index 9b490539f87b..dcafc535c23e 100644
--- a/irc/iroffer-lamm/pkg-plist
+++ b/irc/iroffer-lamm/pkg-plist
@@ -2,8 +2,8 @@ bin/convertxdccfile
 bin/iroffer
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/WHATSNEW
-%%PORTDOCS%%%%EXAMPLESDIR%%/dynip.sh
-%%PORTDOCS%%%%EXAMPLESDIR%%/iroffer.cron
-%%PORTDOCS%%%%EXAMPLESDIR%%/sample.config
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynip.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iroffer.cron
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.config
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/irc/iroffer/Makefile b/irc/iroffer/Makefile
index 2e57731e11e6..a9bc615c5251 100644
--- a/irc/iroffer/Makefile
+++ b/irc/iroffer/Makefile
@@ -23,9 +23,12 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/convertxdccfile ${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/iroffer ${PREFIX}/bin/
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}
+	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
 	${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${DOCSDIR}/
+.endif
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/dynip.sh ${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/iroffer.cron ${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/sample.config ${EXAMPLESDIR}/
diff --git a/irc/iroffer/pkg-plist b/irc/iroffer/pkg-plist
index 9b490539f87b..dcafc535c23e 100644
--- a/irc/iroffer/pkg-plist
+++ b/irc/iroffer/pkg-plist
@@ -2,8 +2,8 @@ bin/convertxdccfile
 bin/iroffer
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/WHATSNEW
-%%PORTDOCS%%%%EXAMPLESDIR%%/dynip.sh
-%%PORTDOCS%%%%EXAMPLESDIR%%/iroffer.cron
-%%PORTDOCS%%%%EXAMPLESDIR%%/sample.config
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynip.sh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/iroffer.cron
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.config
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
diff --git a/irc/ruby-rica/Makefile b/irc/ruby-rica/Makefile
index fbbfbd420f6e..0063e69307d3 100644
--- a/irc/ruby-rica/Makefile
+++ b/irc/ruby-rica/Makefile
@@ -34,11 +34,13 @@ do-install:
 .for f in ${MODULES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_SITELIBDIR}/
 .endfor
-.if !defined(NOPORTDOCS)
+.if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 .for f in ${EXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODEXAMPLESDIR}/
 .endfor
+.endif
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
diff --git a/irc/ruby-rica/pkg-plist b/irc/ruby-rica/pkg-plist
index 10591dc2a43e..7a61581b1cdd 100644
--- a/irc/ruby-rica/pkg-plist
+++ b/irc/ruby-rica/pkg-plist
@@ -2,11 +2,11 @@
 %%RUBY_SITELIBDIR%%/ctcpresponder.rb
 %%RUBY_SITELIBDIR%%/logholder.rb
 %%RUBY_SITELIBDIR%%/rica.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/erica.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/erica.txt
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ricaco.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rica-example.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/erica.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/erica.txt
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/ricaco.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/rica-example.rb
+%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/CHANGES
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/classes_and_methods.txt
diff --git a/irc/xchat-mircryption/Makefile b/irc/xchat-mircryption/Makefile
index ea57f99b3d48..bc0f57d285a6 100644
--- a/irc/xchat-mircryption/Makefile
+++ b/irc/xchat-mircryption/Makefile
@@ -29,14 +29,10 @@ WRKSRC=		${WRKDIR}/src/xchat/
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 
-PLIST_DIRS=	\
-		%%EXAMPLESDIR%%
-PLIST_FILES=	\
-		lib/xchat/plugins/mircryption.so \
-		%%EXAMPLESDIR%%/mcps_masterkey_on_start.pl
+PLIST_FILES=	lib/xchat/plugins/mircryption.so
 
-PORTDOCS=	\
-		README.txt
+PORTDOCS=	README.txt
+PORTEXAMPLES=	mcps_masterkey_on_start.pl
 
 post-patch:
 # \r\n -> \n
@@ -71,9 +67,11 @@ do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/mircryption.so \
 		${PREFIX}/lib/xchat/plugins
 # script
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_SCRIPT} \
 		${WRKSRC}/extras/mcps_masterkey_on_start.pl \
 		${EXAMPLESDIR}
+.endif
 
 .include <bsd.port.mk>