Move manpages to the Makefile and use MAN* macros.

14 files changed, 25 insertions, 50 deletions

diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index 3c5351cddbaa..d86c345eb080 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -3,7 +3,7 @@
 # Date created:		1 May 1998
 # Whom:			Brett Taylor
 #
-# $Id: Makefile,v 1.25 1998/09/15 11:13:34 asami Exp $
+# $Id: Makefile,v 1.26 1998/09/17 00:32:56 asami Exp $
 #
 
 DISTNAME=	AfterStep-1.4.5.0
@@ -30,6 +30,11 @@ MANCOMPRESSED=	yes
 HAS_CONFIGURE=	yes
 
 XMKMF=		$(X11BASE)/bin/xmkmf
+MAN1=		ASSound.1 Animate.1 Audio.1 Auto.1 Banner.1 Clean.1 Form.1 \
+		Ident.1 Pager-noxpm.1 Pager.1 Save.1 Scroll.1 Wharf.1 \
+		WinList.1 Zharf.1 afterstep.1 ascd.1 asclock.1 asmail.1 \
+		asmodem.1 xiterm.1
+
 pre-configure:
 	@${ECHO_MSG} "The interactive portion is asking you about languages"
 	@${ECHO_MSG} "and color use by asclock."
diff --git a/x11-wm/afterstep-stable/pkg-plist b/x11-wm/afterstep-stable/pkg-plist
index 47c22178ce13..68f77abe1a01 100644
--- a/x11-wm/afterstep-stable/pkg-plist
+++ b/x11-wm/afterstep-stable/pkg-plist
@@ -29,27 +29,6 @@ bin/WinList
 bin/Zharf
 bin/afterstepdoc
 include/X11/pixmaps/monitor_bsd.xpm
-man/man1/ascd.1.gz
-man/man1/Audio.1.gz
-man/man1/Auto.1.gz
-man/man1/asclock.1.gz
-man/man1/asmail.1.gz
-man/man1/asmodem.1.gz
-man/man1/xiterm.1.gz
-man/man1/Clean.1.gz
-man/man1/ASSound.1.gz
-man/man1/Animate.1.gz
-man/man1/Banner.1.gz
-man/man1/Form.1.gz
-man/man1/Ident.1.gz
-man/man1/Save.1.gz
-man/man1/Pager.1.gz
-man/man1/Pager-noxpm.1.gz
-man/man1/Scroll.1.gz
-man/man1/Wharf.1.gz
-man/man1/Zharf.1.gz
-man/man1/WinList.1.gz
-man/man1/afterstep.1.gz
 share/afterstep/looks/look.Wouter
 share/afterstep/looks/look.Nextish
 share/afterstep/looks/look.Black
diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile
index 868122d31bd7..8dfa5eb77c31 100644
--- a/x11-wm/ctwm/Makefile
+++ b/x11-wm/ctwm/Makefile
@@ -3,7 +3,7 @@
 # Date created:		13 November 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.17 1998/09/15 11:13:34 asami Exp $
+# $Id: Makefile,v 1.18 1998/09/17 00:32:56 asami Exp $
 #
 
 DISTNAME=	ctwm-3.5
@@ -15,5 +15,6 @@ MAINTAINER=	torstenb@FreeBSD.ORG
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 USE_IMAKE=	yes
+MAN1=		ctwm.1
 
 .include <bsd.port.mk>
diff --git a/x11-wm/ctwm/pkg-plist b/x11-wm/ctwm/pkg-plist
index b056bed3c371..4c2029e431b1 100644
--- a/x11-wm/ctwm/pkg-plist
+++ b/x11-wm/ctwm/pkg-plist
@@ -1,6 +1,5 @@
 bin/ctwm
 lib/X11/twm/system.ctwmrc
-man/man1/ctwm.1.gz
 lib/X11/twm/images/3D_Expand15.xpm
 lib/X11/twm/images/3D_Iconify15.xpm
 lib/X11/twm/images/3D_Lightning15.xpm
@@ -90,3 +89,5 @@ lib/X11/twm/images/xrn.goodnews.xpm
 lib/X11/twm/images/xrn.nonews.xpm
 lib/X11/twm/images/xrn.xpm
 lib/X11/twm/images/xterm.xpm
