Module Name: src
Committed By: mrg
Date: Wed Mar 14 23:41:08 UTC 2018
Modified Files:
src/external/mit/xorg/include: Makefile
src/external/mit/xorg/tools/makekeys: Makefile
src/share/mk: bsd.own.mk
Removed Files:
src/external/mit/xorg/include/bigreqsproto: Makefile
src/external/mit/xorg/include/compositeproto: Makefile
src/external/mit/xorg/include/damageproto: Makefile
src/external/mit/xorg/include/dri2proto: Makefile
src/external/mit/xorg/include/dri3proto: Makefile
src/external/mit/xorg/include/evieext: Makefile
src/external/mit/xorg/include/fixesproto: Makefile
src/external/mit/xorg/include/fontcacheproto: Makefile
src/external/mit/xorg/include/fontsproto: Makefile
src/external/mit/xorg/include/glproto: Makefile
src/external/mit/xorg/include/glproto/internal: Makefile
src/external/mit/xorg/include/inputproto: Makefile
src/external/mit/xorg/include/kbproto: Makefile
src/external/mit/xorg/include/presentproto: Makefile
src/external/mit/xorg/include/randrproto: Makefile
src/external/mit/xorg/include/recordproto: Makefile
src/external/mit/xorg/include/renderproto: Makefile
src/external/mit/xorg/include/resourceproto: Makefile
src/external/mit/xorg/include/scrnsaverproto: Makefile
src/external/mit/xorg/include/trapproto: Makefile
src/external/mit/xorg/include/videoproto: Makefile
src/external/mit/xorg/include/xcmiscproto: Makefile
src/external/mit/xorg/include/xextproto: Makefile
src/external/mit/xorg/include/xf86bigfontproto: Makefile
src/external/mit/xorg/include/xf86dgaproto: Makefile
src/external/mit/xorg/include/xf86driproto: Makefile
src/external/mit/xorg/include/xf86miscproto: Makefile
src/external/mit/xorg/include/xf86vidmodeproto: Makefile
src/external/mit/xorg/include/xineramaproto: Makefile
src/external/mit/xorg/include/xproto: Makefile
src/external/mit/xorg/include/xproxymanagementprotocol: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/include/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/include/bigreqsproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/compositeproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/damageproto/Makefile
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/include/dri2proto/Makefile
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/include/dri3proto/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/include/evieext/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/include/fixesproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/fontcacheproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/fontsproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/glproto/Makefile
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/xorg/include/glproto/internal/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/include/inputproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/kbproto/Makefile
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/include/presentproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/randrproto/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/include/recordproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/renderproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/resourceproto/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/include/scrnsaverproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/trapproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/videoproto/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/include/xcmiscproto/Makefile
cvs rdiff -u -r1.5 -r0 src/external/mit/xorg/include/xextproto/Makefile
cvs rdiff -u -r1.3 -r0 \
src/external/mit/xorg/include/xf86bigfontproto/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/include/xf86dgaproto/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/include/xf86driproto/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/include/xf86miscproto/Makefile
cvs rdiff -u -r1.3 -r0 \
src/external/mit/xorg/include/xf86vidmodeproto/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/include/xineramaproto/Makefile
cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/include/xproto/Makefile
cvs rdiff -u -r1.2 -r0 \
src/external/mit/xorg/include/xproxymanagementprotocol/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/tools/makekeys/Makefile
cvs rdiff -u -r1.1049 -r1.1050 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/include/Makefile
diff -u src/external/mit/xorg/include/Makefile:1.6 src/external/mit/xorg/include/Makefile:1.7
--- src/external/mit/xorg/include/Makefile:1.6 Wed Mar 14 09:09:46 2018
+++ src/external/mit/xorg/include/Makefile Wed Mar 14 23:41:05 2018
@@ -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>
Index: src/external/mit/xorg/tools/makekeys/Makefile
diff -u src/external/mit/xorg/tools/makekeys/Makefile:1.4 src/external/mit/xorg/tools/makekeys/Makefile:1.5
--- src/external/mit/xorg/tools/makekeys/Makefile:1.4 Fri Jun 26 02:43:26 2015
+++ src/external/mit/xorg/tools/makekeys/Makefile Wed Mar 14 23:41:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/06/26 02:43:26 matt Exp $
+# $NetBSD: Makefile,v 1.5 2018/03/14 23:41:05 mrg Exp $
NOMAN= 1
@@ -11,27 +11,20 @@ SRCS= makekeys.c
.if !make(obj) && !exists(${DESTDIR}${X11INCDIR}/X.h)
CLEANFILES+= X11
CPPFLAGS+= -I.
-XPINCS= X.h Xarch.h Xos.h Xosdefs.h keysymdef.h
+XPINCS= X.h Xarch.h Xos.h Xosdefs.h keysymdef.h Xfuncproto.h
X11INCS= Xlib.h Xresource.h
-CLEANFILES+= ${XPINCS} ${X11INCS} Xfuncproto.h
+CLEANFILES+= ${XPINCS} ${X11INCS}
.if !make(clean) && !make(cleandir)
.BEGIN:
@rm -f ${.OBJDIR}/X11 && ln -s . X11
.for i in ${XPINCS}
- @rm -f $i && ln -s ${X11SRCDIR.xproto}/$i .
+ @rm -f $i && ln -s ${X11SRCDIR.xorgproto}/include/X11/$i .
.endfor
.for i in ${X11INCS}
@rm -f $i && ln -s ${X11SRCDIR.X11}/include/X11/$i .
.endfor
.endif
-Xfuncproto.h: ${X11SRCDIR.xproto}/Xfuncproto.h.in
- ${TOOL_SED} -e 's/#undef NARROWPROTO/#define NARROWPROTO/' \
- -e 's/#undef FUNCPROTO/#define FUNCPROTO 15/' \
- < ${.ALLSRC} > ${.TARGET}
-
-makekeys.lo makekeys.o makekeys.d: Xfuncproto.h
-
.else
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}
.endif
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1049 src/share/mk/bsd.own.mk:1.1050
--- src/share/mk/bsd.own.mk:1.1049 Wed Mar 14 07:35:56 2018
+++ src/share/mk/bsd.own.mk Wed Mar 14 23:41:05 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1049 2018/03/14 07:35:56 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1050 2018/03/14 23:41:05 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1391,10 +1391,7 @@ X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib
.endfor
.for _proto in \
- xcmisc xext xf86bigfont bigreqs input kb x fonts fixes scrnsaver \
- xinerama dri2 dri3 render resource record video xf86dga xf86misc \
- xf86vidmode composite damage trap gl randr fontcache xf86dri \
- present xcb- xorg
+ xcb- xorg
X11SRCDIR.${_proto}proto?= ${X11SRCDIRMIT}/${_proto}proto/dist
.endfor
