Updated rox-session to 0.28.

Changes in release 0.28 (2006-03-11):

- Added support for XML-RPC-over-X as an alternative to D-BUS. If D-BUS isn't
  found, we don't need to abort now (Thomas Leonard).

- Kill the DBUS daemon on logout (Stephen Watson).

- Dropped support for older versions of D-BUS. All the special-case code was
  causing maintenence problems (Thomas Leonard).

- Attempt to distinguish dbus 0.33 from 0.35 (new API) and 0.2x (old API)
  (Stephen Watson).

- Python2.2 doesn't have the 'logging' module. Import a dummy version instead
  in this case (Thomas Leonard).

- Pygtk bug: gdk.Event.time is treated as signed even though it is an unsigned
  value, use gdk.Event.get_time() which returns unsigned values (Stephen
  Watson).


12-Feb-2006 (Release 0.27)
~~~~~~~~~~~
l (Thomas Leonard).
Bugfix: Log display would appear empty and never disappear if the message
        timeout was zero (Tony Houghton).

09-Feb-2006
~~~~~~~~~~~
More work on setting up the user's environment (Stephen Watson).

01-Feb-2006
~~~~~~~~~~~
Trap errors from commands that xsettings.py runs on start up (Stephen Watson).
For reasons known only to itself, dtlogin start the session with stdin
redirected from /, which causes Python to segfault.  Have our script run
ROX-Session with stdin from /dev/null (Stephen Watson).

28-Jan-2006
~~~~~~~~~~~
Debian no longer provide Python D-BUS bindings for their default version
of Python. Grrr. If we can't import dbus and we're on Python 2.3 or earlier,
try running again with Python 2.4 (Thomas Leonard).

21-Jan-2006
~~~~~~~~~~~
Made DBus 0.2x support work again (Thomas Leonard).
Don't fail to start if Environment.py is missing (Thomas Leonard).
Offer to restart the window manager when the setting changes (Thomas Leonard).

19-Jan-2006
~~~~~~~~~~~
Now loads session environment from Environment.py instead of Environment
(Stephen Watson).

17-Jan-2006
~~~~~~~~~~~
Use correct interface for settings (Stephen Watson).

16-Jan-2006
~~~~~~~~~~~
main.py and settings.py updated for DBus 0.3x, needs checking it still
works under 0.2x (Stephen Watson).

31-Dec-2005
~~~~~~~~~~~
Fixed some problems with the new code (Thomas Leonard; reported by Babyfai
Cheung).

03-Nov-2005
~~~~~~~~~~~
Started rewriting in Python (Thomas Leonard).

23-Oct-2005
~~~~~~~~~~~
Support KDM when doing "Add to login" (Stephen Watson).

04-Oct-2005
~~~~~~~~~~~
Fixed C code for dbus 0.36: part of a previous patch was missing, and a
workaround was needed for dbus bug 4637 (Tony Houghton).

02-Sep-2005
~~~~~~~~~~~
Added options for screen blanking with DPMS (Tony Houghton).

31-Aug-2005
~~~~~~~~~~~
Updated Chinese translations (Babyfai Cheung).

