Adding:

libXaw3d
libXprintAppUtil
liblbxutil
mkcomposecache
proxymngr
rstart
xcmsdb
xdbedizzy
xedit
xf86dga
xmh
xpr
xrx
xtrap

from pkgsrc-wip as requested by wiz@ last quarter. LICENSE can be fixed
later.

60 files changed, 695 insertions, 1 deletions

diff --git a/x11/Makefile b/x11/Makefile
index f4cf4a3070d..cd4d4677c48 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.753 2015/07/02 03:37:48 rodent Exp $
+# $NetBSD: Makefile,v 1.754 2015/07/02 12:38:32 rodent Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -274,6 +274,7 @@ SUBDIR+=	libXScrnSaver
 SUBDIR+=	libXTrap
 SUBDIR+=	libXau
 SUBDIR+=	libXaw
+SUBDIR+=	libXaw3d
 SUBDIR+=	libXcomposite
 SUBDIR+=	libXcursor
 SUBDIR+=	libXdamage
@@ -289,6 +290,7 @@ SUBDIR+=	libXmu
 SUBDIR+=	libXp
 SUBDIR+=	libXpm
 SUBDIR+=	libXpresent
+SUBDIR+=	libXprintAppUtil
 SUBDIR+=	libXprintUtil
 SUBDIR+=	libXrandr
 SUBDIR+=	libXrender
@@ -304,6 +306,7 @@ SUBDIR+=	libdesktop-agnostic
 SUBDIR+=	libdrm
 SUBDIR+=	libfakekey
 SUBDIR+=	libgnomekbd
+SUBDIR+=	liblbxutil
 SUBDIR+=	liboldXrandr
 SUBDIR+=	libunique
 SUBDIR+=	libunique3
@@ -326,6 +329,7 @@ SUBDIR+=	matchbox-nest
 SUBDIR+=	matchbox-panel
 SUBDIR+=	matchbox-panel-manager
 SUBDIR+=	matchbox-themes-extra
+SUBDIR+=	mkcomposecache
 SUBDIR+=	mlterm
 SUBDIR+=	modeline
 SUBDIR+=	modular-xorg-server
@@ -353,6 +357,7 @@ SUBDIR+=	paragui
 SUBDIR+=	pixman
 SUBDIR+=	presentproto
 SUBDIR+=	printproto
+SUBDIR+=	proxymngr
 SUBDIR+=	py-Pmw
 SUBDIR+=	py-Pmw2
 SUBDIR+=	py-Tk
@@ -434,6 +439,7 @@ SUBDIR+=	resourceproto
 SUBDIR+=	rgb
 SUBDIR+=	rox-session
 SUBDIR+=	rox-wallpaper
+SUBDIR+=	rstart
 SUBDIR+=	ruby-gnome2-gtk
 SUBDIR+=	ruby-gnome2-gtk3
 SUBDIR+=	ruby-gnome2-gtksourceview2
@@ -514,6 +520,7 @@ SUBDIR+=	xcb-util036
 SUBDIR+=	xclip
 SUBDIR+=	xclipboard
 SUBDIR+=	xcmiscproto
+SUBDIR+=	xcmsdb
 SUBDIR+=	xcolors
 SUBDIR+=	xcolorsel
 SUBDIR+=	xcompmgr
@@ -523,6 +530,7 @@ SUBDIR+=	xcursor
 SUBDIR+=	xcursorgen
 SUBDIR+=	xdaemon
 SUBDIR+=	xdaemon2
+SUBDIR+=	xdbedizzy
 SUBDIR+=	xdesktopwaves
 SUBDIR+=	xdg-user-dirs
 SUBDIR+=	xdialog
@@ -532,6 +540,7 @@ SUBDIR+=	xdm3d
 SUBDIR+=	xdpyinfo
 SUBDIR+=	xdriinfo
 SUBDIR+=	xearth
+SUBDIR+=	xedit
 SUBDIR+=	xephem
 SUBDIR+=	xev
 SUBDIR+=	xextproto
@@ -590,6 +599,7 @@ SUBDIR+=	xf86-video-vmware
 SUBDIR+=	xf86-video-voodoo
 SUBDIR+=	xf86-video-wsfb
 SUBDIR+=	xf86bigfontproto
+SUBDIR+=	xf86dga
 SUBDIR+=	xf86dgaproto
 SUBDIR+=	xf86driproto
 SUBDIR+=	xf86miscproto
@@ -653,6 +663,7 @@ SUBDIR+=	xmag
 SUBDIR+=	xman
 SUBDIR+=	xmascot
 SUBDIR+=	xmessage
+SUBDIR+=	xmh
 SUBDIR+=	xmindpath
 SUBDIR+=	xmms-osd
 SUBDIR+=	xmodmap
@@ -676,6 +687,7 @@ SUBDIR+=	xpmicons
 SUBDIR+=	xpmroot
 SUBDIR+=	xpns
 SUBDIR+=	xpostit
+SUBDIR+=	xpr
 SUBDIR+=	xprehashprinterlist
 SUBDIR+=	xprop
 SUBDIR+=	xproto
@@ -685,6 +697,7 @@ SUBDIR+=	xrdb
 SUBDIR+=	xrefresh
 SUBDIR+=	xrestop
 SUBDIR+=	xrootconsole
