mirror of
https://github.com/beard7n/bsdports.git
synced 2026-04-17 14:01:19 +02:00
61 lines
1.6 KiB
Plaintext
61 lines
1.6 KiB
Plaintext
--- ./scripts/startxfce4.in.orig 2012-04-29 00:43:27.000000000 +0400
|
|
+++ ./scripts/startxfce4.in 2012-08-13 09:42:44.000000000 +0400
|
|
@@ -64,30 +64,37 @@
|
|
BASEDIR="$XDG_CONFIG_HOME/xfce4"
|
|
fi
|
|
|
|
-if test "x$XDG_DATA_DIRS" = "x"
|
|
-then
|
|
- if test "x@_datadir_@" = "x/usr/local/share" -o "x@_datadir_@" = "x/usr/share"; then
|
|
- XDG_DATA_DIRS="/usr/local/share:/usr/share"
|
|
- else
|
|
- XDG_DATA_DIRS="@_datadir_@:/usr/local/share:/usr/share"
|
|
- fi
|
|
-else
|
|
- XDG_DATA_DIRS="$XDG_DATA_DIRS:@_datadir_@"
|
|
-fi
|
|
+#if test "x$XDG_DATA_DIRS" = "x"
|
|
+#then
|
|
+# if test "x@_datadir_@" = "x/usr/local/share" -o "x@_datadir_@" = "x/usr/share"; then
|
|
+# XDG_DATA_DIRS="/usr/local/share:/usr/share"
|
|
+# else
|
|
+# XDG_DATA_DIRS="@_datadir_@:/usr/local/share:/usr/share"
|
|
+# fi
|
|
+#else
|
|
+# XDG_DATA_DIRS="$XDG_DATA_DIRS:@_datadir_@"
|
|
+#fi
|
|
+#export XDG_DATA_DIRS
|
|
+
|
|
+#if test "x$XDG_CONFIG_DIRS" = "x"
|
|
+#then
|
|
+# if test "x@_sysconfdir_@" = "x/etc"; then
|
|
+# XDG_CONFIG_DIRS="/etc/xdg"
|
|
+# else
|
|
+# XDG_CONFIG_DIRS="/etc/xdg:@_sysconfdir_@/xdg"
|
|
+# fi
|
|
+#else
|
|
+# XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:@_sysconfdir_@/xdg"
|
|
+#fi
|
|
+#export XDG_CONFIG_DIRS
|
|
+
|
|
+XDG_DATA_DIRS="$XDG_DATA_DIRS:/usr/local/share"
|
|
export XDG_DATA_DIRS
|
|
|
|
-if test "x$XDG_CONFIG_DIRS" = "x"
|
|
-then
|
|
- if test "x@_sysconfdir_@" = "x/etc"; then
|
|
- XDG_CONFIG_DIRS="/etc/xdg"
|
|
- else
|
|
- XDG_CONFIG_DIRS="/etc/xdg:@_sysconfdir_@/xdg"
|
|
- fi
|
|
-else
|
|
- XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:@_sysconfdir_@/xdg"
|
|
-fi
|
|
+XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:/usr/local/etc/xdg"
|
|
export XDG_CONFIG_DIRS
|
|
|
|
+
|
|
if test "x$DISPLAY" = "x"
|
|
then
|
|
echo "$0: Starting X server"
|