Simplify XFree86-server doing the following changes:

	o Move manual pages and system indepent files to PLIST.
	o Use IMAKE_* vars.

5 files changed, 103 insertions, 250 deletions

diff --git a/x11/XFree86-server/Makefile b/x11/XFree86-server/Makefile
index cec0b6552b6..b374e518004 100644
--- a/x11/XFree86-server/Makefile
+++ b/x11/XFree86-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/31 16:13:24 grant Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/31 16:55:55 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		XFree86-server-${XF_VER}
@@ -11,7 +11,8 @@ MAINTAINER=		xfree86@blef.org
 HOMEPAGE=		http://www.xfree86.org/
 COMMENT=		XFree86 X server and related programs
 
-USE_BUILDLINK2=		YES
+USE_IMAKE=		yes
+USE_BUILDLINK2=		yes
 DISTINFO_FILE=		${.CURDIR}/../XFree86-libs/distinfo
 PATCHDIR=		${.CURDIR}/../XFree86-libs/patches
 
@@ -24,11 +25,25 @@ XINSTALL_MAN_DIRS=	programs/Xserver
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux"
+PLIST_SUBST+=		DRIMODULES=
 USE_PERL5=		yes # Still we need perl (at least for now)
 .  if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "alpha"
 XBUILD_DIRS+=		lib/XThrStub lib/X11 lib/Xext lib/GL
 XINSTALL_DIRS+=		lib/GL/mesa/src/drv
 .  endif
+.else
+PLIST_SUBST+=		LIBDRI="@comment "
+PLIST_SUBST+=		DRIMODULES="@comment "
+.endif
+
+.if ${OPSYS} == "Linux"
+PLIST_SUBST+=		KBDMODE="@comment "
+.else
+PLIST_SUBST+=		KBDMODE=
+.endif
+
+.if ${OPSYS} == "FreeBSD"
+PLIST_SUBST+=		LIBDRI=
 .endif
 
 pre-install:
diff --git a/x11/XFree86-server/PLIST.common b/x11/XFree86-server/PLIST
index 3a908ec9209..6cad39d6844 100644
--- a/x11/XFree86-server/PLIST.common
+++ b/x11/XFree86-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1.1.1 2004/01/24 08:48:59 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.1 2004/01/31 16:55:55 xtraeme Exp $
 bin/X
 bin/XFree86
 bin/Xnest
@@ -9,6 +9,7 @@ bin/inb
 bin/inl
 bin/inw
 bin/ioport
+${KBDMODE}bin/kbd_mode
 bin/mmapr
 bin/mmapw
 bin/outb
@@ -106,6 +107,15 @@ lib/modules/codeconv/libKSCJOHAB.a
 lib/modules/codeconv/libMULEENCODING.a
 lib/modules/codeconv/libTCVN.a
 lib/modules/codeconv/libVISCII.a
+${LIBDRI}lib/modules/extensions/libdri.a
+${DRIMODULES}lib/modules/dri/gamma_dri.so
+${DRIMODULES}lib/modules/dri/i810_dri.so
+${DRIMODULES}lib/modules/dri/i830_dri.so
+${DRIMODULES}lib/modules/dri/mga_dri.so
+${DRIMODULES}lib/modules/dri/r128_dri.so
+${DRIMODULES}lib/modules/dri/r200_dri.so
+${DRIMODULES}lib/modules/dri/radeon_dri.so
+${DRIMODULES}lib/modules/dri/tdfx_dri.so
 lib/modules/drivers/apm_drv.o
 lib/modules/drivers/ark_drv.o
 lib/modules/drivers/ati_drv.o
@@ -197,6 +207,81 @@ lib/modules/libxf8_16bpp.a
 lib/modules/libxf8_32bpp.a
 lib/modules/v10002d.uc
 lib/modules/v20002d.uc
