A few things went wrong in r304126.

Fixes:

- Add dependency on devel/py-dbus (required by the logout function)
- Remove debug executable
- Remove extra files from PLIST (src, build, makedist.sh)
- Remove gdm detection and always set OPTIONS_DEFINE
- Remove reduntant files in Help
- Make rox.desktop installation conditional on GDM
- Install missing translations

Noticed by:	Yuri Pankov <yuri.pankov@gmail.com>

2 files changed, 26 insertions, 91 deletions

diff --git a/x11-fm/rox-session/Makefile b/x11-fm/rox-session/Makefile
index 475e0854ee52..b00cab44eed0 100644
--- a/x11-fm/rox-session/Makefile
+++ b/x11-fm/rox-session/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	rox-session
 PORTVERSION=	0.40.0
+PORTREVISION=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	SF/rox/ROX-Session/${PORTVERSION}/
 
@@ -16,7 +17,8 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \
-		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:${PORTSDIR}/devel/py-roxlib
+		${PYTHON_PKGNAMEPREFIX}roxlib>=0:${PORTSDIR}/devel/py-roxlib \
+		${PYTHON_PKGNAMEPREFIX}dbus>=0:${PORTSDIR}/devel/py-dbus
 
 WRKSRC=		${WRKDIR}/ROX-Session
 DATADIR=	${PREFIX}/apps/ROX-Session
@@ -27,10 +29,8 @@ USE_PYTHON=	yes
 
 PORTDOCS=	Changes DBUS-API README
 
-.if !exists(${LOCALBASE}/sbin/gdm)
 OPTIONS_DEFINE=	GDM
 GDM_DESC=	Install GDM login manager
-.endif
 
 SUB_FILES=	${PORTNAME} rox.desktop
 
@@ -50,12 +50,20 @@ do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}
 	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 	@cd ${WRKSRC} && ./AppRun --compile
+	@${MKDIR} ${WRKSRC}/Messages
+	@cd ${WRKSRC}/src/po && ./dist
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
-	@cd ${WRKSRC} && ${FIND} . | ${CPIO} -pdmu ${DATADIR}
+	@${MKDIR} ${DATADIR}
+	@cd ${WRKSRC} && ${CP} -r .DirIcon AppInfo.xml AppRun \
+		Environment Login Messages Options.xml ROX-Session \
+		ROX-Session.xml RunROX SetupPanel Styles browser images \
+		*.py *.pyc *.pyo ${DATADIR}
+.if ${PORT_OPTIONS:MGDM}
 	@${MKDIR} ${PREFIX}/share/applications
 	@${INSTALL_DATA} ${WRKDIR}/rox.desktop ${PREFIX}/share/applications
+.endif
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
diff --git a/x11-fm/rox-session/pkg-plist b/x11-fm/rox-session/pkg-plist
index 2df4aea3964c..80ecb64d2c43 100644
--- a/x11-fm/rox-session/pkg-plist
+++ b/x11-fm/rox-session/pkg-plist
@@ -5,39 +5,26 @@ apps/ROX-Session/AutoStart.py
 apps/ROX-Session/AutoStart.pyc
 apps/ROX-Session/AutoStart.pyo
 apps/ROX-Session/Environment
-apps/ROX-Session/Help/COPYING
-apps/ROX-Session/Help/Changes
-apps/ROX-Session/Help/DBUS-API
-apps/ROX-Session/Help/README
 apps/ROX-Session/Login
+apps/ROX-Session/Messages/da.gmo
+apps/ROX-Session/Messages/de.gmo
+apps/ROX-Session/Messages/es.gmo
+apps/ROX-Session/Messages/fr.gmo
+apps/ROX-Session/Messages/it.gmo
+apps/ROX-Session/Messages/ja.gmo
+apps/ROX-Session/Messages/lt.gmo
+apps/ROX-Session/Messages/nl.gmo
+apps/ROX-Session/Messages/pt_BR.gmo
+apps/ROX-Session/Messages/ru.gmo
+apps/ROX-Session/Messages/zh_CN.gmo
+apps/ROX-Session/Messages/zh_TW.gmo
 apps/ROX-Session/Options.xml
 apps/ROX-Session/ROX-Session
-apps/ROX-Session/ROX-Session.dbg
 apps/ROX-Session/ROX-Session.xml
 apps/ROX-Session/RunROX
 apps/ROX-Session/SetupPanel
 apps/ROX-Session/Styles
 apps/ROX-Session/browser
