From 7d2fca0f660ef5362b4a388138a43520726fc1a2 Mon Sep 17 00:00:00 2001
From: aliriza <aliriza.keskin@pardus.org.tr>
Date: Tue, 14 Mar 2023 07:06:09 +0000
Subject: [PATCH] fix deps

---
 sys/devel/binutils/ympbuild      |  3 ++-
 sys/process/audit/ympbuild       |  1 +
 x11/apps/xinit/files/xinit.initd |  3 ++-
 x11/apps/xinit/files/xinitrc     | 20 +++++++++-----------
 x11/apps/xinit/ympbuild          |  2 +-
 x11/base/xorg-server/ympbuild    |  2 +-
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/sys/devel/binutils/ympbuild b/sys/devel/binutils/ympbuild
index 9f5d4f07..4d83a712 100644
--- a/sys/devel/binutils/ympbuild
+++ b/sys/devel/binutils/ympbuild
@@ -33,7 +33,8 @@ setup(){
     cd build
     set -x
     ../configure --prefix=/usr \
-        --libdir=/usr/lib64 \
+          --libdir=/usr/lib64 \
+          --sysconfdir=/etc \
           --enable-cet \
           --enable-default-execstack=no \
           --enable-deterministic-archives \
diff --git a/sys/process/audit/ympbuild b/sys/process/audit/ympbuild
index 338f741d..ab8e0c2c 100644
--- a/sys/process/audit/ympbuild
+++ b/sys/process/audit/ympbuild
@@ -22,6 +22,7 @@ cd audit-userspace-$version
 setup(){
     autoreconf -fv --install
     ./configure --prefix=/usr \
+        --sysconfdir=/etc \
         --libdir=/usr/lib64 \
         --disable-zos-remote \
         --disable-listener \
diff --git a/x11/apps/xinit/files/xinit.initd b/x11/apps/xinit/files/xinit.initd
index 3ed1c09e..9fdeabcd 100644
--- a/x11/apps/xinit/files/xinit.initd
+++ b/x11/apps/xinit/files/xinit.initd
@@ -4,7 +4,8 @@ name="xinit"
 description="X11 autologin service"
 
 start(){
-    exec /bin/busybox su - $USER -c "exec /usr/bin/startx"
+    /bin/busybox su - $USER -c "exec /usr/bin/startx" &
+    exit 0
 }
 
 depend()
diff --git a/x11/apps/xinit/files/xinitrc b/x11/apps/xinit/files/xinitrc
index 0c4f8944..a2090f94 100644
--- a/x11/apps/xinit/files/xinitrc
+++ b/x11/apps/xinit/files/xinitrc
@@ -25,6 +25,14 @@ if [ -f $usermodmap ]; then
     xmodmap $usermodmap
 fi
 
+
+if [ -d /etc/X11/xinit/xinitrc.d ] ; then
+	for f in /etc/X11/xinit/xinitrc.d/?* ; do
+		[ -x "$f" ] && . "$f"
+	done
+	unset f
+fi
+
 # First try ~/.xinitrc
 if [ -f "$HOME/.xinitrc" ]; then
 	XINITRC="$HOME/.xinitrc"
@@ -38,14 +46,4 @@ if [ -f "$HOME/.xinitrc" ]; then
 	fi
 fi
 
-if [ -d /etc/X11/xinit/xinitrc.d ] ; then
-	for f in /etc/X11/xinit/xinitrc.d/?* ; do
-		[ -x "$f" ] && . "$f"
-	done
-	unset f
-fi
-
-for p in startxfce4 startfluxbox xfce4-terminal \
-		mrxvt urxvt st xterm; do
-	command -v "$p" >/dev/null && exec "$p"
-done
+command -v xterm >/dev/null && exec xterm
diff --git a/x11/apps/xinit/ympbuild b/x11/apps/xinit/ympbuild
index c84373f1..71bb893c 100644
--- a/x11/apps/xinit/ympbuild
+++ b/x11/apps/xinit/ympbuild
@@ -15,7 +15,7 @@ source=("https://gitlab.freedesktop.org/xorg/app/xinit/-/archive/xinit-$version/
         "files/xinit.confd"
         "files/xinit.initd"
 )
-depends=(util-macros xorgproto libX11)
+depends=(util-macros xorgproto libX11 xorg-server)
 makedepends=()
 md5sums=('0855364c1c869679300d55e9dd57e2aa'
          'SKIP'
diff --git a/x11/base/xorg-server/ympbuild b/x11/base/xorg-server/ympbuild
index 5c694c56..2569b13a 100644
--- a/x11/base/xorg-server/ympbuild
+++ b/x11/base/xorg-server/ympbuild
@@ -8,7 +8,7 @@ email='bayramk@gmail.com'
 maintainer='bk'
 license=('GPLv3')
 source=("https://www.x.org/releases/individual/xserver/xorg-server-$version.tar.xz")
-depends=(libmd libbsd libepoxy libfontenc libxkbfile 
+depends=(libmd libbsd libepoxy libfontenc libxkbfile xauth xkbcomp setxkbmap freetype
          libXfont2 libxcvt mesa libX11 libdrm pixman font-util xcb-util-renderutil
          xcb-util xcb-util-image xcb-util-wm xcb-util-keysyms)
 makedepends=()