- Update to 1.8.5

- OPTIONS'ify
- s/INSTALLS_SHLIB/USE_LDCONFIG/
- Respect WITHOUT_NLS
- Take maintainership

PR:		ports/116717
Submitted by:	garga
Approved by:	infofarmer (maintainer)

4 files changed, 68 insertions, 41 deletions

diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index 376e3c949ef4..d737119f4e98 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -6,41 +6,47 @@
 #
 
 PORTNAME=	workrave
-PORTVERSION=	1.8.3
-PORTREVISION=	1
+PORTVERSION=	1.8.5
 CATEGORIES=	x11 gnome
 MASTER_SITES=	SF
 
-MAINTAINER=	infofarmer@FreeBSD.org
+MAINTAINER=	garga@FreeBSD.org
 COMMENT=	A Gnome RSI prevention tool
 
-.if !defined(WITHOUT_GNOME)
-LIB_DEPENDS=	gnomeuimm-2.6.1:${PORTSDIR}/x11-toolkits/libgnomeuimm26
-.else
-LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
-.endif
-.if !defined(WITHOUT_NETWORK)
-LIB_DEPENDS+=	gnet-2.0.0:${PORTSDIR}/net/gnet2
-.endif
+OPTIONS=	GNOME "Build with Gnome support" on \
+		NETWORK "Build with network support" on
 
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 intltool
-.if !defined(WITHOUT_GNOME)
-USE_GNOME+=	gnomepanel
-.endif
 USE_GCC=	3.4+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-gconf
-.if defined(WITHOUT_GNOME)
-CONFIGURE_ARGS+=--disable-gnome
-PLIST_SUB=	GNOME="@comment "
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_GNOME)
+LIB_DEPENDS+=	gnomeuimm-2.6.1:${PORTSDIR}/x11-toolkits/libgnomeuimm26
+USE_GNOME+=	gnomepanel
+PLIST_SUB+=	GNOME=""
 .else
-PLIST_SUB=	GNOME=""
+LIB_DEPENDS+=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
+CONFIGURE_ARGS+=--disable-gnome
+PLIST_SUB+=	GNOME="@comment "
 .endif
-.if defined(WITHOUT_NETWORK)
+
+.if defined(WITH_NETWORK)
+LIB_DEPENDS+=	gnet-2.0.0:${PORTSDIR}/net/gnet2
+.else
 CONFIGURE_ARGS+=--disable-distribution
 .endif
 
-.include <bsd.port.mk>
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11/workrave/distinfo b/x11/workrave/distinfo
index abc58ffe296e..cc32715a1d1e 100644
--- a/x11/workrave/distinfo
+++ b/x11/workrave/distinfo
@@ -1,3 +1,3 @@
-MD5 (workrave-1.8.3.tar.gz) = e1fe49f6fdf9d725bd21d50e2e0dc20d
-SHA256 (workrave-1.8.3.tar.gz) = 411487f55d7e15e68618d30f9931bffafb3154cac36d7ea15ea5f80c3bbac10f
-SIZE (workrave-1.8.3.tar.gz) = 1604897
+MD5 (workrave-1.8.5.tar.gz) = 3df48ab5600256fadc11a976f15bcc7a
+SHA256 (workrave-1.8.5.tar.gz) = 4a2f8f16f015fcec4446953421c8e12cdb41391a6da0e63d04d17b30534a0c56
+SIZE (workrave-1.8.5.tar.gz) = 1940651
diff --git a/x11/workrave/files/patch-frontend__common__src__System.cc b/x11/workrave/files/patch-frontend__common__src__System.cc
new file mode 100644
index 000000000000..08aaad5de308
--- /dev/null
+++ b/x11/workrave/files/patch-frontend__common__src__System.cc
@@ -0,0 +1,10 @@
+--- 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 42ef9ca5e748..eb35165fb597 100644
--- a/x11/workrave/pkg-plist
+++ b/x11/workrave/pkg-plist
@@ -23,6 +23,8 @@ 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
+share/gnome/workrave/exercises/fist-roll-1.png
+share/gnome/workrave/exercises/fist-roll-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
@@ -55,23 +57,32 @@ share/gnome/workrave/images/workrave-icon-small.png
 share/gnome/workrave/images/workrave-quiet-icon-medium.png
 share/gnome/workrave/images/workrave-suspended-icon-medium.png
 share/gnome/workrave/images/workrave.png
-share/locale/ca/LC_MESSAGES/workrave.mo
-share/locale/cs/LC_MESSAGES/workrave.mo
-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/eu/LC_MESSAGES/workrave.mo
-share/locale/fr/LC_MESSAGES/workrave.mo
-share/locale/he/LC_MESSAGES/workrave.mo
-share/locale/lt/LC_MESSAGES/workrave.mo
-share/locale/nl/LC_MESSAGES/workrave.mo
-share/locale/no/LC_MESSAGES/workrave.mo
-share/locale/pl/LC_MESSAGES/workrave.mo
-share/locale/pt_BR/LC_MESSAGES/workrave.mo
-share/locale/ru/LC_MESSAGES/workrave.mo
-share/locale/sv/LC_MESSAGES/workrave.mo
-share/locale/zh_TW/LC_MESSAGES/workrave.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/workrave.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/workrave.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/workrave.mo
+%%NLS%%share/locale/da/LC_MESSAGES/workrave.mo
+%%NLS%%share/locale/de/LC_MESSAGES/workrave.mo
+%%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/eu/LC_MESSAGES/workrave.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/workrave.mo
+%%NLS%%share/locale/he/LC_MESSAGES/workrave.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/workrave.mo
+%%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/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/ru/LC_MESSAGES/workrave.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/workrave.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/workrave.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/workrave.mo
+%%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/gnome/workrave/images
 @dirrm share/gnome/workrave/exercises
 @dirrm share/gnome/workrave