Update to 1.9.1 and take ownership.

5 files changed, 101 insertions, 74 deletions

diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index 25c19f827aca..00cd92928423 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -6,17 +6,24 @@
 #
 
 PORTNAME=	workrave
-PORTVERSION=	1.8.5
-PORTREVISION=	6
+PORTVERSION=	1.9.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	SF
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A Gnome RSI prevention tool
+MAINTAINER=	lx@FreeBSD.org
+COMMENT=	An RSI prevention tool
+
+BUILD_DEPENDS=	gdome-config:${PORTSDIR}/textproc/gdome2
 
 OPTIONS=	GNOME "Build with Gnome support" on \
 		NETWORK "Build with network support" on
 
+DESKTOP_ENTRIES=	"Workrave" "An RSI prevention tool" \
+					"${DATADIR}/images/workrave-icon-small.png" \
+					"workrave" \
+					"Application;Utility;" \
+					false
+
 USE_XORG=	x11 xmu
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/x11/workrave/distinfo b/x11/workrave/distinfo
index cc32715a1d1e..55b697b0fa7d 100644
--- a/x11/workrave/distinfo
+++ b/x11/workrave/distinfo
@@ -1,3 +1,3 @@
-MD5 (workrave-1.8.5.tar.gz) = 3df48ab5600256fadc11a976f15bcc7a
-SHA256 (workrave-1.8.5.tar.gz) = 4a2f8f16f015fcec4446953421c8e12cdb41391a6da0e63d04d17b30534a0c56
-SIZE (workrave-1.8.5.tar.gz) = 1940651
+MD5 (workrave-1.9.1.tar.gz) = 065775ee4fdb3e21e12cbf0907d31b88
+SHA256 (workrave-1.9.1.tar.gz) = 5c23af4b36fc6dd27b0f1b58373868d925fb91ec9ff40b7c7bbcec52a1b28ab9
+SIZE (workrave-1.9.1.tar.gz) = 6594737
diff --git a/x11/workrave/files/patch-System.cc b/x11/workrave/files/patch-System.cc
new file mode 100644
index 000000000000..1340f1253b0f
--- /dev/null
+++ b/x11/workrave/files/patch-System.cc
@@ -0,0 +1,12 @@
+--- frontend/common/src/System.cc.old	2010-03-25 11:16:41.000000000 -0700
++++ frontend/common/src/System.cc	2010-03-25 11:16:55.000000000 -0700
+@@ -41,9 +41,6 @@
+ #include <X11/Xproto.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+-#endif
+-
+-#if defined(HAVE_UNIX)
+ #include <sys/wait.h>
+ #endif
+ 
diff --git a/x11/workrave/files/patch-frontend__common__src__System.cc b/x11/workrave/files/patch-frontend__common__src__System.cc
deleted file mode 100644
index 08aaad5de308..000000000000
--- a/x11/workrave/files/patch-frontend__common__src__System.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- frontend/common/src/System.cc.orig	2007-09-28 13:18:31.000000000 -0300
-+++ frontend/common/src/System.cc	2007-09-28 13:18:48.000000000 -0300
-@@ -28,6 +28,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <strings.h>
-+#include <sys/wait.h>
- 
- #include "System.hh"
- #include "debug.hh"
diff --git a/x11/workrave/pkg-plist b/x11/workrave/pkg-plist
index c4f6560436e6..91f962b7e008 100644
--- a/x11/workrave/pkg-plist
+++ b/x11/workrave/pkg-plist
@@ -1,62 +1,76 @@
 bin/workrave
-etc/sound/events/workrave.soundlist
 %%GNOME%%libdata/bonobo/servers/Workrave-Applet.server
 %%GNOME%%libdata/bonobo/servers/Workrave-Control.server
 %%GNOME%%libexec/workrave-applet
 %%GNOME%%share/gnome-2.0/ui/GNOME_WorkraveApplet.xml
+share/pixmaps/workrave/workrave.xpm
 share/pixmaps/workrave/workrave-icon-huge.png
