4 files changed, 94 insertions, 93 deletions

diff --git a/x11-themes/numix-theme/Makefile b/x11-themes/numix-theme/Makefile
index dfdfc82cac7e..537cc07fb604 100644
--- a/x11-themes/numix-theme/Makefile
+++ b/x11-themes/numix-theme/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	numix
-PORTVERSION=	2.6.2
+PORTVERSION=	2.6.4
 CATEGORIES=	x11-themes xfce
 PKGNAMESUFFIX=	-theme
 
@@ -29,19 +29,21 @@ OPTIONS_SUB=	yes
 
 post-patch:
 # Remove .orig files
-	@${RM} ${WRKSRC}/gtk-?.0/*.orig
+	@${RM} ${WRKSRC}/src/gtk-?.0/*.orig
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/themes/Numix
-.for dir in gtk-2.0 gtk-3.0 gtk-3.20 metacity-1 openbox-3 xfwm4
-	@cd ${WRKSRC} && \
+.for dir in assets gtk-2.0 gtk-3.0 gtk-3.20 metacity-1 openbox-3 xfwm4
+	@cd ${WRKSRC}/src && \
 		${COPYTREE_SHARE} ${dir} \
 		${STAGEDIR}${PREFIX}/share/themes/Numix \
-		"! -path *scss*"
+		"! -name thumbnail.png ! -path *scss*"
 .endfor
+	${INSTALL_DATA} ${WRKSRC}/src/index.theme \
+		${STAGEDIR}${PREFIX}/share/themes/Numix
 
 do-install-NOTIFYD-on:
-	@cd ${WRKSRC} && \
+	@cd ${WRKSRC}/src && \
 		${COPYTREE_SHARE} xfce-notify-4.0 \
 		${STAGEDIR}${PREFIX}/share/themes/Numix
 
diff --git a/x11-themes/numix-theme/distinfo b/x11-themes/numix-theme/distinfo
index a821d265fb76..db4ca590aea6 100644
--- a/x11-themes/numix-theme/distinfo
+++ b/x11-themes/numix-theme/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1474362411
-SHA256 (numixproject-numix-gtk-theme-2.6.2_GH0.tar.gz) = 383a4df7c35355b51fc8a35ee5bd7393f17f54f9e75da9e704d852e620850854
-SIZE (numixproject-numix-gtk-theme-2.6.2_GH0.tar.gz) = 117767
+TIMESTAMP = 1474706338
+SHA256 (numixproject-numix-gtk-theme-2.6.4_GH0.tar.gz) = f70cad6608d9a1b4819eaf6b51fc03d5c75971ff8f08080ac2eb9a5d8e386e6f
+SIZE (numixproject-numix-gtk-theme-2.6.4_GH0.tar.gz) = 118306
diff --git a/x11-themes/numix-theme/files/patch-gtk-2.0__gtkrc b/x11-themes/numix-theme/files/patch-src_gtk-2.0_gtkrc
index aa5b0480c6fb..c167831171aa 100644
--- a/x11-themes/numix-theme/files/patch-gtk-2.0__gtkrc
+++ b/x11-themes/numix-theme/files/patch-src_gtk-2.0_gtkrc
@@ -1,6 +1,6 @@
---- gtk-2.0/gtkrc.orig	2014-12-28 15:41:06 UTC
-+++ gtk-2.0/gtkrc
-@@ -530,7 +530,7 @@ style "xfdesktop-icon-view" {
+--- src/gtk-2.0/gtkrc.orig	2016-09-22 03:11:27 UTC
++++ src/gtk-2.0/gtkrc
+@@ -536,7 +536,7 @@ style "xfdesktop-icon-view" {
  style "xfwm-tabwin" {
  	Xfwm4TabwinWidget::border-width = 1
          Xfwm4TabwinWidget::border-alpha = 1.0
diff --git a/x11-themes/numix-theme/pkg-plist b/x11-themes/numix-theme/pkg-plist
index 44df501d7aff..0c3ef4e61f2f 100644
--- a/x11-themes/numix-theme/pkg-plist
+++ b/x11-themes/numix-theme/pkg-plist
@@ -1,89 +1,89 @@
+share/themes/Numix/assets/checkbox-checked-dark.png
+share/themes/Numix/assets/checkbox-checked-dark.svg
+share/themes/Numix/assets/checkbox-checked-insensitive-dark.png
+share/themes/Numix/assets/checkbox-checked-insensitive-dark.svg
+share/themes/Numix/assets/checkbox-checked-insensitive.png
+share/themes/Numix/assets/checkbox-checked-insensitive.svg
+share/themes/Numix/assets/checkbox-checked.png
+share/themes/Numix/assets/checkbox-checked.svg
+share/themes/Numix/assets/checkbox-mixed-dark.png
+share/themes/Numix/assets/checkbox-mixed-dark.svg
+share/themes/Numix/assets/checkbox-mixed-insensitive-dark.png
+share/themes/Numix/assets/checkbox-mixed-insensitive-dark.svg
+share/themes/Numix/assets/checkbox-mixed-insensitive.png
+share/themes/Numix/assets/checkbox-mixed-insensitive.svg
+share/themes/Numix/assets/checkbox-mixed.png
+share/themes/Numix/assets/checkbox-mixed.svg
+share/themes/Numix/assets/checkbox-unchecked-dark.png
+share/themes/Numix/assets/checkbox-unchecked-dark.svg
+share/themes/Numix/assets/checkbox-unchecked-insensitive-dark.png
+share/themes/Numix/assets/checkbox-unchecked-insensitive-dark.svg
+share/themes/Numix/assets/checkbox-unchecked-insensitive.png
+share/themes/Numix/assets/checkbox-unchecked-insensitive.svg
+share/themes/Numix/assets/checkbox-unchecked.png
+share/themes/Numix/assets/checkbox-unchecked.svg
+share/themes/Numix/assets/grid-selection-checked-dark.png
+share/themes/Numix/assets/grid-selection-checked-dark.svg
+share/themes/Numix/assets/grid-selection-checked.png
+share/themes/Numix/assets/grid-selection-checked.svg
+share/themes/Numix/assets/grid-selection-unchecked-dark.png
+share/themes/Numix/assets/grid-selection-unchecked-dark.svg
+share/themes/Numix/assets/grid-selection-unchecked.png
+share/themes/Numix/assets/grid-selection-unchecked.svg
+share/themes/Numix/assets/menuitem-checkbox-checked-hover.png
+share/themes/Numix/assets/menuitem-checkbox-checked-hover.svg
+share/themes/Numix/assets/menuitem-checkbox-checked-insensitive.png
+share/themes/Numix/assets/menuitem-checkbox-checked-insensitive.svg
+share/themes/Numix/assets/menuitem-checkbox-checked.png
+share/themes/Numix/assets/menuitem-checkbox-checked.svg
+share/themes/Numix/assets/menuitem-checkbox-mixed-hover.png
+share/themes/Numix/assets/menuitem-checkbox-mixed-hover.svg
+share/themes/Numix/assets/menuitem-checkbox-mixed-insensitive.png
+share/themes/Numix/assets/menuitem-checkbox-mixed-insensitive.svg
+share/themes/Numix/assets/menuitem-checkbox-mixed-selected.svg
+share/themes/Numix/assets/menuitem-checkbox-mixed.png
+share/themes/Numix/assets/menuitem-checkbox-mixed.svg
+share/themes/Numix/assets/menuitem-radio-checked-hover.png
+share/themes/Numix/assets/menuitem-radio-checked-hover.svg
+share/themes/Numix/assets/menuitem-radio-checked-insensitive.png
+share/themes/Numix/assets/menuitem-radio-checked-insensitive.svg
+share/themes/Numix/assets/menuitem-radio-checked.png
+share/themes/Numix/assets/menuitem-radio-checked.svg
+share/themes/Numix/assets/pane-handle-vertical.svg
+share/themes/Numix/assets/pane-handle.png
+share/themes/Numix/assets/pane-handle.svg
+share/themes/Numix/assets/radio-checked-dark.png
+share/themes/Numix/assets/radio-checked-insensitive-dark.png
+share/themes/Numix/assets/radio-checked-insensitive.png
+share/themes/Numix/assets/radio-checked.png
+share/themes/Numix/assets/radio-mixed-dark.png
+share/themes/Numix/assets/radio-mixed-dark.svg
+share/themes/Numix/assets/radio-mixed-insensitive-dark.png
+share/themes/Numix/assets/radio-mixed-insensitive-dark.svg
+share/themes/Numix/assets/radio-mixed-insensitive.png
+share/themes/Numix/assets/radio-mixed-insensitive.svg
+share/themes/Numix/assets/radio-mixed.png
+share/themes/Numix/assets/radio-mixed.svg
+share/themes/Numix/assets/radio-selected-dark.svg
+share/themes/Numix/assets/radio-selected-insensitive-dark.svg
+share/themes/Numix/assets/radio-selected-insensitive.svg
+share/themes/Numix/assets/radio-selected.svg
+share/themes/Numix/assets/radio-unchecked-dark.png
+share/themes/Numix/assets/radio-unchecked-insensitive-dark.png
+share/themes/Numix/assets/radio-unchecked-insensitive.png
+share/themes/Numix/assets/radio-unchecked.png
+share/themes/Numix/assets/radio-unselected-dark.svg
+share/themes/Numix/assets/radio-unselected-insensitive-dark.svg
+share/themes/Numix/assets/radio-unselected-insensitive.svg
+share/themes/Numix/assets/radio-unselected.svg
 share/themes/Numix/gtk-2.0/gtkrc
-share/themes/Numix/gtk-3.0/assets/checkbox-checked-dark.png
-share/themes/Numix/gtk-3.0/assets/checkbox-checked-dark.svg
-share/themes/Numix/gtk-3.0/assets/checkbox-checked-insensitive-dark.png
-share/themes/Numix/gtk-3.0/assets/checkbox-checked-insensitive-dark.svg
-share/themes/Numix/gtk-3.0/assets/checkbox-checked-insensitive.png
-share/themes/Numix/gtk-3.0/assets/checkbox-checked-insensitive.svg
-share/themes/Numix/gtk-3.0/assets/checkbox-checked.png
-share/themes/Numix/gtk-3.0/assets/checkbox-checked.svg
-share/themes/Numix/gtk-3.0/assets/checkbox-mixed-dark.png
-share/themes/Numix/gtk-3.0/assets/checkbox-mixed-dark.svg
-share/themes/Numix/gtk-3.0/assets/checkbox-mixed-insensitive-dark.png
-share/themes/Numix/gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg
-share/themes/Numix/gtk-3.0/assets/checkbox-mixed-insensitive.png
-share/themes/Numix/gtk-3.0/assets/checkbox-mixed-insensitive.svg
-share/themes/Numix/gtk-3.0/assets/checkbox-mixed.png
-share/themes/Numix/gtk-3.0/assets/checkbox-mixed.svg
-share/themes/Numix/gtk-3.0/assets/checkbox-unchecked-dark.png
-share/themes/Numix/gtk-3.0/assets/checkbox-unchecked-dark.svg
-share/themes/Numix/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.png
-share/themes/Numix/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg
-share/themes/Numix/gtk-3.0/assets/checkbox-unchecked-insensitive.png
-share/themes/Numix/gtk-3.0/assets/checkbox-unchecked-insensitive.svg
-share/themes/Numix/gtk-3.0/assets/checkbox-unchecked.png
-share/themes/Numix/gtk-3.0/assets/checkbox-unchecked.svg
-share/themes/Numix/gtk-3.0/assets/grid-selection-checked-dark.png
-share/themes/Numix/gtk-3.0/assets/grid-selection-checked-dark.svg
-share/themes/Numix/gtk-3.0/assets/grid-selection-checked.png
-share/themes/Numix/gtk-3.0/assets/grid-selection-checked.svg
-share/themes/Numix/gtk-3.0/assets/grid-selection-unchecked-dark.png
-share/themes/Numix/gtk-3.0/assets/grid-selection-unchecked-dark.svg
-share/themes/Numix/gtk-3.0/assets/grid-selection-unchecked.png
-share/themes/Numix/gtk-3.0/assets/grid-selection-unchecked.svg
-share/themes/Numix/gtk-3.0/assets/menuitem-checkbox-checked-hover.png
-share/themes/Numix/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg
-share/themes/Numix/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.png
-share/themes/Numix/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
-share/themes/Numix/gtk-3.0/assets/menuitem-checkbox-checked.png
-share/themes/Numix/gtk-3.0/assets/menuitem-checkbox-checked.svg
-share/themes/Numix/gtk-3.0/assets/menuitem-checkbox-mixed-hover.png
-share/themes/Numix/gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg
-share/themes/Numix/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.png
-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.png
-share/themes/Numix/gtk-3.0/assets/menuitem-checkbox-mixed.svg
-share/themes/Numix/gtk-3.0/assets/menuitem-radio-checked-hover.png
-share/themes/Numix/gtk-3.0/assets/menuitem-radio-checked-hover.svg
-share/themes/Numix/gtk-3.0/assets/menuitem-radio-checked-insensitive.png
-share/themes/Numix/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg
-share/themes/Numix/gtk-3.0/assets/menuitem-radio-checked.png
-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.png
-share/themes/Numix/gtk-3.0/assets/pane-handle.svg
-share/themes/Numix/gtk-3.0/assets/radio-checked-dark.png
-share/themes/Numix/gtk-3.0/assets/radio-checked-insensitive-dark.png
-share/themes/Numix/gtk-3.0/assets/radio-checked-insensitive.png
-share/themes/Numix/gtk-3.0/assets/radio-checked.png
-share/themes/Numix/gtk-3.0/assets/radio-mixed-dark.png
-share/themes/Numix/gtk-3.0/assets/radio-mixed-dark.svg
-share/themes/Numix/gtk-3.0/assets/radio-mixed-insensitive-dark.png
-share/themes/Numix/gtk-3.0/assets/radio-mixed-insensitive-dark.svg
-share/themes/Numix/gtk-3.0/assets/radio-mixed-insensitive.png
-share/themes/Numix/gtk-3.0/assets/radio-mixed-insensitive.svg
-share/themes/Numix/gtk-3.0/assets/radio-mixed.png
-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-unchecked-dark.png
-share/themes/Numix/gtk-3.0/assets/radio-unchecked-insensitive-dark.png
-share/themes/Numix/gtk-3.0/assets/radio-unchecked-insensitive.png
-share/themes/Numix/gtk-3.0/assets/radio-unchecked.png
-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/assets
 share/themes/Numix/gtk-3.0/dist/gtk-dark.css
 share/themes/Numix/gtk-3.0/dist/gtk.css
 share/themes/Numix/gtk-3.0/gtk-dark.css
 share/themes/Numix/gtk-3.0/gtk.css
 share/themes/Numix/gtk-3.0/gtk.gresource
 share/themes/Numix/gtk-3.0/gtk.gresource.xml
-share/themes/Numix/gtk-3.0/thumbnail.png
 share/themes/Numix/gtk-3.20/assets
 share/themes/Numix/gtk-3.20/dist/gtk-dark.css
 share/themes/Numix/gtk-3.20/dist/gtk.css
@@ -91,10 +91,9 @@ share/themes/Numix/gtk-3.20/gtk-dark.css
 share/themes/Numix/gtk-3.20/gtk.css
 share/themes/Numix/gtk-3.20/gtk.gresource
 share/themes/Numix/gtk-3.20/gtk.gresource.xml
-share/themes/Numix/gtk-3.20/thumbnail.png
+share/themes/Numix/index.theme
 share/themes/Numix/metacity-1/metacity-theme-2.xml
 share/themes/Numix/metacity-1/metacity-theme-3.xml
-share/themes/Numix/metacity-1/thumbnail.png
 share/themes/Numix/openbox-3/close.xbm
 share/themes/Numix/openbox-3/desk.xbm
 share/themes/Numix/openbox-3/desk_toggled.xbm