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

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Mon May 20 21:51:33 CEST 2013


Revision: 21152
          http://gar.svn.sourceforge.net/gar/?rev=21152&view=rev
Author:   wahwah
Date:     2013-05-20 19:51:29 +0000 (Mon, 20 May 2013)
Log Message:
-----------
fluxbox/trunk: Use GNU grep

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

Added Paths:
-----------
    csw/mgar/pkg/fluxbox/trunk/files/0005-fluxbox-generate_menu-Use-CSWbash.patch
    csw/mgar/pkg/fluxbox/trunk/files/0006-use-ggrep-in-generate_menu.patch

Removed Paths:
-------------
    csw/mgar/pkg/fluxbox/trunk/files/0006-fluxbox-generate_menu-Use-CSWbash.patch

Modified: csw/mgar/pkg/fluxbox/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fluxbox/trunk/Makefile	2013-05-20 12:58:53 UTC (rev 21151)
+++ csw/mgar/pkg/fluxbox/trunk/Makefile	2013-05-20 19:51:29 UTC (rev 21152)
@@ -21,11 +21,13 @@
 PATCHFILES += 0002-Workaround-the-double-EXEEXT-substitution.patch
 PATCHFILES += 0003-The-italian-NLS-part-is-broken.patch
 PATCHFILES += 0004-Use-the-fluxbox-command-that-was-just-built.patch
-PATCHFILES += 0006-fluxbox-generate_menu-Use-CSWbash.patch
+PATCHFILES += 0005-fluxbox-generate_menu-Use-CSWbash.patch
+PATCHFILES += 0006-use-ggrep-in-generate_menu.patch
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
 RUNTIME_DEP_PKGS_CSWfluxbox += CSWbash
+RUNTIME_DEP_PKGS_CSWfluxbox += CSWggrep
 RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibxpm4
 RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWfluxbox += CSWlibxrender
@@ -35,6 +37,7 @@
 
 # checkpkg doesn't detect this dependency
 CHECKPKG_OVERRIDES_CSWfluxbox += surplus-dependency|CSWbash
+CHECKPKG_OVERRIDES_CSWfluxbox += surplus-dependency|CSWggrep
 
 include gar/category.mk
 

Copied: csw/mgar/pkg/fluxbox/trunk/files/0005-fluxbox-generate_menu-Use-CSWbash.patch (from rev 21143, csw/mgar/pkg/fluxbox/trunk/files/0006-fluxbox-generate_menu-Use-CSWbash.patch)
===================================================================
--- csw/mgar/pkg/fluxbox/trunk/files/0005-fluxbox-generate_menu-Use-CSWbash.patch	                        (rev 0)
+++ csw/mgar/pkg/fluxbox/trunk/files/0005-fluxbox-generate_menu-Use-CSWbash.patch	2013-05-20 19:51:29 UTC (rev 21152)
@@ -0,0 +1,23 @@
+From b464eac98a65b9d3c0dbd39765d23f87b29a5902 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 19 May 2013 15:48:01 +0200
+Subject: [PATCH] fluxbox-generate_menu: Use CSWbash
+
+The script is not compatible with /bin/sh on Solaris.
+---
+ util/fluxbox-generate_menu.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
+index 1b8e976..2c62650 100755
+--- a/util/fluxbox-generate_menu.in
++++ b/util/fluxbox-generate_menu.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/opt/csw/bin/bash
+ #
+ # generate_menu for Fluxbox
+ #
+-- 
+1.8.1.4
+

Deleted: csw/mgar/pkg/fluxbox/trunk/files/0006-fluxbox-generate_menu-Use-CSWbash.patch
===================================================================
--- csw/mgar/pkg/fluxbox/trunk/files/0006-fluxbox-generate_menu-Use-CSWbash.patch	2013-05-20 12:58:53 UTC (rev 21151)
+++ csw/mgar/pkg/fluxbox/trunk/files/0006-fluxbox-generate_menu-Use-CSWbash.patch	2013-05-20 19:51:29 UTC (rev 21152)
@@ -1,23 +0,0 @@
-From b464eac98a65b9d3c0dbd39765d23f87b29a5902 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Sun, 19 May 2013 15:48:01 +0200
-Subject: [PATCH] fluxbox-generate_menu: Use CSWbash
-
-The script is not compatible with /bin/sh on Solaris.
----
- util/fluxbox-generate_menu.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
-index 1b8e976..2c62650 100755
---- a/util/fluxbox-generate_menu.in
-+++ b/util/fluxbox-generate_menu.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/opt/csw/bin/bash
- #
- # generate_menu for Fluxbox
- #
--- 
-1.8.1.4
-

