diff --git a/srcpkgs/xinit/files/xinitrc b/srcpkgs/xinit/files/xinitrc deleted file mode 100644 index dbd080d0036..00000000000 --- a/srcpkgs/xinit/files/xinitrc +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# -# ~/.xinitrc -# -# Executed by startx (run your window manager from here) - -if [ -d /etc/X11/xinit/xinitrc.d ]; then - for f in /etc/X11/xinit/xinitrc.d/*; do - [ -x "$f" ] && . "$f" - done - unset f -fi - -# exec gnome-session -# exec startkde -# exec startxfce4 -# ...or the Window Manager of your choice diff --git a/srcpkgs/xinit/files/xsession b/srcpkgs/xinit/files/xsession deleted file mode 100644 index a16dc0b8421..00000000000 --- a/srcpkgs/xinit/files/xsession +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# -# ~/.xsession -# -# Executed by xdm/gdm/kdm at login -# - -/bin/bash --login -i ~/.xinitrc - diff --git a/srcpkgs/xinit/template b/srcpkgs/xinit/template index be836ebc94a..b687c0ccd2c 100644 --- a/srcpkgs/xinit/template +++ b/srcpkgs/xinit/template @@ -1,7 +1,7 @@ # Template file for 'xinit' pkgname=xinit version=1.4.1 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-xinitdir=/etc/X11/xinit" hostmakedepends="pkg-config" @@ -15,13 +15,9 @@ checksum=de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9 conf_files=" /etc/X11/xinit/xinitrc - /etc/X11/xinit/xserverrc - /etc/skel/.xinitrc - /etc/skel/.xsession" + /etc/X11/xinit/xserverrc" post_install() { - vinstall ${FILESDIR}/xinitrc 644 etc/skel .xinitrc - vinstall ${FILESDIR}/xsession 644 etc/skel .xsession vinstall ${FILESDIR}/xserverrc 644 etc/X11/xinit vlicense COPYING }