pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: wiz
Date: Wed Mar 7 11:57:48 UTC 2018
Modified Files:
pkgsrc/audio/pulseaudio: Makefile options.mk
pkgsrc/audio/terminatorx: Makefile
pkgsrc/audio/xmms: Makefile
pkgsrc/devel/SDL: Makefile
pkgsrc/devel/SDL2: buildlink3.mk
pkgsrc/devel/imake: Makefile
pkgsrc/devel/makedepend: Makefile
pkgsrc/devel/py-meson: build.mk
pkgsrc/doc: CHANGES-2018
pkgsrc/emulators/kegs: Makefile
pkgsrc/emulators/tuxnes: Makefile
pkgsrc/emulators/xbeeb: options.mk
pkgsrc/emulators/xhomer: Makefile
pkgsrc/fonts/bdftopcf: Makefile
pkgsrc/fonts/libfontenc: Makefile
pkgsrc/fonts/mkfontscale: Makefile
pkgsrc/games/freeciv-client: options.mk
pkgsrc/games/powermanga: Makefile
pkgsrc/games/quake: Makefile
pkgsrc/games/quakeforge: Makefile
pkgsrc/games/tyrquake: Makefile
pkgsrc/graphics/MesaLib: dri.mk
pkgsrc/graphics/MesaLib7: Makefile glx-config.mk
pkgsrc/graphics/evas-software-x11: Makefile
pkgsrc/graphics/imlib: buildlink3.mk
pkgsrc/graphics/libggi: Makefile
pkgsrc/inputmethod/librime: Makefile
pkgsrc/meta-pkgs/modular-xorg-protos: Makefile
pkgsrc/mk/defaults: mk.conf
pkgsrc/multimedia/fxtv: Makefile
pkgsrc/multimedia/gnash: options.mk
pkgsrc/multimedia/libvdpau: Makefile
pkgsrc/multimedia/xawtv: Makefile
pkgsrc/multimedia/xine-ui: Makefile
pkgsrc/net/tigervnc: Makefile
pkgsrc/net/vncviewer: Makefile
pkgsrc/net/x2vnc: Makefile options.mk
pkgsrc/net/xfindproxy: Makefile
pkgsrc/pkgtools/x11-links: xfree.mk xorg.mk
pkgsrc/print/xpdfopen: Makefile
pkgsrc/wm: Makefile
pkgsrc/wm/awesome: Makefile
pkgsrc/wm/bbrun: Makefile
pkgsrc/wm/jwm: Makefile
pkgsrc/wm/libAppleWM: Makefile buildlink3.mk
pkgsrc/wm/libWindowsWM: Makefile
pkgsrc/wm/musca: Makefile
pkgsrc/wm/quartz-wm: Makefile
pkgsrc/wm/spectrwm: Makefile
pkgsrc/x11: Makefile
pkgsrc/x11/Xrender: Makefile buildlink3.mk
pkgsrc/x11/dxpc: Makefile
pkgsrc/x11/fixesproto4: Makefile buildlink3.mk
pkgsrc/x11/gtk3: options.mk
pkgsrc/x11/iceauth: Makefile
pkgsrc/x11/lbxproxy: Makefile
pkgsrc/x11/libFS: Makefile buildlink3.mk
pkgsrc/x11/libICE: Makefile
pkgsrc/x11/libSM: Makefile
pkgsrc/x11/libX11: Makefile buildlink3.mk
pkgsrc/x11/libXScrnSaver: Makefile buildlink3.mk
pkgsrc/x11/libXTrap: Makefile
pkgsrc/x11/libXau: Makefile buildlink3.mk builtin.mk
pkgsrc/x11/libXaw: Makefile buildlink3.mk
pkgsrc/x11/libXcomposite: Makefile buildlink3.mk
pkgsrc/x11/libXcursor: Makefile buildlink3.mk
pkgsrc/x11/libXdamage: Makefile buildlink3.mk
pkgsrc/x11/libXdmcp: Makefile builtin.mk
pkgsrc/x11/libXevie: Makefile buildlink3.mk
pkgsrc/x11/libXext: Makefile buildlink3.mk
pkgsrc/x11/libXfixes: Makefile buildlink3.mk
pkgsrc/x11/libXfont: Makefile buildlink3.mk
pkgsrc/x11/libXfont2: Makefile buildlink3.mk
pkgsrc/x11/libXft: Makefile buildlink3.mk
pkgsrc/x11/libXi: Makefile buildlink3.mk
pkgsrc/x11/libXinerama: Makefile buildlink3.mk
pkgsrc/x11/libXmu: buildlink3.mk
pkgsrc/x11/libXpm: Makefile buildlink3.mk
pkgsrc/x11/libXpresent: Makefile buildlink3.mk builtin.mk
pkgsrc/x11/libXrandr: Makefile buildlink3.mk builtin.mk
pkgsrc/x11/libXrender: Makefile buildlink3.mk
pkgsrc/x11/libXres: Makefile buildlink3.mk
pkgsrc/x11/libXt: Makefile buildlink3.mk
pkgsrc/x11/libXtst: Makefile buildlink3.mk
pkgsrc/x11/libXv: Makefile buildlink3.mk
pkgsrc/x11/libXvMC: Makefile buildlink3.mk
pkgsrc/x11/libXxf86dga: Makefile buildlink3.mk
pkgsrc/x11/libXxf86misc: Makefile buildlink3.mk
pkgsrc/x11/libXxf86vm: Makefile buildlink3.mk
pkgsrc/x11/liblbxutil: Makefile buildlink3.mk
pkgsrc/x11/liboldXrandr: Makefile buildlink3.mk builtin.mk
pkgsrc/x11/libxkbfile: Makefile buildlink3.mk
pkgsrc/x11/libxshmfence: Makefile buildlink3.mk
pkgsrc/x11/mate-settings-daemon: Makefile
pkgsrc/x11/modular-xorg-server: Makefile Makefile.common buildlink3.mk
options.mk
pkgsrc/x11/modular-xorg-server112: Makefile
pkgsrc/x11/modular-xorg-xephyr: Makefile
pkgsrc/x11/modular-xorg-xquartz: Makefile
pkgsrc/x11/printproto: Makefile buildlink3.mk
pkgsrc/x11/proxymngr: Makefile
pkgsrc/x11/rgb: Makefile
pkgsrc/x11/rstart: Makefile
pkgsrc/x11/sessreg: Makefile
pkgsrc/x11/unicode-screensaver: Makefile
pkgsrc/x11/xcalib: Makefile
pkgsrc/x11/xcompmgr: Makefile
pkgsrc/x11/xdriinfo: Makefile
pkgsrc/x11/xev: Makefile
pkgsrc/x11/xf86-input-acecad: Makefile
pkgsrc/x11/xf86-input-elographics: Makefile
pkgsrc/x11/xf86-input-fpit: Makefile
pkgsrc/x11/xf86-input-hyperpen: Makefile
pkgsrc/x11/xf86-input-joystick: Makefile
pkgsrc/x11/xf86-input-keyboard: Makefile
pkgsrc/x11/xf86-input-mouse: Makefile
pkgsrc/x11/xf86-input-mutouch: Makefile
pkgsrc/x11/xf86-input-penmount: Makefile
pkgsrc/x11/xf86-input-vmmouse: Makefile
pkgsrc/x11/xf86-input-void: Makefile
pkgsrc/x11/xf86-input-ws: Makefile
pkgsrc/x11/xf86-video-apm: Makefile
pkgsrc/x11/xf86-video-ark: Makefile
pkgsrc/x11/xf86-video-ati: Makefile
pkgsrc/x11/xf86-video-ati6: Makefile
pkgsrc/x11/xf86-video-chips: Makefile
pkgsrc/x11/xf86-video-cirrus: Makefile
pkgsrc/x11/xf86-video-dummy: Makefile
pkgsrc/x11/xf86-video-fbdev: Makefile
pkgsrc/x11/xf86-video-glint: Makefile
pkgsrc/x11/xf86-video-i128: Makefile
pkgsrc/x11/xf86-video-i740: Makefile
pkgsrc/x11/xf86-video-intel: Makefile
pkgsrc/x11/xf86-video-mach64: Makefile
pkgsrc/x11/xf86-video-mga: Makefile
pkgsrc/x11/xf86-video-modesetting: Makefile
pkgsrc/x11/xf86-video-newport: Makefile
pkgsrc/x11/xf86-video-nouveau: Makefile
pkgsrc/x11/xf86-video-nv: Makefile
pkgsrc/x11/xf86-video-openchrome: Makefile
pkgsrc/x11/xf86-video-qxl: Makefile
pkgsrc/x11/xf86-video-r128: Makefile
pkgsrc/x11/xf86-video-rendition: Makefile
pkgsrc/x11/xf86-video-s3: Makefile
pkgsrc/x11/xf86-video-s3virge: Makefile
pkgsrc/x11/xf86-video-savage: Makefile
pkgsrc/x11/xf86-video-siliconmotion: Makefile
pkgsrc/x11/xf86-video-sis: Makefile
pkgsrc/x11/xf86-video-suncg14: Makefile
pkgsrc/x11/xf86-video-suncg3: Makefile
pkgsrc/x11/xf86-video-suncg6: Makefile
pkgsrc/x11/xf86-video-sunffb: Makefile
pkgsrc/x11/xf86-video-sunleo: Makefile
pkgsrc/x11/xf86-video-suntcx: Makefile
pkgsrc/x11/xf86-video-tdfx: Makefile
pkgsrc/x11/xf86-video-tga: Makefile
pkgsrc/x11/xf86-video-trident: Makefile
pkgsrc/x11/xf86-video-tseng: Makefile
pkgsrc/x11/xf86-video-vmware: Makefile
pkgsrc/x11/xf86-video-voodoo: Makefile
pkgsrc/x11/xf86-video-wsfb: Makefile
pkgsrc/x11/xf86-video-xgi: Makefile
pkgsrc/x11/xfsinfo: Makefile
pkgsrc/x11/xfstt: Makefile
pkgsrc/x11/xfwp: Makefile
pkgsrc/x11/xgamma: Makefile
pkgsrc/x11/xinput: Makefile
pkgsrc/x11/xkbcomp: Makefile
pkgsrc/x11/xkbutils: Makefile
pkgsrc/x11/xkeyboard-config: Makefile
pkgsrc/x11/xlockmore: Makefile Makefile.common
pkgsrc/x11/xlockmore-lite: Makefile
pkgsrc/x11/xmx: Makefile
pkgsrc/x11/xorg-cf-files: Makefile
pkgsrc/x11/xpr: Makefile
pkgsrc/x11/xrandr: Makefile
pkgsrc/x11/xrx: Makefile
pkgsrc/x11/xscope: Makefile
pkgsrc/x11/xstdcmap: Makefile
pkgsrc/x11/xtrap: Makefile
pkgsrc/x11/xwud: Makefile
Removed Files:
pkgsrc/wm/applewmproto: DESCR Makefile PLIST buildlink3.mk distinfo
pkgsrc/wm/windowswmproto: DESCR Makefile PLIST buildlink3.mk distinfo
pkgsrc/x11/bigreqsproto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/compositeproto: DESCR Makefile PLIST buildlink3.mk
builtin.mk distinfo
pkgsrc/x11/damageproto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/dri2proto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/dri3proto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/fixesproto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/fontsproto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/glproto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/inputproto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/kbproto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/presentproto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/randrproto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/recordproto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/renderproto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/renderproto/patches: patch-aa
pkgsrc/x11/resourceproto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/scrnsaverproto: DESCR Makefile PLIST buildlink3.mk
builtin.mk distinfo
pkgsrc/x11/trapproto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/videoproto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/xcmiscproto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/xextproto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/xextproto/files: shmstr.h
pkgsrc/x11/xf86bigfontproto: DESCR Makefile PLIST buildlink3.mk
builtin.mk distinfo
pkgsrc/x11/xf86dgaproto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/xf86driproto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/xf86miscproto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/xf86vidmodeproto: DESCR Makefile PLIST buildlink3.mk
builtin.mk distinfo
pkgsrc/x11/xineramaproto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/xproto: DESCR Makefile PLIST buildlink3.mk builtin.mk
distinfo
pkgsrc/x11/xproto/patches: patch-Xos_r.h.in patch-Xpoll.h.in
patch-configure patch-configure.ac
pkgsrc/x11/xproxymanagementprotocol: DESCR Makefile PLIST buildlink3.mk
builtin.mk distinfo
pkgsrc/x11/xvidtune: hacks.mk
Log Message:
xorgproto: use xorgproto instead of separate *proto packages
Remove now obsolete packages.
To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 pkgsrc/audio/pulseaudio/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/audio/pulseaudio/options.mk
cvs rdiff -u -r1.46 -r1.47 pkgsrc/audio/terminatorx/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/audio/xmms/Makefile
cvs rdiff -u -r1.128 -r1.129 pkgsrc/devel/SDL/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/SDL2/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/imake/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/makedepend/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-meson/build.mk
cvs rdiff -u -r1.1088 -r1.1089 pkgsrc/doc/CHANGES-2018
cvs rdiff -u -r1.13 -r1.14 pkgsrc/emulators/kegs/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/emulators/tuxnes/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/xbeeb/options.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/xhomer/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/fonts/bdftopcf/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/fonts/libfontenc/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/fonts/mkfontscale/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/games/freeciv-client/options.mk
cvs rdiff -u -r1.28 -r1.29 pkgsrc/games/powermanga/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/games/quake/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/games/quakeforge/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/games/tyrquake/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/MesaLib/dri.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/MesaLib7/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/MesaLib7/glx-config.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/evas-software-x11/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/graphics/imlib/buildlink3.mk
cvs rdiff -u -r1.58 -r1.59 pkgsrc/graphics/libggi/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/inputmethod/librime/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/meta-pkgs/modular-xorg-protos/Makefile
cvs rdiff -u -r1.292 -r1.293 pkgsrc/mk/defaults/mk.conf
cvs rdiff -u -r1.35 -r1.36 pkgsrc/multimedia/fxtv/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/multimedia/gnash/options.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/multimedia/libvdpau/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/multimedia/xawtv/Makefile
cvs rdiff -u -r1.83 -r1.84 pkgsrc/multimedia/xine-ui/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/tigervnc/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/net/vncviewer/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/x2vnc/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/x2vnc/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/xfindproxy/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/pkgtools/x11-links/xfree.mk
cvs rdiff -u -r1.30 -r1.31 pkgsrc/pkgtools/x11-links/xorg.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/print/xpdfopen/Makefile
cvs rdiff -u -r1.133 -r1.134 pkgsrc/wm/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/wm/applewmproto/DESCR \
pkgsrc/wm/applewmproto/Makefile pkgsrc/wm/applewmproto/PLIST \
pkgsrc/wm/applewmproto/buildlink3.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/wm/applewmproto/distinfo
cvs rdiff -u -r1.60 -r1.61 pkgsrc/wm/awesome/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/wm/bbrun/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/wm/jwm/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/wm/libAppleWM/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/wm/libAppleWM/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/wm/libWindowsWM/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/wm/musca/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/wm/quartz-wm/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/wm/spectrwm/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/wm/windowswmproto/DESCR \
pkgsrc/wm/windowswmproto/PLIST pkgsrc/wm/windowswmproto/buildlink3.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/wm/windowswmproto/Makefile \
pkgsrc/wm/windowswmproto/distinfo
cvs rdiff -u -r1.817 -r1.818 pkgsrc/x11/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/x11/Xrender/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/x11/Xrender/buildlink3.mk
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/bigreqsproto/DESCR
cvs rdiff -u -r1.5 -r0 pkgsrc/x11/bigreqsproto/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/bigreqsproto/PLIST \
pkgsrc/x11/bigreqsproto/buildlink3.mk pkgsrc/x11/bigreqsproto/builtin.mk
cvs rdiff -u -r1.4 -r0 pkgsrc/x11/bigreqsproto/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/compositeproto/DESCR
cvs rdiff -u -r1.10 -r0 pkgsrc/x11/compositeproto/Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/x11/compositeproto/PLIST
cvs rdiff -u -r1.9 -r0 pkgsrc/x11/compositeproto/buildlink3.mk
cvs rdiff -u -r1.5 -r0 pkgsrc/x11/compositeproto/builtin.mk
cvs rdiff -u -r1.7 -r0 pkgsrc/x11/compositeproto/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/damageproto/DESCR
cvs rdiff -u -r1.6 -r0 pkgsrc/x11/damageproto/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/damageproto/PLIST \
pkgsrc/x11/damageproto/builtin.mk
cvs rdiff -u -r1.4 -r0 pkgsrc/x11/damageproto/buildlink3.mk
cvs rdiff -u -r1.5 -r0 pkgsrc/x11/damageproto/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/dri2proto/DESCR \
pkgsrc/x11/dri2proto/builtin.mk
cvs rdiff -u -r1.8 -r0 pkgsrc/x11/dri2proto/Makefile \
pkgsrc/x11/dri2proto/distinfo
cvs rdiff -u -r1.5 -r0 pkgsrc/x11/dri2proto/PLIST
cvs rdiff -u -r1.4 -r0 pkgsrc/x11/dri2proto/buildlink3.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/dri3proto/DESCR \
pkgsrc/x11/dri3proto/Makefile pkgsrc/x11/dri3proto/PLIST \
pkgsrc/x11/dri3proto/builtin.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/dri3proto/buildlink3.mk \
pkgsrc/x11/dri3proto/distinfo
cvs rdiff -u -r1.32 -r1.33 pkgsrc/x11/dxpc/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/fixesproto/DESCR
cvs rdiff -u -r1.11 -r0 pkgsrc/x11/fixesproto/Makefile \
pkgsrc/x11/fixesproto/buildlink3.mk
cvs rdiff -u -r1.5 -r0 pkgsrc/x11/fixesproto/PLIST
cvs rdiff -u -r1.10 -r0 pkgsrc/x11/fixesproto/builtin.mk
cvs rdiff -u -r1.8 -r0 pkgsrc/x11/fixesproto/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/fixesproto4/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/fixesproto4/buildlink3.mk
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/fontsproto/DESCR
cvs rdiff -u -r1.7 -r0 pkgsrc/x11/fontsproto/Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/x11/fontsproto/PLIST \
pkgsrc/x11/fontsproto/buildlink3.mk pkgsrc/x11/fontsproto/builtin.mk
cvs rdiff -u -r1.5 -r0 pkgsrc/x11/fontsproto/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/glproto/DESCR
cvs rdiff -u -r1.12 -r0 pkgsrc/x11/glproto/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/glproto/PLIST \
pkgsrc/x11/glproto/buildlink3.mk
cvs rdiff -u -r1.4 -r0 pkgsrc/x11/glproto/builtin.mk
cvs rdiff -u -r1.10 -r0 pkgsrc/x11/glproto/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/gtk3/options.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/iceauth/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/inputproto/DESCR
cvs rdiff -u -r1.18 -r0 pkgsrc/x11/inputproto/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/inputproto/PLIST
cvs rdiff -u -r1.6 -r0 pkgsrc/x11/inputproto/buildlink3.mk
cvs rdiff -u -r1.5 -r0 pkgsrc/x11/inputproto/builtin.mk
cvs rdiff -u -r1.16 -r0 pkgsrc/x11/inputproto/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/kbproto/DESCR
cvs rdiff -u -r1.7 -r0 pkgsrc/x11/kbproto/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/kbproto/PLIST pkgsrc/x11/kbproto/builtin.mk
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/kbproto/buildlink3.mk
cvs rdiff -u -r1.6 -r0 pkgsrc/x11/kbproto/distinfo
cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/lbxproxy/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/libFS/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/libFS/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/libICE/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/libSM/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/x11/libX11/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/libX11/buildlink3.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/libXScrnSaver/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/libXScrnSaver/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/libXTrap/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/libXau/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/libXau/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/libXau/builtin.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/libXaw/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/libXaw/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/libXcomposite/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/libXcomposite/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/libXcursor/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/libXcursor/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/libXdamage/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/libXdamage/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/libXdmcp/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/libXdmcp/builtin.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/libXevie/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/libXevie/buildlink3.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/libXext/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/libXext/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/libXfixes/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/libXfixes/buildlink3.mk
cvs rdiff -u -r1.39 -r1.40 pkgsrc/x11/libXfont/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/libXfont/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/libXfont2/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/libXfont2/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/libXft/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/libXft/buildlink3.mk
cvs rdiff -u -r1.33 -r1.34 pkgsrc/x11/libXi/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/libXi/buildlink3.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/libXinerama/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/libXinerama/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/libXmu/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/libXpm/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/libXpm/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/libXpresent/Makefile \
pkgsrc/x11/libXpresent/buildlink3.mk pkgsrc/x11/libXpresent/builtin.mk
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/libXrandr/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/libXrandr/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/libXrandr/builtin.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/libXrender/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/libXrender/buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/libXres/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/libXres/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/libXt/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/libXt/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/libXtst/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/libXtst/buildlink3.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/libXv/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/libXv/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/libXvMC/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/libXvMC/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/libXxf86dga/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/libXxf86dga/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/libXxf86misc/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/libXxf86misc/buildlink3.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/libXxf86vm/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/libXxf86vm/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/liblbxutil/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/liblbxutil/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/liboldXrandr/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/liboldXrandr/buildlink3.mk \
pkgsrc/x11/liboldXrandr/builtin.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/libxkbfile/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/libxkbfile/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/libxshmfence/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/libxshmfence/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/mate-settings-daemon/Makefile
cvs rdiff -u -r1.114 -r1.115 pkgsrc/x11/modular-xorg-server/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/modular-xorg-server/Makefile.common \
pkgsrc/x11/modular-xorg-server/buildlink3.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/modular-xorg-server/options.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/modular-xorg-server112/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/modular-xorg-xephyr/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/modular-xorg-xquartz/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/presentproto/DESCR \
pkgsrc/x11/presentproto/PLIST pkgsrc/x11/presentproto/buildlink3.mk \
pkgsrc/x11/presentproto/builtin.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/presentproto/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/presentproto/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/printproto/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/printproto/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/proxymngr/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/randrproto/DESCR
cvs rdiff -u -r1.16 -r0 pkgsrc/x11/randrproto/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/randrproto/PLIST
cvs rdiff -u -r1.9 -r0 pkgsrc/x11/randrproto/buildlink3.mk
cvs rdiff -u -r1.5 -r0 pkgsrc/x11/randrproto/builtin.mk
cvs rdiff -u -r1.13 -r0 pkgsrc/x11/randrproto/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/recordproto/DESCR
cvs rdiff -u -r1.6 -r0 pkgsrc/x11/recordproto/Makefile \
pkgsrc/x11/recordproto/buildlink3.mk
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/recordproto/PLIST \
pkgsrc/x11/recordproto/builtin.mk
cvs rdiff -u -r1.4 -r0 pkgsrc/x11/recordproto/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/renderproto/DESCR
cvs rdiff -u -r1.10 -r0 pkgsrc/x11/renderproto/Makefile \
pkgsrc/x11/renderproto/builtin.mk
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/renderproto/PLIST
cvs rdiff -u -r1.16 -r0 pkgsrc/x11/renderproto/buildlink3.mk
cvs rdiff -u -r1.7 -r0 pkgsrc/x11/renderproto/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/renderproto/patches/patch-aa
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/resourceproto/DESCR
cvs rdiff -u -r1.5 -r0 pkgsrc/x11/resourceproto/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/resourceproto/PLIST \
pkgsrc/x11/resourceproto/buildlink3.mk
cvs rdiff -u -r1.4 -r0 pkgsrc/x11/resourceproto/builtin.mk \
pkgsrc/x11/resourceproto/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/rgb/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/rstart/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/scrnsaverproto/DESCR
cvs rdiff -u -r1.6 -r0 pkgsrc/x11/scrnsaverproto/Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/x11/scrnsaverproto/PLIST \
pkgsrc/x11/scrnsaverproto/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/scrnsaverproto/buildlink3.mk \
pkgsrc/x11/scrnsaverproto/builtin.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/sessreg/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/trapproto/DESCR
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/trapproto/Makefile \
pkgsrc/x11/trapproto/builtin.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/trapproto/PLIST \
pkgsrc/x11/trapproto/distinfo
cvs rdiff -u -r1.5 -r0 pkgsrc/x11/trapproto/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/unicode-screensaver/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/videoproto/DESCR
cvs rdiff -u -r1.8 -r0 pkgsrc/x11/videoproto/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/videoproto/PLIST \
pkgsrc/x11/videoproto/buildlink3.mk pkgsrc/x11/videoproto/builtin.mk
cvs rdiff -u -r1.6 -r0 pkgsrc/x11/videoproto/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/xcalib/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/xcmiscproto/DESCR
cvs rdiff -u -r1.5 -r0 pkgsrc/x11/xcmiscproto/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/xcmiscproto/PLIST \
pkgsrc/x11/xcmiscproto/buildlink3.mk pkgsrc/x11/xcmiscproto/builtin.mk
cvs rdiff -u -r1.4 -r0 pkgsrc/x11/xcmiscproto/distinfo
cvs rdiff -u -r1.30 -r1.31 pkgsrc/x11/xcompmgr/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/xdriinfo/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/xev/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/xextproto/DESCR
cvs rdiff -u -r1.15 -r0 pkgsrc/x11/xextproto/Makefile
cvs rdiff -u -r1.6 -r0 pkgsrc/x11/xextproto/PLIST
cvs rdiff -u -r1.12 -r0 pkgsrc/x11/xextproto/buildlink3.mk
cvs rdiff -u -r1.10 -r0 pkgsrc/x11/xextproto/builtin.mk \
pkgsrc/x11/xextproto/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/xextproto/files/shmstr.h
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/xf86-input-acecad/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/xf86-input-elographics/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/xf86-input-fpit/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/xf86-input-hyperpen/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/xf86-input-joystick/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/x11/xf86-input-keyboard/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/x11/xf86-input-mouse/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/xf86-input-mutouch/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/xf86-input-penmount/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/x11/xf86-input-vmmouse/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/xf86-input-void/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/xf86-input-ws/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/xf86-video-apm/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/xf86-video-ark/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/x11/xf86-video-ati/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/xf86-video-ati6/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/xf86-video-chips/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/xf86-video-cirrus/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/xf86-video-dummy/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/xf86-video-fbdev/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/xf86-video-glint/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/xf86-video-i128/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/xf86-video-i740/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/x11/xf86-video-intel/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/xf86-video-mach64/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/x11/xf86-video-mga/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/xf86-video-modesetting/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/xf86-video-newport/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/xf86-video-nouveau/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/x11/xf86-video-nv/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/xf86-video-openchrome/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/xf86-video-qxl/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/xf86-video-r128/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/xf86-video-rendition/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/xf86-video-s3/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/xf86-video-s3virge/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/x11/xf86-video-savage/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/xf86-video-siliconmotion/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/x11/xf86-video-sis/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/xf86-video-suncg14/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/xf86-video-suncg3/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/xf86-video-suncg6/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/xf86-video-sunffb/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/xf86-video-sunleo/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/xf86-video-suntcx/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/xf86-video-tdfx/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/xf86-video-tga/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/xf86-video-trident/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/xf86-video-tseng/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/xf86-video-vmware/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/xf86-video-voodoo/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/xf86-video-wsfb/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/xf86-video-xgi/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/xf86bigfontproto/DESCR
cvs rdiff -u -r1.4 -r0 pkgsrc/x11/xf86bigfontproto/Makefile \
pkgsrc/x11/xf86bigfontproto/buildlink3.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/xf86bigfontproto/PLIST
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/xf86bigfontproto/builtin.mk \
pkgsrc/x11/xf86bigfontproto/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/xf86dgaproto/DESCR
cvs rdiff -u -r1.5 -r0 pkgsrc/x11/xf86dgaproto/Makefile \
pkgsrc/x11/xf86dgaproto/buildlink3.mk
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/xf86dgaproto/PLIST
cvs rdiff -u -r1.4 -r0 pkgsrc/x11/xf86dgaproto/builtin.mk \
pkgsrc/x11/xf86dgaproto/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/xf86driproto/DESCR
cvs rdiff -u -r1.8 -r0 pkgsrc/x11/xf86driproto/Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/x11/xf86driproto/PLIST \
pkgsrc/x11/xf86driproto/builtin.mk
cvs rdiff -u -r1.5 -r0 pkgsrc/x11/xf86driproto/buildlink3.mk \
pkgsrc/x11/xf86driproto/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/xf86miscproto/DESCR
cvs rdiff -u -r1.4 -r0 pkgsrc/x11/xf86miscproto/Makefile \
pkgsrc/x11/xf86miscproto/builtin.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/xf86miscproto/PLIST
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/xf86miscproto/buildlink3.mk \
pkgsrc/x11/xf86miscproto/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/xf86vidmodeproto/DESCR
cvs rdiff -u -r1.5 -r0 pkgsrc/x11/xf86vidmodeproto/Makefile \
pkgsrc/x11/xf86vidmodeproto/buildlink3.mk
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/xf86vidmodeproto/PLIST
cvs rdiff -u -r1.4 -r0 pkgsrc/x11/xf86vidmodeproto/builtin.mk \
pkgsrc/x11/xf86vidmodeproto/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/xfsinfo/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/x11/xfstt/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/xfwp/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/xgamma/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/xineramaproto/DESCR
cvs rdiff -u -r1.5 -r0 pkgsrc/x11/xineramaproto/Makefile \
pkgsrc/x11/xineramaproto/buildlink3.mk
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/xineramaproto/PLIST
cvs rdiff -u -r1.6 -r0 pkgsrc/x11/xineramaproto/builtin.mk
cvs rdiff -u -r1.4 -r0 pkgsrc/x11/xineramaproto/distinfo
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/xinput/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/xkbcomp/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/xkbutils/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/x11/xkeyboard-config/Makefile
cvs rdiff -u -r1.129 -r1.130 pkgsrc/x11/xlockmore/Makefile
cvs rdiff -u -r1.77 -r1.78 pkgsrc/x11/xlockmore/Makefile.common
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/xlockmore-lite/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/xmx/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/x11/xorg-cf-files/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/xpr/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/xproto/DESCR
cvs rdiff -u -r1.32 -r0 pkgsrc/x11/xproto/Makefile
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/xproto/PLIST
cvs rdiff -u -r1.11 -r0 pkgsrc/x11/xproto/buildlink3.mk
cvs rdiff -u -r1.6 -r0 pkgsrc/x11/xproto/builtin.mk
cvs rdiff -u -r1.30 -r0 pkgsrc/x11/xproto/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/xproto/patches/patch-Xos_r.h.in
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/xproto/patches/patch-Xpoll.h.in \
pkgsrc/x11/xproto/patches/patch-configure.ac
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/xproto/patches/patch-configure
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/x11/xproxymanagementprotocol/DESCR
cvs rdiff -u -r1.4 -r0 pkgsrc/x11/xproxymanagementprotocol/Makefile \
pkgsrc/x11/xproxymanagementprotocol/buildlink3.mk \
pkgsrc/x11/xproxymanagementprotocol/builtin.mk
cvs rdiff -u -r1.3 -r0 pkgsrc/x11/xproxymanagementprotocol/PLIST \
pkgsrc/x11/xproxymanagementprotocol/distinfo
cvs rdiff -u -r1.22 -r1.23 pkgsrc/x11/xrandr/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/xrx/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/xscope/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/xstdcmap/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/xtrap/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/xvidtune/hacks.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/xwud/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/audio/pulseaudio/Makefile
diff -u pkgsrc/audio/pulseaudio/Makefile:1.123 pkgsrc/audio/pulseaudio/Makefile:1.124
--- pkgsrc/audio/pulseaudio/Makefile:1.123 Sun Jan 28 20:10:34 2018
+++ pkgsrc/audio/pulseaudio/Makefile Wed Mar 7 11:57:28 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.123 2018/01/28 20:10:34 wiz Exp $
+# $NetBSD: Makefile,v 1.124 2018/03/07 11:57:28 wiz Exp $
DISTNAME= pulseaudio-11.1
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/
EXTRACT_SUFX= .tar.xz
Index: pkgsrc/audio/pulseaudio/options.mk
diff -u pkgsrc/audio/pulseaudio/options.mk:1.6 pkgsrc/audio/pulseaudio/options.mk:1.7
--- pkgsrc/audio/pulseaudio/options.mk:1.6 Sat Aug 6 15:56:50 2016
+++ pkgsrc/audio/pulseaudio/options.mk Wed Mar 7 11:57:28 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2016/08/06 15:56:50 richard Exp $
+# $NetBSD: options.mk,v 1.7 2018/03/07 11:57:28 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.pulseaudio
PKG_SUPPORTED_OPTIONS= avahi fftw x11
@@ -46,7 +46,7 @@ CONFIGURE_ARGS+= --without-fftw
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXtst/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
PLIST.x11= yes
.else
CONFIGURE_ARGS+= --disable-x11
Index: pkgsrc/audio/terminatorx/Makefile
diff -u pkgsrc/audio/terminatorx/Makefile:1.46 pkgsrc/audio/terminatorx/Makefile:1.47
--- pkgsrc/audio/terminatorx/Makefile:1.46 Sun Feb 12 06:25:06 2017
+++ pkgsrc/audio/terminatorx/Makefile Wed Mar 7 11:57:28 2018
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2017/02/12 06:25:06 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.47 2018/03/07 11:57:28 wiz Exp $
DISTNAME= terminatorX-3.82
PKGNAME= ${DISTNAME:S/X/x/}
-PKGREVISION= 30
+PKGREVISION= 31
CATEGORIES= audio
MASTER_SITES= http://terminatorx.org/dist/
EXTRACT_SUFX= .tar.bz2
@@ -39,7 +38,7 @@ SUBST_MESSAGE.oss= Fixing hardcoded audi
.include "../../mk/omf-scrollkeeper.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libXxf86dga/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
Index: pkgsrc/audio/xmms/Makefile
diff -u pkgsrc/audio/xmms/Makefile:1.79 pkgsrc/audio/xmms/Makefile:1.80
--- pkgsrc/audio/xmms/Makefile:1.79 Mon Sep 7 12:02:07 2015
+++ pkgsrc/audio/xmms/Makefile Wed Mar 7 11:57:29 2018
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.79 2015/09/07 12:02:07 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.80 2018/03/07 11:57:29 wiz Exp $
.include "Makefile.common"
-PKGREVISION= 5
+PKGREVISION= 6
USE_TOOLS+= msgfmt
@@ -22,5 +21,5 @@ REPLACE_SH= xmms-config.in
.include "../../devel/zlib/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xf86vidmodeproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/SDL/Makefile
diff -u pkgsrc/devel/SDL/Makefile:1.128 pkgsrc/devel/SDL/Makefile:1.129
--- pkgsrc/devel/SDL/Makefile:1.128 Sun Jan 28 20:10:45 2018
+++ pkgsrc/devel/SDL/Makefile Wed Mar 7 11:57:29 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.128 2018/01/28 20:10:45 wiz Exp $
+# $NetBSD: Makefile,v 1.129 2018/03/07 11:57:29 wiz Exp $
DISTNAME= SDL-1.2.15
-PKGREVISION= 23
+PKGREVISION= 24
CATEGORIES= devel games
MASTER_SITES= http://www.libsdl.org/release/
@@ -54,7 +54,7 @@ CONFIGURE_ARGS+= --disable-x11-shared
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXrandr/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.else
CONFIGURE_ARGS+= --without-x
.endif
Index: pkgsrc/devel/SDL2/buildlink3.mk
diff -u pkgsrc/devel/SDL2/buildlink3.mk:1.4 pkgsrc/devel/SDL2/buildlink3.mk:1.5
--- pkgsrc/devel/SDL2/buildlink3.mk:1.4 Sat Apr 25 14:20:31 2015
+++ pkgsrc/devel/SDL2/buildlink3.mk Wed Mar 7 11:57:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2015/04/25 14:20:31 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/03/07 11:57:29 wiz Exp $
BUILDLINK_TREE+= SDL2
@@ -24,7 +24,7 @@ pkgbase := SDL2
.endif
.if !empty(PKG_BUILD_OPTIONS.SDL2:Mx11)
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.endif
Index: pkgsrc/devel/imake/Makefile
diff -u pkgsrc/devel/imake/Makefile:1.24 pkgsrc/devel/imake/Makefile:1.25
--- pkgsrc/devel/imake/Makefile:1.24 Sat Sep 17 17:49:36 2016
+++ pkgsrc/devel/imake/Makefile Wed Mar 7 11:57:29 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2016/09/17 17:49:36 richard Exp $
+# $NetBSD: Makefile,v 1.25 2018/03/07 11:57:29 wiz Exp $
DISTNAME= imake-1.0.7
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=util/}
EXTRACT_SUFX= .tar.bz2
@@ -33,6 +33,5 @@ SUBST_SED.xmkmf= -e "s/^configdirspec= *
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/makedepend/Makefile
diff -u pkgsrc/devel/makedepend/Makefile:1.10 pkgsrc/devel/makedepend/Makefile:1.11
--- pkgsrc/devel/makedepend/Makefile:1.10 Thu Oct 9 14:06:10 2014
+++ pkgsrc/devel/makedepend/Makefile Wed Mar 7 11:57:29 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2014/10/09 14:06:10 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:29 wiz Exp $
DISTNAME= makedepend-1.0.5
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_XORG:=util/}
EXTRACT_SUFX= .tar.bz2
@@ -14,6 +15,5 @@ USE_TOOLS+= pkg-config
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/py-meson/build.mk
diff -u pkgsrc/devel/py-meson/build.mk:1.2 pkgsrc/devel/py-meson/build.mk:1.3
--- pkgsrc/devel/py-meson/build.mk:1.2 Thu Aug 31 05:00:16 2017
+++ pkgsrc/devel/py-meson/build.mk Wed Mar 7 11:57:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.2 2017/08/31 05:00:16 wiz Exp $
+# $NetBSD: build.mk,v 1.3 2018/03/07 11:57:29 wiz Exp $
BUILD_DEPENDS+= ${PYPKGPREFIX}-meson-[0-9]*:../../devel/py-meson
@@ -6,7 +6,7 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-meson-[0-
do-configure: meson-configure
meson-configure:
- cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} meson --prefix ${PREFIX} --buildtype=plain . output
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} meson --prefix ${PREFIX} --buildtype=plain ${MESON_ARGS} . output
do-build: meson-build
meson-build:
Index: pkgsrc/doc/CHANGES-2018
diff -u pkgsrc/doc/CHANGES-2018:1.1088 pkgsrc/doc/CHANGES-2018:1.1089
--- pkgsrc/doc/CHANGES-2018:1.1088 Wed Mar 7 11:51:06 2018
+++ pkgsrc/doc/CHANGES-2018 Wed Mar 7 11:57:48 2018
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2018,v 1.1088 2018/03/07 11:51:06 fhajny Exp $
+$NetBSD: CHANGES-2018,v 1.1089 2018/03/07 11:57:48 wiz Exp $
Changes to the packages collection and infrastructure in 2018:
@@ -1497,3 +1497,33 @@ Changes to the packages collection and i
Updated lang/nodejs8 to 8.10.0 [fhajny 2018-03-07]
Updated lang/nodejs6 to 6.13.1 [fhajny 2018-03-07]
Updated devel/kafka to 1.0.1 [fhajny 2018-03-07]
+ Removed wm/applewmproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed wm/windowswmproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/bigreqsproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/compositeproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/damageproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/dri2proto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/dri3proto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/fixesproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/fontsproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/glproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/inputproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/kbproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/presentproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/randrproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/recordproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/renderproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/resourceproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/scrnsaverproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/trapproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/videoproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/xcmiscproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/xextproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/xf86bigfontproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/xf86dgaproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/xf86driproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/xf86miscproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/xf86vidmodeproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/xineramaproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/xproto successor x11/xorgproto [wiz 2018-03-07]
+ Removed x11/xproxymanagementprotocol successor x11/xorgproto [wiz 2018-03-07]
Index: pkgsrc/emulators/kegs/Makefile
diff -u pkgsrc/emulators/kegs/Makefile:1.13 pkgsrc/emulators/kegs/Makefile:1.14
--- pkgsrc/emulators/kegs/Makefile:1.13 Tue Mar 6 15:29:13 2018
+++ pkgsrc/emulators/kegs/Makefile Wed Mar 7 11:57:29 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2018/03/06 15:29:13 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:29 wiz Exp $
DISTNAME= kegs.0.91
PKGNAME= kegs-0.91
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= emulators
MASTER_SITES= http://kegs.sourceforge.net/
@@ -53,7 +53,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/*txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/config.kegs ${DESTDIR}${PREFIX}/share/${PKGBASE}
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/emulators/tuxnes/Makefile
diff -u pkgsrc/emulators/tuxnes/Makefile:1.14 pkgsrc/emulators/tuxnes/Makefile:1.15
--- pkgsrc/emulators/tuxnes/Makefile:1.14 Thu Feb 25 12:50:49 2016
+++ pkgsrc/emulators/tuxnes/Makefile Wed Mar 7 11:57:29 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2016/02/25 12:50:49 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.15 2018/03/07 11:57:29 wiz Exp $
DISTNAME= tuxnes-0.75
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tuxnes/}
@@ -39,6 +38,6 @@ post-install:
.include "../../devel/zlib/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/emulators/xbeeb/options.mk
diff -u pkgsrc/emulators/xbeeb/options.mk:1.2 pkgsrc/emulators/xbeeb/options.mk:1.3
--- pkgsrc/emulators/xbeeb/options.mk:1.2 Wed Dec 14 08:51:53 2016
+++ pkgsrc/emulators/xbeeb/options.mk Wed Mar 7 11:57:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2016/12/14 08:51:53 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2018/03/07 11:57:29 wiz Exp $
.include "../../mk/bsd.prefs.mk"
@@ -21,9 +21,7 @@ SUBST_SED.nomitshm= -e "s|\#define *MITS
PLIST_VARS+= xbeeb-roms
.if !empty(PKG_OPTIONS:Mmitshm)
-
-.include "../../x11/xextproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mxbeeb-roms)
Index: pkgsrc/emulators/xhomer/Makefile
diff -u pkgsrc/emulators/xhomer/Makefile:1.6 pkgsrc/emulators/xhomer/Makefile:1.7
--- pkgsrc/emulators/xhomer/Makefile:1.6 Wed Jul 24 21:15:54 2013
+++ pkgsrc/emulators/xhomer/Makefile Wed Mar 7 11:57:29 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2013/07/24 21:15:54 shattered Exp $
+# $NetBSD: Makefile,v 1.7 2018/03/07 11:57:29 wiz Exp $
DISTNAME= xhomer-9-16-06
PKGNAME= xhomer-9.16.06
+PKGREVISION= 1
CATEGORIES= emulators
MASTER_SITES= http://xhomer.isani.org/xhomer/
EXTRACT_SUFX= .tgz
@@ -29,5 +30,5 @@ do-install:
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXxf86dga/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/fonts/bdftopcf/Makefile
diff -u pkgsrc/fonts/bdftopcf/Makefile:1.13 pkgsrc/fonts/bdftopcf/Makefile:1.14
--- pkgsrc/fonts/bdftopcf/Makefile:1.13 Wed Nov 8 08:43:45 2017
+++ pkgsrc/fonts/bdftopcf/Makefile Wed Mar 7 11:57:29 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2017/11/08 08:43:45 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:29 wiz Exp $
DISTNAME= bdftopcf-1.1
+PKGREVISION= 1
CATEGORIES= fonts
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -14,6 +15,5 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV+= APP_MAN_SUFFIX=1
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/fonts/libfontenc/Makefile
diff -u pkgsrc/fonts/libfontenc/Makefile:1.11 pkgsrc/fonts/libfontenc/Makefile:1.12
--- pkgsrc/fonts/libfontenc/Makefile:1.11 Fri May 1 08:36:12 2015
+++ pkgsrc/fonts/libfontenc/Makefile Wed Mar 7 11:57:30 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2015/05/01 08:36:12 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2018/03/07 11:57:30 wiz Exp $
DISTNAME= libfontenc-1.1.3
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -17,6 +18,5 @@ GNU_CONFIGURE= yes
.include "../../meta-pkgs/modular-xorg/hacks.mk"
.include "../../devel/zlib/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/fonts/mkfontscale/Makefile
diff -u pkgsrc/fonts/mkfontscale/Makefile:1.35 pkgsrc/fonts/mkfontscale/Makefile:1.36
--- pkgsrc/fonts/mkfontscale/Makefile:1.35 Sat Jan 17 09:12:53 2015
+++ pkgsrc/fonts/mkfontscale/Makefile Wed Mar 7 11:57:30 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2015/01/17 09:12:53 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2018/03/07 11:57:30 wiz Exp $
DISTNAME= mkfontscale-1.1.2
+PKGREVISION= 1
CATEGORIES= fonts x11
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -20,6 +21,5 @@ CONFIGURE_ARGS+= --with-bzip2
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../fonts/libfontenc/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/games/freeciv-client/options.mk
diff -u pkgsrc/games/freeciv-client/options.mk:1.8 pkgsrc/games/freeciv-client/options.mk:1.9
--- pkgsrc/games/freeciv-client/options.mk:1.8 Wed Oct 14 20:17:25 2015
+++ pkgsrc/games/freeciv-client/options.mk Wed Mar 7 11:57:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2015/10/14 20:17:25 wiz Exp $
+# $NetBSD: options.mk,v 1.9 2018/03/07 11:57:30 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.freeciv-client
PKG_OPTIONS_REQUIRED_GROUPS= backend
@@ -52,6 +52,6 @@ CONFIGURE_ARGS+= --enable-client=xaw
CONFIGURE_ARGS+= --enable-fcmp=cli
CONFIGURE_ARGS+= --with-xaw3d
.include "../../x11/libXaw3d/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
PLIST_SRC= ${PKGDIR}/PLIST.xaw
.endif
Index: pkgsrc/games/powermanga/Makefile
diff -u pkgsrc/games/powermanga/Makefile:1.28 pkgsrc/games/powermanga/Makefile:1.29
--- pkgsrc/games/powermanga/Makefile:1.28 Sun Jan 14 15:26:48 2018
+++ pkgsrc/games/powermanga/Makefile Wed Mar 7 11:57:30 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2018/01/14 15:26:48 rillig Exp $
-#
+# $NetBSD: Makefile,v 1.29 2018/03/07 11:57:30 wiz Exp $
DISTNAME= powermanga-0.90
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games
MASTER_SITES= http://linux.tlk.fr/games/Powermanga/download/
@@ -52,5 +51,5 @@ SUBST_FILES.path+= texts/Makefile.in
.include "../../devel/SDL/buildlink3.mk"
.include "../../x11/libXxf86dga/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/games/quake/Makefile
diff -u pkgsrc/games/quake/Makefile:1.52 pkgsrc/games/quake/Makefile:1.53
--- pkgsrc/games/quake/Makefile:1.52 Sun Jan 14 15:26:48 2018
+++ pkgsrc/games/quake/Makefile Wed Mar 7 11:57:30 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2018/01/14 15:26:48 rillig Exp $
+# $NetBSD: Makefile,v 1.53 2018/03/07 11:57:30 wiz Exp $
DISTNAME= q1source
PKGNAME= quake-2.30
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= games x11
MASTER_SITES= ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/source/
MASTER_SITES+= ftp://ftp.idsoftware.com/idstuff/source/
@@ -56,6 +56,6 @@ do-install:
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXxf86dga/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/games/quakeforge/Makefile
diff -u pkgsrc/games/quakeforge/Makefile:1.33 pkgsrc/games/quakeforge/Makefile:1.34
--- pkgsrc/games/quakeforge/Makefile:1.33 Mon Jan 1 23:47:44 2018
+++ pkgsrc/games/quakeforge/Makefile Wed Mar 7 11:57:30 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2018/01/01 23:47:44 rillig Exp $
+# $NetBSD: Makefile,v 1.34 2018/03/07 11:57:30 wiz Exp $
DISTNAME= quakeforge-0.5.5
-PKGREVISION= 15
+PKGREVISION= 16
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=quake/}
@@ -55,7 +55,6 @@ INSTALLATION_DIRS= include/QF/GL include
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXxf86dga/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xf86vidmodeproto/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/games/tyrquake/Makefile
diff -u pkgsrc/games/tyrquake/Makefile:1.8 pkgsrc/games/tyrquake/Makefile:1.9
--- pkgsrc/games/tyrquake/Makefile:1.8 Sun Jan 14 10:42:03 2018
+++ pkgsrc/games/tyrquake/Makefile Wed Mar 7 11:57:30 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2018/01/14 10:42:03 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:30 wiz Exp $
DISTNAME= tyrquake-0.61_20140630
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= games x11
#MASTER_SITES= https://disenchant.net/files/engine/
MASTER_SITES= http://ftp.NetBSD.org/pub/NetBSD/misc/snj/tyrquake/
@@ -33,7 +33,7 @@ do-install:
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXxf86dga/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/MesaLib/dri.mk
diff -u pkgsrc/graphics/MesaLib/dri.mk:1.16 pkgsrc/graphics/MesaLib/dri.mk:1.17
--- pkgsrc/graphics/MesaLib/dri.mk:1.16 Thu Mar 10 05:29:56 2016
+++ pkgsrc/graphics/MesaLib/dri.mk Wed Mar 7 11:57:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: dri.mk,v 1.16 2016/03/10 05:29:56 tnn Exp $
+# $NetBSD: dri.mk,v 1.17 2018/03/07 11:57:30 wiz Exp $
#
# Currently, this is for convenience only.
#
@@ -12,8 +12,6 @@ CHECK_BUILTIN.MesaLib:= no
. endif
. if !empty(USE_BUILTIN.MesaLib:M[Nn][Oo])
-BUILDLINK_API_DEPENDS.dri2proto+= dri2proto>=2.1
-BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.11
. if ${OPSYS} != "Darwin"
BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.60
. endif
@@ -22,22 +20,17 @@ BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1
. endif
. endif
. include "../../textproc/expat/buildlink3.mk"
-. include "../../x11/dri2proto/buildlink3.mk"
+. include "../../x11/xorgproto/buildlink3.mk"
# XXX these do not have builtin.mk
. if ${X11_TYPE} == "modular"
-. include "../../x11/dri3proto/buildlink3.mk"
. include "../../x11/libxshmfence/buildlink3.mk"
-. include "../../x11/presentproto/buildlink3.mk"
. endif
-. include "../../x11/glproto/buildlink3.mk"
. include "../../x11/libXdamage/buildlink3.mk"
. include "../../x11/libXfixes/buildlink3.mk"
. include "../../x11/libXxf86vm/buildlink3.mk"
. if ${OPSYS} != "Darwin"
. include "../../x11/libdrm/buildlink3.mk"
. endif
-. include "../../x11/xf86driproto/buildlink3.mk"
-. include "../../x11/xf86vidmodeproto/buildlink3.mk"
. if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
. include "../../devel/libdevq/buildlink3.mk"
. endif
Index: pkgsrc/graphics/MesaLib7/Makefile
diff -u pkgsrc/graphics/MesaLib7/Makefile:1.10 pkgsrc/graphics/MesaLib7/Makefile:1.11
--- pkgsrc/graphics/MesaLib7/Makefile:1.10 Sun Sep 3 08:53:09 2017
+++ pkgsrc/graphics/MesaLib7/Makefile Wed Mar 7 11:57:30 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2017/09/03 08:53:09 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:30 wiz Exp $
DISTNAME?= ${MESA_DISTNAME}
PKGNAME= MesaLib7-${MESA_PKGVERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ${MESA_SITES}
EXTRACT_SUFX= .tar.bz2
@@ -129,8 +129,7 @@ pre-install:
.include "../../lang/python/tool.mk"
BUILDLINK_DEPMETHOD.libxml2?= build
.include "../../textproc/libxml2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.11
-.include "../../x11/glproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXi/buildlink3.mk"
.include "../../x11/libXmu/buildlink3.mk"
Index: pkgsrc/graphics/MesaLib7/glx-config.mk
diff -u pkgsrc/graphics/MesaLib7/glx-config.mk:1.1 pkgsrc/graphics/MesaLib7/glx-config.mk:1.2
--- pkgsrc/graphics/MesaLib7/glx-config.mk:1.1 Sun Apr 5 17:01:37 2015
+++ pkgsrc/graphics/MesaLib7/glx-config.mk Wed Mar 7 11:57:30 2018
@@ -1,15 +1,10 @@
-# $NetBSD: glx-config.mk,v 1.1 2015/04/05 17:01:37 tnn Exp $
+# $NetBSD: glx-config.mk,v 1.2 2018/03/07 11:57:30 wiz Exp $
#
# used by x11/modular-xorg-server112/options.mk
.if !defined(GLX_CONFIG_MK)
GLX_CONFIG_MK= # empty
-### XXX Older versions of xf86driproto installed dri_interface.h, which
-### is now installed by Mesa.
-###
-BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.0.4
-
. include "../../mk/bsd.fast.prefs.mk"
CFLAGS.NetBSD+= -D_NETBSD_SOURCE
Index: pkgsrc/graphics/evas-software-x11/Makefile
diff -u pkgsrc/graphics/evas-software-x11/Makefile:1.16 pkgsrc/graphics/evas-software-x11/Makefile:1.17
--- pkgsrc/graphics/evas-software-x11/Makefile:1.16 Sat Mar 5 11:28:37 2016
+++ pkgsrc/graphics/evas-software-x11/Makefile Wed Mar 7 11:57:30 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2016/03/05 11:28:37 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2018/03/07 11:57:30 wiz Exp $
PKGNAME= evas-software-x11-${EVAS_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
COMMENT= Evas software X11 engine
EVAS_ENGINES= software-xlib
@@ -15,15 +15,14 @@ MAKE_FLAGS+= module_la_LIBADD="\$${EINA_
INSTALLATION_DIRS+= lib/pkgconfig
PKGCONFIG_OVERRIDE= evas-software-x11.pc.in
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/evas-software-x11.pc \
+ ${DESTDIR}${PREFIX}/lib/pkgconfig
+
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/evas/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/evas-software-x11.pc \
- ${DESTDIR}${PREFIX}/lib/pkgconfig
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/imlib/buildlink3.mk
diff -u pkgsrc/graphics/imlib/buildlink3.mk:1.30 pkgsrc/graphics/imlib/buildlink3.mk:1.31
--- pkgsrc/graphics/imlib/buildlink3.mk:1.30 Mon Sep 8 20:40:30 2014
+++ pkgsrc/graphics/imlib/buildlink3.mk Wed Mar 7 11:57:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2014/09/08 20:40:30 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2018/03/07 11:57:30 wiz Exp $
BUILDLINK_TREE+= imlib
@@ -14,7 +14,7 @@ BUILDLINK_PKGSRCDIR.imlib?= ../../graphi
.include "../../graphics/giflib/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.endif # IMLIB_BUILDLINK3_MK
BUILDLINK_TREE+= -imlib
Index: pkgsrc/graphics/libggi/Makefile
diff -u pkgsrc/graphics/libggi/Makefile:1.58 pkgsrc/graphics/libggi/Makefile:1.59
--- pkgsrc/graphics/libggi/Makefile:1.58 Sun Jan 14 14:58:39 2018
+++ pkgsrc/graphics/libggi/Makefile Wed Mar 7 11:57:31 2018
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2018/01/14 14:58:39 rillig Exp $
-#
+# $NetBSD: Makefile,v 1.59 2018/03/07 11:57:31 wiz Exp $
DISTNAME= libggi-2.2.2.src
PKGNAME= ${DISTNAME:S/.src//}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= graphics
MASTER_SITES= http://www.ggi-project.org/ftp/ggi/v2.2/
MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=ggi/}
@@ -51,7 +50,7 @@ PLIST.libvgl= yes
exists(${X11BASE}/include/X11/extensions/xf86dga.h)
.include "../../x11/libXxf86dga/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
PLIST.xf86dga= yes
.endif
Index: pkgsrc/inputmethod/librime/Makefile
diff -u pkgsrc/inputmethod/librime/Makefile:1.13 pkgsrc/inputmethod/librime/Makefile:1.14
--- pkgsrc/inputmethod/librime/Makefile:1.13 Wed Mar 7 09:34:55 2018
+++ pkgsrc/inputmethod/librime/Makefile Wed Mar 7 11:57:31 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2018/03/07 09:34:55 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:31 wiz Exp $
DISTNAME= librime-1.0
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= inputmethod chinese
MASTER_SITES= http://rimeime.googlecode.com/files/
#MASTER_SITES= http://dl.bintray.com/lotem/rime/
@@ -26,5 +26,5 @@ PKGCONFIG_OVERRIDE+= rime.pc.in
.include "../../devel/google-glog/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../textproc/yaml-cpp/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/meta-pkgs/modular-xorg-protos/Makefile
diff -u pkgsrc/meta-pkgs/modular-xorg-protos/Makefile:1.8 pkgsrc/meta-pkgs/modular-xorg-protos/Makefile:1.9
--- pkgsrc/meta-pkgs/modular-xorg-protos/Makefile:1.8 Wed Dec 11 16:29:47 2013
+++ pkgsrc/meta-pkgs/modular-xorg-protos/Makefile Wed Mar 7 11:57:31 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2013/12/11 16:29:47 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:31 wiz Exp $
DISTNAME= # empty
-PKGNAME= modular-xorg-protos-1.6
+PKGNAME= modular-xorg-protos-1.7
CATEGORIES= meta-pkgs x11
MASTER_SITES= # empty
DISTFILES= # empty
@@ -13,35 +13,6 @@ LICENSE= 2-clause-bsd
META_PACKAGE= yes
-.include "../../mk/bsd.fast.prefs.mk"
-
-.if ${OPSYS} == "Darwin"
-DEPENDS+= applewmproto-[0-9]*:../../wm/applewmproto
-.endif
-DEPENDS+= bigreqsproto-[0-9]*:../../x11/bigreqsproto
-DEPENDS+= compositeproto-[0-9]*:../../x11/compositeproto
-DEPENDS+= damageproto-[0-9]*:../../x11/damageproto
-DEPENDS+= dri2proto-[0-9]*:../../x11/dri2proto
-DEPENDS+= dri3proto-[0-9]*:../../x11/dri3proto
-DEPENDS+= fixesproto-[0-9]*:../../x11/fixesproto
-DEPENDS+= fontsproto-[0-9]*:../../x11/fontsproto
-DEPENDS+= glproto-[0-9]*:../../x11/glproto
-DEPENDS+= inputproto-[0-9]*:../../x11/inputproto
-DEPENDS+= kbproto-[0-9]*:../../x11/kbproto
-DEPENDS+= presentproto-[0-9]*:../../x11/presentproto
-DEPENDS+= randrproto-[0-9]*:../../x11/randrproto
-DEPENDS+= recordproto-[0-9]*:../../x11/recordproto
-DEPENDS+= renderproto-[0-9]*:../../x11/renderproto
-DEPENDS+= resourceproto-[0-9]*:../../x11/resourceproto
-DEPENDS+= scrnsaverproto-[0-9]*:../../x11/scrnsaverproto
-DEPENDS+= videoproto-[0-9]*:../../x11/videoproto
-DEPENDS+= windowswmproto-[0-9]*:../../wm/windowswmproto
-DEPENDS+= xcb-proto-[0-9]*:../../x11/xcb-proto
-DEPENDS+= xcmiscproto-[0-9]*:../../x11/xcmiscproto
-DEPENDS+= xextproto-[0-9]*:../../x11/xextproto
-DEPENDS+= xf86driproto-[0-9]*:../../x11/xf86driproto
-DEPENDS+= xf86vidmodeproto-[0-9]*:../../x11/xf86vidmodeproto
-DEPENDS+= xineramaproto-[0-9]*:../../x11/xineramaproto
-DEPENDS+= xproto-[0-9]*:../../x11/xproto
+DEPENDS+= xorgproto-[0-9]*:../../x11/xorgproto
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/mk/defaults/mk.conf
diff -u pkgsrc/mk/defaults/mk.conf:1.292 pkgsrc/mk/defaults/mk.conf:1.293
--- pkgsrc/mk/defaults/mk.conf:1.292 Tue Feb 27 23:43:21 2018
+++ pkgsrc/mk/defaults/mk.conf Wed Mar 7 11:57:31 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.292 2018/02/27 23:43:21 khorben Exp $
+# $NetBSD: mk.conf,v 1.293 2018/03/07 11:57:31 wiz Exp $
#
# This file provides default values for variables that may be overridden
@@ -287,7 +287,7 @@ PREFER_PKGSRC?=
.elif (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \
exists(/usr/lib/libexpat.so))
PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrender fontconfig \
- freetype2 glu randrproto renderproto xcursor
+ freetype2 glu xcursor
.elif !empty(MACHINE_PLATFORM:MLinux-*-*) && \
(!defined(X11_TYPE) || ${X11_TYPE} == "native")
PREFER_PKGSRC?=
@@ -302,7 +302,7 @@ PREFER_PKGSRC?= fontconfig pixman Xft2
PREFER_PKGSRC?=
.else
PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrender expat fontconfig \
- freetype2 glu randrproto renderproto xcursor
+ freetype2 glu xcursor
.endif
PREFER_NATIVE?= yes
#
Index: pkgsrc/multimedia/fxtv/Makefile
diff -u pkgsrc/multimedia/fxtv/Makefile:1.35 pkgsrc/multimedia/fxtv/Makefile:1.36
--- pkgsrc/multimedia/fxtv/Makefile:1.35 Tue Mar 6 15:36:11 2018
+++ pkgsrc/multimedia/fxtv/Makefile Wed Mar 7 11:57:31 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2018/03/06 15:36:11 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2018/03/07 11:57:31 wiz Exp $
DISTNAME= fxtv-1.03
-PKGREVISION= 22
+PKGREVISION= 23
CATEGORIES= multimedia
MASTER_SITES= ${HOMEPAGE:Q}
EXTRACT_SUFX= .tgz
@@ -42,7 +42,7 @@ pre-configure:
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/libXxf86dga/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/multimedia/gnash/options.mk
diff -u pkgsrc/multimedia/gnash/options.mk:1.22 pkgsrc/multimedia/gnash/options.mk:1.23
--- pkgsrc/multimedia/gnash/options.mk:1.22 Wed Sep 27 13:37:28 2017
+++ pkgsrc/multimedia/gnash/options.mk Wed Mar 7 11:57:31 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.22 2017/09/27 13:37:28 wiz Exp $
+# $NetBSD: options.mk,v 1.23 2018/03/07 11:57:31 wiz Exp $
#
#
@@ -72,7 +72,7 @@ GNASH_RENDER+= cairo
.if !empty(PKG_OPTIONS:Mopengl)
GNASH_RENDER+= ogl
-.include "../../x11/glproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
. if !empty(PKG_OPTIONS:Mgtk)
.include "../../graphics/gtkglext/buildlink3.mk"
. endif
Index: pkgsrc/multimedia/libvdpau/Makefile
diff -u pkgsrc/multimedia/libvdpau/Makefile:1.11 pkgsrc/multimedia/libvdpau/Makefile:1.12
--- pkgsrc/multimedia/libvdpau/Makefile:1.11 Fri Feb 24 00:59:13 2017
+++ pkgsrc/multimedia/libvdpau/Makefile Wed Mar 7 11:57:31 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2017/02/24 00:59:13 maya Exp $
+# $NetBSD: Makefile,v 1.12 2018/03/07 11:57:31 wiz Exp $
DISTNAME= libvdpau-1.1.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= multimedia
MASTER_SITES= http://people.freedesktop.org/~aplattner/vdpau/
EXTRACT_SUFX= .tar.bz2
@@ -32,5 +32,5 @@ PKG_SKIP_REASON+= "VDPAU is not availabl
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/dri2proto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/multimedia/xawtv/Makefile
diff -u pkgsrc/multimedia/xawtv/Makefile:1.46 pkgsrc/multimedia/xawtv/Makefile:1.47
--- pkgsrc/multimedia/xawtv/Makefile:1.46 Sat Jul 9 06:38:40 2016
+++ pkgsrc/multimedia/xawtv/Makefile Wed Mar 7 11:57:31 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2016/07/09 06:38:40 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2018/03/07 11:57:31 wiz Exp $
DISTNAME= xawtv-3.95
-PKGREVISION= 19
+PKGREVISION= 20
CATEGORIES= multimedia
MASTER_SITES= http://dl.bytesex.org/releases/xawtv/
@@ -75,7 +75,7 @@ PLIST.bsd= yes
.include "../../x11/libXv/buildlink3.mk"
.include "../../x11/libXxf86dga/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xf86vidmodeproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/multimedia/xine-ui/Makefile
diff -u pkgsrc/multimedia/xine-ui/Makefile:1.83 pkgsrc/multimedia/xine-ui/Makefile:1.84
--- pkgsrc/multimedia/xine-ui/Makefile:1.83 Mon Feb 26 08:19:31 2018
+++ pkgsrc/multimedia/xine-ui/Makefile Wed Mar 7 11:57:31 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.83 2018/02/26 08:19:31 adam Exp $
+# $NetBSD: Makefile,v 1.84 2018/03/07 11:57:31 wiz Exp $
DISTNAME= xine-ui-0.99.8
-PKGREVISION= 16
+PKGREVISION= 17
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xine/}
EXTRACT_SUFX= .tar.xz
@@ -41,7 +41,7 @@ PTHREAD_AUTO_VARS= yes
.include "../../x11/libXtst/buildlink3.mk"
.include "../../x11/libXv/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xf86vidmodeproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/tigervnc/Makefile
diff -u pkgsrc/net/tigervnc/Makefile:1.19 pkgsrc/net/tigervnc/Makefile:1.20
--- pkgsrc/net/tigervnc/Makefile:1.19 Mon Dec 4 19:46:34 2017
+++ pkgsrc/net/tigervnc/Makefile Wed Mar 7 11:57:31 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2017/12/04 19:46:34 bouyer Exp $
+# $NetBSD: Makefile,v 1.20 2018/03/07 11:57:31 wiz Exp $
DISTNAME= tigervnc-1.8.0
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GITHUB:=TigerVNC/}
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -88,19 +89,8 @@ pre-configure:
BUILDLINK_API_DEPENDS.fltk+= fltk>=1.3.3
.include "../../x11/fltk13/buildlink3.mk"
.include "../../x11/pixman/buildlink3.mk"
-.include "../../x11/xcmiscproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/xtrans/buildlink3.mk"
-.include "../../x11/bigreqsproto/buildlink3.mk"
-.include "../../x11/compositeproto/buildlink3.mk"
-.include "../../x11/damageproto/buildlink3.mk"
-.include "../../x11/dri2proto/buildlink3.mk"
.include "../../x11/libXfont/buildlink3.mk"
.include "../../x11/libxkbfile/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/glproto/buildlink3.mk"
-.include "../../x11/presentproto/buildlink3.mk"
-.include "../../x11/resourceproto/buildlink3.mk"
-.include "../../x11/scrnsaverproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/vncviewer/Makefile
diff -u pkgsrc/net/vncviewer/Makefile:1.31 pkgsrc/net/vncviewer/Makefile:1.32
--- pkgsrc/net/vncviewer/Makefile:1.31 Tue Jan 2 05:37:22 2018
+++ pkgsrc/net/vncviewer/Makefile Wed Mar 7 11:57:31 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2018/01/02 05:37:22 maya Exp $
+# $NetBSD: Makefile,v 1.32 2018/03/07 11:57:31 wiz Exp $
DISTNAME= vnc-4_1_2-unixsrc
PKGNAME= vncviewer-4.1.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= net x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
@@ -31,7 +31,7 @@ do-install:
BUILDLINK_DEPMETHOD.libXt?= build
.include "../../devel/zlib/buildlink3.mk"
-.include "../../x11/inputproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
Index: pkgsrc/net/x2vnc/Makefile
diff -u pkgsrc/net/x2vnc/Makefile:1.23 pkgsrc/net/x2vnc/Makefile:1.24
--- pkgsrc/net/x2vnc/Makefile:1.23 Thu Apr 23 09:17:48 2015
+++ pkgsrc/net/x2vnc/Makefile Wed Mar 7 11:57:32 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2015/04/23 09:17:48 abs Exp $
+# $NetBSD: Makefile,v 1.24 2018/03/07 11:57:32 wiz Exp $
DISTNAME= x2vnc-1.7.2
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= net x11
MASTER_SITES= http://fredrik.hubbe.net/x2vnc/
@@ -20,7 +20,6 @@ LDFLAGS.SunOS+= -lresolv -lsocket -lnsl
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/scrnsaverproto/buildlink3.mk"
-.include "../../x11/xineramaproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/x2vnc/options.mk
diff -u pkgsrc/net/x2vnc/options.mk:1.2 pkgsrc/net/x2vnc/options.mk:1.3
--- pkgsrc/net/x2vnc/options.mk:1.2 Thu Apr 23 09:17:48 2015
+++ pkgsrc/net/x2vnc/options.mk Wed Mar 7 11:57:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2015/04/23 09:17:48 abs Exp $
+# $NetBSD: options.mk,v 1.3 2018/03/07 11:57:32 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.x2vnc
@@ -10,5 +10,5 @@ PKG_SUGGESTED_OPTIONS=
.if !empty(PKG_OPTIONS:Mdga)
. include "../../x11/libXxf86dga/buildlink3.mk"
-. include "../../x11/xf86dgaproto/buildlink3.mk"
+. include "../../x11/xorgproto/buildlink3.mk"
.endif
Index: pkgsrc/net/xfindproxy/Makefile
diff -u pkgsrc/net/xfindproxy/Makefile:1.4 pkgsrc/net/xfindproxy/Makefile:1.5
--- pkgsrc/net/xfindproxy/Makefile:1.4 Sat Sep 16 19:27:06 2017
+++ pkgsrc/net/xfindproxy/Makefile Wed Mar 7 11:57:32 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2017/09/16 19:27:06 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:32 wiz Exp $
DISTNAME= xfindproxy-1.0.4
+PKGREVISION= 1
CATEGORIES= net x11
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -13,7 +14,7 @@ LICENSE= x11
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
-.include "../../x11/xproxymanagementprotocol/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libICE/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
Index: pkgsrc/pkgtools/x11-links/xfree.mk
diff -u pkgsrc/pkgtools/x11-links/xfree.mk:1.18 pkgsrc/pkgtools/x11-links/xfree.mk:1.19
--- pkgsrc/pkgtools/x11-links/xfree.mk:1.18 Sat Jan 27 19:07:48 2018
+++ pkgsrc/pkgtools/x11-links/xfree.mk Wed Mar 7 11:57:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: xfree.mk,v 1.18 2018/01/27 19:07:48 rillig Exp $
+# $NetBSD: xfree.mk,v 1.19 2018/03/07 11:57:32 wiz Exp $
FILES_LIST= ${FILESDIR}/xfree
@@ -12,8 +12,7 @@ FILES_LIST= ${FILESDIR}/xfree
.include "../../x11/libXcursor/buildlink3.mk"
.include "../../x11/libXrandr/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
# Check if any headers and libraries for ${X11_MODULES} found in
# ${X11BASE} actually belong to the base XFree86 or not.
Index: pkgsrc/pkgtools/x11-links/xorg.mk
diff -u pkgsrc/pkgtools/x11-links/xorg.mk:1.30 pkgsrc/pkgtools/x11-links/xorg.mk:1.31
--- pkgsrc/pkgtools/x11-links/xorg.mk:1.30 Fri Mar 2 15:14:12 2018
+++ pkgsrc/pkgtools/x11-links/xorg.mk Wed Mar 7 11:57:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.mk,v 1.30 2018/03/02 15:14:12 wiz Exp $
+# $NetBSD: xorg.mk,v 1.31 2018/03/07 11:57:32 wiz Exp $
#
# This is for X.org, but use "xfree" files also.
@@ -14,15 +14,7 @@ FILES_LIST= ${FILESDIR}/xorg
.include "../../graphics/glut/buildlink3.mk"
.include "../../sysutils/libpciaccess/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
-.include "../../x11/bigreqsproto/buildlink3.mk"
-.include "../../x11/compositeproto/buildlink3.mk"
-.include "../../x11/damageproto/buildlink3.mk"
-.include "../../x11/dri2proto/buildlink3.mk"
.include "../../x11/evieext/buildlink3.mk"
-.include "../../x11/fixesproto/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/glproto/buildlink3.mk"
-.include "../../x11/inputproto/buildlink3.mk"
.include "../../x11/libFS/buildlink3.mk"
.include "../../x11/libICE/buildlink3.mk"
.include "../../x11/libSM/buildlink3.mk"
@@ -53,27 +45,11 @@ FILES_LIST= ${FILESDIR}/xorg
.include "../../x11/libdrm/buildlink3.mk"
.include "../../x11/libxcb/buildlink3.mk"
.include "../../x11/pixman/buildlink3.mk"
-.include "../../x11/presentproto/buildlink3.mk"
-.include "../../x11/printproto/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/recordproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/resourceproto/buildlink3.mk"
-.include "../../x11/scrnsaverproto/buildlink3.mk"
-.include "../../x11/trapproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
.include "../../x11/xbitmaps/buildlink3.mk"
-.include "../../x11/xcmiscproto/buildlink3.mk"
.include "../../x11/xcb-proto/buildlink3.mk"
.include "../../x11/xcb-util/buildlink3.mk"
-.include "../../x11/xf86bigfontproto/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
-.include "../../x11/xf86driproto/buildlink3.mk"
-.include "../../x11/xf86miscproto/buildlink3.mk"
-.include "../../x11/xf86vidmodeproto/buildlink3.mk"
.include "../../x11/xkeyboard-config/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-.include "../../x11/xproxymanagementprotocol/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/xtrans/buildlink3.mk"
# XXX what is ${X11_MODULES} ?
Index: pkgsrc/print/xpdfopen/Makefile
diff -u pkgsrc/print/xpdfopen/Makefile:1.8 pkgsrc/print/xpdfopen/Makefile:1.9
--- pkgsrc/print/xpdfopen/Makefile:1.8 Wed Sep 6 16:49:47 2017
+++ pkgsrc/print/xpdfopen/Makefile Wed Mar 7 11:57:32 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2017/09/06 16:49:47 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:32 wiz Exp $
DISTNAME= texlive-20170524-source
PKGNAME= xpdfopen-0.86
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= print
MASTER_SITES= ftp://tug.org/historic/systems/texlive/2017/
EXTRACT_SUFX= .tar.xz
@@ -20,5 +20,5 @@ GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/utils/xpdfopen
.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/wm/Makefile
diff -u pkgsrc/wm/Makefile:1.133 pkgsrc/wm/Makefile:1.134
--- pkgsrc/wm/Makefile:1.133 Sun Nov 13 22:04:51 2016
+++ pkgsrc/wm/Makefile Wed Mar 7 11:57:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.133 2016/11/13 22:04:51 kamil Exp $
+# $NetBSD: Makefile,v 1.134 2018/03/07 11:57:32 wiz Exp $
#
COMMENT= X11 window managers, configuration tools, and themes
@@ -10,7 +10,6 @@ SUBDIR+= aewm++
SUBDIR+= afterstep
SUBDIR+= amaterus
SUBDIR+= amiwm
-SUBDIR+= applewmproto
SUBDIR+= awesome
SUBDIR+= bbkeys
SUBDIR+= bbkeys09
@@ -89,7 +88,6 @@ SUBDIR+= wbar
SUBDIR+= weewm
SUBDIR+= windowlab
SUBDIR+= windowmaker
-SUBDIR+= windowswmproto
SUBDIR+= wm2
SUBDIR+= wmakerconf
SUBDIR+= wmctrl
Index: pkgsrc/wm/awesome/Makefile
diff -u pkgsrc/wm/awesome/Makefile:1.60 pkgsrc/wm/awesome/Makefile:1.61
--- pkgsrc/wm/awesome/Makefile:1.60 Fri Aug 18 10:16:11 2017
+++ pkgsrc/wm/awesome/Makefile Wed Mar 7 11:57:32 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.60 2017/08/18 10:16:11 triaxx Exp $
-#
+# $NetBSD: Makefile,v 1.61 2018/03/07 11:57:32 wiz Exp $
DISTNAME= awesome-4.2
+PKGREVISION= 1
CATEGORIES= wm
MASTER_SITES= ${MASTER_SITE_GITHUB:=awesomeWM/}
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -77,7 +77,7 @@ pre-configure:
.include "../../x11/xcb-util-keysyms/buildlink3.mk"
.include "../../x11/xcb-util-wm/buildlink3.mk"
.include "../../x11/xcb-util-xrm/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/wm/bbrun/Makefile
diff -u pkgsrc/wm/bbrun/Makefile:1.23 pkgsrc/wm/bbrun/Makefile:1.24
--- pkgsrc/wm/bbrun/Makefile:1.23 Tue Mar 6 15:53:07 2018
+++ pkgsrc/wm/bbrun/Makefile Wed Mar 7 11:57:32 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2018/03/06 15:53:07 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2018/03/07 11:57:32 wiz Exp $
DISTNAME= bbrun-1.3
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= wm x11
MASTER_SITES= http://www.dwave.net/~jking/bbrun/
@@ -21,5 +21,5 @@ do-install:
.include "../../x11/gtk/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/wm/jwm/Makefile
diff -u pkgsrc/wm/jwm/Makefile:1.33 pkgsrc/wm/jwm/Makefile:1.34
--- pkgsrc/wm/jwm/Makefile:1.33 Sat Oct 21 18:07:33 2017
+++ pkgsrc/wm/jwm/Makefile Wed Mar 7 11:57:32 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2017/10/21 18:07:33 tsutsui Exp $
-#
+# $NetBSD: Makefile,v 1.34 2018/03/07 11:57:32 wiz Exp $
DISTNAME= jwm-2.3.7
+PKGREVISION= 1
CATEGORIES= wm x11
MASTER_SITES= http://www.joewing.net/programs/jwm/releases/
EXTRACT_SUFX= .tar.xz
@@ -50,5 +50,5 @@ BUILDLINK_DEPMETHOD.libXt?= build
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/wm/libAppleWM/Makefile
diff -u pkgsrc/wm/libAppleWM/Makefile:1.6 pkgsrc/wm/libAppleWM/Makefile:1.7
--- pkgsrc/wm/libAppleWM/Makefile:1.6 Mon Feb 22 20:02:36 2016
+++ pkgsrc/wm/libAppleWM/Makefile Wed Mar 7 11:57:32 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2016/02/22 20:02:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.7 2018/03/07 11:57:32 wiz Exp $
DISTNAME= libAppleWM-1.4.1
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -25,7 +26,7 @@ MY_XCODE_SDK_PATH!= /usr/bin/xcrun --sdk
.endif
MAKE_ENV+= OSX_SDK_PATH=${MY_XCODE_SDK_PATH}
-.include "../../wm/applewmproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/wm/libAppleWM/buildlink3.mk
diff -u pkgsrc/wm/libAppleWM/buildlink3.mk:1.2 pkgsrc/wm/libAppleWM/buildlink3.mk:1.3
--- pkgsrc/wm/libAppleWM/buildlink3.mk:1.2 Sun Nov 16 20:14:59 2014
+++ pkgsrc/wm/libAppleWM/buildlink3.mk Wed Mar 7 11:57:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2014/11/16 20:14:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/03/07 11:57:32 wiz Exp $
BUILDLINK_TREE+= libAppleWM
@@ -8,7 +8,7 @@ LIBAPPLEWM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libAppleWM+= libAppleWM>=1.4.0
BUILDLINK_PKGSRCDIR.libAppleWM?= ../../wm/libAppleWM
-.include "../../wm/applewmproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.endif # LIBAPPLEWM_BUILDLINK3_MK
Index: pkgsrc/wm/libWindowsWM/Makefile
diff -u pkgsrc/wm/libWindowsWM/Makefile:1.5 pkgsrc/wm/libWindowsWM/Makefile:1.6
--- pkgsrc/wm/libWindowsWM/Makefile:1.5 Sat Sep 16 19:27:22 2017
+++ pkgsrc/wm/libWindowsWM/Makefile Wed Mar 7 11:57:32 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2017/09/16 19:27:22 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2018/03/07 11:57:32 wiz Exp $
DISTNAME= libWindowsWM-1.0.1
+PKGREVISION= 1
CATEGORIES= wm x11
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -25,8 +26,7 @@ PKGCONFIG_OVERRIDE+= windowswm.pc.in
CONFIGURE_ARGS+= --enable-malloc0returnsnull
.endif
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
-.include "../../wm/windowswmproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/wm/musca/Makefile
diff -u pkgsrc/wm/musca/Makefile:1.4 pkgsrc/wm/musca/Makefile:1.5
--- pkgsrc/wm/musca/Makefile:1.4 Sun Sep 3 08:37:01 2017
+++ pkgsrc/wm/musca/Makefile Wed Mar 7 11:57:32 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2017/09/03 08:37:01 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:32 wiz Exp $
DISTNAME= musca-0.9.24
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= wm
MASTER_SITES= http://aerosuidae.net/
EXTRACT_SUFX= .tgz
@@ -30,5 +29,5 @@ do-install:
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/wm/quartz-wm/Makefile
diff -u pkgsrc/wm/quartz-wm/Makefile:1.1 pkgsrc/wm/quartz-wm/Makefile:1.2
--- pkgsrc/wm/quartz-wm/Makefile:1.1 Thu Oct 1 11:06:08 2015
+++ pkgsrc/wm/quartz-wm/Makefile Wed Mar 7 11:57:33 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2015/10/01 11:06:08 tnn Exp $
+# $NetBSD: Makefile,v 1.2 2018/03/07 11:57:33 wiz Exp $
DISTNAME= quartz-wm-1.3.1
+PKGREVISION= 1
CATEGORIES= wm
MASTER_SITES= http://xquartz.macosforge.org/downloads/src/
EXTRACT_SUFX= .tar.xz
@@ -22,5 +23,5 @@ ONLY_FOR_PLATFORM= Darwin-*-*
.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/libXrandr/buildlink3.mk"
.include "../../x11/pixman/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/wm/spectrwm/Makefile
diff -u pkgsrc/wm/spectrwm/Makefile:1.10 pkgsrc/wm/spectrwm/Makefile:1.11
--- pkgsrc/wm/spectrwm/Makefile:1.10 Mon Sep 4 18:01:03 2017
+++ pkgsrc/wm/spectrwm/Makefile Wed Mar 7 11:57:33 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2017/09/04 18:01:03 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:33 wiz Exp $
DISTNAME= spectrwm-2.5.1
+PKGREVISION= 1
CATEGORIES= wm
MASTER_SITES= https://opensource.conformal.com/snapshots/spectrwm/
EXTRACT_SUFX= .tgz
@@ -47,7 +48,7 @@ post-install:
BUILDLINK_DEPMETHOD.libXt= build
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/xcb-util/buildlink3.mk"
.include "../../x11/xcb-util-keysyms/buildlink3.mk"
.include "../../x11/xcb-util-wm/buildlink3.mk"
Index: pkgsrc/x11/Makefile
diff -u pkgsrc/x11/Makefile:1.817 pkgsrc/x11/Makefile:1.818
--- pkgsrc/x11/Makefile:1.817 Fri Mar 2 15:15:50 2018
+++ pkgsrc/x11/Makefile Wed Mar 7 11:57:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.817 2018/03/02 15:15:50 wiz Exp $
+# $NetBSD: Makefile,v 1.818 2018/03/07 11:57:33 wiz Exp $
#
COMMENT= Packages to support the X window system
@@ -21,7 +21,6 @@ SUBDIR+= autocutsel
SUBDIR+= avant-window-navigator
SUBDIR+= bbapm
SUBDIR+= beforelight
-SUBDIR+= bigreqsproto
SUBDIR+= bitmap
SUBDIR+= blt
SUBDIR+= c++-gtk-utils
@@ -29,9 +28,7 @@ SUBDIR+= clipit
SUBDIR+= clisp-gtk2
SUBDIR+= clisp-mit-clx
SUBDIR+= clisp-new-clx
-SUBDIR+= compositeproto
SUBDIR+= compton
-SUBDIR+= damageproto
SUBDIR+= deforaos-integration
SUBDIR+= deforaos-keyboard
SUBDIR+= deforaos-libdesktop
@@ -43,8 +40,6 @@ SUBDIR+= deskmenu
SUBDIR+= devilspie
SUBDIR+= dmenu
SUBDIR+= docker
-SUBDIR+= dri2proto
-SUBDIR+= dri3proto
SUBDIR+= driconf
SUBDIR+= dtx11session
SUBDIR+= dunst
@@ -61,12 +56,10 @@ SUBDIR+= evieext
SUBDIR+= fast-user-switch-applet
SUBDIR+= fbdesk
SUBDIR+= filerunner
-SUBDIR+= fixesproto
SUBDIR+= fixesproto4
SUBDIR+= fltk
SUBDIR+= fltk13
SUBDIR+= fltk2
-SUBDIR+= fontsproto
SUBDIR+= fox
SUBDIR+= frameworkintegration
SUBDIR+= fspanel
@@ -75,7 +68,6 @@ SUBDIR+= fvwm-wharf
SUBDIR+= gcolor2
SUBDIR+= gdm
SUBDIR+= ggiterm
-SUBDIR+= glproto
SUBDIR+= gnome-applets
SUBDIR+= gnome-control-center
SUBDIR+= gnome-desktop
@@ -136,11 +128,9 @@ SUBDIR+= i3lock
SUBDIR+= iceauth
SUBDIR+= ico
SUBDIR+= imwheel
-SUBDIR+= inputproto
SUBDIR+= kactivities
SUBDIR+= kactivities-stats
SUBDIR+= kactivities5
-SUBDIR+= kbproto
SUBDIR+= kconfigwidgets
SUBDIR+= kde-baseapps4
SUBDIR+= kde-runtime4
@@ -331,7 +321,6 @@ SUBDIR+= p5-gtk2
SUBDIR+= paragui
SUBDIR+= pixman
SUBDIR+= plasma-framework
-SUBDIR+= presentproto
SUBDIR+= printproto
SUBDIR+= proxymngr
SUBDIR+= py-Pmw
@@ -398,15 +387,11 @@ SUBDIR+= qt5-qtxmlpatterns
SUBDIR+= qwt-qt4
SUBDIR+= qwt6-qt4
SUBDIR+= qwtplot3d-qt4
-SUBDIR+= randrproto
SUBDIR+= ratmen
-SUBDIR+= recordproto
SUBDIR+= redshift
SUBDIR+= rendercheck
-SUBDIR+= renderproto
SUBDIR+= renderproto9
SUBDIR+= rep-gtk2
-SUBDIR+= resourceproto
SUBDIR+= rgb
SUBDIR+= rofi
SUBDIR+= rox-session
@@ -423,7 +408,6 @@ SUBDIR+= ruby-wxruby
SUBDIR+= rxvt
SUBDIR+= rxvt-unicode
SUBDIR+= sakura
-SUBDIR+= scrnsaverproto
SUBDIR+= sessreg
SUBDIR+= setxkbmap
SUBDIR+= slock
@@ -445,11 +429,9 @@ SUBDIR+= tk85
SUBDIR+= tkinfo
SUBDIR+= tktable
SUBDIR+= transset
-SUBDIR+= trapproto
SUBDIR+= tzosdclock
SUBDIR+= unclutter
SUBDIR+= unicode-screensaver
-SUBDIR+= videoproto
SUBDIR+= viewres
SUBDIR+= vte
SUBDIR+= vte029
@@ -492,7 +474,6 @@ SUBDIR+= xcb-util-xrm
SUBDIR+= xcb-util036
SUBDIR+= xclip
SUBDIR+= xclipboard
-SUBDIR+= xcmiscproto
SUBDIR+= xcmsdb
SUBDIR+= xcolors
SUBDIR+= xcolorsel
@@ -517,7 +498,6 @@ SUBDIR+= xearth
SUBDIR+= xedit
SUBDIR+= xephem
SUBDIR+= xev
-SUBDIR+= xextproto
SUBDIR+= xeyes
SUBDIR+= xf86-input-acecad
SUBDIR+= xf86-input-elographics
@@ -577,12 +557,7 @@ SUBDIR+= xf86-video-vmware
SUBDIR+= xf86-video-voodoo
SUBDIR+= xf86-video-wsfb
SUBDIR+= xf86-video-xgi
-SUBDIR+= xf86bigfontproto
SUBDIR+= xf86dga
-SUBDIR+= xf86dgaproto
-SUBDIR+= xf86driproto
-SUBDIR+= xf86miscproto
-SUBDIR+= xf86vidmodeproto
SUBDIR+= xfce4-clipman-plugin
SUBDIR+= xfce4-dashboard
SUBDIR+= xfce4-desktop
@@ -617,7 +592,6 @@ SUBDIR+= xgrk
SUBDIR+= xhangglider
SUBDIR+= xhost
SUBDIR+= xicc
-SUBDIR+= xineramaproto
SUBDIR+= xinit
SUBDIR+= xinput
SUBDIR+= xjman
@@ -674,8 +648,6 @@ SUBDIR+= xpostit
SUBDIR+= xpr
SUBDIR+= xprehashprinterlist
SUBDIR+= xprop
-SUBDIR+= xproto
-SUBDIR+= xproxymanagementprotocol
SUBDIR+= xrandr
SUBDIR+= xrdb
SUBDIR+= xrefresh
Index: pkgsrc/x11/Xrender/Makefile
diff -u pkgsrc/x11/Xrender/Makefile:1.38 pkgsrc/x11/Xrender/Makefile:1.39
--- pkgsrc/x11/Xrender/Makefile:1.38 Wed Sep 6 09:03:05 2017
+++ pkgsrc/x11/Xrender/Makefile Wed Mar 7 11:57:33 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2017/09/06 09:03:05 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2018/03/07 11:57:33 wiz Exp $
DISTNAME= libXrender-0.9.0
PKGNAME= ${DISTNAME:S/lib//}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= x11
MASTER_SITES= https://xlibs.freedesktop.org/release/
EXTRACT_SUFX= .tar.bz2
@@ -25,6 +25,6 @@ CONFIGURE_ENV+= X_LIBS=${X11_LDFLAGS:Q}
PKG_FAIL_REASON+="This package is for native X11 only; use libXrender instead."
.endif
-.include "../../x11/renderproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/Xrender/buildlink3.mk
diff -u pkgsrc/x11/Xrender/buildlink3.mk:1.45 pkgsrc/x11/Xrender/buildlink3.mk:1.46
--- pkgsrc/x11/Xrender/buildlink3.mk:1.45 Fri Mar 20 19:25:39 2009
+++ pkgsrc/x11/Xrender/buildlink3.mk Wed Mar 7 11:57:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.45 2009/03/20 19:25:39 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.46 2018/03/07 11:57:33 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -12,7 +12,7 @@ BUILDLINK_ABI_DEPENDS.Xrender+= Xrender>
BUILDLINK_PKGSRCDIR.Xrender?= ../../x11/Xrender
.include "../../mk/x11.buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.endif # XRENDER_BUILDLINK3_MK
BUILDLINK_TREE+= -Xrender
Index: pkgsrc/x11/dxpc/Makefile
diff -u pkgsrc/x11/dxpc/Makefile:1.32 pkgsrc/x11/dxpc/Makefile:1.33
--- pkgsrc/x11/dxpc/Makefile:1.32 Thu Dec 27 20:19:35 2012
+++ pkgsrc/x11/dxpc/Makefile Wed Mar 7 11:57:34 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2012/12/27 20:19:35 ryoon Exp $
+# $NetBSD: Makefile,v 1.33 2018/03/07 11:57:34 wiz Exp $
DISTNAME= dxpc-3.9.2
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.vigor.nu/dxpc/
EXTRACT_SUFX= .tgz
@@ -20,5 +21,5 @@ INSTALL_MAKE_FLAGS+= man1dir=${DESTDIR}$
LIBS.SunOS+= -lsocket -lnsl
.include "../../archivers/lzo/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/fixesproto4/Makefile
diff -u pkgsrc/x11/fixesproto4/Makefile:1.2 pkgsrc/x11/fixesproto4/Makefile:1.3
--- pkgsrc/x11/fixesproto4/Makefile:1.2 Mon Oct 29 05:06:12 2012
+++ pkgsrc/x11/fixesproto4/Makefile Wed Mar 7 11:57:34 2018
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2012/10/29 05:06:12 asau Exp $
+# $NetBSD: Makefile,v 1.3 2018/03/07 11:57:34 wiz Exp $
#
# This package is for use with Xfixes only. Do not update to later versions.
DISTNAME= fixesproto-4.0
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
@@ -24,7 +25,5 @@ PKG_FAIL_REASON+="This package is for na
.endif
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/fixesproto4/buildlink3.mk
diff -u pkgsrc/x11/fixesproto4/buildlink3.mk:1.3 pkgsrc/x11/fixesproto4/buildlink3.mk:1.4
--- pkgsrc/x11/fixesproto4/buildlink3.mk:1.3 Mon Mar 26 13:07:34 2012
+++ pkgsrc/x11/fixesproto4/buildlink3.mk Wed Mar 7 11:57:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2012/03/26 13:07:34 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/03/07 11:57:34 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -12,8 +12,7 @@ FIXESPROTO_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=3.0.0<5
BUILDLINK_PKGSRCDIR.fixesproto?= ../../x11/fixesproto4
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.endif # FIXESPROTO_BUILDLINK3_MK
BUILDLINK_TREE+= -fixesproto
Index: pkgsrc/x11/gtk3/options.mk
diff -u pkgsrc/x11/gtk3/options.mk:1.10 pkgsrc/x11/gtk3/options.mk:1.11
--- pkgsrc/x11/gtk3/options.mk:1.10 Sun Nov 12 15:37:00 2017
+++ pkgsrc/x11/gtk3/options.mk Wed Mar 7 11:57:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2017/11/12 15:37:00 khorben Exp $
+# $NetBSD: options.mk,v 1.11 2018/03/07 11:57:34 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gtk3
PKG_SUPPORTED_OPTIONS= gtk3-atk-bridge cups debug
@@ -44,9 +44,8 @@ CONFIGURE_ARGS+= --without-atk-bridge
. endif
BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2nb2
-BUILDLINK_API_DEPENDS.inputproto+= inputproto>=2.0
-.include "../../x11/inputproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXcursor/buildlink3.mk"
.include "../../x11/libXft/buildlink3.mk"
Index: pkgsrc/x11/iceauth/Makefile
diff -u pkgsrc/x11/iceauth/Makefile:1.10 pkgsrc/x11/iceauth/Makefile:1.11
--- pkgsrc/x11/iceauth/Makefile:1.10 Mon Mar 5 09:31:00 2018
+++ pkgsrc/x11/iceauth/Makefile Wed Mar 7 11:57:34 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2018/03/05 09:31:00 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:34 wiz Exp $
DISTNAME= iceauth-1.0.8
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -15,5 +16,5 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV+= APP_MAN_SUFFIX=1
.include "../../x11/libICE/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/lbxproxy/Makefile
diff -u pkgsrc/x11/lbxproxy/Makefile:1.16 pkgsrc/x11/lbxproxy/Makefile:1.17
--- pkgsrc/x11/lbxproxy/Makefile:1.16 Sat Sep 16 19:27:26 2017
+++ pkgsrc/x11/lbxproxy/Makefile Wed Mar 7 11:57:34 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2017/09/16 19:27:26 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2018/03/07 11:57:34 wiz Exp $
DISTNAME= lbxproxy-1.0.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -24,8 +24,7 @@ INSTALLATION_DIRS+= share/examples/lbxpr
post-install:
${MV} ${DESTDIR}${PKG_SYSCONFDIR}/AtomControl ${DESTDIR}${EGDIR}/
-.include "../../x11/bigreqsproto/buildlink3.mk"
-.include "../../x11/xproxymanagementprotocol/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libICE/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/liblbxutil/buildlink3.mk"
Index: pkgsrc/x11/libFS/Makefile
diff -u pkgsrc/x11/libFS/Makefile:1.16 pkgsrc/x11/libFS/Makefile:1.17
--- pkgsrc/x11/libFS/Makefile:1.16 Fri Feb 26 11:27:14 2016
+++ pkgsrc/x11/libFS/Makefile Wed Mar 7 11:57:35 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2016/02/26 11:27:14 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2018/03/07 11:57:35 wiz Exp $
DISTNAME= libFS-1.0.7
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -19,8 +20,6 @@ CONFIGURE_ARGS.NetBSD+= --disable-malloc
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/xtrans/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libFS/buildlink3.mk
diff -u pkgsrc/x11/libFS/buildlink3.mk:1.3 pkgsrc/x11/libFS/buildlink3.mk:1.4
--- pkgsrc/x11/libFS/buildlink3.mk:1.3 Fri Mar 20 19:25:43 2009
+++ pkgsrc/x11/libFS/buildlink3.mk Wed Mar 7 11:57:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/03/07 11:57:35 wiz Exp $
BUILDLINK_TREE+= libFS
@@ -8,8 +8,7 @@ LIBFS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libFS+= libFS>=1.0.0
BUILDLINK_PKGSRCDIR.libFS?= ../../x11/libFS
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.endif # LIBFS_BUILDLINK3_MK
BUILDLINK_TREE+= -libFS
Index: pkgsrc/x11/libICE/Makefile
diff -u pkgsrc/x11/libICE/Makefile:1.12 pkgsrc/x11/libICE/Makefile:1.13
--- pkgsrc/x11/libICE/Makefile:1.12 Thu Oct 9 14:07:13 2014
+++ pkgsrc/x11/libICE/Makefile Wed Mar 7 11:57:35 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2014/10/09 14:07:13 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2018/03/07 11:57:35 wiz Exp $
DISTNAME= libICE-1.0.9
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -19,7 +20,6 @@ PKGCONFIG_OVERRIDE+= ice.pc.in
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/xtrans/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libSM/Makefile
diff -u pkgsrc/x11/libSM/Makefile:1.13 pkgsrc/x11/libSM/Makefile:1.14
--- pkgsrc/x11/libSM/Makefile:1.13 Thu Oct 9 14:07:14 2014
+++ pkgsrc/x11/libSM/Makefile Wed Mar 7 11:57:35 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2014/10/09 14:07:14 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:35 wiz Exp $
DISTNAME= libSM-1.2.2
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -22,7 +23,6 @@ CONFIGURE_ARGS+= --without-libuuid
.include "../../meta-pkgs/modular-xorg/hacks.mk"
.include "../../x11/libICE/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/xtrans/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libX11/Makefile
diff -u pkgsrc/x11/libX11/Makefile:1.44 pkgsrc/x11/libX11/Makefile:1.45
--- pkgsrc/x11/libX11/Makefile:1.44 Mon Feb 27 09:09:50 2017
+++ pkgsrc/x11/libX11/Makefile Wed Mar 7 11:57:35 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2017/02/27 09:09:50 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2018/03/07 11:57:35 wiz Exp $
DISTNAME= libX11-1.6.5
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -30,7 +31,6 @@ LDFLAGS.MirBSD+= ${PTHREAD_LDFLAGS}
LDFLAGS.OpenBSD+= ${PTHREAD_LDFLAGS}
BUILDLINK_API_DEPENDS.libxcb+=libxcb>=1.11.1
-BUILDLINK_API_DEPENDS.xproto+=xproto>=7.0.17
TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
@@ -42,19 +42,12 @@ CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_C
# XXX This needs to match the version of xcb-proto we get for the
# target by buildlink3.
-TOOL_DEPENDS+= xproto-[0-9]*:../../x11/xproto
+TOOL_DEPENDS+= xorgproto-[0-9]*:../../x11/xorgproto
.endif
-.include "../../x11/bigreqsproto/buildlink3.mk"
-.include "../../x11/inputproto/buildlink3.mk"
-.include "../../x11/kbproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libXau/buildlink3.mk"
.include "../../x11/libXdmcp/buildlink3.mk"
.include "../../x11/libxcb/buildlink3.mk"
-.include "../../x11/xcmiscproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/xf86bigfontproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
.include "../../x11/xtrans/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libX11/buildlink3.mk
diff -u pkgsrc/x11/libX11/buildlink3.mk:1.12 pkgsrc/x11/libX11/buildlink3.mk:1.13
--- pkgsrc/x11/libX11/buildlink3.mk:1.12 Sun Jan 7 13:04:38 2018
+++ pkgsrc/x11/libX11/buildlink3.mk Wed Mar 7 11:57:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:38 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2018/03/07 11:57:35 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -24,7 +24,6 @@ X11_LDFLAGS+= -L${BUILDLINK_PREFIX.libX1
.include "../../mk/pthread.buildlink3.mk"
. endif
-.include "../../x11/kbproto/buildlink3.mk"
.include "../../x11/libXau/buildlink3.mk"
.include "../../x11/libXdmcp/buildlink3.mk"
@@ -34,7 +33,7 @@ X11_LDFLAGS+= -L${BUILDLINK_PREFIX.libX1
.include "../../x11/libxcb/buildlink3.mk"
. endif
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
. endif # LIBX11_BUILDLINK3_MK
BUILDLINK_TREE+= -libX11
Index: pkgsrc/x11/libXScrnSaver/Makefile
diff -u pkgsrc/x11/libXScrnSaver/Makefile:1.11 pkgsrc/x11/libXScrnSaver/Makefile:1.12
--- pkgsrc/x11/libXScrnSaver/Makefile:1.11 Fri Feb 26 11:27:14 2016
+++ pkgsrc/x11/libXScrnSaver/Makefile Wed Mar 7 11:57:35 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2016/02/26 11:27:14 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.12 2018/03/07 11:57:35 wiz Exp $
DISTNAME= libXScrnSaver-1.2.2
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -10,8 +10,6 @@ MAINTAINER= joerg%NetBSD.org@localhost
HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= X11 Screen Saver Library
-CONFLICTS+= scrnsaverproto<1.2.0
-
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
@@ -24,7 +22,5 @@ CONFIGURE_ARGS.NetBSD+= --disable-malloc
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-BUILDLINK_API_DEPENDS.scrnsaverproto+= scrnsaverproto>=1.2.0
-.include "../../x11/scrnsaverproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXScrnSaver/buildlink3.mk
diff -u pkgsrc/x11/libXScrnSaver/buildlink3.mk:1.3 pkgsrc/x11/libXScrnSaver/buildlink3.mk:1.4
--- pkgsrc/x11/libXScrnSaver/buildlink3.mk:1.3 Fri Mar 20 19:25:43 2009
+++ pkgsrc/x11/libXScrnSaver/buildlink3.mk Wed Mar 7 11:57:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/03/07 11:57:35 wiz Exp $
BUILDLINK_TREE+= libXScrnSaver
@@ -10,7 +10,7 @@ BUILDLINK_PKGSRCDIR.libXScrnSaver?= ../.
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/scrnsaverproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.endif # LIBXSCRNSAVER_BUILDLINK3_MK
BUILDLINK_TREE+= -libXScrnSaver
Index: pkgsrc/x11/libXTrap/Makefile
diff -u pkgsrc/x11/libXTrap/Makefile:1.8 pkgsrc/x11/libXTrap/Makefile:1.9
--- pkgsrc/x11/libXTrap/Makefile:1.8 Thu Oct 9 14:07:14 2014
+++ pkgsrc/x11/libXTrap/Makefile Wed Mar 7 11:57:35 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2014/10/09 14:07:14 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:35 wiz Exp $
DISTNAME= libXTrap-1.0.1
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -19,6 +19,5 @@ PKGCONFIG_OVERRIDE+= xtrap.pc.in
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/trapproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXau/Makefile
diff -u pkgsrc/x11/libXau/Makefile:1.13 pkgsrc/x11/libXau/Makefile:1.14
--- pkgsrc/x11/libXau/Makefile:1.13 Thu Oct 9 14:07:14 2014
+++ pkgsrc/x11/libXau/Makefile Wed Mar 7 11:57:35 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2014/10/09 14:07:14 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:35 wiz Exp $
DISTNAME= libXau-1.0.8
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -22,6 +23,5 @@ CPPFLAGS.OSF1+= -pthread # Required by
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXau/buildlink3.mk
diff -u pkgsrc/x11/libXau/buildlink3.mk:1.4 pkgsrc/x11/libXau/buildlink3.mk:1.5
--- pkgsrc/x11/libXau/buildlink3.mk:1.4 Fri Mar 20 19:25:44 2009
+++ pkgsrc/x11/libXau/buildlink3.mk Wed Mar 7 11:57:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/03/07 11:57:35 wiz Exp $
BUILDLINK_TREE+= libXau
@@ -8,7 +8,7 @@ LIBXAU_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libXau+= libXau>=1.0
BUILDLINK_PKGSRCDIR.libXau?= ../../x11/libXau
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.endif # LIBXAU_BUILDLINK3_MK
BUILDLINK_TREE+= -libXau
Index: pkgsrc/x11/libXau/builtin.mk
diff -u pkgsrc/x11/libXau/builtin.mk:1.5 pkgsrc/x11/libXau/builtin.mk:1.6
--- pkgsrc/x11/libXau/builtin.mk:1.5 Mon Mar 10 11:56:02 2014
+++ pkgsrc/x11/libXau/builtin.mk Wed Mar 7 11:57:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2014/03/10 11:56:02 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.6 2018/03/07 11:57:35 wiz Exp $
BUILTIN_PKG:= libXau
@@ -71,7 +71,7 @@ xau-fake-pc:
else \
req=""; \
if ${TEST} -f \
- ${BUILDLINK_PREFIX.xproto}/lib/pkgconfig/xproto.pc; then \
+ ${BUILDLINK_PREFIX.xorgproto}/lib/pkgconfig/xproto.pc; then \
req="xproto"; \
fi; \
{ ${ECHO} "Name: Xau"; \
Index: pkgsrc/x11/libXaw/Makefile
diff -u pkgsrc/x11/libXaw/Makefile:1.14 pkgsrc/x11/libXaw/Makefile:1.15
--- pkgsrc/x11/libXaw/Makefile:1.14 Fri May 1 08:40:12 2015
+++ pkgsrc/x11/libXaw/Makefile Wed Mar 7 11:57:35 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2015/05/01 08:40:12 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2018/03/07 11:57:35 wiz Exp $
DISTNAME= libXaw-1.0.13
+PKGREVISION= 1
CATEGORIES= graphics x11
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -23,6 +24,5 @@ CONFIGURE_ENV+= LIB_MAN_SUFFIX=3
.include "../../x11/libXmu/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXaw/buildlink3.mk
diff -u pkgsrc/x11/libXaw/buildlink3.mk:1.7 pkgsrc/x11/libXaw/buildlink3.mk:1.8
--- pkgsrc/x11/libXaw/buildlink3.mk:1.7 Sun Jan 7 13:04:39 2018
+++ pkgsrc/x11/libXaw/buildlink3.mk Wed Mar 7 11:57:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:39 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/03/07 11:57:35 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -22,7 +22,7 @@ BUILDLINK_TRANSFORM+= l:Xaw:Xaw7
.include "../../x11/libXmu/buildlink3.mk"
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
. endif # LIBXAW_BUILDLINK3_MK
BUILDLINK_TREE+= -libXaw
Index: pkgsrc/x11/libXcomposite/Makefile
diff -u pkgsrc/x11/libXcomposite/Makefile:1.10 pkgsrc/x11/libXcomposite/Makefile:1.11
--- pkgsrc/x11/libXcomposite/Makefile:1.10 Thu Oct 9 14:07:14 2014
+++ pkgsrc/x11/libXcomposite/Makefile Wed Mar 7 11:57:35 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2014/10/09 14:07:14 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:35 wiz Exp $
DISTNAME= libXcomposite-0.4.4
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -17,10 +17,7 @@ USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE+= xcomposite.pc.in
-BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4
-
-.include "../../x11/compositeproto/buildlink3.mk"
-.include "../../x11/fixesproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXfixes/buildlink3.mk"
Index: pkgsrc/x11/libXcomposite/buildlink3.mk
diff -u pkgsrc/x11/libXcomposite/buildlink3.mk:1.4 pkgsrc/x11/libXcomposite/buildlink3.mk:1.5
--- pkgsrc/x11/libXcomposite/buildlink3.mk:1.4 Sat Dec 14 09:36:57 2013
+++ pkgsrc/x11/libXcomposite/buildlink3.mk Wed Mar 7 11:57:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2013/12/14 09:36:57 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/03/07 11:57:35 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -10,8 +10,7 @@ LIBXCOMPOSITE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libXcomposite+= libXcomposite>=0.3.1
BUILDLINK_PKGSRCDIR.libXcomposite?= ../../x11/libXcomposite
-.include "../../x11/compositeproto/buildlink3.mk"
-.include "../../x11/fixesproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXfixes/buildlink3.mk"
Index: pkgsrc/x11/libXcursor/Makefile
diff -u pkgsrc/x11/libXcursor/Makefile:1.9 pkgsrc/x11/libXcursor/Makefile:1.10
--- pkgsrc/x11/libXcursor/Makefile:1.9 Tue Nov 28 14:57:20 2017
+++ pkgsrc/x11/libXcursor/Makefile Wed Mar 7 11:57:35 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2017/11/28 14:57:20 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2018/03/07 11:57:35 wiz Exp $
DISTNAME= libXcursor-1.1.15
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -19,10 +20,8 @@ PKGCONFIG_OVERRIDE+= xcursor.pc.in
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-.include "../../x11/fixesproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXfixes/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXcursor/buildlink3.mk
diff -u pkgsrc/x11/libXcursor/buildlink3.mk:1.4 pkgsrc/x11/libXcursor/buildlink3.mk:1.5
--- pkgsrc/x11/libXcursor/buildlink3.mk:1.4 Sun Jan 7 13:04:39 2018
+++ pkgsrc/x11/libXcursor/buildlink3.mk Wed Mar 7 11:57:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:39 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/03/07 11:57:35 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -17,7 +17,7 @@ BUILDLINK_PKGSRCDIR.libXcursor?= ../../x
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXfixes/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
. endif # LIBXCURSOR_BUILDLINK3_MK
BUILDLINK_TREE+= -libXcursor
Index: pkgsrc/x11/libXdamage/Makefile
diff -u pkgsrc/x11/libXdamage/Makefile:1.9 pkgsrc/x11/libXdamage/Makefile:1.10
--- pkgsrc/x11/libXdamage/Makefile:1.9 Mon Jan 21 13:27:28 2013
+++ pkgsrc/x11/libXdamage/Makefile Wed Mar 7 11:57:35 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2013/01/21 13:27:28 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.10 2018/03/07 11:57:35 wiz Exp $
DISTNAME= libXdamage-1.1.4
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -17,11 +17,7 @@ USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE+= xdamage.pc.in
-.include "../../x11/damageproto/buildlink3.mk"
-.include "../../x11/fixesproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXfixes/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXdamage/buildlink3.mk
diff -u pkgsrc/x11/libXdamage/buildlink3.mk:1.4 pkgsrc/x11/libXdamage/buildlink3.mk:1.5
--- pkgsrc/x11/libXdamage/buildlink3.mk:1.4 Fri Mar 20 19:25:44 2009
+++ pkgsrc/x11/libXdamage/buildlink3.mk Wed Mar 7 11:57:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/03/07 11:57:35 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -10,10 +10,9 @@ LIBXDAMAGE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libXdamage+= libXdamage>=1.0.3
BUILDLINK_PKGSRCDIR.libXdamage?= ../../x11/libXdamage
-.include "../../x11/damageproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXfixes/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.endif # LIBXDAMAGE_BUILDLINK3_MK
BUILDLINK_TREE+= -libXdamage
Index: pkgsrc/x11/libXdmcp/Makefile
diff -u pkgsrc/x11/libXdmcp/Makefile:1.8 pkgsrc/x11/libXdmcp/Makefile:1.9
--- pkgsrc/x11/libXdmcp/Makefile:1.8 Thu Apr 2 22:35:06 2015
+++ pkgsrc/x11/libXdmcp/Makefile Wed Mar 7 11:57:36 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2015/04/02 22:35:06 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:36 wiz Exp $
DISTNAME= libXdmcp-1.1.2
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -16,6 +17,5 @@ GNU_CONFIGURE= yes
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXdmcp/builtin.mk
diff -u pkgsrc/x11/libXdmcp/builtin.mk:1.5 pkgsrc/x11/libXdmcp/builtin.mk:1.6
--- pkgsrc/x11/libXdmcp/builtin.mk:1.5 Mon Mar 10 11:56:02 2014
+++ pkgsrc/x11/libXdmcp/builtin.mk Wed Mar 7 11:57:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2014/03/10 11:56:02 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.6 2018/03/07 11:57:36 wiz Exp $
BUILTIN_PKG:= libXdmcp
@@ -71,7 +71,7 @@ xdmcp-fake-pc:
else \
req=""; \
if ${TEST} -f \
- ${BUILDLINK_PREFIX.xproto}/lib/pkgconfig/xproto.pc; then \
+ ${BUILDLINK_PREFIX.xorgproto}/lib/pkgconfig/xproto.pc; then \
req="xproto"; \
fi; \
{ ${ECHO} "Name: Xdmcp"; \
Index: pkgsrc/x11/libXevie/Makefile
diff -u pkgsrc/x11/libXevie/Makefile:1.9 pkgsrc/x11/libXevie/Makefile:1.10
--- pkgsrc/x11/libXevie/Makefile:1.9 Fri Feb 26 11:27:14 2016
+++ pkgsrc/x11/libXevie/Makefile Wed Mar 7 11:57:36 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2016/02/26 11:27:14 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.10 2018/03/07 11:57:36 wiz Exp $
DISTNAME= libXevie-1.0.3
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -24,6 +24,5 @@ pre-configure:
.include "../../x11/evieext/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXevie/buildlink3.mk
diff -u pkgsrc/x11/libXevie/buildlink3.mk:1.3 pkgsrc/x11/libXevie/buildlink3.mk:1.4
--- pkgsrc/x11/libXevie/buildlink3.mk:1.3 Sun Jan 7 13:04:39 2018
+++ pkgsrc/x11/libXevie/buildlink3.mk Wed Mar 7 11:57:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:39 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/03/07 11:57:36 wiz Exp $
BUILDLINK_TREE+= libXevie
@@ -10,7 +10,7 @@ BUILDLINK_PKGSRCDIR.libXevie?= ../../x1
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.endif # LIBXEVIE_BUILDLINK3_MK
BUILDLINK_TREE+= -libXevie
Index: pkgsrc/x11/libXext/Makefile
diff -u pkgsrc/x11/libXext/Makefile:1.23 pkgsrc/x11/libXext/Makefile:1.24
--- pkgsrc/x11/libXext/Makefile:1.23 Fri Feb 26 11:27:14 2016
+++ pkgsrc/x11/libXext/Makefile Wed Mar 7 11:57:36 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2016/02/26 11:27:14 jperkin Exp $
+# $NetBSD: Makefile,v 1.24 2018/03/07 11:57:36 wiz Exp $
DISTNAME= libXext-1.3.3
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -26,9 +27,5 @@ CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PR
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6
.include "../../x11/libX11/buildlink3.mk"
-BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.1.99
-.include "../../x11/xextproto/buildlink3.mk"
-BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.13
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXext/buildlink3.mk
diff -u pkgsrc/x11/libXext/buildlink3.mk:1.11 pkgsrc/x11/libXext/buildlink3.mk:1.12
--- pkgsrc/x11/libXext/buildlink3.mk:1.11 Sun Jan 7 13:04:39 2018
+++ pkgsrc/x11/libXext/buildlink3.mk Wed Mar 7 11:57:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:39 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2018/03/07 11:57:36 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -17,7 +17,7 @@ BUILDLINK_API_DEPENDS.libXext+= libXext>
BUILDLINK_PKGSRCDIR.libXext?= ../../x11/libXext
.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
. endif # LIBXEXT_BUILDLINK3_MK
BUILDLINK_TREE+= -libXext
Index: pkgsrc/x11/libXfixes/Makefile
diff -u pkgsrc/x11/libXfixes/Makefile:1.12 pkgsrc/x11/libXfixes/Makefile:1.13
--- pkgsrc/x11/libXfixes/Makefile:1.12 Tue Oct 4 21:59:07 2016
+++ pkgsrc/x11/libXfixes/Makefile Wed Mar 7 11:57:36 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2016/10/04 21:59:07 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2018/03/07 11:57:36 wiz Exp $
DISTNAME= libXfixes-5.0.3
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -18,9 +19,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV+= LIB_MAN_SUFFIX=3
PKGCONFIG_OVERRIDE+= xfixes.pc.in
-BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=5.0
-.include "../../x11/fixesproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6
.include "../../x11/libX11/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXfixes/buildlink3.mk
diff -u pkgsrc/x11/libXfixes/buildlink3.mk:1.5 pkgsrc/x11/libXfixes/buildlink3.mk:1.6
--- pkgsrc/x11/libXfixes/buildlink3.mk:1.5 Sun Jan 7 13:04:39 2018
+++ pkgsrc/x11/libXfixes/buildlink3.mk Wed Mar 7 11:57:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:39 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/03/07 11:57:36 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -16,7 +16,7 @@ LIBXFIXES_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libXfixes+= libXfixes>=4.0.1
BUILDLINK_PKGSRCDIR.libXfixes?= ../../x11/libXfixes
-.include "../../x11/fixesproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
. endif # LIBXFIXES_BUILDLINK3_MK
Index: pkgsrc/x11/libXfont/Makefile
diff -u pkgsrc/x11/libXfont/Makefile:1.39 pkgsrc/x11/libXfont/Makefile:1.40
--- pkgsrc/x11/libXfont/Makefile:1.39 Fri Mar 2 15:09:06 2018
+++ pkgsrc/x11/libXfont/Makefile Wed Mar 7 11:57:36 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2018/03/02 15:09:06 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2018/03/07 11:57:36 wiz Exp $
DISTNAME= libXfont-1.5.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 devel fonts
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -24,9 +24,7 @@ CONFIGURE_ARGS+= --disable-devel-docs
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../fonts/libfontenc/buildlink3.mk"
-BUILDLINK_API_DEPENDS.fontsproto+= fontsproto>=2.1.3
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/xtrans/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXfont/buildlink3.mk
diff -u pkgsrc/x11/libXfont/buildlink3.mk:1.7 pkgsrc/x11/libXfont/buildlink3.mk:1.8
--- pkgsrc/x11/libXfont/buildlink3.mk:1.7 Sun Jan 7 13:04:39 2018
+++ pkgsrc/x11/libXfont/buildlink3.mk Wed Mar 7 11:57:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:39 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/03/07 11:57:36 wiz Exp $
BUILDLINK_TREE+= libXfont
@@ -11,8 +11,7 @@ BUILDLINK_PKGSRCDIR.libXfont?= ../../x1
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../fonts/libfontenc/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.endif # LIBXFONT_BUILDLINK3_MK
BUILDLINK_TREE+= -libXfont
Index: pkgsrc/x11/libXfont2/Makefile
diff -u pkgsrc/x11/libXfont2/Makefile:1.5 pkgsrc/x11/libXfont2/Makefile:1.6
--- pkgsrc/x11/libXfont2/Makefile:1.5 Fri Mar 2 15:09:44 2018
+++ pkgsrc/x11/libXfont2/Makefile Wed Mar 7 11:57:36 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2018/03/02 15:09:44 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2018/03/07 11:57:36 wiz Exp $
DISTNAME= libXfont2-2.0.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11 devel fonts
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -24,9 +24,6 @@ CONFIGURE_ARGS+= --disable-devel-docs
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../fonts/libfontenc/buildlink3.mk"
-BUILDLINK_API_DEPENDS.fontsproto+= fontsproto>=2.1.3
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/xtrans/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXfont2/buildlink3.mk
diff -u pkgsrc/x11/libXfont2/buildlink3.mk:1.2 pkgsrc/x11/libXfont2/buildlink3.mk:1.3
--- pkgsrc/x11/libXfont2/buildlink3.mk:1.2 Sun Jan 7 13:04:39 2018
+++ pkgsrc/x11/libXfont2/buildlink3.mk Wed Mar 7 11:57:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:39 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/03/07 11:57:36 wiz Exp $
BUILDLINK_TREE+= libXfont2
@@ -10,8 +10,7 @@ BUILDLINK_PKGSRCDIR.libXfont2?= ../../x
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../fonts/libfontenc/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.endif # LIBXFONT2_BUILDLINK3_MK
BUILDLINK_TREE+= -libXfont2
Index: pkgsrc/x11/libXft/Makefile
diff -u pkgsrc/x11/libXft/Makefile:1.17 pkgsrc/x11/libXft/Makefile:1.18
--- pkgsrc/x11/libXft/Makefile:1.17 Thu Oct 9 14:07:14 2014
+++ pkgsrc/x11/libXft/Makefile Wed Mar 7 11:57:36 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2014/10/09 14:07:14 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2018/03/07 11:57:36 wiz Exp $
DISTNAME= libXft-2.3.2
+PKGREVISION= 1
CATEGORIES= fonts x11
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -22,6 +23,5 @@ BUILDLINK_API_DEPENDS.fontconfig+= fontc
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXft/buildlink3.mk
diff -u pkgsrc/x11/libXft/buildlink3.mk:1.14 pkgsrc/x11/libXft/buildlink3.mk:1.15
--- pkgsrc/x11/libXft/buildlink3.mk:1.14 Sun Jan 7 13:04:39 2018
+++ pkgsrc/x11/libXft/buildlink3.mk Wed Mar 7 11:57:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:39 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2018/03/07 11:57:36 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -21,7 +21,7 @@ BUILDLINK_PKGSRCDIR.libXft?= ../../x11/l
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
. endif # LIBXFT_BUILDLINK3_MK
BUILDLINK_TREE+= -libXft
Index: pkgsrc/x11/libXi/Makefile
diff -u pkgsrc/x11/libXi/Makefile:1.33 pkgsrc/x11/libXi/Makefile:1.34
--- pkgsrc/x11/libXi/Makefile:1.33 Mon Jan 23 07:41:27 2017
+++ pkgsrc/x11/libXi/Makefile Wed Mar 7 11:57:36 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2017/01/23 07:41:27 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2018/03/07 11:57:36 wiz Exp $
DISTNAME= libXi-1.7.9
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -24,16 +25,10 @@ SUBST_SED.sosubdir= -e 's|\.so X|.so man
CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull
-BUILDLINK_API_DEPENDS.inputproto+= inputproto>=2.3
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6
BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1
-BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.3
-BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.13
-.include "../../x11/inputproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXfixes/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXi/buildlink3.mk
diff -u pkgsrc/x11/libXi/buildlink3.mk:1.9 pkgsrc/x11/libXi/buildlink3.mk:1.10
--- pkgsrc/x11/libXi/buildlink3.mk:1.9 Sun Jan 7 13:04:39 2018
+++ pkgsrc/x11/libXi/buildlink3.mk Wed Mar 7 11:57:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:39 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/03/07 11:57:36 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -22,17 +22,13 @@ BUILDLINK_API_DEPENDS.libXi+= libXi>=1.0
BUILDLINK_PKGSRCDIR.libXi?= ../../x11/libXi
. if !empty(USE_BUILTIN.libXi:M[Nn][Oo])
-BUILDLINK_API_DEPENDS.inputproto+= inputproto>=2.3
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.5
BUILDLINK_API_DEPENDS.libXext+= libXext>=1.1
-BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.3
-BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.13
. endif
-.include "../../x11/inputproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXfixes/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
. endif # LIBXI_BUILDLINK3_MK
BUILDLINK_TREE+= -libXi
Index: pkgsrc/x11/libXinerama/Makefile
diff -u pkgsrc/x11/libXinerama/Makefile:1.14 pkgsrc/x11/libXinerama/Makefile:1.15
--- pkgsrc/x11/libXinerama/Makefile:1.14 Fri Feb 26 11:27:15 2016
+++ pkgsrc/x11/libXinerama/Makefile Wed Mar 7 11:57:36 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2016/02/26 11:27:15 jperkin Exp $
+# $NetBSD: Makefile,v 1.15 2018/03/07 11:57:36 wiz Exp $
DISTNAME= libXinerama-1.1.3
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -22,7 +23,5 @@ CONFIGURE_ARGS.NetBSD+= --disable-malloc
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-BUILDLINK_API_DEPENDS.xineramaproto+= xineramaproto>=1.1.99.1
-.include "../../x11/xineramaproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXinerama/buildlink3.mk
diff -u pkgsrc/x11/libXinerama/buildlink3.mk:1.9 pkgsrc/x11/libXinerama/buildlink3.mk:1.10
--- pkgsrc/x11/libXinerama/buildlink3.mk:1.9 Sun Jan 7 13:04:40 2018
+++ pkgsrc/x11/libXinerama/buildlink3.mk Wed Mar 7 11:57:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:40 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2018/03/07 11:57:36 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.libXinerama?= ../../
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xineramaproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
. endif # LIBXINERAMA_BUILDLINK3_MK
BUILDLINK_TREE+= -libXinerama
Index: pkgsrc/x11/libXmu/buildlink3.mk
diff -u pkgsrc/x11/libXmu/buildlink3.mk:1.6 pkgsrc/x11/libXmu/buildlink3.mk:1.7
--- pkgsrc/x11/libXmu/buildlink3.mk:1.6 Sun Jan 7 13:04:40 2018
+++ pkgsrc/x11/libXmu/buildlink3.mk Wed Mar 7 11:57:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:40 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/03/07 11:57:36 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.libXmu?= ../../x11/l
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
. endif # LIBXMU_BUILDLINK3_MK
BUILDLINK_TREE+= -libXmu
Index: pkgsrc/x11/libXpm/Makefile
diff -u pkgsrc/x11/libXpm/Makefile:1.17 pkgsrc/x11/libXpm/Makefile:1.18
--- pkgsrc/x11/libXpm/Makefile:1.17 Thu Dec 15 23:02:51 2016
+++ pkgsrc/x11/libXpm/Makefile Wed Mar 7 11:57:36 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2016/12/15 23:02:51 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2018/03/07 11:57:36 wiz Exp $
DISTNAME= libXpm-3.5.12
+PKGREVISION= 1
CATEGORIES= graphics x11
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -46,6 +47,5 @@ CONFIGURE_ARGS+= XPM_CFLAGS=${XPM_CFLAGS
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXpm/buildlink3.mk
diff -u pkgsrc/x11/libXpm/buildlink3.mk:1.5 pkgsrc/x11/libXpm/buildlink3.mk:1.6
--- pkgsrc/x11/libXpm/buildlink3.mk:1.5 Wed Dec 16 19:57:47 2009
+++ pkgsrc/x11/libXpm/buildlink3.mk Wed Mar 7 11:57:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/12/16 19:57:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/03/07 11:57:36 wiz Exp $
BUILDLINK_TREE+= libXpm
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.libXpm+= libXpm>=3
BUILDLINK_PKGSRCDIR.libXpm?= ../../x11/libXpm
.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.endif # LIBXPM_BUILDLINK3_MK
BUILDLINK_TREE+= -libXpm
Index: pkgsrc/x11/libXpresent/Makefile
diff -u pkgsrc/x11/libXpresent/Makefile:1.1 pkgsrc/x11/libXpresent/Makefile:1.2
--- pkgsrc/x11/libXpresent/Makefile:1.1 Fri Apr 17 19:54:46 2015
+++ pkgsrc/x11/libXpresent/Makefile Wed Mar 7 11:57:37 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2015/04/17 19:54:46 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2018/03/07 11:57:37 wiz Exp $
DISTNAME= libXpresent-1.0.0
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -17,7 +18,6 @@ GNU_CONFIGURE= yes
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXfixes/buildlink3.mk"
.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/presentproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXpresent/buildlink3.mk
diff -u pkgsrc/x11/libXpresent/buildlink3.mk:1.1 pkgsrc/x11/libXpresent/buildlink3.mk:1.2
--- pkgsrc/x11/libXpresent/buildlink3.mk:1.1 Fri Apr 17 19:59:25 2015
+++ pkgsrc/x11/libXpresent/buildlink3.mk Wed Mar 7 11:57:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/04/17 19:59:25 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/03/07 11:57:37 wiz Exp $
BUILDLINK_TREE+= libXpresent
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.libXpresent?= ../../
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXfixes/buildlink3.mk"
.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/presentproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.endif # LIBXPRESENT_BUILDLINK3_MK
Index: pkgsrc/x11/libXpresent/builtin.mk
diff -u pkgsrc/x11/libXpresent/builtin.mk:1.1 pkgsrc/x11/libXpresent/builtin.mk:1.2
--- pkgsrc/x11/libXpresent/builtin.mk:1.1 Tue Jan 24 14:25:00 2017
+++ pkgsrc/x11/libXpresent/builtin.mk Wed Mar 7 11:57:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2017/01/24 14:25:00 mrg Exp $
+# $NetBSD: builtin.mk,v 1.2 2018/03/07 11:57:37 wiz Exp $
BUILTIN_PKG:= libXpresent
PKGCONFIG_FILE.libXpresent= ${X11BASE}/lib/pkgconfig/xpresent.pc
@@ -6,12 +6,3 @@ PKGCONFIG_FILE.libXpresent+= ${X11BASE}/
.include "../../mk/buildlink3/pkgconfig-builtin.mk"
.include "../../mk/x11.builtin.mk"
-
-CHECK_BUILTIN.libXpresent?= no
-.if !empty(CHECK_BUILTIN.libXpresent:M[nN][oO])
-
-. if !empty(USE_BUILTIN.libXpresent:M[nN][oO])
-BUILDLINK_API_DEPENDS.presentproto+= presentproto>=1.0
-. endif
-
-.endif # CHECK_BUILTIN.libXpresent
Index: pkgsrc/x11/libXrandr/Makefile
diff -u pkgsrc/x11/libXrandr/Makefile:1.19 pkgsrc/x11/libXrandr/Makefile:1.20
--- pkgsrc/x11/libXrandr/Makefile:1.19 Tue Oct 4 22:01:03 2016
+++ pkgsrc/x11/libXrandr/Makefile Wed Mar 7 11:57:37 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2016/10/04 22:01:03 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2018/03/07 11:57:37 wiz Exp $
DISTNAME= libXrandr-1.5.1
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -24,8 +25,5 @@ BUILDLINK_API_DEPENDS.libX11+= libX11>=1
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"
-BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.5
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXrandr/buildlink3.mk
diff -u pkgsrc/x11/libXrandr/buildlink3.mk:1.8 pkgsrc/x11/libXrandr/buildlink3.mk:1.9
--- pkgsrc/x11/libXrandr/buildlink3.mk:1.8 Sun Jan 7 13:04:40 2018
+++ pkgsrc/x11/libXrandr/buildlink3.mk Wed Mar 7 11:57:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:40 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/03/07 11:57:37 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.libXrandr?= ../../x
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
. endif # LIBXRANDR_BUILDLINK3_MK
BUILDLINK_TREE+= -libXrandr
Index: pkgsrc/x11/libXrandr/builtin.mk
diff -u pkgsrc/x11/libXrandr/builtin.mk:1.5 pkgsrc/x11/libXrandr/builtin.mk:1.6
--- pkgsrc/x11/libXrandr/builtin.mk:1.5 Mon Mar 10 11:05:52 2014
+++ pkgsrc/x11/libXrandr/builtin.mk Wed Mar 7 11:57:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.5 2014/03/10 11:05:52 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.6 2018/03/07 11:57:37 wiz Exp $
BUILTIN_PKG:= libXrandr
PKGCONFIG_FILE.libXrandr= ${X11BASE}/lib/pkgconfig/xrandr.pc
@@ -6,12 +6,3 @@ PKGCONFIG_FILE.libXrandr+= ${X11BASE}/li
.include "../../mk/buildlink3/pkgconfig-builtin.mk"
.include "../../mk/x11.builtin.mk"
-
-CHECK_BUILTIN.libXrandr?= no
-.if !empty(CHECK_BUILTIN.libXrandr:M[nN][oO])
-
-. if !empty(USE_BUILTIN.libXrandr:M[nN][oO])
-BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.4
-. endif
-
-.endif # CHECK_BUILTIN.libXrandr
Index: pkgsrc/x11/libXrender/Makefile
diff -u pkgsrc/x11/libXrender/Makefile:1.14 pkgsrc/x11/libXrender/Makefile:1.15
--- pkgsrc/x11/libXrender/Makefile:1.14 Tue Oct 4 22:01:41 2016
+++ pkgsrc/x11/libXrender/Makefile Wed Mar 7 11:57:37 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2016/10/04 22:01:41 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2018/03/07 11:57:37 wiz Exp $
DISTNAME= libXrender-0.9.10
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -22,9 +23,8 @@ CONFIGURE_ARGS.NetBSD+= --disable-malloc
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-.include "../../x11/renderproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXrender/buildlink3.mk
diff -u pkgsrc/x11/libXrender/buildlink3.mk:1.6 pkgsrc/x11/libXrender/buildlink3.mk:1.7
--- pkgsrc/x11/libXrender/buildlink3.mk:1.6 Sun Jan 7 13:04:40 2018
+++ pkgsrc/x11/libXrender/buildlink3.mk Wed Mar 7 11:57:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:40 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/03/07 11:57:37 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -16,7 +16,7 @@ LIBXRENDER_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libXrender+= libXrender>=0.9.2
BUILDLINK_PKGSRCDIR.libXrender?= ../../x11/libXrender
-.include "../../x11/renderproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
. endif # LIBXRENDER_BUILDLINK3_MK
Index: pkgsrc/x11/libXres/Makefile
diff -u pkgsrc/x11/libXres/Makefile:1.12 pkgsrc/x11/libXres/Makefile:1.13
--- pkgsrc/x11/libXres/Makefile:1.12 Wed Oct 11 16:45:43 2017
+++ pkgsrc/x11/libXres/Makefile Wed Mar 7 11:57:37 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2017/10/11 16:45:43 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2018/03/07 11:57:37 wiz Exp $
DISTNAME= libXres-1.2.0
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -21,7 +22,5 @@ CONFIGURE_ARGS.NetBSD+= --disable-malloc
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/resourceproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXres/buildlink3.mk
diff -u pkgsrc/x11/libXres/buildlink3.mk:1.4 pkgsrc/x11/libXres/buildlink3.mk:1.5
--- pkgsrc/x11/libXres/buildlink3.mk:1.4 Fri Mar 20 19:25:45 2009
+++ pkgsrc/x11/libXres/buildlink3.mk Wed Mar 7 11:57:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:45 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/03/07 11:57:37 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.libXres?= ../../x11/
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.endif # LIBXRES_BUILDLINK3_MK
BUILDLINK_TREE+= -libXres
Index: pkgsrc/x11/libXt/Makefile
diff -u pkgsrc/x11/libXt/Makefile:1.24 pkgsrc/x11/libXt/Makefile:1.25
--- pkgsrc/x11/libXt/Makefile:1.24 Fri Feb 26 11:27:15 2016
+++ pkgsrc/x11/libXt/Makefile Wed Mar 7 11:57:37 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2016/02/26 11:27:15 jperkin Exp $
+# $NetBSD: Makefile,v 1.25 2018/03/07 11:57:37 wiz Exp $
DISTNAME= libXt-1.1.5
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -36,7 +37,5 @@ CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PR
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libICE/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/kbproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXt/buildlink3.mk
diff -u pkgsrc/x11/libXt/buildlink3.mk:1.7 pkgsrc/x11/libXt/buildlink3.mk:1.8
--- pkgsrc/x11/libXt/buildlink3.mk:1.7 Sun Jan 7 13:04:40 2018
+++ pkgsrc/x11/libXt/buildlink3.mk Wed Mar 7 11:57:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:40 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/03/07 11:57:37 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.libXt?= ../../x11/li
.include "../../x11/libSM/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
. endif # LIBXT_BUILDLINK3_MK
BUILDLINK_TREE+= -libXt
Index: pkgsrc/x11/libXtst/Makefile
diff -u pkgsrc/x11/libXtst/Makefile:1.13 pkgsrc/x11/libXtst/Makefile:1.14
--- pkgsrc/x11/libXtst/Makefile:1.13 Tue Oct 4 22:02:50 2016
+++ pkgsrc/x11/libXtst/Makefile Wed Mar 7 11:57:37 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2016/10/04 22:02:50 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:37 wiz Exp $
DISTNAME= libXtst-1.2.3
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -34,15 +35,10 @@ SUBST_MESSAGE.sofix= Fix .so arguments.
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-.include "../../x11/inputproto/buildlink3.mk"
-BUILDLINK_API_DEPENDS.recordproto+= recordproto>=1.13.99.1
-.include "../../x11/recordproto/buildlink3.mk"
-BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.99.3
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6
.include "../../x11/libX11/buildlink3.mk"
BUILDLINK_API_DEPENDS.libXext+= libXext>=1.0.99.4
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXi/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXtst/buildlink3.mk
diff -u pkgsrc/x11/libXtst/buildlink3.mk:1.8 pkgsrc/x11/libXtst/buildlink3.mk:1.9
--- pkgsrc/x11/libXtst/buildlink3.mk:1.8 Tue Oct 23 10:24:19 2012
+++ pkgsrc/x11/libXtst/buildlink3.mk Wed Mar 7 11:57:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2012/10/23 10:24:19 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/03/07 11:57:37 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -10,7 +10,7 @@ LIBXTST_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libXtst+= libXtst>=1.0.1
BUILDLINK_PKGSRCDIR.libXtst?= ../../x11/libXtst
-.include "../../x11/recordproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXi/buildlink3.mk"
Index: pkgsrc/x11/libXv/Makefile
diff -u pkgsrc/x11/libXv/Makefile:1.16 pkgsrc/x11/libXv/Makefile:1.17
--- pkgsrc/x11/libXv/Makefile:1.16 Tue Oct 4 22:03:54 2016
+++ pkgsrc/x11/libXv/Makefile Wed Mar 7 11:57:37 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2016/10/04 22:03:54 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2018/03/07 11:57:37 wiz Exp $
DISTNAME= libXv-1.0.11
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -21,7 +22,5 @@ CONFIGURE_ARGS.NetBSD+= --disable-malloc
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXv/buildlink3.mk
diff -u pkgsrc/x11/libXv/buildlink3.mk:1.6 pkgsrc/x11/libXv/buildlink3.mk:1.7
--- pkgsrc/x11/libXv/buildlink3.mk:1.6 Tue Oct 23 10:24:19 2012
+++ pkgsrc/x11/libXv/buildlink3.mk Wed Mar 7 11:57:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2012/10/23 10:24:19 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/03/07 11:57:37 wiz Exp $
BUILDLINK_TREE+= libXv
@@ -10,8 +10,7 @@ BUILDLINK_PKGSRCDIR.libXv?= ../../x11/li
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.endif # LIBXV_BUILDLINK3_MK
BUILDLINK_TREE+= -libXv
Index: pkgsrc/x11/libXvMC/Makefile
diff -u pkgsrc/x11/libXvMC/Makefile:1.13 pkgsrc/x11/libXvMC/Makefile:1.14
--- pkgsrc/x11/libXvMC/Makefile:1.13 Tue Oct 4 22:05:30 2016
+++ pkgsrc/x11/libXvMC/Makefile Wed Mar 7 11:57:37 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2016/10/04 22:05:30 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:37 wiz Exp $
DISTNAME= libXvMC-1.0.10
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -24,6 +25,5 @@ BUILDLINK_API_DEPENDS.libX11+= libX11>=1
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXv/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXvMC/buildlink3.mk
diff -u pkgsrc/x11/libXvMC/buildlink3.mk:1.4 pkgsrc/x11/libXvMC/buildlink3.mk:1.5
--- pkgsrc/x11/libXvMC/buildlink3.mk:1.4 Wed Jan 19 17:50:48 2011
+++ pkgsrc/x11/libXvMC/buildlink3.mk Wed Mar 7 11:57:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2011/01/19 17:50:48 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/03/07 11:57:37 wiz Exp $
BUILDLINK_TREE+= libXvMC
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.libXvMC?= ../../x11/
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXv/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.endif # LIBXVMC_BUILDLINK3_MK
BUILDLINK_TREE+= -libXvMC
Index: pkgsrc/x11/libXxf86dga/Makefile
diff -u pkgsrc/x11/libXxf86dga/Makefile:1.13 pkgsrc/x11/libXxf86dga/Makefile:1.14
--- pkgsrc/x11/libXxf86dga/Makefile:1.13 Fri Feb 26 11:27:15 2016
+++ pkgsrc/x11/libXxf86dga/Makefile Wed Mar 7 11:57:37 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2016/02/26 11:27:15 jperkin Exp $
+# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:37 wiz Exp $
DISTNAME= libXxf86dga-1.1.4
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -23,6 +24,5 @@ CONFIGURE_ARGS.NetBSD+= --disable-malloc
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXxf86dga/buildlink3.mk
diff -u pkgsrc/x11/libXxf86dga/buildlink3.mk:1.3 pkgsrc/x11/libXxf86dga/buildlink3.mk:1.4
--- pkgsrc/x11/libXxf86dga/buildlink3.mk:1.3 Sun Jan 7 13:04:40 2018
+++ pkgsrc/x11/libXxf86dga/buildlink3.mk Wed Mar 7 11:57:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:40 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/03/07 11:57:37 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -16,7 +16,7 @@ BUILDLINK_PKGSRCDIR.libXxf86dga?= ../../
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
. endif # LIBXXF86DGA_BUILDLINK3_MK
BUILDLINK_TREE+= -libXxf86dga
Index: pkgsrc/x11/libXxf86misc/Makefile
diff -u pkgsrc/x11/libXxf86misc/Makefile:1.8 pkgsrc/x11/libXxf86misc/Makefile:1.9
--- pkgsrc/x11/libXxf86misc/Makefile:1.8 Fri Feb 26 11:27:15 2016
+++ pkgsrc/x11/libXxf86misc/Makefile Wed Mar 7 11:57:37 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2016/02/26 11:27:15 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:37 wiz Exp $
DISTNAME= libXxf86misc-1.0.3
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -19,9 +19,7 @@ CONFIGURE_ENV+= LIB_MAN_SUFFIX=3
CONFIGURE_ARGS.NetBSD+= --disable-malloc0returnsnull
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/xf86miscproto/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXxf86misc/buildlink3.mk
diff -u pkgsrc/x11/libXxf86misc/buildlink3.mk:1.4 pkgsrc/x11/libXxf86misc/buildlink3.mk:1.5
--- pkgsrc/x11/libXxf86misc/buildlink3.mk:1.4 Sun Jan 7 13:04:40 2018
+++ pkgsrc/x11/libXxf86misc/buildlink3.mk Wed Mar 7 11:57:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:40 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2018/03/07 11:57:37 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -16,7 +16,7 @@ BUILDLINK_PKGSRCDIR.libXxf86misc?= ../..
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xf86miscproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
. endif # LIBXXF86MISC_BUILDLINK3_MK
BUILDLINK_TREE+= -libXxf86misc
Index: pkgsrc/x11/libXxf86vm/Makefile
diff -u pkgsrc/x11/libXxf86vm/Makefile:1.13 pkgsrc/x11/libXxf86vm/Makefile:1.14
--- pkgsrc/x11/libXxf86vm/Makefile:1.13 Fri Feb 26 11:27:15 2016
+++ pkgsrc/x11/libXxf86vm/Makefile Wed Mar 7 11:57:37 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2016/02/26 11:27:15 jperkin Exp $
+# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:37 wiz Exp $
DISTNAME= libXxf86vm-1.1.4
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -24,7 +25,5 @@ CONFIGURE_ARGS.NetBSD+= --disable-malloc
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.6
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xf86vidmodeproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libXxf86vm/buildlink3.mk
diff -u pkgsrc/x11/libXxf86vm/buildlink3.mk:1.5 pkgsrc/x11/libXxf86vm/buildlink3.mk:1.6
--- pkgsrc/x11/libXxf86vm/buildlink3.mk:1.5 Sun Jan 7 13:04:40 2018
+++ pkgsrc/x11/libXxf86vm/buildlink3.mk Wed Mar 7 11:57:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:40 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/03/07 11:57:37 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -16,7 +16,7 @@ BUILDLINK_PKGSRCDIR.libXxf86vm?= ../../x
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xf86vidmodeproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
. endif # LIBXXF86VM_BUILDLINK3_MK
BUILDLINK_TREE+= -libXxf86vm
Index: pkgsrc/x11/liblbxutil/Makefile
diff -u pkgsrc/x11/liblbxutil/Makefile:1.9 pkgsrc/x11/liblbxutil/Makefile:1.10
--- pkgsrc/x11/liblbxutil/Makefile:1.9 Sat Sep 16 19:27:27 2017
+++ pkgsrc/x11/liblbxutil/Makefile Wed Mar 7 11:57:38 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2017/09/16 19:27:27 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.10 2018/03/07 11:57:38 wiz Exp $
DISTNAME= liblbxutil-1.1.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -20,7 +19,5 @@ USE_TOOLS+= gsed pkg-config
PKGCONFIG_OVERRIDE+= lbxutil.pc.in
.include "../../devel/zlib/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.99.1
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/liblbxutil/buildlink3.mk
diff -u pkgsrc/x11/liblbxutil/buildlink3.mk:1.5 pkgsrc/x11/liblbxutil/buildlink3.mk:1.6
--- pkgsrc/x11/liblbxutil/buildlink3.mk:1.5 Thu Oct 22 14:34:45 2015
+++ pkgsrc/x11/liblbxutil/buildlink3.mk Wed Mar 7 11:57:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2015/10/22 14:34:45 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2018/03/07 11:57:38 wiz Exp $
BUILDLINK_TREE+= liblbxutil
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.liblbxutil+= liblb
BUILDLINK_PKGSRCDIR.liblbxutil?= ../../x11/liblbxutil
.include "../../devel/zlib/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.endif # LIBLBXUTIL_BUILDLINK3_MK
BUILDLINK_TREE+= -liblbxutil
Index: pkgsrc/x11/liboldXrandr/Makefile
diff -u pkgsrc/x11/liboldXrandr/Makefile:1.5 pkgsrc/x11/liboldXrandr/Makefile:1.6
--- pkgsrc/x11/liboldXrandr/Makefile:1.5 Wed Sep 6 09:03:05 2017
+++ pkgsrc/x11/liboldXrandr/Makefile Wed Mar 7 11:57:38 2018
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2017/09/06 09:03:05 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.6 2018/03/07 11:57:38 wiz Exp $
DISTNAME= libXrandr-1.0.2
PKGNAME= Xrandr-1.0.2
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= x11 devel
MASTER_SITES= https://xlibs.freedesktop.org/release/
EXTRACT_SUFX= .tar.bz2
@@ -24,6 +23,5 @@ BUILDLINK_API_DEPENDS.Xrender+= Xrender>
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/liboldXrandr/buildlink3.mk
diff -u pkgsrc/x11/liboldXrandr/buildlink3.mk:1.3 pkgsrc/x11/liboldXrandr/buildlink3.mk:1.4
--- pkgsrc/x11/liboldXrandr/buildlink3.mk:1.3 Fri Mar 20 19:25:47 2009
+++ pkgsrc/x11/liboldXrandr/buildlink3.mk Wed Mar 7 11:57:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:47 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/03/07 11:57:38 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -12,7 +12,7 @@ BUILDLINK_ABI_DEPENDS.Xrandr+= Xrandr>=1
BUILDLINK_PKGSRCDIR.Xrandr?= ../../x11/liboldXrandr
.include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.endif # XRANDR_BUILDLINK3_MK
BUILDLINK_TREE+= -Xrandr
Index: pkgsrc/x11/liboldXrandr/builtin.mk
diff -u pkgsrc/x11/liboldXrandr/builtin.mk:1.3 pkgsrc/x11/liboldXrandr/builtin.mk:1.4
--- pkgsrc/x11/liboldXrandr/builtin.mk:1.3 Mon Mar 19 12:34:21 2012
+++ pkgsrc/x11/liboldXrandr/builtin.mk Wed Mar 7 11:57:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2012/03/19 12:34:21 joerg Exp $
+# $NetBSD: builtin.mk,v 1.4 2018/03/07 11:57:38 wiz Exp $
BUILTIN_PKG:= Xrandr
@@ -64,9 +64,6 @@ MAKEVARS+= BUILTIN_PKG.Xrandr
.if defined(USE_BUILTIN.Xrender) && !empty(USE_BUILTIN.Xrender:M[nN][oO])
USE_BUILTIN.Xrender= no
.endif
-.if defined(USE_BUILTIN.randrproto) && !empty(USE_BUILTIN.randrproto:M[nN][oO])
-USE_BUILTIN.randrproto= no
-.endif
.if !defined(USE_BUILTIN.Xrandr)
. if ${PREFER.Xrandr} == "pkgsrc"
@@ -109,7 +106,6 @@ BUILDLINK_API_DEPENDS.Xrender+= Xrender>
. if !empty(USE_BUILTIN.Xrandr:M[yY][eE][sS])
BUILDLINK_PREFIX.Xrandr= ${X11BASE}
USE_BUILTIN.Xrender= yes
-USE_BUILTIN.randrproto= yes
. endif
.endif # CHECK_BUILTIN.Xrandr
Index: pkgsrc/x11/libxkbfile/Makefile
diff -u pkgsrc/x11/libxkbfile/Makefile:1.8 pkgsrc/x11/libxkbfile/Makefile:1.9
--- pkgsrc/x11/libxkbfile/Makefile:1.8 Fri May 1 08:41:32 2015
+++ pkgsrc/x11/libxkbfile/Makefile Wed Mar 7 11:57:38 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2015/05/01 08:41:32 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:38 wiz Exp $
DISTNAME= libxkbfile-1.0.9
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
EXTRACT_SUFX= .tar.bz2
@@ -16,7 +17,6 @@ USE_TOOLS+= pkg-config
.include "../../meta-pkgs/modular-xorg/hacks.mk"
-.include "../../x11/kbproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libxkbfile/buildlink3.mk
diff -u pkgsrc/x11/libxkbfile/buildlink3.mk:1.6 pkgsrc/x11/libxkbfile/buildlink3.mk:1.7
--- pkgsrc/x11/libxkbfile/buildlink3.mk:1.6 Sun Jan 7 13:04:40 2018
+++ pkgsrc/x11/libxkbfile/buildlink3.mk Wed Mar 7 11:57:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:40 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2018/03/07 11:57:38 wiz Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -14,7 +14,7 @@ LIBXKBFILE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libxkbfile+= libxkbfile>=0.99.1
BUILDLINK_PKGSRCDIR.libxkbfile?= ../../x11/libxkbfile
-.include "../../x11/kbproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
. endif # LIBXKBFILE_BUILDLINK3_MK
Index: pkgsrc/x11/libxshmfence/Makefile
diff -u pkgsrc/x11/libxshmfence/Makefile:1.9 pkgsrc/x11/libxshmfence/Makefile:1.10
--- pkgsrc/x11/libxshmfence/Makefile:1.9 Tue Feb 27 08:16:03 2018
+++ pkgsrc/x11/libxshmfence/Makefile Wed Mar 7 11:57:38 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2018/02/27 08:16:03 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2018/03/07 11:57:38 wiz Exp $
DISTNAME= libxshmfence-1.3
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xorg.freedesktop.org/archive/individual/lib/
EXTRACT_SUFX= .tar.bz2
@@ -33,5 +34,5 @@ pre-configure:
cd ${WRKSRC} && autoreconf -vif
.include "../../devel/xorg-util-macros/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/libxshmfence/buildlink3.mk
diff -u pkgsrc/x11/libxshmfence/buildlink3.mk:1.2 pkgsrc/x11/libxshmfence/buildlink3.mk:1.3
--- pkgsrc/x11/libxshmfence/buildlink3.mk:1.2 Wed Apr 29 16:09:43 2015
+++ pkgsrc/x11/libxshmfence/buildlink3.mk Wed Mar 7 11:57:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2015/04/29 16:09:43 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2018/03/07 11:57:38 wiz Exp $
BUILDLINK_TREE+= libxshmfence
@@ -8,7 +8,7 @@ LIBXSHMFENCE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libxshmfence+= libxshmfence>=1.2
BUILDLINK_PKGSRCDIR.libxshmfence?= ../../x11/libxshmfence
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.endif # LIBXSHMFENCE_BUILDLINK3_MK
BUILDLINK_TREE+= -libxshmfence
Index: pkgsrc/x11/mate-settings-daemon/Makefile
diff -u pkgsrc/x11/mate-settings-daemon/Makefile:1.10 pkgsrc/x11/mate-settings-daemon/Makefile:1.11
--- pkgsrc/x11/mate-settings-daemon/Makefile:1.10 Sun Jan 28 20:11:09 2018
+++ pkgsrc/x11/mate-settings-daemon/Makefile Wed Mar 7 11:57:38 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2018/01/28 20:11:09 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:38 wiz Exp $
-PKGREVISION= 3
+PKGREVISION= 4
.include "../../meta-pkgs/mate/Makefile.common"
DISTNAME= mate-settings-daemon-${VERSION:R}.1
@@ -32,6 +32,6 @@ CONF_FILES+= ${PREFIX}/share/examples/ma
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
.include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../x11/kbproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libxklavier/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/modular-xorg-server/Makefile
diff -u pkgsrc/x11/modular-xorg-server/Makefile:1.114 pkgsrc/x11/modular-xorg-server/Makefile:1.115
--- pkgsrc/x11/modular-xorg-server/Makefile:1.114 Thu Oct 5 15:34:13 2017
+++ pkgsrc/x11/modular-xorg-server/Makefile Wed Mar 7 11:57:38 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.114 2017/10/05 15:34:13 wiz Exp $
+# $NetBSD: Makefile,v 1.115 2018/03/07 11:57:38 wiz Exp $
DISTNAME= xorg-server-${XORG_VERSION}
PKGNAME= modular-${DISTNAME}
+PKGREVISION= 1
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= Modular X11 server from modular X.org
Index: pkgsrc/x11/modular-xorg-server/Makefile.common
diff -u pkgsrc/x11/modular-xorg-server/Makefile.common:1.20 pkgsrc/x11/modular-xorg-server/Makefile.common:1.21
--- pkgsrc/x11/modular-xorg-server/Makefile.common:1.20 Wed Dec 20 22:40:48 2017
+++ pkgsrc/x11/modular-xorg-server/Makefile.common Wed Mar 7 11:57:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2017/12/20 22:40:48 wiz Exp $
+# $NetBSD: Makefile.common,v 1.21 2018/03/07 11:57:38 wiz Exp $
# used by x11/modular-xorg-server/Makefile
# used by x11/modular-xorg-xephyr/Makefile
@@ -105,27 +105,10 @@ CONFIGURE_ENV.SunOS+= ac_cv_func_epoll_c
INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input
BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=7.8.0
-BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4
-BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=5.0
-BUILDLINK_API_DEPENDS.damageproto+= damageproto>=1.1
-BUILDLINK_API_DEPENDS.xcmiscproto+= xcmiscproto>=1.2.0
BUILDLINK_API_DEPENDS.xtrans+= xtrans>=1.2.2
-BUILDLINK_API_DEPENDS.bigreqsproto+= bigreqsproto>=1.1.0
-BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.31
-BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.1.99
-BUILDLINK_API_DEPENDS.recordproto+= recordproto>=1.13.99.1
-BUILDLINK_API_DEPENDS.scrnsaverproto+= scrnsaverproto>=1.1
-BUILDLINK_API_DEPENDS.resourceproto+= resourceproto>=1.2.0
BUILDLINK_API_DEPENDS.dri+= dri>=7.8
BUILDLINK_API_DEPENDS.xfont+= xfont>=1.4.2
-BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.16
-BUILDLINK_API_DEPENDS.inputproto+= inputproto>=2.1.99.6
-BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3
BUILDLINK_API_DEPENDS.pixman+= pixman>=0.21.8
-BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.5.0
-BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.11
-BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3
-BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.1.0
BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
@@ -143,13 +126,7 @@ CONFIGURE_ARGS+= --with-sha1=libnettle
BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.11.0
BUILDLINK_DEPMETHOD.libpciaccess= full
.include "../../sysutils/libpciaccess/buildlink3.mk"
-.include "../../x11/bigreqsproto/buildlink3.mk"
-.include "../../x11/compositeproto/buildlink3.mk"
-.include "../../x11/damageproto/buildlink3.mk"
.include "../../x11/evieext/buildlink3.mk"
-.include "../../x11/fixesproto/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/inputproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXau/buildlink3.mk"
.include "../../x11/libXaw/buildlink3.mk"
@@ -164,22 +141,7 @@ BUILDLINK_API_DEPENDS.libXext+= libXext>
.include "../../x11/libxkbfile/buildlink3.mk"
.include "../../x11/libxkbui/buildlink3.mk"
.include "../../x11/pixman/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/recordproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/resourceproto/buildlink3.mk"
-.include "../../x11/scrnsaverproto/buildlink3.mk"
-.include "../../x11/trapproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
-.include "../../x11/xcmiscproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/kbproto/buildlink3.mk"
.include "../../x11/xcb-util-keysyms/buildlink3.mk"
-.include "../../x11/xf86bigfontproto/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
-.include "../../x11/xf86miscproto/buildlink3.mk"
-.include "../../x11/xf86vidmodeproto/buildlink3.mk"
-.include "../../x11/xineramaproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/xtrans/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
Index: pkgsrc/x11/modular-xorg-server/buildlink3.mk
diff -u pkgsrc/x11/modular-xorg-server/buildlink3.mk:1.20 pkgsrc/x11/modular-xorg-server/buildlink3.mk:1.21
--- pkgsrc/x11/modular-xorg-server/buildlink3.mk:1.20 Sat Jan 7 22:34:56 2017
+++ pkgsrc/x11/modular-xorg-server/buildlink3.mk Wed Mar 7 11:57:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2017/01/07 22:34:56 maya Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2018/03/07 11:57:38 wiz Exp $
BUILDLINK_TREE+= modular-xorg-server
@@ -21,30 +21,14 @@ BUILDLINK_DEPMETHOD.libpciaccess= full
.include "../../sysutils/libpciaccess/buildlink3.mk"
.include "../../x11/pixman/buildlink3.mk"
-.include "../../x11/compositeproto/buildlink3.mk"
-.include "../../x11/dri2proto/buildlink3.mk"
-.include "../../x11/dri3proto/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
.if !empty(USE_OLD_MODULAR_XORG_SERVER:M[yY][eE][sS])
.include "../../graphics/MesaLib7/buildlink3.mk" # XXX should not be needed for non-dri build
.include "../../x11/libXfont/buildlink3.mk"
.else
.include "../../x11/libXfont2/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk" # XXX should not be needed for non-dri build
-.include "../../x11/resourceproto/buildlink3.mk"
-.include "../../x11/scrnsaverproto/buildlink3.mk"
-.include "../../x11/presentproto/buildlink3.mk"
.endif
-.include "../../x11/inputproto/buildlink3.mk"
-BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.5.0
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/xf86driproto/buildlink3.mk"
-BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.31
-.include "../../x11/xproto/buildlink3.mk"
-.include "../../x11/xineramaproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.endif # MODULAR_XORG_SERVER_BUILDLINK3_MK
BUILDLINK_TREE+= -modular-xorg-server
Index: pkgsrc/x11/modular-xorg-server/options.mk
diff -u pkgsrc/x11/modular-xorg-server/options.mk:1.17 pkgsrc/x11/modular-xorg-server/options.mk:1.18
--- pkgsrc/x11/modular-xorg-server/options.mk:1.17 Tue Feb 21 14:56:14 2017
+++ pkgsrc/x11/modular-xorg-server/options.mk Wed Mar 7 11:57:38 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.17 2017/02/21 14:56:14 wiz Exp $
+# $NetBSD: options.mk,v 1.18 2018/03/07 11:57:38 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.modular-xorg-server
PKG_SUPPORTED_OPTIONS= inet6 debug dtrace
@@ -16,13 +16,9 @@ PLIST_VARS+= dri dtrace
.include "../../graphics/libepoxy/buildlink3.mk"
BUILDLINK_API_DEPENDS.MesaLib+= MesaLib>=11
.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../x11/glproto/buildlink3.mk"
-.include "../../x11/dri2proto/buildlink3.mk"
-.include "../../x11/dri3proto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libdrm/buildlink3.mk"
.include "../../x11/libxshmfence/buildlink3.mk"
-.include "../../x11/presentproto/buildlink3.mk"
-.include "../../x11/xf86driproto/buildlink3.mk"
PLIST.dri= yes
CONFIGURE_ARGS+= --enable-dri
CONFIGURE_ARGS+= --enable-dri2
Index: pkgsrc/x11/modular-xorg-server112/Makefile
diff -u pkgsrc/x11/modular-xorg-server112/Makefile:1.10 pkgsrc/x11/modular-xorg-server112/Makefile:1.11
--- pkgsrc/x11/modular-xorg-server112/Makefile:1.10 Sat Mar 5 11:29:47 2016
+++ pkgsrc/x11/modular-xorg-server112/Makefile Wed Mar 7 11:57:38 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2016/03/05 11:29:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:38 wiz Exp $
DISTNAME= xorg-server-1.12.4
PKGNAME= modular-${DISTNAME}
-PKGREVISION= 17
+PKGREVISION= 18
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=xserver/}
EXTRACT_SUFX= .tar.bz2
@@ -111,27 +111,10 @@ CONFIGURE_ENV.NetBSD+= ac_cv_header_sys_
INSTALLATION_DIRS+= lib/xorg/modules/drivers lib/xorg/modules/input
BUILDLINK_API_DEPENDS.MesaLib7+= MesaLib7>=7.8.0<10
-BUILDLINK_API_DEPENDS.compositeproto+= compositeproto>=0.4
-BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=5.0
-BUILDLINK_API_DEPENDS.damageproto+= damageproto>=1.1
-BUILDLINK_API_DEPENDS.xcmiscproto+= xcmiscproto>=1.2.0
BUILDLINK_API_DEPENDS.xtrans+= xtrans>=1.2.2
-BUILDLINK_API_DEPENDS.bigreqsproto+= bigreqsproto>=1.1.0
-BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.22
-BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.1.99
-BUILDLINK_API_DEPENDS.recordproto+= recordproto>=1.13.99.1
-BUILDLINK_API_DEPENDS.scrnsaverproto+= scrnsaverproto>=1.1
-BUILDLINK_API_DEPENDS.resourceproto+= resourceproto>=1.2.0
BUILDLINK_API_DEPENDS.dri+= dri>=7.8
BUILDLINK_API_DEPENDS.xfont+= xfont>=1.4.2
-BUILDLINK_API_DEPENDS.glproto+= glproto>=1.4.16
-BUILDLINK_API_DEPENDS.inputproto+= inputproto>=2.1.99.6
-BUILDLINK_API_DEPENDS.kbproto+= kbproto>=1.0.3
BUILDLINK_API_DEPENDS.pixman+= pixman>=0.21.8
-BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.4.0
-BUILDLINK_API_DEPENDS.renderproto+= renderproto>=0.11
-BUILDLINK_API_DEPENDS.xf86dgaproto+= xf86dgaproto>=2.0.3
-BUILDLINK_API_DEPENDS.xf86driproto+= xf86driproto>=2.1.0
BUILD_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
@@ -146,15 +129,7 @@ CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PR
BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.11.0
BUILDLINK_DEPMETHOD.libpciaccess= full
.include "../../sysutils/libpciaccess/buildlink3.mk"
-.include "../../x11/bigreqsproto/buildlink3.mk"
-.include "../../x11/compositeproto/buildlink3.mk"
-.include "../../x11/damageproto/buildlink3.mk"
-.include "../../x11/dri2proto/buildlink3.mk"
.include "../../x11/evieext/buildlink3.mk"
-.include "../../x11/fixesproto/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/glproto/buildlink3.mk"
-.include "../../x11/inputproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXau/buildlink3.mk"
.include "../../x11/libXaw/buildlink3.mk"
@@ -170,23 +145,7 @@ BUILDLINK_API_DEPENDS.libXext+= libXext>
.include "../../x11/libxkbfile/buildlink3.mk"
.include "../../x11/libxkbui/buildlink3.mk"
.include "../../x11/pixman/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/recordproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/resourceproto/buildlink3.mk"
-.include "../../x11/scrnsaverproto/buildlink3.mk"
-.include "../../x11/trapproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
-.include "../../x11/xcmiscproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/kbproto/buildlink3.mk"
-.include "../../x11/xf86bigfontproto/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
-.include "../../x11/xf86driproto/buildlink3.mk"
-.include "../../x11/xf86miscproto/buildlink3.mk"
-.include "../../x11/xf86vidmodeproto/buildlink3.mk"
-.include "../../x11/xineramaproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/xtrans/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/modular-xorg-xephyr/Makefile
diff -u pkgsrc/x11/modular-xorg-xephyr/Makefile:1.10 pkgsrc/x11/modular-xorg-xephyr/Makefile:1.11
--- pkgsrc/x11/modular-xorg-xephyr/Makefile:1.10 Sun Feb 26 22:28:52 2017
+++ pkgsrc/x11/modular-xorg-xephyr/Makefile Wed Mar 7 11:57:38 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2017/02/26 22:28:52 khorben Exp $
+# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:38 wiz Exp $
DISTNAME= xorg-server-${XORG_VERSION}
PKGNAME= modular-xorg-xephyr-${XORG_VERSION}
+PKGREVISION= 1
DISTINFO_FILE= ${.CURDIR}/../../x11/modular-xorg-server/distinfo
PATCHDIR= ${.CURDIR}/../../x11/modular-xorg-server/patches
Index: pkgsrc/x11/modular-xorg-xquartz/Makefile
diff -u pkgsrc/x11/modular-xorg-xquartz/Makefile:1.6 pkgsrc/x11/modular-xorg-xquartz/Makefile:1.7
--- pkgsrc/x11/modular-xorg-xquartz/Makefile:1.6 Sun Sep 3 08:53:17 2017
+++ pkgsrc/x11/modular-xorg-xquartz/Makefile Wed Mar 7 11:57:38 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2017/09/03 08:53:17 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2018/03/07 11:57:38 wiz Exp $
DISTNAME= xorg-server-1.17.2
PKGNAME= ${DISTNAME:S/xorg-server/modular-xorg-xquartz/}
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= https://www.x.org/releases/individual/xserver/
EXTRACT_SUFX= .tar.bz2
@@ -94,15 +95,8 @@ MESSAGE_SUBST+= PREFIX=${PREFIX}
.include "../../graphics/libepoxy/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../wm/libAppleWM/buildlink3.mk"
-.include "../../wm/applewmproto/buildlink3.mk"
-.include "../../x11/bigreqsproto/buildlink3.mk"
-.include "../../x11/compositeproto/buildlink3.mk"
-.include "../../x11/damageproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/evieext/buildlink3.mk"
-.include "../../x11/fixesproto/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/inputproto/buildlink3.mk"
-.include "../../x11/kbproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXau/buildlink3.mk"
.include "../../x11/libXaw/buildlink3.mk"
@@ -116,27 +110,7 @@ MESSAGE_SUBST+= PREFIX=${PREFIX}
.include "../../x11/libxkbfile/buildlink3.mk"
.include "../../x11/libxkbui/buildlink3.mk"
.include "../../x11/pixman/buildlink3.mk"
-.include "../../x11/presentproto/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/recordproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/resourceproto/buildlink3.mk"
-.include "../../x11/scrnsaverproto/buildlink3.mk"
-.include "../../x11/trapproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
-.include "../../x11/xcmiscproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
.include "../../x11/xcb-util-keysyms/buildlink3.mk"
-.include "../../x11/xf86bigfontproto/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
-.include "../../x11/xf86miscproto/buildlink3.mk"
-.include "../../x11/xf86vidmodeproto/buildlink3.mk"
-.include "../../x11/xineramaproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
.include "../../x11/xtrans/buildlink3.mk"
-.include "../../x11/glproto/buildlink3.mk"
-.include "../../x11/dri2proto/buildlink3.mk"
-.include "../../x11/dri3proto/buildlink3.mk"
.include "../../x11/libxshmfence/buildlink3.mk"
-.include "../../x11/xf86driproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/printproto/Makefile
diff -u pkgsrc/x11/printproto/Makefile:1.7 pkgsrc/x11/printproto/Makefile:1.8
--- pkgsrc/x11/printproto/Makefile:1.7 Mon Oct 29 05:06:43 2012
+++ pkgsrc/x11/printproto/Makefile Wed Mar 7 11:57:39 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2012/10/29 05:06:43 asau Exp $
-#
+# $NetBSD: Makefile,v 1.8 2018/03/07 11:57:39 wiz Exp $
DISTNAME= printproto-1.0.5
+PKGREVISION= 1
CATEGORIES= x11 print
MASTER_SITES= ${MASTER_SITE_XORG:=proto/}
EXTRACT_SUFX= .tar.bz2
@@ -17,5 +17,5 @@ PKGCONFIG_OVERRIDE+= printproto.pc.in
CONFIGURE_ENV+= MISC_MAN_SUFFIX=7
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/printproto/buildlink3.mk
diff -u pkgsrc/x11/printproto/buildlink3.mk:1.3 pkgsrc/x11/printproto/buildlink3.mk:1.4
--- pkgsrc/x11/printproto/buildlink3.mk:1.3 Tue May 29 14:18:48 2012
+++ pkgsrc/x11/printproto/buildlink3.mk Wed Mar 7 11:57:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2012/05/29 14:18:48 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2018/03/07 11:57:39 wiz Exp $
BUILDLINK_TREE+= printproto
@@ -10,7 +10,7 @@ BUILDLINK_PKGSRCDIR.printproto?= ../../x
BUILDLINK_DEPMETHOD.printproto?= build
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.endif # PRINTPROTO_BUILDLINK3_MK
BUILDLINK_TREE+= -printproto
Index: pkgsrc/x11/proxymngr/Makefile
diff -u pkgsrc/x11/proxymngr/Makefile:1.4 pkgsrc/x11/proxymngr/Makefile:1.5
--- pkgsrc/x11/proxymngr/Makefile:1.4 Sat Sep 16 19:27:27 2017
+++ pkgsrc/x11/proxymngr/Makefile Wed Mar 7 11:57:39 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2017/09/16 19:27:27 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:39 wiz Exp $
DISTNAME= proxymngr-1.0.4
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -10,6 +11,8 @@ HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= X proxy manager service
LICENSE= x11
+DEPENDS+= lbxproxy-[0-9]*:../../x11/lbxproxy
+
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
@@ -24,11 +27,8 @@ post-install:
${RM} ${DESTDIR}${PKG_SYSCONFDIR}/X11/proxymngr/pmconfig
${INSTALL_DATA} ${WRKSRC}/pmconfig ${DESTDIR}${PREFIX}/${EGDIR}
-BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.17
-.include "../../x11/xproto/buildlink3.mk"
-.include "../../x11/xproxymanagementprotocol/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libICE/buildlink3.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
-DEPENDS+= lbxproxy-[0-9]*:../../x11/lbxproxy
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/rgb/Makefile
diff -u pkgsrc/x11/rgb/Makefile:1.8 pkgsrc/x11/rgb/Makefile:1.9
--- pkgsrc/x11/rgb/Makefile:1.8 Sat Nov 8 21:59:21 2014
+++ pkgsrc/x11/rgb/Makefile Wed Mar 7 11:57:39 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2014/11/08 21:59:21 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:39 wiz Exp $
DISTNAME= rgb-1.0.6
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -14,5 +15,5 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV+= APP_MAN_SUFFIX=1
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/rstart/Makefile
diff -u pkgsrc/x11/rstart/Makefile:1.2 pkgsrc/x11/rstart/Makefile:1.3
--- pkgsrc/x11/rstart/Makefile:1.2 Sat Sep 16 19:27:27 2017
+++ pkgsrc/x11/rstart/Makefile Wed Mar 7 11:57:39 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2017/09/16 19:27:27 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.3 2018/03/07 11:57:39 wiz Exp $
DISTNAME= rstart-1.0.5
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -9,11 +9,10 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Implements "A Flexible Remote Execution Protocol Based on rsh"
-#LICENSE= # TODO: (see mk/license.mk)
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
.include "../../devel/xorg-util-macros/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/sessreg/Makefile
diff -u pkgsrc/x11/sessreg/Makefile:1.13 pkgsrc/x11/sessreg/Makefile:1.14
--- pkgsrc/x11/sessreg/Makefile:1.13 Tue Feb 28 07:34:29 2017
+++ pkgsrc/x11/sessreg/Makefile Wed Mar 7 11:57:39 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2017/02/28 07:34:29 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:39 wiz Exp $
DISTNAME= sessreg-1.1.1
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -21,6 +22,5 @@ CONFIGURE_ARGS+=--localstatedir=${VARBAS
CPPFLAGS+= -P
.endif
-BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.25
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/unicode-screensaver/Makefile
diff -u pkgsrc/x11/unicode-screensaver/Makefile:1.9 pkgsrc/x11/unicode-screensaver/Makefile:1.10
--- pkgsrc/x11/unicode-screensaver/Makefile:1.9 Sun Jan 29 06:26:51 2017
+++ pkgsrc/x11/unicode-screensaver/Makefile Wed Mar 7 11:57:40 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2017/01/29 06:26:51 mef Exp $
-#
+# $NetBSD: Makefile,v 1.10 2018/03/07 11:57:40 wiz Exp $
DISTNAME= unicode-screensaver-0.5
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://www.joachim-breitner.de/archive/unicode-screensaver/
@@ -23,5 +23,5 @@ post-install:
.include "../../x11/libXmu/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xcalib/Makefile
diff -u pkgsrc/x11/xcalib/Makefile:1.6 pkgsrc/x11/xcalib/Makefile:1.7
--- pkgsrc/x11/xcalib/Makefile:1.6 Tue Mar 6 15:31:13 2018
+++ pkgsrc/x11/xcalib/Makefile Wed Mar 7 11:57:40 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2018/03/06 15:31:13 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2018/03/07 11:57:40 wiz Exp $
DISTNAME= xcalib-source-0.8
-PKGREVISION= 2
+PKGREVISION= 3
PKGNAME= ${DISTNAME:C/-source//}
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xcalib/}
@@ -31,7 +31,7 @@ do-build:
do-install:
${SETENV} ${MAKE_ENV} ${LIBTOOL} --tag=CC --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/xcalib ${DESTDIR}${PREFIX}/bin/
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xcompmgr/Makefile
diff -u pkgsrc/x11/xcompmgr/Makefile:1.30 pkgsrc/x11/xcompmgr/Makefile:1.31
--- pkgsrc/x11/xcompmgr/Makefile:1.30 Fri Apr 17 07:00:35 2015
+++ pkgsrc/x11/xcompmgr/Makefile Wed Mar 7 11:57:40 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2015/04/17 07:00:35 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2018/03/07 11:57:40 wiz Exp $
DISTNAME= xcompmgr-1.1.7
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES = ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -25,7 +26,7 @@ XCOMPMGR_DEFS+= -DCAN_DO_USABLE=1 # def
CPPFLAGS+= ${XCOMPMGR_DEFS}
-.include "../../x11/compositeproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libXdamage/buildlink3.mk"
.include "../../x11/libXcomposite/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"
Index: pkgsrc/x11/xdriinfo/Makefile
diff -u pkgsrc/x11/xdriinfo/Makefile:1.7 pkgsrc/x11/xdriinfo/Makefile:1.8
--- pkgsrc/x11/xdriinfo/Makefile:1.7 Sat Apr 25 14:25:21 2015
+++ pkgsrc/x11/xdriinfo/Makefile Wed Mar 7 11:57:40 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2015/04/25 14:25:21 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2018/03/07 11:57:40 wiz Exp $
DISTNAME= xdriinfo-1.0.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -24,7 +24,6 @@ USE_TOOLS+= pkg-config
### graphics/MesaLib/builtin.mk?
###
.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../x11/glproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xev/Makefile
diff -u pkgsrc/x11/xev/Makefile:1.13 pkgsrc/x11/xev/Makefile:1.14
--- pkgsrc/x11/xev/Makefile:1.13 Fri Apr 17 07:05:50 2015
+++ pkgsrc/x11/xev/Makefile Wed Mar 7 11:57:40 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2015/04/17 07:05:50 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:40 wiz Exp $
DISTNAME= xev-1.2.2
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -18,6 +19,5 @@ CONFIGURE_ENV+= APP_MAN_SUFFIX=1
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-input-acecad/Makefile
diff -u pkgsrc/x11/xf86-input-acecad/Makefile:1.8 pkgsrc/x11/xf86-input-acecad/Makefile:1.9
--- pkgsrc/x11/xf86-input-acecad/Makefile:1.8 Sat Sep 16 19:27:28 2017
+++ pkgsrc/x11/xf86-input-acecad/Makefile Wed Mar 7 11:57:41 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2017/09/16 19:27:28 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:41 wiz Exp $
DISTNAME= xf86-input-acecad-1.5.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -18,8 +18,6 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
.include "../../devel/xorg-util-macros/buildlink3.mk"
-.include "../../x11/inputproto/buildlink3.mk"
-.include "../../x11/kbproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-input-elographics/Makefile
diff -u pkgsrc/x11/xf86-input-elographics/Makefile:1.4 pkgsrc/x11/xf86-input-elographics/Makefile:1.5
--- pkgsrc/x11/xf86-input-elographics/Makefile:1.4 Sat Sep 16 19:27:28 2017
+++ pkgsrc/x11/xf86-input-elographics/Makefile Wed Mar 7 11:57:41 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2017/09/16 19:27:28 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:41 wiz Exp $
DISTNAME= xf86-input-elographics-1.4.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -17,6 +17,6 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-input-fpit/Makefile
diff -u pkgsrc/x11/xf86-input-fpit/Makefile:1.4 pkgsrc/x11/xf86-input-fpit/Makefile:1.5
--- pkgsrc/x11/xf86-input-fpit/Makefile:1.4 Sat Sep 16 19:27:28 2017
+++ pkgsrc/x11/xf86-input-fpit/Makefile Wed Mar 7 11:57:41 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2017/09/16 19:27:28 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:41 wiz Exp $
DISTNAME= xf86-input-fpit-1.4.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -18,6 +18,6 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
.include "../../devel/xorg-util-macros/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-input-hyperpen/Makefile
diff -u pkgsrc/x11/xf86-input-hyperpen/Makefile:1.5 pkgsrc/x11/xf86-input-hyperpen/Makefile:1.6
--- pkgsrc/x11/xf86-input-hyperpen/Makefile:1.5 Sat Sep 16 19:27:28 2017
+++ pkgsrc/x11/xf86-input-hyperpen/Makefile Wed Mar 7 11:57:41 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2017/09/16 19:27:28 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2018/03/07 11:57:41 wiz Exp $
DISTNAME= xf86-input-hyperpen-1.4.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -18,6 +18,6 @@ USE_LANGUAGES+= c99
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-input-joystick/Makefile
diff -u pkgsrc/x11/xf86-input-joystick/Makefile:1.7 pkgsrc/x11/xf86-input-joystick/Makefile:1.8
--- pkgsrc/x11/xf86-input-joystick/Makefile:1.7 Wed Dec 27 14:13:55 2017
+++ pkgsrc/x11/xf86-input-joystick/Makefile Wed Mar 7 11:57:41 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2017/12/27 14:13:55 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2018/03/07 11:57:41 wiz Exp $
DISTNAME= xf86-input-joystick-1.6.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -26,8 +26,7 @@ SUBST_FILES.usbhid+= src/backend_bsd.c
SUBST_SED.usbhid= -e 's,dev/usb/,bus/u4b/,g'
SUBST_MESSAGE.usbhid= Correct usbhid include paths
-.include "../../x11/kbproto/buildlink3.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-input-keyboard/Makefile
diff -u pkgsrc/x11/xf86-input-keyboard/Makefile:1.25 pkgsrc/x11/xf86-input-keyboard/Makefile:1.26
--- pkgsrc/x11/xf86-input-keyboard/Makefile:1.25 Sun Jan 21 13:42:26 2018
+++ pkgsrc/x11/xf86-input-keyboard/Makefile Wed Mar 7 11:57:41 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2018/01/21 13:42:26 triaxx Exp $
+# $NetBSD: Makefile,v 1.26 2018/03/07 11:57:41 wiz Exp $
DISTNAME= xf86-input-keyboard-1.9.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -17,11 +17,7 @@ USE_TOOLS+= gmake pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-.include "../../x11/inputproto/buildlink3.mk"
.include "../../x11/libxkbfile/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/kbproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-input-mouse/Makefile
diff -u pkgsrc/x11/xf86-input-mouse/Makefile:1.28 pkgsrc/x11/xf86-input-mouse/Makefile:1.29
--- pkgsrc/x11/xf86-input-mouse/Makefile:1.28 Sun Jan 21 10:47:47 2018
+++ pkgsrc/x11/xf86-input-mouse/Makefile Wed Mar 7 11:57:41 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2018/01/21 10:47:47 triaxx Exp $
+# $NetBSD: Makefile,v 1.29 2018/03/07 11:57:41 wiz Exp $
DISTNAME= xf86-input-mouse-1.9.2
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -16,10 +17,6 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/inputproto/buildlink3.mk"
-.include "../../x11/kbproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-input-mutouch/Makefile
diff -u pkgsrc/x11/xf86-input-mutouch/Makefile:1.5 pkgsrc/x11/xf86-input-mutouch/Makefile:1.6
--- pkgsrc/x11/xf86-input-mutouch/Makefile:1.5 Sat Sep 16 19:27:28 2017
+++ pkgsrc/x11/xf86-input-mutouch/Makefile Wed Mar 7 11:57:41 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2017/09/16 19:27:28 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2018/03/07 11:57:41 wiz Exp $
DISTNAME= xf86-input-mutouch-1.3.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Microtouch input driver for the Xorg X server
-#LICENSE= # TODO: (see mk/license.mk)
GNU_CONFIGURE= yes
USE_LANGUAGES= c99
@@ -18,6 +17,6 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-input-penmount/Makefile
diff -u pkgsrc/x11/xf86-input-penmount/Makefile:1.8 pkgsrc/x11/xf86-input-penmount/Makefile:1.9
--- pkgsrc/x11/xf86-input-penmount/Makefile:1.8 Sat Sep 16 19:27:29 2017
+++ pkgsrc/x11/xf86-input-penmount/Makefile Wed Mar 7 11:57:41 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2017/09/16 19:27:29 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:41 wiz Exp $
DISTNAME= xf86-input-penmount-1.5.0
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -17,7 +17,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-input-vmmouse/Makefile
diff -u pkgsrc/x11/xf86-input-vmmouse/Makefile:1.22 pkgsrc/x11/xf86-input-vmmouse/Makefile:1.23
--- pkgsrc/x11/xf86-input-vmmouse/Makefile:1.22 Sat Aug 20 14:48:18 2016
+++ pkgsrc/x11/xf86-input-vmmouse/Makefile Wed Mar 7 11:57:41 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2016/08/20 14:48:18 kamil Exp $
+# $NetBSD: Makefile,v 1.23 2018/03/07 11:57:41 wiz Exp $
DISTNAME= xf86-input-vmmouse-13.1.0
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -20,10 +20,6 @@ CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=
# Currently libudev is unsupported in pkgsrc
CONFIGURE_ARGS+= --without-libudev
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/inputproto/buildlink3.mk"
-.include "../../x11/kbproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-input-void/Makefile
diff -u pkgsrc/x11/xf86-input-void/Makefile:1.16 pkgsrc/x11/xf86-input-void/Makefile:1.17
--- pkgsrc/x11/xf86-input-void/Makefile:1.16 Fri Feb 26 11:27:18 2016
+++ pkgsrc/x11/xf86-input-void/Makefile Wed Mar 7 11:57:41 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2016/02/26 11:27:18 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2018/03/07 11:57:41 wiz Exp $
DISTNAME= xf86-input-void-1.4.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -16,9 +16,6 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-.include "../../x11/inputproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-input-ws/Makefile
diff -u pkgsrc/x11/xf86-input-ws/Makefile:1.2 pkgsrc/x11/xf86-input-ws/Makefile:1.3
--- pkgsrc/x11/xf86-input-ws/Makefile:1.2 Tue Jan 5 13:11:42 2016
+++ pkgsrc/x11/xf86-input-ws/Makefile Wed Mar 7 11:57:42 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2016/01/05 13:11:42 tnn Exp $
-#
+# $NetBSD: Makefile,v 1.3 2018/03/07 11:57:42 wiz Exp $
DISTNAME= xf86-input-ws-1.3.0.20151010
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
@@ -17,7 +16,5 @@ USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-.include "../../x11/inputproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-apm/Makefile
diff -u pkgsrc/x11/xf86-video-apm/Makefile:1.18 pkgsrc/x11/xf86-video-apm/Makefile:1.19
--- pkgsrc/x11/xf86-video-apm/Makefile:1.18 Fri Feb 26 11:27:18 2016
+++ pkgsrc/x11/xf86-video-apm/Makefile Wed Mar 7 11:57:42 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2016/02/26 11:27:18 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.19 2018/03/07 11:57:42 wiz Exp $
DISTNAME= xf86-video-apm-1.2.5
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -18,9 +17,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXext?= build
.include "../../x11/libXext/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-ark/Makefile
diff -u pkgsrc/x11/xf86-video-ark/Makefile:1.17 pkgsrc/x11/xf86-video-ark/Makefile:1.18
--- pkgsrc/x11/xf86-video-ark/Makefile:1.17 Fri Feb 26 11:27:18 2016
+++ pkgsrc/x11/xf86-video-ark/Makefile Wed Mar 7 11:57:42 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2016/02/26 11:27:18 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.18 2018/03/07 11:57:42 wiz Exp $
DISTNAME= xf86-video-ark-0.7.5
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -18,8 +17,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXext?= build
.include "../../x11/libXext/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-ati/Makefile
diff -u pkgsrc/x11/xf86-video-ati/Makefile:1.43 pkgsrc/x11/xf86-video-ati/Makefile:1.44
--- pkgsrc/x11/xf86-video-ati/Makefile:1.43 Fri Sep 8 08:45:49 2017
+++ pkgsrc/x11/xf86-video-ati/Makefile Wed Mar 7 11:57:42 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2017/09/08 08:45:49 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2018/03/07 11:57:42 wiz Exp $
DISTNAME= xf86-video-ati-7.10.0
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -25,17 +26,7 @@ BUILDLINK_API_DEPENDS.modular-xorg-serve
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/glproto/buildlink3.mk"
BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.58
.include "../../x11/libdrm/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
-.include "../../x11/xf86driproto/buildlink3.mk"
-.include "../../x11/xf86miscproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/xineramaproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-ati6/Makefile
diff -u pkgsrc/x11/xf86-video-ati6/Makefile:1.13 pkgsrc/x11/xf86-video-ati6/Makefile:1.14
--- pkgsrc/x11/xf86-video-ati6/Makefile:1.13 Fri Feb 26 11:27:18 2016
+++ pkgsrc/x11/xf86-video-ati6/Makefile Wed Mar 7 11:57:42 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2016/02/26 11:27:18 jperkin Exp $
+# $NetBSD: Makefile,v 1.14 2018/03/07 11:57:42 wiz Exp $
DISTNAME= xf86-video-ati-6.14.6
PKGNAME= ${DISTNAME:S/ati/ati6/}
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -30,16 +30,6 @@ pre-configure:
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/glproto/buildlink3.mk"
.include "../../x11/libdrm/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
-.include "../../x11/xf86driproto/buildlink3.mk"
-.include "../../x11/xf86miscproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/xineramaproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-chips/Makefile
diff -u pkgsrc/x11/xf86-video-chips/Makefile:1.18 pkgsrc/x11/xf86-video-chips/Makefile:1.19
--- pkgsrc/x11/xf86-video-chips/Makefile:1.18 Wed Jan 18 18:28:03 2017
+++ pkgsrc/x11/xf86-video-chips/Makefile Wed Mar 7 11:57:42 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2017/01/18 18:28:03 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2018/03/07 11:57:42 wiz Exp $
DISTNAME= xf86-video-chips-1.2.7
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -24,9 +25,7 @@ post-extract:
.endif
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXext?= build
.include "../../x11/libXext/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-cirrus/Makefile
diff -u pkgsrc/x11/xf86-video-cirrus/Makefile:1.19 pkgsrc/x11/xf86-video-cirrus/Makefile:1.20
--- pkgsrc/x11/xf86-video-cirrus/Makefile:1.19 Fri Feb 26 11:27:18 2016
+++ pkgsrc/x11/xf86-video-cirrus/Makefile Wed Mar 7 11:57:42 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2016/02/26 11:27:18 jperkin Exp $
+# $NetBSD: Makefile,v 1.20 2018/03/07 11:57:42 wiz Exp $
DISTNAME= xf86-video-cirrus-1.5.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -17,9 +17,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXext?= build
.include "../../x11/libXext/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-dummy/Makefile
diff -u pkgsrc/x11/xf86-video-dummy/Makefile:1.9 pkgsrc/x11/xf86-video-dummy/Makefile:1.10
--- pkgsrc/x11/xf86-video-dummy/Makefile:1.9 Sat Sep 16 19:27:29 2017
+++ pkgsrc/x11/xf86-video-dummy/Makefile Wed Mar 7 11:57:42 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2017/09/16 19:27:29 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2018/03/07 11:57:42 wiz Exp $
DISTNAME= xf86-video-dummy-0.3.8
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -8,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Virtual/offscreen frame buffer driver for the Xorg X server
-#LICENSE= # TODO: (see mk/license.mk)
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
@@ -16,9 +16,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-.include "../../x11/xf86dgaproto/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-fbdev/Makefile
diff -u pkgsrc/x11/xf86-video-fbdev/Makefile:1.10 pkgsrc/x11/xf86-video-fbdev/Makefile:1.11
--- pkgsrc/x11/xf86-video-fbdev/Makefile:1.10 Sat Sep 16 19:27:29 2017
+++ pkgsrc/x11/xf86-video-fbdev/Makefile Wed Mar 7 11:57:42 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2017/09/16 19:27:29 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:42 wiz Exp $
DISTNAME= xf86-video-fbdev-0.4.4
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -17,8 +17,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-glint/Makefile
diff -u pkgsrc/x11/xf86-video-glint/Makefile:1.20 pkgsrc/x11/xf86-video-glint/Makefile:1.21
--- pkgsrc/x11/xf86-video-glint/Makefile:1.20 Wed Jan 18 20:17:32 2017
+++ pkgsrc/x11/xf86-video-glint/Makefile Wed Mar 7 11:57:42 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2017/01/18 20:17:32 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2018/03/07 11:57:42 wiz Exp $
DISTNAME= xf86-video-glint-1.2.9
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -18,9 +19,5 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-i128/Makefile
diff -u pkgsrc/x11/xf86-video-i128/Makefile:1.18 pkgsrc/x11/xf86-video-i128/Makefile:1.19
--- pkgsrc/x11/xf86-video-i128/Makefile:1.18 Fri Feb 26 11:27:19 2016
+++ pkgsrc/x11/xf86-video-i128/Makefile Wed Mar 7 11:57:42 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2016/02/26 11:27:19 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.19 2018/03/07 11:57:42 wiz Exp $
DISTNAME= xf86-video-i128-1.3.6
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -18,9 +17,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXext?= build
.include "../../x11/libXext/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-i740/Makefile
diff -u pkgsrc/x11/xf86-video-i740/Makefile:1.20 pkgsrc/x11/xf86-video-i740/Makefile:1.21
--- pkgsrc/x11/xf86-video-i740/Makefile:1.20 Wed Jan 18 20:21:14 2017
+++ pkgsrc/x11/xf86-video-i740/Makefile Wed Mar 7 11:57:43 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2017/01/18 20:21:14 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2018/03/07 11:57:43 wiz Exp $
DISTNAME= xf86-video-i740-1.3.6
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -16,9 +17,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXext?= build
.include "../../x11/libXext/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-intel/Makefile
diff -u pkgsrc/x11/xf86-video-intel/Makefile:1.39 pkgsrc/x11/xf86-video-intel/Makefile:1.40
--- pkgsrc/x11/xf86-video-intel/Makefile:1.39 Wed Dec 7 21:59:54 2016
+++ pkgsrc/x11/xf86-video-intel/Makefile Wed Mar 7 11:57:43 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2016/12/07 21:59:54 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2018/03/07 11:57:43 wiz Exp $
DISTNAME= xf86-video-intel-2.99.917
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -25,6 +25,6 @@ BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/libXvMC/buildlink3.mk"
.include "../../x11/libdrm/buildlink3.mk"
-.include "../../x11/xineramaproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-mach64/Makefile
diff -u pkgsrc/x11/xf86-video-mach64/Makefile:1.18 pkgsrc/x11/xf86-video-mach64/Makefile:1.19
--- pkgsrc/x11/xf86-video-mach64/Makefile:1.18 Fri Feb 26 11:27:19 2016
+++ pkgsrc/x11/xf86-video-mach64/Makefile Wed Mar 7 11:57:43 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2016/02/26 11:27:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.19 2018/03/07 11:57:43 wiz Exp $
DISTNAME= xf86-video-mach64-6.9.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -22,16 +22,6 @@ CPPFLAGS.SunOS+= -D__EXTENSIONS__
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/glproto/buildlink3.mk"
.include "../../x11/libdrm/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
-.include "../../x11/xf86driproto/buildlink3.mk"
-.include "../../x11/xf86miscproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/xineramaproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-mga/Makefile
diff -u pkgsrc/x11/xf86-video-mga/Makefile:1.23 pkgsrc/x11/xf86-video-mga/Makefile:1.24
--- pkgsrc/x11/xf86-video-mga/Makefile:1.23 Wed Jan 18 18:26:41 2017
+++ pkgsrc/x11/xf86-video-mga/Makefile Wed Mar 7 11:57:43 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2017/01/18 18:26:41 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2018/03/07 11:57:43 wiz Exp $
DISTNAME= xf86-video-mga-1.6.5
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -18,8 +19,5 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-modesetting/Makefile
diff -u pkgsrc/x11/xf86-video-modesetting/Makefile:1.4 pkgsrc/x11/xf86-video-modesetting/Makefile:1.5
--- pkgsrc/x11/xf86-video-modesetting/Makefile:1.4 Sat Sep 16 19:27:29 2017
+++ pkgsrc/x11/xf86-video-modesetting/Makefile Wed Mar 7 11:57:43 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2017/09/16 19:27:29 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:43 wiz Exp $
DISTNAME= xf86-video-modesetting-0.9.0
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -18,13 +19,10 @@ USE_OLD_MODULAR_XORG_SERVER= yes
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.99.1
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../sysutils/libpciaccess/buildlink3.mk"
.include "../../x11/libdrm/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-newport/Makefile
diff -u pkgsrc/x11/xf86-video-newport/Makefile:1.8 pkgsrc/x11/xf86-video-newport/Makefile:1.9
--- pkgsrc/x11/xf86-video-newport/Makefile:1.8 Sat Sep 16 19:27:29 2017
+++ pkgsrc/x11/xf86-video-newport/Makefile Wed Mar 7 11:57:43 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2017/09/16 19:27:29 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:43 wiz Exp $
DISTNAME= xf86-video-newport-0.2.4
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -21,8 +21,7 @@ CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=
USE_OLD_MODULAR_XORG_SERVER= yes
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-nouveau/Makefile
diff -u pkgsrc/x11/xf86-video-nouveau/Makefile:1.10 pkgsrc/x11/xf86-video-nouveau/Makefile:1.11
--- pkgsrc/x11/xf86-video-nouveau/Makefile:1.10 Mon Apr 24 07:25:47 2017
+++ pkgsrc/x11/xf86-video-nouveau/Makefile Wed Mar 7 11:57:43 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2017/04/24 07:25:47 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:43 wiz Exp $
DISTNAME= xf86-video-nouveau-1.0.15
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xorg.freedesktop.org/archive/individual/driver/
EXTRACT_SUFX= .tar.bz2
@@ -18,12 +19,5 @@ CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/libdrm/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/xf86driproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/glproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-nv/Makefile
diff -u pkgsrc/x11/xf86-video-nv/Makefile:1.31 pkgsrc/x11/xf86-video-nv/Makefile:1.32
--- pkgsrc/x11/xf86-video-nv/Makefile:1.31 Wed Jan 18 20:16:04 2017
+++ pkgsrc/x11/xf86-video-nv/Makefile Wed Mar 7 11:57:43 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2017/01/18 20:16:04 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2018/03/07 11:57:43 wiz Exp $
DISTNAME= xf86-video-nv-2.1.21
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -18,17 +19,8 @@ CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/glproto/buildlink3.mk"
.include "../../x11/libdrm/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
-.include "../../x11/xf86driproto/buildlink3.mk"
-.include "../../x11/xf86miscproto/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXext?= build
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xineramaproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-openchrome/Makefile
diff -u pkgsrc/x11/xf86-video-openchrome/Makefile:1.20 pkgsrc/x11/xf86-video-openchrome/Makefile:1.21
--- pkgsrc/x11/xf86-video-openchrome/Makefile:1.20 Sun Dec 24 10:19:02 2017
+++ pkgsrc/x11/xf86-video-openchrome/Makefile Wed Mar 7 11:57:43 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2017/12/24 10:19:02 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2018/03/07 11:57:43 wiz Exp $
DISTNAME= xf86-video-openchrome-0.6.0
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xorg.freedesktop.org/archive/individual/driver/
EXTRACT_SUFX= .tar.bz2
@@ -28,8 +29,5 @@ PLIST.XvMC= yes
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../x11/libXvMC/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-qxl/Makefile
diff -u pkgsrc/x11/xf86-video-qxl/Makefile:1.7 pkgsrc/x11/xf86-video-qxl/Makefile:1.8
--- pkgsrc/x11/xf86-video-qxl/Makefile:1.7 Sat Sep 16 19:27:29 2017
+++ pkgsrc/x11/xf86-video-qxl/Makefile Wed Mar 7 11:57:43 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2017/09/16 19:27:29 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2018/03/07 11:57:43 wiz Exp $
DISTNAME= xf86-video-qxl-0.1.5
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -24,9 +25,7 @@ BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2
.include "../../x11/libdrm/buildlink3.mk"
.include "../../sysutils/libpciaccess/buildlink3.mk"
.include "../../sysutils/spice-protocol/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-r128/Makefile
diff -u pkgsrc/x11/xf86-video-r128/Makefile:1.19 pkgsrc/x11/xf86-video-r128/Makefile:1.20
--- pkgsrc/x11/xf86-video-r128/Makefile:1.19 Wed Jan 18 20:22:39 2017
+++ pkgsrc/x11/xf86-video-r128/Makefile Wed Mar 7 11:57:43 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2017/01/18 20:22:39 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2018/03/07 11:57:43 wiz Exp $
DISTNAME= xf86-video-r128-6.10.2
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -21,16 +22,6 @@ CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/glproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libdrm/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
-.include "../../x11/xf86driproto/buildlink3.mk"
-.include "../../x11/xf86miscproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/xineramaproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-rendition/Makefile
diff -u pkgsrc/x11/xf86-video-rendition/Makefile:1.19 pkgsrc/x11/xf86-video-rendition/Makefile:1.20
--- pkgsrc/x11/xf86-video-rendition/Makefile:1.19 Fri Feb 26 11:27:20 2016
+++ pkgsrc/x11/xf86-video-rendition/Makefile Wed Mar 7 11:57:44 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2016/02/26 11:27:20 jperkin Exp $
+# $NetBSD: Makefile,v 1.20 2018/03/07 11:57:44 wiz Exp $
DISTNAME= xf86-video-rendition-4.2.6
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -17,8 +17,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXext?= build
.include "../../x11/libXext/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-s3/Makefile
diff -u pkgsrc/x11/xf86-video-s3/Makefile:1.18 pkgsrc/x11/xf86-video-s3/Makefile:1.19
--- pkgsrc/x11/xf86-video-s3/Makefile:1.18 Fri Feb 26 11:27:20 2016
+++ pkgsrc/x11/xf86-video-s3/Makefile Wed Mar 7 11:57:44 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2016/02/26 11:27:20 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.19 2018/03/07 11:57:44 wiz Exp $
DISTNAME= xf86-video-s3-0.6.5
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -18,9 +17,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXext?= build
.include "../../x11/libXext/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-s3virge/Makefile
diff -u pkgsrc/x11/xf86-video-s3virge/Makefile:1.19 pkgsrc/x11/xf86-video-s3virge/Makefile:1.20
--- pkgsrc/x11/xf86-video-s3virge/Makefile:1.19 Fri Feb 26 11:27:20 2016
+++ pkgsrc/x11/xf86-video-s3virge/Makefile Wed Mar 7 11:57:44 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2016/02/26 11:27:20 jperkin Exp $
+# $NetBSD: Makefile,v 1.20 2018/03/07 11:57:44 wiz Exp $
DISTNAME= xf86-video-s3virge-1.10.7
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -17,9 +17,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXext?= build
.include "../../x11/libXext/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-savage/Makefile
diff -u pkgsrc/x11/xf86-video-savage/Makefile:1.22 pkgsrc/x11/xf86-video-savage/Makefile:1.23
--- pkgsrc/x11/xf86-video-savage/Makefile:1.22 Wed Jan 18 20:19:57 2017
+++ pkgsrc/x11/xf86-video-savage/Makefile Wed Mar 7 11:57:44 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2017/01/18 20:19:57 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2018/03/07 11:57:44 wiz Exp $
DISTNAME= xf86-video-savage-2.3.9
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -18,8 +19,5 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-siliconmotion/Makefile
diff -u pkgsrc/x11/xf86-video-siliconmotion/Makefile:1.20 pkgsrc/x11/xf86-video-siliconmotion/Makefile:1.21
--- pkgsrc/x11/xf86-video-siliconmotion/Makefile:1.20 Wed Jan 18 18:31:17 2017
+++ pkgsrc/x11/xf86-video-siliconmotion/Makefile Wed Mar 7 11:57:44 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2017/01/18 18:31:17 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2018/03/07 11:57:44 wiz Exp $
DISTNAME= xf86-video-siliconmotion-1.7.9
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -16,9 +17,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXext?= build
.include "../../x11/libXext/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-sis/Makefile
diff -u pkgsrc/x11/xf86-video-sis/Makefile:1.25 pkgsrc/x11/xf86-video-sis/Makefile:1.26
--- pkgsrc/x11/xf86-video-sis/Makefile:1.25 Wed Jan 18 18:25:18 2017
+++ pkgsrc/x11/xf86-video-sis/Makefile Wed Mar 7 11:57:44 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2017/01/18 18:25:18 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2018/03/07 11:57:44 wiz Exp $
DISTNAME= xf86-video-sis-0.10.9
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -23,11 +24,5 @@ CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PR
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
-.include "../../x11/xf86miscproto/buildlink3.mk"
-.include "../../x11/xineramaproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-suncg14/Makefile
diff -u pkgsrc/x11/xf86-video-suncg14/Makefile:1.8 pkgsrc/x11/xf86-video-suncg14/Makefile:1.9
--- pkgsrc/x11/xf86-video-suncg14/Makefile:1.8 Sat Sep 16 19:27:29 2017
+++ pkgsrc/x11/xf86-video-suncg14/Makefile Wed Mar 7 11:57:44 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2017/09/16 19:27:29 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:44 wiz Exp $
DISTNAME= xf86-video-suncg14-1.1.2
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -19,8 +19,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-suncg3/Makefile
diff -u pkgsrc/x11/xf86-video-suncg3/Makefile:1.8 pkgsrc/x11/xf86-video-suncg3/Makefile:1.9
--- pkgsrc/x11/xf86-video-suncg3/Makefile:1.8 Sat Sep 16 19:27:29 2017
+++ pkgsrc/x11/xf86-video-suncg3/Makefile Wed Mar 7 11:57:44 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2017/09/16 19:27:29 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:44 wiz Exp $
DISTNAME= xf86-video-suncg3-1.1.2
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -17,8 +17,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-suncg6/Makefile
diff -u pkgsrc/x11/xf86-video-suncg6/Makefile:1.4 pkgsrc/x11/xf86-video-suncg6/Makefile:1.5
--- pkgsrc/x11/xf86-video-suncg6/Makefile:1.4 Sat Sep 16 19:27:30 2017
+++ pkgsrc/x11/xf86-video-suncg6/Makefile Wed Mar 7 11:57:44 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2017/09/16 19:27:30 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:44 wiz Exp $
DISTNAME= xf86-video-suncg6-1.1.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= GX/Turbo GX video driver for the Xorg X server
-#LICENSE= # TODO: (see mk/license.mk)
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
@@ -19,8 +18,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-sunffb/Makefile
diff -u pkgsrc/x11/xf86-video-sunffb/Makefile:1.8 pkgsrc/x11/xf86-video-sunffb/Makefile:1.9
--- pkgsrc/x11/xf86-video-sunffb/Makefile:1.8 Sat Sep 16 19:27:30 2017
+++ pkgsrc/x11/xf86-video-sunffb/Makefile Wed Mar 7 11:57:44 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2017/09/16 19:27:30 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/03/07 11:57:44 wiz Exp $
DISTNAME= xf86-video-sunffb-1.2.2
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -19,10 +19,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.99.1
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-sunleo/Makefile
diff -u pkgsrc/x11/xf86-video-sunleo/Makefile:1.1 pkgsrc/x11/xf86-video-sunleo/Makefile:1.2
--- pkgsrc/x11/xf86-video-sunleo/Makefile:1.1 Wed Jan 25 11:39:37 2017
+++ pkgsrc/x11/xf86-video-sunleo/Makefile Wed Mar 7 11:57:44 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2017/01/25 11:39:37 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2018/03/07 11:57:44 wiz Exp $
DISTNAME= xf86-video-sunleo-1.2.2
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -16,9 +17,6 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.99.1
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-suntcx/Makefile
diff -u pkgsrc/x11/xf86-video-suntcx/Makefile:1.4 pkgsrc/x11/xf86-video-suntcx/Makefile:1.5
--- pkgsrc/x11/xf86-video-suntcx/Makefile:1.4 Sat Sep 16 19:27:30 2017
+++ pkgsrc/x11/xf86-video-suntcx/Makefile Wed Mar 7 11:57:45 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2017/09/16 19:27:30 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:45 wiz Exp $
DISTNAME= xf86-video-suntcx-1.1.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -9,7 +9,6 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= TCX video driver for the Xorg X server
-#LICENSE= # TODO: (see mk/license.mk)
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
@@ -19,8 +18,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-tdfx/Makefile
diff -u pkgsrc/x11/xf86-video-tdfx/Makefile:1.21 pkgsrc/x11/xf86-video-tdfx/Makefile:1.22
--- pkgsrc/x11/xf86-video-tdfx/Makefile:1.21 Wed Jan 18 18:23:24 2017
+++ pkgsrc/x11/xf86-video-tdfx/Makefile Wed Mar 7 11:57:45 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2017/01/18 18:23:24 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2018/03/07 11:57:45 wiz Exp $
DISTNAME= xf86-video-tdfx-1.4.7
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -18,9 +19,5 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/glproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-tga/Makefile
diff -u pkgsrc/x11/xf86-video-tga/Makefile:1.16 pkgsrc/x11/xf86-video-tga/Makefile:1.17
--- pkgsrc/x11/xf86-video-tga/Makefile:1.16 Fri Feb 26 11:27:21 2016
+++ pkgsrc/x11/xf86-video-tga/Makefile Wed Mar 7 11:57:45 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2016/02/26 11:27:21 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.17 2018/03/07 11:57:45 wiz Exp $
DISTNAME= xf86-video-tga-1.2.2
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -18,9 +17,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXext?= build
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-trident/Makefile
diff -u pkgsrc/x11/xf86-video-trident/Makefile:1.20 pkgsrc/x11/xf86-video-trident/Makefile:1.21
--- pkgsrc/x11/xf86-video-trident/Makefile:1.20 Wed Jan 18 20:19:21 2017
+++ pkgsrc/x11/xf86-video-trident/Makefile Wed Mar 7 11:57:45 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2017/01/18 20:19:21 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2018/03/07 11:57:45 wiz Exp $
DISTNAME= xf86-video-trident-1.3.8
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -16,10 +17,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXext?= build
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-tseng/Makefile
diff -u pkgsrc/x11/xf86-video-tseng/Makefile:1.18 pkgsrc/x11/xf86-video-tseng/Makefile:1.19
--- pkgsrc/x11/xf86-video-tseng/Makefile:1.18 Fri Feb 26 11:27:21 2016
+++ pkgsrc/x11/xf86-video-tseng/Makefile Wed Mar 7 11:57:45 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2016/02/26 11:27:21 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.19 2018/03/07 11:57:45 wiz Exp $
DISTNAME= xf86-video-tseng-1.2.5
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -18,9 +17,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXext?= build
.include "../../x11/libXext/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-vmware/Makefile
diff -u pkgsrc/x11/xf86-video-vmware/Makefile:1.26 pkgsrc/x11/xf86-video-vmware/Makefile:1.27
--- pkgsrc/x11/xf86-video-vmware/Makefile:1.26 Fri Nov 18 08:07:47 2016
+++ pkgsrc/x11/xf86-video-vmware/Makefile Wed Mar 7 11:57:45 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2016/11/18 08:07:47 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2018/03/07 11:57:45 wiz Exp $
DISTNAME= xf86-video-vmware-13.2.1
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -34,8 +35,7 @@ pre-configure:
.endif
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
BUILDLINK_DEPMETHOD.libXext?= build
.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xineramaproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-voodoo/Makefile
diff -u pkgsrc/x11/xf86-video-voodoo/Makefile:1.4 pkgsrc/x11/xf86-video-voodoo/Makefile:1.5
--- pkgsrc/x11/xf86-video-voodoo/Makefile:1.4 Sat Sep 16 19:27:30 2017
+++ pkgsrc/x11/xf86-video-voodoo/Makefile Wed Mar 7 11:57:45 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2017/09/16 19:27:30 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:45 wiz Exp $
DISTNAME= xf86-video-voodoo-1.2.5
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -19,12 +19,8 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
-BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.99.1
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../sysutils/libpciaccess/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
.include "../../x11/modular-xorg-server/buildlink3.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-wsfb/Makefile
diff -u pkgsrc/x11/xf86-video-wsfb/Makefile:1.17 pkgsrc/x11/xf86-video-wsfb/Makefile:1.18
--- pkgsrc/x11/xf86-video-wsfb/Makefile:1.17 Fri Feb 26 11:27:21 2016
+++ pkgsrc/x11/xf86-video-wsfb/Makefile Wed Mar 7 11:57:45 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2016/02/26 11:27:21 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2018/03/07 11:57:45 wiz Exp $
DISTNAME= xf86-video-wsfb-0.4.0
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -19,5 +19,5 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
.include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xf86-video-xgi/Makefile
diff -u pkgsrc/x11/xf86-video-xgi/Makefile:1.4 pkgsrc/x11/xf86-video-xgi/Makefile:1.5
--- pkgsrc/x11/xf86-video-xgi/Makefile:1.4 Fri Feb 26 11:27:21 2016
+++ pkgsrc/x11/xf86-video-xgi/Makefile Wed Mar 7 11:57:45 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2016/02/26 11:27:21 jperkin Exp $
+# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:45 wiz Exp $
DISTNAME= xf86-video-xgi-1.6.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
@@ -17,8 +17,5 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV.SunOS+= DRIVER_MAN_SUFFIX=4
.include "../../x11/modular-xorg-server/buildlink3.mk"
-#.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
-#.include "../../x11/renderproto/buildlink3.mk"
-#.include "../../x11/videoproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xfsinfo/Makefile
diff -u pkgsrc/x11/xfsinfo/Makefile:1.3 pkgsrc/x11/xfsinfo/Makefile:1.4
--- pkgsrc/x11/xfsinfo/Makefile:1.3 Sat Sep 16 19:27:30 2017
+++ pkgsrc/x11/xfsinfo/Makefile Wed Mar 7 11:57:46 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2017/09/16 19:27:30 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2018/03/07 11:57:46 wiz Exp $
DISTNAME= xfsinfo-1.0.5
+PKGREVISION= 1
CATEGORIES= fonts x11
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -14,7 +15,6 @@ GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
.include "../../x11/libFS/buildlink3.mk"
-BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.17
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xfstt/Makefile
diff -u pkgsrc/x11/xfstt/Makefile:1.41 pkgsrc/x11/xfstt/Makefile:1.42
--- pkgsrc/x11/xfstt/Makefile:1.41 Sun Jan 29 05:54:21 2017
+++ pkgsrc/x11/xfstt/Makefile Wed Mar 7 11:57:46 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2017/01/29 05:54:21 mef Exp $
+# $NetBSD: Makefile,v 1.42 2018/03/07 11:57:46 wiz Exp $
DISTNAME= xfstt-1.9.3
+PKGREVISION= 1
CATEGORIES= x11 net fonts
MASTER_SITES= http://archive.hadrons.org/software/xfstt/
EXTRACT_SUFX= .tar.xz
@@ -44,6 +45,5 @@ do-install:
${DESTDIR}${PREFIX}/share/examples/xfstt/ \
)
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xfwp/Makefile
diff -u pkgsrc/x11/xfwp/Makefile:1.5 pkgsrc/x11/xfwp/Makefile:1.6
--- pkgsrc/x11/xfwp/Makefile:1.5 Sat Sep 16 19:27:30 2017
+++ pkgsrc/x11/xfwp/Makefile Wed Mar 7 11:57:46 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2017/09/16 19:27:30 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2018/03/07 11:57:46 wiz Exp $
DISTNAME= xfwp-1.0.3
-CATEGORIES= net
+PKGREVISION= 1
+CATEGORIES= net x11
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -15,8 +16,7 @@ USE_TOOLS+= pkg-config
CONFIGURE_ARGS.Linux+= --disable-strict-compilation --disable-selective-werror
-.include "../../x11/xproxymanagementprotocol/buildlink3.mk"
.include "../../x11/libICE/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xgamma/Makefile
diff -u pkgsrc/x11/xgamma/Makefile:1.10 pkgsrc/x11/xgamma/Makefile:1.11
--- pkgsrc/x11/xgamma/Makefile:1.10 Fri Apr 17 07:07:27 2015
+++ pkgsrc/x11/xgamma/Makefile Wed Mar 7 11:57:46 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2015/04/17 07:07:27 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/03/07 11:57:46 wiz Exp $
DISTNAME= xgamma-1.0.6
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -17,5 +18,5 @@ CONFIGURE_ENV+= APP_MAN_SUFFIX=1
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXxf86vm/buildlink3.mk"
-.include "../../x11/xf86vidmodeproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xinput/Makefile
diff -u pkgsrc/x11/xinput/Makefile:1.12 pkgsrc/x11/xinput/Makefile:1.13
--- pkgsrc/x11/xinput/Makefile:1.12 Mon Oct 19 22:56:32 2015
+++ pkgsrc/x11/xinput/Makefile Wed Mar 7 11:57:46 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2015/10/19 22:56:32 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2018/03/07 11:57:46 wiz Exp $
DISTNAME= xinput-1.6.2
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
@@ -12,11 +13,9 @@ LICENSE= mit
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
-BUILDLINK_API_DEPENDS.inputproto+= inputproto>=1.6
-.include "../../x11/inputproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
BUILDLINK_API_DEPENDS.libXi+= libXi>=1.2.0
.include "../../x11/libXi/buildlink3.mk"
.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/libXrandr/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xkbcomp/Makefile
diff -u pkgsrc/x11/xkbcomp/Makefile:1.15 pkgsrc/x11/xkbcomp/Makefile:1.16
--- pkgsrc/x11/xkbcomp/Makefile:1.15 Thu Mar 1 23:48:07 2018
+++ pkgsrc/x11/xkbcomp/Makefile Wed Mar 7 11:57:46 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2018/03/01 23:48:07 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2018/03/07 11:57:46 wiz Exp $
DISTNAME= xkbcomp-1.4.1
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -18,6 +19,5 @@ CONFIGURE_ENV+= APP_MAN_SUFFIX=1
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libxkbfile/buildlink3.mk"
-BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.17
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xkbutils/Makefile
diff -u pkgsrc/x11/xkbutils/Makefile:1.3 pkgsrc/x11/xkbutils/Makefile:1.4
--- pkgsrc/x11/xkbutils/Makefile:1.3 Mon Feb 11 08:59:57 2013
+++ pkgsrc/x11/xkbutils/Makefile Wed Mar 7 11:57:46 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2013/02/11 08:59:57 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.4 2018/03/07 11:57:46 wiz Exp $
DISTNAME= xkbutils-1.0.4
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -13,7 +13,7 @@ COMMENT= Small utilities utilizing the
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libXaw/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
Index: pkgsrc/x11/xkeyboard-config/Makefile
diff -u pkgsrc/x11/xkeyboard-config/Makefile:1.35 pkgsrc/x11/xkeyboard-config/Makefile:1.36
--- pkgsrc/x11/xkeyboard-config/Makefile:1.35 Thu Feb 1 10:06:18 2018
+++ pkgsrc/x11/xkeyboard-config/Makefile Wed Mar 7 11:57:47 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2018/02/01 10:06:18 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2018/03/07 11:57:47 wiz Exp $
DISTNAME= xkeyboard-config-2.23.1
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=data/${PKGBASE}/}
EXTRACT_SUFX= .tar.bz2
@@ -57,6 +58,5 @@ BUILDLINK_DEPMETHOD.gettext= build # for
BUILDLINK_API_DEPENDS.libX11+= libX11>=1.4.3
.include "../../x11/libX11/buildlink3.mk"
-BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.20
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xlockmore/Makefile
diff -u pkgsrc/x11/xlockmore/Makefile:1.129 pkgsrc/x11/xlockmore/Makefile:1.130
--- pkgsrc/x11/xlockmore/Makefile:1.129 Thu Feb 8 16:03:12 2018
+++ pkgsrc/x11/xlockmore/Makefile Wed Mar 7 11:57:47 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.129 2018/02/08 16:03:12 jaapb Exp $
+# $NetBSD: Makefile,v 1.130 2018/03/07 11:57:47 wiz Exp $
-PKGREVISION= 10
+PKGREVISION= 11
.include "Makefile.common"
COMMENT= Like the XLock session-locker/screensaver, but with more
@@ -16,7 +16,7 @@ MESA_ENV= no_mesa= ac_mesa_includes=${BU
CONFIGURE_ENV+= ac_cv_path_mesa=${MESA_ENV:Q}
#BUILDLINK_TRANSFORM+= l:MesaGL:GL
#BUILDLINK_TRANSFORM+= l:MesaGLU:GLU
-XEXT_ENV= no_ext= ac_ext_includes=${BUILDLINK_PREFIX.xextproto}/include ac_ext_libraries=${BUILDLINK_PREFIX.libXext}/lib
+XEXT_ENV= no_ext= ac_ext_includes=${BUILDLINK_PREFIX.xorgproto}/include ac_ext_libraries=${BUILDLINK_PREFIX.libXext}/lib
CONFIGURE_ENV+= ac_cv_path_ext=${XEXT_ENV:Q}
PLIST_SUBST+= LITE=""
Index: pkgsrc/x11/xlockmore/Makefile.common
diff -u pkgsrc/x11/xlockmore/Makefile.common:1.77 pkgsrc/x11/xlockmore/Makefile.common:1.78
--- pkgsrc/x11/xlockmore/Makefile.common:1.77 Mon Oct 9 08:50:24 2017
+++ pkgsrc/x11/xlockmore/Makefile.common Wed Mar 7 11:57:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.77 2017/10/09 08:50:24 wiz Exp $
+# $NetBSD: Makefile.common,v 1.78 2018/03/07 11:57:47 wiz Exp $
#
# used by x11/xlockmore/Makefile
# used by x11/xlockmore-lite/Makefile
@@ -66,7 +66,7 @@ CONFIGURE_ARGS+= --without-dpms
. if ${X11_TYPE} != "native" || !exists(${X11BASE}/lib${LIBABISUFFIX}/libXdpms.a)
BUILDLINK_TRANSFORM+= l:Xdpms:Xext
. endif
-DPMS_ENV= no_dpms= ac_dpms_includes=${BUILDLINK_PREFIX.xextproto}/include ac_dpms_libraries=${BUILDLINK_PREFIX.libXext}/lib
+DPMS_ENV= no_dpms= ac_dpms_includes=${BUILDLINK_PREFIX.xorgproto}/include ac_dpms_libraries=${BUILDLINK_PREFIX.libXext}/lib
CONFIGURE_ENV+= ac_cv_path_dpms=${DPMS_ENV:Q}
.endif
@@ -106,7 +106,7 @@ INSTALLATION_DIRS+= ${EGDIR}/pam.d
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXinerama/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
XINERAMA_ENV= no_xenerama= ac_xinerama_includes=${BUILDLINK_PREFIX.libXinerama}/include ac_xinerama_libraries=${BUILDLINK_PREFIX.libXinerama}/lib
CONFIGURE_ENV+= ac_cv_path_xinerama=${XINERAMA_ENV:Q}
Index: pkgsrc/x11/xlockmore-lite/Makefile
diff -u pkgsrc/x11/xlockmore-lite/Makefile:1.21 pkgsrc/x11/xlockmore-lite/Makefile:1.22
--- pkgsrc/x11/xlockmore-lite/Makefile:1.21 Wed Apr 15 07:31:15 2015
+++ pkgsrc/x11/xlockmore-lite/Makefile Wed Mar 7 11:57:47 2018
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2015/04/15 07:31:15 spz Exp $
+# $NetBSD: Makefile,v 1.22 2018/03/07 11:57:47 wiz Exp $
.include "../../x11/xlockmore/Makefile.common"
PKGNAME= ${DISTNAME:S/-/-lite-/}
+PKGREVISION= 1
COMMENT= "lite" version of xlockmore
CONFIGURE_ARGS+= --without-xpm
Index: pkgsrc/x11/xmx/Makefile
diff -u pkgsrc/x11/xmx/Makefile:1.19 pkgsrc/x11/xmx/Makefile:1.20
--- pkgsrc/x11/xmx/Makefile:1.19 Tue Mar 6 15:48:09 2018
+++ pkgsrc/x11/xmx/Makefile Wed Mar 7 11:57:47 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2018/03/06 15:48:09 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2018/03/07 11:57:47 wiz Exp $
DISTNAME= xmx-2.1alpha.pl7
PKGNAME= xmx-2.1a7
-PKGREVISION= 8
+PKGREVISION= 9
CATEGORIES= x11
MASTER_SITES= ftp://ftp.cs.brown.edu/pub/xmx/
@@ -20,7 +20,7 @@ MAKE_FLAGS+= EXTRA_LDOPTIONS=${LDFLAGS:Q
MAKE_FLAGS+= SHLIBGLOBALSFLAGS=${LDFLAGS:Q}
.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
.include "../../x11/libXaw/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xorg-cf-files/Makefile
diff -u pkgsrc/x11/xorg-cf-files/Makefile:1.34 pkgsrc/x11/xorg-cf-files/Makefile:1.35
--- pkgsrc/x11/xorg-cf-files/Makefile:1.34 Thu Jan 25 13:01:23 2018
+++ pkgsrc/x11/xorg-cf-files/Makefile Wed Mar 7 11:57:47 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2018/01/25 13:01:23 jperkin Exp $
+# $NetBSD: Makefile,v 1.35 2018/03/07 11:57:47 wiz Exp $
DISTNAME= xorg-cf-files-1.0.6
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=util/}
EXTRACT_SUFX= .tar.bz2
@@ -54,6 +54,5 @@ pre-configure:
${ECHO} '#define RealProjectRoot ${X11BASE}' >> ${WRKSRC}/host.def; \
fi
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xpr/Makefile
diff -u pkgsrc/x11/xpr/Makefile:1.2 pkgsrc/x11/xpr/Makefile:1.3
--- pkgsrc/x11/xpr/Makefile:1.2 Sat Sep 16 19:27:31 2017
+++ pkgsrc/x11/xpr/Makefile Wed Mar 7 11:57:47 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2017/09/16 19:27:31 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.3 2018/03/07 11:57:47 wiz Exp $
DISTNAME= xpr-1.0.4
+PKGREVISION= 1
CATEGORIES= print x11
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -9,13 +9,11 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Formats xwd dump files as output for various types of printers
-#LICENSE= # TODO: (see mk/license.mk)
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
-BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.17
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libXmu/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
Index: pkgsrc/x11/xrandr/Makefile
diff -u pkgsrc/x11/xrandr/Makefile:1.22 pkgsrc/x11/xrandr/Makefile:1.23
--- pkgsrc/x11/xrandr/Makefile:1.22 Mon Mar 14 01:47:44 2016
+++ pkgsrc/x11/xrandr/Makefile Wed Mar 7 11:57:47 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2016/03/14 01:47:44 tnn Exp $
+# $NetBSD: Makefile,v 1.23 2018/03/07 11:57:47 wiz Exp $
DISTNAME= xrandr-1.5.0
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -22,11 +23,8 @@ SUBST_STAGE.nickle= post-build
SUBST_MESSAGE.nickle= Fixing path to nickle.
BUILDLINK_API_DEPENDS.libXrandr+= libXrandr>=1.5.0
-BUILDLINK_API_DEPENDS.randrproto+= randrproto>=1.5.0
-.include "../../x11/randrproto/buildlink3.mk"
.include "../../x11/libXrandr/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
-BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.17
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xrx/Makefile
diff -u pkgsrc/x11/xrx/Makefile:1.2 pkgsrc/x11/xrx/Makefile:1.3
--- pkgsrc/x11/xrx/Makefile:1.2 Sat Sep 16 19:27:31 2017
+++ pkgsrc/x11/xrx/Makefile Wed Mar 7 11:57:48 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2017/09/16 19:27:31 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.3 2018/03/07 11:57:48 wiz Exp $
DISTNAME= xrx-1.0.4
+PKGREVISION= 1
CATEGORIES= net x11
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -21,7 +21,7 @@ USE_TOOLS+= pkg-config
.include "../../x11/libXaw/buildlink3.mk"
.include "../../x11/libICE/buildlink3.mk"
.include "../../x11/libXau/buildlink3.mk"
-.include "../../x11/xproxymanagementprotocol/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/xtrans/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXt/buildlink3.mk"
Index: pkgsrc/x11/xscope/Makefile
diff -u pkgsrc/x11/xscope/Makefile:1.4 pkgsrc/x11/xscope/Makefile:1.5
--- pkgsrc/x11/xscope/Makefile:1.4 Wed Sep 6 09:03:06 2017
+++ pkgsrc/x11/xscope/Makefile Wed Mar 7 11:57:48 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2017/09/06 09:03:06 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2018/03/07 11:57:48 wiz Exp $
DISTNAME= xscope-1.4.1
+PKGREVISION= 1
CATEGORIES= x11 devel
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -12,6 +13,6 @@ COMMENT= Tool to monitor X11/Client conv
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/xtrans/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xstdcmap/Makefile
diff -u pkgsrc/x11/xstdcmap/Makefile:1.3 pkgsrc/x11/xstdcmap/Makefile:1.4
--- pkgsrc/x11/xstdcmap/Makefile:1.3 Sat Sep 16 19:27:31 2017
+++ pkgsrc/x11/xstdcmap/Makefile Wed Mar 7 11:57:48 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2017/09/16 19:27:31 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.4 2018/03/07 11:57:48 wiz Exp $
DISTNAME= xstdcmap-1.0.3
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -15,8 +15,7 @@ GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
.include "../../x11/libXmu/buildlink3.mk"
-BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.17
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xtrap/Makefile
diff -u pkgsrc/x11/xtrap/Makefile:1.3 pkgsrc/x11/xtrap/Makefile:1.4
--- pkgsrc/x11/xtrap/Makefile:1.3 Sat Sep 16 19:27:31 2017
+++ pkgsrc/x11/xtrap/Makefile Wed Mar 7 11:57:48 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2017/09/16 19:27:31 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.4 2018/03/07 11:57:48 wiz Exp $
DISTNAME= xtrap-1.0.2
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -9,14 +9,13 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= XTrap sample clients
-#LICENSE= # TODO: (see mk/license.mk)
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
CONFIGURE_ENV+= APP_MAN_SUFFIX=1
-.include "../../x11/trapproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../x11/libXTrap/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/xwud/Makefile
diff -u pkgsrc/x11/xwud/Makefile:1.7 pkgsrc/x11/xwud/Makefile:1.8
--- pkgsrc/x11/xwud/Makefile:1.7 Mon Oct 29 05:07:25 2012
+++ pkgsrc/x11/xwud/Makefile Wed Mar 7 11:57:48 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2012/10/29 05:07:25 asau Exp $
-#
+# $NetBSD: Makefile,v 1.8 2018/03/07 11:57:48 wiz Exp $
DISTNAME= xwud-1.0.4
+PKGREVISION= 1
CATEGORIES= x11 graphics
MASTER_SITES= ${MASTER_SITE_XORG:=app/}
EXTRACT_SUFX= .tar.bz2
@@ -16,9 +16,5 @@ USE_TOOLS+= pkg-config
CONFIGURE_ENV+= APP_MAN_SUFFIX=1
.include "../../x11/libX11/buildlink3.mk"
-
-# Should this be in libX11/buildlink3.mk?
-# Package 'inputproto', required by 'X11', not found
-.include "../../x11/inputproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index