4 files changed, 62 insertions, 17 deletions

diff --git a/misc/gnome-osd/Makefile b/misc/gnome-osd/Makefile
index 6f5e881f97c7..51a09fd53e8d 100644
--- a/misc/gnome-osd/Makefile
+++ b/misc/gnome-osd/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	gnome-osd
-DISTVERSION=	0.8.0-1
+DISTVERSION=	0.9.1-1
 CATEGORIES=	misc
-MASTER_SITES=	http://telecom.inescporto.pt/~gjc/gnome-osd/
+MASTER_SITES=	http://telecom.inescporto.pt/~gjc/gnome-osd/${DISTVERSION:C|-.*$||}/
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	jylefort@FreeBSD.org
@@ -21,24 +21,20 @@ USE_PYTHON=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 GCONF_SCHEMAS=	gnome-osd.schemas
+PORTDOCS=	AUTHORS NEWS README
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|control-center-2.0/capplets|applications|' \
+	@${REINPLACE_CMD} -e 's|control-center-2.0/capplets|applications|; \
+		s|$$(datadir)/dbus-1|$$(prefix)/share/dbus-1|' \
 		${WRKSRC}/Makefile.in
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} \
-		${WRKSRC}/AUTHORS \
-		${WRKSRC}/NEWS \
-		${WRKSRC}/README \
-		${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
-
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/misc/gnome-osd/distinfo b/misc/gnome-osd/distinfo
index 905696dd15f6..56a02e358236 100644
--- a/misc/gnome-osd/distinfo
+++ b/misc/gnome-osd/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome-osd_0.8.0-1.tar.gz) = 7dea83abc9c69cf76925b22110499702
-SIZE (gnome-osd_0.8.0-1.tar.gz) = 158143
+MD5 (gnome-osd_0.9.1-1.tar.gz) = 88d90eb04327de335a0f56b992020497
+SIZE (gnome-osd_0.9.1-1.tar.gz) = 169257
diff --git a/misc/gnome-osd/files/patch-gnomeosd_server.py b/misc/gnome-osd/files/patch-gnomeosd_server.py
new file mode 100644
index 000000000000..ecee9f358d36
--- /dev/null
+++ b/misc/gnome-osd/files/patch-gnomeosd_server.py
@@ -0,0 +1,47 @@
+--- 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 e0c54690c4e8..f5ff07d2eadb 100644
--- a/misc/gnome-osd/pkg-plist
+++ b/misc/gnome-osd/pkg-plist
@@ -20,10 +20,14 @@ libdata/bonobo/servers/GNOME_OSD.server
 %%PYTHON_SITELIBDIR%%/gnomeosd/gosd.py
 %%PYTHON_SITELIBDIR%%/gnomeosd/gosd.pyc
 %%PYTHON_SITELIBDIR%%/gnomeosd/gosd.pyo
+%%PYTHON_SITELIBDIR%%/gnomeosd/gtasklet.py
+%%PYTHON_SITELIBDIR%%/gnomeosd/gtasklet.pyc
+%%PYTHON_SITELIBDIR%%/gnomeosd/gtasklet.pyo
 %%PYTHON_SITELIBDIR%%/gnomeosd/server.py
 %%PYTHON_SITELIBDIR%%/gnomeosd/server.pyc
 %%PYTHON_SITELIBDIR%%/gnomeosd/server.pyo
 libexec/gnome-osd-server
+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
@@ -33,7 +37,5 @@ share/locale/pt/LC_MESSAGES/gnome-osd.mo
 @dirrm %%PYTHON_SITELIBDIR%%/gnomeosd
 @unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
 @unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@comment only remove the dbus directories if dbus is not installed
+@unexec if ! [ -e %%LOCALBASE%%/bin/dbus-daemon ]; then rmdir %D/share/dbus-1/services 2>/dev/null; rmdir %D/share/dbus-1 2>/dev/null; fi