From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Sep 28 11:00:14 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BEA081065674 for ; Tue, 28 Sep 2010 11:00:14 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 787FD8FC18 for ; Tue, 28 Sep 2010 11:00:14 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o8SB0Esg045575 for ; Tue, 28 Sep 2010 11:00:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o8SB0Elb045562; Tue, 28 Sep 2010 11:00:14 GMT (envelope-from gnats) Resent-Date: Tue, 28 Sep 2010 11:00:14 GMT Resent-Message-Id: <201009281100.o8SB0Elb045562@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C06C3106564A for ; Tue, 28 Sep 2010 10:56:04 +0000 (UTC) (envelope-from andy.kosela@gmail.com) Received: from mail-qy0-f175.google.com (mail-qy0-f175.google.com [209.85.216.175]) by mx1.freebsd.org (Postfix) with ESMTP id 74E9E8FC21 for ; Tue, 28 Sep 2010 10:56:04 +0000 (UTC) Received: by qyk30 with SMTP id 30so2300840qyk.13 for ; Tue, 28 Sep 2010 03:56:03 -0700 (PDT) Received: by 10.224.19.66 with SMTP id z2mr6615111qaa.187.1285671363492; Tue, 28 Sep 2010 03:56:03 -0700 (PDT) Received: from l8cevm.emea.ipaper.com (stuntpilot.ipaper.com [141.129.1.98]) by mx.google.com with ESMTPS id t24sm7887010qcs.11.2010.09.28.03.55.59 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 28 Sep 2010 03:56:02 -0700 (PDT) Message-Id: <4ca1c9b9.s8vVidjw9OhuGqdO%akosela@andykosela.com> Date: Tue, 28 Sep 2010 12:55:53 +0200 From: Andy Kosela Sender: Andy Kosela To: FreeBSD-gnats-submit@FreeBSD.org Cc: akosela@andykosela.com Subject: ports/151025: [MAINTAINER-UPDATE] ports-mgmt/bpkg: update to 2.1.3 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: akosela@andykosela.com List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Sep 2010 11:00:14 -0000 >Number: 151025 >Category: ports >Synopsis: [MAINTAINER-UPDATE] ports-mgmt/bpkg: update to 2.1.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Sep 28 11:00:13 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Andy Kosela >Release: FreeBSD 7.3-RELEASE-p2 amd64 >Organization: >Environment: >Description: - Update to 2.1.3 * update WWW * implement fixes suggested by Doug Barton * remove extra space in bpkg.8 Port maintainer (akosela@andykosela.com) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- bpkg-2.1.3.patch begins here --- diff -ruN --exclude=CVS /usr/ports/ports-mgmt/bpkg/Makefile /usr/home/akosela/bpkg/Makefile --- /usr/ports/ports-mgmt/bpkg/Makefile 2010-09-27 13:45:17.000000000 +0200 +++ /usr/home/akosela/bpkg/Makefile 2010-09-28 12:42:39.000000000 +0200 @@ -2,13 +2,13 @@ # Date created: 24 June 2007 # Whom: Andy Kosela # -# $FreeBSD: ports/ports-mgmt/bpkg/Makefile,v 1.28 2010/09/25 14:55:28 az Exp $ +# $FreeBSD$ # # This port is self contained in the files directory. # PORTNAME= bpkg -PORTVERSION= 2.1.2 +PORTVERSION= 2.1.3 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none diff -ruN --exclude=CVS /usr/ports/ports-mgmt/bpkg/files/bpkg.8 /usr/home/akosela/bpkg/files/bpkg.8 --- /usr/ports/ports-mgmt/bpkg/files/bpkg.8 2010-09-27 13:45:17.000000000 +0200 +++ /usr/home/akosela/bpkg/files/bpkg.8 2010-09-28 12:35:49.000000000 +0200 @@ -97,10 +97,10 @@ .It Fl p search the ports tree and display short info about each port. .It Fl Q -display the latest available package in the FreeBSD repository. +display the latest available package in the FreeBSD repository. [-STABLE] .It Fl q -display the latest available package in the FreeBSD repository. +display the latest available package in the FreeBSD repository. [-RELEASE] .It Fl r show the list of all port's dependencies. @@ -114,7 +114,7 @@ .It Fl v list all installed ports and possible updates. [no arguments] .It Fl Z -display all missing dynamic object dependencies. [no arguments] +display all missing dynamic object dependencies. [no arguments] .It Fl z display dynamic object dependencies for the specified port. .El @@ -125,7 +125,7 @@ .Nm command: .Pp -.Dl "$ bpkg -i foo" +.Dl "$ bpkg -i foo" .Pp Display short description about port foo. .Pp diff -ruN --exclude=CVS /usr/ports/ports-mgmt/bpkg/files/bpkg.sh.in /usr/home/akosela/bpkg/files/bpkg.sh.in --- /usr/ports/ports-mgmt/bpkg/files/bpkg.sh.in 2010-09-27 13:45:17.000000000 +0200 +++ /usr/home/akosela/bpkg/files/bpkg.sh.in 2010-09-28 12:27:36.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/sh -# $FreeBSD: ports/ports-mgmt/bpkg/files/bpkg.sh.in,v 1.27 2010/09/25 14:55:28 az Exp $ +# $FreeBSD$ -# Copyright (c) 2007-2010 Andy Kosela +# Copyright (c) 2007-2010 Andy Kosela # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -10,21 +10,20 @@ # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. trap trap_exit 2 pkg=$@ @@ -81,12 +80,12 @@ info_fn if [ -z "$info" ]; then - pwd=`cat /usr/ports/INDEX-$re | grep /$e'|'/ | - cut -d'|' -f2 | cut -d/ -f4,5` + pwd=`grep "/$e|" /usr/ports/INDEX-$re | cut -d'|' -f2 | + cut -d/ -f4,5` echo "*** not installed ***" for i in $pwd; do - echo "$i: `cat /usr/ports/INDEX-$re | - grep /$i'|' | cut -d'|' -f4`" + echo "$i: `grep "/$i|" /usr/ports/INDEX-$re | + cut -d'|' -f4`" done else echo "*** installed ***" @@ -138,31 +137,31 @@ info_fn if [ -z "$info" ]; then - pwd=`cat /usr/ports/INDEX-$re | grep /$e'|'/ | - cut -d'|' -f2 | cut -d/ -f4,5` + pwd=`grep "/$e|" /usr/ports/INDEX-$re | cut -d'|' -f2 | + cut -d/ -f4,5` for i in $pwd; do echo "*** not installed ***" - echo "$i: `cat /usr/ports/INDEX-$re | - grep /$i'|' | cut -d'|' -f4`" + echo "$i: `grep "/$i|" /usr/ports/INDEX-$re | + cut -d'|' -f4`" echo "Information in ports for `echo $i | cut -d/ -f2`:" - echo "B-deps: `cat /usr/ports/INDEX-$re | - grep /$i'|'/ | cut -d'|' -f8`" - echo "R-deps: `cat /usr/ports/INDEX-$re | - grep /$i'|'/ | cut -d'|' -f9`" + echo "B-deps: `grep "/$i|" \ + /usr/ports/INDEX-$re | cut -d'|' -f8`" + echo "R-deps: `grep "/$i|" \ + /usr/ports/INDEX-$re | cut -d'|' -f9`" echo "" done else echo "*** installed ***" pkg_info -xrR $info - pwd=`cat /usr/ports/INDEX-$re | grep /$e'|'/ | - cut -d'|' -f2 | cut -d/ -f4,5` + pwd=`grep "/$e|" /usr/ports/INDEX-$re | cut -d'|' -f2 | + cut -d/ -f4,5` for i in $pwd; do echo "Information in ports for $i:" - echo "B-deps: `cat /usr/ports/INDEX-$re | - grep /$i'|'/ | cut -d'|' -f8`" - echo "R-deps: `cat /usr/ports/INDEX-$re | - grep /$i'|'/ | cut -d'|' -f9`" + echo "B-deps: `grep "/$i|" \ + /usr/ports/INDEX-$re | cut -d'|' -f8`" + echo "R-deps: `grep "/$i|" \ + /usr/ports/INDEX-$re | cut -d'|' -f9`" echo "" done fi @@ -193,12 +192,12 @@ info_fn if [ -z "$info" ]; then - pwd=`cat /usr/ports/INDEX-$re | grep /$e'|'/ | - cut -d'|' -f2 | cut -d/ -f4,5` + pwd=`grep "/$e|" /usr/ports/INDEX-$re | cut -d'|' -f2 | + cut -d/ -f4,5` echo "*** not installed ***" for i in $pwd; do - echo "$i: `cat /usr/ports/INDEX-$re | - grep /$i'|' | cut -d'|' -f4`" + echo "$i: `grep "/$i|" /usr/ports/INDEX-$re | + cut -d'|' -f4`" echo "Packing list:" [ -d /usr/ports/$i ] && cat /usr/ports/$i/pkg-plist @@ -262,11 +261,11 @@ re=`uname -r | cut -d. -f1` for e in $pkg; do - pwd=`cat /usr/ports/INDEX-$re | grep /$e'|'/ | - cut -d'|' -f2 | cut -d/ -f4,5` + pwd=`grep "/$e|" /usr/ports/INDEX-$re | cut -d'|' -f2 | + cut -d/ -f4,5` for i in $pwd; do - echo "$i: `cat /usr/ports/INDEX-$re | - grep /$i'|' | cut -d'|' -f4`" + echo "$i: `grep "/$i|" /usr/ports/INDEX-$re | + cut -d'|' -f4`" done done exit 0 @@ -277,8 +276,7 @@ local pwd re re=`uname -r | cut -d. -f1` - pwd=`cat /usr/ports/INDEX-$re | grep /$pkg'|'/ | sed -n 1p | - cut -d'|' -f2` + pwd=`grep "/$pkg|" /usr/ports/INDEX-$re | sed -n 1p | cut -d'|' -f2` [ -z "$pwd" ] && echo "bpkg: can't find the port in /usr/ports/" && exit 0 @@ -291,8 +289,7 @@ local pwd e re re=`uname -r | cut -d. -f1` - pwd=`cat /usr/ports/INDEX-$re | grep /$pkg'|'/ | sed -n 1p | - cut -d'|' -f2` + pwd=`grep "/$pkg|" /usr/ports/INDEX-$re | sed -n 1p | cut -d'|' -f2` [ -z "$pwd" ] && echo "bpkg: can't find the port in /usr/ports/" for e in `cat $pwd/distinfo 2>/dev/null | grep SIZE | @@ -344,10 +341,9 @@ n=1 for e in `cat /tmp/bpkg1.tmp | awk '{print $9}' | cut -d. -f1` do - size_pkg=`cat /tmp/bpkg1.tmp | sed '/^[A-Z]/d' | - sed -n ${n}p | awk '{print $11}' | cut -d/ -f3` - size=`cat /tmp/bpkg2.tmp | grep $size_pkg | - awk '{print $5}'` + size_pkg=`cat /tmp/bpkg1.tmp | sed '/^[A-Z]/d' | sed -n ${n}p | + awk '{print $11}' | cut -d/ -f3` + size=`cat /tmp/bpkg2.tmp | grep $size_pkg | awk '{print $5}'` mtime=`cat /tmp/bpkg2.tmp | grep $size_pkg | awk '{print $6, $7, $8}'` echo "$e -> $size_pkg `convert $size` [$mtime]" @@ -377,10 +373,9 @@ n=1 for e in `cat /tmp/bpkg1.tmp | awk '{print $9}' | cut -d. -f1` do - size_pkg=`cat /tmp/bpkg1.tmp | sed '/^[A-Z]/d' | - sed -n ${n}p | awk '{print $11}' | cut -d/ -f3` - size=`cat /tmp/bpkg2.tmp | grep $size_pkg | - awk '{print $5}'` + size_pkg=`cat /tmp/bpkg1.tmp | sed '/^[A-Z]/d' | sed -n ${n}p | + awk '{print $11}' | cut -d/ -f3` + size=`cat /tmp/bpkg2.tmp | grep $size_pkg | awk '{print $5}'` mtime=`cat /tmp/bpkg2.tmp | grep $size_pkg | awk '{print $6, $7, $8}'` echo "$e -> $size_pkg `convert $size` [$mtime]" @@ -431,8 +426,7 @@ exit 0 fi - pkg_install=`pkg_info -xoQ ^$pkg | cut -d: -f1 | - awk '{ORS=" " ;print}'` + pkg_install=`pkg_info -xoQ ^$pkg | cut -d: -f1 | awk '{ORS=" " ;print}'` echo "Creating backup package(s) "$pkg_install"in /var/tmp/bpkg/" [ ! -d /var/tmp/bpkg/ ] && mkdir /var/tmp/bpkg/ cd /var/tmp/bpkg/ @@ -478,12 +472,12 @@ info_fn if [ -z "$info" ]; then - pwd=`cat /usr/ports/INDEX-$re | grep /$e'|'/ | - cut -d'|' -f2 | cut -d/ -f4,5` + pwd=`grep "/$e|" /usr/ports/INDEX-$re | cut -d'|' -f2 | + cut -d/ -f4,5` for i in $pwd; do echo "*** not installed ***" - echo "$i: `cat /usr/ports/$i/Makefile | - grep COMMENT | cut -d= -f2`" + echo "$i: `grep COMMENT \ + /usr/ports/$i/Makefile | cut -d= -f2`" echo -n "Do you want to display config options recursively? [n] " read key case $key in @@ -501,7 +495,7 @@ "Do you want to display config options recursively? [n] " read key case $key in - y) cd /usr/ports/$i && \ + y) cd /usr/ports/$i && make showconfig-recursive ;; *) cd /usr/ports/$i && make showconfig ;; esac @@ -522,12 +516,12 @@ info_fn if [ -z "$info" ]; then - pwd=`cat /usr/ports/INDEX-$re | grep /$e'|'/ | - cut -d'|' -f2 | cut -d/ -f4,5` + pwd=`grep "/$e|" /usr/ports/INDEX-$re | cut -d'|' -f2 | + cut -d/ -f4,5` for i in $pwd; do echo "*** not installed ***" - echo "$i: `cat /usr/ports/$i/Makefile | - grep COMMENT | cut -d= -f2`" + echo "$i: `grep COMMENT \ + /usr/ports/$i/Makefile | cut -d= -f2`" echo -n \ "Do you want to remove config options recursively? [n] " read key @@ -567,12 +561,12 @@ info_fn if [ -z "$info" ]; then - pwd=`cat /usr/ports/INDEX-$re | grep /$e'|'/ | - cut -d'|' -f2 | cut -d/ -f4,5` + pwd=`grep "/$e|" /usr/ports/INDEX-$re | cut -d'|' -f2 | + cut -d/ -f4,5` for i in $pwd; do echo "*** not installed ***" - echo "$i: `cat /usr/ports/$i/Makefile | - grep COMMENT | cut -d= -f2`" + echo "$i: `grep COMMENT \ + /usr/ports/$i/Makefile | cut -d= -f2`" echo -n \ "Do you want to set config options recursively? [n] " read key @@ -613,8 +607,8 @@ echo "bpkg: text WWW browser required" else echo "Loading..." - pwd=`cd /usr/ports && make search path=/$pkg | - grep -w Path | sed -n 1p | cut -d/ -f4,5` + pwd=`cd /usr/ports && make search path=/$pkg | grep -w Path | + sed -n 1p | cut -d/ -f4,5` $browser http://www.freshports.org/$pwd fi exit 0 @@ -633,8 +627,8 @@ for e in $pkg; do info_fn if [ -z "$info" ]; then - pwd=`cat /usr/ports/INDEX-$re | grep /$e'|'/ | - cut -d'|' -f2 | cut -d/ -f4,5` + pwd=`grep "/$e|" /usr/ports/INDEX-$re | cut -d'|' -f2 | + cut -d/ -f4,5` for i in $pwd; do /usr/local/sbin/portmaster --show-work $i done diff -ruN --exclude=CVS /usr/ports/ports-mgmt/bpkg/pkg-descr /usr/home/akosela/bpkg/pkg-descr --- /usr/ports/ports-mgmt/bpkg/pkg-descr 2009-03-11 23:46:44.000000000 +0100 +++ /usr/home/akosela/bpkg/pkg-descr 2010-09-28 12:42:31.000000000 +0200 @@ -5,4 +5,4 @@ -- Andy Kosela -WWW: http://www.andykosela.com/bpkg/ +WWW: http://www.andykosela.com/bpkg.html --- bpkg-2.1.3.patch ends here --- --Andy >Release-Note: >Audit-Trail: >Unformatted: