5 files changed, 26 insertions, 46 deletions

diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index a17850a1172b..72e8e2db6f7b 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	workrave
-PORTVERSION=	1.4.0
-PORTREVISION=	3
+PORTVERSION=	1.6.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,7 +21,7 @@ BUILD_DEPENDS=	intltool-extract:${PORTSDIR}/textproc/intltool
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomepanel gconf2
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomepanel gconf2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/x11/workrave/distinfo b/x11/workrave/distinfo
index c5e9ecf6b556..7c7d759fa781 100644
--- a/x11/workrave/distinfo
+++ b/x11/workrave/distinfo
@@ -1,2 +1,2 @@
-MD5 (workrave-1.4.0.tar.gz) = d5bd1127b533b6d613335f7f240005ad
-SIZE (workrave-1.4.0.tar.gz) = 968636
+MD5 (workrave-1.6.1.tar.gz) = a00ecf1ff9526fe9c625d0ce28ea95f8
+SIZE (workrave-1.6.1.tar.gz) = 1189458
diff --git a/x11/workrave/files/patch-configure b/x11/workrave/files/patch-configure
deleted file mode 100644
index ed38bd27518f..000000000000
--- a/x11/workrave/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Tue Aug 26 23:50:00 2003
-+++ configure	Tue Aug 26 23:50:32 2003
-@@ -8571,7 +8571,6 @@
- 
- 
- LIBS_save=$LIBS
--LIBS="$LIBS -L $ac_x_libraries"
- echo "$as_me:$LINENO: checking for XRecordEnableContext in -lXtst" >&5
- echo $ECHO_N "checking for XRecordEnableContext in -lXtst... $ECHO_C" >&6
- if test "${ac_cv_lib_Xtst_XRecordEnableContext+set}" = set; then
diff --git a/x11/workrave/files/patch-src::app::gtkmm::gnome_applet::WorkraveApplet.c b/x11/workrave/files/patch-src::app::gtkmm::gnome_applet::WorkraveApplet.c
deleted file mode 100644
index 29d73d0b03a6..000000000000
--- a/x11/workrave/files/patch-src::app::gtkmm::gnome_applet::WorkraveApplet.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/app/gtkmm/gnome_applet/WorkraveApplet.c.orig	Wed Aug  6 23:01:06 2003
-+++ src/app/gtkmm/gnome_applet/WorkraveApplet.c	Fri Aug 29 18:24:11 2003
-@@ -849,6 +849,7 @@
- {
-   GdkPixbuf *pixbuf = NULL;
-   GtkWidget *hbox = NULL;
-+  GtkWidget *event_box = gtk_event_box_new();
-   BonoboUIComponent *ui = NULL;
-   
-   // Create menus.
-@@ -863,7 +864,6 @@
-   bonobo_ui_component_add_listener(ui, "Quiet", mode_callback, NULL);
- 
-   // Eventbox
--  GtkWidget *event_box = gtk_event_box_new();
-   applet_control->event_box = event_box;
-   gtk_widget_set_events(event_box, gtk_widget_get_events(event_box) | GDK_BUTTON_PRESS_MASK);
-   gtk_widget_show(GTK_WIDGET(event_box));
diff --git a/x11/workrave/pkg-plist b/x11/workrave/pkg-plist
index d578cb3f3a97..5f95376a4dfd 100644
--- a/x11/workrave/pkg-plist
+++ b/x11/workrave/pkg-plist
@@ -1,8 +1,8 @@
 bin/workrave
 etc/sound/events/workrave.soundlist
-libexec/workrave-applet
 libdata/bonobo/servers/Workrave-Applet.server
 libdata/bonobo/servers/Workrave-Control.server
+libexec/workrave-applet
 share/gnome/gnome-2.0/ui/GNOME_WorkraveApplet.xml
 share/gnome/pixmaps/workrave/workrave-icon-small.png
 share/gnome/sounds/workrave/break-ignored.wav
@@ -10,15 +10,16 @@ share/gnome/sounds/workrave/break-prelude.wav
 share/gnome/sounds/workrave/daily-limit.wav
 share/gnome/sounds/workrave/exercise-ended.wav
 share/gnome/sounds/workrave/exercises-ended.wav
-share/gnome/sounds/workrave/micropause-ended.wav
-share/gnome/sounds/workrave/micropause-started.wav
-share/gnome/sounds/workrave/restbreak-ended.wav
-share/gnome/sounds/workrave/restbreak-started.wav
+share/gnome/sounds/workrave/micro-break-ended.wav
+share/gnome/sounds/workrave/micro-break-started.wav
+share/gnome/sounds/workrave/rest-break-ended.wav
+share/gnome/sounds/workrave/rest-break-started.wav
 share/gnome/workrave/exercises/backward-shoulder-stretch.png
 share/gnome/workrave/exercises/chair-pushup-1.png
 share/gnome/workrave/exercises/chair-pushup-2.png
 share/gnome/workrave/exercises/depth-focus-1.png
 share/gnome/workrave/exercises/depth-focus-2.png
+share/gnome/workrave/exercises/exercises.xml
 share/gnome/workrave/exercises/eye-darkness.png
 share/gnome/workrave/exercises/finger-stretch-1.png
 share/gnome/workrave/exercises/finger-stretch-2.png
@@ -29,39 +30,47 @@ share/gnome/workrave/exercises/monitor-border-4.png
 share/gnome/workrave/exercises/neck-tilt-stretch-1.png
 share/gnome/workrave/exercises/neck-tilt-stretch-2.png
 share/gnome/workrave/exercises/rotate-arm.png
-share/gnome/workrave/exercises/turn-head-1.png
 share/gnome/workrave/exercises/shoulder-arm-stretch.png
+share/gnome/workrave/exercises/turn-head-1.png
 share/gnome/workrave/exercises/turn-head-2.png
 share/gnome/workrave/exercises/wrist-lower-arm-desk-stretch-1.png
-share/gnome/workrave/exercises/wrist-lower-arm-desk-stretch-2.png
-share/gnome/workrave/exercises/exercises.xml
 share/gnome/workrave/images/daily-limit.png
 share/gnome/workrave/images/display.png
-share/gnome/workrave/images/micropause.png
+share/gnome/workrave/images/lock.png
+share/gnome/workrave/images/micro-break.png
 share/gnome/workrave/images/monitoring.png
 share/gnome/workrave/images/network.png
 share/gnome/workrave/images/prelude-hint-sad.png
 share/gnome/workrave/images/prelude-hint.png
-share/gnome/workrave/images/restbreak.png
+share/gnome/workrave/images/rest-break.png
+share/gnome/workrave/images/shutdown.png
 share/gnome/workrave/images/time.png
 share/gnome/workrave/images/timer-daily.png
-share/gnome/workrave/images/timer-micropause.png
-share/gnome/workrave/images/timer-restbreak.png
+share/gnome/workrave/images/timer-micro-break.png
+share/gnome/workrave/images/timer-rest-break.png
 share/gnome/workrave/images/workrave-icon-large.png
 share/gnome/workrave/images/workrave-icon-medium.png
 share/gnome/workrave/images/workrave-icon-small.png
-share/gnome/workrave/images/workrave.ico
 share/gnome/workrave/images/workrave.png
 share/locale/da/LC_MESSAGES/workrave.mo
 share/locale/de/LC_MESSAGES/workrave.mo
 share/locale/eo/LC_MESSAGES/workrave.mo
 share/locale/es/LC_MESSAGES/workrave.mo
+share/locale/fr/LC_MESSAGES/workrave.mo
 share/locale/nl/LC_MESSAGES/workrave.mo
 share/locale/pl/LC_MESSAGES/workrave.mo
+share/locale/ru/LC_MESSAGES/workrave.mo
+share/locale/zh_TW/LC_MESSAGES/workrave.mo
+@unexec rmdir share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/zh_TW 2>/dev/null || true
+@unexec rmdir share/locale/ru/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/ru 2>/dev/null || true
 @unexec rmdir share/locale/pl/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir share/locale/pl 2>/dev/null || true
 @unexec rmdir share/locale/nl/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir share/locale/nl 2>/dev/null || true
+@unexec rmdir share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir share/locale/fr 2>/dev/null || true
 @unexec rmdir share/locale/es/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir share/locale/es 2>/dev/null || true
 @unexec rmdir share/locale/eo/LC_MESSAGES 2>/dev/null || true