: use xorgproto instead of separate proto packages

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: *: use xorgproto instead of separate *proto packages
From: Thomas Klausner <tk%giga.or.at@localhost>
Date: Wed, 07 Mar 2018 11:50:23 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Wed Mar 7 12:50:23 2018 +0100
Changeset:	cd2b2a5cd721088b91f021b39ca103d291f59c56

Modified Files:
	Makefile
	MesaLib-dfbsd/dri.mk
	MesaLib-dfbsd/options.mk
	MesaLib/dri.mk
	argyllcms/Makefile
	bub-n-bros/Makefile
	bub-n-bros/PLIST
	chromium/Makefile
	fceux/Makefile
	fceux/options.mk
	fonttosfnt/Makefile
	goldendict/Makefile
	higan/Makefile
	hs-x11-extras/Makefile
	lander/Makefile
	libdmx/Makefile
	libdmx/buildlink3.mk
	megaglest/Makefile
	megaglest/distinfo
	modular-xorg-server-dfbsd/Makefile.common
	modular-xorg-server-dfbsd/buildlink3.mk
	modular-xorg-server-dfbsd/options.mk
	openbsd-input-usbtablet/Makefile
	pcsxr/Makefile
	pulseaudio-git/options.mk
	py-gist/Makefile
	pypanel/Makefile
	smproxy/Makefile
	tktile/Makefile
	tleenx2/Makefile
	uTox-git/Makefile
	unagi/Makefile
	xf86-input-mouse-dfbsd/Makefile
	xf86-input-vboxmouse/Makefile
	xf86-video-ati-dfbsd/Makefile
	xf86-video-geode/Makefile
	xf86-video-intel-devel-dfbsd/Makefile
	xf86-video-intel-dfbsd/Makefile
	xf86-video-intel-old/Makefile
	xf86-video-virtualbox/Makefile
	xf86rushproto/Makefile
	xf86rushproto/buildlink3.mk
	xinput_calibrator/Makefile
	xpilot-ng/Makefile
Added Files:
	megaglest/patches/patch-build-mg.sh
Removed Files:
	dmxproto/DESCR
	dmxproto/Makefile
	dmxproto/PLIST
	dmxproto/buildlink3.mk
	dmxproto/distinfo

Log Message:
*: use xorgproto instead of separate *proto packages

Fix some build problems while here.
Remove dmxproto (included in xorgproto).

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=cd2b2a5cd721088b91f021b39ca103d291f59c56

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                  |  3 ++-
 MesaLib-dfbsd/dri.mk                      |  9 +------
 MesaLib-dfbsd/options.mk                  |  2 +-
 MesaLib/dri.mk                            |  9 +------
 argyllcms/Makefile                        |  3 ++-
 bub-n-bros/Makefile                       | 21 +++++++++++++---
 bub-n-bros/PLIST                          | 10 ++++----
 chromium/Makefile                         |  4 +--
 dmxproto/DESCR                            |  4 ---
 dmxproto/Makefile                         | 20 ---------------
 dmxproto/PLIST                            |  4 ---
 dmxproto/buildlink3.mk                    | 14 -----------
 dmxproto/distinfo                         |  5 ----
 fceux/Makefile                            |  2 +-
 fceux/options.mk                          | 22 ++++++++---------
 fonttosfnt/Makefile                       |  6 ++---
 goldendict/Makefile                       |  3 ++-
 higan/Makefile                            |  4 +--
 hs-x11-extras/Makefile                    |  5 ++--
 lander/Makefile                           |  3 ++-
 libdmx/Makefile                           |  4 +--
 libdmx/buildlink3.mk                      |  2 +-
 megaglest/Makefile                        | 22 ++++++++---------
 megaglest/distinfo                        |  1 +
 megaglest/patches/patch-build-mg.sh       | 16 ++++++++++++
 modular-xorg-server-dfbsd/Makefile.common | 41 ++-----------------------------
 modular-xorg-server-dfbsd/buildlink3.mk   | 18 +-------------
 modular-xorg-server-dfbsd/options.mk      |  7 ++----
 openbsd-input-usbtablet/Makefile          |  9 ++-----
 pcsxr/Makefile                            |  4 +--
 pulseaudio-git/options.mk                 |  2 +-
 py-gist/Makefile                          |  6 +++--
 pypanel/Makefile                          |  7 +++---
 smproxy/Makefile                          |  3 ++-
 tktile/Makefile                           |  4 +--
 tleenx2/Makefile                          |  7 +++---
 uTox-git/Makefile                         |  2 +-
 unagi/Makefile                            |  4 +--
 xf86-input-mouse-dfbsd/Makefile           |  7 ++----
 xf86-input-vboxmouse/Makefile             |  6 ++---
 xf86-video-ati-dfbsd/Makefile             | 13 ++--------
 xf86-video-geode/Makefile                 |  6 ++---
 xf86-video-intel-devel-dfbsd/Makefile     |  3 ++-
 xf86-video-intel-dfbsd/Makefile           |  4 +--
 xf86-video-intel-old/Makefile             |  4 +--
 xf86-video-virtualbox/Makefile            |  4 +--
 xf86rushproto/Makefile                    |  4 +--
 xf86rushproto/buildlink3.mk               |  2 +-
 xinput_calibrator/Makefile                |  3 ++-
 xpilot-ng/Makefile                        |  4 +--
 50 files changed, 134 insertions(+), 238 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index cb7eb38373..c62997bf4c 100644
