Use new IMAKE_MAN_PATH variables in PLISTs to make these packages more

portable.  Bump PKGREVISION accordingly.

17 files changed, 37 insertions, 41 deletions

diff --git a/wm/9wm/Makefile b/wm/9wm/Makefile
index a0ec797b4b5..cc81eef2454 100644
--- a/wm/9wm/Makefile
+++ b/wm/9wm/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2002/01/27 18:32:35 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/03 03:32:31 jschauma Exp $
 # FreeBSD Id: Makefile,v 1.4 1997/05/28 06:18:20 fenner Exp
 #
 
 DISTNAME=		9wm-1.1
+PKGREVISION=		1
 CATEGORIES=		plan9 wm
 MASTER_SITES=		ftp://ftp.freefriends.org/arnold/Source/
 EXTRACT_SUFX=		.shar.gz
diff --git a/wm/9wm/PLIST b/wm/9wm/PLIST
index 8aaaff1852f..a363de8410a 100644
--- a/wm/9wm/PLIST
+++ b/wm/9wm/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:59:00 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 03:32:32 jschauma Exp $
 bin/9wm
-man/cat1/9wm.0
+${IMAKE_MAN_DIR}/9wm.${IMAKE_MANNEWSUFFIX}
diff --git a/wm/fvwm1/Makefile b/wm/fvwm1/Makefile
index 9fc458d6110..d2ea706f6a8 100644
--- a/wm/fvwm1/Makefile
+++ b/wm/fvwm1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/06/17 09:28:59 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/03 03:32:32 jschauma Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -45,8 +45,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/fvwm_icons/*.xbm \
 	  ${WRKSRC}/fvwm_icons/*.bitmap ${WRKSRC}/fvwm_icons/*.icon \
 	  ${PREFIX}/lib/X11/fvwm/bitmaps
-	${INSTALL_MAN} ${WRKSRC}/modules/GoodStuff/GoodStuff.man \
-	  ${PREFIX}/man/man1/GoodStuff.1
-	${INSTALL_MAN} ${WRKSRC}/fvwm/fvwm.man ${PREFIX}/man/man1/fvwm.1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/fvwm1/PLIST b/wm/fvwm1/PLIST
index 9df143f1cd0..2ae0ded22a1 100644
--- a/wm/fvwm1/PLIST
+++ b/wm/fvwm1/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:59:13 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 03:32:33 jschauma Exp $
 bin/fvwm
 lib/X11/fvwm/FvwmPager
 lib/X11/fvwm/system.fvwmrc
@@ -64,10 +64,8 @@ lib/X11/fvwm/pixmaps/xterm-sgi.xpm
 lib/X11/fvwm/pixmaps/xterm-sol.xpm
 lib/X11/fvwm/pixmaps/xterm-sun.xpm
 lib/X11/fvwm/pixmaps/xterm.xpm
-man/cat1/GoodStuff.0
-man/cat1/fvwm.0
-man/man1/GoodStuff.1
-man/man1/fvwm.1
+${IMAKE_MAN_DIR}/GoodStuff.${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/fvwm.${IMAKE_MANNEWSUFFIX}
 @dirrm lib/X11/fvwm/pixmaps
 @dirrm lib/X11/fvwm/bitmaps
 @dirrm lib/X11/fvwm
diff --git a/wm/larswm/Makefile b/wm/larswm/Makefile
index 08b3afb5e47..4c9b5201223 100644
--- a/wm/larswm/Makefile
+++ b/wm/larswm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/02/15 19:14:09 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/03 03:32:33 jschauma Exp $
 #
 
 DISTNAME=	larswm-7.2.8
+PKGREVISION=	1
 CATEGORIES=	x11 wm
 MASTER_SITES=	http://www-personal.umich.edu/~larsb/larswm/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DOCFILES}
diff --git a/wm/larswm/PLIST b/wm/larswm/PLIST
new file mode 100644
index 00000000000..55d853eadc3
--- /dev/null
+++ b/wm/larswm/PLIST
@@ -0,0 +1,10 @@
+@comment $NetBSD: PLIST,v 1.1 2003/03/03 03:32:33 jschauma Exp $
+bin/larsclock
+bin/larsremote
+bin/larswm
+${IMAKE_MAN_DIR}/larsclock.${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/larswm.${IMAKE_MANNEWSUFFIX}
+${IMAKE_MAN_DIR}/larsremote.${IMAKE_MANNEWSUFFIX}
+share/doc/larswm/keyboard_refcard.pdf
+share/doc/larswm/mouse_refcard.pdf
+@dirrm share/doc/larswm
diff --git a/wm/larswm/PLIST.Linux b/wm/larswm/PLIST.Linux
deleted file mode 100644
index d07bf3f02cd..00000000000
--- a/wm/larswm/PLIST.Linux
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.1.1.1 2003/02/15 19:14:09 jschauma Exp $
-man/man1/larswm.1x
-man/man1/larsremote.1x
-man/man1/larsclock.1x
diff --git a/wm/larswm/PLIST.NetBSD b/wm/larswm/PLIST.NetBSD
deleted file mode 100644
index 7ca1911a9c8..00000000000
--- a/wm/larswm/PLIST.NetBSD
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.1.1.1 2003/02/15 19:14:09 jschauma Exp $
-man/cat1/larsclock.0
-man/cat1/larsremote.0
-man/cat1/larswm.0
diff --git a/wm/larswm/PLIST.common b/wm/larswm/PLIST.common
deleted file mode 100644
index e90bc0a997e..00000000000
--- a/wm/larswm/PLIST.common
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.1.1.1 2003/02/15 19:14:09 jschauma Exp $
-bin/larsclock
-bin/larsremote
-bin/larswm
-share/doc/larswm/keyboard_refcard.pdf
-share/doc/larswm/mouse_refcard.pdf
-@dirrm share/doc/larswm
diff --git a/wm/olvwm/Makefile b/wm/olvwm/Makefile
index e2ee4773705..336d5c5c7c5 100644
--- a/wm/olvwm/Makefile
+++ b/wm/olvwm/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2002/10/10 13:09:34 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/03 03:32:34 jschauma Exp $
 #
 
 DISTNAME=	olvwm4.src4
 PKGNAME=	olvwm-4.4
+PKGREVISION=	1
 CATEGORIES=	x11 wm
 MASTER_SITES=	http://www.akula.com/~jadler/sdo/olvwm/
 
diff --git a/wm/olvwm/PLIST b/wm/olvwm/PLIST
index be224042240..cf2098e399b 100644
--- a/wm/olvwm/PLIST
+++ b/wm/olvwm/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:59:20 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 03:32:34 jschauma Exp $
 bin/olvwm
 lib/help/olvwm.info
-man/cat1/olvwm.0
-man/cat5/olvwmrc.0
+${IMAKE_MAN_DIR}/olvwm.${IMAKE_MANNEWSUFFIX}
+${IMAKE_FILEMAN_DIR}/olvwmrc.${IMAKE_MANNEWSUFFIX}
diff --git a/wm/piewm/Makefile b/wm/piewm/Makefile
index 2fdbda0d891..7b7074a028c 100644
--- a/wm/piewm/Makefile
+++ b/wm/piewm/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/10/28 22:28:31 agc Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/03 03:32:35 jschauma Exp $
 
 DISTNAME=	piewm-1.02
+PKGREVISION=	1
 CATEGORIES=	wm
 MASTER_SITES=	ftp://ftp.crynwr.com/piewm/
 
diff --git a/wm/piewm/PLIST b/wm/piewm/PLIST
index 6e4f6604a11..47ff5b95fe4 100644
--- a/wm/piewm/PLIST
+++ b/wm/piewm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/10/28 22:28:31 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 03:32:35 jschauma Exp $
 bin/piewm
 lib/X11/twm/system.twmrc
-man/cat1/piewm.0
+${IMAKE_MAN_DIR}/piewm.${IMAKE_MANNEWSUFFIX}
diff --git a/wm/tvtwm/Makefile b/wm/tvtwm/Makefile
index 9648c96180d..24cbdf00ed9 100644
--- a/wm/tvtwm/Makefile
+++ b/wm/tvtwm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2002/10/10 12:57:44 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/03 03:32:35 jschauma Exp $
 
 DISTNAME=	tvtwm.pl11
 PKGNAME=	tvtwm-11
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/tvtwm
 CATEGORIES=	x11 wm
 MASTER_SITES=	${MASTER_SITE_XCONTRIB:=window_managers/}
diff --git a/wm/tvtwm/PLIST b/wm/tvtwm/PLIST
index 2d52c9e2c89..bd76ffd4a0b 100644
--- a/wm/tvtwm/PLIST
+++ b/wm/tvtwm/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:59:28 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 03:32:35 jschauma Exp $
 bin/tvtwm
 bin/ssetroot
 lib/X11/twm/system.tvtwmrc
-man/cat1/tvtwm.0
+${IMAKE_MAN_DIR}/tvtwm.${IMAKE_MANNEWSUFFIX}
diff --git a/wm/uwm/Makefile b/wm/uwm/Makefile
index 766c691f40f..34e699d71b8 100644
--- a/wm/uwm/Makefile
+++ b/wm/uwm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2001/02/25 04:18:21 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/03 03:32:36 jschauma Exp $
 
 DISTNAME=	X.V11R3uwm
 PKGNAME=	uwm-19881027
+PKGREVISION=	1
 CATEGORIES=	x11 wm
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
diff --git a/wm/uwm/PLIST b/wm/uwm/PLIST
index 8db68042178..ebdc9f1faf6 100644
--- a/wm/uwm/PLIST
+++ b/wm/uwm/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:59:29 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/03/03 03:32:36 jschauma Exp $
 bin/uwm
-man/cat1/uwm.0
+${IMAKE_MAN_DIR}/uwm.${IMAKE_MANNEWSUFFIX}
 lib/X11/uwm/system.uwmrc
 @dirrm lib/X11/uwm