+${IMAKE_MAN_DIR}/XFree86.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/Xnest.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/Xserver.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/Xvfb.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/gtf.${IMAKE_MAN_SUFFIX}
+${KBDMODE}${IMAKE_MAN_DIR}/kbd_mode.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/pcitweak.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/scanpci.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/xf86cfg.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/xf86config.${IMAKE_MAN_SUFFIX}
+${IMAKE_LIBMAN_DIR}/XF86VidMode.${IMAKE_LIBMAN_SUFFIX}
+${IMAKE_LIBMAN_DIR}/XF86VidModeDeleteModeLine.${IMAKE_LIBMAN_SUFFIX}
+${IMAKE_LIBMAN_DIR}/XF86VidModeGetAllModeLines.${IMAKE_LIBMAN_SUFFIX}
+${IMAKE_LIBMAN_DIR}/XF86VidModeGetDotClocks.${IMAKE_LIBMAN_SUFFIX}
+${IMAKE_LIBMAN_DIR}/XF86VidModeGetGamma.${IMAKE_LIBMAN_SUFFIX}
+${IMAKE_LIBMAN_DIR}/XF86VidModeGetGammaRamp.${IMAKE_LIBMAN_SUFFIX}
+${IMAKE_LIBMAN_DIR}/XF86VidModeGetGammaRampSize.${IMAKE_LIBMAN_SUFFIX}
+${IMAKE_LIBMAN_DIR}/XF86VidModeGetModeLine.${IMAKE_LIBMAN_SUFFIX}
+${IMAKE_LIBMAN_DIR}/XF86VidModeGetMonitor.${IMAKE_LIBMAN_SUFFIX}
+${IMAKE_LIBMAN_DIR}/XF86VidModeGetPermissions.${IMAKE_LIBMAN_SUFFIX}
+${IMAKE_LIBMAN_DIR}/XF86VidModeGetViewPort.${IMAKE_LIBMAN_SUFFIX}
+${IMAKE_LIBMAN_DIR}/XF86VidModeLockModeSwitch.${IMAKE_LIBMAN_SUFFIX}
+${IMAKE_LIBMAN_DIR}/XF86VidModeModModeLine.${IMAKE_LIBMAN_SUFFIX}
+${IMAKE_LIBMAN_DIR}/XF86VidModeQueryExtension.${IMAKE_LIBMAN_SUFFIX}
+${IMAKE_LIBMAN_DIR}/XF86VidModeQueryVersion.${IMAKE_LIBMAN_SUFFIX}
+${IMAKE_LIBMAN_DIR}/XF86VidModeSetClientVersion.${IMAKE_LIBMAN_SUFFIX}
+${IMAKE_LIBMAN_DIR}/XF86VidModeSetGamma.${IMAKE_LIBMAN_SUFFIX}
+${IMAKE_LIBMAN_DIR}/XF86VidModeSetGammaRamp.${IMAKE_LIBMAN_SUFFIX}
+${IMAKE_LIBMAN_DIR}/XF86VidModeSetViewPort.${IMAKE_LIBMAN_SUFFIX}
+${IMAKE_LIBMAN_DIR}/XF86VidModeSwitchMode.${IMAKE_LIBMAN_SUFFIX}
+${IMAKE_LIBMAN_DIR}/XF86VidModeSwitchToMode.${IMAKE_LIBMAN_SUFFIX}
+${IMAKE_LIBMAN_DIR}/XF86VidModeValidateModeLine.${IMAKE_LIBMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/apm.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/cirrus.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/citron.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/cyrix.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/chips.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/dmc.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/dynapro.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/elographics.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/fbdevhw.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/fpit.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/glint.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/i128.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/i740.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/i810.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/js_x.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/kbd.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/keyboard.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/mga.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/microtouch.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/mouse.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/mutouch.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/neomagic.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/nsc.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/nv.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/palmax.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/penmount.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/r128.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/radeon.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/rendition.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/s3virge.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/savage.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/siliconmotion.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/sis.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/tdfx.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/tek4957.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/trident.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/tseng.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/vesa.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/vga.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/vmware.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/void.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_KERNMAN_DIR}/wacom.${IMAKE_KERNMAN_SUFFIX}
+${IMAKE_FILEMAN_DIR}/XF86Config.${IMAKE_FILEMAN_SUFFIX}
 @dirrm lib/modules/input
 @dirrm lib/modules/fonts
 @dirrm lib/modules/extensions
