From 15cd2d0438316c4fb1d39f1b1fb8aff34d5e5f73 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 5 Nov 2009 14:10:06 +0000
Subject: x11/xinit: alpinize xinitrc script

start xfce by default
---
 x11/xinit/APKBUILD | 14 ++++++++------
 x11/xinit/xinitrc  | 57 +++++++++++++++++++++++++++++++++++++++++++++---------
 x11/xinit/xsession |  2 +-
 3 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/x11/xinit/APKBUILD b/x11/xinit/APKBUILD
index 20b65c1b7..e75f78840 100644
--- a/x11/xinit/APKBUILD
+++ b/x11/xinit/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xinit
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org initialisation program "
 url="http://xorg.freedesktop.org/"
 license="GPL"
@@ -13,20 +13,22 @@ source="http://xorg.freedesktop.org/releases/individual/app/xinit-$pkgver.tar.bz
 	xsession
 	xserverrc"
 
-build () 
-{ 
+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 "$pkgdir"/etc/X11/xinit
-	install -m755 "$srcdir"/xinitrc "$pkgdir"/etc/skel/.xinitrc || return 1
 	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
-cee2d70748a089fbc7db64a4a6e8fdb1  xinitrc
-7873d97db30d6c279ed37e3559e7c59d  xsession
+af322d72972d5722b7fc0a9e8f025b15  xinitrc
+4f04d2891ea87f50fde518267b7a1154  xsession
 bb550d3b9a2d2b6cbe6e2667a3a7cd03  xserverrc"
diff --git a/x11/xinit/xinitrc b/x11/xinit/xinitrc
index a5a352713..005571359 100644
--- a/x11/xinit/xinitrc
+++ b/x11/xinit/xinitrc
@@ -1,10 +1,49 @@
 #!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
-
-# exec gnome-session
-# exec startkde
-# exec startxfce4
-# ...or the Window Manager of your choice
+# $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/x11/xinit/xsession b/x11/xinit/xsession
index a16dc0b84..819c248cd 100644
--- a/x11/xinit/xsession
+++ b/x11/xinit/xsession
@@ -6,5 +6,5 @@
 # Executed by xdm/gdm/kdm at login
 #
 
-/bin/bash --login -i ~/.xinitrc
+/bin/sh -l ~/.xinitrc
 
-- 
cgit v1.2.3