Fix manpage suffix in FreeBSD, it's IMAKE_MANNEWSUFFIX not

IMAKE_LIBMAN_SUFFIX.

2 files changed, 107 insertions, 117 deletions

diff --git a/x11/XFree86-clients/Makefile b/x11/XFree86-clients/Makefile
index 385660617ab..9864ff64148 100644
--- a/x11/XFree86-clients/Makefile
+++ b/x11/XFree86-clients/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/02/02 14:16:07 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/04 23:29:26 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		XFree86-clients-${XF_VER}
@@ -23,12 +23,6 @@ XINSTALL_MAN_DIRS=	programs
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD"
-PLIST_SUBST+=		MANPAGE_SUFFIX=${IMAKE_MANNEWSUFFIX}
-.else
-PLIST_SUBST+=		MANPAGE_SUFFIX=${IMAKE_LIBMAN_SUFFIX}
-.endif
-
 .if ${OPSYS} == "Linux"
 .  include "../../security/PAM/buildlink2.mk"
 .endif
diff --git a/x11/XFree86-clients/PLIST b/x11/XFree86-clients/PLIST
index 90f549fb863..ee94c7c9300 100644
--- a/x11/XFree86-clients/PLIST
+++ b/x11/XFree86-clients/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/02/02 14:16:07 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/02/04 23:29:26 xtraeme Exp $
 X11R6/bin/Xmark
 X11R6/bin/appres
 X11R6/bin/atobm
@@ -722,111 +722,111 @@ X11R6/lib/X11/xkb/types/pc
 X11R6/lib/X11/xkb/xkbcomp
 X11R6/lib/X11/xman.help
 X11R6/lib/X11/xsm/system.xsm
-X11R6/${IMAKE_MAN_DIR}/Xmark.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/appres.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/atobm.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/bdftopcf.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/beforelight.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/bitmap.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/bmtoa.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/cxpm.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/dga.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/dpsexec.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/dpsinfo.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/editres.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/fslsfonts.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/fstobdf.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/glxgears.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/glxinfo.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/iceauth.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/ico.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/lbxproxy.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/listres.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/luit.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/makepsres.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/mkcfm.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/mkfontdir.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/mkfontscale.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/oclock.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/proxymngr.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/resize.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/rstart.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/rstartd.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/sessreg.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/setxkbmap.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/showfont.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/showrgb.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/smproxy.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/startx.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/sxpm.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/texteroids.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/twm.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/viewres.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/x11perf.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/x11perfcomp.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xauth.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xbiff.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xcalc.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xclipboard.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xclock.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xcmsdb.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xconsole.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xcursorgen.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xcutsel.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xditview.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xdm.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xdpyinfo.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xedit.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xev.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xeyes.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xfd.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xfindproxy.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xfontsel.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xfsinfo.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xfwp.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xgamma.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xgc.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xhost.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xinit.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xkbcomp.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xkbevd.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xkbprint.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xkill.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xload.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xlogo.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xlsatoms.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xlsclients.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xlsfonts.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xmag.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xman.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xmessage.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xmh.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xmodmap.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xon.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xprop.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xrandr.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xrdb.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xrefresh.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xset.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xsetmode.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xsetpointer.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xsetroot.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xsm.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xstdcmap.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xterm.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xtrap.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xtrapchar.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xtrapin.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xtrapinfo.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xtrapout.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xtrapproto.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xtrapreset.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xtrapstats.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xvidtune.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xvinfo.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xwd.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xwininfo.${MANPAGE_SUFFIX}
-X11R6/${IMAKE_MAN_DIR}/xwud.${MANPAGE_SUFFIX}
+X11R6/${IMAKE_MAN_DIR}/Xmark.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/appres.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/atobm.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/bdftopcf.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/beforelight.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/bitmap.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/bmtoa.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/cxpm.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/dga.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/dpsexec.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/dpsinfo.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/editres.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/fslsfonts.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/fstobdf.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/glxgears.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/glxinfo.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/iceauth.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/ico.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/lbxproxy.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/listres.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/luit.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/makepsres.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/mkcfm.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/mkfontdir.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/mkfontscale.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/oclock.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/proxymngr.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/resize.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/rstart.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/rstartd.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/sessreg.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/setxkbmap.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/showfont.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/showrgb.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/smproxy.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/startx.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/sxpm.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/texteroids.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/twm.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/viewres.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/x11perf.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/x11perfcomp.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xauth.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xbiff.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xcalc.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xclipboard.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xclock.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xcmsdb.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xconsole.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xcursorgen.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xcutsel.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xditview.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xdm.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xdpyinfo.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xedit.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xev.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xeyes.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xfd.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xfindproxy.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xfontsel.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xfsinfo.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xfwp.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xgamma.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xgc.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xhost.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xinit.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xkbcomp.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xkbevd.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xkbprint.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xkill.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xload.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xlogo.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xlsatoms.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xlsclients.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xlsfonts.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xmag.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xman.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xmessage.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xmh.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xmodmap.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xon.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xprop.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xrandr.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xrdb.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xrefresh.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xset.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xsetmode.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xsetpointer.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xsetroot.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xsm.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xstdcmap.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xterm.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xtrap.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xtrapchar.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xtrapin.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xtrapinfo.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xtrapout.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xtrapproto.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xtrapreset.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xtrapstats.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xvidtune.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xvinfo.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xwd.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xwininfo.${IMAKE_MANNEWSUFFIX}
+X11R6/${IMAKE_MAN_DIR}/xwud.${IMAKE_MANNEWSUFFIX}
 @dirrm X11R6/lib/X11/xsm
 @dirrm X11R6/lib/X11/xkb/types
 @dirrm X11R6/lib/X11/xkb/symbols/xfree68
@@ -881,8 +881,4 @@ X11R6/${IMAKE_MAN_DIR}/xwud.${MANPAGE_SUFFIX}
 @dirrm X11R6/lib/X11/fonts
 @dirrm X11R6/lib/X11/etc
 @dirrm X11R6/lib/X11/app-defaults
-@dirrm X11R6/lib/X11
-@dirrm X11R6/include/X11/bitmaps
 @dirrm X11R6/include/X11/PM
-@dirrm X11R6/include/X11
-@dirrm X11R6/bin