xorgproto: use xorgproto instead of separate *proto packages

Remove now obsolete packages.

20 files changed, 27 insertions, 129 deletions

diff --git a/wm/Makefile b/wm/Makefile
index af6f23772d3..fb562a4df05 100644
--- a/wm/Makefile
+++ b/wm/Makefile
@@ -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
diff --git a/wm/applewmproto/DESCR b/wm/applewmproto/DESCR
deleted file mode 100644
index d95edda5ea3..00000000000
--- a/wm/applewmproto/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This provides the AppleWM extension headers from modular X.org X11
-project.
diff --git a/wm/applewmproto/Makefile b/wm/applewmproto/Makefile
deleted file mode 100644
index 4030b7f9bef..00000000000
--- a/wm/applewmproto/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2013/05/31 00:33:43 rodent Exp $
-#
-
-DISTNAME=	applewmproto-1.4.2
-CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_XORG:=proto/}
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://xorg.freedesktop.org/
-COMMENT=	AppleWM extension headers from X.org
-LICENSE=	mit
-
-PREV_PKGPATH=	x11/applewmproto
-
-ONLY_FOR_PLATFORM=	Darwin-*-*
-
-GNU_CONFIGURE=		yes
-PKGCONFIG_OVERRIDE+=	${WRKSRC}/applewmproto.pc.in
-
-.include "../../x11/xproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/wm/applewmproto/PLIST b/wm/applewmproto/PLIST
deleted file mode 100644
index f2c82914196..00000000000
--- a/wm/applewmproto/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2013/05/31 00:33:43 rodent Exp $
-include/X11/extensions/applewmconst.h
-include/X11/extensions/applewmproto.h
-lib/pkgconfig/applewmproto.pc
diff --git a/wm/applewmproto/buildlink3.mk b/wm/applewmproto/buildlink3.mk
deleted file mode 100644
index ff0ff871c62..00000000000
--- a/wm/applewmproto/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/05/31 00:33:43 rodent Exp $
-
-BUILDLINK_TREE+=	applewmproto
-
-.if !defined(APPLEWMPROTO_BUILDLINK3_MK)
-APPLEWMPROTO_BUILDLINK3_MK:=
-
-BUILDLINK_DEPMETHOD.applewmproto?=	build
-
-BUILDLINK_API_DEPENDS.applewmproto+=	applewmproto>=1.4.1
-BUILDLINK_PKGSRCDIR.applewmproto?=	../../wm/applewmproto
-
-.include "../../x11/xproto/buildlink3.mk"
-.endif # APPLEWMPROTO_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-applewmproto
diff --git a/wm/applewmproto/distinfo b/wm/applewmproto/distinfo
deleted file mode 100644
index 071385be767..00000000000
--- a/wm/applewmproto/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2015/11/02 23:42:50 agc Exp $
-
-SHA1 (applewmproto-1.4.2.tar.bz2) = 71dd2374e745a7db7ae0e94410e55ba721683d10
-RMD160 (applewmproto-1.4.2.tar.bz2) = b6ba0eb3e12d783d73d18934587acd1b11fb3989
-SHA512 (applewmproto-1.4.2.tar.bz2) = d4fd66b1566a1250a5c5d30fa19d2bb017f01ab39db5f9791951e738d323c54bb308f0223f52c781a59605c5691b217ae04379ebf211dc8b49fdd1c280c22b3d
-Size (applewmproto-1.4.2.tar.bz2) = 97192 bytes
diff --git a/wm/awesome/Makefile b/wm/awesome/Makefile
index 39a4e8f6702..5ea7bdbf1d0 100644
--- a/wm/awesome/Makefile
+++ b/wm/awesome/Makefile
@@ -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"
diff --git a/wm/bbrun/Makefile b/wm/bbrun/Makefile
index 5ecb94a4d1d..41700e922c0 100644
--- a/wm/bbrun/Makefile
+++ b/wm/bbrun/Makefile
@@ -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"
diff --git a/wm/jwm/Makefile b/wm/jwm/Makefile
index 23afaca52af..7d67937f82d 100644
--- a/wm/jwm/Makefile
+++ b/wm/jwm/Makefile
@@ -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"
diff --git a/wm/libAppleWM/Makefile b/wm/libAppleWM/Makefile
index 6d69a7eaf76..c51b606862a 100644
--- a/wm/libAppleWM/Makefile
+++ b/wm/libAppleWM/Makefile
@@ -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 macosx${OSX_VERSION} --show-sdk-path
 .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"