--- a/Makefile
+++ b/Makefile
@@ -589,7 +589,6 @@ SUBDIR+=	dmapd
 SUBDIR+=	dmd
 SUBDIR+=	dmd-bin
 SUBDIR+=	dmt-ux
-SUBDIR+=	dmxproto
 SUBDIR+=	dnrd
 SUBDIR+=	dns2tcp
 SUBDIR+=	dnscrypt-proxy
@@ -2071,6 +2070,7 @@ SUBDIR+=	mixer.tk
 SUBDIR+=	mixmaster
 #SUBDIR+=	mk 		# not a package
 SUBDIR+=	mk-configure
+SUBDIR+=	mk-scm-tests
 SUBDIR+=	mkcabal
 SUBDIR+=	mksend
 SUBDIR+=	mlmmj
@@ -4585,6 +4585,7 @@ SUBDIR+=	which
 SUBDIR+=	why
 SUBDIR+=	why3
 SUBDIR+=	wicd
+SUBDIR+=	will-it-scale-git
 SUBDIR+=	wine-devel
 SUBDIR+=	wings
 SUBDIR+=	winwrangler
diff --git a/MesaLib-dfbsd/dri.mk b/MesaLib-dfbsd/dri.mk
index 9027c88170..5791123b65 100644
--- a/MesaLib-dfbsd/dri.mk
+++ b/MesaLib-dfbsd/dri.mk
@@ -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,21 +20,16 @@ BUILDLINK_API_DEPENDS.libxcb+=	libxcb>=1.9.3
 .  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"
 # Change to option to include in options.mk
-# .    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"
 .endif
diff --git a/MesaLib-dfbsd/options.mk b/MesaLib-dfbsd/options.mk
index 8053660901..fd22e47a91 100644
--- a/MesaLib-dfbsd/options.mk
+++ b/MesaLib-dfbsd/options.mk
@@ -59,7 +59,7 @@ CONFIGURE_ARGS+=	--enable-egl
 CFLAGS+=		-DHAVE_DRI3
 CONFIGURE_ARGS+=	--enable-dri3
 .    if ${X11_TYPE} == "modular"
-.include "../../x11/dri3proto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .    endif
 .  else
 CONFIGURE_ARGS+=	--disable-dri3
diff --git a/MesaLib/dri.mk b/MesaLib/dri.mk
index 8e09a642cb..181d2e7ffc 100644
--- a/MesaLib/dri.mk
+++ b/MesaLib/dri.mk
@@ -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.9.3
 .  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
diff --git a/argyllcms/Makefile b/argyllcms/Makefile
index 336de7e365..edc9046a36 100644
--- a/argyllcms/Makefile
+++ b/argyllcms/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	Argyll_V1.8.3_src
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.argyllcms.com/
 EXTRACT_SUFX=	.zip
@@ -42,7 +43,7 @@ post-install:
 .include "../../x11/libXxf86dga/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/xineramaproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/bub-n-bros/Makefile b/bub-n-bros/Makefile
index 8bb7543bcd..34521822dc 100644
--- a/bub-n-bros/Makefile
+++ b/bub-n-bros/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.23 2014/01/25 10:45:27 thomasklausner Exp $
-#
 
 DISTNAME=		bubbros-1.6.2
+PKGREVISION=		1
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bub-n-bros/}
 
@@ -17,7 +17,11 @@ MAKE_ENV+=		LDFLAGS=${LDFLAGS:M*:Q}
 
 USE_TOOLS+=		pax
 
+REPLACE_PYTHON+=	BubBob.py
 REPLACE_PYTHON+=	bubbob/bb.py
+REPLACE_PYTHON+=	bubbob/setup.py
+REPLACE_PYTHON+=	display/setup.py
+REPLACE_PYTHON+=	display/setup.py.pre
 REPLACE_PYTHON+=	bubbob/doc/bonus-doc.py
 REPLACE_PYTHON+=	display/pclient.py
 REPLACE_PYTHON+=	display/playback.py
@@ -39,12 +43,21 @@ do-build:
 	${PYTHONBIN} -O ${PREFIX}/${PYLIB}/compileall.py ${WRKSRC}
 
 do-install:
-	${INSTALL_DATA_DIR} ${DESDIR}${PREFIX}/games/${PKGBASE}
+	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/games/${PKGBASE}
 	cd ${WRKSRC} && pax ${PAX_SUBST} \