-share/sounds/workrave/break-ignored.wav
-share/sounds/workrave/break-prelude.wav
-share/sounds/workrave/daily-limit.wav
-share/sounds/workrave/exercise-ended.wav
-share/sounds/workrave/exercises-ended.wav
-share/sounds/workrave/micro-break-ended.wav
-share/sounds/workrave/micro-break-started.wav
-share/sounds/workrave/rest-break-ended.wav
-share/sounds/workrave/rest-break-started.wav
-share/workrave/exercises/backward-shoulder-stretch.png
-share/workrave/exercises/chair-pushup-1.png
-share/workrave/exercises/chair-pushup-2.png
-share/workrave/exercises/depth-focus-1.png
-share/workrave/exercises/depth-focus-2.png
-share/workrave/exercises/exercises.xml
-share/workrave/exercises/eye-darkness.png
-share/workrave/exercises/finger-stretch-1.png
-share/workrave/exercises/finger-stretch-2.png
-share/workrave/exercises/fist-roll-1.png
-share/workrave/exercises/fist-roll-2.png
-share/workrave/exercises/monitor-border-1.png
-share/workrave/exercises/monitor-border-2.png
-share/workrave/exercises/monitor-border-3.png
-share/workrave/exercises/monitor-border-4.png
-share/workrave/exercises/neck-tilt-stretch-1.png
-share/workrave/exercises/neck-tilt-stretch-2.png
-share/workrave/exercises/rotate-arm.png
-share/workrave/exercises/shoulder-arm-stretch.png
-share/workrave/exercises/turn-head-1.png
-share/workrave/exercises/turn-head-2.png
-share/workrave/exercises/wrist-lower-arm-desk-stretch-1.png
-share/workrave/images/daily-limit.png
-share/workrave/images/display.png
-share/workrave/images/lock.png
-share/workrave/images/micro-break.png
-share/workrave/images/monitoring.png
-share/workrave/images/network.png
-share/workrave/images/prelude-hint-sad.png
-share/workrave/images/prelude-hint.png
-share/workrave/images/rest-break.png
-share/workrave/images/shutdown.png
-share/workrave/images/time.png
-share/workrave/images/timer-daily.png
-share/workrave/images/timer-micro-break.png
-share/workrave/images/timer-rest-break.png
-share/workrave/images/workrave-icon-huge.png
-share/workrave/images/workrave-icon-large.png
-share/workrave/images/workrave-icon-medium.png
-share/workrave/images/workrave-icon-small.png
-share/workrave/images/workrave-quiet-icon-medium.png
-share/workrave/images/workrave-suspended-icon-medium.png
-share/workrave/images/workrave.png
+share/sounds/workrave/subtle/break-ignored.wav
+share/sounds/workrave/subtle/break-prelude.wav
+share/sounds/workrave/subtle/daily-limit.wav
+share/sounds/workrave/subtle/exercise-ended.wav
+share/sounds/workrave/subtle/exercise-step.wav
+share/sounds/workrave/subtle/exercises-ended.wav
+share/sounds/workrave/subtle/micro-break-ended.wav
+share/sounds/workrave/subtle/micro-break-started.wav
+share/sounds/workrave/subtle/rest-break-ended.wav
+share/sounds/workrave/subtle/rest-break-started.wav
+share/sounds/workrave/subtle/soundtheme
+share/sounds/workrave/default/break-ignored.wav
+share/sounds/workrave/default/break-prelude.wav
+share/sounds/workrave/default/daily-limit.wav
+share/sounds/workrave/default/exercise-ended.wav
+share/sounds/workrave/default/exercise-step.wav
+share/sounds/workrave/default/exercises-ended.wav
+share/sounds/workrave/default/micro-break-ended.wav
+share/sounds/workrave/default/micro-break-started.wav
+share/sounds/workrave/default/rest-break-ended.wav
+share/sounds/workrave/default/rest-break-started.wav
+share/sounds/workrave/default/soundtheme
+%%DATADIR%%/images/workrave.xpm
+%%DATADIR%%/exercises/backward-shoulder-stretch.png
+%%DATADIR%%/exercises/chair-pushup-1.png
+%%DATADIR%%/exercises/chair-pushup-2.png
+%%DATADIR%%/exercises/depth-focus-1.png
+%%DATADIR%%/exercises/depth-focus-2.png
+%%DATADIR%%/exercises/exercises.xml
+%%DATADIR%%/exercises/eye-darkness.png
+%%DATADIR%%/exercises/finger-stretch-1.png
+%%DATADIR%%/exercises/finger-stretch-2.png
+%%DATADIR%%/exercises/fist-roll-1.png
+%%DATADIR%%/exercises/fist-roll-2.png
+%%DATADIR%%/exercises/monitor-border-1.png
+%%DATADIR%%/exercises/monitor-border-2.png
+%%DATADIR%%/exercises/monitor-border-3.png
+%%DATADIR%%/exercises/monitor-border-4.png
+%%DATADIR%%/exercises/neck-tilt-stretch-1.png
+%%DATADIR%%/exercises/neck-tilt-stretch-2.png
+%%DATADIR%%/exercises/rotate-arm.png
+%%DATADIR%%/exercises/shoulder-arm-stretch.png
+%%DATADIR%%/exercises/turn-head-1.png
+%%DATADIR%%/exercises/turn-head-2.png
+%%DATADIR%%/exercises/wrist-lower-arm-desk-stretch-1.png
+%%DATADIR%%/images/daily-limit.png
+%%DATADIR%%/images/display.png
+%%DATADIR%%/images/lock.png
+%%DATADIR%%/images/micro-break.png
+%%DATADIR%%/images/monitoring.png
+%%DATADIR%%/images/network.png
+%%DATADIR%%/images/prelude-hint-sad.png
+%%DATADIR%%/images/prelude-hint.png
+%%DATADIR%%/images/rest-break.png
+%%DATADIR%%/images/shutdown.png
+%%DATADIR%%/images/time.png
+%%DATADIR%%/images/timer-daily.png
+%%DATADIR%%/images/timer-micro-break.png
+%%DATADIR%%/images/timer-rest-break.png
+%%DATADIR%%/images/workrave-icon-huge.png
+%%DATADIR%%/images/workrave-icon-large.png
+%%DATADIR%%/images/workrave-icon-medium.png
+%%DATADIR%%/images/workrave-icon-small.png
+%%DATADIR%%/images/workrave-quiet-icon-medium.png
+%%DATADIR%%/images/workrave-suspended-icon-medium.png
+%%DATADIR%%/images/workrave.png
 %%NLS%%share/locale/bg/LC_MESSAGES/workrave.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/workrave.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/workrave.mo
