mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-09-08 11:52:55 -04:00
35 lines
1.5 KiB
Plaintext
35 lines
1.5 KiB
Plaintext
$NetBSD: patch-aa,v 1.12 2012/04/17 20:08:06 bsiegert Exp $
|
|
|
|
* "grep -q" doesn't work everywhere.
|
|
* Do not use the home directory of the user building the package.
|
|
|
|
--- util/fluxbox-generate_menu.in.orig Sat Oct 29 13:45:51 2011
|
|
+++ util/fluxbox-generate_menu.in
|
|
@@ -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 -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
|
|
+ if ! grep "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
|
|
echo -e "\"${entry_exec}\" \t <${entry_icon}>" >> $ICONMAPPING
|
|
else
|
|
: echo "# mapping already exists for ${entry_exec}" >> $ICONMAPPING
|
|
@@ -561,7 +561,7 @@ WHOAMI=`whoami`
|
|
[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
|
|
|
|
# Check for Imlib2-support
|
|
-if @pkgprefix@fluxbox@pkgsuffix@ -info 2> /dev/null | grep -q "^IMLIB"; then
|
|
+if @pkgprefix@fluxbox@pkgsuffix@ -info 2> /dev/null | grep "^IMLIB" > /dev/null; then
|
|
PNG_ICONS="yes"
|
|
else
|
|
# better assume to assume "no"
|
|
@@ -1220,7 +1220,7 @@ case ${LC_ALL} in
|
|
esac
|
|
|
|
# Set Defaults
|
|
-USERFLUXDIR="${HOME}/.@pkgprefix@fluxbox@pkgsuffix@"
|
|
+USERFLUXDIR="\${HOME}/.@pkgprefix@fluxbox@pkgsuffix@"
|
|
MENUFILENAME="${MENUFILENAME:=${USERFLUXDIR}/menu}"
|
|
MENUTITLE="${MENUTITLE:=Fluxbox}"
|
|
HOMEPAGE="${HOMEPAGE:=fluxbox.org}"
|