5 files changed, 30 insertions, 54 deletions

diff --git a/misc/gnome-osd/Makefile b/misc/gnome-osd/Makefile
index 4c089e2d05ca..6cd529acf45a 100644
--- a/misc/gnome-osd/Makefile
+++ b/misc/gnome-osd/Makefile
@@ -6,23 +6,23 @@
 #
 
 PORTNAME=	gnome-osd
-DISTVERSION=	0.9.1-1
+DISTVERSION=	0.11.3
 CATEGORIES=	misc
 MASTER_SITES=	http://telecom.inescporto.pt/~gjc/gnome-osd/${DISTVERSION:C|-.*$||}/
-DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	jylefort@FreeBSD.org
 COMMENT=	An On-Screen-Display infrastructure using Pango text rendering
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack pygnome2
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 GCONF_SCHEMAS=	gnome-osd.schemas
 PORTDOCS=	AUTHORS NEWS README
+MAN1=		gnome-osd-client.1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|control-center-2.0/capplets|applications|; \
diff --git a/misc/gnome-osd/distinfo b/misc/gnome-osd/distinfo
index c4cd4851dff8..0e4b3d210f78 100644
--- a/misc/gnome-osd/distinfo
+++ b/misc/gnome-osd/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-osd_0.9.1-1.tar.gz) = 88d90eb04327de335a0f56b992020497
-SHA256 (gnome-osd_0.9.1-1.tar.gz) = 6e79ad12c78fb0b15b90c9578b9204d2c3ecd25553f304a2d6b8a90dfb09e50d
-SIZE (gnome-osd_0.9.1-1.tar.gz) = 169257
+MD5 (gnome-osd-0.11.3.tar.gz) = f85ec6d1c97c5ff4f12d83ba90197c7d
+SHA256 (gnome-osd-0.11.3.tar.gz) = 9296a040b6185f1bad2d6ad8fb01b78c70eae34d29263bf1b3bb133841c752da
+SIZE (gnome-osd-0.11.3.tar.gz) = 175507
diff --git a/misc/gnome-osd/files/patch-gnomeosd_capplet.py b/misc/gnome-osd/files/patch-gnomeosd_capplet.py
new file mode 100644
index 000000000000..2dcfec3e3907
--- /dev/null
+++ b/misc/gnome-osd/files/patch-gnomeosd_capplet.py
@@ -0,0 +1,10 @@
+--- gnomeosd/capplet.py.orig	Wed Aug 23 03:44:56 2006
++++ gnomeosd/capplet.py	Wed Aug 23 03:45:29 2006
+@@ -150,7 +150,6 @@
+ def main():
+     gettext.install("gnome-osd", os.path.join(gnome_osd_conf.datadir, "locale"))
+     locale.setlocale(locale.LC_ALL, '')
+-    locale.bind_textdomain_codeset('gnome-osd','UTF-8')
+     gettext.bind_textdomain_codeset('gnome-osd','UTF-8')
+     gnome.program_init("gnome-osd-properties", gnome_osd_conf.VERSION)
+ 
diff --git a/misc/gnome-osd/files/patch-gnomeosd_server.py b/misc/gnome-osd/files/patch-gnomeosd_server.py
deleted file mode 100644
index ecee9f358d36..000000000000
--- a/misc/gnome-osd/files/patch-gnomeosd_server.py
+++ /dev/null
@@ -1,47 +0,0 @@
---- gnomeosd/server.py.orig	Wed Nov 16 16:26:50 2005
-+++ gnomeosd/server.py	Wed Nov 16 16:28:14 2005
-@@ -378,26 +378,27 @@
- 
-     bonobo.context_running_get().connect("last-unref", last_unref_cb)
- 
--class DBusInterface(dbus.service.Object):
--    def __init__(self, bus_name, object_path="/Server"):
--        dbus.service.Object.__init__(self, bus_name, object_path)
-+if HAVE_DBUS:
-+    class DBusInterface(dbus.service.Object):
-+        def __init__(self, bus_name, object_path="/Server"):
-+            dbus.service.Object.__init__(self, bus_name, object_path)
- 
--    #@dbus.service.method("pt.inescporto.telecom.GnomeOSD")
--    def showMessage(self, message, timeout=-1):
--        return message_show_cb(None, message, timeout)
--    showMessage = dbus.service.method("pt.inescporto.telecom.GnomeOSD")(showMessage)
-+    	#@dbus.service.method("pt.inescporto.telecom.GnomeOSD")
-+        def showMessage(self, message, timeout=-1):
-+            return message_show_cb(None, message, timeout)
-+        showMessage = dbus.service.method("pt.inescporto.telecom.GnomeOSD")(showMessage)
- 
--    #@dbus.service.method("pt.inescporto.telecom.GnomeOSD")
--    def showMessageFull(self, message):
--        return message_show_full_cb(None, message)
--    showMessageFull = dbus.service.method("pt.inescporto.telecom.GnomeOSD")(showMessageFull)
-+    	#@dbus.service.method("pt.inescporto.telecom.GnomeOSD")
-+        def showMessageFull(self, message):
-+            return message_show_full_cb(None, message)
-+        showMessageFull = dbus.service.method("pt.inescporto.telecom.GnomeOSD")(showMessageFull)
-+
-+    def start_dbus_interface():
-+        session_bus = dbus.SessionBus()
-+        name = dbus.service.BusName("pt.inescporto.telecom.GnomeOSD",
-+                                    bus=session_bus)
-+        obj = DBusInterface(name)
- 
--def start_dbus_interface():
--    session_bus = dbus.SessionBus()
--    name = dbus.service.BusName("pt.inescporto.telecom.GnomeOSD",
--                                bus=session_bus)
--    obj = DBusInterface(name)
--    
- 
- def main():
-     print "starting Bonobo interface..."
diff --git a/misc/gnome-osd/pkg-plist b/misc/gnome-osd/pkg-plist
index 00c2427ddb89..96a29146bbc7 100644
--- a/misc/gnome-osd/pkg-plist
+++ b/misc/gnome-osd/pkg-plist
@@ -1,6 +1,7 @@
 bin/gnome-osd-client
