2 files changed, 86 insertions, 83 deletions

diff --git a/cad/scotch/Makefile b/cad/scotch/Makefile
index cae785687dc1..37bd261cd826 100644
--- a/cad/scotch/Makefile
+++ b/cad/scotch/Makefile
@@ -73,9 +73,12 @@ do-install:
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${LICDOCS:S|^|${WRKSRC}/doc/|} ${DATADIR}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}/grf ${EXAMPLESDIR}/tgt
+	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
+.endif
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}/grf ${EXAMPLESDIR}/tgt
 	${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/doc/|} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/grf/* ${EXAMPLESDIR}/grf
 	${INSTALL_DATA} ${WRKSRC}/tgt/* ${EXAMPLESDIR}/tgt
diff --git a/cad/scotch/pkg-plist b/cad/scotch/pkg-plist
index 6260d44b41f5..61a38427a009 100644
--- a/cad/scotch/pkg-plist
+++ b/cad/scotch/pkg-plist
@@ -39,87 +39,87 @@ lib/libscotch.a
 lib/libscotcherr.a
 lib/libscotcherrcom.a
 lib/libscotchmetis.a
-%%PORTDOCS%%%%EXAMPLESDIR%%/grf/3elt.grf.gz
-%%PORTDOCS%%%%EXAMPLESDIR%%/grf/3elt.xyz.gz
-%%PORTDOCS%%%%EXAMPLESDIR%%/grf/4elt.grf.gz
-%%PORTDOCS%%%%EXAMPLESDIR%%/grf/4elt.xyz.gz
-%%PORTDOCS%%%%EXAMPLESDIR%%/grf/4elt2.grf.gz
-%%PORTDOCS%%%%EXAMPLESDIR%%/grf/4elt2.xyz.gz
-%%PORTDOCS%%%%EXAMPLESDIR%%/grf/bump.grf.gz
-%%PORTDOCS%%%%EXAMPLESDIR%%/grf/bump.xyz.gz
-%%PORTDOCS%%%%EXAMPLESDIR%%/scotch_example.f
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/SP2_16.txt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/T3D_64.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/h1.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/h10.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/h2.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/h3.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/h4.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/h5.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/h6.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/h7.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/h8.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/h9.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/k1.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/k12.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/k128.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/k16.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/k2.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/k24.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/k256.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/k32.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/k4.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/k48.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/k512.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/k6.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/k64.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/k7.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/k8.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/k96.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m10x10.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m10x20.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m11x13.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m16x16.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m16x32.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m17x19.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m19x21.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m19x31.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m21x23.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m23x25.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m24x24.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m25x27.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m27x29.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m29x31.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m2x2.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m2x4x8.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m32x32.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m3x3.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m4x4.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m4x8.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m5x5.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m5x7.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m64x64.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m8x16.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m8x8.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m9x11.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/m9x7.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/p128.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/p16.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/p2.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/p256.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/p32.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/p4.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/p512.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/p64.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/p8.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/t2x4x8.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/t4x4x4.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/vcmplt.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/vhcub.tgt
-%%PORTDOCS%%%%EXAMPLESDIR%%/tgt/void.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/3elt.grf.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/3elt.xyz.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/4elt.grf.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/4elt.xyz.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/4elt2.grf.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/4elt2.xyz.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/bump.grf.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/bump.xyz.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scotch_example.f
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/SP2_16.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/T3D_64.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h1.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h10.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h2.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h3.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h4.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h5.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h6.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h7.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h8.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h9.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k1.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k12.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k128.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k16.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k2.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k24.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k256.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k32.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k4.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k48.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k512.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k6.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k64.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k7.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k8.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k96.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m10x10.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m10x20.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m11x13.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m16x16.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m16x32.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m17x19.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m19x21.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m19x31.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m21x23.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m23x25.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m24x24.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m25x27.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m27x29.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m29x31.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m2x2.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m2x4x8.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m32x32.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m3x3.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m4x4.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m4x8.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m5x5.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m5x7.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m64x64.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m8x16.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m8x8.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m9x11.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m9x7.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p128.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p16.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p2.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p256.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p32.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p4.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p512.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p64.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p8.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/t2x4x8.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/t4x4x4.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/vcmplt.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/vhcub.tgt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/void.tgt
 %%DATADIR%%/CeCILL-C_V1-en.txt
 %%DATADIR%%/CeCILL-C_V1-fr.txt
-%%PORTDOCS%%@dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tgt
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/grf
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+@dirrm %%DATADIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tgt
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/grf
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%