Added: csw/mgar/pkg/fluxbox/trunk/files/0006-use-ggrep-in-generate_menu.patch
===================================================================
--- csw/mgar/pkg/fluxbox/trunk/files/0006-use-ggrep-in-generate_menu.patch	                        (rev 0)
+++ csw/mgar/pkg/fluxbox/trunk/files/0006-use-ggrep-in-generate_menu.patch	2013-05-20 19:51:29 UTC (rev 21152)
@@ -0,0 +1,121 @@
+From 676961dbec8b2c6749806b2d7cdd774fd8e758fe Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Mon, 20 May 2013 21:17:37 +0200
+Subject: [PATCH] use ggrep in generate_menu
+
+---
+ util/fluxbox-generate_menu.in | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
+index 6dea643..4763193 100755
+--- a/util/fluxbox-generate_menu.in
++++ b/util/fluxbox-generate_menu.in
+@@ -113,7 +113,7 @@ EOF
+ }
+ 
+ testoption() {
+-    if [ -z "$3" -o -n "`echo $3|grep '^-'`" ]; then
++    if [ -z "$3" -o -n "`echo $3|/opt/csw/bin/ggrep '^-'`" ]; then
+         echo "Error: The option $2 requires an argument." >&2
+         exit 1
+     fi
+@@ -262,7 +262,7 @@ doSearch(){
+     # $dnlamVERBOSE "# Searching for icon $temp_icon for $execname" >> $ICONMAPPING
+ 
+     # check in $ICONMAPPING before searching directories
+-    entry_icon=`grep "^\"${execname}\"" $ICONMAPPING | head -n 1 | grep -o '<.*>'`
++    entry_icon=`/opt/csw/bin/ggrep "^\"${execname}\"" $ICONMAPPING | head -n 1 | /opt/csw/bin/ggrep -o '<.*>'`
+     if [ -n "$entry_icon" ]; then
+         entry_icon=`replaceWithinString "$entry_icon" "<"`
+         entry_icon=`replaceWithinString "$entry_icon" ">"`
+@@ -330,7 +330,7 @@ searchForIcon(){
+     # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" 
+     if [ -f "$entry_icon" ]; then
+     # if icon exists and entry does not already exists, add it
+-        if ! grep -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
++        if ! /opt/csw/bin/ggrep -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
+             printf "\"${entry_exec}\" \t <${entry_icon}>\n" >> $ICONMAPPING
+         else 
+             : echo "#    mapping already exists for ${entry_exec}" >> $ICONMAPPING
+@@ -355,14 +355,14 @@ createIconMapping(){
+                 # echo $DESKTOP_FILE; 
+                 #entry_name=`grep '^[ ]*Name=' $DESKTOP_FILE | head -n 1`
+                 #entry_name=${entry_name##*=}
+-                entry_exec=`grep '^[ ]*Exec=' "$DESKTOP_FILE" | head -n 1`
++                entry_exec=`/opt/csw/bin/ggrep '^[ ]*Exec=' "$DESKTOP_FILE" | head -n 1`
+                 entry_exec=${entry_exec##*=}
+                 entry_exec=`replaceWithinString "$entry_exec" "\""`
+                 if [ -z "$entry_exec" ]; then
+                     entry_exec=${DESKTOP_FILE%%.desktop*}
+                 fi
+ 
+-                entry_icon=`grep '^[ ]*Icon=' "$DESKTOP_FILE" | head -n 1`
++                entry_icon=`/opt/csw/bin/ggrep '^[ ]*Icon=' "$DESKTOP_FILE" | head -n 1`
+                 entry_icon=${entry_icon##*=}
+ 
+                 # $dnlamVERBOSE echo "--- $entry_exec $entry_icon" >&2
+@@ -394,11 +394,11 @@ lookupIcon() {
+     execname=`removePath "$execname"`
+ 
+     #echo "grepping ${execname}"
+-    iconString=`grep "^\"${execname}\"" $ICONMAPPING | head -n 1 | grep -o '<.*>'`
++    iconString=`/opt/csw/bin/ggrep "^\"${execname}\"" $ICONMAPPING | head -n 1 | /opt/csw/bin/ggrep -o '<.*>'`
+     # $dnlamVERBOSE "lookupIcon $execname, $iconString" >&2
+ 
+     if [ -z "$iconString" ] ; then
+-        iconString=`grep "^\"${execname%% *}" $ICONMAPPING | head -n 1 | grep -o '<.*>'`
++        iconString=`/opt/csw/bin/ggrep "^\"${execname%% *}" $ICONMAPPING | head -n 1 | /opt/csw/bin/ggrep -o '<.*>'`
+     fi
+ 
+     if [ -z "$iconString" ] && [ -z "$PARSING_DESKTOP" ] ; then
+@@ -414,7 +414,7 @@ lookupIcon() {
+ append() {
+      if [ -z "${INSTALL}" ]; then
+         # $dnlamVERBOSE echo "append: $*" >&2
+-        iconString="`echo $* | grep -o '<.*>'`"
++        iconString="`echo $* | /opt/csw/bin/ggrep -o '<.*>'`"
+         # echo "iconString=$iconString" >&2
+         if [ -z "$iconString" ] && [ -z "$NO_ICON" ]; then
+             echo -n "      $* " >> ${MENUFILENAME}
+@@ -464,8 +464,8 @@ append_menu_end() {
+ menu_entry() {
+     if [ -f "$1" ]; then
+         #                   space&tab here
+-        entry_name=`grep '^[     ]*Name=' "$1" | head -n 1 | cut -d = -f 2`
+-        entry_exec=`grep '^[     ]*Exec=' "$1" | head -n 1 | cut -d = -f 2`
++        entry_name=`/opt/csw/bin/ggrep '^[     ]*Name=' "$1" | head -n 1 | cut -d = -f 2`
++        entry_exec=`/opt/csw/bin/ggrep '^[     ]*Exec=' "$1" | head -n 1 | cut -d = -f 2`
+         if [ -n "$entry_name" -a -n "$entry_exec" ]; then
+             append "[exec] ($entry_name) {$entry_exec}"
+         fi
+@@ -543,7 +543,7 @@ until [ $counter -lt 1 ] || \
+     cmp ${MENUFILENAME} ${MENUFILENAME}.tmp >/dev/null 2>&1; do
+     [ -s ${MENUFILENAME}.tmp ] && mv ${MENUFILENAME}.tmp ${MENUFILENAME}
+     counter=`expr $counter - 1`
+-    grep -v '^$' ${MENUFILENAME}|sed -e "/^\[submenu].*/{
++    /opt/csw/bin/ggrep -v '^$' ${MENUFILENAME}|sed -e "/^\[submenu].*/{
+ n
+ N
+ /^\[submenu].*\n\[end]/d
+@@ -562,7 +562,7 @@ WHOAMI=`id -u -n`
+ [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
+ 
+ # Check for Imlib2-support
+-if @pkgprefix at fluxbox@pkgsuffix@@EXEEXT@ -info 2> /dev/null | grep "^IMLIB"; then
++if @pkgprefix at fluxbox@pkgsuffix@@EXEEXT@ -info 2> /dev/null | /opt/csw/bin/ggrep "^IMLIB"; then
+     PNG_ICONS="yes"
+ else
+     # better assume to assume "no"
+@@ -1422,7 +1422,7 @@ fi
+ PREFIX="${PREFIX:=@PREFIX@}"
+ if [  -z "${PREFIX}" -o ! -d "${PREFIX}" ]; then
+     hash @pkgprefix at fluxbox@pkgsuffix@@EXEEXT@
+-    PREFIX=`hash | grep @pkgprefix at fluxbox@pkgsuffix@ | sed 's,.*\t/,/,' | sed 's,/bin/@pkgprefix at fluxbox@pkgsuffix@@EXEEXT@$,,'`
++    PREFIX=`hash | /opt/csw/bin/ggrep @pkgprefix at fluxbox@pkgsuffix@ | sed 's,.*\t/,/,' | sed 's,/bin/@pkgprefix at fluxbox@pkgsuffix@@EXEEXT@$,,'`
+ fi
+ 
+ 
+-- 
+1.8.1.4
+

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



More information about the devel mailing list