[src/trunk]: src/external/mit/xorg/server/xorg-server remove obsolete things.

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9c3415c4e392
branches:  trunk
changeset: 347173:9c3415c4e392
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Aug 16 07:56:47 2016 +0000

description:
remove obsolete things.

diffstat:

 external/mit/xorg/server/xorg-server/Makefile.Xserver                   |  11 +--
 external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile          |  16 +---
 external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils    |   4 +-
 external/mit/xorg/server/xorg-server/hw/xfree86/utils/ioport/Makefile   |  43 ----------
 external/mit/xorg/server/xorg-server/hw/xfree86/utils/pcitweak/Makefile |  34 -------
 external/mit/xorg/server/xorg-server/hw/xfree86/utils/scanpci/Makefile  |  37 --------
 6 files changed, 4 insertions(+), 141 deletions(-)

diffs (208 lines):

diff -r a4eb66fbd4b5 -r 9c3415c4e392 external/mit/xorg/server/xorg-server/Makefile.Xserver
--- a/external/mit/xorg/server/xorg-server/Makefile.Xserver     Tue Aug 16 07:52:05 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile.Xserver     Tue Aug 16 07:56:47 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.Xserver,v 1.17 2016/08/14 03:43:03 mrg Exp $
+#      $NetBSD: Makefile.Xserver,v 1.18 2016/08/16 07:56:47 mrg Exp $
 
 .for _SL in \
        mi \
@@ -30,15 +30,10 @@
        hw/xfree86/common \
        hw/xfree86/ddc \
        hw/xfree86/dixmods \
-       hw/xfree86/dixmods/dbe \
        hw/xfree86/dixmods/fb \
-       hw/xfree86/dixmods/freetype \
-       hw/xfree86/dixmods/record \
        hw/xfree86/dixmods/shadow \
-       hw/xfree86/dixmods/type1 \
        hw/xfree86/dixmods/wfb \
        hw/xfree86/dixmods/xorgxkb \
-       hw/xfree86/dixmods/xtrap \
        hw/xfree86/doc \
        hw/xfree86/dri \
        hw/xfree86/dri2 \
@@ -48,16 +43,12 @@
        hw/xfree86/int10 \
        hw/xfree86/loader \
        hw/xfree86/xorgos \
-       hw/xfree86/rac \
        hw/xfree86/ramdac \
-       hw/xfree86/scanpci \
        hw/xfree86/shadowfb \
        hw/xfree86/utils \
        hw/xfree86/vbe \
        hw/xfree86/vgahw \
        hw/xfree86/x86emu \
-       hw/xfree86/xf8_16bpp \
-       hw/xfree86/xf8_32bpp \
        hw/xfree86/xf86config \
        hw/xfree86/xf86modes
 
diff -r a4eb66fbd4b5 -r 9c3415c4e392 external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile    Tue Aug 16 07:52:05 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile    Tue Aug 16 07:56:47 2016 +0000
@@ -1,18 +1,6 @@
-#      $NetBSD: Makefile,v 1.15 2011/02/21 04:42:17 mrg Exp $
+#      $NetBSD: Makefile,v 1.16 2016/08/16 07:56:47 mrg Exp $
 
 SUBDIR=        cvt gtf
-#SUBDIR=       cvt gtf xorgconfig
-
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-#SUBDIR+=ioport pcitweak scanpci
-.endif
-
-.if ${MACHINE} == "cats" || ${MACHINE} == "macppc" || \
-    ${MACHINE} == "netwinder" || ${MACHINE_ARCH} == "sparc" || \
-    ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE} == "prep" || ${MACHINE} == "bebox" || \
-    ${MACHINE} == "ofppc"
-#SUBDIR+=pcitweak scanpci
-.endif
+#SUBDIR+=      xorgconfig
 
 .include <bsd.subdir.mk>
diff -r a4eb66fbd4b5 -r 9c3415c4e392 external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils      Tue Aug 16 07:52:05 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile.utils      Tue Aug 16 07:56:47 2016 +0000
@@ -1,11 +1,9 @@
-#      $NetBSD: Makefile.utils,v 1.6 2016/06/10 03:37:34 mrg Exp $
+#      $NetBSD: Makefile.utils,v 1.7 2016/08/16 07:56:47 mrg Exp $
 
 .include <bsd.own.mk>
 
 DUMMYOBJDIR!=  cd ${NETBSDSRCDIR}/external/mit/xorg/server/${XORG_SERVER_SUBDIR}/hw/xfree86/dummy && ${PRINTOBJDIR}
-SCANPCIOBJDIR!=        cd ${NETBSDSRCDIR}/external/mit/xorg/server/${XORG_SERVER_SUBDIR}/hw/xfree86/scanpci && ${PRINTOBJDIR}
 XORGOSOBJDIR!= cd ${NETBSDSRCDIR}/external/mit/xorg/server/${XORG_SERVER_SUBDIR}/hw/xfree86/xorgos && ${PRINTOBJDIR}
 
 LIBDUMMY=      ${DUMMYOBJDIR}/libdummy.a
 LIBXORGOS=     ${XORGOSOBJDIR}/libxorgos.a
