Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

complete the switch to xorgproto over *proto split packages

Browse Source 
- 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.
This commit is contained in:
mrg 2018-03-14 23:41:05 +00:00
parent 832f757f9d
commit 5ae6500fa6
34 changed files with 7 additions and 576 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
external/mit/xorg/include/Makefile vendored
View File

@ -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>

17
external/mit/xorg/include/bigreqsproto/Makefile vendored
View File

@ -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>

15
external/mit/xorg/include/compositeproto/Makefile vendored
View File

@ -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>

15
external/mit/xorg/include/damageproto/Makefile vendored
View File

@ -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>

15
external/mit/xorg/include/dri2proto/Makefile vendored
View File

@ -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>

15
external/mit/xorg/include/dri3proto/Makefile vendored
View File

@ -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>

18
external/mit/xorg/include/evieext/Makefile vendored
View File

@ -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>

19
external/mit/xorg/include/fixesproto/Makefile vendored
View File

@ -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>

15
external/mit/xorg/include/fontcacheproto/Makefile vendored
View File

@ -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>

15
external/mit/xorg/include/fontsproto/Makefile vendored
View File

@ -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>

18
external/mit/xorg/include/glproto/Makefile vendored
View File

@ -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>

13
external/mit/xorg/include/glproto/internal/Makefile vendored
View File

@ -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>

21
external/mit/xorg/include/inputproto/Makefile vendored
View File

@ -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>

15
external/mit/xorg/include/kbproto/Makefile vendored
View File

@ -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>

15
external/mit/xorg/include/presentproto/Makefile vendored
View File

@ -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
PKGCONFIG= presentproto
.include <bsd.x11.mk>
.include <bsd.prog.mk>

15
external/mit/xorg/include/randrproto/Makefile vendored
View File

@ -1,15 +0,0 @@
# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:29 cube Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.randrproto}
INCS= randr.h randrproto.h
INCSDIR=${X11INCDIR}/X11/extensions
NOOBJ= # defined
PKGCONFIG= randrproto
.include <bsd.x11.mk>
.include <bsd.prog.mk>

18
external/mit/xorg/include/recordproto/Makefile vendored
View File

@ -1,18 +0,0 @@
# $NetBSD: Makefile,v 1.3 2010/05/22 02:27:07 mrg Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.recordproto}
INCS= recordconst.h \
recordproto.h \
recordstr.h
INCSDIR=${X11INCDIR}/X11/extensions
NOOBJ= # defined
PKGCONFIG= recordproto
.include <bsd.x11.mk>
.include <bsd.prog.mk>

15
external/mit/xorg/include/renderproto/Makefile vendored
View File

@ -1,15 +0,0 @@
# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:29 cube Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.renderproto}
INCS= render.h renderproto.h
INCSDIR=${X11INCDIR}/X11/extensions
NOOBJ= # defined
PKGCONFIG= renderproto
.include <bsd.x11.mk>
.include <bsd.prog.mk>

15
external/mit/xorg/include/resourceproto/Makefile vendored
View File

@ -1,15 +0,0 @@
# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:29 cube Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.resourceproto}
INCS= XResproto.h
INCSDIR=${X11INCDIR}/X11/extensions
NOOBJ= # defined
PKGCONFIG= resourceproto
.include <bsd.x11.mk>
.include <bsd.prog.mk>

15
external/mit/xorg/include/scrnsaverproto/Makefile vendored
View File

@ -1,15 +0,0 @@
# $NetBSD: Makefile,v 1.3 2010/05/22 09:22:15 mrg Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.scrnsaverproto}
INCS= saver.h saverproto.h
INCSDIR=${X11INCDIR}/X11/extensions
NOOBJ= # defined
PKGCONFIG= scrnsaverproto
.include <bsd.x11.mk>
.include <bsd.prog.mk>

16
external/mit/xorg/include/trapproto/Makefile vendored
View File