30-Aug-2005
~~~~~~~~~~~
Fixed update-po to include Python strings (Thomas Leonard; reported by babyfai
Cheung).
Make NumLock default to off, as on some laptops it makes the letter keys
produce numbers! (reported by Matthew Weier O'Phinney).

28-Aug-2005 (Release 0.26)
~~~~~~~~~~~
Updated build system to match ROX-Filer: generated files go in the 'build'
directory, the platform guessing has been removed, and the translation building
system has been updated. Also upgraded to the latest findrox and added
ROX-Session.xml for 0launch (Thomas Leonard).
RunROX and SetUp panel scripts use freedesktop.org basedir spec.

09-Jul-2005
~~~~~~~~~~~
Work-around for problem with D-BUS 0.3 Python bindings which prevented them
working with Python 2.3 (Thomas Leonard, reported by Marcus).
Separated the Guide from ROX-Session, as it was getting far too big (Thomas
Leonard).

03-Jul-2005
~~~~~~~~~~~
Allow ROX-Session to compile with DBUS 0.3x (Tony Houghton and Thomas Leonard).
Try to run ROX-Session using 0launch, if possible (Thomas Leonard).

20-May-2005
~~~~~~~~~~~
Change the way that ROX-Session runs ROX-Filer. It now uses the -S option to
open the default Panel and Pinboard, with the configuration of panel and
pinboard in ROX-Filer options (Stephen Watson).

12-May-2005
~~~~~~~~~~~
Updated Chinese translation (Babyfai Cheung).
Bugfix: Make sure messages are valid UTF-8 before logging (Thomas Leonard).

01-May-2005
~~~~~~~~~~~
Removed code for setting scroll lock. Doesn't work, and nobody uses scroll
lock anyway (Thomas Leonard).

30-Apr-2005
~~~~~~~~~~~
Added Brazilian Portuguese translation (Jose Carlos).
Bugfix: Don't refuse to start if the new Environment file doesn't exist
        (Thomas Leonard).

10-Apr-2005
~~~~~~~~~~~
Provide a way to set up a user's environment in general (Stephen Watson).

04-Mar-2005
~~~~~~~~~~~
Set $BROWSER to ROX-Session/browser on login. This is a script that runs your
configured web-browser ($XDG_CONFIG_DIRS/rox.sourceforge.net/handlers/BROWSER),
or picks a suitable default if none is set (Thomas Leonard).

22-Jan-2005
~~~~~~~~~~~
Allow setting keyboard LEDs (Caps lock, Num lock, Scroll lock) on login (Guido
Schimmes). This is used by Keyboard, a configuration application.

23-Dec-2004
~~~~~~~~~~~
Added Chinese translation (Babyfai Cheung).

23-Oct-2004
~~~~~~~~~~~
Updated Dutch translation (Jan Wagemakers).

15-Oct-2004
~~~~~~~~~~~
Allow Xcursor code to compile under GLib 2.2 (Stephen Watson).
Updated rox-session to 0.28.

Changes in release 0.28 (2006-03-11):

- Added support for XML-RPC-over-X as an alternative to D-BUS. If D-BUS isn't
  found, we don't need to abort now (Thomas Leonard).

- Kill the DBUS daemon on logout (Stephen Watson).

- Dropped support for older versions of D-BUS. All the special-case code was
  causing maintenence problems (Thomas Leonard).

- Attempt to distinguish dbus 0.33 from 0.35 (new API) and 0.2x (old API)
  (Stephen Watson).

- Python2.2 doesn't have the 'logging' module. Import a dummy version instead
  in this case (Thomas Leonard).

- Pygtk bug: gdk.Event.time is treated as signed even though it is an unsigned
  value, use gdk.Event.get_time() which returns unsigned values (Stephen
  Watson).


12-Feb-2006 (Release 0.27)
~~~~~~~~~~~

5 files changed, 61 insertions, 119 deletions

diff --git a/x11/rox-session/Makefile b/x11/rox-session/Makefile
index 078af6ce446..17b7958cd74 100644
--- a/x11/rox-session/Makefile
+++ b/x11/rox-session/Makefile
@@ -1,46 +1,30 @@
-# $NetBSD: Makefile,v 1.3 2006/02/27 13:05:55 rxg Exp $
+# $NetBSD: Makefile,v 1.4 2006/04/02 15:15:21 rxg Exp $
 #
 
-DISTNAME=	ROX-Session-0.1.25
-PKGNAME=	rox-session-0.1.25
+DISTNAME=	rox-session-0.28
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rox/}
-EXTRACT_SUFX=	.tgz
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	rxg@NetBSD.org
 HOMEPAGE=	http://rox.sourceforge.net/
 COMMENT=	Very simple session manager
 
 DEPENDS+=	rox-lib>=2.0.2nb2:../../devel/rox-lib
-DEPENDS+=	${PYPKGPREFIX}-pyrex>=0.9.3:../../lang/py-pyrex
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/ROX-Session
 DIST_SUBDIR=	rox
 
-PLATFORM=	${OPSYS}-${MACHINE_ARCH}
+NO_BUILD=	yes
 
-USE_TOOLS+=		pkg-config
-GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-platform=${PLATFORM:Q}
-
-PYTHON_PATCH_SCRIPTS=	AutoStart.py interactive.py
+PYTHON_PATCH_SCRIPTS=	AppRun tests/testutils.py
 
 INSTALLATION_DIRS=	share/rox/ROX-Session
 
-SUBST_CLASSES+=		bin
-SUBST_MESSAGE.bin=	Fixing binary path.
-SUBST_STAGE.bin=	post-patch
-SUBST_FILES.bin=	AppRun
-SUBST_SED.bin=		-e 's,BIN="$$APP_DIR/$$PLATFORM,BIN="${PREFIX}/libexec/rox,g'
-
 SUBST_CLASSES+=		path
 SUBST_MESSAGE.path=	Fixing hardcoded paths.
 SUBST_STAGE.path=	post-patch
