Upgrade to version 0.29.

8 files changed, 132 insertions, 100 deletions

diff --git a/x11-fm/rox-session/Makefile b/x11-fm/rox-session/Makefile
index 37b1b56540e2..b1d84dcb4114 100644
--- a/x11-fm/rox-session/Makefile
+++ b/x11-fm/rox-session/Makefile
@@ -5,48 +5,36 @@
 # $FreeBSD$
 
 PORTNAME=	rox-session
-PORTVERSION=	0.1.21
-PORTREVISION=	5
+PORTVERSION=	0.29
 CATEGORIES=	x11-fm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	rox
-DISTNAME=	ROX-Session-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
+DISTNAME=	rox-session-${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	A session manager for the ROX desktop
 
 RUN_DEPENDS=	${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer
 
-WRKSRC=		${WRKDIR}/ROX-Session-${PORTVERSION}
+USE_BZIP2=	yes
+USE_PYTHON=	yes
 
-USE_GNOME=	gtk20 pkgconfig libxml2
-USE_AUTOTOOLS=	autoconf:213
-HAS_CONFIGURE=	yes
+SUB_FILES=	rox-session rox.desktop
 
 .include <bsd.port.pre.mk>
 
-.if (${ARCH} == "i386")
-BINARIES=	FreeBSD-ix86
-.else
-BINARIES=	FreeBSD-${ARCH}
-.endif
-
-PLIST_SUB=	BINARIES="${BINARIES}"
-
-CONFIGURE_ARGS=		--enable-rox --with-platform=${BINARIES}
-CONFIGURE_WRKSRC=	${WRKSRC}/ROX-Session/src
-BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
-ALL_TARGET=
+post-patch:
+	@${FIND} ${WRKSRC} -name *.orig | ${XARGS} ${RM}
 
 do-build:
-	# Run the custom build procedure
-	@cd ${WRKSRC}/ROX-Session && GTK_CONFIG=${GTK_CONFIG} GLIB_CONFIG=${GLIB_CONFIG} ./AppRun --compile
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 
 do-install:
-	@${MKDIR} ${PREFIX}/apps/ROX-Session
-	@cd ${WRKSRC}/ROX-Session && ${CP} -r .DirIcon AppInfo.xml AppRun ${BINARIES} Help Login MakeDefault.sh Messages Options.xml RunROX Setup SetupPanel Styles WindowMans images ${PREFIX}/apps/ROX-Session
-	@${CAT} ${FILESDIR}/rox-session | ${SED} -e "s|%%PREFIX%%|${PREFIX}|" > ${PREFIX}/bin/rox-session
-	@${CHMOD} 775 ${PREFIX}/bin/rox-session
+	@${MKDIR} ${PREFIX}/apps
+	@${CP} -r ${WRKSRC}/ROX-Session ${PREFIX}/apps/
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/apps/ROX-Session
+	@${INSTALL_SCRIPT} ${WRKDIR}/rox-session ${PREFIX}/sbin
+	@${INSTALL_DATA} ${WRKDIR}/rox.desktop ${PREFIX}/etc/dm/Sessions
 
 .include <bsd.port.post.mk>
diff --git a/x11-fm/rox-session/distinfo b/x11-fm/rox-session/distinfo
index e7d54af192e2..40dcd38c70e5 100644
--- a/x11-fm/rox-session/distinfo
+++ b/x11-fm/rox-session/distinfo
@@ -1,3 +1,3 @@
-MD5 (ROX-Session-0.1.21.tgz) = 34de54735a7ae0e649dbd4817c0b97ad
-SHA256 (ROX-Session-0.1.21.tgz) = e2405c9d76afd6c5442ecef891be0a31490cb2b663ee7622f4b949afb4225af4
-SIZE (ROX-Session-0.1.21.tgz) = 940915
+MD5 (rox-session-0.29.tar.bz2) = 0d8458e02a13dc041e4bff4e786ade91
+SHA256 (rox-session-0.29.tar.bz2) = c0899a372d7d39c787ae2cc3e02649dd1d6957156829f1689c7d3600f6e0d5b6
+SIZE (rox-session-0.29.tar.bz2) = 130948
diff --git a/x11-fm/rox-session/files/patch-ROX-Session_setup.py b/x11-fm/rox-session/files/patch-ROX-Session_setup.py
new file mode 100644
index 000000000000..21a39b6c07ac
--- /dev/null
+++ b/x11-fm/rox-session/files/patch-ROX-Session_setup.py
@@ -0,0 +1,15 @@
+
+$FreeBSD$
+
+--- ROX-Session/setup.py.orig
++++ ROX-Session/setup.py
+@@ -126,7 +126,8 @@
+ 	try:
+ 		session_dirs = ['/etc/X11/sessions', '/etc/dm/Sessions',
+ 				'/etc/X11/dm/Sessions', '/usr/share/xsessions',
+-				'/opt/kde3/share/apps/kdm/sessions']
++				'/opt/kde3/share/apps/kdm/sessions',
++				'/usr/local/etc/dm/Sessions']
+ 		# TODO: more guesses about where KDE is installed, /opt/kde3
+ 		# works for SuSE 9.2
+ 		for d in session_dirs:
diff --git a/x11-fm/rox-session/files/patch-ROX-Session_src_session.c b/x11-fm/rox-session/files/patch-ROX-Session_src_session.c
deleted file mode 100644
index 8f77b38ceb8a..000000000000
--- a/x11-fm/rox-session/files/patch-ROX-Session_src_session.c
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- ROX-Session/src/session.c.orig	Sun Mar 23 21:11:38 2003
-+++ ROX-Session/src/session.c	Sun Mar 23 21:12:38 2003
-@@ -152,8 +152,8 @@
- 	option_add_int(&mouse_accel_threshold, "accel_threshold", 10);
- 	option_add_int(&mouse_accel_factor, "accel_factor", 20);
- 
--	option_add_string(&halt_command, "halt_command", "halt");
--	option_add_string(&reboot_command, "reboot_command", "reboot");
-+	option_add_string(&halt_command, "halt_command", "/sbin/shutdown -p now");
-+	option_add_string(&reboot_command, "reboot_command", "/sbin/shutdown -r now");
- 	option_add_string(&suspend_command, "suspend_command",
- 			  "xset dpms force off");
- 
diff --git a/x11-fm/rox-session/files/rox-session b/x11-fm/rox-session/files/rox-session
deleted file mode 100644
index 5a649366a6e8..000000000000
--- a/x11-fm/rox-session/files/rox-session
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec %%PREFIX%%/apps/ROX-Session/AppRun "$@"
diff --git a/x11-fm/rox-session/files/rox-session.in b/x11-fm/rox-session/files/rox-session.in
new file mode 100644
index 000000000000..8e8f21864625
--- /dev/null
+++ b/x11-fm/rox-session/files/rox-session.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec %%PREFIX%%/apps/ROX-Session/AppRun -w < /dev/null
diff --git a/x11-fm/rox-session/files/rox.desktop.in b/x11-fm/rox-session/files/rox.desktop.in
new file mode 100644
index 000000000000..620222760ea7
--- /dev/null
+++ b/x11-fm/rox-session/files/rox.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=ROX
+Comment=This session logs you into the ROX desktop
+Exec=%%PREFIX%%/sbin/rox-session
+Type=Application
diff --git a/x11-fm/rox-session/pkg-plist b/x11-fm/rox-session/pkg-plist
index 3ebdee1b662f..bfd70413bc2e 100644
--- a/x11-fm/rox-session/pkg-plist
+++ b/x11-fm/rox-session/pkg-plist
@@ -1,77 +1,116 @@
-apps/ROX-Session/%%BINARIES%%/ROX-Session
 apps/ROX-Session/.DirIcon
 apps/ROX-Session/AppInfo.xml
 apps/ROX-Session/AppRun
+apps/ROX-Session/AutoStart.py
+apps/ROX-Session/AutoStart.pyc
+apps/ROX-Session/AutoStart.pyo
+apps/ROX-Session/Environment.py
+apps/ROX-Session/Environment.pyc
+apps/ROX-Session/Environment.pyo
 apps/ROX-Session/Help/COPYING
 apps/ROX-Session/Help/Changes
-apps/ROX-Session/Help/Guide/.DirIcon
-apps/ROX-Session/Help/Guide/AppInfo.xml
-apps/ROX-Session/Help/Guide/AppRun
-apps/ROX-Session/Help/Guide/Guide.html
-apps/ROX-Session/Help/Guide/Tutorial.html
-apps/ROX-Session/Help/Guide/Tutorial2.html
-apps/ROX-Session/Help/Guide/applets.png
-apps/ROX-Session/Help/Guide/apps.png
-apps/ROX-Session/Help/Guide/archive.png
-apps/ROX-Session/Help/Guide/de/Anleitung.html
-apps/ROX-Session/Help/Guide/de/Leitfaden.html
-apps/ROX-Session/Help/Guide/de/apps.png
-apps/ROX-Session/Help/Guide/de/help.png
-apps/ROX-Session/Help/Guide/de/logout.png
-apps/ROX-Session/Help/Guide/de/mount.png
-apps/ROX-Session/Help/Guide/de/newdir.png
-apps/ROX-Session/Help/Guide/de/shortcut.png
-apps/ROX-Session/Help/Guide/edit.png
-apps/ROX-Session/Help/Guide/help.png
-apps/ROX-Session/Help/Guide/it/Guida.html
-apps/ROX-Session/Help/Guide/it/Tutorial.html
-apps/ROX-Session/Help/Guide/it/Tutorial2.html
-apps/ROX-Session/Help/Guide/it/applets.png
-apps/ROX-Session/Help/Guide/it/apps.png
-apps/ROX-Session/Help/Guide/it/archive.png
-apps/ROX-Session/Help/Guide/it/edit.png
-apps/ROX-Session/Help/Guide/it/help.png
-apps/ROX-Session/Help/Guide/it/logout.png
-apps/ROX-Session/Help/Guide/it/mount.png
-apps/ROX-Session/Help/Guide/it/newdir.png
-apps/ROX-Session/Help/Guide/it/panel1.png
-apps/ROX-Session/Help/Guide/it/runaction.png
-apps/ROX-Session/Help/Guide/it/save.png
-apps/ROX-Session/Help/Guide/it/shortcut.png
-apps/ROX-Session/Help/Guide/it/style.css
-apps/ROX-Session/Help/Guide/logout.png
-apps/ROX-Session/Help/Guide/mount.png
-apps/ROX-Session/Help/Guide/newdir.png
-apps/ROX-Session/Help/Guide/panel1.png
-apps/ROX-Session/Help/Guide/runaction.png
-apps/ROX-Session/Help/Guide/save.png
-apps/ROX-Session/Help/Guide/shortcut.png
-apps/ROX-Session/Help/Guide/style.css
+apps/ROX-Session/Help/DBUS-API
 apps/ROX-Session/Help/README
 apps/ROX-Session/Login
-apps/ROX-Session/MakeDefault.sh
 apps/ROX-Session/Messages/da.gmo
+apps/ROX-Session/Messages/da.po
 apps/ROX-Session/Messages/de.gmo
+apps/ROX-Session/Messages/de.po
+apps/ROX-Session/Messages/dist
 apps/ROX-Session/Messages/es.gmo
+apps/ROX-Session/Messages/es.po
+apps/ROX-Session/Messages/fr.gmo
+apps/ROX-Session/Messages/fr.po
 apps/ROX-Session/Messages/it.gmo
+apps/ROX-Session/Messages/it.po
 apps/ROX-Session/Messages/ja.gmo
+apps/ROX-Session/Messages/ja.po
+apps/ROX-Session/Messages/lt.gmo
+apps/ROX-Session/Messages/lt.po
 apps/ROX-Session/Messages/nl.gmo
+apps/ROX-Session/Messages/nl.po
+apps/ROX-Session/Messages/pt_BR.gmo
+apps/ROX-Session/Messages/pt_BR.po
 apps/ROX-Session/Messages/ru.gmo
+apps/ROX-Session/Messages/ru.po
+apps/ROX-Session/Messages/tips.py
+apps/ROX-Session/Messages/tips.pyc
+apps/ROX-Session/Messages/tips.pyo
+apps/ROX-Session/Messages/update-po
+apps/ROX-Session/Messages/zh_CN.gmo
+apps/ROX-Session/Messages/zh_CN.po
+apps/ROX-Session/Messages/zh_TW.gmo
+apps/ROX-Session/Messages/zh_TW.po
 apps/ROX-Session/Options.xml
+apps/ROX-Session/ROX-Session.xml
 apps/ROX-Session/RunROX
-apps/ROX-Session/Setup
 apps/ROX-Session/SetupPanel
 apps/ROX-Session/Styles
-apps/ROX-Session/WindowMans
+apps/ROX-Session/browser
+apps/ROX-Session/children.py
+apps/ROX-Session/children.pyc
+apps/ROX-Session/children.pyo
+apps/ROX-Session/constants.py
+apps/ROX-Session/constants.pyc
+apps/ROX-Session/constants.pyo
+apps/ROX-Session/findrox.py
+apps/ROX-Session/findrox.pyc
+apps/ROX-Session/findrox.pyo
 apps/ROX-Session/images/rox-halt.png
 apps/ROX-Session/images/rox-suspend.png
-bin/rox-session
+apps/ROX-Session/interactive.py
+apps/ROX-Session/interactive.pyc
+apps/ROX-Session/interactive.pyo
+apps/ROX-Session/log.py
+apps/ROX-Session/log.pyc
+apps/ROX-Session/log.pyo
+apps/ROX-Session/logout.py
+apps/ROX-Session/logout.pyc
+apps/ROX-Session/logout.pyo
+apps/ROX-Session/main.py
+apps/ROX-Session/main.pyc
+apps/ROX-Session/main.pyo
+apps/ROX-Session/mydbus.py
+apps/ROX-Session/mydbus.pyc
+apps/ROX-Session/mydbus.pyo
+apps/ROX-Session/mylogging.py
+apps/ROX-Session/mylogging.pyc
+apps/ROX-Session/mylogging.pyo
+apps/ROX-Session/session.py
+apps/ROX-Session/session.pyc
+apps/ROX-Session/session.pyo
+apps/ROX-Session/session_dbus.py
+apps/ROX-Session/session_dbus.pyc
+apps/ROX-Session/session_dbus.pyo
+apps/ROX-Session/settings.py
+apps/ROX-Session/settings.pyc
+apps/ROX-Session/settings.pyo
+apps/ROX-Session/settings3x.py
+apps/ROX-Session/settings3x.pyc
+apps/ROX-Session/settings3x.pyo
+apps/ROX-Session/setup.py
+apps/ROX-Session/setup.pyc
+apps/ROX-Session/setup.pyo
+apps/ROX-Session/tests/testutils.py
+apps/ROX-Session/tests/testutils.pyc
+apps/ROX-Session/tests/testutils.pyo
+apps/ROX-Session/utils.py
+apps/ROX-Session/utils.pyc
+apps/ROX-Session/utils.pyo
+apps/ROX-Session/wm.py
+apps/ROX-Session/wm.pyc
+apps/ROX-Session/wm.pyo
+apps/ROX-Session/xsettings.py
+apps/ROX-Session/xsettings.pyc
+apps/ROX-Session/xsettings.pyo
+apps/ROX-Session/xxmlrpc.py
+apps/ROX-Session/xxmlrpc.pyc
+apps/ROX-Session/xxmlrpc.pyo
+etc/dm/Sessions/rox.desktop
+sbin/rox-session
+@dirrm apps/ROX-Session/tests
 @dirrm apps/ROX-Session/images
 @dirrm apps/ROX-Session/Messages
-@dirrm apps/ROX-Session/Help/Guide/it
-@dirrm apps/ROX-Session/Help/Guide/de
-@dirrm apps/ROX-Session/Help/Guide
 @dirrm apps/ROX-Session/Help
-@dirrm apps/ROX-Session/%%BINARIES%%
 @dirrm apps/ROX-Session
 @dirrmtry apps