- Update xfce4-whiskermenu-plugin to 2.2.0

- Add NLS option
- Remove PORTSCOUT limitation

3 files changed, 63 insertions, 55 deletions

diff --git a/x11/xfce4-whiskermenu-plugin/Makefile b/x11/xfce4-whiskermenu-plugin/Makefile
index 6cf80141eacb..eb18e42d83f9 100644
--- a/x11/xfce4-whiskermenu-plugin/Makefile
+++ b/x11/xfce4-whiskermenu-plugin/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-whiskermenu-plugin
-PORTVERSION=	1.7.5
+PORTVERSION=	2.2.0
 CATEGORIES=	x11 xfce
 MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
@@ -13,11 +13,17 @@ COMMENT=	Alternate menu for the Xfce Desktop
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-PORTSCOUT=	limit:^1\.7\.
+OPTIONS_DEFINE=	NLS
 
-USES=		cmake:outsource gettext localbase pkgconfig tar:bzip2 xfce
-USE_GNOME=	gtk20 cairo
+OPTIONS_SUB=	yes
+NLS_USES=	gettext-runtime
+
+USES=		cmake:outsource gettext-tools localbase pkgconfig tar:bzip2 xfce:gtk3
+USE_GNOME=	gtk30 cairo
 USE_XFCE=	panel
 INSTALLS_ICONS=	yes
 
+post-patch-NLS-off:
+	@${REINPLACE_CMD} '/add_subdirectory(po)/d' ${WRKSRC}/CMakeLists.txt
+
 .include <bsd.port.mk>
diff --git a/x11/xfce4-whiskermenu-plugin/distinfo b/x11/xfce4-whiskermenu-plugin/distinfo
index f05181fa2b4c..4d44bbb83092 100644
--- a/x11/xfce4-whiskermenu-plugin/distinfo
+++ b/x11/xfce4-whiskermenu-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514532780
-SHA256 (xfce4/xfce4-whiskermenu-plugin-1.7.5.tar.bz2) = 9b60dd29be7ce315a6a8506337bbcbfe39a401ac2beddf2a611e865cc5733de6
-SIZE (xfce4/xfce4-whiskermenu-plugin-1.7.5.tar.bz2) = 164129
+TIMESTAMP = 1526911753
+SHA256 (xfce4/xfce4-whiskermenu-plugin-2.2.0.tar.bz2) = 8f68492a38cb2d148867162adff947dd37fed162b4ef4f31910660229ef00ef1
+SIZE (xfce4/xfce4-whiskermenu-plugin-2.2.0.tar.bz2) = 168577
diff --git a/x11/xfce4-whiskermenu-plugin/pkg-plist b/x11/xfce4-whiskermenu-plugin/pkg-plist
index da7a8cdd256a..0cec9758fdd1 100644
--- a/x11/xfce4-whiskermenu-plugin/pkg-plist
+++ b/x11/xfce4-whiskermenu-plugin/pkg-plist
@@ -10,52 +10,54 @@ share/icons/hicolor/32x32/apps/xfce4-whiskermenu.png
 share/icons/hicolor/48x48/apps/xfce4-whiskermenu.png
 share/icons/hicolor/64x64/apps/xfce4-whiskermenu.png
 share/icons/hicolor/scalable/apps/xfce4-whiskermenu.svg
-share/locale/am/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/ar/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/ast/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/bg/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/ca/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/ca@valencia/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/cs/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/da/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/de/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/el/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/es/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/et/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/eu/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/fa/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/fi/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/fr/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/he/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/hr/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/hu/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/id/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/is/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/it/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/ja/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/kk/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/ko/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/lt/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/lv/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/ms/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/nb/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/ne/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/nl/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/pl/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/pt/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/ro/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/ru/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/sk/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/sl/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/sr/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/sr@latin/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/sv/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/tr/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/uk/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/uz/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/vi/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/am/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/et/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/ne/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/sr@latin/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/uz/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-whiskermenu-plugin.mo
 share/xfce4/panel/plugins/whiskermenu.desktop