-		-rwpe . ${DESDIR}${PREFIX}/games/${PKGBASE}
+		-rwpe . ${DESTDIR}${PREFIX}/games/${PKGBASE}
+	find ${DESTDIR}${PREFIX} -name *.orig -delete
+	find ${DESTDIR}${PREFIX} -name .cvsignore -delete
+	find ${DESTDIR}${PREFIX} -name Entries -delete
+	find ${DESTDIR}${PREFIX} -name Entries.Log -delete
+	find ${DESTDIR}${PREFIX} -name Repository -delete
+	find ${DESTDIR}${PREFIX} -name Root -delete
+	find ${DESTDIR}${PREFIX} -name CVS -exec rmdir {} \; 2>/dev/null || ${TRUE}
+
+PYTHON_VERSIONS_ACCEPTED=	27
 
 .include "../../lang/python/application.mk"
 .include "../../devel/py-game/buildlink3.mk"
 
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/bub-n-bros/PLIST b/bub-n-bros/PLIST
index 57f22bf990..03abf53c11 100644
--- a/bub-n-bros/PLIST
+++ b/bub-n-bros/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2012/06/14 01:16:12 othyro Exp $
+@comment $NetBSD$
 games/bubbros/BubBob.icns
 games/bubbros/BubBob.py
 games/bubbros/BubBob.pyo
@@ -221,9 +221,13 @@ games/bubbros/bubbob/sounds/yippee.wav
 games/bubbros/bubbob/sprmap.py
 games/bubbros/bubbob/sprmap.pyo
 games/bubbros/bubbob/statesaver.c
+games/bubbros/bubbob/statesaver.py
+games/bubbros/bubbob/statesaver.pyo
 games/bubbros/bubbob/statesaver.so
 games/bubbros/bubbob/test_rnglevel.py
 games/bubbros/bubbob/test_rnglevel.pyo
+games/bubbros/bubbob/test_statesaver.py
+games/bubbros/bubbob/test_statesaver.pyo
 games/bubbros/bubbob/tmp/pat00.ppm
 games/bubbros/bubbob/tmp/pat01.ppm
 games/bubbros/bubbob/tmp/pat02.ppm
@@ -309,13 +313,9 @@ games/bubbros/display/xshm.c
 games/bubbros/display/xshm.so
 games/bubbros/doc/BubBob.py.1
 games/bubbros/doc/Client.py.1
-games/bubbros/doc/Introduction.html
 games/bubbros/doc/Makefile
-games/bubbros/doc/authors.html
 games/bubbros/doc/bb.py.1
 games/bubbros/doc/crazybonuses.html
-games/bubbros/doc/download.html
-games/bubbros/doc/help.html
 games/bubbros/doc/sshots.html
 games/bubbros/http2/data/bab.png
 games/bubbros/http2/data/baub.png
diff --git a/chromium/Makefile b/chromium/Makefile
index 39dbeedaff..d02783508f 100644
--- a/chromium/Makefile
+++ b/chromium/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.14 2012/09/24 18:26:53 asau Exp $
 
 DISTNAME=	chromium-56.0.2924.87
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
 EXTRACT_SUFX=	.tar.xz
@@ -344,7 +345,7 @@ BUILDLINK_TRANSFORM.NetBSD+=	opt:-lpci:-lpciutils
 .include "../../devel/dconf/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
-.include "../../x11/scrnsaverproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../x11/xcursor/buildlink3.mk"
@@ -352,7 +353,6 @@ BUILDLINK_TRANSFORM.NetBSD+=	opt:-lpci:-lpciutils
 .include "../../x11/libXdamage/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
diff --git a/dmxproto/DESCR b/dmxproto/DESCR
deleted file mode 100644
index 06186189f0..0000000000
--- a/dmxproto/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Distributed Multi-headed X protocol headers from modular X.org:
-"your networked Xinerama".
-
-This package tracks the most current tarball available.
diff --git a/dmxproto/Makefile b/dmxproto/Makefile
deleted file mode 100644
index 53c8b479cc..0000000000
--- a/dmxproto/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2014/10/09 14:06:26 thomasklausner Exp $
-#
-
-DISTNAME=	dmxproto-2.3.1
-CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_XORG:=proto/}
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	blair.sadewitz%gmail.com@localhost
-HOMEPAGE=	http://xorg.freedesktop.org/releases/individual/proto/
-COMMENT=	Distributed Multi-headed X protocol headers from modular X.org
-
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	pkg-config
-USE_LANGUAGES=	c
-
-PKGCONFIG_OVERRIDE+=	dmxproto.pc.in
-
-.include "../../x11/xproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/dmxproto/PLIST b/dmxproto/PLIST
deleted file mode 100644
index 2227861029..0000000000
--- a/dmxproto/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2012/09/13 13:36:56 thomasklausner Exp $
-include/X11/extensions/dmx.h
-include/X11/extensions/dmxproto.h
-lib/pkgconfig/dmxproto.pc
diff --git a/dmxproto/buildlink3.mk b/dmxproto/buildlink3.mk
deleted file mode 100644
index ee586cf7fd..0000000000
--- a/dmxproto/buildlink3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:43:40 jsonn Exp $
-
-BUILDLINK_TREE+=	dmxproto
-
-.if !defined(DMXPROTO_BUILDLINK3_MK)
-DMXPROTO_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.dmxproto+=	dmxproto>=2.2.2
-BUILDLINK_PKGSRCDIR.dmxproto?=		../../wip/dmxproto
-
-.include "../../x11/xproto/buildlink3.mk"
-.endif # DMXPROTO_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-dmxproto
diff --git a/dmxproto/distinfo b/dmxproto/distinfo
deleted file mode 100644
index 4d8fedcc01..0000000000
--- a/dmxproto/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.2 2012/09/13 13:36:56 thomasklausner Exp $
-
-SHA1 (dmxproto-2.3.1.tar.bz2) = 3b8b273b8ef3d8dbab998df9ec1dddf99edf4d91
-RMD160 (dmxproto-2.3.1.tar.bz2) = d1ef4dcd268f85a935a63bdc4ff0dceb6b51aa8b
-Size (dmxproto-2.3.1.tar.bz2) = 96467 bytes
diff --git a/fceux/Makefile b/fceux/Makefile
index 8aea7548d3..d6236f7218 100644
--- a/fceux/Makefile
+++ b/fceux/Makefile
@@ -1,5 +1,4 @@
 # $NetBSD: Makefile,v 1.8 2013/11/13 02:28:18 othyro Exp $