-SUBST_FILES.path=	AppRun
-SUBST_FILES.path+=	Login
-SUBST_FILES.path+=	RunROX
-SUBST_FILES.path+=	setup.py
-SUBST_FILES.path+=	src/choices.c
+SUBST_FILES.path=	Login
 SUBST_SED.path=		-e 's,/usr/local,${PREFIX},g'
 
 SUBST_CLASSES+=		lib
@@ -49,23 +33,14 @@ SUBST_STAGE.lib=	post-patch
 SUBST_FILES.lib=	findrox.py
 SUBST_SED.lib=		-e 's,/usr/local/lib,${PREFIX}/share/rox,g'
 
-BUILD_TARGET=		../${PLATFORM}/ROX-Session
-CONFIGURE_DIRS=		src
-
 pre-install:
+	${RM} -f ${WRKSRC}/wm.py.orig
 	${RM} -f ${WRKSRC}/setup.py.orig
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PLATFORM}/ROX-Session ${PREFIX}/libexec/rox
-	cd ${WRKSRC} && ${PAX} -rw	\
-		-s ',^\./${PLATFORM}$$,,' -s ',^\./${PLATFORM}/.*,,'	\
-		-s ',^\./src$$,,' -s ',^\./src/.*,,'	\
-		. ${PREFIX}/share/rox/ROX-Session
+	cd ${WRKSRC} && ${PAX} -rw . ${PREFIX}/share/rox/ROX-Session
 
 .include "../../lang/python/application.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/py-dbus/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/rox-session/PLIST b/x11/rox-session/PLIST
index 596b3ced6bd..89c1e9ab1b7 100644
--- a/x11/rox-session/PLIST
+++ b/x11/rox-session/PLIST
@@ -1,80 +1,70 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/02/11 16:12:25 rxg Exp $
-libexec/rox/ROX-Session
+@comment $NetBSD: PLIST,v 1.2 2006/04/02 15:15:21 rxg Exp $
 share/rox/ROX-Session/.DirIcon
 share/rox/ROX-Session/AppInfo.xml
 share/rox/ROX-Session/AppRun
 share/rox/ROX-Session/AutoStart.py
+share/rox/ROX-Session/Environment.py
 share/rox/ROX-Session/Help/COPYING
 share/rox/ROX-Session/Help/Changes
 share/rox/ROX-Session/Help/DBUS-API
-share/rox/ROX-Session/Help/Guide/.DirIcon
-share/rox/ROX-Session/Help/Guide/AppInfo.xml
-share/rox/ROX-Session/Help/Guide/AppRun
-share/rox/ROX-Session/Help/Guide/Guide.html
-share/rox/ROX-Session/Help/Guide/Tutorial.html
-share/rox/ROX-Session/Help/Guide/Tutorial2.html
-share/rox/ROX-Session/Help/Guide/applets.png
-share/rox/ROX-Session/Help/Guide/apps.png
-share/rox/ROX-Session/Help/Guide/archive.png
-share/rox/ROX-Session/Help/Guide/de/Anleitung.html
-share/rox/ROX-Session/Help/Guide/de/Leitfaden.html
-share/rox/ROX-Session/Help/Guide/de/apps.png
-share/rox/ROX-Session/Help/Guide/de/help.png
-share/rox/ROX-Session/Help/Guide/de/logout.png
-share/rox/ROX-Session/Help/Guide/de/mount.png
-share/rox/ROX-Session/Help/Guide/de/newdir.png
-share/rox/ROX-Session/Help/Guide/de/shortcut.png
-share/rox/ROX-Session/Help/Guide/edit.png
-share/rox/ROX-Session/Help/Guide/help.png
-share/rox/ROX-Session/Help/Guide/it/Guida.html
-share/rox/ROX-Session/Help/Guide/it/Tutorial.html
-share/rox/ROX-Session/Help/Guide/it/Tutorial2.html
-share/rox/ROX-Session/Help/Guide/it/applets.png
-share/rox/ROX-Session/Help/Guide/it/apps.png
-share/rox/ROX-Session/Help/Guide/it/archive.png
-share/rox/ROX-Session/Help/Guide/it/edit.png
-share/rox/ROX-Session/Help/Guide/it/help.png
-share/rox/ROX-Session/Help/Guide/it/logout.png
-share/rox/ROX-Session/Help/Guide/it/mount.png
-share/rox/ROX-Session/Help/Guide/it/newdir.png
-share/rox/ROX-Session/Help/Guide/it/panel1.png
-share/rox/ROX-Session/Help/Guide/it/runaction.png
-share/rox/ROX-Session/Help/Guide/it/save.png
-share/rox/ROX-Session/Help/Guide/it/shortcut.png
-share/rox/ROX-Session/Help/Guide/it/style.css
-share/rox/ROX-Session/Help/Guide/logout.png
-share/rox/ROX-Session/Help/Guide/mount.png
-share/rox/ROX-Session/Help/Guide/newdir.png
-share/rox/ROX-Session/Help/Guide/panel1.png
-share/rox/ROX-Session/Help/Guide/runaction.png
-share/rox/ROX-Session/Help/Guide/save.png
-share/rox/ROX-Session/Help/Guide/shortcut.png
-share/rox/ROX-Session/Help/Guide/style.css
 share/rox/ROX-Session/Help/README
 share/rox/ROX-Session/Login
 share/rox/ROX-Session/Messages/da.gmo
