4 files changed, 46 insertions, 54 deletions

diff --git a/misc/gnome-osd/Makefile b/misc/gnome-osd/Makefile
index 271f50ad169a..94e93cf4be46 100644
--- a/misc/gnome-osd/Makefile
+++ b/misc/gnome-osd/Makefile
@@ -5,28 +5,28 @@
 # $FreeBSD$
 #
 
-PORTNAME=		gnome-osd
-PORTVERSION=		0.6.0
-PORTREVISION=	1
-CATEGORIES=		misc
-MASTER_SITES=		http://yang.inescn.pt/~gjc/gnome-osd/
+PORTNAME=	gnome-osd
+PORTVERSION=	0.7.2
+CATEGORIES=	misc
+MASTER_SITES=	http://telecom.inescporto.pt/~gjc/gnome-osd/
 
-MAINTAINER=		jylefort@brutele.be
-COMMENT=		An On-Screen-Display infrastructure using Pango text rendering
+MAINTAINER=	jylefort@brutele.be
+COMMENT=	An On-Screen-Display infrastructure using Pango text rendering
 
-USE_X_PREFIX=		yes
-USE_BZIP2=		yes
-USE_GNOME=		gnomehack gnomeprefix intlhack pygnome2
-USE_PYTHON=		yes
-USE_REINPLACE=		yes
-USE_GMAKE=		yes
-GNU_CONFIGURE=		yes
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+USE_X_PREFIX=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack gnomeprefix intlhack pygnome2
+USE_PYTHON=	yes
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+GCONF_SCHEMAS=	gnome-osd.schemas
 
 post-patch:
-	@${REINPLACE_CMD} -e 's/^Icon=gnome-osd$$/&.png/' \
-		${WRKSRC}/gnome-osd-properties.desktop.in
+	@${REINPLACE_CMD} -e 's|control-center-2.0/capplets|applications|' \
+		${WRKSRC}/Makefile.in
 
 post-install:
 .if !defined(NOPORTDOCS)
@@ -36,11 +36,6 @@ post-install:
 		${WRKSRC}/NEWS \
 		${WRKSRC}/README \
 		${DOCSDIR}
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} \
-		${WRKSRC}/rbosd.py \
-		${WRKSRC}/xchatosd.py \
-		${EXAMPLESDIR}
 .endif
 
 	@${CAT} ${PKGMESSAGE}
diff --git a/misc/gnome-osd/distinfo b/misc/gnome-osd/distinfo
index c5a59cc7eaef..9da23bebb9bc 100644
--- a/misc/gnome-osd/distinfo
+++ b/misc/gnome-osd/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome-osd-0.6.0.tar.bz2) = 01c2bf98425a871b577503fef5df8e55
-SIZE (gnome-osd-0.6.0.tar.bz2) = 106548
+MD5 (gnome-osd-0.7.2.tar.bz2) = 84f960f422aa91503134f99365779420
+SIZE (gnome-osd-0.7.2.tar.bz2) = 124948
diff --git a/misc/gnome-osd/files/patch-README b/misc/gnome-osd/files/patch-README
deleted file mode 100644
index f3e28dbbff7a..000000000000
--- a/misc/gnome-osd/files/patch-README
+++ /dev/null
@@ -1,13 +0,0 @@
---- README.orig	Sat Aug 21 17:29:37 2004
-+++ README	Sat Aug 21 17:30:03 2004
-@@ -35,10 +35,3 @@
-    yourself, somewhere.  To start, simply run the program with no arguments.
- From there on, every time rhythmbox changes song, you get an OSD message
- notifying you of this.
--
--        ** Note **
--               In order to make rbosd.py work correctly, you need to
--apply the patch gnome-python-2.5.90.diff against gnome-python 2.5.90
--source and recompile.  This is a temporary solution until gnome-python
--2.5.91 is released.
--
diff --git a/misc/gnome-osd/pkg-plist b/misc/gnome-osd/pkg-plist
index 8cf931a3f6da..ebf2041b91d9 100644
--- a/misc/gnome-osd/pkg-plist
+++ b/misc/gnome-osd/pkg-plist
@@ -1,26 +1,36 @@
 bin/gnome-osd-client
 bin/gnome-osd-properties
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-osd.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-osd.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-osd.schemas > /dev/null || /usr/bin/true
 libdata/bonobo/servers/GNOME_OSD.server
-%%PYTHON_SITELIBDIR%%/gconfsync.py
-%%PYTHON_SITELIBDIR%%/gconfsync.pyc
-%%PYTHON_SITELIBDIR%%/gconfsync.pyo
-%%PYTHON_SITELIBDIR%%/gnome_osd_conf.py
-%%PYTHON_SITELIBDIR%%/gnome_osd_conf.pyc
-%%PYTHON_SITELIBDIR%%/gnome_osd_conf.pyo
-%%PYTHON_SITELIBDIR%%/gosd.py
-%%PYTHON_SITELIBDIR%%/gosd.pyc
-%%PYTHON_SITELIBDIR%%/gosd.pyo
+%%PYTHON_SITELIBDIR%%/gnomeosd/__init__.py
+%%PYTHON_SITELIBDIR%%/gnomeosd/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gnomeosd/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gnomeosd/capplet.py
+%%PYTHON_SITELIBDIR%%/gnomeosd/capplet.pyc
+%%PYTHON_SITELIBDIR%%/gnomeosd/capplet.pyo
+%%PYTHON_SITELIBDIR%%/gnomeosd/client.py
+%%PYTHON_SITELIBDIR%%/gnomeosd/client.pyc
+%%PYTHON_SITELIBDIR%%/gnomeosd/client.pyo
+%%PYTHON_SITELIBDIR%%/gnomeosd/gconfsync.py
+%%PYTHON_SITELIBDIR%%/gnomeosd/gconfsync.pyc
+%%PYTHON_SITELIBDIR%%/gnomeosd/gconfsync.pyo
+%%PYTHON_SITELIBDIR%%/gnomeosd/gnome_osd_conf.py
+%%PYTHON_SITELIBDIR%%/gnomeosd/gnome_osd_conf.pyc
+%%PYTHON_SITELIBDIR%%/gnomeosd/gnome_osd_conf.pyo
+%%PYTHON_SITELIBDIR%%/gnomeosd/gosd.py
+%%PYTHON_SITELIBDIR%%/gnomeosd/gosd.pyc
+%%PYTHON_SITELIBDIR%%/gnomeosd/gosd.pyo
+%%PYTHON_SITELIBDIR%%/gnomeosd/server.py
+%%PYTHON_SITELIBDIR%%/gnomeosd/server.pyc
+%%PYTHON_SITELIBDIR%%/gnomeosd/server.pyo
 libexec/gnome-osd-server
-share/gnome/control-center-2.0/capplets/gnome-osd-properties.desktop
+share/gnome/applications/gnome-osd-properties.desktop
+share/gnome/gnome-osd/rbosd.py
+share/gnome/gnome-osd/xchatosd.py
 share/gnome/pixmaps/gnome-osd.png
+share/locale/ja/LC_MESSAGES/gnome-osd.mo
 share/locale/pt/LC_MESSAGES/gnome-osd.mo
+@dirrm %%PYTHON_SITELIBDIR%%/gnomeosd
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/rbosd.py
-%%PORTDOCS%%%%EXAMPLESDIR%%/xchatosd.py
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%