diff options
| author | Beat Gaetzi <beat@FreeBSD.org> | 2013-01-02 15:21:58 +0000 |
|---|---|---|
| committer | Beat Gaetzi <beat@FreeBSD.org> | 2013-01-02 15:21:58 +0000 |
| commit | 07b041985652b4e5ea3aca5025212e5553330b2a (patch) | |
| tree | 00a40678ebfc2adabba46bd0df04fcc2c0aeac81 /x11-wm | |
| parent | - Update to 4.11 [1] (diff) | |
- Update to 1.3.3
Notes
Notes:
svn path=/head/; revision=309820
Diffstat (limited to 'x11-wm')
| -rw-r--r-- | x11-wm/fluxbox/Makefile | 2 | ||||
| -rw-r--r-- | x11-wm/fluxbox/distinfo | 4 | ||||
| -rw-r--r-- | x11-wm/fluxbox/files/patch-util::fluxbox-generate_menu.in | 14 |
3 files changed, 10 insertions, 10 deletions
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile index d280833e0742..ab838d2fe2a7 100644 --- a/x11-wm/fluxbox/Makefile +++ b/x11-wm/fluxbox/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= fluxbox -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.3 CATEGORIES= x11-wm MASTER_SITES= SF DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} diff --git a/x11-wm/fluxbox/distinfo b/x11-wm/fluxbox/distinfo index 5708d2b723f0..021667ac6a11 100644 --- a/x11-wm/fluxbox/distinfo +++ b/x11-wm/fluxbox/distinfo @@ -1,5 +1,5 @@ -SHA256 (fluxbox-1.3.2.tar.gz) = c174030bd356f680dc5608f5553cac89b44f362c050d081ae8a8b7a3227280a0 -SIZE (fluxbox-1.3.2.tar.gz) = 1065005 +SHA256 (fluxbox-1.3.3.tar.gz) = 2eaa5595924e9fdb1a438cc82c58515bfb1b3d9a80bce4f89d0fa59ae819ee7e +SIZE (fluxbox-1.3.3.tar.gz) = 1074561 SHA256 (fb-doc-mfhtml-20060629.tgz) = 98d37b73dbb1caf1361b098bffc69d1f365f9b324a71f622ba72ed5da5d9b9ec SIZE (fb-doc-mfhtml-20060629.tgz) = 115560 SHA256 (fluxbook-20060629.pdf) = 8f225b101e9ab81543182c83699aeef3fe86370d72da215831321c903eee9cde diff --git a/x11-wm/fluxbox/files/patch-util::fluxbox-generate_menu.in b/x11-wm/fluxbox/files/patch-util::fluxbox-generate_menu.in index 7f37f1f64fe7..75dac641b9c0 100644 --- a/x11-wm/fluxbox/files/patch-util::fluxbox-generate_menu.in +++ b/x11-wm/fluxbox/files/patch-util::fluxbox-generate_menu.in @@ -1,5 +1,5 @@ ---- util/fluxbox-generate_menu.in.orig 2011-10-29 15:46:15.000000000 +0200 -+++ util/fluxbox-generate_menu.in 2011-10-31 20:05:12.000000000 +0100 +--- util/fluxbox-generate_menu.in.orig 2012-12-10 18:26:53.000000000 +0100 ++++ util/fluxbox-generate_menu.in 2013-01-02 14:22:14.000000000 +0100 @@ -68,7 +68,7 @@ -d Other path(s) to recursively search for *.desktop files -ds Wider search for *.desktop files (takes more time) @@ -41,7 +41,7 @@ + return 1 + fi + } - + -find_it_options() { - [ -n "$1" ] && hash $1 2> /dev/null -} @@ -64,7 +64,7 @@ + which $1 > /dev/null 2>&1 + } +fi - + #echo "replaceWithinString: $1, $2, $3" >&2 #echo ${1//$2/$3} # causes error in BSD even though not used @@ -203,7 +232,7 @@ @@ -93,7 +93,7 @@ +[ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:%%LOCALBASE%%/bin # Check for Imlib2-support - if @pkgprefix@fluxbox@pkgsuffix@ -info 2> /dev/null | grep -q "^IMLIB"; then + if @pkgprefix@fluxbox@pkgsuffix@@EXEEXT@ -info 2> /dev/null | grep -q "^IMLIB"; then @@ -1271,16 +1300,16 @@ # These are prefixes; So if fluxbox is installed in @PREFIX@/bin/fluxbox # your prefix is: @PREFIX@ @@ -161,8 +161,8 @@ # prefix PREFIX="${PREFIX:=@PREFIX@}" if [ -z "${PREFIX}" -o ! -d "${PREFIX}" ]; then -- hash @pkgprefix@fluxbox@pkgsuffix@ -- PREFIX=`hash | grep @pkgprefix@fluxbox@pkgsuffix@ | sed 's,.*\t/,/,' | sed 's,/bin/@pkgprefix@fluxbox@pkgsuffix@$,,'` +- hash @pkgprefix@fluxbox@pkgsuffix@@EXEEXT@ +- PREFIX=`hash | grep @pkgprefix@fluxbox@pkgsuffix@ | sed 's,.*\t/,/,' | sed 's,/bin/@pkgprefix@fluxbox@pkgsuffix@@EXEEXT@$,,'` + PREFIX=`which fluxbox | sed 's,/bin/fluxbox$,,'` fi |