diff --git a/x11/XFree86-server/PLIST.FreeBSD b/x11/XFree86-server/PLIST.FreeBSD
deleted file mode 100644
index 0f96b522b76..00000000000
--- a/x11/XFree86-server/PLIST.FreeBSD
+++ /dev/null
@@ -1,87 +0,0 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.1.1.1 2004/01/24 08:48:57 xtraeme Exp $
-bin/kbd_mode
-lib/modules/extensions/libdri.a
-lib/modules/${LOWER_OPSYS}/libdrm.a
-lib/modules/dri/gamma_dri.so
-lib/modules/dri/i810_dri.so
-lib/modules/dri/i830_dri.so
-lib/modules/dri/mga_dri.so
-lib/modules/dri/r128_dri.so
-lib/modules/dri/r200_dri.so
-lib/modules/dri/radeon_dri.so
-lib/modules/dri/tdfx_dri.so
-man/man1/XFree86.1.gz
-man/man1/Xnest.1.gz
-man/man1/Xserver.1.gz
-man/man1/Xvfb.1.gz
-man/man1/gtf.1.gz
-man/man1/kbd_mode.1.gz
-man/man1/pcitweak.1.gz
-man/man1/scanpci.1.gz
-man/man1/xf86cfg.1.gz
-man/man1/xf86config.1.gz
-man/man3/XF86VidMode.3.gz
-man/man3/XF86VidModeDeleteModeLine.3.gz
-man/man3/XF86VidModeGetAllModeLines.3.gz
-man/man3/XF86VidModeGetDotClocks.3.gz
-man/man3/XF86VidModeGetGamma.3.gz
-man/man3/XF86VidModeGetGammaRamp.3.gz
-man/man3/XF86VidModeGetGammaRampSize.3.gz
-man/man3/XF86VidModeGetModeLine.3.gz
-man/man3/XF86VidModeGetMonitor.3.gz
-man/man3/XF86VidModeGetPermissions.3.gz
-man/man3/XF86VidModeGetViewPort.3.gz
-man/man3/XF86VidModeLockModeSwitch.3.gz
-man/man3/XF86VidModeModModeLine.3.gz
-man/man3/XF86VidModeQueryExtension.3.gz
-man/man3/XF86VidModeQueryVersion.3.gz
-man/man3/XF86VidModeSetClientVersion.3.gz
-man/man3/XF86VidModeSetGamma.3.gz
-man/man3/XF86VidModeSetGammaRamp.3.gz
-man/man3/XF86VidModeSetViewPort.3.gz
-man/man3/XF86VidModeSwitchMode.3.gz
-man/man3/XF86VidModeSwitchToMode.3.gz
-man/man3/XF86VidModeValidateModeLine.3.gz
-man/man4/apm.4.gz
-man/man4/cirrus.4.gz
-man/man4/citron.4.gz
-man/man4/cyrix.4.gz
-man/man4/chips.4.gz
-man/man4/dmc.4.gz
-man/man4/dynapro.4.gz
-man/man4/elographics.4.gz
-man/man4/fbdevhw.4.gz
-man/man4/fpit.4.gz
-man/man4/glint.4.gz
-man/man4/i128.4.gz
-man/man4/i740.4.gz
-man/man4/i810.4.gz
-man/man4/js_x.4.gz
-man/man4/kbd.4.gz
-man/man4/keyboard.4.gz
-man/man4/mga.4.gz
-man/man4/microtouch.4.gz
-man/man4/mouse.4.gz
-man/man4/mutouch.4.gz
-man/man4/neomagic.4.gz
-man/man4/nsc.4.gz
-man/man4/nv.4.gz
-man/man4/palmax.4.gz
-man/man4/penmount.4.gz
-man/man4/r128.4.gz
-man/man4/radeon.4.gz
-man/man4/rendition.4.gz
-man/man4/s3virge.4.gz
-man/man4/savage.4.gz
-man/man4/siliconmotion.4.gz
-man/man4/sis.4.gz
-man/man4/tdfx.4.gz
-man/man4/tek4957.4.gz
-man/man4/trident.4.gz
-man/man4/tseng.4.gz
-man/man4/vesa.4.gz
-man/man4/vga.4.gz
-man/man4/vmware.4.gz
-man/man4/void.4.gz
-man/man4/wacom.4.gz
-man/man5/XF86Config.5.gz
diff --git a/x11/XFree86-server/PLIST.Linux b/x11/XFree86-server/PLIST.Linux
deleted file mode 100644
index 5021eff9e64..00000000000
--- a/x11/XFree86-server/PLIST.Linux
+++ /dev/null
@@ -1,83 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.1.1.1 2004/01/24 08:48:58 xtraeme Exp $
-lib/modules/dri/gamma_dri.so
-lib/modules/dri/i810_dri.so
-lib/modules/dri/i830_dri.so
-lib/modules/dri/mga_dri.so
-lib/modules/dri/r128_dri.so
-lib/modules/dri/r200_dri.so
-lib/modules/dri/radeon_dri.so
-lib/modules/dri/tdfx_dri.so
-man/man1/XFree86.1x
-man/man1/Xnest.1x
-man/man1/Xserver.1x
-man/man1/Xvfb.1x
-man/man1/gtf.1x
-man/man1/pcitweak.1x
-man/man1/scanpci.1x
-man/man1/xf86cfg.1x
-man/man1/xf86config.1x
-man/man3/XF86VidMode.3x
-man/man3/XF86VidModeDeleteModeLine.3x
-man/man3/XF86VidModeGetAllModeLines.3x
-man/man3/XF86VidModeGetDotClocks.3x
-man/man3/XF86VidModeGetGamma.3x
-man/man3/XF86VidModeGetGammaRamp.3x
-man/man3/XF86VidModeGetGammaRampSize.3x
-man/man3/XF86VidModeGetModeLine.3x
-man/man3/XF86VidModeGetMonitor.3x
-man/man3/XF86VidModeGetPermissions.3x
-man/man3/XF86VidModeGetViewPort.3x
-man/man3/XF86VidModeLockModeSwitch.3x
-man/man3/XF86VidModeModModeLine.3x
-man/man3/XF86VidModeQueryExtension.3x
-man/man3/XF86VidModeQueryVersion.3x
-man/man3/XF86VidModeSetClientVersion.3x
-man/man3/XF86VidModeSetGamma.3x
-man/man3/XF86VidModeSetGammaRamp.3x
-man/man3/XF86VidModeSetViewPort.3x
-man/man3/XF86VidModeSwitchMode.3x
-man/man3/XF86VidModeSwitchToMode.3x
-man/man3/XF86VidModeValidateModeLine.3x
-man/man4/apm.4
-man/man4/chips.4
-man/man4/cirrus.4
-man/man4/citron.4
-man/man4/cyrix.4
-man/man4/dmc.4
-man/man4/dynapro.4
-man/man4/elographics.4
-man/man4/fbdevhw.4
-man/man4/fpit.4
-man/man4/glint.4
-man/man4/i128.4
-man/man4/i740.4
-man/man4/i810.4
-man/man4/js_x.4
-man/man4/kbd.4
-man/man4/keyboard.4
-man/man4/mga.4
-man/man4/microtouch.4
-man/man4/mouse.4
-man/man4/mutouch.4
-man/man4/neomagic.4
-man/man4/nsc.4
-man/man4/nv.4
-man/man4/palmax.4
-man/man4/penmount.4
-man/man4/r128.4
-man/man4/radeon.4
-man/man4/rendition.4
-man/man4/s3virge.4
-man/man4/savage.4
-man/man4/siliconmotion.4
-man/man4/sis.4
-man/man4/tdfx.4
-man/man4/tek4957.4
-man/man4/trident.4
-man/man4/tseng.4
-man/man4/vesa.4
-man/man4/vga.4
-man/man4/vmware.4
-man/man4/void.4
-man/man4/wacom.4
-man/man5/XF86Config.5x
diff --git a/x11/XFree86-server/PLIST.NetBSD b/x11/XFree86-server/PLIST.NetBSD
deleted file mode 100644
index f9d4bef0e42..00000000000
--- a/x11/XFree86-server/PLIST.NetBSD
+++ /dev/null
@@ -1,77 +0,0 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.1.1.1 2004/01/24 08:48:58 xtraeme Exp $
-bin/kbd_mode
-man/cat1/XFree86.0
-man/cat1/Xnest.0
-man/cat1/Xserver.0
-man/cat1/Xvfb.0
-man/cat1/gtf.0
-man/cat1/kbd_mode.0
-man/cat1/pcitweak.0
-man/cat1/scanpci.0
-man/cat1/xf86cfg.0
-man/cat1/xf86config.0
-man/cat3/XF86VidMode.0
-man/cat3/XF86VidModeDeleteModeLine.0
-man/cat3/XF86VidModeGetAllModeLines.0
-man/cat3/XF86VidModeGetDotClocks.0
-man/cat3/XF86VidModeGetGamma.0
-man/cat3/XF86VidModeGetGammaRamp.0
-man/cat3/XF86VidModeGetGammaRampSize.0
-man/cat3/XF86VidModeGetModeLine.0
-man/cat3/XF86VidModeGetMonitor.0
-man/cat3/XF86VidModeGetPermissions.0
-man/cat3/XF86VidModeGetViewPort.0
-man/cat3/XF86VidModeLockModeSwitch.0
-man/cat3/XF86VidModeModModeLine.0
-man/cat3/XF86VidModeQueryExtension.0
-man/cat3/XF86VidModeQueryVersion.0
-man/cat3/XF86VidModeSetClientVersion.0
-man/cat3/XF86VidModeSetGamma.0
-man/cat3/XF86VidModeSetGammaRamp.0
-man/cat3/XF86VidModeSetViewPort.0
-man/cat3/XF86VidModeSwitchMode.0
-man/cat3/XF86VidModeSwitchToMode.0
-man/cat3/XF86VidModeValidateModeLine.0
-man/cat4/apm.0
-man/cat4/chips.0
-man/cat4/cirrus.0
-man/cat4/citron.0
-man/cat4/cyrix.0
-man/cat4/dmc.0
-man/cat4/dynapro.0
-man/cat4/elographics.0
-man/cat4/fbdevhw.0
-man/cat4/fpit.0
-man/cat4/glint.0
-man/cat4/i128.0
-man/cat4/i740.0
-man/cat4/i810.0
-man/cat4/js_x.0
-man/cat4/kbd.0
-man/cat4/keyboard.0
-man/cat4/mga.0
-man/cat4/microtouch.0
-man/cat4/mouse.0
-man/cat4/mutouch.0
-man/cat4/neomagic.0
-man/cat4/nsc.0
-man/cat4/nv.0
-man/cat4/palmax.0
-man/cat4/penmount.0
-man/cat4/r128.0
-man/cat4/radeon.0
-man/cat4/rendition.0
-man/cat4/s3virge.0
-man/cat4/savage.0
-man/cat4/siliconmotion.0
-man/cat4/sis.0
-man/cat4/tdfx.0
-man/cat4/tek4957.0
-man/cat4/trident.0
-man/cat4/tseng.0
-man/cat4/vesa.0
-man/cat4/vga.0
-man/cat4/vmware.0
-man/cat4/void.0
-man/cat4/wacom.0
-man/cat5/XF86Config.0