+share/rox/ROX-Session/Messages/da.po
 share/rox/ROX-Session/Messages/de.gmo
+share/rox/ROX-Session/Messages/de.po
+share/rox/ROX-Session/Messages/dist
 share/rox/ROX-Session/Messages/es.gmo
+share/rox/ROX-Session/Messages/es.po
 share/rox/ROX-Session/Messages/fr.gmo
+share/rox/ROX-Session/Messages/fr.po
 share/rox/ROX-Session/Messages/it.gmo
+share/rox/ROX-Session/Messages/it.po
 share/rox/ROX-Session/Messages/ja.gmo
+share/rox/ROX-Session/Messages/ja.po
 share/rox/ROX-Session/Messages/lt.gmo
+share/rox/ROX-Session/Messages/lt.po
 share/rox/ROX-Session/Messages/nl.gmo
+share/rox/ROX-Session/Messages/nl.po
+share/rox/ROX-Session/Messages/pt_BR.gmo
+share/rox/ROX-Session/Messages/pt_BR.po
 share/rox/ROX-Session/Messages/ru.gmo
+share/rox/ROX-Session/Messages/ru.po
+share/rox/ROX-Session/Messages/tips.py
+share/rox/ROX-Session/Messages/update-po
+share/rox/ROX-Session/Messages/zh_CN.gmo
+share/rox/ROX-Session/Messages/zh_CN.po
+share/rox/ROX-Session/Messages/zh_TW.gmo
+share/rox/ROX-Session/Messages/zh_TW.po
 share/rox/ROX-Session/Options.xml
+share/rox/ROX-Session/ROX-Session.xml
 share/rox/ROX-Session/RunROX
 share/rox/ROX-Session/SetupPanel
 share/rox/ROX-Session/Styles
+share/rox/ROX-Session/browser
+share/rox/ROX-Session/children.py
+share/rox/ROX-Session/constants.py
 share/rox/ROX-Session/findrox.py
 share/rox/ROX-Session/images/rox-halt.png
 share/rox/ROX-Session/images/rox-suspend.png
 share/rox/ROX-Session/interactive.py
+share/rox/ROX-Session/log.py
 share/rox/ROX-Session/logout.py
+share/rox/ROX-Session/main.py
+share/rox/ROX-Session/mydbus.py
+share/rox/ROX-Session/mylogging.py
+share/rox/ROX-Session/session.py
+share/rox/ROX-Session/session_dbus.py
+share/rox/ROX-Session/settings.py
+share/rox/ROX-Session/settings3x.py
 share/rox/ROX-Session/setup.py
+share/rox/ROX-Session/tests/testutils.py
+share/rox/ROX-Session/utils.py
+share/rox/ROX-Session/wm.py
+share/rox/ROX-Session/xsettings.py
+share/rox/ROX-Session/xxmlrpc.py
+@dirrm share/rox/ROX-Session/tests
 @dirrm share/rox/ROX-Session/images
 @dirrm share/rox/ROX-Session/Messages
-@dirrm share/rox/ROX-Session/Help/Guide/it
-@dirrm share/rox/ROX-Session/Help/Guide/de
-@dirrm share/rox/ROX-Session/Help/Guide
 @dirrm share/rox/ROX-Session/Help
 @dirrm share/rox/ROX-Session
