libXTrap, xtrap: remove

Not useful according to upstream (deprecated since ~1994).

13 files changed, 9 insertions, 108 deletions

diff --git a/doc/CHANGES-2019 b/doc/CHANGES-2019
index 5b0056c78e9..d57184f24cc 100644
--- a/doc/CHANGES-2019
+++ b/doc/CHANGES-2019
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2019,v 1.2974 2019/07/19 20:38:53 leot Exp $
+$NetBSD: CHANGES-2019,v 1.2975 2019/07/19 21:13:28 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2019:
 
@@ -4896,3 +4896,7 @@ Changes to the packages collection and infrastructure in 2019:
 	Removed wm/libWindowsWM [wiz 2019-07-19]
 	Updated www/curl to 7.65.3 [leot 2019-07-19]
 	Updated net/gallery-dl to 1.9.0 [leot 2019-07-19]
+	Removed x11/xtrap [wiz 2019-07-19]
+	Removed x11/libXTrap [wiz 2019-07-19]
+	Updated meta-pkgs/modular-xorg-apps to 1.14.1.11 [wiz 2019-07-19]
+	Updated meta-pkgs/modular-xorg-libs to 1.8 [wiz 2019-07-19]
diff --git a/meta-pkgs/modular-xorg-apps/Makefile b/meta-pkgs/modular-xorg-apps/Makefile
index 308c620d7a1..9439a1aa58a 100644
--- a/meta-pkgs/modular-xorg-apps/Makefile
+++ b/meta-pkgs/modular-xorg-apps/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2019/03/20 16:35:26 tnn Exp $
+# $NetBSD: Makefile,v 1.39 2019/07/19 21:13:27 wiz Exp $
 
 DISTNAME=	# empty
-PKGNAME=	modular-xorg-apps-1.14.1.10
+PKGNAME=	modular-xorg-apps-1.14.1.11
 CATEGORIES=	meta-pkgs x11
 MASTER_SITES=	${MASTER_SITE_XORG:=app/}
 DISTFILES=	# empty
@@ -91,7 +91,6 @@ DEPENDS+=	xsm-[0-9]*:../../x11/xsm
 DEPENDS+=	xstdcmap-[0-9]*:../../x11/xstdcmap
 DEPENDS+=	xterm-[0-9]*:../../x11/xterm
 DEPENDS+=	xtrans-[0-9]*:../../x11/xtrans
-DEPENDS+=	xtrap-[0-9]*:../../x11/xtrap
 DEPENDS+=	xvinfo-[0-9]*:../../x11/xvinfo
 DEPENDS+=	xwininfo-[0-9]*:../../x11/xwininfo
 DEPENDS+=	xwd-[0-9]*:../../x11/xwd
diff --git a/meta-pkgs/modular-xorg-libs/Makefile b/meta-pkgs/modular-xorg-libs/Makefile
index 13dff4947d6..986e5c9b30c 100644
--- a/meta-pkgs/modular-xorg-libs/Makefile
+++ b/meta-pkgs/modular-xorg-libs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2019/07/19 12:07:23 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/07/19 21:13:27 wiz Exp $
 
 DISTNAME=	# empty
-PKGNAME=	modular-xorg-libs-1.7
+PKGNAME=	modular-xorg-libs-1.8
 CATEGORIES=	meta-pkgs x11
 MASTER_SITES=	${MASTER_SITE_XORG:=lib/}
 DISTFILES=	# empty
@@ -24,7 +24,6 @@ META_PACKAGE=	yes
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
-.include "../../x11/libXTrap/buildlink3.mk"
 .include "../../x11/libXau/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXaw3d/buildlink3.mk"
diff --git a/x11/libXTrap/DESCR b/x11/libXTrap/DESCR
deleted file mode 100644
index 833bca196c0..00000000000
--- a/x11/libXTrap/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-This package contains the library and header files for the X Trap Library.
-This is from the modular X.org project.
diff --git a/x11/libXTrap/Makefile b/x11/libXTrap/Makefile
deleted file mode 100644
index af68a30e4b3..00000000000
--- a/x11/libXTrap/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $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
-
-MAINTAINER=		joerg@NetBSD.org
-HOMEPAGE=		http://xorg.freedesktop.org/
-COMMENT=		X Trap Library
-
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		pkg-config
-
-PKGCONFIG_OVERRIDE+=	xtrap.pc.in
-
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xorgproto/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXTrap/PLIST b/x11/libXTrap/PLIST
deleted file mode 100644
index caf1778a79a..00000000000
--- a/x11/libXTrap/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/11/03 20:58:20 joerg Exp $
-lib/libXTrap.la
-lib/pkgconfig/xtrap.pc
diff --git a/x11/libXTrap/buildlink3.mk b/x11/libXTrap/buildlink3.mk
deleted file mode 100644
index 6d219284bfd..00000000000
--- a/x11/libXTrap/buildlink3.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:39 rillig Exp $
-
-BUILDLINK_TREE+=	libXTrap
-
-.if !defined(LIBXTRAP_BUILDLINK3_MK)
-LIBXTRAP_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.libXTrap+=	libXTrap>=1.0.0
-BUILDLINK_PKGSRCDIR.libXTrap?=		../../x11/libXTrap
-
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.endif # LIBXTRAP_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-libXTrap
diff --git a/x11/libXTrap/builtin.mk b/x11/libXTrap/builtin.mk
deleted file mode 100644
index 0258601f2c2..00000000000
--- a/x11/libXTrap/builtin.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:52 jperkin Exp $
-
-BUILTIN_PKG:=	libXTrap
-PKGCONFIG_FILE.libXTrap=	${X11BASE}/lib/pkgconfig/xtrap.pc
-PKGCONFIG_FILE.libXTrap+=	${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xtrap.pc
-
-.include "../../mk/buildlink3/pkgconfig-builtin.mk"
-.include "../../mk/x11.builtin.mk"
diff --git a/x11/libXTrap/distinfo b/x11/libXTrap/distinfo
deleted file mode 100644
index d0135594ea9..00000000000
--- a/x11/libXTrap/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 03:28:45 agc Exp $
-
-SHA1 (libXTrap-1.0.1.tar.bz2) = 40850a53d916730720b8b32e9ebd5969f66115bf
-RMD160 (libXTrap-1.0.1.tar.bz2) = efd57663d5d032f7ae3230be963b1c1931e4b8ea
-SHA512 (libXTrap-1.0.1.tar.bz2) = 638f79aeb7a68aaff51839266c74b5e4f875e5bb2b473f01a637ea0dd75e4fbc7350612ff27dc12716142397c824fe16b178003015878f34f439d90d748391f1
-Size (libXTrap-1.0.1.tar.bz2) = 269484 bytes
diff --git a/x11/xtrap/DESCR b/x11/xtrap/DESCR
deleted file mode 100644
index 800603510a0..00000000000
--- a/x11/xtrap/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-XTrap sample clients.
diff --git a/x11/xtrap/Makefile b/x11/xtrap/Makefile
deleted file mode 100644
index 956edddbec4..00000000000
--- a/x11/xtrap/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2018/03/24 06:59:25 wiz Exp $
-
-DISTNAME=	xtrap-1.0.3
-CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_XORG:=app/}
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://xorg.freedesktop.org/
-COMMENT=	XTrap sample clients
-
-GNU_CONFIGURE=	yes
-USE_TOOLS+=	pkg-config
-
-CONFIGURE_ENV+=	APP_MAN_SUFFIX=1
-
-.include "../../x11/xorgproto/buildlink3.mk"
-.include "../../x11/libXTrap/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xtrap/PLIST b/x11/xtrap/PLIST
deleted file mode 100644
index e0a837ba0a8..00000000000
--- a/x11/xtrap/PLIST
+++ /dev/null
@@ -1,16 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2015/07/02 12:38:33 rodent Exp $
-bin/xtrapchar
-bin/xtrapin
-bin/xtrapinfo
-bin/xtrapout
-bin/xtrapproto
-bin/xtrapreset
-bin/xtrapstats
-man/man1/xtrap.1
-man/man1/xtrapchar.1
-man/man1/xtrapin.1
-man/man1/xtrapinfo.1
-man/man1/xtrapout.1
-man/man1/xtrapproto.1
-man/man1/xtrapreset.1
-man/man1/xtrapstats.1
diff --git a/x11/xtrap/distinfo b/x11/xtrap/distinfo
deleted file mode 100644
index 7ec5322ded5..00000000000
--- a/x11/xtrap/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.3 2018/03/24 06:59:25 wiz Exp $
-
-SHA1 (xtrap-1.0.3.tar.bz2) = 1f1df2c1cb6422238d4dc2708b15445d1af9bdad
-RMD160 (xtrap-1.0.3.tar.bz2) = a932b596e045466845430536a9502896e3253812
-SHA512 (xtrap-1.0.3.tar.bz2) = cdb205859a96a64ede8ce1df119c318e5b6d35107425996c18be0ec56a6287a0564d768f93012f301cb91d517f67261de5c76441c0bfb796cc0190799aaf6c2f
-Size (xtrap-1.0.3.tar.bz2) = 134065 bytes