diff --git a/wm/libAppleWM/buildlink3.mk b/wm/libAppleWM/buildlink3.mk
index 0376e6f364c..39c4875e614 100644
--- a/wm/libAppleWM/buildlink3.mk
+++ b/wm/libAppleWM/buildlink3.mk
@@ -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
 
diff --git a/wm/libWindowsWM/Makefile b/wm/libWindowsWM/Makefile
index dcda51eb3ed..302ee261154 100644
--- a/wm/libWindowsWM/Makefile
+++ b/wm/libWindowsWM/Makefile
@@ -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"
diff --git a/wm/musca/Makefile b/wm/musca/Makefile
index b51f6417317..acbe4f8e660 100644
--- a/wm/musca/Makefile
+++ b/wm/musca/Makefile
@@ -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"
diff --git a/wm/quartz-wm/Makefile b/wm/quartz-wm/Makefile
index 2c18e77f9f0..dd83bf47803 100644
--- a/wm/quartz-wm/Makefile
+++ b/wm/quartz-wm/Makefile
@@ -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"
diff --git a/wm/spectrwm/Makefile b/wm/spectrwm/Makefile
index ed24669d32a..b318984c4ca 100644
--- a/wm/spectrwm/Makefile
+++ b/wm/spectrwm/Makefile
@@ -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"
diff --git a/wm/windowswmproto/DESCR b/wm/windowswmproto/DESCR
deleted file mode 100644
index 307b1f8e39d..00000000000
--- a/wm/windowswmproto/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-This module provides the definition of the WindowsWM extension to the X11
-protocol, used for coordination between an X11 server and the Microsoft Windows
-native window manager.
-
-WindowsWM is only intended to be used on Cygwin when running a rootless XWin
-server.
diff --git a/wm/windowswmproto/Makefile b/wm/windowswmproto/Makefile
deleted file mode 100644
index 97a3cbd9d90..00000000000
--- a/wm/windowswmproto/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2017/09/16 19:27:22 wiz Exp $
-
-DISTNAME=	windowswmproto-1.0.4
-CATEGORIES=	wm
-MASTER_SITES=	${MASTER_SITE_XORG:=proto/}
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://xorg.freedesktop.org/
-COMMENT=	Provides definition of the WindowsWM extension to the X11 protocol
-LICENSE=	mit
-
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	pkg-config
-USE_LANGUAGES=	c
-
-PKGCONFIG_OVERRIDE+=	windowswmproto.pc.in
-
-.include "../../x11/xproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/wm/windowswmproto/PLIST b/wm/windowswmproto/PLIST
deleted file mode 100644
index a78b8e10b8a..00000000000
--- a/wm/windowswmproto/PLIST
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2013/05/31 00:27:37 rodent Exp $
-include/X11/extensions/windowswm.h
-include/X11/extensions/windowswmstr.h
-lib/pkgconfig/windowswmproto.pc
diff --git a/wm/windowswmproto/buildlink3.mk b/wm/windowswmproto/buildlink3.mk
deleted file mode 100644
index 1a6cefe47fa..00000000000
--- a/wm/windowswmproto/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/05/31 00:27:37 rodent Exp $
-
-BUILDLINK_TREE+=	windowswmproto
-
-.if !defined(WINDOWSWMPROTO_BUILDLINK3_MK)
-WINDOWSWMPROTO_BUILDLINK3_MK:=
-
-BUILDLINK_DEPMETHOD.windowswmproto?=	build
-
-BUILDLINK_API_DEPENDS.windowswmproto+=	windowswmproto>=1.0.4
-BUILDLINK_PKGSRCDIR.windowswmproto?=	../../wm/windowswmproto
-
-.include "../../x11/xproto/buildlink3.mk"
-.endif	# WINDOWSWMPROTO_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-windowswmproto
diff --git a/wm/windowswmproto/distinfo b/wm/windowswmproto/distinfo
deleted file mode 100644
index 4919261d97c..00000000000
--- a/wm/windowswmproto/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2015/11/02 23:42:55 agc Exp $
-
-SHA1 (windowswmproto-1.0.4.tar.bz2) = 1c9b522c66325f08bb989700b4b31911b6ae60ae
-RMD160 (windowswmproto-1.0.4.tar.bz2) = 1825537af9cb3aba21901789dd3330089e948adf
-SHA512 (windowswmproto-1.0.4.tar.bz2) = d62d13846b0852e6517276d031f571c65440e468d8098d95b74895861059a315a1fa47108a0110878fbc42579ed56fe4ff9dffc7d895cacb96f03d308e3e1703
-Size (windowswmproto-1.0.4.tar.bz2) = 84371 bytes