-#
 
 DISTNAME=	fceux-2.2.2.src
 PKGNAME=	${DISTNAME:S/.src//}
@@ -37,5 +36,6 @@ do-install:
 		${SETENV} ${INSTALL_ENV} ${PREFIX}/bin/scons install --prefix=${DESTDIR}${PREFIX}
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fceux/options.mk b/fceux/options.mk
index 4c701fcf47..1421c529a8 100644
--- a/fceux/options.mk
+++ b/fceux/options.mk
@@ -1,8 +1,8 @@
 # $NetBSD: options.mk,v 1.3 2013/11/13 02:28:18 othyro Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.fceux
-PKG_SUPPORTED_OPTIONS=	debug gd gtk2 gtk3 lua opengl sdl x11 zlib
-PKG_SUGGESTED_OPTIONS=	gtk2 lua opengl sdl x11 zlib
+PKG_SUPPORTED_OPTIONS=	debug gd gtk2 gtk3 opengl sdl x11 zlib
+PKG_SUGGESTED_OPTIONS=	gtk2 opengl sdl x11 zlib
 
 .include "../../mk/bsd.options.mk"
 
@@ -35,14 +35,14 @@ MAKE_ENV+=		GTK3=1 GTK=0
 MAKE_ENV+=		GTK3=0
 .endif
 
-.if !empty(PKG_OPTIONS:Mlua)
-#PLIST.lua=		yes
-LUA_VERSION_REQD=	51
-.include "../../lang/lua/buildlink3.mk"
-MAKE_ENV+=		LUA=1
-.else
-MAKE_ENV+=		LUA=0
-.endif
+#.if !empty(PKG_OPTIONS:Mlua)
+##PLIST.lua=		yes
+#LUA_VERSION_REQD=	51
+#.include "../../lang/lua/buildlink3.mk"
+#MAKE_ENV+=		LUA=1
+#.else
+#MAKE_ENV+=		LUA=0
+#.endif
 
 .if !empty(PKG_OPTIONS:Mopengl)
 #PLIST.opengl=           yes
@@ -61,7 +61,7 @@ MAKE_ENV+=		CREATE_AVI=0 LOGO=0
 
 .if !empty(PKG_OPTIONS:Mx11)
 #PLIST.x11=              yes
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/fonttosfnt/Makefile b/fonttosfnt/Makefile
index 4e4ccf6be6..4fc796d2de 100644
--- a/fonttosfnt/Makefile
+++ b/fonttosfnt/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.5 2012/09/28 23:21:48 asau Exp $
-#
 
 DISTNAME=	fonttosfnt-1.0.4
+PKGREVISION=	1
 CATEGORIES=	fonts x11
 MASTER_SITES=	${MASTER_SITE_XORG:=app/}
 EXTRACT_SUFX=	.tar.bz2
@@ -15,9 +15,7 @@ USE_TOOLS+=	pkg-config
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c
 
-
 .include "../../fonts/libfontenc/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/goldendict/Makefile b/goldendict/Makefile
index fa6f198cef..c29de5f1bc 100644
--- a/goldendict/Makefile
+++ b/goldendict/Makefile
@@ -2,6 +2,7 @@
 
 GITHUB_PROJECT=	goldendict
 DISTNAME=	goldendict-1.5.0rc2
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	-https://github.com/${GITHUB_PROJECT}/${DIST_SUBDIR}/archive/1.5.0-RC2.tar.gz
 DIST_SUBDIR=	${GITHUB_PROJECT}
@@ -37,7 +38,7 @@ do-configure:
 .include "../../textproc/eb/buildlink3.mk"
 .include "../../textproc/hunspell/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
-.include "../../x11/recordproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 
diff --git a/higan/Makefile b/higan/Makefile
index ab1fc057fa..4628fefe40 100644
--- a/higan/Makefile
+++ b/higan/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.1 2013/02/07 21:23:33 othyro Exp $
-#
 
 DISTNAME=	higan_v092-source
 PKGNAME=	${DISTNAME:S/_v0/-0./1:S/-source//1}
+PKGREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://higan.googlecode.com/files/
 EXTRACT_SUFX=	.tar.xz
@@ -34,7 +34,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/higan/data/cheats.bml ${DESTDIR}${PREFIX}/share/doc/higan
 
 .include "../../x11/libXv/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../audio/alsa-lib/buildlink3.mk"
 .include "../../audio/libao/buildlink3.mk"
 .include "../../audio/openal-soft/buildlink3.mk"
diff --git a/hs-x11-extras/Makefile b/hs-x11-extras/Makefile
index 5ccc0b6037..f727b417c3 100644
--- a/hs-x11-extras/Makefile
+++ b/hs-x11-extras/Makefile
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.7 2014/05/21 21:04:46 szptvlfn Exp $
-#
 
 DISTNAME=	X11-extras-${VERSION}
 PKGNAME=	hs-x11-extras-${VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/X11-extras/${VERSION}/
 
@@ -59,6 +58,6 @@ do-install:
 
 .include "../../x11/hs-X11/buildlink3.mk"
 .include "../../lang/ghc/buildlink3.mk"
-.include "../../x11/xineramaproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lander/Makefile b/lander/Makefile
index 2be70272bb..41c764655a 100644
--- a/lander/Makefile
+++ b/lander/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	lander-0.6.4
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.nickg.me.uk/files/
 
@@ -28,5 +29,5 @@ CONFIGURE_ARGS+=	--with-boost="${PREFIX}"\
 .include "../../audio/SDL_sound/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libdmx/Makefile b/libdmx/Makefile
index cbe88457d6..06d902349b 100644
--- a/libdmx/Makefile
+++ b/libdmx/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.9 2014/10/09 14:06:27 thomasklausner Exp $
 
 DISTNAME=	libdmx-1.1.3
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=	.tar.bz2
@@ -16,6 +17,5 @@ USE_TOOLS+=	pkg-config
 PKGCONFIG_OVERRIDE+=	dmx.pc.in
 
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../wip/dmxproto/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libdmx/buildlink3.mk b/libdmx/buildlink3.mk
index 98478ad4ae..9a570cc3f8 100644
--- a/libdmx/buildlink3.mk
+++ b/libdmx/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.libdmx+=	libdmx>=1.0.2
 BUILDLINK_PKGSRCDIR.libdmx?=	../../wip/libdmx
 
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../wip/dmxproto/buildlink3.mk"
+.include "../../wip/xorgproto/buildlink3.mk"
 .endif # LIBDMX_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libdmx
diff --git a/megaglest/Makefile b/megaglest/Makefile
index d495fba4ea..661d76d5a6 100644
--- a/megaglest/Makefile
+++ b/megaglest/Makefile
@@ -2,6 +2,7 @@
 
 DISTNAME=	${VERS}
 PKGNAME=	megaglest-${VERS}
+PKGREVISION=	1
 VERS=		3.9.1
 CATEGORIES=	games
 MASTER_SITES=	https://github.com/MegaGlest/megaglest-source/archive/
@@ -25,21 +26,18 @@ EXTRACT_USING=	bsdtar
 do-build:
 	cd ${WRKSRC} && ./build-mg.sh
 
-.include "../../graphics/aalib/buildlink3.mk"
-.include "../../x11/damageproto/buildlink3.mk"
-.include "../../x11/dri2proto/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
-.include "../../x11/fixesproto/buildlink3.mk"
 .include "../../audio/freealut/buildlink3.mk"
-.include "../../x11/kbproto/buildlink3.mk"
-.include "../../multimedia/libogg/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
-.include "../../lang/lua/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/cppunit/buildlink3.mk"
+.include "../../graphics/aalib/buildlink3.mk"
+.include "../../graphics/glew/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/xerces-c/buildlink3.mk"
-.include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/xf86vidmodeproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../wip/ftgl/buildlink3.mk"
 .include "../../x11/wxGTK28/buildlink3.mk"
-
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/megaglest/distinfo b/megaglest/distinfo
index d840889ba5..3a953d2075 100644
--- a/megaglest/distinfo
+++ b/megaglest/distinfo
@@ -3,3 +3,4 @@ $NetBSD: distinfo,v 1.1 2014/04/24 19:11:24 christtrekker Exp $
 SHA1 (3.9.1.tar.gz) = 5ffc98a995041cabb6d551cab0ae7acbd0d383b6
 RMD160 (3.9.1.tar.gz) = 22e5a1adfd12d1f83fb04ecf57fea556cb1acba6
 Size (3.9.1.tar.gz) = 4966496 bytes
+SHA1 (patch-build-mg.sh) = eb28641bfde6754989d6f1578ae652d57d46e817
diff --git a/megaglest/patches/patch-build-mg.sh b/megaglest/patches/patch-build-mg.sh
new file mode 100644
index 0000000000..0da801ae15
--- /dev/null
+++ b/megaglest/patches/patch-build-mg.sh
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- build-mg.sh.orig	2018-03-07 10:41:05.899626541 +0000
++++ build-mg.sh
+@@ -107,9 +107,10 @@ EXTRA_CMAKE_OPTIONS=
+ 
+ # Build threads
+ # By default we use all physical CPU cores to build.
+-NUMCORES=`lscpu -p | grep -cv '^#'`
++NUMCORES=`lscpu -p | grep -cv '^#'| wc -l`
+ echo "CPU cores detected: $NUMCORES"
+ if [ "$NUMCORES" = '' ]; then NUMCORES=1; fi
++if [ "$NUMCORES" = '0' ]; then NUMCORES=1; fi
+ if [ $CPU_COUNT != -1 ]; then NUMCORES=$CPU_COUNT; fi
+ echo "CPU cores to be used: $NUMCORES"
+ 
diff --git a/modular-xorg-server-dfbsd/Makefile.common b/modular-xorg-server-dfbsd/Makefile.common
index 8126d52677..ecb3711bbe 100644
--- a/modular-xorg-server-dfbsd/Makefile.common
+++ b/modular-xorg-server-dfbsd/Makefile.common
@@ -105,29 +105,13 @@ CONFIGURE_ENV.SunOS+=	ac_cv_func_epoll_create1=no
 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
+BUILD_DEPENDS+=		font-util-[0-9]*:../../fonts/font-util
 CONFIGURE_ENV+=		ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
 
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "Bitrig" || ${OPSYS} == "MirBSD"
@@ -145,13 +129,8 @@ 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/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/libX11/buildlink3.mk"
 .include "../../x11/libXau/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
@@ -169,22 +148,6 @@ BUILDLINK_API_DEPENDS.libXext+=	libXext>=1.1.1
 .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/xtrans/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/modular-xorg-server-dfbsd/buildlink3.mk b/modular-xorg-server-dfbsd/buildlink3.mk
index 417e7a1289..fb67cf13a2 100644
--- a/modular-xorg-server-dfbsd/buildlink3.mk
+++ b/modular-xorg-server-dfbsd/buildlink3.mk
@@ -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"
+.include "../../x11/xorgproto/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"
 .endif # MODULAR_XORG_SERVER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-modular-xorg-server
diff --git a/modular-xorg-server-dfbsd/options.mk b/modular-xorg-server-dfbsd/options.mk
index 8a037e8034..5cfc466b05 100644
--- a/modular-xorg-server-dfbsd/options.mk
+++ b/modular-xorg-server-dfbsd/options.mk
@@ -29,7 +29,7 @@ PLIST_VARS+=		dri3
 .  if !empty(PKG_OPTIONS:Mdri3)
 CONFIGURE_ARGS+=	--enable-dri3
 PLIST.dri3=		yes
-.include "../../x11/dri3proto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .  else
 CONFIGURE_ARGS+=	--disable-dri3
 .  endif
@@ -37,12 +37,9 @@ CONFIGURE_ARGS+=	--disable-dri3
 .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/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
diff --git a/openbsd-input-usbtablet/Makefile b/openbsd-input-usbtablet/Makefile
index 1c03f7b396..cf36e7148f 100644
--- a/openbsd-input-usbtablet/Makefile
+++ b/openbsd-input-usbtablet/Makefile
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.4 2012/10/03 21:32:46 asau Exp $
-#
 
 DISTNAME=	openbsd-input-usbtablet-1.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 
@@ -14,10 +13,6 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 
-.include "../../x11/inputproto/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/pcsxr/Makefile b/pcsxr/Makefile
index 10260f5554..2e9c46e97e 100644
--- a/pcsxr/Makefile
+++ b/pcsxr/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.7 2013/11/12 12:26:33 othyro Exp $
-#
 
 DISTNAME=	pcsxr-1.9.93
+PKGREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://pcsxr.codeplex.com/downloads/get/722114
 EXTRACT_SUFX=	.tar.bz2
@@ -35,7 +35,7 @@ BUILDLINK_DEPMETHOD.libXcursor=	build
 .include "../../x11/libXcursor/buildlink3.mk"
 .include "../../x11/libXv/buildlink3.mk"
 .include "../../x11/libXtst/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
diff --git a/pulseaudio-git/options.mk b/pulseaudio-git/options.mk
index 17f68f3720..846cff8963 100644
--- a/pulseaudio-git/options.mk
+++ b/pulseaudio-git/options.mk
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+=	--disable-avahi
 .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
diff --git a/py-gist/Makefile b/py-gist/Makefile
index 4716949425..fd337be5d0 100644
--- a/py-gist/Makefile
+++ b/py-gist/Makefile
@@ -2,8 +2,10 @@
 
 DISTNAME=	pygist-1.5.28
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^py//}
+PKGREVISION=	1
 CATEGORIES=	graphics python
-MASTER_SITES=	http://hifweb.lbl.gov/public/software/gist/
+#MASTER_SITES=	http://hifweb.lbl.gov/public/software/gist/
+MASTER_SITES=	http://www.ii.uib.no/~avle/filer/
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://hifweb.lbl.gov/public/software/gist/
@@ -18,5 +20,5 @@ PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-Numeric
 .include "../../lang/python/extension.mk"
 .include "../../math/py-Numeric/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/pypanel/Makefile b/pypanel/Makefile
index 5489cfa55c..40819c0eb4 100644
--- a/pypanel/Makefile
+++ b/pypanel/Makefile
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.16 2012/10/07 13:57:33 asau Exp $
-#
 
 DISTNAME=		PyPanel-2.4
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=pypanel/}
 
@@ -12,6 +11,8 @@ COMMENT=		Lightweight panel written in Python and C for X11
 
 DEPENDS+=		${PYPKGPREFIX}-Xlib-[0-9]*:../../x11/py-Xlib
 
+PYTHON_VERSIONS_ACCEPTED=	27
+
 PYDISTUTILSPKG=		yes
 PY_PATCHPLIST=		yes
 
@@ -26,6 +27,6 @@ SUBST_SED.setup+=	-e 's|/usr/lib|${PREFIX}/lib|g'
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/smproxy/Makefile b/smproxy/Makefile
index cd0bb07b2e..bbd9b77114 100644
--- a/smproxy/Makefile
+++ b/smproxy/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.6 2015/04/17 06:56:55 thomasklausner Exp $
 
 DISTNAME=	smproxy-1.0.6
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=app/}
 EXTRACT_SUFX=	.tar.bz2
@@ -13,7 +14,7 @@ COMMENT=	Proxy to allow non-XSMP apps to be managed by xsm
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
-.include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 
diff --git a/tktile/Makefile b/tktile/Makefile
index 8f9a151b91..0f2ba3c2da 100644
--- a/tktile/Makefile
+++ b/tktile/Makefile
@@ -1,8 +1,8 @@
 # $NetBSD: Makefile,v 1.3 2012/11/12 16:26:52 othyro Exp $
-#
 
 DISTNAME=	tile-0.8.4.0
 PKGNAME=	tk${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tktable/}
 
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+=	--x-libraries=${X11BASE}/lib
 
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/tleenx2/Makefile b/tleenx2/Makefile
index 7e16246c89..b344e39291 100644
--- a/tleenx2/Makefile
+++ b/tleenx2/Makefile
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.10 2012/10/07 17:17:40 asau Exp $
-#
 
 DISTNAME=	TleenX2-20040214
 PKGNAME=	tleenx2-20040214
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tleenx/}
 
