[pkgsrc/trunk]: pkgsrc/wm/fluxbox The home directory of the user building the...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0690192655d8
branches:  trunk
changeset: 534269:0690192655d8
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Mon Oct 15 09:17:31 2007 +0000

description:
The home directory of the user building the package is not interesting
enough to be included in the menu file.

PKGREVISION++

diffstat:

 wm/fluxbox/Makefile         |   4 ++--
 wm/fluxbox/distinfo         |   4 ++--
 wm/fluxbox/patches/patch-aa |  20 ++++++++++++++++----
 3 files changed, 20 insertions(+), 8 deletions(-)

diffs (67 lines):

diff -r 355b136d51ec -r 0690192655d8 wm/fluxbox/Makefile
--- a/wm/fluxbox/Makefile       Mon Oct 15 07:47:23 2007 +0000
+++ b/wm/fluxbox/Makefile       Mon Oct 15 09:17:31 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2007/10/09 20:17:31 xtraeme Exp $
+# $NetBSD: Makefile,v 1.44 2007/10/15 09:17:31 rillig Exp $
 #
 
 DISTNAME=      fluxbox-1.0.0
-#PKGREVISION=  1
+PKGREVISION=   1
 CATEGORIES=    wm x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 355b136d51ec -r 0690192655d8 wm/fluxbox/distinfo
--- a/wm/fluxbox/distinfo       Mon Oct 15 07:47:23 2007 +0000
+++ b/wm/fluxbox/distinfo       Mon Oct 15 09:17:31 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2007/10/09 20:17:31 xtraeme Exp $
+$NetBSD: distinfo,v 1.25 2007/10/15 09:17:31 rillig Exp $
 
 SHA1 (fluxbox-1.0.0.tar.bz2) = 7985e35fbb170fda24b9e04610690cd04c7a8748
 RMD160 (fluxbox-1.0.0.tar.bz2) = 320b11a1cf96a757da079886cd6496b9d84ab202
 Size (fluxbox-1.0.0.tar.bz2) = 767586 bytes
-SHA1 (patch-aa) = e93ce1d4100fe3899ff226fbf6d99fb2526babf4
+SHA1 (patch-aa) = 7b0b4a08a2c66902c38dc573da77b7917a2e859a
 SHA1 (patch-ac) = 2e77766bc2490b65e214d04ac6102f4e9e882930
 SHA1 (patch-af) = 1cdde9aa6901e23ba42377d71cefb19f073445fa
diff -r 355b136d51ec -r 0690192655d8 wm/fluxbox/patches/patch-aa
--- a/wm/fluxbox/patches/patch-aa       Mon Oct 15 07:47:23 2007 +0000
+++ b/wm/fluxbox/patches/patch-aa       Mon Oct 15 09:17:31 2007 +0000
@@ -1,7 +1,10 @@
-$NetBSD: patch-aa,v 1.8 2005/10/20 15:55:01 tonio Exp $
+$NetBSD: patch-aa,v 1.9 2007/10/15 09:17:31 rillig Exp $
 
---- util/fluxbox-generate_menu.in.orig 2005-08-25 18:52:50.000000000 +0200
-+++ util/fluxbox-generate_menu.in
+* "grep -q" doesn't work everywhere.
+* Do not use the home directory of the user building the package.
+
+--- util/fluxbox-generate_menu.in.orig 2007-03-19 20:57:15.000000000 +0100
++++ util/fluxbox-generate_menu.in      2007-10-15 11:07:05.000000000 +0200
 @@ -51,7 +51,7 @@ WHOAMI=`whoami`
  [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
  
@@ -11,7 +14,7 @@
      PNG_ICONS="yes"
  else
      # better assume to assume "no"
-@@ -343,7 +343,7 @@ searchForIcon(){
+@@ -337,7 +337,7 @@ searchForIcon(){
      # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" 
      if [ -f "$entry_icon" ]; then
      # if icon exists and entry does not already exists, add it
@@ -20,3 +23,12 @@
              echo -e "\"${entry_exec}\" \t <${entry_icon}>" >> $ICONMAPPING
          else 
              : echo "#    mapping already exists for ${entry_exec}" >> $ICONMAPPING
+@@ -1635,7 +1635,7 @@ append_submenu "${MULTIMEDIAMENU}"
+        append_submenu "${XUTILSMENU}"
+            normal_find xfontsel xman xload xbiff editres viewres xclock \
+                xmag wmagnify gkrellm gkrellm2 vmware portagemaster agave 
+-           find_it xrdb append "[exec] (Reload .Xdefaults) {xrdb -load $HOME/.Xdefaults}"
++           find_it xrdb append "[exec] (Reload .Xdefaults) {xrdb -load \$HOME/.Xdefaults}"
+        append_menu_end
+ append_menu_end
+