- Update to 1.1.0

- Add GTK3 and GTK2 (set by default) options
- Remove unneeded patch

4 files changed, 17 insertions, 18 deletions

diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile
index ac970479852e..c39b153898ca 100644
--- a/x11/xfce4-taskmanager/Makefile
+++ b/x11/xfce4-taskmanager/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-taskmanager
-PORTVERSION=	1.0.1
+PORTVERSION=	1.1.0
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
@@ -16,10 +16,19 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake pkgconfig tar:bzip2
-USE_GNOME=	gtk20 cairo libwnck intltool intlhack
+USE_GNOME=	glib20 cairo intltool intlhack
 
-CONFIGURE_ARGS=	--enable-wnck \
-	--disable-gksu
+OPTIONS_SINGLE=	GTK
+OPTIONS_SINGLE_GTK=	GTK2 GTK3
+OPTIONS_DEFAULT=	GTK2
+
+GTK2_USE=	GNOME=gtk20 libwnck
+GTK2_CONFIGURE_ON=	--enable-wnck --disable-wnck3
+GTK3_USE=	GNOME=gtk30 libwnck3
+GTK3_CONFIGURE_ON=	--enable-gtk3 --enable-wnck3 --disable-wnck
+
+
+CONFIGURE_ARGS=	--disable-gksu
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|prefix)/$$(DATADIRNAME)|datadir)|' \
diff --git a/x11/xfce4-taskmanager/distinfo b/x11/xfce4-taskmanager/distinfo
index f21f0329d882..be5c4b967bde 100644
--- a/x11/xfce4-taskmanager/distinfo
+++ b/x11/xfce4-taskmanager/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-taskmanager-1.0.1.tar.bz2) = f5aa2796dd9971f8ae400238bfcdd9fa1322dba1466d1e6fd5bf8ee7e88bee86
-SIZE (xfce4/xfce4-taskmanager-1.0.1.tar.bz2) = 368495
+SHA256 (xfce4/xfce4-taskmanager-1.1.0.tar.bz2) = 2e1eb161f966cbfbd68bd029fb59115bc5ab0c0704cb500d20e7d73967e59ecb
+SIZE (xfce4/xfce4-taskmanager-1.1.0.tar.bz2) = 365866
diff --git a/x11/xfce4-taskmanager/files/patch-task-manager-freebsd.c b/x11/xfce4-taskmanager/files/patch-task-manager-freebsd.c
deleted file mode 100644
index 4f5d20720e53..000000000000
--- a/x11/xfce4-taskmanager/files/patch-task-manager-freebsd.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/task-manager-freebsd.c.orig	2010-05-21 06:29:33.000000000 -0700
-+++ src/task-manager-freebsd.c	2011-10-27 12:42:24.425260800 -0700
-@@ -18,6 +18,9 @@
- #include <fcntl.h>
- #include <paths.h>
- #include <unistd.h>
-+#if defined(__FreeBSD_version) && __FreeBSD_version >= 900030
-+#include <sys/vmmeter.h>
-+#endif
- 
- #include <glib.h>
- 
diff --git a/x11/xfce4-taskmanager/pkg-plist b/x11/xfce4-taskmanager/pkg-plist
index eccf9cc054f9..29c1f9d9b209 100644
--- a/x11/xfce4-taskmanager/pkg-plist
+++ b/x11/xfce4-taskmanager/pkg-plist
@@ -27,6 +27,7 @@ share/locale/kk/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/ko/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/lv/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/lt/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/ms/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/nb/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/nl/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/oc/LC_MESSAGES/xfce4-taskmanager.mo
@@ -42,6 +43,7 @@ share/locale/sq/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/sr/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/sv/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/te/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/th/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/tr/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/ug/LC_MESSAGES/xfce4-taskmanager.mo
 share/locale/uk/LC_MESSAGES/xfce4-taskmanager.mo