+SUBDIR+=	xrx
 SUBDIR+=	xscope
 SUBDIR+=	xscreensaver
 SUBDIR+=	xscreensaver-demo
@@ -703,6 +716,7 @@ SUBDIR+=	xterm
 SUBDIR+=	xtermset
 SUBDIR+=	xtoolwait
 SUBDIR+=	xtrans
+SUBDIR+=	xtrap
 SUBDIR+=	xtruss
 SUBDIR+=	xvattr
 SUBDIR+=	xvidcap
diff --git a/x11/libXaw3d/DESCR b/x11/libXaw3d/DESCR
new file mode 100644
index 00000000000..eded7a2c5a3
--- /dev/null
+++ b/x11/libXaw3d/DESCR
@@ -0,0 +1,2 @@
+Xaw3d is the X 3D Athena Widget Set. Xaw3d is a widget set based on the X
+Toolkit Intrinsics (Xt) Library.
diff --git a/x11/libXaw3d/Makefile b/x11/libXaw3d/Makefile
new file mode 100644
index 00000000000..af18a437001
--- /dev/null
+++ b/x11/libXaw3d/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 12:38:32 rodent Exp $
+#
+
+DISTNAME=	libXaw3d-1.6.2
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XORG:=lib/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	X 3D Athena Widget Set
+#LICENSE=	x11 # AND others
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	bison flex pkg-config
+
+PKGCONFIG_OVERRIDE+=	xaw3d.pc.in
+
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../devel/xorg-util-macros/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXaw3d/PLIST b/x11/libXaw3d/PLIST
new file mode 100644
index 00000000000..15044554cfb
--- /dev/null
+++ b/x11/libXaw3d/PLIST
@@ -0,0 +1,79 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 12:38:32 rodent Exp $
+include/X11/Xaw3d/AllWidgets.h
+include/X11/Xaw3d/AsciiSink.h
+include/X11/Xaw3d/AsciiSinkP.h
+include/X11/Xaw3d/AsciiSrc.h
+include/X11/Xaw3d/AsciiSrcP.h
+include/X11/Xaw3d/AsciiText.h
+include/X11/Xaw3d/AsciiTextP.h
+include/X11/Xaw3d/Box.h
+include/X11/Xaw3d/BoxP.h
+include/X11/Xaw3d/Cardinals.h
+include/X11/Xaw3d/Command.h
+include/X11/Xaw3d/CommandP.h
+include/X11/Xaw3d/Dialog.h
+include/X11/Xaw3d/DialogP.h
+include/X11/Xaw3d/Form.h
+include/X11/Xaw3d/FormP.h
+include/X11/Xaw3d/Grip.h
+include/X11/Xaw3d/GripP.h
+include/X11/Xaw3d/Label.h
+include/X11/Xaw3d/LabelP.h
+include/X11/Xaw3d/Layout.h
+include/X11/Xaw3d/LayoutP.h
+include/X11/Xaw3d/List.h
+include/X11/Xaw3d/ListP.h
+include/X11/Xaw3d/MenuButtoP.h
+include/X11/Xaw3d/MenuButton.h
+include/X11/Xaw3d/MultiSink.h
+include/X11/Xaw3d/MultiSinkP.h
+include/X11/Xaw3d/MultiSrc.h
+include/X11/Xaw3d/MultiSrcP.h
+include/X11/Xaw3d/Paned.h
+include/X11/Xaw3d/PanedP.h
+include/X11/Xaw3d/Panner.h
+include/X11/Xaw3d/PannerP.h
+include/X11/Xaw3d/Porthole.h
+include/X11/Xaw3d/PortholeP.h
+include/X11/Xaw3d/Repeater.h
+include/X11/Xaw3d/RepeaterP.h
+include/X11/Xaw3d/Reports.h
+include/X11/Xaw3d/Scrollbar.h
+include/X11/Xaw3d/ScrollbarP.h
+include/X11/Xaw3d/Simple.h
+include/X11/Xaw3d/SimpleMenP.h
+include/X11/Xaw3d/SimpleMenu.h
+include/X11/Xaw3d/SimpleP.h
+include/X11/Xaw3d/Sme.h
+include/X11/Xaw3d/SmeBSB.h
+include/X11/Xaw3d/SmeBSBP.h
+include/X11/Xaw3d/SmeLine.h
+include/X11/Xaw3d/SmeLineP.h
+include/X11/Xaw3d/SmeP.h
+include/X11/Xaw3d/SmeThreeD.h
+include/X11/Xaw3d/SmeThreeDP.h
+include/X11/Xaw3d/StripCharP.h
+include/X11/Xaw3d/StripChart.h
+include/X11/Xaw3d/Text.h
+include/X11/Xaw3d/TextP.h
+include/X11/Xaw3d/TextSink.h
+include/X11/Xaw3d/TextSinkP.h
+include/X11/Xaw3d/TextSrc.h
+include/X11/Xaw3d/TextSrcP.h
+include/X11/Xaw3d/ThreeD.h
+include/X11/Xaw3d/ThreeDP.h
+include/X11/Xaw3d/Tip.h
+include/X11/Xaw3d/TipP.h
+include/X11/Xaw3d/Toggle.h
+include/X11/Xaw3d/ToggleP.h
+include/X11/Xaw3d/Tree.h
+include/X11/Xaw3d/TreeP.h
+include/X11/Xaw3d/VendorEP.h
+include/X11/Xaw3d/Viewport.h
+include/X11/Xaw3d/ViewportP.h
+include/X11/Xaw3d/Xaw3dP.h
+include/X11/Xaw3d/XawImP.h
+include/X11/Xaw3d/XawInit.h
+lib/libXaw3d.la
+lib/pkgconfig/xaw3d.pc
+share/doc/libXaw3d/README.XAW3D
diff --git a/x11/libXaw3d/distinfo b/x11/libXaw3d/distinfo
new file mode 100644
index 00000000000..9e792a749f2
--- /dev/null
+++ b/x11/libXaw3d/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 12:38:32 rodent Exp $
+
+SHA1 (libXaw3d-1.6.2.tar.bz2) = 0b1db72e9d5be0edae57cda213860c0289fac12f
+RMD160 (libXaw3d-1.6.2.tar.bz2) = 0837e67bcae5e7191f1fef5522d572cc3b397d1d
+Size (libXaw3d-1.6.2.tar.bz2) = 551851 bytes
diff --git a/x11/libXprintAppUtil/DESCR b/x11/libXprintAppUtil/DESCR
new file mode 100644
index 00000000000..9def64e2ba0
--- /dev/null
+++ b/x11/libXprintAppUtil/DESCR
@@ -0,0 +1 @@
+Xprint application utility routines.
diff --git a/x11/libXprintAppUtil/Makefile b/x11/libXprintAppUtil/Makefile
new file mode 100644
index 00000000000..3126f5744e6
--- /dev/null
+++ b/x11/libXprintAppUtil/Makefile
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 12:38:32 rodent Exp $
+#
+
+DISTNAME=	libXprintAppUtil-1.0.1
+CATEGORIES=	print x11
+MASTER_SITES=	${MASTER_SITE_XORG:=lib/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	Xprint application utility routines
+#LICENSE=	# TODO: (see mk/license.mk)
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_LANGUAGES+=	c c++ fortran
+USE_TOOLS+=	gsed pkg-config
+
+PKGCONFIG_OVERRIDE+=	xprintapputil.pc.in
+
+.include "../../x11/libXau/buildlink3.mk"
+.include "../../x11/printproto/buildlink3.mk"
+.include "../../x11/libXprintUtil/buildlink3.mk"
+BUILD_DEPENDS+=	xp-[0-9]*:../../x11/xp
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/libXprintAppUtil/PLIST b/x11/libXprintAppUtil/PLIST
new file mode 100644
index 00000000000..f4e8fa01d46
--- /dev/null
+++ b/x11/libXprintAppUtil/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 12:38:32 rodent Exp $
+include/X11/XprintAppUtil/xpapputil.h
+lib/libXprintAppUtil.la
+lib/pkgconfig/xprintapputil.pc
diff --git a/x11/libXprintAppUtil/buildlink3.mk b/x11/libXprintAppUtil/buildlink3.mk
new file mode 100644
index 00000000000..413d6741948
--- /dev/null
+++ b/x11/libXprintAppUtil/buildlink3.mk
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.1 2015/07/02 12:38:32 rodent Exp $
+
+BUILDLINK_TREE+=	libXprintAppUtil
+
+.if !defined(LIBXPRINTAPPUTIL_BUILDLINK3_MK)
+LIBXPRINTAPPUTIL_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libXprintAppUtil+=	libXprintAppUtil>=1.0.1
+BUILDLINK_PKGSRCDIR.libXprintAppUtil?=	../../x11/libXprintAppUtil
+
+.include "../../x11/libXau/buildlink3.mk"
+.include "../../x11/libXprintUtil/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.endif	# LIBXPRINTAPPUTIL_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-libXprintAppUtil
diff --git a/x11/libXprintAppUtil/distinfo b/x11/libXprintAppUtil/distinfo
new file mode 100644
index 00000000000..319c9688ae3
--- /dev/null
+++ b/x11/libXprintAppUtil/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 12:38:32 rodent Exp $
+
+SHA1 (libXprintAppUtil-1.0.1.tar.bz2) = 6391b4a018189b49e31eda0fe76b3daf92b447ec
+RMD160 (libXprintAppUtil-1.0.1.tar.bz2) = e5e16acd5e6b8b77f5b6821613470950289c4cc4
+Size (libXprintAppUtil-1.0.1.tar.bz2) = 208379 bytes
diff --git a/x11/liblbxutil/DESCR b/x11/liblbxutil/DESCR
new file mode 100644
index 00000000000..6334711016f
--- /dev/null
+++ b/x11/liblbxutil/DESCR
@@ -0,0 +1 @@
+liblbxutil - Low Bandwith X extension (LBX) utility routines
diff --git a/x11/liblbxutil/Makefile b/x11/liblbxutil/Makefile
new file mode 100644
index 00000000000..ec0f41b3c7a
--- /dev/null
+++ b/x11/liblbxutil/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.7 2015/07/02 12:38:32 rodent Exp $
+#
+
+DISTNAME=	liblbxutil-1.1.0
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XORG:=lib/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	Low Bandwith X extension (LBX) utility routines
+LICENSE=	x11 # XXX and others
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_LANGUAGES+=	c c++ fortran
+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 "../../mk/bsd.pkg.mk"
diff --git a/x11/liblbxutil/PLIST b/x11/liblbxutil/PLIST
new file mode 100644
index 00000000000..6ffd3dc6191
--- /dev/null
+++ b/x11/liblbxutil/PLIST
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST,v 1.3 2015/07/02 12:38:32 rodent Exp $
+include/X11/extensions/lbxbuf.h
+include/X11/extensions/lbxbufstr.h
+include/X11/extensions/lbxdeltastr.h
+include/X11/extensions/lbximage.h
+include/X11/extensions/lbxopts.h
+include/X11/extensions/lbxzlib.h
+lib/liblbxutil.la
+lib/pkgconfig/lbxutil.pc
diff --git a/x11/liblbxutil/buildlink3.mk b/x11/liblbxutil/buildlink3.mk
new file mode 100644
index 00000000000..ecbd142c556
--- /dev/null
+++ b/x11/liblbxutil/buildlink3.mk
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.4 2015/07/02 12:38:32 rodent Exp $
+
+BUILDLINK_TREE+=	liblbxutil
+
+.if !defined(LIBLBXUTIL_BUILDLINK3_MK)
+LIBLBXUTIL_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.liblbxutil+=	liblbxutil>=1.1.0
+BUILDLINK_PKGSRCDIR.liblbxutil?=	../../x11/liblbxutil
+
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../x11/xproto/buildlink3.mk"
+.endif	# LIBLBXUTIL_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-liblbxutil
diff --git a/x11/liblbxutil/distinfo b/x11/liblbxutil/distinfo
new file mode 100644
index 00000000000..602e203bab6
--- /dev/null
+++ b/x11/liblbxutil/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.4 2015/07/02 12:38:32 rodent Exp $
+
+SHA1 (liblbxutil-1.1.0.tar.bz2) = 99616bab0ca0afeaa9c0a19222091b1ff4f18680
+RMD160 (liblbxutil-1.1.0.tar.bz2) = d719285993a86ac0b364997e9261373d5aad9912
+Size (liblbxutil-1.1.0.tar.bz2) = 268278 bytes
diff --git a/x11/mkcomposecache/DESCR b/x11/mkcomposecache/DESCR
new file mode 100644
index 00000000000..b3b220ae5a6
--- /dev/null
+++ b/x11/mkcomposecache/DESCR
@@ -0,0 +1,4 @@
+mkcomposecache is used for creating global (system-wide) Compose cache files.
+
+Compose cache files help with application startup times and memory usage,
+especially in locales with large Compose tables (e.g. all UTF-8 locales).
diff --git a/x11/mkcomposecache/Makefile b/x11/mkcomposecache/Makefile
new file mode 100644
index 00000000000..6b1d0e105fc
--- /dev/null
+++ b/x11/mkcomposecache/Makefile
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 12:38:32 rodent Exp $
+#
+
+DISTNAME=	mkcomposecache-1.2.1
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XORG:=app/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	Used for creating global (system-wide) Compose cache files
+#LICENSE=	# XXX SUSE license ?
+
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	pkg-config
+
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/mkcomposecache/PLIST b/x11/mkcomposecache/PLIST
new file mode 100644
index 00000000000..268fbb3ad2b
--- /dev/null
+++ b/x11/mkcomposecache/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 12:38:32 rodent Exp $
+man/man8/mkcomposecache.8
+sbin/mkcomposecache
diff --git a/x11/mkcomposecache/distinfo b/x11/mkcomposecache/distinfo
new file mode 100644
index 00000000000..7068d4db17d
--- /dev/null
+++ b/x11/mkcomposecache/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 12:38:32 rodent Exp $
+
+SHA1 (mkcomposecache-1.2.1.tar.bz2) = a0daa928b449998a2374c0472fd715792075f8b3
+RMD160 (mkcomposecache-1.2.1.tar.bz2) = 4f09fbf0c4b72c267ce6242155ff3f177dd403f3
+Size (mkcomposecache-1.2.1.tar.bz2) = 97359 bytes
+SHA1 (patch-mkallcomposecaches.sh) = 2382cf4abe912ff80360caa1a9e4d6f3cfe7535e
diff --git a/x11/mkcomposecache/patches/patch-mkallcomposecaches.sh b/x11/mkcomposecache/patches/patch-mkallcomposecaches.sh
new file mode 100644
index 00000000000..970d7fb3102
--- /dev/null
+++ b/x11/mkcomposecache/patches/patch-mkallcomposecaches.sh
@@ -0,0 +1,15 @@
+$NetBSD: patch-mkallcomposecaches.sh,v 1.1 2015/07/02 12:38:32 rodent Exp $
+
+Fixes portability failure.
+
+--- mkallcomposecaches.sh.orig	2009-04-10 00:43:20.000000000 +0000
++++ mkallcomposecaches.sh
+@@ -55,7 +55,7 @@ while [ "x$1" != x ] ; do
+   esac
+ done
+ 
+-test $# == 1 || usage
++test $# = 1 || usage
+ 
+ 
+ # Defaults
diff --git a/x11/proxymngr/DESCR b/x11/proxymngr/DESCR
new file mode 100644
index 00000000000..acc351e4216
--- /dev/null
+++ b/x11/proxymngr/DESCR
@@ -0,0 +1,6 @@
+X proxy manager service:
+
+The proxy manager (proxymngr) is responsible for resolving requests from
+xfindproxy (and other similar clients), starting new proxies when appropriate,
+and keeping track of all of the available proxy services. The proxy manager
+strives to reuse existing proxies whenever possible.
diff --git a/x11/proxymngr/Makefile b/x11/proxymngr/Makefile
new file mode 100644
index 00000000000..17b33544724
--- /dev/null
+++ b/x11/proxymngr/Makefile
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 12:38:32 rodent Exp $
+#
+
+DISTNAME=	proxymngr-1.0.3
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XORG:=app/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	X proxy manager service
+LICENSE=	x11
+
+GNU_CONFIGURE=	yes
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	pkg-config
+
+EGDIR=		share/examples/proxymngr
+CONF_FILES+=	${EGDIR}/pmconfig ${PKG_SYSCONFDIR}/X11/proxymngr/pmconfig
+
+INSTALLATION_DIRS+=	${EGDIR}
+
+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/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"
diff --git a/x11/proxymngr/PLIST b/x11/proxymngr/PLIST
new file mode 100644
index 00000000000..5063a8628ef
--- /dev/null
+++ b/x11/proxymngr/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 12:38:32 rodent Exp $
+bin/proxymngr
+man/man1/proxymngr.1
+share/examples/proxymngr/pmconfig
diff --git a/x11/proxymngr/distinfo b/x11/proxymngr/distinfo
new file mode 100644
index 00000000000..d99f1da1309
--- /dev/null
+++ b/x11/proxymngr/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 12:38:32 rodent Exp $
+
+SHA1 (proxymngr-1.0.3.tar.bz2) = 50f517d017663faf45a99e46a032647060791ba0
+RMD160 (proxymngr-1.0.3.tar.bz2) = 658e2cb8ad2e7f052094e881abe9e5cc1f16b503
+Size (proxymngr-1.0.3.tar.bz2) = 125473 bytes
diff --git a/x11/rstart/DESCR b/x11/rstart/DESCR
new file mode 100644
index 00000000000..9eb95304afb
--- /dev/null
+++ b/x11/rstart/DESCR
@@ -0,0 +1,6 @@
+This package includes both the client and server sides implementing the protocol
+described in the "A Flexible Remote Execution Protocol Based on rsh" paper found
+in the specs/ subdirectory.
+
+This software has been deprecated in favor of the X11 forwarding provided in
+common ssh implementations.
diff --git a/x11/rstart/Makefile b/x11/rstart/Makefile
new file mode 100644
index 00000000000..36479ac3292
--- /dev/null
+++ b/x11/rstart/Makefile
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 12:38:32 rodent Exp $
+#
+
+DISTNAME=	rstart-1.0.5
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XORG:=app/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+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 "../../mk/bsd.pkg.mk"
diff --git a/x11/rstart/PLIST b/x11/rstart/PLIST
new file mode 100644
index 00000000000..18636d60d39
--- /dev/null
+++ b/x11/rstart/PLIST
@@ -0,0 +1,20 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 12:38:32 rodent Exp $
+bin/rstart
+bin/rstartd
+lib/X11/rstart/commands/@List
+lib/X11/rstart/commands/ListContexts
+lib/X11/rstart/commands/ListGenericCommands
+lib/X11/rstart/commands/x
+lib/X11/rstart/commands/x11
+lib/X11/rstart/commands/x11r6/@List
+lib/X11/rstart/commands/x11r6/LoadMonitor
+lib/X11/rstart/commands/x11r6/Terminal
+lib/X11/rstart/config
+lib/X11/rstart/contexts/@List
+lib/X11/rstart/contexts/default
+lib/X11/rstart/contexts/x
+lib/X11/rstart/contexts/x11
+lib/X11/rstart/contexts/x11r6
+lib/X11/rstart/rstartd.real
+man/man1/rstart.1
+man/man1/rstartd.1
diff --git a/x11/rstart/distinfo b/x11/rstart/distinfo
new file mode 100644
index 00000000000..14196f941ac
--- /dev/null
+++ b/x11/rstart/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 12:38:32 rodent Exp $
+
+SHA1 (rstart-1.0.5.tar.bz2) = 97fad3686b4687104a58b3f2b7b387d316b26b92
+RMD160 (rstart-1.0.5.tar.bz2) = e23d45cd744f60ece5a876bc8dc693d8ddfe5913
+Size (rstart-1.0.5.tar.bz2) = 144607 bytes
diff --git a/x11/xcmsdb/DESCR b/x11/xcmsdb/DESCR
new file mode 100644
index 00000000000..ec385e76de0
--- /dev/null
+++ b/x11/xcmsdb/DESCR
@@ -0,0 +1,4 @@
+xcmsdb is used to load, query, or remove Device Color Characterization data
+stored in properties on the root window of the screen as specified in section 7,
+Device Color Characterization, of the X11 Inter-Client Communication Conventions
+Manual (ICCCM).
diff --git a/x11/xcmsdb/Makefile b/x11/xcmsdb/Makefile
new file mode 100644
index 00000000000..4ae0488a633
--- /dev/null
+++ b/x11/xcmsdb/Makefile
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 12:38:32 rodent Exp $
+#
+
+DISTNAME=	xcmsdb-1.0.4
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XORG:=app/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	Loads, queries, or removes Device Color Characterization data
+LICENSE=	x11 # XXX and another
+
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	pkg-config
+
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../devel/xorg-util-macros/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xcmsdb/PLIST b/x11/xcmsdb/PLIST
new file mode 100644
index 00000000000..2ed5cd52306
--- /dev/null
+++ b/x11/xcmsdb/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 12:38:32 rodent Exp $
+bin/xcmsdb
+man/man1/xcmsdb.1
diff --git a/x11/xcmsdb/distinfo b/x11/xcmsdb/distinfo
new file mode 100644
index 00000000000..4aed7ff6f94
--- /dev/null
+++ b/x11/xcmsdb/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 12:38:32 rodent Exp $
+
+SHA1 (xcmsdb-1.0.4.tar.bz2) = a633f76af38ea40b33d55c3ac820fd19f17f9428
+RMD160 (xcmsdb-1.0.4.tar.bz2) = 01b4bb77fe3058d21894a99b97e5b1e65e080e98
+Size (xcmsdb-1.0.4.tar.bz2) = 136502 bytes
diff --git a/x11/xdbedizzy/DESCR b/x11/xdbedizzy/DESCR
new file mode 100644
index 00000000000..96b22901821
--- /dev/null
+++ b/x11/xdbedizzy/DESCR
@@ -0,0 +1,2 @@
+xdbedizzy is a demo of the X11 Double Buffer Extension (DBE) creating a double
+buffered spinning scene.
diff --git a/x11/xdbedizzy/Makefile b/x11/xdbedizzy/Makefile
new file mode 100644
index 00000000000..86604f162cc
--- /dev/null
+++ b/x11/xdbedizzy/Makefile
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 12:38:32 rodent Exp $
+#
+
+DISTNAME=	xdbedizzy-1.1.0
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XORG:=app/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	Demo of the X11 Double Buffer Extension (DBE)
+#LICENSE=	# XXX mit?
+
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	pkg-config
+
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../devel/xorg-util-macros/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xdbedizzy/PLIST b/x11/xdbedizzy/PLIST
new file mode 100644
index 00000000000..cbc46e9c48e
--- /dev/null
+++ b/x11/xdbedizzy/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 12:38:33 rodent Exp $
+bin/xdbedizzy
+man/man1/xdbedizzy.1
diff --git a/x11/xdbedizzy/distinfo b/x11/xdbedizzy/distinfo
new file mode 100644
index 00000000000..f53ede44b9c
--- /dev/null
+++ b/x11/xdbedizzy/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 12:38:33 rodent Exp $
+
+SHA1 (xdbedizzy-1.1.0.tar.bz2) = 281bee72116311e2d8393ae53ea832e9d267eded
+RMD160 (xdbedizzy-1.1.0.tar.bz2) = d0542549284b8b812a68fc4683d02ffa47a82d00
+Size (xdbedizzy-1.1.0.tar.bz2) = 110340 bytes
diff --git a/x11/xedit/DESCR b/x11/xedit/DESCR
new file mode 100644
index 00000000000..4991754d259
--- /dev/null
+++ b/x11/xedit/DESCR
@@ -0,0 +1,2 @@
+Xedit is a simple text editor for X. Please check xedit(1) for information about
+resources and configurable options.
diff --git a/x11/xedit/Makefile b/x11/xedit/Makefile
new file mode 100644
index 00000000000..8b7d8cc8b98
--- /dev/null
+++ b/x11/xedit/Makefile
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 12:38:33 rodent Exp $
+
+DISTNAME=	xedit-1.2.2
+CATEGORIES=	editors
+MASTER_SITES=	${MASTER_SITE_XORG:=app/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	Simple text editor for X
+#LICENSE=	modified-bsd AND x11 # XXX AND others
+
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	pkg-config
+
+MAKE_FLAGS+=	appdefaultdir=${PREFIX}/lib/X11/app-defaults
+
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../devel/xorg-util-macros/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xedit/PLIST b/x11/xedit/PLIST
new file mode 100644
index 00000000000..240170bf052
--- /dev/null
+++ b/x11/xedit/PLIST
@@ -0,0 +1,25 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 12:38:33 rodent Exp $
+bin/xedit
+lib/X11/app-defaults/Xedit
+lib/X11/app-defaults/Xedit-color
+lib/X11/xedit/lisp/indent.lsp
+lib/X11/xedit/lisp/lisp.lsp
+lib/X11/xedit/lisp/progmodes/auto.lsp
+lib/X11/xedit/lisp/progmodes/c.lsp
+lib/X11/xedit/lisp/progmodes/html.lsp
+lib/X11/xedit/lisp/progmodes/imake.lsp
+lib/X11/xedit/lisp/progmodes/lisp.lsp
+lib/X11/xedit/lisp/progmodes/make.lsp
+lib/X11/xedit/lisp/progmodes/man.lsp
+lib/X11/xedit/lisp/progmodes/patch.lsp
+lib/X11/xedit/lisp/progmodes/perl.lsp
+lib/X11/xedit/lisp/progmodes/python.lsp
+lib/X11/xedit/lisp/progmodes/rpm.lsp
+lib/X11/xedit/lisp/progmodes/sgml.lsp
+lib/X11/xedit/lisp/progmodes/sh.lsp
+lib/X11/xedit/lisp/progmodes/xconf.lsp
+lib/X11/xedit/lisp/progmodes/xlog.lsp
+lib/X11/xedit/lisp/progmodes/xrdb.lsp
+lib/X11/xedit/lisp/syntax.lsp
+lib/X11/xedit/lisp/xedit.lsp
+man/man1/xedit.1
diff --git a/x11/xedit/distinfo b/x11/xedit/distinfo
new file mode 100644
index 00000000000..a25e453f341
--- /dev/null
+++ b/x11/xedit/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 12:38:33 rodent Exp $
+
+SHA1 (xedit-1.2.2.tar.bz2) = f37b5d0f8ec461955f0419dbb1890d8cf63d179d
+RMD160 (xedit-1.2.2.tar.bz2) = 90c7f18e0a1c85fac650dad07883cb61069e6008
+Size (xedit-1.2.2.tar.bz2) = 525861 bytes
diff --git a/x11/xf86dga/DESCR b/x11/xf86dga/DESCR
new file mode 100644
index 00000000000..6642377eba3
--- /dev/null
+++ b/x11/xf86dga/DESCR
@@ -0,0 +1 @@
+dga is a simple test client for the XFree86-DGA extension.
diff --git a/x11/xf86dga/Makefile b/x11/xf86dga/Makefile
new file mode 100644
index 00000000000..72b19a0399a
--- /dev/null
+++ b/x11/xf86dga/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 12:38:33 rodent Exp $
+#
+
+DISTNAME=	xf86dga-1.0.3
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XORG:=app/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	Simple test client for the XFree86-DGA extension
+#LICENSE=	# TODO: (see mk/license.mk)
+
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	pkg-config
+
+BUILDLINK_API_DEPENDS.libXxf86dga+=	libXxf86dga>=1.1
+.include "../../x11/libXxf86dga/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../devel/xorg-util-macros/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86dga/PLIST b/x11/xf86dga/PLIST
new file mode 100644
index 00000000000..ee3e623a2e3
--- /dev/null
+++ b/x11/xf86dga/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 12:38:33 rodent Exp $
+bin/dga
+man/man1/dga.1
diff --git a/x11/xf86dga/distinfo b/x11/xf86dga/distinfo
new file mode 100644
index 00000000000..aec82a0bfd2
--- /dev/null
+++ b/x11/xf86dga/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 12:38:33 rodent Exp $
+
+SHA1 (xf86dga-1.0.3.tar.bz2) = 030659e3728f5f7142e1cf727f147aceeabe4b9e
+RMD160 (xf86dga-1.0.3.tar.bz2) = 4243e1b567fcc4b649ee413e51ca8987104984f3
+Size (xf86dga-1.0.3.tar.bz2) = 104935 bytes
diff --git a/x11/xmh/DESCR b/x11/xmh/DESCR
new file mode 100644
index 00000000000..bd97029d8fd
--- /dev/null
+++ b/x11/xmh/DESCR
@@ -0,0 +1,2 @@
+The xmh program provides a graphical user interface to the MH Message Handling
+System. To actually do things with your mail, it makes calls to the MH package.
diff --git a/x11/xmh/Makefile b/x11/xmh/Makefile
new file mode 100644
index 00000000000..c917a1bf291
--- /dev/null
+++ b/x11/xmh/Makefile
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 12:38:33 rodent Exp $
+#
+
+DISTNAME=	xmh-1.0.2
+CATEGORIES=	mail
+MASTER_SITES=	${MASTER_SITE_XORG:=app/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	Provides a GUI to the MH Message Handling System
+#LICENSE=	# TODO: (see mk/license.mk)
+
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	pkg-config
+
+MAKE_FLAGS+=	appdefaultdir=${PREFIX}/lib/X11/app-defaults
+
+BUILDLINK_API_DEPENDS.xbitmaps+=	xbitmaps>=1.1.0
+.include "../../x11/xbitmaps/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libXmu/buildlink3.mk"
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../devel/xorg-util-macros/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xmh/PLIST b/x11/xmh/PLIST
new file mode 100644
index 00000000000..1109f78e4d3
--- /dev/null
+++ b/x11/xmh/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 12:38:33 rodent Exp $
+bin/xmh
+lib/X11/app-defaults/Xmh
+man/man1/xmh.1
diff --git a/x11/xmh/distinfo b/x11/xmh/distinfo
new file mode 100644
index 00000000000..53d0f8f0ee4
--- /dev/null
+++ b/x11/xmh/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 12:38:33 rodent Exp $
+
+SHA1 (xmh-1.0.2.tar.bz2) = 3b771d8e7de175dc6890bcf03bd1fcf91c7ad919
+RMD160 (xmh-1.0.2.tar.bz2) = 29d14122033edb31418aac199facc7e9d07c38de
+Size (xmh-1.0.2.tar.bz2) = 181993 bytes
diff --git a/x11/xpr/DESCR b/x11/xpr/DESCR
new file mode 100644
index 00000000000..826c9309ba8
--- /dev/null
+++ b/x11/xpr/DESCR
@@ -0,0 +1,2 @@
+xpr takes as input a window dump file produced by xwd and formats it for output
+on various types of printers.
diff --git a/x11/xpr/Makefile b/x11/xpr/Makefile
new file mode 100644
index 00000000000..57bc9a4bb36
--- /dev/null
+++ b/x11/xpr/Makefile
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 12:38:33 rodent Exp $
+#
+
+DISTNAME=	xpr-1.0.4
+CATEGORIES=	print x11
+MASTER_SITES=	${MASTER_SITE_XORG:=app/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+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/libXmu/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../devel/xorg-util-macros/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpr/PLIST b/x11/xpr/PLIST
new file mode 100644
index 00000000000..41a2a353719
--- /dev/null
+++ b/x11/xpr/PLIST
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 12:38:33 rodent Exp $
+bin/xdpr
+bin/xpr
+man/man1/xdpr.1
+man/man1/xpr.1
diff --git a/x11/xpr/distinfo b/x11/xpr/distinfo
new file mode 100644
index 00000000000..6aae49ec62b
--- /dev/null
+++ b/x11/xpr/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 12:38:33 rodent Exp $
+
+SHA1 (xpr-1.0.4.tar.bz2) = 0645404e9aa2c9f979e4d006c483633bf6cfc2d9
+RMD160 (xpr-1.0.4.tar.bz2) = 1b022d6a733aece430c27a23c1a0c480dfc408d4
+Size (xpr-1.0.4.tar.bz2) = 143144 bytes
diff --git a/x11/xrx/DESCR b/x11/xrx/DESCR
new file mode 100644
index 00000000000..1fd985ac93c
--- /dev/null
+++ b/x11/xrx/DESCR
@@ -0,0 +1,17 @@
+RX: X Remote eXecution
+----------------------
+
+The remote execution (RX) service specifies a MIME format for invoking
+applications remotely, for example via a World Wide Web browser. This RX format
+specifies a syntax for listing network services required by the application, for
+example an X display server. The requesting Web browser must identify specific
+instances of the services in the request to invoke the application.
+
+The distribution contains a helper program (xrx) and a Mozilla family browser
+plug-in (libxrx) that demonstrate this protocol. The plug-in was originally
+written for Navigator 3.0, but has been used with later versions of the Mozilla
+family of browsers, including Firefox.
+
+The specification for the RX mime type is in the xorg-docs module in the X.Org
+repository in specs/RX/RX.mif (FrameMaker interchange source) and
+hardcopy/RX/RX.PS.Z (compressed PostScript).
diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile
new file mode 100644
index 00000000000..4710a3576e9
--- /dev/null
+++ b/x11/xrx/Makefile
@@ -0,0 +1,30 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 12:38:33 rodent Exp $
+#
+
+DISTNAME=	xrx-1.0.4
+CATEGORIES=	net x11
+MASTER_SITES=	${MASTER_SITE_XORG:=app/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	X Remote eXecution
+LICENSE=	x11
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
+
+# XXX: Create this and enable firefox plugin in PKG_OPTIONS
+#.include "options.mk"
+
+.include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libXau/buildlink3.mk"
+.include "../../x11/xproxymanagementprotocol/buildlink3.mk"
+.include "../../x11/xtrans/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../devel/xorg-util-macros/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xrx/PLIST b/x11/xrx/PLIST
new file mode 100644
index 00000000000..5051f184907
--- /dev/null
+++ b/x11/xrx/PLIST
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST,v 1.1 2015/07/02 12:38:33 rodent Exp $
+bin/xrx
+lib/libxrx.la
+lib/libxrxnest.la
+man/man1/libxrx.1
+man/man1/xrx.1
diff --git a/x11/xrx/distinfo b/x11/xrx/distinfo
new file mode 100644
index 00000000000..7b0f4eb2d5a
--- /dev/null
+++ b/x11/xrx/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 12:38:33 rodent Exp $
+
+SHA1 (xrx-1.0.4.tar.bz2) = ff5b8c329ed255138eb78e6b9c034add2b02de94
+RMD160 (xrx-1.0.4.tar.bz2) = 10d4ae4e953e926dc28960b49533e27a2df3420a
+Size (xrx-1.0.4.tar.bz2) = 338140 bytes
diff --git a/x11/xtrap/DESCR b/x11/xtrap/DESCR
new file mode 100644
index 00000000000..800603510a0
--- /dev/null
+++ b/x11/xtrap/DESCR
@@ -0,0 +1 @@
+XTrap sample clients.
diff --git a/x11/xtrap/Makefile b/x11/xtrap/Makefile
new file mode 100644
index 00000000000..7a3e67e05a8
--- /dev/null
+++ b/x11/xtrap/Makefile
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2015/07/02 12:38:33 rodent Exp $
+#
+
+DISTNAME=	xtrap-1.0.2
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_XORG:=app/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	rodent@NetBSD.org
+HOMEPAGE=	http://xorg.freedesktop.org/
+COMMENT=	XTrap sample clients
+#LICENSE=	# TODO: (see mk/license.mk)
+
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	pkg-config
+
+.include "../../x11/trapproto/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
new file mode 100644
index 00000000000..e0a837ba0a8
--- /dev/null
+++ b/x11/xtrap/PLIST
@@ -0,0 +1,16 @@
+@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
new file mode 100644
index 00000000000..f72453eaab9
--- /dev/null
+++ b/x11/xtrap/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/07/02 12:38:33 rodent Exp $
+
+SHA1 (xtrap-1.0.2.tar.bz2) = 228735dcf4e059865900cee7f9656fc1a6b0a746
+RMD160 (xtrap-1.0.2.tar.bz2) = 2eee6e6da2d6ce22c1d0148b546eea85b073ec22
+Size (xtrap-1.0.2.tar.bz2) = 95471 bytes