From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jul 26 21:50:03 2008 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 8F1DA1065672 for ; Sat, 26 Jul 2008 21:50:03 +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 6A5F08FC13 for ; Sat, 26 Jul 2008 21:50:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m6QLo3Wi015163 for ; Sat, 26 Jul 2008 21:50:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m6QLo3h9015162; Sat, 26 Jul 2008 21:50:03 GMT (envelope-from gnats) Resent-Date: Sat, 26 Jul 2008 21:50:03 GMT Resent-Message-Id: <200807262150.m6QLo3h9015162@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, Andy Kosela Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 79DBD1065673 for ; Sat, 26 Jul 2008 21:40:46 +0000 (UTC) (envelope-from root@aegis.um.lublin.pl) Received: from aegis.um.lublin.pl (aegis.um.lublin.pl [193.93.68.20]) by mx1.freebsd.org (Postfix) with ESMTP id DE8B48FC0C for ; Sat, 26 Jul 2008 21:40:45 +0000 (UTC) (envelope-from root@aegis.um.lublin.pl) Received: from localhost (localhost [127.0.0.1]) by aegis.um.lublin.pl (Postfix) with ESMTP id 62EFC67AEF for ; Sat, 26 Jul 2008 23:41:16 +0200 (CEST) Received: from aegis.um.lublin.pl ([127.0.0.1]) by localhost (aegis.um.lublin.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id N0c1bPXz10id for ; Sat, 26 Jul 2008 23:41:15 +0200 (CEST) Received: by aegis.um.lublin.pl (Postfix, from userid 0) id 7D46367AEE; Sat, 26 Jul 2008 23:41:15 +0200 (CEST) Message-Id: <20080726214115.7D46367AEE@aegis.um.lublin.pl> Date: Sat, 26 Jul 2008 23:41:15 +0200 (CEST) From: Andy Kosela To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/125991: [MAINTAINER-UPDATE] ports-mgmt/bpkg: update to 2.0.2_1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Jul 2008 21:50:03 -0000 >Number: 125991 >Category: ports >Synopsis: [MAINTAINER-UPDATE] ports-mgmt/bpkg: update to 2.0.2_1 >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: Sat Jul 26 21:50:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Andy Kosela >Release: FreeBSD 6.2-RELEASE-p11 i386 >Organization: >Environment: System: FreeBSD aegis.um.lublin.pl 6.2-RELEASE-p11 FreeBSD 6.2-RELEASE-p11 #0: Wed Feb 13 07:00:04 UTC 2008 >Description: - Compatible with BSD KNF - Minor fixes - Bump PORTREVISION - Update to 2.0.2_1 Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- bpkg-2.0.2_1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/ports-mgmt/bpkg/Makefile /usr/home/akosela/downloads/bpkg-2.0.2_1/Makefile --- /usr/ports/ports-mgmt/bpkg/Makefile Sat Jul 19 20:23:52 2008 +++ /usr/home/akosela/downloads/bpkg-2.0.2_1/Makefile Sat Jul 26 23:36:18 2008 @@ -2,13 +2,14 @@ # Date created: 24 June 2007 # Whom: Andy Kosela # -# $FreeBSD: ports/ports-mgmt/bpkg/Makefile,v 1.17 2008/07/19 18:23:52 miwi Exp $ +# $FreeBSD$ # # This port is self contained in the files directory. # PORTNAME= bpkg PORTVERSION= 2.0.2 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none diff -ruN --exclude=CVS /usr/ports/ports-mgmt/bpkg/files/bpkg.8 /usr/home/akosela/downloads/bpkg-2.0.2_1/files/bpkg.8 --- /usr/ports/ports-mgmt/bpkg/files/bpkg.8 Sat Jul 19 20:23:52 2008 +++ /usr/home/akosela/downloads/bpkg-2.0.2_1/files/bpkg.8 Sat Jul 26 23:33:13 2008 @@ -113,19 +113,19 @@ .Nm command: .Pp -.Dl Ar "> bpkg -i foo" +.Dl "> bpkg -i foo" .Pp Display info about port foo. .Pp -.Dl Ar "> bpkg -S 'foo[0-9]+$'" +.Dl "> bpkg -S 'foo[0-9]+$'" .Pp Display all ports matching the regular expression. .Pp -.Dl Ar "> bpkg -t | head" +.Dl "> bpkg -t | head" .Pp Display 10 most recently installed ports. .Pp -.Dl Ar "> bpkg -b 'foo bar'" +.Dl "> bpkg -b 'foo bar'" .Pp Create backup packages of foo and bar in /var/tmp/bpkg/ directory. .Sh SEE ALSO diff -ruN --exclude=CVS /usr/ports/ports-mgmt/bpkg/files/bpkg.sh.in /usr/home/akosela/downloads/bpkg-2.0.2_1/files/bpkg.sh.in --- /usr/ports/ports-mgmt/bpkg/files/bpkg.sh.in Sat Jul 19 20:23:52 2008 +++ /usr/home/akosela/downloads/bpkg-2.0.2_1/files/bpkg.sh.in Sat Jul 26 23:19:58 2008 @@ -1,5 +1,6 @@ #!/bin/sh -# $FreeBSD: ports/ports-mgmt/bpkg/files/bpkg.sh.in,v 1.16 2008/07/19 18:23:52 miwi Exp $ +# @(#) bpkg.sh simple tool for displaying information about ports +# $FreeBSD: ports/ports-mgmt/bpkg/files/bpkg.sh.in,v 1.15 2008/07/17 18:48:43 miwi Exp $ # Copyright (c) 2007-2008 Andy Kosela # All rights reserved. @@ -26,33 +27,30 @@ # SUCH DAMAGE. trap trap_exit 2 - pkg=$@ -root() { - if [ `id -u` != 0 ]; then - echo "bpkg: access denied, root privileges required" - exit 0 - fi -} - -trap_exit() { +trap_exit() +{ echo -e "\n*** SIGINT ***" exit 1 } -missing() { - echo "bpkg: can't find the port in /usr/ports/" - exit 0 +root() +{ + if [ `id -u` != 0 ]; then + echo "bpkg: access denied, root privileges required" + exit 1 + fi } -main() { - help -} +############################################################################### +# Start of main functions -pkg_info-xI() { +pkg_info-xI() +{ for e in $pkg; do - info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d/ -f5` + info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | \ + cut -d/ -f5` if [ -z "$info" ]; then path=`cd /usr/ports && make search path=/$e | \ @@ -70,9 +68,11 @@ exit 0 } -pkg_info-xL() { +pkg_info-xL() +{ for e in $pkg; do - info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d: -f3` + info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | \ + cut -d: -f3` if [ ! -z "$info" ]; then for i in $info; do @@ -90,16 +90,19 @@ exit 0 } -pkg_inf() { +pkg_inf() +{ echo -e "\033[33m*** installed ***\033[0m" pkg_info echo "***`pkg_info | wc -l` ports installed ***" exit 0 } -pkg_info-xs() { +pkg_info-xs() +{ for e in $pkg; do - info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d: -f3` + info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | \ + cut -d: -f3` if [ ! -z "$info" ]; then for i in $info; do @@ -117,9 +120,11 @@ exit 0 } -pkg_info-xr() { +pkg_info-xr() +{ for e in $pkg; do - info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d: -f3` + info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | \ + cut -d: -f3` if [ -z "$info" ]; then path=`cd /usr/ports && make search path=/$e.* | \ @@ -152,9 +157,11 @@ exit 0 } -pkg_info-xg() { +pkg_info-xg() +{ for e in $pkg; do - info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d: -f3` + info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | \ + cut -d: -f3` if [ ! -z "$info" ]; then for i in $info; do @@ -172,9 +179,11 @@ exit 0 } -pkg_info-xf() { +pkg_info-xf() +{ for e in $pkg; do - info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d: -f3` + info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | \ + cut -d: -f3` if [ -z "$info" ]; then path=`cd /usr/ports && make search path=/$e.* | \ @@ -202,9 +211,11 @@ exit 0 } -pkg_info-xk() { +pkg_info-xk() +{ for e in $pkg; do - info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d: -f3` + info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | \ + cut -d: -f3` if [ ! -z "$info" ]; then for i in $info; do @@ -222,9 +233,11 @@ exit 0 } -pkg_info-xD() { +pkg_info-xD() +{ for e in $pkg; do - info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d: -f3` + info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | \ + cut -d: -f3` if [ ! -z "$info" ]; then for i in $info; do @@ -242,9 +255,11 @@ exit 0 } -pkg_info-x() { +pkg_info-x() +{ for e in $pkg; do - info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d: -f3` + info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | \ + cut -d: -f3` if [ -z "$info" ]; then path=`cd /usr/ports && make search path=/$e.* | \ @@ -272,15 +287,18 @@ exit 0 } -pkg_ver() { +pkg_ver() +{ echo -e "\033[33m*** installed ***\033[0m" pkg_version -Iv echo "***`pkg_info | wc -l` ports installed ***" exit 0 } -pkg_path() { - path=`cd /usr/ports && make search path=/$pkg | grep -w Path | cut -d/ -f4,5` +pkg_path() +{ + path=`cd /usr/ports && make search path=/$pkg | grep -w Path | \ + cut -d/ -f4,5` for e in $path; do echo "$e" ; cat /usr/ports/$e/Makefile | grep -w COMMENT | \ cut -d= -f2 @@ -288,17 +306,21 @@ exit 0 } -pkg_makefile() { - path=`cd /usr/ports && make search path=/$pkg$ | grep -w Path | cut -d/ -f4,5` - [ -z "$path" ] && missing +pkg_makefile() +{ + path=`cd /usr/ports && make search path=/$pkg$ | grep -w Path | \ + cut -d/ -f4,5` + [ -z "$path" ] && echo "bpkg: can't find the port in /usr/ports/" less /usr/ports/$path/Makefile 2>/dev/null exit 0 } -make_search() { +make_search() +{ for e in $pkg; do - info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d: -f3` + info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | \ + cut -d: -f3` if [ -z "$info" ]; then path=`cd /usr/ports && make search path=/$e | \ grep -w Path | cut -d/ -f4,5` @@ -319,21 +341,24 @@ exit 0 } -make_search_S() { +make_search_S() +{ for e in $pkg; do cd /usr/ports && make search path=/$e done exit 0 } -make_search_info() { +make_search_info() +{ for e in $pkg; do cd /usr/ports && make search info=$e done exit 0 } -pkg_ftp() { +pkg_ftp() +{ arch=`uname -m` sys=`uname -r | cut -d- -f1,2 | tr '[:upper:]' '[:lower:]'` @@ -346,7 +371,8 @@ exit 0 } -pkg_latestftp() { +pkg_latestftp() +{ arch=`uname -m` for e in $pkg; do @@ -358,7 +384,8 @@ exit 0 } -pkg_clean() { +pkg_clean() +{ root echo "Cleaning /usr/ports/distfiles/*" rm -rf /usr/ports/distfiles/* 1>/dev/null 2>&1 @@ -366,7 +393,8 @@ exit 0 } -pkg_clean2() { +pkg_clean2() +{ root echo "Cleaning /usr/ports/distfiles/* and /usr/ports/*/*/work/" rm -rf /usr/ports/distfiles/* 1>/dev/null 2>&1 @@ -375,13 +403,15 @@ exit 0 } -pkg_which-() { +pkg_which-() +{ grep "$pkg"$ /var/db/pkg/*/+CONTENTS | awk -F 'pkg/' '{ print $2 }' | \ sed '/@dirrm/ d ; /@unexec/ d ; /@comment/ d ; s/\/+CONTENTS//g ; s/:@comment .*ORIGIN//g' | awk -F: '{ print $1 ":\t" $2 }' exit 0 } -pkg_backup() { +pkg_backup() +{ root z=`pkg_info -xoQ $pkg 2>/dev/null` @@ -401,16 +431,19 @@ exit 0 } -pkg_time() { +pkg_time() +{ /bin/ls -lUTt /var/db/pkg/ | awk -F' ' '{ print $6,$7,$8,$9,$10 }' | \ cut -d/ -f1,5 echo "***`pkg_info | wc -l` ports installed ***" exit 0 } -make_showc() { +make_showc() +{ for e in $pkg; do - info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d: -f3` + info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | \ + cut -d: -f3` if [ -z "$info" ]; then path=`cd /usr/ports && make search path=/$e.* | \ grep Path | cut -d/ -f4,5` @@ -448,10 +481,12 @@ exit 0 } -make_rmc() { +make_rmc() +{ root for e in $pkg; do - info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d: -f3` + info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | \ + cut -d: -f3` if [ -z "$info" ]; then path=`cd /usr/ports && make search path=/$e.* | \ @@ -490,10 +525,13 @@ exit 0 } -make_config() { +make_config() +{ root for e in $pkg; do - info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d: -f3` + info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | \ + cut -d: -f3` + if [ -z "$info" ]; then path=`cd /usr/ports && make search path=/$e.* | \ grep Path | cut -d/ -f4,5` @@ -531,9 +569,11 @@ exit 0 } -make_ldd() { +make_ldd() +{ for e in $pkg; do - info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d: -f3` + info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | \ + cut -d: -f3` if [ -z "$info" ]; then echo "bpkg: no installed ports match $e" @@ -558,7 +598,8 @@ exit 0 } -make_ldd_all() { +make_ldd_all() +{ echo "" echo "List of all missing dynamic object dependencies:" @@ -760,7 +801,8 @@ exit 0 } -help() { +help() +{ echo "bpkg version `pkg_info -xI bpkg | cut -d- -f2 | cut -d' ' -f1`" echo "" echo "Usage: bpkg [-bdefgiIjkLmMoOpqQrsSwz] pkg-name ..." @@ -772,7 +814,7 @@ } # End of functions -################################################################################ +############################################################################### while getopts b:d:e:f:g:i:I:j:k:L:m:M:o:O:p:q:Q:r:s:S:w:z:cChltvZ opts; do case $opts in @@ -831,4 +873,4 @@ esac done -main +help --- bpkg-2.0.2_1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: