- Remove all directories created by the port;

- install actual README file instead of vi(1) temporary copy slipped into
  distfile somehow;
- install all readmes using similar naming scheme (README.[package]);
- don't install xv.xpm - this file now included into and being installed by
  WindowMaker;
- slightly simplify makefile;

2 files changed, 12 insertions, 14 deletions

diff --git a/graphics/wmicons/Makefile b/graphics/wmicons/Makefile
index 8adc589acd21..f716d29c6e0d 100644
--- a/graphics/wmicons/Makefile
+++ b/graphics/wmicons/Makefile
@@ -14,13 +14,8 @@ MASTER_SITES=	${MASTER_SITE_WINDOWMAKER} \
 		http://www.itlb.te.noda.sut.ac.jp/~manome/wmaker/archive/ \
 		http://www.slip.net/~seto/images/ \
 		http://www.lab06.ee.u-tokai.ac.jp/~7jeem005/WindowMaker/Archives/
-MASTER_SITE_SUBDIR=. contrib/icons beta/srcs
-DISTFILES=	DWiconpack1.tar.gz DWiconpack2.tar.gz IconFest-1.2.tgz \
-		NeXT_XEmacs_tar.gz  wm_icons_png.tar.gz wm_icons_tif.tar.gz \
-		isiconpack4.tgz \
-		japanese-step-icons1.1.tar.gz \
-		KTermIcons-1.0.tar.gz \
-		WindowMaker-extra-0.1.tar.gz
+MASTER_SITE_SUBDIR=	. contrib/icons beta/srcs
+DISTFILES=	${EXTRACT_ONLY} isiconpack4.tgz
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
@@ -47,7 +42,7 @@ pre-install:
 	${MKDIR} ${WMDOCDIR}
 	${MKDIR} ${WMICONDIR}
 	cd ${WRKDIR}/IconFest-1.2; \
-	${INSTALL_DATA} .README.swp ${WMDOCDIR}; \
+	${INSTALL_DATA} README ${WMDOCDIR}/README.IconFest; \
 	${INSTALL_DATA} *.xpm *.tif ${WMICONDIR}
 	cd ${WRKDIR}/Icons; \
 	${INSTALL_DATA} *.xpm ${WMICONDIR}
@@ -55,10 +50,10 @@ pre-install:
 	${INSTALL_DATA} README.NeXT.XEmacs ${WMDOCDIR}; \
 	${INSTALL_DATA} ./*/*.xpm ${WMICONDIR}
 	cd ${WRKDIR}/dwiconpack1; \
-	${INSTALL_DATA} dwiconpack1.README ${WMDOCDIR}; \
+	${INSTALL_DATA} dwiconpack1.README ${WMDOCDIR}/README.dwiconpack1; \
 	${INSTALL_DATA} *.tif ${WMICONDIR}
 	cd ${WRKDIR}/dwiconpack2; \
-	${INSTALL_DATA} dwiconpack2.README ${WMDOCDIR}; \
+	${INSTALL_DATA} dwiconpack2.README ${WMDOCDIR}/README.dwiconpack2; \
 	${INSTALL_DATA} *.tif ${WMICONDIR}
 	cd ${WRKDIR}/isiconpack4; \
 	${INSTALL_DATA} CREDITS ${WMDOCDIR}; \
diff --git a/graphics/wmicons/pkg-plist b/graphics/wmicons/pkg-plist
index f18b0f1347c6..31a991dcae5b 100644
--- a/graphics/wmicons/pkg-plist
+++ b/graphics/wmicons/pkg-plist
@@ -59,7 +59,6 @@ share/WindowMaker/Icons/tile.black.xpm
 share/WindowMaker/Icons/tile.snow.xpm
 share/WindowMaker/Icons/tile.xpm
 share/WindowMaker/Icons/tile2.xpm
-share/WindowMaker/Icons/xv.xpm
 share/WindowMaker/Pixmaps/3D-Gun.xpm
 share/WindowMaker/Pixmaps/3D.png
 share/WindowMaker/Pixmaps/3D.tif
@@ -466,16 +465,20 @@ 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/.README.swp
 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
-share/doc/wmicons/dwiconpack1.README
-share/doc/wmicons/dwiconpack2.README
 @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
+@dirrm share/WindowMaker