4 files changed, 40 insertions, 26 deletions

diff --git a/misc/gnome-osd/Makefile b/misc/gnome-osd/Makefile
index f7838aef3503..9b3b3975f276 100644
--- a/misc/gnome-osd/Makefile
+++ b/misc/gnome-osd/Makefile
@@ -6,34 +6,33 @@
 #
 
 PORTNAME=	gnome-osd
-DISTVERSION=	0.11.3
-PORTREVISION=	8
+PORTVERSION=	0.20.0
 CATEGORIES=	misc
-MASTER_SITES=	http://telecom.inescporto.pt/~gjc/gnome-osd/${DISTVERSION:C|-.*$||}/
+MASTER_SITES=	http://launchpadlibrarian.net/63944370/
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An On-Screen-Display infrastructure using Pango text rendering
 
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
 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_ENV=	LDFLAGS="${LDFLAGS}"
+
 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|' \
-		${WRKSRC}/Makefile.in
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+.for file in AUTHORS NEWS README
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/misc/gnome-osd/distinfo b/misc/gnome-osd/distinfo
index 55311ba27183..4b9c9b3de6a1 100644
--- a/misc/gnome-osd/distinfo
+++ b/misc/gnome-osd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome-osd-0.11.3.tar.gz) = 9296a040b6185f1bad2d6ad8fb01b78c70eae34d29263bf1b3bb133841c752da
-SIZE (gnome-osd-0.11.3.tar.gz) = 175507
+SHA256 (gnome-osd_0.20.0.tar.gz) = cc5e06173ffed70ff69f69e16d0cdf795e4d8f91648398ea9cc7894abc331aa0
+SIZE (gnome-osd_0.20.0.tar.gz) = 256992
diff --git a/misc/gnome-osd/pkg-descr b/misc/gnome-osd/pkg-descr
index ff9cc352efc2..825f20ceca91 100644
--- a/misc/gnome-osd/pkg-descr
+++ b/misc/gnome-osd/pkg-descr
@@ -2,4 +2,4 @@ Gnome OSD is a new small project to create an OSD (On-Screen-Display)
 infrastructure, similar to XOSD. It includes a command-line client,
 and sample xchat and rhythmbox plugins.
 
-WWW: http://www.gnomefiles.org/app.php?soft_id=350
+WWW: https://launchpad.net/gnome-osd
diff --git a/misc/gnome-osd/pkg-plist b/misc/gnome-osd/pkg-plist
index 8cdcddabc763..2a94b4938a3f 100644
--- a/misc/gnome-osd/pkg-plist
+++ b/misc/gnome-osd/pkg-plist
@@ -2,7 +2,6 @@ bin/gnome-osd-client
 bin/gnome-osd-event-bridge
 bin/gnome-osd-properties
 etc/xdg/autostart/gnome-osd-event-bridge.desktop
-libdata/bonobo/servers/GNOME_OSD.server
 %%PYTHON_SITELIBDIR%%/gnomeosd/__init__.py
 %%PYTHON_SITELIBDIR%%/gnomeosd/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gnomeosd/__init__.pyo
@@ -36,19 +35,35 @@ libdata/bonobo/servers/GNOME_OSD.server
 %%PYTHON_SITELIBDIR%%/gnomeosd/xscreensaver.py
 %%PYTHON_SITELIBDIR%%/gnomeosd/xscreensaver.pyc
 %%PYTHON_SITELIBDIR%%/gnomeosd/xscreensaver.pyo
+libdata/bonobo/servers/GNOME_OSD.server
 libexec/gnome-osd-server
+share/applications/gnome-osd-properties.desktop
 share/dbus-1/services/pt.inescporto.telecom.GnomeOSD.EventBridge.service
 share/dbus-1/services/pt.inescporto.telecom.GnomeOSD.service
-share/applications/gnome-osd-properties.desktop
-share/gnome-osd/xchatosd.py
-share/pixmaps/gnome-osd.png
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%DATADIR%%/xchatosd.py
+share/locale/ca/LC_MESSAGES/gnome-osd.mo
 share/locale/cs/LC_MESSAGES/gnome-osd.mo
+share/locale/de/LC_MESSAGES/gnome-osd.mo
+share/locale/en_GB/LC_MESSAGES/gnome-osd.mo
+share/locale/es/LC_MESSAGES/gnome-osd.mo
+share/locale/fr/LC_MESSAGES/gnome-osd.mo
+share/locale/hu/LC_MESSAGES/gnome-osd.mo
+share/locale/it/LC_MESSAGES/gnome-osd.mo
 share/locale/ja/LC_MESSAGES/gnome-osd.mo
+share/locale/ms/LC_MESSAGES/gnome-osd.mo
+share/locale/pl/LC_MESSAGES/gnome-osd.mo
 share/locale/pt/LC_MESSAGES/gnome-osd.mo
-@dirrm share/gnome-osd
-@dirrm %%PYTHON_SITELIBDIR%%/gnomeosd
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%
-@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
+share/locale/ru/LC_MESSAGES/gnome-osd.mo
+share/locale/sv/LC_MESSAGES/gnome-osd.mo
+share/locale/tr/LC_MESSAGES/gnome-osd.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-osd.mo
+share/pixmaps/gnome-osd.png
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%
+@dirrmtry share/dbus-1/services
+@dirrmtry share/dbus-1
 @dirrmtry share/applications
+@dirrm %%PYTHON_SITELIBDIR%%/gnomeosd