summaryrefslogtreecommitdiff
path: root/wm/fluxbox
diff options
context:
space:
mode:
authortonio <tonio@pkgsrc.org>2005-10-20 15:55:01 +0000
committertonio <tonio@pkgsrc.org>2005-10-20 15:55:01 +0000
commitc28760869c8a52369f16f41ded3ad9b952e074dc (patch)
tree1ec04453b5f211d6aaa003421f3ecd40956c3345 /wm/fluxbox
parent33a5d8ce27668cab06da2c799e2ee77b47d155fc (diff)
downloadpkgsrc-c28760869c8a52369f16f41ded3ad9b952e074dc.tar.gz
Take care of nonportable use of grep in fluxbox-generate-menu
This should fix the build under openbsd and solaris
Diffstat (limited to 'wm/fluxbox')
-rw-r--r--wm/fluxbox/Makefile3
-rw-r--r--wm/fluxbox/distinfo3
-rw-r--r--wm/fluxbox/patches/patch-aa22
3 files changed, 26 insertions, 2 deletions
diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index a1f8230d06a..722fa951cc6 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2005/09/27 12:49:04 tonio Exp $
+# $NetBSD: Makefile,v 1.29 2005/10/20 15:55:01 tonio Exp $
#
DISTNAME= fluxbox-0.9.14
+PKGREVISION= 1
CATEGORIES= wm x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
EXTRACT_SUFX= .tar.bz2
diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo
index 2f9980d2091..be6ab9bcc08 100644
--- a/wm/fluxbox/distinfo
+++ b/wm/fluxbox/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.18 2005/09/27 12:49:04 tonio Exp $
+$NetBSD: distinfo,v 1.19 2005/10/20 15:55:01 tonio Exp $
SHA1 (fluxbox-0.9.14.tar.bz2) = 6e9d6d42631bb92b2fcfa1b74476b4383af91c3b
RMD160 (fluxbox-0.9.14.tar.bz2) = 17cb299115164303972988471526a57bf0eeebde
Size (fluxbox-0.9.14.tar.bz2) = 671916 bytes
+SHA1 (patch-aa) = e93ce1d4100fe3899ff226fbf6d99fb2526babf4
SHA1 (patch-ac) = f180c8cc2878f73ca14fa48aea73e04ff599004b
SHA1 (patch-ad) = 8fe91a52ce87f3f35f986ad8afb136c5cfd660d5
SHA1 (patch-af) = 2e20d43536b348dc72696110d41d85a69f2f19c9
diff --git a/wm/fluxbox/patches/patch-aa b/wm/fluxbox/patches/patch-aa
new file mode 100644
index 00000000000..fa9e3c8d450
--- /dev/null
+++ b/wm/fluxbox/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.8 2005/10/20 15:55:01 tonio Exp $
+
+--- util/fluxbox-generate_menu.in.orig 2005-08-25 18:52:50.000000000 +0200
++++ util/fluxbox-generate_menu.in
+@@ -51,7 +51,7 @@ WHOAMI=`whoami`
+ [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
+
+ # Check for Imlib2-support
+-if fluxbox -info 2> /dev/null | grep -q "^IMLIB"; then
++if fluxbox -info 2> /dev/null | grep "^IMLIB" > /dev/null; then
+ PNG_ICONS="yes"
+ else
+ # better assume to assume "no"
+@@ -343,7 +343,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 -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
++ if ! grep "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING > /dev/null; then
+ echo -e "\"${entry_exec}\" \t <${entry_icon}>" >> $ICONMAPPING
+ else
+ : echo "# mapping already exists for ${entry_exec}" >> $ICONMAPPING