From owner-svn-ports-all@FreeBSD.ORG Wed Jan 2 15:22:00 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 10C637A2; Wed, 2 Jan 2013 15:22:00 +0000 (UTC) (envelope-from beat@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id DEA6C8FC0A; Wed, 2 Jan 2013 15:21:59 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r02FLxie012226; Wed, 2 Jan 2013 15:21:59 GMT (envelope-from beat@svn.freebsd.org) Received: (from beat@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r02FLxUB012223; Wed, 2 Jan 2013 15:21:59 GMT (envelope-from beat@svn.freebsd.org) Message-Id: <201301021521.r02FLxUB012223@svn.freebsd.org> From: Beat Gaetzi Date: Wed, 2 Jan 2013 15:21:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309820 - in head/x11-wm/fluxbox: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jan 2013 15:22:00 -0000 Author: beat Date: Wed Jan 2 15:21:58 2013 New Revision: 309820 URL: http://svnweb.freebsd.org/changeset/ports/309820 Log: - Update to 1.3.3 Modified: head/x11-wm/fluxbox/Makefile head/x11-wm/fluxbox/distinfo head/x11-wm/fluxbox/files/patch-util::fluxbox-generate_menu.in Modified: head/x11-wm/fluxbox/Makefile ============================================================================== --- head/x11-wm/fluxbox/Makefile Wed Jan 2 14:19:48 2013 (r309819) +++ head/x11-wm/fluxbox/Makefile Wed Jan 2 15:21:58 2013 (r309820) @@ -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} Modified: head/x11-wm/fluxbox/distinfo ============================================================================== --- head/x11-wm/fluxbox/distinfo Wed Jan 2 14:19:48 2013 (r309819) +++ head/x11-wm/fluxbox/distinfo Wed Jan 2 15:21:58 2013 (r309820) @@ -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 Modified: head/x11-wm/fluxbox/files/patch-util::fluxbox-generate_menu.in ============================================================================== --- head/x11-wm/fluxbox/files/patch-util::fluxbox-generate_menu.in Wed Jan 2 14:19:48 2013 (r309819) +++ head/x11-wm/fluxbox/files/patch-util::fluxbox-generate_menu.in Wed Jan 2 15:21:58 2013 (r309820) @@ -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