@ -1,16 +0,0 @@
# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:29 cube Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.trapproto}
INCS= xtrapbits.h xtrapddmi.h xtrapdi.h xtrapemacros.h xtraplib.h \
xtraplibp.h xtrapproto.h
INCSDIR=${X11INCDIR}/X11/extensions
NOOBJ= # defined
PKGCONFIG= trapproto
.include <bsd.x11.mk>
.include <bsd.prog.mk>

15
external/mit/xorg/include/videoproto/Makefile vendored
View File

@ -1,15 +0,0 @@
# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:29 cube Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.videoproto}
INCS= Xv.h XvMC.h XvMCproto.h Xvproto.h vldXvMC.h
INCSDIR=${X11INCDIR}/X11/extensions
NOOBJ= # defined
PKGCONFIG= videoproto
.include <bsd.x11.mk>
.include <bsd.prog.mk>

17
external/mit/xorg/include/xcmiscproto/Makefile vendored
View File

@ -1,17 +0,0 @@
# $NetBSD: Makefile,v 1.3 2010/05/22 02:27:07 mrg Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.xcmiscproto}
INCS= xcmiscstr.h \
xcmiscproto.h
INCSDIR=${X11INCDIR}/X11/extensions
NOOBJ= # defined
PKGCONFIG= xcmiscproto
.include <bsd.x11.mk>
.include <bsd.prog.mk>

47
external/mit/xorg/include/xextproto/Makefile vendored
View File

@ -1,47 +0,0 @@
# $NetBSD: Makefile,v 1.5 2010/08/14 08:51:32 mrg Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.xextproto}
INCS= EVI.h \
EVIproto.h \
ag.h \
agproto.h \
cup.h \
cupproto.h \
dbe.h \
dbeproto.h \
dpmsconst.h \
dpmsproto.h \
ge.h \
geproto.h \
lbx.h \
lbxproto.h \
mitmiscconst.h \
mitmiscproto.h \
multibufconst.h \
multibufproto.h \
secur.h \
securproto.h \
shapeconst.h \
shapeproto.h \
shm.h \
shmproto.h \
syncconst.h \
syncproto.h \
xtestconst.h \
xtestext1const.h \
xtestext1proto.h \
xtestproto.h
# XXX XXX XXX xorg-server 1.7 won't need this
INCS+= shapestr.h shmstr.h syncstr.h
#
INCSDIR=${X11INCDIR}/X11/extensions
NOOBJ= # defined
PKGCONFIG= xextproto
.include <bsd.x11.mk>
.include <bsd.prog.mk>

18
external/mit/xorg/include/xf86bigfontproto/Makefile vendored
View File

@ -1,18 +0,0 @@
# $NetBSD: Makefile,v 1.3 2010/05/22 02:27:07 mrg Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.xf86bigfontproto}
INCS= xf86bigfont.h \
xf86bigfstr.h \
xf86bigfproto.h
INCSDIR=${X11INCDIR}/X11/extensions
NOOBJ= # defined
PKGCONFIG= xf86bigfontproto
.include <bsd.x11.mk>
.include <bsd.prog.mk>

22
external/mit/xorg/include/xf86dgaproto/Makefile vendored
View File

@ -1,22 +0,0 @@
# $NetBSD: Makefile,v 1.3 2010/05/22 02:27:07 mrg Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.xf86dgaproto}
INCS= xf86dga.h \
xf86dga1str.h \
xf86dgastr.h \
xf86dga1const.h \
xf86dga1proto.h \
xf86dgaconst.h \
xf86dgaproto.h
INCSDIR=${X11INCDIR}/X11/extensions
NOOBJ= # defined
PKGCONFIG= xf86dgaproto
.include <bsd.x11.mk>
.include <bsd.prog.mk>

18
external/mit/xorg/include/xf86driproto/Makefile vendored
View File