+@dirrm lib/X11/twm/images
+@dirrm lib/X11/twm
diff --git a/x11-wm/fvwm/Makefile b/x11-wm/fvwm/Makefile
index eda4c552a368..b90d1c94412c 100644
--- a/x11-wm/fvwm/Makefile
+++ b/x11-wm/fvwm/Makefile
@@ -3,7 +3,7 @@
 # Date created:		12 May 1995
 # Whom:			me
 #
-# $Id: Makefile,v 1.25 1998/09/15 11:13:35 asami Exp $
+# $Id: Makefile,v 1.26 1998/09/17 00:32:56 asami Exp $
 #
 
 DISTNAME=	fvwm-1.24r
@@ -19,6 +19,10 @@ NO_LATEST_LINK=	yes
 USE_IMAKE=	yes
 XMKMF=		xmkmf
 ALL_TARGET=	Makefiles all
+MAN1=		FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 FvwmClean.1 \
+		FvwmDebug.1 FvwmIconBox.1 FvwmIdent.1 FvwmPager.1 FvwmSave.1 \
+		FvwmSaveDesk.1 FvwmScroll.1 FvwmWinList.1 GoodStuff.1 fvwm.1 \
+		xpmroot.1
 
 post-install:
 	@mkdir -p ${PREFIX}/include/X11/pixmaps
diff --git a/x11-wm/fvwm/pkg-plist b/x11-wm/fvwm/pkg-plist
index 9571068c5b41..41e54ea570f0 100644
--- a/x11-wm/fvwm/pkg-plist
+++ b/x11-wm/fvwm/pkg-plist
@@ -15,22 +15,6 @@ lib/X11/fvwm/FvwmAuto
 lib/X11/fvwm/FvwmWinList
 lib/X11/fvwm/FvwmBanner
 lib/X11/fvwm/system.fvwmrc
-man/man1/fvwm.1.gz
-man/man1/GoodStuff.1.gz
-man/man1/FvwmIdent.1.gz
-man/man1/FvwmDebug.1.gz
-man/man1/FvwmBacker.1.gz
-man/man1/FvwmClean.1.gz
-man/man1/FvwmPager.1.gz
-man/man1/FvwmAudio.1.gz
-man/man1/FvwmScroll.1.gz
-man/man1/FvwmIconBox.1.gz
-man/man1/FvwmSave.1.gz
-man/man1/FvwmSaveDesk.1.gz
-man/man1/FvwmAuto.1.gz
-man/man1/FvwmWinList.1.gz
-man/man1/xpmroot.1.gz
-man/man1/FvwmBanner.1.gz
 include/X11/pixmaps/arrdown2.xpm
 include/X11/pixmaps/arrows2.xpm
 include/X11/pixmaps/arrup2.xpm
@@ -74,3 +58,4 @@ include/X11/pixmaps/xterm-sgi.xpm
 include/X11/pixmaps/xterm-sol.xpm
 include/X11/pixmaps/xterm-sun.xpm
 include/X11/pixmaps/xterm.xpm
+@dirrm lib/X11/fvwm
diff --git a/x11-wm/gwm/Makefile b/x11-wm/gwm/Makefile
index bf4c5f463bea..ce7d8532497b 100644
--- a/x11-wm/gwm/Makefile
+++ b/x11-wm/gwm/Makefile
@@ -3,7 +3,7 @@
 # Date created:		14 November 1996
 # Whom:			markm
 #
-# $Id: Makefile,v 1.6 1998/09/15 11:13:35 asami Exp $
+# $Id: Makefile,v 1.7 1998/09/17 00:32:57 asami Exp $
 #
 
 DISTNAME=	gwm-1.8c
@@ -16,5 +16,6 @@ MAINTAINER=	markm@FreeBSD.ORG
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 USE_IMAKE=	yes
+MAN1=		gwm.1
 
 .include <bsd.port.mk>
diff --git a/x11-wm/gwm/pkg-plist b/x11-wm/gwm/pkg-plist
index 8231faadf8b9..4edd49f9f6a1 100644
--- a/x11-wm/gwm/pkg-plist
+++ b/x11-wm/gwm/pkg-plist
@@ -1,6 +1,5 @@
 @cwd /usr/X11R6
 bin/gwm