@@ -65,6 +79,7 @@ share/workrave/images/workrave.png
 %%NLS%%share/locale/el/LC_MESSAGES/workrave.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/workrave.mo
 %%NLS%%share/locale/es/LC_MESSAGES/workrave.mo
+%%NLS%%share/locale/et/LC_MESSAGES/workrave.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/workrave.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/workrave.mo
 %%NLS%%share/locale/he/LC_MESSAGES/workrave.mo
@@ -72,10 +87,11 @@ share/workrave/images/workrave.png
 %%NLS%%share/locale/it/LC_MESSAGES/workrave.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/workrave.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/workrave.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/workrave.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/workrave.mo
-%%NLS%%share/locale/no/LC_MESSAGES/workrave.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/workrave.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/workrave.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/workrave.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/workrave.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/workrave.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/workrave.mo
@@ -83,8 +99,10 @@ share/workrave/images/workrave.png
 %%NLS%%share/locale/tr/LC_MESSAGES/workrave.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/workrave.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/workrave.mo
-@dirrm share/workrave/images
-@dirrm share/workrave/exercises
-@dirrm share/workrave
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/exercises
+@dirrm %%DATADIR%%
+@dirrm share/sounds/workrave/default
+@dirrm share/sounds/workrave/subtle
 @dirrm share/sounds/workrave
 @dirrm share/pixmaps/workrave