6 files changed, 47 insertions, 44 deletions

diff --git a/x11-wm/amiwm/pkg-plist b/x11-wm/amiwm/pkg-plist
index 4219521af672..ede974ffba8d 100644
--- a/x11-wm/amiwm/pkg-plist
+++ b/x11-wm/amiwm/pkg-plist
@@ -14,7 +14,7 @@ lib/X11/amiwm/requestchoice
 lib/X11/amiwm/schwartz.map
 lib/X11/amiwm/system.amiwmrc
 lib/X11/amiwm/system.map
-share/doc/amiwm/README
-share/doc/amiwm/README.modules
+%%PORTDOCS%%share/doc/amiwm/README
+%%PORTDOCS%%share/doc/amiwm/README.modules
 @dirrm lib/X11/amiwm
-@dirrm share/doc/amiwm
+%%PORTDOCS%%@dirrm share/doc/amiwm
diff --git a/x11-wm/ude/pkg-plist b/x11-wm/ude/pkg-plist
index 6e087e1860ca..ea72a089f7ba 100644
--- a/x11-wm/ude/pkg-plist
+++ b/x11-wm/ude/pkg-plist
@@ -14,15 +14,15 @@ include/ude/ude-types.h
 include/ude/ude-vector.h
 include/ude/ude-wraparounds.h
 include/ude/ude.h
-share/doc/ude/html/index.html
-share/doc/ude/html/scratch.html
-share/doc/ude/html/uwm/index.html
-share/doc/ude/html/uwm/uwm_manual.html
-share/doc/ude/manual.tex
-share/doc/ude/scratch.lyx
-share/doc/ude/scratch.txt
-share/doc/ude/uwm_manual.lyx
-share/doc/ude/uwm_manual.txt
+%%PORTDOCS%%share/doc/ude/html/index.html
+%%PORTDOCS%%share/doc/ude/html/scratch.html
+%%PORTDOCS%%share/doc/ude/html/uwm/index.html
+%%PORTDOCS%%share/doc/ude/html/uwm/uwm_manual.html
+%%PORTDOCS%%share/doc/ude/manual.tex
+%%PORTDOCS%%share/doc/ude/scratch.lyx
+%%PORTDOCS%%share/doc/ude/scratch.txt
+%%PORTDOCS%%share/doc/ude/uwm_manual.lyx
+%%PORTDOCS%%share/doc/ude/uwm_manual.txt
 share/locale/de/LC_MESSAGES/ude.mo
 share/locale/es/LC_MESSAGES/ude.mo
 share/locale/pt_BR/LC_MESSAGES/ude.mo
@@ -57,7 +57,7 @@ share/ude/gfx/shape.xpm
 @dirrm share/ude/extras
 @dirrm share/ude/config
 @dirrm share/ude
-@dirrm share/doc/ude/html/uwm
-@dirrm share/doc/ude/html
-@dirrm share/doc/ude
+%%PORTDOCS%%@dirrm share/doc/ude/html/uwm
+%%PORTDOCS%%@dirrm share/doc/ude/html
+%%PORTDOCS%%@dirrm share/doc/ude
 @dirrm include/ude