-apps/ROX-Session/build/Makefile
-apps/ROX-Session/build/choices.o
-apps/ROX-Session/build/config.h
-apps/ROX-Session/build/config.log
-apps/ROX-Session/build/config.status
-apps/ROX-Session/build/dbus.o
-apps/ROX-Session/build/dpms.o
-apps/ROX-Session/build/gui_support.o
-apps/ROX-Session/build/i18n.o
-apps/ROX-Session/build/log.o
-apps/ROX-Session/build/main.o
-apps/ROX-Session/build/options.o
-apps/ROX-Session/build/rox_gettext.o
-apps/ROX-Session/build/session.o
-apps/ROX-Session/build/settings.o
-apps/ROX-Session/build/wm.o
-apps/ROX-Session/build/xdgautostart.o
-apps/ROX-Session/build/xkb.o
-apps/ROX-Session/build/xsettings-common.o
-apps/ROX-Session/build/xsettings-manager.o
 apps/ROX-Session/choose_wm.py
 apps/ROX-Session/choose_wm.pyc
 apps/ROX-Session/choose_wm.pyo
@@ -55,7 +42,6 @@ apps/ROX-Session/interactive.pyo
 apps/ROX-Session/logout.py
 apps/ROX-Session/logout.pyc
 apps/ROX-Session/logout.pyo
-apps/ROX-Session/makedist.sh
 apps/ROX-Session/migrate.py
 apps/ROX-Session/migrate.pyc
 apps/ROX-Session/migrate.pyo
@@ -65,69 +51,10 @@ apps/ROX-Session/sessionbus.pyo
 apps/ROX-Session/setup.py
 apps/ROX-Session/setup.pyc
 apps/ROX-Session/setup.pyo
-apps/ROX-Session/src/Makefile
-apps/ROX-Session/src/Makefile.in
-apps/ROX-Session/src/choices.c
-apps/ROX-Session/src/choices.h
-apps/ROX-Session/src/config.h.in
-apps/ROX-Session/src/configure
-apps/ROX-Session/src/configure.in
-apps/ROX-Session/src/dbus.c
-apps/ROX-Session/src/dbus.h
-apps/ROX-Session/src/dpms.c
-apps/ROX-Session/src/dpms.h
-apps/ROX-Session/src/global.h
-apps/ROX-Session/src/gui_support.c
-apps/ROX-Session/src/gui_support.h
-apps/ROX-Session/src/i18n.c
-apps/ROX-Session/src/i18n.h
-apps/ROX-Session/src/log.c
-apps/ROX-Session/src/log.h
-apps/ROX-Session/src/main.c
-apps/ROX-Session/src/main.h
-apps/ROX-Session/src/options.c
-apps/ROX-Session/src/options.h
-apps/ROX-Session/src/po/da.po
-apps/ROX-Session/src/po/de.po
-apps/ROX-Session/src/po/dist
-apps/ROX-Session/src/po/es.po
-apps/ROX-Session/src/po/fr.po
-apps/ROX-Session/src/po/it.po
-apps/ROX-Session/src/po/ja.po
-apps/ROX-Session/src/po/lt.po
-apps/ROX-Session/src/po/make-mo
-apps/ROX-Session/src/po/nl.po
-apps/ROX-Session/src/po/pt_BR.po
-apps/ROX-Session/src/po/ru.po
-apps/ROX-Session/src/po/tips.py
-apps/ROX-Session/src/po/tips.pyc
-apps/ROX-Session/src/po/tips.pyo
-apps/ROX-Session/src/po/update-po
-apps/ROX-Session/src/po/zh_CN.po
-apps/ROX-Session/src/po/zh_TW.po
-apps/ROX-Session/src/rox_gettext.c
-apps/ROX-Session/src/rox_gettext.h
-apps/ROX-Session/src/session.c
-apps/ROX-Session/src/session.h
-apps/ROX-Session/src/settings.c
-apps/ROX-Session/src/settings.h
-apps/ROX-Session/src/wm.c
-apps/ROX-Session/src/wm.h
-apps/ROX-Session/src/xdgautostart.c
-apps/ROX-Session/src/xdgautostart.h
-apps/ROX-Session/src/xkb.c
-apps/ROX-Session/src/xkb.h
-apps/ROX-Session/src/xsettings-common.c
-apps/ROX-Session/src/xsettings-common.h
-apps/ROX-Session/src/xsettings-manager.c
-apps/ROX-Session/src/xsettings-manager.h
 bin/rox-session
-share/applications/rox.desktop
+%%GDM%%share/applications/rox.desktop
 @dirrmtry share/applications
-@dirrm apps/ROX-Session/src/po
-@dirrm apps/ROX-Session/src
 @dirrm apps/ROX-Session/images
-@dirrm apps/ROX-Session/build
-@dirrm apps/ROX-Session/Help
+@dirrm apps/ROX-Session/Messages
 @dirrm apps/ROX-Session
 @dirrmtry apps