-man/man1/gwm.1.gz
 @cwd /usr/local
 lib/gwm/Imakefile
 lib/gwm/ImakeB
@@ -211,3 +210,4 @@ lib/gwm/Zircon-icon.yes
 lib/gwm/Zircon-icon.no
 lib/gwm/wallpaper.gwm
 lib/gwm/timeout-win.gwm
+@dirrm lib/gwm
diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile
index d7492c1fab53..22a9bdcad1eb 100644
--- a/x11-wm/olvwm/Makefile
+++ b/x11-wm/olvwm/Makefile
@@ -3,7 +3,7 @@
 # Date created:		21 October 1994
 # Whom:			smace
 #
-# $Id: Makefile,v 1.13 1998/08/24 01:28:42 steve Exp $
+# $Id: Makefile,v 1.14 1998/09/21 22:15:59 steve Exp $
 #
 
 DISTNAME=	olvwm4
@@ -25,5 +25,6 @@ LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview-lib
 
 NO_WRKSUBDIR=	yes
 USE_IMAKE=	yes
+MAN1=		olvwm.1 olvwmrc.1
 
 .include <bsd.port.mk>
diff --git a/x11-wm/olvwm/pkg-plist b/x11-wm/olvwm/pkg-plist
index d884008d8f2b..6be61568ad4d 100644
--- a/x11-wm/olvwm/pkg-plist
+++ b/x11-wm/olvwm/pkg-plist
@@ -1,4 +1,2 @@
 bin/olvwm
 lib/help/olvwm.info
-man/man1/olvwm.1.gz
-man/man1/olvwmrc.1.gz
diff --git a/x11-wm/piewm/Makefile b/x11-wm/piewm/Makefile
index aacb14f8690d..1fa02ae32389 100644
--- a/x11-wm/piewm/Makefile
+++ b/x11-wm/piewm/Makefile
@@ -3,7 +3,7 @@
 # Date created:		24 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.13 1998/09/15 11:13:36 asami Exp $
+# $Id: Makefile,v 1.14 1998/09/17 00:32:58 asami Exp $
 #
 
 DISTNAME=	piewm
@@ -17,6 +17,7 @@ MAINTAINER=	ports@FreeBSD.ORG
 LIB_DEPENDS=    Xpm.4:${PORTSDIR}/graphics/xpm
 
 USE_IMAKE=	yes
+MAN1=		piewm.1
 
 # piewm.tar.Z includes and old version of xpm, and also a bunch of .o
 #  files plus an executable
diff --git a/x11-wm/piewm/pkg-plist b/x11-wm/piewm/pkg-plist
index 53162142a235..d73ef90de3d4 100644
--- a/x11-wm/piewm/pkg-plist
+++ b/x11-wm/piewm/pkg-plist
@@ -1,5 +1,4 @@
 bin/piewm
 bin/ssetroot
 lib/X11/piewm/system.twmrc
-man/man1/piewm.1.gz
 @dirrm lib/X11/piewm
diff --git a/x11-wm/tvtwm/Makefile b/x11-wm/tvtwm/Makefile
index 09fada6ce5ae..81909865c994 100644
--- a/x11-wm/tvtwm/Makefile
+++ b/x11-wm/tvtwm/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5th December 1994
 # Whom:			gpalmer
 #
-# $Id: Makefile,v 1.11 1998/09/15 11:13:37 asami Exp $
+# $Id: Makefile,v 1.12 1998/09/17 00:32:59 asami Exp $
 #
 
 DISTNAME=	tvtwm
@@ -18,5 +18,6 @@ MAINTAINER=	gpalmer@FreeBSD.ORG
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 USE_IMAKE=	yes
+MAN1=		tvtwm.1
 
 .include <bsd.port.mk>
diff --git a/x11-wm/tvtwm/pkg-plist b/x11-wm/tvtwm/pkg-plist
index d799e55506d2..6f2247eec1e9 100644
--- a/x11-wm/tvtwm/pkg-plist
+++ b/x11-wm/tvtwm/pkg-plist
@@ -1,2 +1 @@
 bin/tvtwm
-man/man1/tvtwm.1.gz