Update to 2.5

4 files changed, 53 insertions, 17 deletions

diff --git a/x11-themes/numix-theme/Makefile b/x11-themes/numix-theme/Makefile
index 7e2781509c09..97758965359e 100644
--- a/x11-themes/numix-theme/Makefile
+++ b/x11-themes/numix-theme/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	numix
-PORTVERSION=	2.2.3
+PORTVERSION=	2.5
 CATEGORIES=	x11-themes xfce
 MASTER_SITES=	GH GHC
 PKGNAMESUFFIX=	-theme
@@ -17,7 +17,7 @@ RUN_DEPENDS=	gtk-murrine-engine>=0.98.1:${PORTSDIR}/x11-themes/gtk-murrine-engin
 GH_ACCOUNT=	shimmerproject
 GH_PROJECT=	Numix
 GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	3160668
+GH_COMMIT=	09c071e
 
 USE_GITHUB=	yes
 NO_BUILD=	yes
diff --git a/x11-themes/numix-theme/distinfo b/x11-themes/numix-theme/distinfo
index aedef5e52813..130652c66eb9 100644
--- a/x11-themes/numix-theme/distinfo
+++ b/x11-themes/numix-theme/distinfo
@@ -1,2 +1,2 @@
-SHA256 (numix-2.2.3.tar.gz) = 2ae633798f63a22724b57aec66d9df6aa05a4cd498e48209e88bd7b4396e98c2
-SIZE (numix-2.2.3.tar.gz) = 64915
+SHA256 (numix-2.5.tar.gz) = a639d7947c122e5609cf844b9f55ee795fdc1a5e5359a88e1d42ca77cfafb2ca
+SIZE (numix-2.5.tar.gz) = 73393
diff --git a/x11-themes/numix-theme/files/patch-gtk-2.0__gtkrc b/x11-themes/numix-theme/files/patch-gtk-2.0__gtkrc
index aae6b69c4dd9..aa5b0480c6fb 100644
--- a/x11-themes/numix-theme/files/patch-gtk-2.0__gtkrc
+++ b/x11-themes/numix-theme/files/patch-gtk-2.0__gtkrc
@@ -1,11 +1,11 @@
---- ./gtk-2.0/gtkrc.orig	2013-09-17 08:29:50.000000000 +0000
-+++ ./gtk-2.0/gtkrc	2013-10-21 17:09:22.000000000 +0000
-@@ -528,7 +528,7 @@
- 
+--- gtk-2.0/gtkrc.orig	2014-12-28 15:41:06 UTC
++++ gtk-2.0/gtkrc
+@@ -530,7 +530,7 @@ style "xfdesktop-icon-view" {
  style "xfwm-tabwin" {
- 	Xfwm4TabwinWidget::border-width = 0
+ 	Xfwm4TabwinWidget::border-width = 1
+         Xfwm4TabwinWidget::border-alpha = 1.0
 -	Xfwm4TabwinWidget::icon-size = 64
 +	#Xfwm4TabwinWidget::icon-size = 64
+         Xfwm4TabwinWidget::alpha = 1.0
+         Xfwm4TabwinWidget::border-radius = 2
  
- 	bg[NORMAL] = @menu_bg_color
- 	fg[NORMAL] = @menu_fg_color
diff --git a/x11-themes/numix-theme/pkg-plist b/x11-themes/numix-theme/pkg-plist
index 141a118ff3ff..b17bc6d59b32 100644
--- a/x11-themes/numix-theme/pkg-plist
+++ b/x11-themes/numix-theme/pkg-plist
@@ -6,11 +6,53 @@ share/themes/Numix/gtk-3.0/apps/nemo.css
 share/themes/Numix/gtk-3.0/apps/synaptic.css
 share/themes/Numix/gtk-3.0/apps/unity.css
 share/themes/Numix/gtk-3.0/apps/xfce.css
+share/themes/Numix/gtk-3.0/assets/checkbox-checked-dark.svg
+share/themes/Numix/gtk-3.0/assets/checkbox-checked-insensitive-dark.svg
+share/themes/Numix/gtk-3.0/assets/checkbox-checked-insensitive.svg
+share/themes/Numix/gtk-3.0/assets/checkbox-checked.svg
+share/themes/Numix/gtk-3.0/assets/checkbox-mixed-dark.svg
+share/themes/Numix/gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg
+share/themes/Numix/gtk-3.0/assets/checkbox-mixed-insensitive.svg
+share/themes/Numix/gtk-3.0/assets/checkbox-mixed.svg
+share/themes/Numix/gtk-3.0/assets/checkbox-unchecked-dark.svg
+share/themes/Numix/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg
+share/themes/Numix/gtk-3.0/assets/checkbox-unchecked-insensitive.svg
+share/themes/Numix/gtk-3.0/assets/checkbox-unchecked.svg
+share/themes/Numix/gtk-3.0/assets/grid-selection-checked-dark.svg
+share/themes/Numix/gtk-3.0/assets/grid-selection-checked.svg
+share/themes/Numix/gtk-3.0/assets/grid-selection-unchecked-dark.svg
+share/themes/Numix/gtk-3.0/assets/grid-selection-unchecked.svg
+share/themes/Numix/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg
+share/themes/Numix/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
+share/themes/Numix/gtk-3.0/assets/menuitem-checkbox-checked.svg
+share/themes/Numix/gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg
+share/themes/Numix/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
+share/themes/Numix/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg
+share/themes/Numix/gtk-3.0/assets/menuitem-checkbox-mixed.svg
+share/themes/Numix/gtk-3.0/assets/menuitem-radio-checked-hover.svg
+share/themes/Numix/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg
+share/themes/Numix/gtk-3.0/assets/menuitem-radio-checked.svg
+share/themes/Numix/gtk-3.0/assets/pane-handle-vertical.svg
+share/themes/Numix/gtk-3.0/assets/pane-handle.svg
+share/themes/Numix/gtk-3.0/assets/radio-mixed-dark.svg
+share/themes/Numix/gtk-3.0/assets/radio-mixed-insensitive-dark.svg
+share/themes/Numix/gtk-3.0/assets/radio-mixed-insensitive.svg
+share/themes/Numix/gtk-3.0/assets/radio-mixed.svg
+share/themes/Numix/gtk-3.0/assets/radio-selected-dark.svg
+share/themes/Numix/gtk-3.0/assets/radio-selected-insensitive-dark.svg
+share/themes/Numix/gtk-3.0/assets/radio-selected-insensitive.svg
+share/themes/Numix/gtk-3.0/assets/radio-selected.svg
+share/themes/Numix/gtk-3.0/assets/radio-unselected-dark.svg
+share/themes/Numix/gtk-3.0/assets/radio-unselected-insensitive-dark.svg
+share/themes/Numix/gtk-3.0/assets/radio-unselected-insensitive.svg
+share/themes/Numix/gtk-3.0/assets/radio-unselected.svg
 share/themes/Numix/gtk-3.0/gtk-dark.css
+share/themes/Numix/gtk-3.0/gtk-widgets-assets-dark.css
 share/themes/Numix/gtk-3.0/gtk-widgets-assets.css
 share/themes/Numix/gtk-3.0/gtk-widgets.css
 share/themes/Numix/gtk-3.0/gtk.css
 share/themes/Numix/gtk-3.0/settings.ini
+share/themes/Numix/gtk-3.0/thumbnail.png
 %%NOTIFYD%%share/themes/Numix/xfce-notify-4.0/gtkrc
 share/themes/Numix/xfwm4/bottom-active.xpm
 share/themes/Numix/xfwm4/bottom-inactive.xpm
@@ -81,9 +123,3 @@ share/themes/Numix/xfwm4/top-left-active.xpm
 share/themes/Numix/xfwm4/top-left-inactive.xpm
 share/themes/Numix/xfwm4/top-right-active.xpm
 share/themes/Numix/xfwm4/top-right-inactive.xpm
-@dirrm share/themes/Numix/xfwm4
-%%NOTIFYD%%@dirrm share/themes/Numix/xfce-notify-4.0
-@dirrm share/themes/Numix/gtk-3.0/apps
-@dirrm share/themes/Numix/gtk-3.0
-@dirrm share/themes/Numix/gtk-2.0
-@dirrm share/themes/Numix