From 44e773e18970ac4bf1331c26efa2e7f47f6f3daf Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 21 Dec 2012 16:09:43 +0100
Subject: [PATCH] xorg-server: add new subpkgs: -xephyr, -xnest and -xvfb.

---
 srcpkgs/xorg-server-xephyr                      |  1 +
 srcpkgs/xorg-server-xnest                       |  1 +
 srcpkgs/xorg-server-xvfb                        |  1 +
 srcpkgs/xorg-server/template                    | 17 +++++++++--------
 srcpkgs/xorg-server/xorg-server-xephyr.template |  8 ++++++++
 srcpkgs/xorg-server/xorg-server-xnest.template  |  8 ++++++++
 srcpkgs/xorg-server/xorg-server-xvfb.template   |  8 ++++++++
 7 files changed, 36 insertions(+), 8 deletions(-)
 create mode 120000 srcpkgs/xorg-server-xephyr
 create mode 120000 srcpkgs/xorg-server-xnest
 create mode 120000 srcpkgs/xorg-server-xvfb
 create mode 100644 srcpkgs/xorg-server/xorg-server-xephyr.template
 create mode 100644 srcpkgs/xorg-server/xorg-server-xnest.template
 create mode 100644 srcpkgs/xorg-server/xorg-server-xvfb.template

diff --git a/srcpkgs/xorg-server-xephyr b/srcpkgs/xorg-server-xephyr
new file mode 120000
index 00000000000..0e680f217e7
--- /dev/null
+++ b/srcpkgs/xorg-server-xephyr
@@ -0,0 +1 @@
+xorg-server
\ No newline at end of file
diff --git a/srcpkgs/xorg-server-xnest b/srcpkgs/xorg-server-xnest
new file mode 120000
index 00000000000..0e680f217e7
--- /dev/null
+++ b/srcpkgs/xorg-server-xnest
@@ -0,0 +1 @@
+xorg-server
\ No newline at end of file
diff --git a/srcpkgs/xorg-server-xvfb b/srcpkgs/xorg-server-xvfb
new file mode 120000
index 00000000000..0e680f217e7
--- /dev/null
+++ b/srcpkgs/xorg-server-xvfb
@@ -0,0 +1 @@
+xorg-server
\ No newline at end of file
diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template
index ca5bcda00e2..d31c760cd9b 100644
--- a/srcpkgs/xorg-server/template
+++ b/srcpkgs/xorg-server/template
@@ -1,7 +1,7 @@
 # Template build file for 'xorg-server'.
 pkgname=xorg-server
 version=1.13.1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
  --enable-xnest --enable-xephyr --enable-composite --enable-xvfb
@@ -9,18 +9,19 @@ configure_args="--enable-ipv6 --enable-xcsecurity --enable-record
  --disable-config-dbus --enable-config-udev --sysconfdir=/etc/X11
  --with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb
  --with-fontrootdir=/usr/share/fonts/X11 --with-sha1=libcrypto
- --disable-dmx --disable-xfree86-utils --enable-dga
- --enable-install-setuid"
-short_desc="X11 server from X.org"
+ --disable-dmx --disable-xfree86-utils --enable-dga --enable-xorg
+ --enable-install-setuid --disable-xfbdev --disable-xfake
+ --enable-kdrive --enable-kdrive-evdev --enable-kdrive-kbd
+ --enable-kdrive-mouse --enable-xorg --enable-xcsecurity"
+short_desc="The X11 server from X.org"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xorg.freedesktop.org"
 license="MIT/X11, BSD"
 distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2"
 checksum=c93540e2799df4655c6f1b67dc7d8d6db96df4f08ef1702fffbc5df843a43d00
-long_desc="
- The X11 server from the modularized source tree of X.org."
 
-subpackages="${pkgname}-devel"
+subpackages="${pkgname}-xnest ${pkgname}-xephyr ${pkgname}-xvfb
+ ${pkgname}-devel"
 fulldepends="xkeyboard-config"
 
 # See hw/xfree86/common/xf86Module.h. Only care for the major version.
@@ -32,7 +33,7 @@ makedepends="pkg-config perl flex inputproto>=2.2 glproto>=1.4.15 xproto>=7.0.22
  openssl-devel libX11-devel libXext-devel libdmx-devel libpciaccess-devel
  libXfont-devel libXmu-devel libXrender-devel libXfixes-devel libXi-devel
  libXaw-devel libdrm-devel libXtst-devel libXres-devel libxkbui-devel
- libxkbfile-devel libXxf86dga-devel pixman-devel MesaLib-devel"
+ libxkbfile-devel libXxf86dga-devel libXv-devel pixman-devel MesaLib-devel"
 
 post_install() {
 	vinstall ${FILESDIR}/11-quirks.conf 644 etc/X11/xorg.conf.d
diff --git a/srcpkgs/xorg-server/xorg-server-xephyr.template b/srcpkgs/xorg-server/xorg-server-xephyr.template
new file mode 100644
index 00000000000..6782f3f7932
--- /dev/null
+++ b/srcpkgs/xorg-server/xorg-server-xephyr.template
@@ -0,0 +1,8 @@
+# Template file for 'xorg-server-xephyr'.
+#
+short_desc="X server outputting to a window on a pre-existing X display"
+
+do_install() {
+	vmove usr/bin/Xephyr usr/bin
+	vmove usr/share/man/man1/Xephyr.1 usr/share/man/man1
+}
diff --git a/srcpkgs/xorg-server/xorg-server-xnest.template b/srcpkgs/xorg-server/xorg-server-xnest.template
new file mode 100644
index 00000000000..aaa1aafb11f
--- /dev/null
+++ b/srcpkgs/xorg-server/xorg-server-xnest.template
@@ -0,0 +1,8 @@
+# Template file for 'xorg-server-xnest'.
+#
+short_desc="A nested X server that runs as an X application"
+
+do_install() {
+	vmove usr/bin/Xnest usr/bin
+	vmove usr/share/man/man1/Xnest.1 usr/share/man/man1
+}
diff --git a/srcpkgs/xorg-server/xorg-server-xvfb.template b/srcpkgs/xorg-server/xorg-server-xvfb.template
new file mode 100644
index 00000000000..6a88f34c515
--- /dev/null
+++ b/srcpkgs/xorg-server/xorg-server-xvfb.template
@@ -0,0 +1,8 @@
+# Template file for 'xorg-server-xvfb'.
+#
+short_desc="Virtual framebuffer X server"
+
+do_install() {
+	vmove usr/bin/Xvfb usr/bin
+	vmove usr/share/man/man1/Xvfb.1 usr/share/man/man1
+}