[pkgsrc/trunk]: pkgsrc/x11/XFree86-server Simplify XFree86-server doing the f...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/x11/XFree86-server Simplify XFree86-server doing the f...
From: xtraeme <xtraeme%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:27:30 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/a04ec477fad5
branches:  trunk
changeset: 467410:a04ec477fad5
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sat Jan 31 16:55:55 2004 +0000

description:
Simplify XFree86-server doing the following changes:

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

diffstat:

 x11/XFree86-server/Makefile      |   19 ++-
 x11/XFree86-server/PLIST         |  290 +++++++++++++++++++++++++++++++++++++++
 x11/XFree86-server/PLIST.FreeBSD |   87 -----------
 x11/XFree86-server/PLIST.Linux   |   83 -----------
 x11/XFree86-server/PLIST.NetBSD  |   77 ----------
 x11/XFree86-server/PLIST.common  |  205 ---------------------------
 6 files changed, 307 insertions(+), 454 deletions(-)

diffs (truncated from 807 to 300 lines):

diff -r 2584eaba53b8 -r a04ec477fad5 x11/XFree86-server/Makefile
--- a/x11/XFree86-server/Makefile       Sat Jan 31 16:52:16 2004 +0000
+++ b/x11/XFree86-server/Makefile       Sat Jan 31 16:55:55 2004 +0000
@@ -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 @@
 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 @@
 .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 -r 2584eaba53b8 -r a04ec477fad5 x11/XFree86-server/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/XFree86-server/PLIST  Sat Jan 31 16:55:55 2004 +0000