+bin/gnome-osd-event-bridge
 bin/gnome-osd-properties
-bin/rbosd.py
+etc/xdg/autostart/gnome-osd-event-bridge.desktop
 libdata/bonobo/servers/GNOME_OSD.server
 %%PYTHON_SITELIBDIR%%/gnomeosd/__init__.py
 %%PYTHON_SITELIBDIR%%/gnomeosd/__init__.pyc
@@ -11,6 +12,9 @@ libdata/bonobo/servers/GNOME_OSD.server
 %%PYTHON_SITELIBDIR%%/gnomeosd/client.py
 %%PYTHON_SITELIBDIR%%/gnomeosd/client.pyc
 %%PYTHON_SITELIBDIR%%/gnomeosd/client.pyo
+%%PYTHON_SITELIBDIR%%/gnomeosd/eventbridge.py
+%%PYTHON_SITELIBDIR%%/gnomeosd/eventbridge.pyc
+%%PYTHON_SITELIBDIR%%/gnomeosd/eventbridge.pyo
 %%PYTHON_SITELIBDIR%%/gnomeosd/gconfsync.py
 %%PYTHON_SITELIBDIR%%/gnomeosd/gconfsync.pyc
 %%PYTHON_SITELIBDIR%%/gnomeosd/gconfsync.pyo
@@ -23,16 +27,25 @@ libdata/bonobo/servers/GNOME_OSD.server
 %%PYTHON_SITELIBDIR%%/gnomeosd/gtasklet.py
 %%PYTHON_SITELIBDIR%%/gnomeosd/gtasklet.pyc
 %%PYTHON_SITELIBDIR%%/gnomeosd/gtasklet.pyo
+%%PYTHON_SITELIBDIR%%/gnomeosd/gtkexcepthook.py
+%%PYTHON_SITELIBDIR%%/gnomeosd/gtkexcepthook.pyc
+%%PYTHON_SITELIBDIR%%/gnomeosd/gtkexcepthook.pyo
 %%PYTHON_SITELIBDIR%%/gnomeosd/server.py
 %%PYTHON_SITELIBDIR%%/gnomeosd/server.pyc
 %%PYTHON_SITELIBDIR%%/gnomeosd/server.pyo
+%%PYTHON_SITELIBDIR%%/gnomeosd/xscreensaver.py
+%%PYTHON_SITELIBDIR%%/gnomeosd/xscreensaver.pyc
+%%PYTHON_SITELIBDIR%%/gnomeosd/xscreensaver.pyo
 libexec/gnome-osd-server
+share/dbus-1/services/pt.inescporto.telecom.GnomeOSD.EventBridge.service
 share/dbus-1/services/pt.inescporto.telecom.GnomeOSD.service
 share/gnome/applications/gnome-osd-properties.desktop
 share/gnome/gnome-osd/xchatosd.py
 share/gnome/pixmaps/gnome-osd.png
+share/locale/cs/LC_MESSAGES/gnome-osd.mo
 share/locale/ja/LC_MESSAGES/gnome-osd.mo
 share/locale/pt/LC_MESSAGES/gnome-osd.mo
+@dirrmtry etc/xdg/autostart
 @dirrm share/gnome/gnome-osd
 @dirrm %%PYTHON_SITELIBDIR%%/gnomeosd
 @dirrmtry %%PYTHON_SITELIBDIR%%