CVS commit: pkgsrc/meta-pkgs

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Wed Sep  2 04:08:11 UTC 2020

Modified Files:
        pkgsrc/meta-pkgs/xfce4: Makefile
        pkgsrc/meta-pkgs/xfce4-extras: Makefile

Log Message:
xfce4 & xfce4-extras: move gnome-themes-standard to extras

gnome-themes-standard isn't strictly necessary for a minimal Xfce
installation. Now that its dependency librsvg can involve a more
complex chain (which e.g. caused a breakage observed in 32-bit ARM
bulk builds), make it an extra.


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 pkgsrc/meta-pkgs/xfce4/Makefile
cvs rdiff -u -r1.84 -r1.85 pkgsrc/meta-pkgs/xfce4-extras/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/meta-pkgs/xfce4/Makefile
diff -u pkgsrc/meta-pkgs/xfce4/Makefile:1.100 pkgsrc/meta-pkgs/xfce4/Makefile:1.101
--- pkgsrc/meta-pkgs/xfce4/Makefile:1.100       Mon Aug 31 18:10:19 2020
+++ pkgsrc/meta-pkgs/xfce4/Makefile     Wed Sep  2 04:08:11 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.100 2020/08/31 18:10:19 wiz Exp $
+# $NetBSD: Makefile,v 1.101 2020/09/02 04:08:11 gutteridge Exp $
 
 META_PACKAGE=  yes
 
-PKGREVISION= 4
+PKGREVISION= 5
 .include "Makefile.common"
 
 DISTNAME=      xfce4-${XFCE4_VERSION}
@@ -25,7 +25,6 @@ DEPENDS+=     xfce4-wm-themes>=4.10.0:../../
 DEPENDS+=      xfce4-xarchiver>=0.5.4:../../sysutils/xfce4-xarchiver
 DEPENDS+=      elementary-xfce-icon-theme>=0.5:../../graphics/elementary-xfce-icon-theme
 DEPENDS+=      xdg-utils-[0-9]*:../../misc/xdg-utils
-DEPENDS+=      gnome-themes-standard>=3.20.2:../../graphics/gnome-themes-standard
 
 pre-extract:
        ${MKDIR} ${WRKSRC}

Index: pkgsrc/meta-pkgs/xfce4-extras/Makefile
diff -u pkgsrc/meta-pkgs/xfce4-extras/Makefile:1.84 pkgsrc/meta-pkgs/xfce4-extras/Makefile:1.85
--- pkgsrc/meta-pkgs/xfce4-extras/Makefile:1.84 Mon Aug 31 18:10:19 2020
+++ pkgsrc/meta-pkgs/xfce4-extras/Makefile      Wed Sep  2 04:08:11 2020
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.84 2020/08/31 18:10:19 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2020/09/02 04:08:11 gutteridge Exp $
 
 META_PACKAGE=  yes
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-PKGREVISION=   5
+PKGREVISION=   6
 DISTNAME=      xfce4-extras-${XFCE4_VERSION}
 CATEGORIES=    meta-pkgs
 COMMENT=       Xfce extras
@@ -52,6 +52,9 @@ DEPENDS+=     xfce4-thunar-archive-plugin>=0
 DEPENDS+=      xfce4-thunar-media-tags-plugin>=0.2.1:../../multimedia/xfce4-thunar-media-tags
 #DEPENDS+=     xfce4-thunar-vcs-plugin>=0.1.4:../../sysutils/xfce4-thunar-vcs
 
+# Extra Themes
+DEPENDS+=      gnome-themes-standard>=3.20.2:../../graphics/gnome-themes-standard
+
 # Broken
 # 0.2.0 fails because our thunar is too new. Fixed upstream already.
 #DEPENDS+=     xfce4-thunar-shares>=0.2.0:../../sysutils/xfce4-thunar-shares