- Update x11/tint to 15.2

- Fix portlint warnings about variable ordering
- While here sort plist

PR:		222725
Submitted by:	yamagi@yamagi.org (maintainer)

3 files changed, 41 insertions, 56 deletions

diff --git a/x11/tint/Makefile b/x11/tint/Makefile
index 1fdfc120a7c1..431afb7366ae 100644
--- a/x11/tint/Makefile
+++ b/x11/tint/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	tint2
-PORTVERSION=	0.14.5
+PORTVERSION=	15.2
 CATEGORIES=	x11
 
 MAINTAINER=	yamagi@yamagi.org
@@ -10,14 +10,15 @@ COMMENT=	Lightweight freedesktop-compliant panel/taskbar/systray/clock
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BROKEN_powerpc64=	fails to build: area.h: redefinition of typedef 'Area'
+
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libImlib2.so:graphics/imlib2 \
 		libstartup-notification-1.so:x11/startup-notification
 
-BROKEN_powerpc64=	fails to build: area.h: redefinition of typedef 'Area'
-
-USES=		alias cmake:outsource pkgconfig
+USES=		alias cmake:outsource desktop-file-utils pkgconfig \
+		shared-mime-info
 USE_GNOME=	cairo glib20 gtk20 librsvg2 pango
 USE_XORG=	x11 xcomposite xdamage xfixes xinerama xrandr xrender
 INSTALLS_ICONS=	yes
diff --git a/x11/tint/distinfo b/x11/tint/distinfo
index d5b94b8899b6..1551157d69bf 100644
--- a/x11/tint/distinfo
+++ b/x11/tint/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495716954
-SHA256 (o9000-tint2-0.14.5_GH0.tar.gz) = 73a232a3fbb08e18cca60dffda1c7f66bfb5e7a3415153f460a1b66a1f3985aa
-SIZE (o9000-tint2-0.14.5_GH0.tar.gz) = 465344
+TIMESTAMP = 1506888530
+SHA256 (o9000-tint2-15.2_GH0.tar.gz) = b9d9c9a138184728e52a985da799e4caba707093be3d8364e4399b0576b6bb25
+SIZE (o9000-tint2-15.2_GH0.tar.gz) = 499583
diff --git a/x11/tint/pkg-plist b/x11/tint/pkg-plist
index e8993851afd2..9de14c24f565 100644
--- a/x11/tint/pkg-plist
+++ b/x11/tint/pkg-plist
@@ -1,53 +1,37 @@
-share/mime/packages/tint2conf.xml
-share/icons/hicolor/scalable/apps/tint2conf.svg
-share/icons/hicolor/scalable/apps/tint2.svg
-share/applications/tint2conf.desktop
-share/applications/tint2.desktop
-man/man1/tint2.1.gz
-etc/xdg/tint2/tint2rc
-bin/tint2conf
 bin/tint2
-@dir etc/xdg/tint2
-@dir etc/xdg
-%%PORTDOCS%%%%DOCSDIR%%/tint2.md
-%%PORTDOCS%%%%DOCSDIR%%/html/readme.html
-%%PORTDOCS%%%%DOCSDIR%%/html/manual.html
-%%PORTDOCS%%%%DOCSDIR%%/html/images/taskbar_padding.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/task_padding.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/panel_size_margin.jpg
-%%PORTDOCS%%%%DOCSDIR%%/html/images/panel_padding.jpg
-%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+bin/tint2conf
+etc/xdg/tint2/tint2rc
+man/man1/tint2.1.gz
+share/applications/tint2.desktop
+share/applications/tint2conf.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%NLS%%share/locale/sr/LC_MESSAGES/tint2conf.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/tint2conf.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/tint2conf.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/tint2conf.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/tint2conf.mo
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/html/images/panel_padding.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/panel_size_margin.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/task_padding.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/taskbar_padding.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/html/readme.html
+%%PORTDOCS%%%%DOCSDIR%%/tint2.md
+share/icons/hicolor/scalable/apps/tint2.svg
+share/icons/hicolor/scalable/apps/tint2conf.svg
 %%NLS%%share/locale/bs/LC_MESSAGES/tint2conf.mo
-%%DATADIR%%/vertical-neutral-icons.tint2rc
-%%DATADIR%%/vertical-light-transparent.tint2rc
-%%DATADIR%%/vertical-light-opaque.tint2rc
-%%DATADIR%%/vertical-dark-transparent.tint2rc
-%%DATADIR%%/vertical-dark-opaque.tint2rc
-%%DATADIR%%/text_only_6.tint2rc
-%%DATADIR%%/text_only_5.tint2rc
-%%DATADIR%%/text_only_4.tint2rc
-%%DATADIR%%/text_only_3.tint2rc
-%%DATADIR%%/text_only_2.tint2rc
-%%DATADIR%%/text_only_1.tint2rc
-%%DATADIR%%/icon_only_7.tint2rc
-%%DATADIR%%/icon_only_6.tint2rc
-%%DATADIR%%/icon_only_4.tint2rc
-%%DATADIR%%/icon_only_3.tint2rc
-%%DATADIR%%/icon_only_2.tint2rc
-%%DATADIR%%/icon_only_1.tint2rc
-%%DATADIR%%/icon_and_text_4.tint2rc
-%%DATADIR%%/icon_and_text_3.tint2rc
-%%DATADIR%%/icon_and_text_2.tint2rc
-%%DATADIR%%/icon_and_text_1.tint2rc
-%%DATADIR%%/horizontal-light-transparent.tint2rc
-%%DATADIR%%/horizontal-light-opaque.tint2rc
-%%DATADIR%%/horizontal-dark-transparent.tint2rc
-%%DATADIR%%/horizontal-dark-opaque.tint2rc
+%%NLS%%share/locale/fr/LC_MESSAGES/tint2conf.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/tint2conf.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/tint2conf.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/tint2conf.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/tint2conf.mo
+share/mime/packages/tint2conf.xml
 %%DATADIR%%/default_icon.png
+%%DATADIR%%/horizontal-dark-opaque.tint2rc
+%%DATADIR%%/horizontal-dark-transparent.tint2rc
+%%DATADIR%%/horizontal-icon-only.tint2rc
+%%DATADIR%%/horizontal-light-opaque.tint2rc
+%%DATADIR%%/horizontal-light-transparent.tint2rc
+%%DATADIR%%/horizontal-text-only.tint2rc
+%%DATADIR%%/vertical-dark-opaque.tint2rc
+%%DATADIR%%/vertical-dark-transparent.tint2rc
+%%DATADIR%%/vertical-light-opaque.tint2rc
+%%DATADIR%%/vertical-light-transparent.tint2rc
+%%DATADIR%%/vertical-neutral-icons.tint2rc