@@ -11,13 +10,13 @@ MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://tleenx.sourceforge.net/
 COMMENT=	Client to tlen.pl - polish IM / chat system
 
-
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config
 LIBS+=			-lm
 
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/scrnsaverproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
+.include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../chat/libtlen/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/uTox-git/Makefile b/uTox-git/Makefile
index e67fbaec82..2354337d5b 100644
--- a/uTox-git/Makefile
+++ b/uTox-git/Makefile
@@ -28,7 +28,7 @@ USE_CMAKE=	yes
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../wip/mk/git-package.mk"
diff --git a/unagi/Makefile b/unagi/Makefile
index 8455e27789..34b9bce0b1 100644
--- a/unagi/Makefile
+++ b/unagi/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.5 2014/02/03 11:30:10 othyro Exp $
-#
 
 DISTNAME=	unagi-0.3.4
+PKGREVISION=	1
 CATEGORIES=	wm
 MASTER_SITES=	https://projects.mini-dweeb.org/attachments/download/114/
 
@@ -32,7 +32,7 @@ post-install:
 		${RM} ${DESTDIR}${PKG_SYSCONFDIR}/xdg/unagi.conf
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../x11/xcb-util036/buildlink3.mk"
 .include "../../devel/libev/buildlink3.mk"
 .include "../../x11/xcb-util-keysyms/buildlink3.mk"
