- Update xfce4-taskmanager to 1.2.1

- Add GTK3 option, disabled by default since it's off by default
  in upstream configure script
- Add NLS option
- Add required INSTALLS_ICONS
- Remove patches applied upstream

5 files changed, 73 insertions, 121 deletions

diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile
index 36e9227bb1ae..e108e7c0364e 100644
--- a/x11/xfce4-taskmanager/Makefile
+++ b/x11/xfce4-taskmanager/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-taskmanager
-PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 CATEGORIES=	x11 xfce
 MASTER_SITES=	XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
@@ -15,15 +14,25 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
-	libfreetype.so:print/freetype2
+		libfreetype.so:print/freetype2
 
 GNU_CONFIGURE=	yes
-USES=		gettext gmake localbase pkgconfig tar:bzip2
-USE_GNOME=	gtk20 glib20 cairo gdkpixbuf2 intltool libwnck
+USES=		gettext-tools gmake localbase pkgconfig tar:bzip2
+USE_GNOME=	glib20 cairo gdkpixbuf2 intltool libwnck
 USE_XORG=	ice sm x11 xmu xt
+INSTALLS_ICONS=	yes
 
-CONFIGURE_ARGS+=	--disable-gksu \
-	--disable-gtk3 --disable-wnck3 \
-	--enable-wnck
+CONFIGURE_ARGS+=	--disable-silent-rules --disable-gksu \
+			--disable-wnck3 --enable-wnck
+
+OPTIONS_DEFINE=		GTK3 NLS
+OPTIONS_SUB=		yes
+
+GTK3_CONFIGURE_ENABLE=	gtk3
+GTK3_USE=		GNOME=gtk30
+GTK3_USE_OFF=		GNOME=gtk20
+
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext-runtime
 
 .include <bsd.port.mk>
diff --git a/x11/xfce4-taskmanager/distinfo b/x11/xfce4-taskmanager/distinfo
index 67862759061d..9f92767ab868 100644
--- a/x11/xfce4-taskmanager/distinfo
+++ b/x11/xfce4-taskmanager/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486910944
-SHA256 (xfce4/xfce4-taskmanager-1.2.0.tar.bz2) = 5746d473ad428b13db7c05cfcbc8099fbea13da6be26d3a9359bcb4de971ba69
-SIZE (xfce4/xfce4-taskmanager-1.2.0.tar.bz2) = 435276
+TIMESTAMP = 1528046210
+SHA256 (xfce4/xfce4-taskmanager-1.2.1.tar.bz2) = 22e523e2ee231713f40a48890d8cbae99320ac1173f7c68502f490318e1e0409
+SIZE (xfce4/xfce4-taskmanager-1.2.1.tar.bz2) = 394704
diff --git a/x11/xfce4-taskmanager/files/patch-data_icons_16x16_Makefile.in b/x11/xfce4-taskmanager/files/patch-data_icons_16x16_Makefile.in
deleted file mode 100644
index c107fe111fe2..000000000000
--- a/x11/xfce4-taskmanager/files/patch-data_icons_16x16_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/icons/16x16/Makefile.in.orig	2017-02-12 11:22:36 UTC
-+++ data/icons/16x16/Makefile.in
-@@ -336,7 +336,7 @@ target_vendor = @target_vendor@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--iconsdir = $(datadir)/icons/hicolor/16x16/apps
-+iconsdir = $(datadir)/icons/hicolor/16x16/actions
- icons_DATA = xc_crosshair.png
- EXTRA_DIST = $(icons_DATA)
- all: all-am
diff --git a/x11/xfce4-taskmanager/files/patch-src__task-manager-freebsd.c b/x11/xfce4-taskmanager/files/patch-src__task-manager-freebsd.c
deleted file mode 100644
index 8fb41538cb6f..000000000000
--- a/x11/xfce4-taskmanager/files/patch-src__task-manager-freebsd.c
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/task-manager-freebsd.c.orig	2017-01-23 06:53:01 UTC
-+++ src/task-manager-freebsd.c
-@@ -26,11 +26,11 @@
- 
- #include "task-manager.h"
- 
--gulong
-+guint64
- get_mem_by_bytes (const gchar *name)
- {
--	gulong buf;
--	gsize len = sizeof (gulong);
-+	guint64 buf = 0;
-+	gsize len = sizeof (buf);
- 
- 	if (sysctlbyname (name, &buf, &len, NULL, 0) < 0)
- 		return 0;
-@@ -41,13 +41,13 @@ get_mem_by_bytes (const gchar *name)
- guint64
- get_mem_by_pages (const gchar *name)
- {
--	gulong res;
-+	guint64 res;
- 
- 	res = get_mem_by_bytes (name);
- 	if (res > 0)
- 		res = res * getpagesize ();
- 
--	return (guint64) res;
-+	return res;
- }
- 
- gboolean
-@@ -55,10 +55,10 @@ get_memory_usage (guint64 *memory_total,
- {
- 	/* Get memory usage */
- 	{
--		*memory_total = (guint64) get_mem_by_bytes ("hw.physmem");;
-+		*memory_total = get_mem_by_bytes ("hw.physmem");;
- 		*memory_free = get_mem_by_pages ("vm.stats.vm.v_free_count");
- 		*memory_cache = get_mem_by_pages ("vm.stats.vm.v_inactive_count");
--		*memory_buffers = (guint64) get_mem_by_bytes ("vfs.bufspace");
-+		*memory_buffers = get_mem_by_bytes ("vfs.bufspace");
- 	}
- 
- 	/* Get swap usage */
diff --git a/x11/xfce4-taskmanager/pkg-plist b/x11/xfce4-taskmanager/pkg-plist
index 29c3be96d30b..1263e41f927d 100644
--- a/x11/xfce4-taskmanager/pkg-plist
+++ b/x11/xfce4-taskmanager/pkg-plist
@@ -3,56 +3,56 @@ share/applications/xfce4-taskmanager.desktop
 share/icons/hicolor/16x16/actions/xc_crosshair.png
 share/icons/hicolor/24x24/actions/xc_crosshair.png
 share/icons/hicolor/scalable/actions/xc_crosshair.svg
-share/locale/ar/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/ast/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/be/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/bg/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/ca/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/cs/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/da/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/de/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/el/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/en_AU/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/es/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/eu/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/fi/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/fr/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/gl/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/he/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/hr/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/hu/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/id/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/is/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/it/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/ja/LC_MESSAGES/xfce4-taskmanager.mo
-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
-share/locale/pa/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/pl/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/pt/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/ru/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/si/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/sk/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/sl/LC_MESSAGES/xfce4-taskmanager.mo
-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
-share/locale/ur/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/ur_PK/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/vi/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/zh_HK/LC_MESSAGES/xfce4-taskmanager.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/si/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/te/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/xfce4-taskmanager.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-taskmanager.mo