3 files changed, 26 insertions, 30 deletions

diff --git a/graphics/wmicons/Makefile b/graphics/wmicons/Makefile
index f4cd3814479c..3d6b376b9cb3 100644
--- a/graphics/wmicons/Makefile
+++ b/graphics/wmicons/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmicons
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics windowmaker
 MASTER_SITES=	${MASTER_SITE_LOCAL:S|%SUBDIR%|kiri/wmicons|} \
 		${MASTER_SITE_WINDOWMAKER} \
@@ -24,47 +24,56 @@ EXTRACT_ONLY=	DWiconpack1.tar.gz DWiconpack2.tar.gz IconFest-1.2.tgz \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Icons mainly for use in Window Maker
 
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
+PORTDOCS=	*
 
 WRKSRC=		${WRKDIR}/WindowMaker-extra-0.1
-
 WMICONDIR=	${PREFIX}/share/WindowMaker/Pixmaps
-WMDOCDIR=	${PREFIX}/share/doc/wmicons
 
 post-extract:
 	${MKDIR} ${WRKDIR}/isiconpack4
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/isiconpack4.tgz \
 		${EXTRACT_AFTER_ARGS} -C ${WRKDIR}/isiconpack4
 
-pre-su-install:
-	${MKDIR} ${WMDOCDIR}
+post-install:
 	${MKDIR} ${WMICONDIR}
 	cd ${WRKDIR}/IconFest-1.2; \
-	${INSTALL_DATA} README ${WMDOCDIR}/README.IconFest; \
 	${INSTALL_DATA} *.xpm *.tif ${WMICONDIR}
 	cd ${WRKDIR}/Icons; \
 	${INSTALL_DATA} *.xpm ${WMICONDIR}
 	cd ${WRKDIR}/NeXT.XEmacs; \
-	${INSTALL_DATA} README.NeXT.XEmacs ${WMDOCDIR}; \
 	${INSTALL_DATA} ./*/*.xpm ${WMICONDIR}
 	cd ${WRKDIR}/dwiconpack1; \
-	${INSTALL_DATA} dwiconpack1.README ${WMDOCDIR}/README.dwiconpack1; \
 	${INSTALL_DATA} *.tif ${WMICONDIR}
 	cd ${WRKDIR}/dwiconpack2; \
-	${INSTALL_DATA} dwiconpack2.README ${WMDOCDIR}/README.dwiconpack2; \
 	${INSTALL_DATA} *.tif ${WMICONDIR}
 	cd ${WRKDIR}/isiconpack4; \
-	${INSTALL_DATA} CREDITS ${WMDOCDIR}; \
 	${INSTALL_DATA} *.xpm *.tif ${WMICONDIR}
 	cd ${WRKDIR}/japanese-step-icons; \
-	${INSTALL_DATA} README.txt ${WMDOCDIR}/README.japanese-step-icons.txt; \
 	${INSTALL_DATA} *.xpm ${WMICONDIR}
 	cd ${WRKDIR}/vf_png; \
-	${INSTALL_DATA} README ${WMDOCDIR}/README.vf_png; \
 	${INSTALL_DATA} *.png ${WMICONDIR}
 	cd ${WRKDIR}/vf_tif; \
-	${INSTALL_DATA} README ${WMDOCDIR}/README.vf_tif; \
 	${INSTALL_DATA} *.tif ${WMICONDIR}
 
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/IconFest-1.2/README \
+		${DOCSDIR}/README.IconFest
+	${INSTALL_DATA} ${WRKDIR}/NeXT.XEmacs/README.NeXT.XEmacs \
+		${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/dwiconpack1/dwiconpack1.README \
+		${DOCSDIR}/README.dwiconpack1
+	${INSTALL_DATA} ${WRKDIR}/dwiconpack2/dwiconpack2.README \
+		${DOCSDIR}/README.dwiconpack2
+	${INSTALL_DATA} ${WRKDIR}/isiconpack4/CREDITS \
+		${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/japanese-step-icons/README.txt \
+		${DOCSDIR}/README.japanese-step-icons.txt
+	${INSTALL_DATA} ${WRKDIR}/vf_png/README \
+		${DOCSDIR}/README.vf_png
+	${INSTALL_DATA} ${WRKDIR}/vf_tif/README \
+		${DOCSDIR}/README.vf_tif
+.endif
+
 .include <bsd.port.mk>
diff --git a/graphics/wmicons/pkg-descr b/graphics/wmicons/pkg-descr
index ef7da65567f9..2a0249880ebb 100644
--- a/graphics/wmicons/pkg-descr
+++ b/graphics/wmicons/pkg-descr
@@ -1,5 +1 @@
 This package provides icons used in WindowMaker frequently.
-
---
-KIRIYAMA Kazuhiko
-<kiri@FreeBSD.org>
diff --git a/graphics/wmicons/pkg-plist b/graphics/wmicons/pkg-plist
index b4a9536462fc..cfa4c2ddfbe3 100644
--- a/graphics/wmicons/pkg-plist
+++ b/graphics/wmicons/pkg-plist
@@ -465,20 +465,11 @@ share/WindowMaker/Themes/Night.themed/SeaNight.jpeg
 share/WindowMaker/Themes/Night.themed/style
 share/WindowMaker/Themes/STEP2000.themed/BlueImage2.jpeg
 share/WindowMaker/Themes/STEP2000.themed/style
-share/doc/wmicons/CREDITS
-share/doc/wmicons/README.IconFest
-share/doc/wmicons/README.NeXT.XEmacs
-share/doc/wmicons/README.dwiconpack1
-share/doc/wmicons/README.dwiconpack2
-share/doc/wmicons/README.japanese-step-icons.txt
-share/doc/wmicons/README.vf_png
-share/doc/wmicons/README.vf_tif
-@dirrm share/doc/wmicons
 @dirrm share/WindowMaker/Themes/STEP2000.themed
 @dirrm share/WindowMaker/Themes/Night.themed
 @dirrm share/WindowMaker/Themes/LeetWM.themed
 @dirrm share/WindowMaker/Themes/Checker.themed
-@dirrm share/WindowMaker/Themes
-@dirrm share/WindowMaker/Pixmaps
-@dirrm share/WindowMaker/Icons
+@dirrmtry share/WindowMaker/Themes
+@dirrmtry share/WindowMaker/Pixmaps
+@dirrmtry share/WindowMaker/Icons
 @dirrmtry share/WindowMaker