diff options
author | Alexander Nedotsukov <bland@FreeBSD.org> | 2003-08-29 17:04:31 +0000 |
---|---|---|
committer | Alexander Nedotsukov <bland@FreeBSD.org> | 2003-08-29 17:04:31 +0000 |
commit | 0eac30808f6d443ae4131adb8da1dbcf904c1da8 (patch) | |
tree | 08d7a64101e36420c423e8c3fad1ca774a43b979 /x11/workrave | |
parent | Fix package building when not using GNOME. (diff) |
Update to 1.4.0
Submitted by: maintainer (-STABLE patches)
Approved by: marcus (mentor)
Notes
Notes:
svn path=/head/; revision=87988
Diffstat (limited to 'x11/workrave')
-rw-r--r-- | x11/workrave/Makefile | 9 | ||||
-rw-r--r-- | x11/workrave/distinfo | 2 | ||||
-rw-r--r-- | x11/workrave/files/patch-arch_debug.hh | 11 | ||||
-rw-r--r-- | x11/workrave/files/patch-arch_unix_Mutex.hh | 14 | ||||
-rw-r--r-- | x11/workrave/files/patch-arch_unix_Thread.hh | 10 | ||||
-rw-r--r-- | x11/workrave/files/patch-configure | 10 | ||||
-rw-r--r-- | x11/workrave/files/patch-src::app::gtkmm::gnome_applet::WorkraveApplet.c (renamed from x11/workrave/files/patch-gui_gnome_WorkraveApplet.c) | 9 | ||||
-rw-r--r-- | x11/workrave/files/patch-src_X11InputMonitor.cc | 24 | ||||
-rw-r--r-- | x11/workrave/pkg-plist | 33 |
9 files changed, 53 insertions, 69 deletions
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile index 8ced6af0511d..8148adb4ff59 100644 --- a/x11/workrave/Makefile +++ b/x11/workrave/Makefile @@ -6,8 +6,7 @@ # PORTNAME= workrave -PORTVERSION= 1.2.2 -PORTREVISION= 1 +PORTVERSION= 1.4.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,7 +15,8 @@ MAINTAINER= einekoai@chello.nl COMMENT= A Gnome RSI prevention tool LIB_DEPENDS= gtkmm-2.0.6:${PORTSDIR}/x11-toolkits/gtk--2 \ - gnomeuimm-1.3:${PORTSDIR}/x11-toolkits/libgnomeuimm + gnomeuimm-1.3:${PORTSDIR}/x11-toolkits/libgnomeuimm \ + gnet-2.0.0:${PORTSDIR}/net/gnet2 BUILD_DEPENDS= intltool-extract:${PORTSDIR}/textproc/intltool USE_X_PREFIX= yes @@ -27,6 +27,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" CONFIGURE_ARGS= --datadir=${PREFIX}/share/gnome/workrave \ --enable-gconf \ - --enable-gnome + --enable-gnome \ + --enable-exercises .include <bsd.port.mk> diff --git a/x11/workrave/distinfo b/x11/workrave/distinfo index 987aa12a32b3..267a3c9026fc 100644 --- a/x11/workrave/distinfo +++ b/x11/workrave/distinfo @@ -1 +1 @@ -MD5 (workrave-1.2.2.tar.gz) = 412e373059da6a31bdec5833ecbef878 +MD5 (workrave-1.4.0.tar.gz) = d5bd1127b533b6d613335f7f240005ad diff --git a/x11/workrave/files/patch-arch_debug.hh b/x11/workrave/files/patch-arch_debug.hh deleted file mode 100644 index 1190bb4a7f46..000000000000 --- a/x11/workrave/files/patch-arch_debug.hh +++ /dev/null @@ -1,11 +0,0 @@ ---- arch/debug.hh.orig Sun Jul 13 10:04:38 2003 -+++ arch/debug.hh Sun Jul 13 10:04:55 2003 -@@ -21,6 +21,8 @@ - #ifndef DEBUG_HH - #define DEBUG_HH - -+#include <assert.h> -+ - #ifndef CWDEBUG - - #define AllocTag1(p) diff --git a/x11/workrave/files/patch-arch_unix_Mutex.hh b/x11/workrave/files/patch-arch_unix_Mutex.hh deleted file mode 100644 index ac836e9ded7c..000000000000 --- a/x11/workrave/files/patch-arch_unix_Mutex.hh +++ /dev/null @@ -1,14 +0,0 @@ ---- arch/unix/Mutex.hh.orig Sun Jan 5 00:53:45 2003 -+++ arch/unix/Mutex.hh Sat Jul 12 16:40:21 2003 -@@ -23,6 +23,11 @@ - - #include <pthread.h> - -+// define this to something freebsd knows -+#ifdef __FreeBSD__ -+#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE -+#endif -+ - /*! - * A Mutex class. - */ diff --git a/x11/workrave/files/patch-arch_unix_Thread.hh b/x11/workrave/files/patch-arch_unix_Thread.hh deleted file mode 100644 index bdcddcd2f595..000000000000 --- a/x11/workrave/files/patch-arch_unix_Thread.hh +++ /dev/null @@ -1,10 +0,0 @@ ---- arch/unix/Thread.cc.orig Sun Jan 5 00:53:45 2003 -+++ arch/unix/Thread.cc Sat Jul 5 13:58:39 2003 -@@ -20,6 +20,7 @@ - #include "config.h" - #endif - -+#include <time.h> - #include "Thread.hh" - - void * diff --git a/x11/workrave/files/patch-configure b/x11/workrave/files/patch-configure new file mode 100644 index 000000000000..ed38bd27518f --- /dev/null +++ b/x11/workrave/files/patch-configure @@ -0,0 +1,10 @@ +--- 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-gui_gnome_WorkraveApplet.c b/x11/workrave/files/patch-src::app::gtkmm::gnome_applet::WorkraveApplet.c index 496ef12c2b37..29d73d0b03a6 100644 --- a/x11/workrave/files/patch-gui_gnome_WorkraveApplet.c +++ b/x11/workrave/files/patch-src::app::gtkmm::gnome_applet::WorkraveApplet.c @@ -1,6 +1,6 @@ ---- gui/gnome/WorkraveApplet.c.orig Tue Mar 18 22:04:42 2003 -+++ gui/gnome/WorkraveApplet.c Thu Jul 31 13:43:50 2003 -@@ -783,6 +783,7 @@ +--- 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; @@ -8,12 +8,11 @@ BonoboUIComponent *ui = NULL; // Create menus. -@@ -797,7 +798,7 @@ +@@ -863,7 +864,6 @@ bonobo_ui_component_add_listener(ui, "Quiet", mode_callback, NULL); // Eventbox - GtkWidget *event_box = gtk_event_box_new(); -+// 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/files/patch-src_X11InputMonitor.cc b/x11/workrave/files/patch-src_X11InputMonitor.cc deleted file mode 100644 index e4939d32f71e..000000000000 --- a/x11/workrave/files/patch-src_X11InputMonitor.cc +++ /dev/null @@ -1,24 +0,0 @@ ---- src/X11InputMonitor.cc.orig Sat Mar 22 14:53:57 2003 -+++ src/X11InputMonitor.cc Mon Jul 14 17:47:35 2003 -@@ -39,6 +39,7 @@ - #if HAVE_UNISTD_H - # include <unistd.h> - #endif -+#include <sys/select.h> - - #include <X11/X.h> - #include <X11/Xproto.h> -@@ -174,11 +175,13 @@ - TRACE_MSG("waiting"); - abort = true; - -+#ifdef HAVE_XRECORD - //FIXME: stop_xrecord does not seem to work. - if (use_xrecord) - { - monitor_thread->stop(); - } -+#endif - // wait_for_terminated_signal.wait(); - TRACE_EXIT(); - } diff --git a/x11/workrave/pkg-plist b/x11/workrave/pkg-plist index dc97a58594b2..d578cb3f3a97 100644 --- a/x11/workrave/pkg-plist +++ b/x11/workrave/pkg-plist @@ -8,10 +8,33 @@ share/gnome/pixmaps/workrave/workrave-icon-small.png share/gnome/sounds/workrave/break-ignored.wav 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/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/eye-darkness.png +share/gnome/workrave/exercises/finger-stretch-1.png +share/gnome/workrave/exercises/finger-stretch-2.png +share/gnome/workrave/exercises/monitor-border-1.png +share/gnome/workrave/exercises/monitor-border-2.png +share/gnome/workrave/exercises/monitor-border-3.png +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-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 @@ -29,16 +52,26 @@ 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/nl/LC_MESSAGES/workrave.mo +share/locale/pl/LC_MESSAGES/workrave.mo +@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/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 @unexec rmdir share/locale/eo 2>/dev/null || true @unexec rmdir share/locale/de/LC_MESSAGES 2>/dev/null || true @unexec rmdir share/locale/de 2>/dev/null || true +@unexec rmdir share/locale/da/LC_MESSAGES 2>/dev/null || true +@unexec rmdir share/locale/da 2>/dev/null || true @dirrm share/gnome/workrave/images +@dirrm share/gnome/workrave/exercises @dirrm share/gnome/workrave @dirrm share/gnome/pixmaps/workrave @dirrm share/gnome/sounds/workrave |