diff --git a/xf86-input-mouse-dfbsd/Makefile b/xf86-input-mouse-dfbsd/Makefile
index 0ac6246c56..0d6ca010d6 100644
--- a/xf86-input-mouse-dfbsd/Makefile
+++ b/xf86-input-mouse-dfbsd/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.27 2016/11/17 08:06:52 wiz Exp $
 
 DISTNAME=	xf86-input-mouse-1.9.2
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
@@ -17,10 +18,6 @@ CONFIGURE_ENV.SunOS+=	DRIVER_MAN_SUFFIX=4
 
 .include "options.mk"
 
-.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"
diff --git a/xf86-input-vboxmouse/Makefile b/xf86-input-vboxmouse/Makefile
index 4b4a154c1a..c4d3555394 100644
--- a/xf86-input-vboxmouse/Makefile
+++ b/xf86-input-vboxmouse/Makefile
@@ -2,6 +2,7 @@
 
 DISTNAME=	VirtualBox-5.0.14
 PKGNAME=	${DISTNAME:S/VirtualBox/xf86-input-vboxmouse/}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.bz2
@@ -29,9 +30,6 @@ pre-configure:
 	cd ${WRKSRC}/${VBOXMOUSE_DIR} && autoreconf -vif
 
 .include "../../devel/xorg-util-macros/buildlink3.mk"