diff --git a/x11-wm/wmanager/Makefile b/x11-wm/wmanager/Makefile
index 6fc84aac5ed7..ff1f21541b27 100644
--- a/x11-wm/wmanager/Makefile
+++ b/x11-wm/wmanager/Makefile
@@ -27,17 +27,20 @@ MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wmanager ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/wmanager
-	${INSTALL_DATA} ${WRKSRC}/.wmanagerrc ${PREFIX}/share/wmanager/wmanagerrc_sample
-	${INSTALL_DATA} ${WRKSRC}/.xinitrc ${PREFIX}/share/wmanager/xinitrc_sample
+	@${MKDIR} ${PREFIX}/share/examples/${PORTNAME}
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/.wmanagerrc \
+		${PREFIX}/share/examples/${PORTNAME}/wmanagerrc_sample
+	@${INSTALL_DATA} ${WRKSRC}/.xinitrc \
+		${PREFIX}/share/examples/${PORTNAME}/xinitrc_sample
 .for file in FAQ HISTORY INSTALL NEWS README TODO
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/wmanager
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
-	@${ECHO}
-	@${ECHO} "Docs have been installed in ${PREFIX}/share/wmanager/."
-	@${ECHO} "You are advised to have a look at the sample .wmanagerrc"
-	@${ECHO} "and .xinitrc's available there."
-	@${ECHO}
+	@${ECHO} ""
+	@${ECHO} "Examples of .xinitrc and .wmanagerrc have been installed"
+	@${ECHO} "in ${PREFIX}/share/examples/${PORTNAME} and docs have"
+	@${ECHO} "been installed to ${DOCSDIR}."
+	@${ECHO} ""
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-wm/wmanager/pkg-plist b/x11-wm/wmanager/pkg-plist
index ad086eee851c..431808f20122 100644
--- a/x11-wm/wmanager/pkg-plist
+++ b/x11-wm/wmanager/pkg-plist
@@ -1,10 +1,11 @@
 bin/wmanager
-share/wmanager/wmanagerrc_sample
-share/wmanager/xinitrc_sample
-share/wmanager/FAQ
-share/wmanager/HISTORY
-share/wmanager/INSTALL
-share/wmanager/NEWS
-share/wmanager/README
-share/wmanager/TODO
-@dirrm share/wmanager
+%%PORTDOCS%%share/doc/wmanager/FAQ
+%%PORTDOCS%%share/doc/wmanager/HISTORY
+%%PORTDOCS%%share/doc/wmanager/INSTALL
+%%PORTDOCS%%share/doc/wmanager/NEWS
+%%PORTDOCS%%share/doc/wmanager/README
+%%PORTDOCS%%share/doc/wmanager/TODO
+%%PORTDOCS%%share/examples/wmanager/wmanagerrc_sample
+%%PORTDOCS%%share/examples/wmanager/xinitrc_sample
+%%PORTDOCS%%@dirrm share/examples/wmanager
+%%PORTDOCS%%@dirrm share/doc/wmanager
diff --git a/x11-wm/wmthemeinstall/Makefile b/x11-wm/wmthemeinstall/Makefile
index a21c4afdcf12..f8fcee9c27b4 100644
--- a/x11-wm/wmthemeinstall/Makefile
+++ b/x11-wm/wmthemeinstall/Makefile
@@ -19,20 +19,19 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GTK=	yes
 GNU_CONFIGURE=	yes
-DOCS_DIR=	${PREFIX}/share/wmthemeinstall
 
 pre-build:
 	@${PERL} -pi -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/wmOptions.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wmthemeinstall ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/wmthemeinstall ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCS_DIR}
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCS_DIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCS_DIR}
-	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DOCS_DIR}
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DOCSDIR}
 	@${ECHO}
-	@${ECHO} "Documentation was installed in ${DOCS_DIR}."
+	@${ECHO} "Documentation was installed in ${DOCSDIR}."
 	@${ECHO}
 .endif
 
diff --git a/x11-wm/wmthemeinstall/pkg-plist b/x11-wm/wmthemeinstall/pkg-plist
index 595c0aad510f..719cd8bcede5 100644
--- a/x11-wm/wmthemeinstall/pkg-plist
+++ b/x11-wm/wmthemeinstall/pkg-plist
@@ -1,5 +1,5 @@
 bin/wmthemeinstall
-share/wmthemeinstall/AUTHORS
-share/wmthemeinstall/ChangeLog
-share/wmthemeinstall/README
-@dirrm share/wmthemeinstall
+%%PORTDOCS%%share/doc/wmthemeinstall/AUTHORS
+%%PORTDOCS%%share/doc/wmthemeinstall/ChangeLog
+%%PORTDOCS%%share/doc/wmthemeinstall/README
+%%PORTDOCS%%@dirrm share/doc/wmthemeinstall