-LIBSCANPCI=    ${SCANPCIOBJDIR}/libscanpci.a
diff -r a4eb66fbd4b5 -r 9c3415c4e392 external/mit/xorg/server/xorg-server/hw/xfree86/utils/ioport/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/utils/ioport/Makefile     Tue Aug 16 07:52:05 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#      $NetBSD: Makefile,v 1.6 2010/11/23 08:22:33 mrg Exp $
-
-.include <bsd.own.mk>
-
-PROG=  ioport
-# XXX NOMAN no workie?
-MKMAN= no
-
-.include "../Makefile.utils"
-
-CPPFLAGS+=     -DHAVE_XORG_CONFIG_H \
-               -I${DESTDIR}${X11INCDIR}/xorg \
-               -I${DESTDIR}${X11INCDIR}/pixman-1 \
-               -I${X11SRCDIR.xorg-server}/../include
-
-
-LDADD= -L${XORGOSOBJDIR} -lxorgos \
-       -L${DUMMYOBJDIR} -lm
-
-DPADD= ${LIBXORGOS} ${LIBM}
-
-.if ${MACHINE_ARCH} == "i386"
-LDADD+=        -li386
-DPADD+=        ${LIBI386}
-.elif ${MACHINE_ARCH} == "x86_64"
-LDADD+=        -lx86_64
-DPADD+=        ${LIBX86_64}
-.elif ${MACHINE_ARCH} == "alpha"
-LDADD+=        -lalpha
-DPADD+=        ${LIBALPHA}
-.endif
-
-LINKS=  ${X11BINDIR}/ioport ${X11BINDIR}/inb \
-       ${X11BINDIR}/ioport ${X11BINDIR}/inw \
-       ${X11BINDIR}/ioport ${X11BINDIR}/inl \
-       ${X11BINDIR}/ioport ${X11BINDIR}/outb \
-       ${X11BINDIR}/ioport ${X11BINDIR}/outw \
-       ${X11BINDIR}/ioport ${X11BINDIR}/outl 
-
-.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/utils/${PROG}
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
diff -r a4eb66fbd4b5 -r 9c3415c4e392 external/mit/xorg/server/xorg-server/hw/xfree86/utils/pcitweak/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/utils/pcitweak/Makefile   Tue Aug 16 07:52:05 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#      $NetBSD: Makefile,v 1.6 2010/11/23 08:22:34 mrg Exp $
-
-.include <bsd.own.mk>
-
-PROG=  pcitweak
-MAN=   pcitweak.1
-
-.include "../Makefile.utils"
-
-CPPFLAGS+=     -DHAVE_XORG_CONFIG_H \
-               -I${DESTDIR}${X11INCDIR}/xorg \
-               -I${DESTDIR}${X11INCDIR}/pixman-1 \
-               -I${X11SRCDIR.xorg-server}/../include
-
-LDADD= -L${XORGOSOBJDIR} -lxorgos \
-       -L${DUMMYOBJDIR} -lm
-
-DPADD= ${LIBXORGOS} ${LIBM}
-
-.if ${MACHINE_ARCH} == "i386"
-LDADD+=        -li386
-DPADD+=        ${LIBI386}
-.elif ${MACHINE_ARCH} == "x86_64"
-LDADD+=        -lx86_64
-DPADD+=        ${LIBX86_64}
-.elif ${MACHINE_ARCH} == "alpha"
-LDADD+=        -lalpha
-DPADD+=        ${LIBALPHA}
-.endif
-
-.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/utils/${PROG}
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
diff -r a4eb66fbd4b5 -r 9c3415c4e392 external/mit/xorg/server/xorg-server/hw/xfree86/utils/scanpci/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/utils/scanpci/Makefile    Tue Aug 16 07:52:05 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#      $NetBSD: Makefile,v 1.7 2010/11/23 08:22:34 mrg Exp $
-
-.include <bsd.own.mk>
-
-PROG=  scanpci
-MAN=   scanpci.1
-
-.include "../Makefile.utils"
-
-CPPFLAGS+=     -DHAVE_XORG_CONFIG_H \
-               -I${DESTDIR}${X11INCDIR}/xorg \
-               -I${DESTDIR}${X11INCDIR}/pixman-1 \
-               -I${X11SRCDIR.xorg-server}/../include \
-               -I${X11SRCDIR.xorg-server}/hw/xfree86/scanpci
-
-LDADD= -L${SCANPCIOBJDIR} -lscanpci \
-       -Wl,-rpath,${X11USRLIBDIR}/modules \
-       -L${XORGOSOBJDIR} -lxorgos \
-       -L${DUMMYOBJDIR} -lm
-
-DPADD= ${LIBSCANPCI} ${LIBXORGOS} ${LIBM}
-
-.if ${MACHINE_ARCH} == "i386"
-LDADD+=        -li386
-DPADD+=        ${LIBI386}
-.elif ${MACHINE_ARCH} == "x86_64"
-LDADD+=        -lx86_64
-DPADD+=        ${LIBX86_64}
-.elif ${MACHINE_ARCH} == "alpha"
-LDADD+=        -lalpha
-DPADD+=        ${LIBALPHA}
-.endif
-
-.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/utils/${PROG}
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>