Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src complete the switch to xorgproto over *proto split packages
details: https://anonhg.NetBSD.org/src/rev/01a457a80076
branches: trunk
changeset: 321404:01a457a80076
user: mrg <mrg%NetBSD.org@localhost>
date: Wed Mar 14 23:41:05 2018 +0000
description:
complete the switch to xorgproto over *proto split packages
- remove old package makefiles
- update makekeys for Xfuncproto.h being a real file now
- clean up deleted package X11SRCDIR.pkg settings
this should be functionally equivalent.
diffstat:
external/mit/xorg/include/Makefile | 11 +--
external/mit/xorg/include/bigreqsproto/Makefile | 17 ----
external/mit/xorg/include/compositeproto/Makefile | 15 ----
external/mit/xorg/include/damageproto/Makefile | 15 ----
external/mit/xorg/include/dri2proto/Makefile | 15 ----
external/mit/xorg/include/dri3proto/Makefile | 15 ----
external/mit/xorg/include/evieext/Makefile | 18 ----
external/mit/xorg/include/fixesproto/Makefile | 19 -----
external/mit/xorg/include/fontcacheproto/Makefile | 15 ----
external/mit/xorg/include/fontsproto/Makefile | 15 ----
external/mit/xorg/include/glproto/Makefile | 18 ----
external/mit/xorg/include/glproto/internal/Makefile | 13 ---
external/mit/xorg/include/inputproto/Makefile | 21 -----
external/mit/xorg/include/kbproto/Makefile | 15 ----
external/mit/xorg/include/presentproto/Makefile | 15 ----
external/mit/xorg/include/randrproto/Makefile | 15 ----
external/mit/xorg/include/recordproto/Makefile | 18 ----
external/mit/xorg/include/renderproto/Makefile | 15 ----
external/mit/xorg/include/resourceproto/Makefile | 15 ----
external/mit/xorg/include/scrnsaverproto/Makefile | 15 ----
external/mit/xorg/include/trapproto/Makefile | 16 ----
external/mit/xorg/include/videoproto/Makefile | 15 ----
external/mit/xorg/include/xcmiscproto/Makefile | 17 ----
external/mit/xorg/include/xextproto/Makefile | 47 -------------
external/mit/xorg/include/xf86bigfontproto/Makefile | 18 ----
external/mit/xorg/include/xf86dgaproto/Makefile | 22 ------
external/mit/xorg/include/xf86driproto/Makefile | 18 ----
external/mit/xorg/include/xf86miscproto/Makefile | 15 ----
external/mit/xorg/include/xf86vidmodeproto/Makefile | 18 ----
external/mit/xorg/include/xineramaproto/Makefile | 15 ----
external/mit/xorg/include/xproto/Makefile | 29 --------
external/mit/xorg/include/xproxymanagementprotocol/Makefile | 16 ----
external/mit/xorg/tools/makekeys/Makefile | 15 +---
share/mk/bsd.own.mk | 7 +-
34 files changed, 7 insertions(+), 576 deletions(-)
diffs (truncated from 757 to 300 lines):
diff -r 8a8f0726dfc5 -r 01a457a80076 external/mit/xorg/include/Makefile
--- a/external/mit/xorg/include/Makefile Wed Mar 14 18:58:32 2018 +0000
+++ b/external/mit/xorg/include/Makefile Wed Mar 14 23:41:05 2018 +0000
@@ -1,17 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2018/03/14 09:09:46 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2018/03/14 23:41:05 mrg Exp $
# *proto packages for xorg
-.if 0
SUBDIR= xorgproto
-.else
-SUBDIR= xproto fontsproto bigreqsproto kbproto xcmiscproto xf86bigfontproto \
- fixesproto inputproto scrnsaverproto xextproto evieext xineramaproto \
- resourceproto recordproto videoproto xf86dgaproto xf86miscproto \
- compositeproto damageproto trapproto glproto randrproto \
- xf86driproto xf86vidmodeproto renderproto dri2proto dri3proto \
- presentproto xproxymanagementprotocol
-.endif
SUBDIR+= xbitmaps xcb-proto .WAIT xtrans
.include <bsd.subdir.mk>
diff -r 8a8f0726dfc5 -r 01a457a80076 external/mit/xorg/include/bigreqsproto/Makefile
--- a/external/mit/xorg/include/bigreqsproto/Makefile Wed Mar 14 18:58:32 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2010/05/22 02:27:06 mrg Exp $
-
-.include <bsd.own.mk>
-
-.PATH: ${X11SRCDIR.bigreqsproto}
-
-INCS= bigreqstr.h \
- bigreqsproto.h
-
-INCSDIR=${X11INCDIR}/X11/extensions
-
-NOOBJ= # defined
-
-PKGCONFIG= bigreqsproto
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
diff -r 8a8f0726dfc5 -r 01a457a80076 external/mit/xorg/include/compositeproto/Makefile
--- a/external/mit/xorg/include/compositeproto/Makefile Wed Mar 14 18:58:32 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:28 cube Exp $
-
-.include <bsd.own.mk>
-
-.PATH: ${X11SRCDIR.compositeproto}
-
-INCS= composite.h compositeproto.h
-INCSDIR=${X11INCDIR}/X11/extensions
-
-NOOBJ= # defined
-
-PKGCONFIG= compositeproto
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
diff -r 8a8f0726dfc5 -r 01a457a80076 external/mit/xorg/include/damageproto/Makefile
--- a/external/mit/xorg/include/damageproto/Makefile Wed Mar 14 18:58:32 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:28 cube Exp $
-
-.include <bsd.own.mk>
-
-.PATH: ${X11SRCDIR.damageproto}
-
-INCS= damageproto.h damagewire.h
-INCSDIR=${X11INCDIR}/X11/extensions
-
-NOOBJ= # defined
-
-PKGCONFIG= damageproto
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
diff -r 8a8f0726dfc5 -r 01a457a80076 external/mit/xorg/include/dri2proto/Makefile
--- a/external/mit/xorg/include/dri2proto/Makefile Wed Mar 14 18:58:32 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2009/06/10 04:37:27 mrg Exp $
-
-.include <bsd.own.mk>
-
-.PATH: ${X11SRCDIR.dri2proto}
-
-INCS= dri2proto.h dri2tokens.h
-INCSDIR=${X11INCDIR}/X11/extensions
-
-NOOBJ= # defined
-
-PKGCONFIG= dri2proto
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
diff -r 8a8f0726dfc5 -r 01a457a80076 external/mit/xorg/include/dri3proto/Makefile
--- a/external/mit/xorg/include/dri3proto/Makefile Wed Mar 14 18:58:32 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2014/03/16 23:25:15 mrg Exp $
-
-.include <bsd.own.mk>
-
-.PATH: ${X11SRCDIR.dri3proto}
-
-INCS= dri3proto.h
-INCSDIR=${X11INCDIR}/X11/extensions
-
-NOOBJ= # defined
-
-PKGCONFIG= dri3proto
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
diff -r 8a8f0726dfc5 -r 01a457a80076 external/mit/xorg/include/evieext/Makefile
--- a/external/mit/xorg/include/evieext/Makefile Wed Mar 14 18:58:32 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2010/05/22 02:27:07 mrg Exp $
-
-.include <bsd.own.mk>
-
-.PATH: ${X11SRCDIR.evieext}
-
-INCS= Xeviestr.h \
- evieproto.h
-
-INCSDIR=${X11INCDIR}/X11/extensions
-
-NOOBJ= # defined
-
-PKGCONFIG= evieproto
-PKGDIST= evieext
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
diff -r 8a8f0726dfc5 -r 01a457a80076 external/mit/xorg/include/fixesproto/Makefile
--- a/external/mit/xorg/include/fixesproto/Makefile Wed Mar 14 18:58:32 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2010/05/22 02:27:07 mrg Exp $
-
-.include <bsd.own.mk>
-
-.PATH: ${X11SRCDIR.fixesproto}
-
-INCS= xfixesproto.h \
- xfixeswire.h
-
-INCSDIR=${X11INCDIR}/X11/extensions
-
-NOOBJ= # defined
-
-PKGCONFIG= fixesproto
-
-# XXX fixesproto.txt
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
diff -r 8a8f0726dfc5 -r 01a457a80076 external/mit/xorg/include/fontcacheproto/Makefile
--- a/external/mit/xorg/include/fontcacheproto/Makefile Wed Mar 14 18:58:32 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:28 cube Exp $
-
-.include <bsd.own.mk>
-
-.PATH: ${X11SRCDIR.fontcacheproto}
-
-INCS= fontcache.h fontcacheP.h fontcachstr.h
-INCSDIR=${X11INCDIR}/X11/extensions
-
-NOOBJ= # defined
-
-PKGCONFIG= fontcacheproto
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
diff -r 8a8f0726dfc5 -r 01a457a80076 external/mit/xorg/include/fontsproto/Makefile
--- a/external/mit/xorg/include/fontsproto/Makefile Wed Mar 14 18:58:32 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:29 cube Exp $
-
-.include <bsd.own.mk>
-
-.PATH: ${X11SRCDIR.fontsproto}
-
-INCS= FS.h FSproto.h font.h fontproto.h fontstruct.h fsmasks.h
-INCSDIR=${X11INCDIR}/X11/fonts
-
-NOOBJ= # defined
-
-PKGCONFIG= fontsproto
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
diff -r 8a8f0726dfc5 -r 01a457a80076 external/mit/xorg/include/glproto/Makefile
--- a/external/mit/xorg/include/glproto/Makefile Wed Mar 14 18:58:32 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:29 cube Exp $
-
-.include <bsd.own.mk>
-
-.PATH: ${X11SRCDIR.glproto}
-
-INCS= glxint.h glxmd.h glxproto.h glxtokens.h
-INCSDIR=${X11INCDIR}/GL
-
-SUBDIR= internal
-
-NOOBJ= # defined
-
-PKGCONFIG= glproto
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
-.include <bsd.subdir.mk>
diff -r 8a8f0726dfc5 -r 01a457a80076 external/mit/xorg/include/glproto/internal/Makefile
--- a/external/mit/xorg/include/glproto/internal/Makefile Wed Mar 14 18:58:32 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
-
-.include <bsd.own.mk>
-
-.PATH: ${X11SRCDIR.glproto}
-
-INCS= glcore.h
-INCSDIR=${X11INCDIR}/GL/internal
-
-NOOBJ= # defined
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
diff -r 8a8f0726dfc5 -r 01a457a80076 external/mit/xorg/include/inputproto/Makefile
--- a/external/mit/xorg/include/inputproto/Makefile Wed Mar 14 18:58:32 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2010/05/22 02:27:07 mrg Exp $
-
-.include <bsd.own.mk>
-
-.PATH: ${X11SRCDIR.inputproto}
-
-INCS= XI.h \
- XIproto.h \
- XI2.h \
- XI2proto.h
-
-INCSDIR=${X11INCDIR}/X11/extensions
-
-NOOBJ= # defined
-
-PKGCONFIG= inputproto
-
-# XXX XI2proto.txt XIproto.txt
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
diff -r 8a8f0726dfc5 -r 01a457a80076 external/mit/xorg/include/kbproto/Makefile
--- a/external/mit/xorg/include/kbproto/Makefile Wed Mar 14 18:58:32 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:29 cube Exp $
-
-.include <bsd.own.mk>
-
-.PATH: ${X11SRCDIR.kbproto}
-
-INCS= XKB.h XKBgeom.h XKBproto.h XKBsrv.h XKBstr.h
-INCSDIR=${X11INCDIR}/X11/extensions
-
-NOOBJ= # defined
-
-PKGCONFIG= kbproto
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
diff -r 8a8f0726dfc5 -r 01a457a80076 external/mit/xorg/include/presentproto/Makefile
--- a/external/mit/xorg/include/presentproto/Makefile Wed Mar 14 18:58:32 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2014/03/16 23:25:15 mrg Exp $
-
-.include <bsd.own.mk>
-
-.PATH: ${X11SRCDIR.present}
-
-INCS= presentproto.h presenttokens.h
-INCSDIR=${X11INCDIR}/X11/extensions
-
-NOOBJ= # defined
-
Home |
Main Index |
Thread Index |
Old Index