@ -1,18 +0,0 @@
# $NetBSD: Makefile,v 1.3 2010/05/22 02:27:07 mrg Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.xf86driproto}
INCS= xf86dri.h \
xf86dristr.h \
xf86driproto.h
INCSDIR=${X11INCDIR}/X11/dri
NOOBJ= # defined
PKGCONFIG= xf86driproto
.include <bsd.x11.mk>
.include <bsd.prog.mk>

15
external/mit/xorg/include/xf86miscproto/Makefile vendored
View File

@ -1,15 +0,0 @@
# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:29 cube Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.xf86miscproto}
INCS= xf86misc.h xf86mscstr.h
INCSDIR=${X11INCDIR}/X11/extensions
NOOBJ= # defined
PKGCONFIG= xf86miscproto
.include <bsd.x11.mk>
.include <bsd.prog.mk>

18
external/mit/xorg/include/xf86vidmodeproto/Makefile vendored
View File

@ -1,18 +0,0 @@
# $NetBSD: Makefile,v 1.3 2010/05/22 02:27:07 mrg Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.xf86vidmodeproto}
INCS= xf86vm.h \
xf86vmstr.h \
xf86vmproto.h
INCSDIR=${X11INCDIR}/X11/extensions
NOOBJ= # defined
PKGCONFIG= xf86vidmodeproto
.include <bsd.x11.mk>
.include <bsd.prog.mk>

15
external/mit/xorg/include/xineramaproto/Makefile vendored
View File

@ -1,15 +0,0 @@
# $NetBSD: Makefile,v 1.3 2009/11/09 03:27:05 mrg Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.xineramaproto}
INCS= panoramiXproto.h
INCSDIR=${X11INCDIR}/X11/extensions
NOOBJ= # defined
PKGCONFIG= xineramaproto
.include <bsd.x11.mk>
.include <bsd.prog.mk>

29
external/mit/xorg/include/xproto/Makefile vendored
View File

@ -1,29 +0,0 @@
# $NetBSD: Makefile,v 1.3 2014/08/24 16:39:21 christos Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.xproto}
Xfuncproto.h: Xfuncproto.h.in
${TOOL_SED} -e 's/#undef NARROWPROTO/#define NARROWPROTO/' \
-e 's/#undef FUNCPROTO/#define FUNCPROTO 15/' \
< ${.ALLSRC} > ${.TARGET}
Xpoll.h: Xpoll.h.in
${TOOL_SED} 's/@USE_FDS_BITS@/fds_bits/' \
< ${.ALLSRC} > ${.TARGET}
INCS= DECkeysym.h HPkeysym.h Sunkeysym.h X.h XF86keysym.h XWDFile.h \
Xalloca.h Xarch.h Xatom.h Xdefs.h Xfuncproto.h Xfuncs.h Xmd.h \
Xos.h Xos_r.h Xosdefs.h Xpoll.h Xproto.h Xprotostr.h Xthreads.h \
Xw32defs.h Xwindows.h Xwinsock.h ap_keysym.h keysym.h keysymdef.h
INCSDIR=${X11INCDIR}/X11
CLEANFILES+= Xpoll.h Xfuncproto.h
NOOBJ= # defined
PKGCONFIG= xproto
.include <bsd.x11.mk>
.include <bsd.prog.mk>

16
external/mit/xorg/include/xproxymanagementprotocol/Makefile vendored
View File

@ -1,16 +0,0 @@
# $NetBSD: Makefile,v 1.2 2008/09/13 04:32:29 cube Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.xproxymanagementprotocol}
INCS= PM.h PMproto.h
INCSDIR=${X11INCDIR}/X11/PM
NOOBJ= # defined
PKGCONFIG= xproxymngproto
PKGDIST= xproxymanagementprotocol
.include <bsd.x11.mk>
.include <bsd.prog.mk>

15
external/mit/xorg/tools/makekeys/Makefile vendored
View File

@ -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

7
share/mk/bsd.own.mk
View File

@ -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${_lib}/dist
.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