[csw-devel] SF.net SVN: gar:[18216] csw/mgar/pkg/fluxbox/trunk

[wahwah at users.sourceforge.net]

Revision: 18216
          http://gar.svn.sourceforge.net/gar/?rev=18216&view=rev
Author:   wahwah
Date:     2012-06-04 19:18:49 +0000 (Mon, 04 Jun 2012)
Log Message:
-----------
fluxbox/trunk: Use gwhoami in fbsetbg

Modified Paths:
--------------
    csw/mgar/pkg/fluxbox/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/fluxbox/trunk/files/0001-Use-gwhoami-from-CSWcoreutils.patch

Modified: csw/mgar/pkg/fluxbox/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fluxbox/trunk/Makefile	2012-06-04 19:02:09 UTC (rev 18215)
+++ csw/mgar/pkg/fluxbox/trunk/Makefile	2012-06-04 19:18:49 UTC (rev 18216)
@@ -20,21 +20,25 @@
 EXTRA_CPPFLAGS = -features=extensions -D__FUNCTION__=__func__
 EXTRA_LINKER_FLAGS = -norunpath
 
+PATCHFILES += 0001-Use-gwhoami-from-CSWcoreutils.patch
+
 CONFIGURE_ARGS = $(DIRPATHS)
 
+RUNTIME_DEP_PKGS_CSWfluxbox += CSWcoreutils
+RUNTIME_DEP_PKGS_CSWfluxbox += CSWimlib2
+RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfontconfig1
+RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfreetype6
+RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfribidi0
 RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWfluxbox += CSWimlib2
-RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibz1
 RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibxft2
 RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibxrender
-RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfribidi0
+RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibz1
 RUNTIME_DEP_PKGS_CSWfluxbox += CSWxpm
-RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfontconfig1
-RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibfreetype6
 CHECKPKG_OVERRIDES_CSWfluxbox += file-with-bad-content|/usr/share|root/opt/csw/share/man/man5/fluxbox-style.5
 CHECKPKG_OVERRIDES_CSWfluxbox += file-with-bad-content|/usr/share|root/opt/csw/bin/fluxbox-generate_menu
 CHECKPKG_OVERRIDES_CSWfluxbox += file-with-bad-content|/usr/local|root/opt/csw/bin/fluxbox-generate_menu
 CHECKPKG_OVERRIDES_CSWfluxbox += file-with-bad-content|/usr/local|root/opt/csw/bin/fbsetbg
+CHECKPKG_OVERRIDES_CSWfluxbox += surplus-dependency|CSWcoreutils
 
 include gar/category.mk
 

Added: csw/mgar/pkg/fluxbox/trunk/files/0001-Use-gwhoami-from-CSWcoreutils.patch
===================================================================
--- csw/mgar/pkg/fluxbox/trunk/files/0001-Use-gwhoami-from-CSWcoreutils.patch	                        (rev 0)
+++ csw/mgar/pkg/fluxbox/trunk/files/0001-Use-gwhoami-from-CSWcoreutils.patch	2012-06-04 19:18:49 UTC (rev 18216)
@@ -0,0 +1,25 @@
+From 9ad03afab9348046c24a45e0eecda76568f778a9 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Mon, 4 Jun 2012 21:14:44 +0200
+Subject: [PATCH] Use gwhoami from CSWcoreutils
+
+---
+ util/fbsetbg |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/fbsetbg b/util/fbsetbg
+index 0bdb804..cf888e7 100644
+--- a/util/fbsetbg
++++ b/util/fbsetbg
+@@ -48,7 +48,7 @@ wpsetters="${wpsetters:=Esetroot wmsetbg feh hsetroot chbg display qiv xv xsri x
+ lastwallpaper="${HOME}/.fluxbox/lastwallpaper"
+ 
+ 
+-WHOAMI=`whoami`
++WHOAMI=`gwhoami`
+ [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin/:/usr/local/bin:/usr/X11R6/bin
+ 
+ command="`basename \"$0\"`"
+-- 
+1.7.10
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.