@@ -0,0 +1,290 @@
+@comment $NetBSD: PLIST,v 1.1 2004/01/31 16:55:55 xtraeme Exp $
+bin/X
+bin/XFree86
+bin/Xnest
+bin/Xprt
+bin/Xvfb
+bin/gtf
+bin/inb
+bin/inl
+bin/inw
+bin/ioport
+${KBDMODE}bin/kbd_mode
+bin/mmapr
+bin/mmapw
+bin/outb
+bin/outl
+bin/outw
+bin/pcitweak
+bin/scanpci
+bin/xf86cfg
+bin/xf86config
+include/X11/bitmaps/card.xbm
+include/X11/bitmaps/down.xbm
+include/X11/bitmaps/keyboard.xbm
+include/X11/bitmaps/left.xbm
+include/X11/bitmaps/monitor.xbm
+include/X11/bitmaps/mouse.xbm
+include/X11/bitmaps/narrower.xbm
+include/X11/bitmaps/right.xbm
+include/X11/bitmaps/shorter.xbm
+include/X11/bitmaps/taller.xbm
+include/X11/bitmaps/up.xbm
+include/X11/bitmaps/wider.xbm
+include/X11/pixmaps/card.xpm
+include/X11/pixmaps/computer.xpm
+include/X11/pixmaps/keyboard.xpm
+include/X11/pixmaps/monitor.xpm
+include/X11/pixmaps/mouse.xpm
+lib/X11/Cards
+lib/X11/Options
+lib/X11/XF86Config.98
+lib/X11/XF86Config.eg
+lib/X11/app-defaults/XF86Cfg
+lib/X11/doc/BUILD
+lib/X11/doc/BugReport
+lib/X11/doc/DESIGN
+lib/X11/doc/Install
+lib/X11/doc/LICENSE
+lib/X11/doc/README
+lib/X11/doc/README.DECtga
+lib/X11/doc/README.DGA
+lib/X11/doc/README.DRI
+lib/X11/doc/README.DRIcomp
+lib/X11/doc/README.I128
+lib/X11/doc/README.SiS
+lib/X11/doc/README.XKB-Config
+lib/X11/doc/README.XKB-Enhancing
+lib/X11/doc/README.apm
+lib/X11/doc/README.ati
+lib/X11/doc/README.chips
+lib/X11/doc/README.cyrix
+lib/X11/doc/README.dps
+lib/X11/doc/README.fonts
+lib/X11/doc/README.i740
+lib/X11/doc/README.i810
+lib/X11/doc/README.mouse
+lib/X11/doc/README.newport
+lib/X11/doc/README.r128
+lib/X11/doc/README.rapidaccess
+lib/X11/doc/README.rendition
+lib/X11/doc/README.s3virge
+lib/X11/doc/RELNOTES
+lib/X11/doc/ServersOnly
+lib/X11/doc/Status
+lib/X11/doc/Versions
+lib/X11/doc/VideoBoard98
+lib/X11/etc/Xinstall.sh
+lib/X11/etc/xmodmap.std
+lib/X11/xserver/SecurityPolicy
+lib/modules/codeconv/libARABIC.a
+lib/modules/codeconv/libARMSCII8.a
+lib/modules/codeconv/libBIG5.a
+lib/modules/codeconv/libBIG5HKSCS.a
+lib/modules/codeconv/libDOSENCODING.a
+lib/modules/codeconv/libGB2312.a
+lib/modules/codeconv/libGBK.a
+lib/modules/codeconv/libGEORGIAN.a
+lib/modules/codeconv/libISO8859_1.a
+lib/modules/codeconv/libISO8859_10.a
+lib/modules/codeconv/libISO8859_11.a
+lib/modules/codeconv/libISO8859_14.a
+lib/modules/codeconv/libISO8859_15.a
+lib/modules/codeconv/libISO8859_2.a
+lib/modules/codeconv/libISO8859_3.a
+lib/modules/codeconv/libISO8859_4.a
+lib/modules/codeconv/libISO8859_5.a
+lib/modules/codeconv/libISO8859_6.a
+lib/modules/codeconv/libISO8859_7.a
+lib/modules/codeconv/libISO8859_8.a
+lib/modules/codeconv/libISO8859_9.a
+lib/modules/codeconv/libJISX0201.a
+lib/modules/codeconv/libJISX0208.a
+lib/modules/codeconv/libJISX0212.a
+lib/modules/codeconv/libKOI8.a
+lib/modules/codeconv/libKSC5601.a
+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
+lib/modules/drivers/atimisc_drv.o
+lib/modules/drivers/chips_drv.o
+lib/modules/drivers/cirrus_alpine.o
+lib/modules/drivers/cirrus_drv.o
+lib/modules/drivers/cirrus_laguna.o
+lib/modules/drivers/cyrix_drv.o
+lib/modules/drivers/glint_drv.o
+lib/modules/drivers/i128_drv.o
+lib/modules/drivers/i740_drv.o
+lib/modules/drivers/i810_drv.o
+lib/modules/drivers/mga_drv.o
+lib/modules/drivers/neomagic_drv.o
+lib/modules/drivers/nsc_drv.o
+lib/modules/drivers/nv_drv.o
+lib/modules/drivers/r128_drv.o
+lib/modules/drivers/radeon_drv.o
+lib/modules/drivers/rendition_drv.o
+lib/modules/drivers/s3_drv.o
+lib/modules/drivers/s3virge_drv.o
+lib/modules/drivers/savage_drv.o
+lib/modules/drivers/siliconmotion_drv.o
+lib/modules/drivers/sis_drv.o
+lib/modules/drivers/tdfx_drv.o
+lib/modules/drivers/tga_drv.o
+lib/modules/drivers/trident_drv.o
+lib/modules/drivers/tseng_drv.o
+lib/modules/drivers/vesa_drv.o
+lib/modules/drivers/vga_drv.o
+lib/modules/drivers/vmware_drv.o
+lib/modules/extensions/libGLcore.a
+lib/modules/extensions/libdbe.a
+lib/modules/extensions/libextmod.a
+lib/modules/extensions/libglx.a
+lib/modules/extensions/librecord.a
+lib/modules/extensions/libxtrap.a
+lib/modules/fonts/libbitmap.a
+lib/modules/fonts/libfreetype.a
+lib/modules/fonts/libspeedo.a
+lib/modules/fonts/libtype1.a
+lib/modules/fonts/libxtt.a
+lib/modules/input/calcomp_drv.o
+lib/modules/input/citron_drv.o
+lib/modules/input/digitaledge_drv.o
+lib/modules/input/dmc_drv.o
+lib/modules/input/dynapro_drv.o
+lib/modules/input/elographics_drv.o
+lib/modules/input/fpit_drv.o
+lib/modules/input/hyperpen_drv.o
+lib/modules/input/js_x_drv.o
+lib/modules/input/kbd_drv.o
+lib/modules/input/magellan_drv.o
+lib/modules/input/microtouch_drv.o
+lib/modules/input/mouse_drv.o
+lib/modules/input/mutouch_drv.o
+lib/modules/input/palmax_drv.o
+lib/modules/input/penmount_drv.o
+lib/modules/input/spaceorb_drv.o
+lib/modules/input/summa_drv.o
+lib/modules/input/tek4957_drv.o
+lib/modules/input/void_drv.o
+lib/modules/input/wacom_drv.o
+lib/modules/libafb.a
+lib/modules/libcfb.a
+lib/modules/libcfb16.a
+lib/modules/libcfb24.a
+lib/modules/libcfb32.a
+lib/modules/libddc.a
+lib/modules/libfb.a
+lib/modules/libi2c.a
+lib/modules/libint10.a
+lib/modules/liblayer.a
+lib/modules/libmfb.a
+lib/modules/libpcidata.a
+lib/modules/librac.a
+lib/modules/libramdac.a
+lib/modules/libscanpci.a
+lib/modules/libshadow.a
+lib/modules/libshadowfb.a
+lib/modules/libvbe.a
+lib/modules/libvgahw.a
+lib/modules/libxaa.a
+lib/modules/libxf1bpp.a
+lib/modules/libxf24_32bpp.a
+lib/modules/libxf4bpp.a
+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}
Prev by Date: [pkgsrc/trunk]: pkgsrc/mk Add some new variables for manual pages when using ...
Next by Date: [pkgsrc/trunk]: pkgsrc/x11/XFree86-server s/${IMAKE_MAN_SUFFIX}/${IMAKE_MANNE...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/mk Add some new variables for manual pages when using ...
Next by Thread: [pkgsrc/trunk]: pkgsrc/x11/XFree86-server s/${IMAKE_MAN_SUFFIX}/${IMAKE_MANNE...
Indexes:
Home | Main Index | Thread Index | Old Index