-.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"
diff --git a/xf86-video-ati-dfbsd/Makefile b/xf86-video-ati-dfbsd/Makefile
index c01a56a702..6a7b0e0375 100644
--- a/xf86-video-ati-dfbsd/Makefile
+++ b/xf86-video-ati-dfbsd/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: Makefile,v 1.42 2017/03/16 12:04:25 wiz Exp $
 
 DISTNAME=	xf86-video-ati-7.9.0
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
@@ -38,17 +39,7 @@ BUILDLINK_API_DEPENDS.modular-xorg-server+=	modular-xorg-server>=1.18.1
 .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"
diff --git a/xf86-video-geode/Makefile b/xf86-video-geode/Makefile
index 3ef66d8a90..b9493a47bf 100644
--- a/xf86-video-geode/Makefile
+++ b/xf86-video-geode/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.5 2012/10/07 20:11:09 asau Exp $
-#
 
 DISTNAME=	xf86-video-geode-2.11.4
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
@@ -18,7 +18,5 @@ GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config
 
 .include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/xf86dgaproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/xf86-video-intel-devel-dfbsd/Makefile b/xf86-video-intel-devel-dfbsd/Makefile
index 37317878da..aecf378a0e 100644
--- a/xf86-video-intel-devel-dfbsd/Makefile
+++ b/xf86-video-intel-devel-dfbsd/Makefile
@@ -10,6 +10,7 @@ PORTNAME=	xf86-video-intel
 
 DISTNAME=	${PORTNAME}-${COMMIT_ID}
 PKGNAME=	${PORTNAME}-2.99.917
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://cgit.freedesktop.org/xorg/driver/${PORTNAME}/snapshot/
 EXTRACT_SUFX=	.tar.xz
