From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jun 19 22:10:02 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 4D67A1065674 for ; Thu, 19 Jun 2008 22:10:02 +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 1B8F48FC15 for ; Thu, 19 Jun 2008 22:10:02 +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 m5JMA2iG058727 for ; Thu, 19 Jun 2008 22:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m5JMA2h3058726; Thu, 19 Jun 2008 22:10:02 GMT (envelope-from gnats) Resent-Date: Thu, 19 Jun 2008 22:10:02 GMT Resent-Message-Id: <200806192210.m5JMA2h3058726@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 B63D7106566C for ; Thu, 19 Jun 2008 22:04:19 +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 6DCA68FC22 for ; Thu, 19 Jun 2008 22:04:18 +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 8E10867862 for ; Thu, 19 Jun 2008 23:45:57 +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 ARDG35oE8oHt for ; Thu, 19 Jun 2008 23:45:55 +0200 (CEST) Received: by aegis.um.lublin.pl (Postfix, from userid 0) id 6695367861; Thu, 19 Jun 2008 23:45:55 +0200 (CEST) Message-Id: <20080619214555.6695367861@aegis.um.lublin.pl> Date: Thu, 19 Jun 2008 23:45:55 +0200 (CEST) From: Andy Kosela To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/124769: [MAINTAINER-UPDATE] ports-mgmt/bpkg: update to 2.0 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: Thu, 19 Jun 2008 22:10:02 -0000 >Number: 124769 >Category: ports >Synopsis: [MAINTAINER-UPDATE] ports-mgmt/bpkg: update to 2.0 >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: Thu Jun 19 22:10:01 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: - Update to 2.0 Switched focus of application from all-in-one to purely informational tool about ports. >How-To-Repeat: >Fix: --- bpkg-2.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/ports-mgmt/bpkg/Makefile /usr/home/akosela/downloads/bpkg-2.0/Makefile --- /usr/ports/ports-mgmt/bpkg/Makefile Wed Mar 26 14:00:23 2008 +++ /usr/home/akosela/downloads/bpkg-2.0/Makefile Thu Jun 19 21:02:36 2008 @@ -2,19 +2,19 @@ # Date created: 24 June 2007 # Whom: Andy Kosela # -# $FreeBSD: ports/ports-mgmt/bpkg/Makefile,v 1.13 2008/03/26 13:00:23 miwi Exp $ +# $FreeBSD$ # # This port is self contained in the files directory. # PORTNAME= bpkg -PORTVERSION= 1.7.3 +PORTVERSION= 2.0 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none MAINTAINER= andy.kosela@gmail.com -COMMENT= Simple tool for managing FreeBSD packages/ports +COMMENT= Simple tool for displaying information about ports NO_BUILD= yes SUB_FILES= bpkg.sh diff -ruN --exclude=CVS /usr/ports/ports-mgmt/bpkg/files/bpkg.8 /usr/home/akosela/downloads/bpkg-2.0/files/bpkg.8 --- /usr/ports/ports-mgmt/bpkg/files/bpkg.8 Thu Dec 27 23:51:27 2007 +++ /usr/home/akosela/downloads/bpkg-2.0/files/bpkg.8 Thu Jun 19 23:37:43 2008 @@ -23,111 +23,85 @@ .\" SUCH DAMAGE. .\" .\" -.Dd December 24, 2007 +.Dd June 19, 2008 .Dt BPKG 8 .Os .Sh NAME .Nm bpkg -.Nd a simple tool for managing FreeBSD packages/ports. +.Nd a simple tool for displaying information about ports. .Sh SYNOPSIS .Nm -.Op Fl bBdDeEfFgiIjkLmMnoOpqQrsSwz +.Op Fl bdeEfgiIjkLmMoOpqQrsSwz .Ar pkg-name ... .Nm -.Op Fl aAcChltvZ +.Op Fl cChltvZ .Pp .Sh DESCRIPTION .Nm -is a simple tool written in sh(1) for managing FreeBSD packages/ports. It is a -wrapper around base system utilities manipulating the FreeBSD Ports Collection. -The main goal of this project is to provide one universal tool for -packages/ports management. -.Sh TERMINOLOGY -.An Nm Port -- a software ready to be compiled from source using the Ports Collection -framework. -.Pp -.An Nm Package -- an installed software (from binary package or port) or a binary package file -in .tbz format made from a port. +is a simple tool written in sh(1) for displaying information about ports. Its +main goal is to provide a quick way to display all kinds of useful info about +installed ports and the whole ports tree. .Sh OPTIONS The following command line arguments are supported: .Bl -tag -width F1 -.It Ar pkg-name ... -with no additional arguments, upgrade/install the specified packages from -RELEASE repository. -.It Fl a -upgrade all installed packages (interactive mode). [no arguments] -.It Fl A -upgrade all installed packages (non-interactive mode). [no arguments] .It Fl b -upgrade/install the specified ports, update the list of installed ports in /root/ports.lst. -.It Fl B -create backup package file in /usr/obj/ from a locally installed package. +create backup package file in /usr/obj/ from a locally installed port. .It Fl c clean all distfiles in /usr/ports/distfiles/* [no arguments] .It Fl C clean all distfiles in /usr/ports/distfiles/* and also all working directories of the ports tree /usr/ports/*/*/work/ [no arguments] .It Fl d -delete the specified installed package. -.It Fl D -display description of the package/port. +display description of the port. .It Fl e -configure options for the specified package/port using dialog(1). -.It Fl E -compile and install any dependencies of the specified package/port and then -compile and install the port itself. +configure options for the specified port using dialog(1). .It Fl f -show the packing list instructions for the package/port. -.It Fl F -show the latest available binary package in the FreeBSD repository. [-RELEASE] +show the packing list instructions for the port. .It Fl g show files that do not match the recorded checksum in the specified installed -package. +port. .It Fl h display help. [no arguments] .It Fl i -display info about the package/port (priority - installed packages). +display info about the port (priority - installed ports). .It Fl I -display short info about the package/port (priority - installed packages). +display short info about the port (priority - installed ports). .It Fl j search the ports tree according to ports' descriptions. .It Fl k -show the deinstall script (if any) for the installed package. +show the deinstall script (if any) for the installed port. .It Fl l -display short info about all installed packages. [no arguments] +display short info about all installed ports. [no arguments] .It Fl L -show the files within the installed package. +show the files within the installed port. .It Fl m -display package/port's Makefile. +display port's Makefile. .It Fl M -show the install-message file for the installed package. -.It Fl n -simulation mode, do not actually install a package/port. +show the install-message file for the installed port. .It Fl o -display config options for the specified package/port. +display config options for the specified port. .It Fl O -remove config options for the specified package/port. +remove config options for the specified port. .It Fl p search the ports tree and display short info about the port. .It Fl q -upgrade/install the specified packages from -STABLE repository. +show the latest available package in the FreeBSD repository. [-RELEASE] .It Fl Q -show the latest available binary package in the FreeBSD repository. [-STABLE] +show the latest available package in the FreeBSD repository. [-STABLE] .It Fl r -show the list of all package/port's dependencies. +show the list of all port's dependencies. .It Fl s -show the total size occupied by files installed within the package. +show the total size occupied by files installed within the port. .It Fl S search the ports tree and display info about the port. .It Fl t -list all installed packages and dates of their installation. [no arguments] +list all installed ports and dates of their installation. [no arguments] .It Fl w -which installed package owns the specified file. +which installed port owns the specified file. .It Fl v -list all installed packages and possible upgrades. [no arguments] +list all installed ports and possible upgrades. [no arguments] .It Fl z -display dynamic object dependencies for the specified package. +display dynamic object dependencies for the specified port. .It Fl Z display all missing dynamic object dependencies. [no arguments] .El @@ -139,17 +113,9 @@ .Nm command: .Pp -.Dl Ar "# bpkg foo" +.Dl Ar "> bpkg -i foo" .Pp -Upgrade or install a package named foo (root privileges required). -.Pp -.Dl Ar "# bpkg -b foo" -.Pp -Upgrade or install a port named foo (root privileges required). -.Pp -.Dl Ar "> bpkg -i 'foo bar'" -.Pp -Display info about packages/ports foo and bar. +Display info about port foo. .Pp .Dl Ar "> bpkg -S 'foo[0-9]+$'" .Pp @@ -157,7 +123,7 @@ .Pp .Dl Ar "> bpkg -t | head" .Pp -Display 10 most recently installed packages. +Display 10 most recently installed ports. .Sh SEE ALSO .Xr pkg_add 1 , .Xr pkg_create 1 , diff -ruN --exclude=CVS /usr/ports/ports-mgmt/bpkg/files/bpkg.sh.in /usr/home/akosela/downloads/bpkg-2.0/files/bpkg.sh.in --- /usr/ports/ports-mgmt/bpkg/files/bpkg.sh.in Wed Mar 26 14:00:24 2008 +++ /usr/home/akosela/downloads/bpkg-2.0/files/bpkg.sh.in Thu Jun 19 23:13:08 2008 @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: ports/ports-mgmt/bpkg/files/bpkg.sh.in,v 1.12 2008/03/26 13:00:24 miwi Exp $ +# $FreeBSD$ # Copyright (c) 2007 Andy Kosela # All rights reserved. @@ -47,303 +47,7 @@ } main() { - root - if [ -z "$pkg" ]; then - echo "bpkg: you didn't specify any package to install/upgrade" - exit 0 - fi - - echo "Available in ports:" - for e in $pkg; do - cd /usr/ports && make search path=/$e.* | awk '/Port/ /Path/ { print $0 "\n" }' - done - - for z in $pkg; do - pkg_install=`cd /usr/ports && make search path=/$z.* | grep Path | cut -d/ -f4,5` - - for e in $pkg_install; do - e_stripped=`echo $e | cut -d/ -f2` - e_installed=`grep $e$ /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d/ -f5` - - if [ -z "$e_installed" ]; then - echo -n "Do you want to install new $e? [y] " - else - echo -n "Do you want to upgrade installed $e_installed? [y] " - fi - read key - case $key in - n) ;; - *) - if [ ! -z "$e_installed" ]; then - echo -n "Creating backup package in /usr/obj/$e_installed.tbz... " - cd /usr/obj/ && pkg_create -b $e_installed - echo "Done." - fi - - # Fetch and install binary package - - echo "" - if [ ! -z "$e_installed" ]; then - touch /root/ports.lst - if [ ! -z "`grep $e /root/ports.lst`" ]; then - echo "It seems you installed this package using ports." - echo "It is strongly recommended to upgrade it using also ports." - echo -n "Do you want to cancel this binary upgrade process? [y] " - read key - case $key in - n) - sed -i '' s,$e,,g /root/ports.lst 1>/dev/null 2>&1;; - *) ;; - esac - fi - - echo "Upgrading installed package:" - pkg_delete -f $e_installed 1>/dev/null 2>&1 - if [ ! -z `pkg_info -oq $e_installed 2>/dev/null` ]; then - echo "*** cannot proceed without first removing the package ***" - fi - pkg_add -r $e_stripped - else - echo "Installing new package:" - pkg_add -r $e_stripped - fi;; - esac - done - done -} - -pkg_latest() { - root - if [ -z "$pkg" ]; then - echo "bpkg: you didn't specify any package to install/upgrade" - exit 0 - fi - - echo "Available in ports:" - for e in $pkg; do - cd /usr/ports && make search path=/$e.* | awk '/Port/ /Path/ { print $0 "\n" }' - done - - for z in $pkg; do - pkg_install=`cd /usr/ports && make search path=/$z.* | grep Path | cut -d/ -f4,5` - - for e in $pkg_install; do - e_stripped=`echo $e | cut -d/ -f2` - e_installed=`grep $e$ /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d/ -f5` - - if [ -z "$e_installed" ]; then - echo -n "Do you want to install new $e? [y] " - else - echo -n "Do you want to upgrade installed $e_installed? [y] " - fi - read key - case $key in - n) ;; - *) - arch=`uname -m` - setenv PACKAGESITE ftp://ftp.freebsd.org/pub/FreeBSD/ports/$arch/packages-stable/Latest/ - - if [ ! -z "$e_installed" ]; then - echo -n "Creating backup package in /usr/obj/$e_installed.tbz... " - cd /usr/obj/ && pkg_create -b $e_installed - echo "Done." - fi - - # Fetch and install binary package - - echo "" - if [ ! -z "$e_installed" ]; then - touch /root/ports.lst - if [ ! -z "`grep $e /root/ports.lst`" ]; then - echo "It seems you installed this package using ports." - echo "It is strongly recommended to upgrade it using also ports." - echo -n "Do you want to cancel this binary upgrade process? [y] " - read key - case $key in - n) - sed -i '' s,$e,,g /root/ports.lst 1>/dev/null 2>&1;; - *) - unsetenv PACKAGESITE;; - esac - fi - - echo "Upgrading installed package:" - pkg_delete -f $e_installed 1>/dev/null 2>&1 - if [ ! -z `pkg_info -oq $e_installed 2>/dev/null` ]; then - echo "*** cannot proceed without first removing the package ***" - fi - pkg_add -r $e_stripped - unsetenv PACKAGESITE - else - echo "Installing new package:" - pkg_add -r $e_stripped - unsetenv PACKAGESITE - fi;; - esac - done - done -} - -simulation() { - root - if [ -z "$pkg" ]; then - echo "bpkg: you didn't specify any package to install/upgrade" - exit 0 - fi - - echo "Available in ports:" - for e in $pkg; do - cd /usr/ports && make search path=/$e.* | awk '/Port/ /Path/ { print $0 "\n" }' - done - - for z in $pkg; do - pkg_install=`cd /usr/ports && make search path=/$z.* | grep Path | cut -d/ -f4,5` - - for e in $pkg_install; do - e_stripped=`echo $e | cut -d/ -f2` - e_installed=`grep $e$ /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d/ -f5` - - if [ -z "$e_installed" ]; then - echo -n "Do you want to install new $e? [y] " - else - echo -n "Do you want to upgrade installed $e_installed? [y] " - fi - read key - case $key in - n) ;; - *) - if [ ! -z "$e_installed" ]; then - echo -n "Creating backup package in /usr/obj/$e_installed.tbz... " - cd /usr/obj/ && pkg_create -b $e_installed - echo "Done." - fi - - # Fetch and install binary package - - echo "" - if [ ! -z "$e_installed" ]; then - echo "Upgrading installed package:" - pkg_delete -n $e_installed 1>/dev/null 2>&1 - pkg_add -rn $e_stripped - else - echo "Installing new package:" - pkg_add -rn $e_stripped - fi;; - esac - done - done -} - -build_port() { - root - if [ -z "$pkg" ]; then - echo "bpkg: you didn't specify any package to install/upgrade" - exit 0 - fi - - echo "Available in ports:" - for e in $pkg; do - cd /usr/ports && make search path=/$e.* | awk '/Port/ /Path/ { print $0 "\n" }' - done - - for z in $pkg; do - pkg_install=`cd /usr/ports && make search path=/$z.* | grep Path | cut -d/ -f4,5` - - for e in $pkg_install; do - e_stripped=`echo $e | cut -d/ -f2` - e_installed=`grep $e$ /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d/ -f5` - - if [ -z "$e_installed" ]; then - echo -n "Do you want to install new $e? [y] " - else - echo -n "Do you want to upgrade installed $e_installed? [y] " - fi - read key - case $key in - n) ;; - *) - if [ ! -z "$e_installed" ]; then - echo -n "Creating backup package in /usr/obj/$e_installed.tbz... " - cd /usr/obj/ && pkg_create -b $e_installed - echo "Done." - fi - - # Install from port (source) - - echo "" - if [ ! -z "$e_installed" ]; then - echo "Upgrading installed port:" - touch /root/ports.lst - [ -z "`grep $e /root/ports.lst`" ] && echo $e >> /root/ports.lst - pkg_delete -f $e_installed 1>/dev/null 2>&1 - if [ ! -z `pkg_info -oq $e_installed 2>/dev/null` ]; then - echo "*** cannot proceed without first removing the package ***" - fi - else - echo "Installing new port:" - touch /root/ports.lst - echo $e >> /root/ports.lst - fi - - echo -n "Do you want to explicitly set config options now? [n] " - read key2 - case $key2 in - y) echo -n "Recursive? [n] " - read key - case $key in - y) cd /usr/ports/$e && make config-recursive - cd /usr/ports/$e && make install clean;; - *) cd /usr/ports/$e && make config - cd /usr/ports/$e && make install clean;; - esac;; - - *) cd /usr/ports/$e && make install clean;; - esac;; - esac - done - done -} - -all() { - root - echo "" - echo -n "Do you want to upgrade all installed packages using binary packages? (interactive mode) [y] " - read key - - case $key in - n) echo "Upgrading all ports:" - all=`pkg_info -aoq` - pkg_delete -ifa - for e in $all; do - cd /usr/ports/$e && make install clean - done - exit 0;; - *) echo "Upgrading all packages:" - all=`ls -l /var/db/pkg/ | awk '{print $9}' | sed 's/\(.*\)-.*/\1/g' | awk '{ORS=" " ;print}'` - pkg_delete -ifa && pkg_add -r $all - exit 0;; - esac -} - -all_non-interactive() { - root - echo "" - echo -n "Do you want to upgrade all installed packages using binary packages? (non-interactive mode) [y] " - read key - - case $key in - n) echo "Upgrading all ports:" - all=`pkg_info -aoq` - pkg_delete -fa - for e in $all; do - cd /usr/ports/$e && make install clean - done - exit 0;; - *) echo "Upgrading all packages:" - all=`ls -l /var/db/pkg/ | awk '{print $9}' | sed 's/\(.*\)-.*/\1/g' | awk '{ORS=" " ;print}'` - pkg_delete -fa && pkg_add -r $all - exit 0;; - esac + help } pkg_info-xI() { @@ -376,7 +80,7 @@ pkg_info -L `grep $i /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d/ -f5` done else - echo "bpkg: no installed packages match $e" + echo "bpkg: no installed ports match $e" fi done exit 0 @@ -385,7 +89,7 @@ pkg_inf() { echo -e "\033[33m*** installed ***\033[0m" pkg_info - echo "***`pkg_info | wc -l` packages installed ***" + echo "***`pkg_info | wc -l` ports installed ***" exit 0 } @@ -401,7 +105,7 @@ pkg_info -s `grep $i /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d/ -f5` done else - echo "bpkg: no installed packages match $e" + echo "bpkg: no installed ports match $e" fi done exit 0 @@ -450,7 +154,7 @@ pkg_info -g `grep $i /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d/ -f5` done else - echo "bpkg: no installed packages match $e" + echo "bpkg: no installed ports match $e" fi done exit 0 @@ -494,28 +198,28 @@ pkg_info -k `grep $i /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d/ -f5` done else - echo "bpkg: no installed packages match $e" + echo "bpkg: no installed ports match $e" fi done exit 0 } pkg_info-xD() { - for e in $pkg; do - info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d: -f3` - - if [ ! -z "$info" ]; then - for i in $info; do - echo -e "\033[33m*** installed ***\033[0m" - echo "$i: `grep $i /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d/ -f5`" - echo "" - pkg_info -D `grep $i /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d/ -f5` - done - else - echo "bpkg: no installed packages match $e" - fi - done - exit 0 + for e in $pkg; do + info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d: -f3` + + if [ ! -z "$info" ]; then + for i in $info; do + echo -e "\033[33m*** installed ***\033[0m" + echo "$i: `grep $i /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d/ -f5`" + echo "" + pkg_info -D `grep $i /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d/ -f5` + done + else + echo "bpkg: no installed ports match $e" + fi + done + exit 0 } pkg_info-x() { @@ -547,7 +251,7 @@ pkg_ver() { echo -e "\033[33m*** installed ***\033[0m" pkg_version -Iv - echo "***`pkg_info | wc -l` packages installed ***" + echo "***`pkg_info | wc -l` ports installed ***" exit 0 } @@ -603,7 +307,7 @@ exit 0 } -pkg_find() { +pkg_ftp() { arch=`uname -m` sys=`uname -r | cut -d- -f1,2 | tr '[:upper:]' '[:lower:]'` @@ -628,45 +332,6 @@ exit 0 } -pkg_delete-xr() { - root - z=`pkg_info -xoQ $pkg 2>/dev/null` - - if [ -z "$z" ]; then - echo "bpkg: no installed packages match pattern(s)" - exit 0 - fi - - echo -e "\033[33m*** installed ***\033[0m" - pkg_info -xoQ $pkg | awk -F: '{OFS=": " ; print $2, $1}' - touch /root/ports.lst - for e in $pkg; do - sed -i '' s,.*$e,,g /root/ports.lst 1>/dev/null 2>&1 - done - echo "" - echo -n "Do you want to use recursive removal? [n] " - read key - - case $key in - y) echo -n "Do you want to use force removal? [n] " - read key2 - case $key2 in - y) pkg_delete -xrfi $pkg - exit 0;; - *) pkg_delete -xri $pkg - exit 0;; - esac;; - *) echo -n "Do you want to use force removal? [n] " - read key2 - case $key2 in - y) pkg_delete -xf $pkg - exit 0;; - *) pkg_delete -x $pkg - exit 0;; - esac;; - esac -} - pkg_clean() { root echo "Cleaning /usr/ports/distfiles/*" @@ -695,7 +360,7 @@ z=`pkg_info -xoQ $pkg 2>/dev/null` if [ -z "$z" ]; then - echo "bpkg: no installed packages match pattern(s)" + echo "bpkg: no installed ports match pattern(s)" exit 0 fi @@ -710,7 +375,7 @@ pkg_time() { echo "Packages (date of installation):" /bin/ls -lUTt /var/db/pkg/ | awk -F' ' '{ print $6,$7,$8,$9,$10 }' | cut -d/ -f1,5 - echo "***`pkg_info | wc -l` packages installed ***" + echo "***`pkg_info | wc -l` ports installed ***" exit 0 } @@ -824,81 +489,12 @@ exit 0 } -make_depends() { - root - if [ -z "$pkg" ]; then - echo "bpkg: you didn't specify any package to install/upgrade" - exit 0 - fi - - echo "Available in ports:" - for i in $pkg; do - cd /usr/ports && make search path=/$e.* | awk '/Port/ /Path/ { print $0 "\n" }' - done - - for z in $pkg; do - pkg_install=`cd /usr/ports && make search path=/$z.* | grep Path | cut -d/ -f4,5` - - for e in $pkg_install; do - e_stripped=`echo $e | cut -d/ -f2` - e_installed=`grep $e$ /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d/ -f5` - - if [ -z "$e_installed" ]; then - echo -n "Do you want to install new $e? [y] " - else - echo -n "Do you want to upgrade installed $e_installed? [y] " - fi - read key - case $key in - n) ;; - *) - if [ ! -z "$e_installed" ]; then - echo -n "Creating backup package in /usr/obj/$e_installed.tbz... " - cd /usr/obj/ && pkg_create -b $e_installed - echo "Done." - fi - - echo "" - if [ ! -z "$e_installed" ]; then - echo "Upgrading installed port and all dependencies:" - pkg_delete -f $e_installed 1>/dev/null 2>&1 - if [ ! -z `pkg_info -oq $e_installed 2>/dev/null` ]; then - echo "*** cannot proceed without first removing the package ***" - exit 0 - fi - else - echo "Installing new port and all dependencies:" - fi - - echo -n "Do you want to explicitly set config options now? [n] " - read key2 - case $key2 in - y) echo -n "Recursive? [n] " - read key - case $key in - y) cd /usr/ports/$e && make config-recursive - cd /usr/ports/$e && make depends && make install clean - exit 0;; - *) cd /usr/ports/$e && make config - cd /usr/ports/$e && make depends && make install clean - exit 0;; - esac;; - - *) cd /usr/ports/$e && make depends && make install clean - exit 0;; - esac - exit 0;; - esac - done - done -} - make_ldd() { for e in $pkg; do info=`grep $e /var/db/pkg/*/+CONTENTS | grep -w ORIGIN | cut -d: -f3` if [ -z "$info" ]; then - echo "bpkg: no installed packages match $e" + echo "bpkg: no installed ports match $e" else for i in $info; do echo -e "\033[33m*** installed ***\033[0m" @@ -1109,8 +705,8 @@ help() { echo "bpkg version `pkg_info -xI bpkg | cut -d- -f2 | cut -d' ' -f1`" echo "" - echo "Usage: bpkg [-bBdDeEfFgiIjkLmMnoOpqQrsSwz] pkg-name ..." - echo " bpkg [-aAcChltvZ]" + echo "Usage: bpkg [-bdefgiIjkLmMoOpqQrsSwz] pkg-name ..." + echo " bpkg [-cChltvZ]" echo "" echo "Please see the bpkg(8) man page for more information" echo "" @@ -1120,24 +716,16 @@ # End of functions ################################################################################ -while getopts b:B:d:D:e:E:f:F:g:i:I:j:k:L:m:M:n:o:O:p:q:Q:r:s:S:w:z:aAcChltvZ opts; do +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 b) pkg=$OPTARG - build_port;; - B) pkg=$OPTARG - pkg_backup;; + pkg_backup;; d) pkg=$OPTARG - pkg_delete-xr;; - D) pkg=$OPTARG pkg_info-x;; e) pkg=$OPTARG make_config;; - E) pkg=$OPTARG - make_depends;; f) pkg=$OPTARG pkg_info-xf;; - F) pkg=$OPTARG - pkg_find;; g) pkg=$OPTARG pkg_info-xg;; i) pkg=$OPTARG @@ -1154,8 +742,6 @@ pkg_makefile;; M) pkg=$OPTARG pkg_info-xD;; - n) pkg=$OPTARG - simulation;; o) pkg=$OPTARG make_showc;; O) pkg=$OPTARG @@ -1163,7 +749,7 @@ p) pkg=$OPTARG pkg_path;; q) pkg=$OPTARG - pkg_latest;; + pkg_ftp;; Q) pkg=$OPTARG pkg_latestftp;; r) pkg=$OPTARG @@ -1176,8 +762,6 @@ pkg_which-;; z) pkg=$OPTARG make_ldd;; - a) all;; - A) all_non-interactive;; c) pkg_clean;; C) pkg_clean2;; h) help;; diff -ruN --exclude=CVS /usr/ports/ports-mgmt/bpkg/pkg-descr /usr/home/akosela/downloads/bpkg-2.0/pkg-descr --- /usr/ports/ports-mgmt/bpkg/pkg-descr Tue Jul 3 16:17:22 2007 +++ /usr/home/akosela/downloads/bpkg-2.0/pkg-descr Thu Jun 19 23:36:35 2008 @@ -1,7 +1,6 @@ -bpkg is a simple tool written in sh(1) for managing FreeBSD packages/ports. It -is a wrapper around base system utilities manipulating the FreeBSD Ports -Collection. The main goal of this project is to provide one universal tool for -packages/ports management. +bpkg is a simple tool written in sh(1) for displaying information about ports. +Its main goal is to provide a quick way to display all kinds of useful info +about installed ports and the whole ports tree. -- Andy Kosela --- bpkg-2.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: