aboutsummaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorOliver Lehmann <oliver@FreeBSD.org>2004-02-21 13:00:01 +0000
committerOliver Lehmann <oliver@FreeBSD.org>2004-02-21 13:00:01 +0000
commitde99ace52c557b4169a173222fd19cea255338eb (patch)
treed3b178c597b190d66cde27e853ea0a6d54c73de1 /x11-wm
parentea35143c9090ab42e6f9c10532112a7d0380849a (diff)
downloadports-de99ace52c557b4169a173222fd19cea255338eb.tar.gz
ports-de99ace52c557b4169a173222fd19cea255338eb.zip
Notes
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/xfce4/Makefile19
-rw-r--r--x11-wm/xfce4/files/XFce47
-rw-r--r--x11-wm/xfce4/files/XFce4.desktop3
-rw-r--r--x11-wm/xfce4/pkg-plist6
4 files changed, 34 insertions, 1 deletions
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index 1915d9f021c5..25a95f3909f9 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce
PORTVERSION= 4.0.3.1
+PORTREVISION= 1
CATEGORIES= x11-wm xfce
MASTER_SITES= # empty
DISTFILES= # empty
@@ -25,6 +26,17 @@ RUN_DEPENDS= ${X11BASE}/lib/xfce4/mcs-plugins/ui_plugin.so:${PORTSDIR}/sysutils/
xfce4-iconbox:${PORTSDIR}/misc/xfce4-iconbox \
${X11BASE}/lib/gtk-2.0/2.2.0/engines/libxfce.so:${PORTSDIR}/x11-toolkits/gtk-xfce-engine
+.if exists(${X11BASE}/bin/gdm)
+WITH_GDM= yes
+.endif
+
+.if defined(WITH_GDM)
+RUN_DEPENDS+= ${X11BASE}/bin/gdm:${PORTSDIR}/x11/gdm2
+PLIST_SUB+= GDM=""
+.else
+PLIST_SUB+= GDM="@comment"
+.endif
+
.if !defined(WITHOUT_EXTRAS)
.if !defined(WITHOUT_THEMES)
RUN_DEPENDS+= ${X11BASE}/share/xfce4/themes/BeOS/terminal.png:${PORTSDIR}/misc/xfce4-panel-themes \
@@ -41,7 +53,14 @@ RUN_DEPENDS+= ${X11BASE}/lib/xfce4/panel-plugins/libmixer.so:${PORTSDIR}/audio/x
LATEST_LINK= xfce4
NO_BUILD= yes
+USE_X_PREFIX= yes
do-install: # empty
+post-install:
+.if defined(WITH_GDM)
+ @${INSTALL_SCRIPT} ${FILESDIR}/XFce4 ${X11BASE}/etc/gdm/Sessions
+ @${INSTALL_DATA} ${FILESDIR}/XFce4.desktop ${X11BASE}/etc/dm/Sessions
+.endif
+
.include <bsd.port.mk>
diff --git a/x11-wm/xfce4/files/XFce4 b/x11-wm/xfce4/files/XFce4
new file mode 100644
index 000000000000..eaa1e78f19bd
--- /dev/null
+++ b/x11-wm/xfce4/files/XFce4
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+xfce-mcs-manager
+xfwm4 --daemon
+xftaskbar4 &
+xfdesktop &
+exec xfce4-panel
diff --git a/x11-wm/xfce4/files/XFce4.desktop b/x11-wm/xfce4/files/XFce4.desktop
new file mode 100644
index 000000000000..8fb3ee397b7a
--- /dev/null
+++ b/x11-wm/xfce4/files/XFce4.desktop
@@ -0,0 +1,3 @@
+[Desktop Entry]
+Name=XFce4
+Exec=/usr/X11R6/etc/gdm/Sessions/XFce4
diff --git a/x11-wm/xfce4/pkg-plist b/x11-wm/xfce4/pkg-plist
index 549a621fec0c..fbf6d847ca52 100644
--- a/x11-wm/xfce4/pkg-plist
+++ b/x11-wm/xfce4/pkg-plist
@@ -1 +1,5 @@
-@comment this plist intentionally left empty
+%%GDM%%etc/gdm/Sessions/XFce4.desktop
+%%GDM%%etc/gdm/Sessions/XFce4
+%%GDM%%@unexec rmdir %D/etc/gdm/Sessions 2>/dev/null || true
+%%GDM%%@unexec rmdir %D/etc/gdm 2>/dev/null || true
+