@@ -60,7 +61,7 @@ CONFIGURE_ARGS+=	--with-default-accel=uxa
 
 .if !empty(PKG_OPTIONS:Mdri3)
 CONFIGURE_ARGS+=	--enable-dri3
-.include "../../x11/dri3proto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-dri3
 .endif
diff --git a/xf86-video-intel-dfbsd/Makefile b/xf86-video-intel-dfbsd/Makefile
index c9a96a9621..7111005767 100644
--- a/xf86-video-intel-dfbsd/Makefile
+++ b/xf86-video-intel-dfbsd/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.39 2016/12/07 21:59:54 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
@@ -57,7 +57,7 @@ PLIST.xvmc=		yes
 .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 "../../x11/libXrender/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/xf86-video-intel-old/Makefile b/xf86-video-intel-old/Makefile
index a46dfeac1c..833f8a1c45 100644
--- a/xf86-video-intel-old/Makefile
+++ b/xf86-video-intel-old/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.2 2014/08/01 09:10:09 thomasklausner Exp $
 
 DISTNAME=	xf86-video-intel-2.7.1
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
@@ -30,6 +30,6 @@ BUILDLINK_API_DEPENDS.libdrm+=	libdrm>=2.4.7
 .include "../../graphics/MesaLib/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"
diff --git a/xf86-video-virtualbox/Makefile b/xf86-video-virtualbox/Makefile
index 784e8d1baa..ddcfba0dcb 100644
--- a/xf86-video-virtualbox/Makefile
+++ b/xf86-video-virtualbox/Makefile
@@ -2,6 +2,7 @@
 
 DISTNAME=	VirtualBox-5.0.14
 PKGNAME=	${DISTNAME:S/VirtualBox/xf86-video-virtualbox/}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://download.virtualbox.org/virtualbox/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.bz2
@@ -31,8 +32,7 @@ pre-configure:
 .include "../../devel/xorg-util-macros/buildlink3.mk"
 .include "../../x11/libdrm/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
-.include "../../x11/randrproto/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libXext?=   build
 .include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/xineramaproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/xf86rushproto/Makefile b/xf86rushproto/Makefile
index 699e701e23..82d0f757c5 100644
--- a/xf86rushproto/Makefile
+++ b/xf86rushproto/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2012/10/07 20:11:09 asau Exp $
-#
 
 DISTNAME=	xf86rushproto-1.1.2
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=proto/}
 EXTRACT_SUFX=	.tar.bz2
@@ -17,6 +17,6 @@ USE_LANGUAGES=	# none
 
 PKGCONFIG_OVERRIDE+=	xf86rushproto.pc.in
 
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/xf86rushproto/buildlink3.mk b/xf86rushproto/buildlink3.mk
index 3c9d50ea51..6ce00e9aa8 100644
--- a/xf86rushproto/buildlink3.mk
+++ b/xf86rushproto/buildlink3.mk
@@ -8,7 +8,7 @@ XF86RUSHPROTO_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.xf86rushproto+=	xf86rushproto>=1.1.2
 BUILDLINK_PKGSRCDIR.xf86rushproto?=	../../wip/xf86rushproto
 
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .endif # XF86RUSHPROTO_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-xf86rushproto
diff --git a/xinput_calibrator/Makefile b/xinput_calibrator/Makefile
index f6b2f2efa7..db9b44c067 100644
--- a/xinput_calibrator/Makefile
+++ b/xinput_calibrator/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	xinput_calibrator-0.7.5
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://github.com/downloads/tias/xinput_calibrator/
 
@@ -19,5 +20,5 @@ USE_TOOLS+=	pkg-config
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/inputproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/xpilot-ng/Makefile b/xpilot-ng/Makefile
index 407bc98e0d..0d74931153 100644
--- a/xpilot-ng/Makefile
+++ b/xpilot-ng/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.15 2014/01/25 10:45:29 thomasklausner Exp $
 
 DISTNAME=	xpilot-ng-4.7.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xpilot/}
 
@@ -16,7 +16,7 @@ REPLACE_PYTHON=	mapconvert.py
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/SDL_ttf/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
Prev by Date: ftgl: fix PLIST after doxygen update
Next by Date: e16: remove even more ancient version of enlightenment
Previous by Thread: ftgl: fix PLIST after doxygen update
Next by Thread: e16: remove even more ancient version of enlightenment
Indexes:
Home | Main Index | Thread Index | Old Index