merged x11 repository into main

ref #255

4 files changed, 94 insertions, 0 deletions

diff --git a/main/xinit/APKBUILD b/main/xinit/APKBUILD
new file mode 100644
index 000000000..be135ed7a
--- /dev/null
+++ b/main/xinit/APKBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=xinit
+pkgver=1.1.1
+pkgrel=3
+pkgdesc="X.Org initialisation program "
+url="http://xorg.freedesktop.org/"
+license="GPL"
+subpackages="$pkgname-doc"
+depends="xauth"
+makedepends="pkgconfig libx11-dev"
+source="http://xorg.freedesktop.org/releases/individual/app/xinit-$pkgver.tar.bz2
+	xinitrc
+	xsession
+	xserverrc"
+
+build() { 
+	cd "$srcdir"/xinit-$pkgver
+	./configure --prefix=/usr || return 1
+	make XINITDIR=/etc/X11/xinit || return 1
+}
+
+package() {
+	cd "$srcdir"/xinit-$pkgver
+	make XINITDIR=/etc/X11/xinit DESTDIR="$pkgdir" install || return 1
+	chmod +x "$pkgdir"/usr/bin/startx
+	install -m755 -d "$pkgdir"/etc/skel
+	install -m755 -D "$srcdir"/xinitrc "$pkgdir"/etc/X11/xinit/xinitrc
+	install -m755 "$srcdir"/xsession "$pkgdir"/etc/skel/.xsession || return 1
+	install -m755 "$srcdir"/xserverrc "$pkgdir"/etc/X11/xinit/xserverrc || return 1
+}
+md5sums="93c73705ed9eb1e1a6b6938405672f2b  xinit-1.1.1.tar.bz2
+af322d72972d5722b7fc0a9e8f025b15  xinitrc
+4f04d2891ea87f50fde518267b7a1154  xsession
+bb550d3b9a2d2b6cbe6e2667a3a7cd03  xserverrc"
diff --git a/main/xinit/xinitrc b/main/xinit/xinitrc
new file mode 100644
index 000000000..005571359
--- /dev/null
+++ b/main/xinit/xinitrc
@@ -0,0 +1,49 @@
+#!/bin/sh
+# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+xinitdir=/etc/X11
+sysresources=$xinitdir/Xresources
+sysmodmap=$xinitdir/Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+    xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f $userresources ]; then
+    xrdb -merge $userresources
+fi
+
+if [ -f $usermodmap ]; then
+    xmodmap $usermodmap
+fi
+
+# First try ~/.xinitrc
+if [ -f "$HOME/.xinitrc" ]; then
+	XINITRC="$HOME/.xinitrc"
+	if [ -x $XINITRC ]; then
+		# if the x bit is set on .xinitrc
+		# it means the xinitrc is not a
+		# shell script but something else
+		exec $XINITRC "$@"
+	else
+		exec /bin/sh "$HOME/.xinitrc" "$@"
+	fi
+fi
+
+# If not present, try the system default
+exec startxfce4
+
+
+# Fall back to fluxbox
+exec startfluxbox
+
+# Start only terminal as last resort
+exec terminal || exec aterm
diff --git a/main/xinit/xserverrc b/main/xinit/xserverrc
new file mode 100644
index 000000000..6a636c119
--- /dev/null
+++ b/main/xinit/xserverrc
@@ -0,0 +1 @@
+exec /usr/bin/X -nolisten tcp
diff --git a/main/xinit/xsession b/main/xinit/xsession
new file mode 100644
index 000000000..819c248cd
--- /dev/null
+++ b/main/xinit/xsession
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+#
+# ~/.xsession
+#
+# Executed by xdm/gdm/kdm at login
+#
+
+/bin/sh -l ~/.xinitrc
+