diff --git a/x11/rox-session/distinfo b/x11/rox-session/distinfo
index d305f8dd3d9..2048d304451 100644
--- a/x11/rox-session/distinfo
+++ b/x11/rox-session/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/02/11 16:12:25 rxg Exp $
+$NetBSD: distinfo,v 1.2 2006/04/02 15:15:21 rxg Exp $
 
-SHA1 (rox/ROX-Session-0.1.25.tgz) = 1e8c8f6cf853422b4ba3b3249a1f10c384a757fd
-RMD160 (rox/ROX-Session-0.1.25.tgz) = 0fd5916590ca9f0af069d7c2ac51a7056e51da77
-Size (rox/ROX-Session-0.1.25.tgz) = 1027577 bytes
-SHA1 (patch-aa) = 428bde0a5e928807b072d28ccebabc6a9a0fffd3
-SHA1 (patch-ab) = bfd42d6b676f60a2d5d4d41bab139543764b1acd
+SHA1 (rox/rox-session-0.28.tar.bz2) = 12cd08babc01b5de0d4893702efd04e1eda61ca8
+RMD160 (rox/rox-session-0.28.tar.bz2) = a70d5ab90aa6ebb679085f09f2b0f95a614fdbf3
+Size (rox/rox-session-0.28.tar.bz2) = 129900 bytes
+SHA1 (patch-ab) = d83674b5faa03bce2f257f5872a12d7d4bedc284
 SHA1 (patch-ac) = cf4247eeab08f934685eddde573fae808f93ed0c
diff --git a/x11/rox-session/patches/patch-aa b/x11/rox-session/patches/patch-aa
deleted file mode 100644
index 8687bec6d04..00000000000
--- a/x11/rox-session/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/02/11 16:12:25 rxg Exp $
-
---- src/dbus.c.orig	2005-11-20 16:43:11.000000000 +0800
-+++ src/dbus.c
-@@ -356,14 +356,14 @@ void dbus_init(void)
- 	gint stdout_pipe = -1;
- 	gchar *argv[] = {"dbus-daemon-1", "--session", "--print-address", NULL};
- 
--	libdbus = dlopen("libdbus-1.so.0", RTLD_LAZY | RTLD_NOLOAD);
-+	libdbus = dlopen("libdbus-1.so.0", RTLD_LAZY);
- 	if (!libdbus)
- 	{
- 		g_warning(_("Failed to open libdbus-1.so.0. "
- 			    "D-BUS support disabled."));
- 		return;
- 	}
--	libdbus_glib = dlopen("libdbus-glib-1.so.0", RTLD_LAZY | RTLD_NOLOAD);
-+	libdbus_glib = dlopen("libdbus-glib-1.so.0", RTLD_LAZY);
- 	if (!libdbus_glib)
- 	{
- 		g_warning(_("Failed to open libdbus-glib-1.so.0. "
diff --git a/x11/rox-session/patches/patch-ab b/x11/rox-session/patches/patch-ab
index 12119efa6ac..4c4e796b95f 100644
--- a/x11/rox-session/patches/patch-ab
+++ b/x11/rox-session/patches/patch-ab
@@ -1,13 +1,12 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/02/11 16:12:25 rxg Exp $
+$NetBSD: patch-ab,v 1.2 2006/04/02 15:15:21 rxg Exp $
 
---- src/wm.c.orig	2006-01-30 13:25:57.000000000 +0800
-+++ src/wm.c
-@@ -214,7 +214,7 @@ static void run_wm(void)
-  */
- static const char *get_window_manager(void)
- {
--	const char *fallbacks[] = {"xfwm4", "sawfish", "sawmill", "enlightenment", "wmaker",
-+	const char *fallbacks[] = {"oroborox", "xfwm4", "sawfish", "sawmill", "enlightenment", "wmaker",
- 			    "icewm", "blackbox", "fluxbox", "metacity", "kwin", "kwm",
- 			    "fvwm2", "fvwm", "4Dwm", "twm"};
+--- wm.py.orig	2006-04-02 19:37:24.000000000 +0800
++++ wm.py
+@@ -12,6 +12,7 @@ autorestart_wm = False
+ path_dirs = os.environ.get('PATH', '/bin:/usr/bin').split(':')
  
+ window_managers = [
++	'oroborox',
+ 	'0launch http://rox.sourceforge.net/2005/interfaces/OroboROX',
+ 	'xfwm4',
+ 	'sawfish',