diff options
| author | rillig <rillig@pkgsrc.org> | 2007-11-04 15:34:08 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-11-04 15:34:08 +0000 |
| commit | 6b89ee80bc166bf913809bd31ceb40f42c5c7ca6 (patch) | |
| tree | 4adcbc850ebc58751a33232b6fa3a7a89a06029a /wm/fluxbox | |
| parent | e447fd32740a54f33c9757e40f187be9a832d6ac (diff) | |
| download | pkgsrc-6b89ee80bc166bf913809bd31ceb40f42c5c7ca6.tar.gz | |
Fixed another reference to the home directory of the user that builds
the package.
PKGREVISION++
Diffstat (limited to 'wm/fluxbox')
| -rw-r--r-- | wm/fluxbox/Makefile | 4 | ||||
| -rw-r--r-- | wm/fluxbox/distinfo | 4 | ||||
| -rw-r--r-- | wm/fluxbox/patches/patch-aa | 19 |
3 files changed, 18 insertions, 9 deletions
diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile index e0b2fe70912..e6e40c03171 100644 --- a/wm/fluxbox/Makefile +++ b/wm/fluxbox/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.45 2007/11/01 13:08:05 rillig Exp $ +# $NetBSD: Makefile,v 1.46 2007/11/04 15:34:08 rillig Exp $ # DISTNAME= fluxbox-1.0.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= wm x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluxbox/} EXTRACT_SUFX= .tar.bz2 diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo index 3765286cecf..070dec0a423 100644 --- a/wm/fluxbox/distinfo +++ b/wm/fluxbox/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.26 2007/11/01 13:08:05 rillig Exp $ +$NetBSD: distinfo,v 1.27 2007/11/04 15:34:08 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) = 7b0b4a08a2c66902c38dc573da77b7917a2e859a +SHA1 (patch-aa) = a7edf240ed45bc91431f86efdc371f4e9e2080aa SHA1 (patch-ac) = 467154bd1f43e68997bb368883016c65e1afd7b2 SHA1 (patch-af) = 1cdde9aa6901e23ba42377d71cefb19f073445fa SHA1 (patch-ba) = 27ecea84bfe459656f4ff5a09b4f24abf1519097 diff --git a/wm/fluxbox/patches/patch-aa b/wm/fluxbox/patches/patch-aa index f6144aca30c..f9a9af02286 100644 --- a/wm/fluxbox/patches/patch-aa +++ b/wm/fluxbox/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.9 2007/10/15 09:17:31 rillig Exp $ +$NetBSD: patch-aa,v 1.10 2007/11/04 15:34:09 rillig 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 2007-03-19 20:57:15.000000000 +0100 -+++ util/fluxbox-generate_menu.in 2007-10-15 11:07:05.000000000 +0200 +--- util/fluxbox-generate_menu.in.orig 2007-10-08 18:49:08.000000000 +0000 ++++ util/fluxbox-generate_menu.in 2007-11-04 15:31:20.000000000 +0000 @@ -51,7 +51,7 @@ WHOAMI=`whoami` [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin @@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.9 2007/10/15 09:17:31 rillig Exp $ PNG_ICONS="yes" else # better assume to assume "no" -@@ -337,7 +337,7 @@ searchForIcon(){ +@@ -338,7 +338,7 @@ searchForIcon(){ # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" if [ -f "$entry_icon" ]; then # if icon exists and entry does not already exists, add it @@ -23,7 +23,16 @@ $NetBSD: patch-aa,v 1.9 2007/10/15 09:17:31 rillig Exp $ echo -e "\"${entry_exec}\" \t <${entry_icon}>" >> $ICONMAPPING else : echo "# mapping already exists for ${entry_exec}" >> $ICONMAPPING -@@ -1635,7 +1635,7 @@ append_submenu "${MULTIMEDIAMENU}" +@@ -1210,7 +1210,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}" +@@ -1708,7 +1708,7 @@ append_submenu "${MULTIMEDIAMENU}" append_submenu "${XUTILSMENU}" normal_find xfontsel xman xload xbiff editres viewres xclock \ xmag wmagnify gkrellm gkrellm2 vmware portagemaster agave |