Date: Mon, 24 Dec 2007 21:39:10 +0100 (CET) From: Andy Kosela <andy.kosela@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/119001: [MAINTAINER] ports-mgmt/bpkg: update to 1.7.1 Message-ID: <20071224203910.8B4296785D@aegis.um.lublin.pl> Resent-Message-ID: <200712242110.lBOLA48p065024@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 119001 >Category: ports >Synopsis: [MAINTAINER] ports-mgmt/bpkg: update to 1.7.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: Mon Dec 24 21:10:03 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Andy Kosela >Release: FreeBSD 6.2-RELEASE-p4 i386 >Organization: Protect Ya Neck Records/Wu-Tang Management >Environment: System: FreeBSD aegis.um.lublin.pl 6.2-RELEASE-p4 FreeBSD 6.2-RELEASE-p4 #0: Thu Apr 26 17:55:55 UTC 2007 >Description: - Update to 1.7.1 >How-To-Repeat: >Fix: --- bpkg-1.7.1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/ports-mgmt/bpkg/Makefile /usr/home/spear/downloads/bpkg-1.7.1/Makefile --- /usr/ports/ports-mgmt/bpkg/Makefile Thu Dec 13 00:48:51 2007 +++ /usr/home/spear/downloads/bpkg-1.7.1/Makefile Mon Dec 24 11:29:41 2007 @@ -2,13 +2,13 @@ # Date created: 24 June 2007 # Whom: Andy Kosela <andy.kosela@gmail.com> # -# $FreeBSD: ports/ports-mgmt/bpkg/Makefile,v 1.10 2007/12/12 23:48:51 miwi Exp $ +# $FreeBSD$ # # This port is self contained in the files directory. # PORTNAME= bpkg -PORTVERSION= 1.7 +PORTVERSION= 1.7.1 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none diff -ruN --exclude=CVS /usr/ports/ports-mgmt/bpkg/files/bpkg.8 /usr/home/spear/downloads/bpkg-1.7.1/files/bpkg.8 --- /usr/ports/ports-mgmt/bpkg/files/bpkg.8 Thu Dec 13 00:48:52 2007 +++ /usr/home/spear/downloads/bpkg-1.7.1/files/bpkg.8 Mon Dec 24 16:35:07 2007 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" -.Dd November 14, 2007 +.Dd December 24, 2007 .Dt BPKG 8 .Os .Sh NAME @@ -62,7 +62,7 @@ .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/tmp/ from a locally installed package. +create backup package file in /usr/obj/ from a locally installed package. .It Fl c clean all distfiles in /usr/ports/distfiles/* [no arguments] .It Fl C diff -ruN --exclude=CVS /usr/ports/ports-mgmt/bpkg/files/bpkg.sh.in /usr/home/spear/downloads/bpkg-1.7.1/files/bpkg.sh.in --- /usr/ports/ports-mgmt/bpkg/files/bpkg.sh.in Thu Dec 13 00:48:52 2007 +++ /usr/home/spear/downloads/bpkg-1.7.1/files/bpkg.sh.in Mon Dec 24 21:32:47 2007 @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: ports/ports-mgmt/bpkg/files/bpkg.sh.in,v 1.9 2007/12/12 23:48:52 miwi Exp $ +# $FreeBSD$ # Copyright (c) 2007 Andy Kosela <andy.kosela@gmail.com> # All rights reserved. @@ -75,8 +75,8 @@ n) ;; *) if [ ! -z "$e_installed" ]; then - echo -n "Creating backup package in /usr/tmp/$e_installed.tbz... " - cd /usr/tmp/ && pkg_create -b $e_installed + echo -n "Creating backup package in /usr/obj/$e_installed.tbz... " + cd /usr/obj/ && pkg_create -b $e_installed echo "Done." fi @@ -84,6 +84,7 @@ 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." @@ -92,7 +93,7 @@ case $key in n) sed -i '' s,$e,,g /root/ports.lst 1>/dev/null 2>&1;; - *) exit 0;; + *) ;; esac fi @@ -100,14 +101,11 @@ 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 pkg_add -r $e_stripped - exit 0 else echo "Installing new package:" pkg_add -r $e_stripped - exit 0 fi;; esac done @@ -146,8 +144,8 @@ 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/tmp/$e_installed.tbz... " - cd /usr/tmp/ && pkg_create -b $e_installed + echo -n "Creating backup package in /usr/obj/$e_installed.tbz... " + cd /usr/obj/ && pkg_create -b $e_installed echo "Done." fi @@ -155,6 +153,7 @@ 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." @@ -164,8 +163,7 @@ n) sed -i '' s,$e,,g /root/ports.lst 1>/dev/null 2>&1;; *) - unsetenv PACKAGESITE - exit 0;; + unsetenv PACKAGESITE;; esac fi @@ -173,16 +171,13 @@ 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 pkg_add -r $e_stripped unsetenv PACKAGESITE - exit 0 else echo "Installing new package:" pkg_add -r $e_stripped unsetenv PACKAGESITE - exit 0 fi;; esac done @@ -218,8 +213,8 @@ n) ;; *) if [ ! -z "$e_installed" ]; then - echo -n "Creating backup package in /usr/tmp/$e_installed.tbz... " - cd /usr/tmp/ && pkg_create -b $e_installed + echo -n "Creating backup package in /usr/obj/$e_installed.tbz... " + cd /usr/obj/ && pkg_create -b $e_installed echo "Done." fi @@ -230,11 +225,9 @@ echo "Upgrading installed package:" pkg_delete -n $e_installed 1>/dev/null 2>&1 pkg_add -rn $e_stripped - exit 0 else echo "Installing new package:" pkg_add -rn $e_stripped - exit 0 fi;; esac done @@ -270,8 +263,8 @@ n) ;; *) if [ ! -z "$e_installed" ]; then - echo -n "Creating backup package in /usr/tmp/$e_installed.tbz... " - cd /usr/tmp/ && pkg_create -b $e_installed + echo -n "Creating backup package in /usr/obj/$e_installed.tbz... " + cd /usr/obj/ && pkg_create -b $e_installed echo "Done." fi @@ -280,14 +273,15 @@ 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 ***" - exit 0 fi else echo "Installing new port:" + touch /root/ports.lst echo $e >> /root/ports.lst fi @@ -298,18 +292,13 @@ read key case $key in y) cd /usr/ports/$e && make config-recursive - cd /usr/ports/$e && make install clean - exit 0;; + cd /usr/ports/$e && make install clean;; *) cd /usr/ports/$e && make config - cd /usr/ports/$e && make install clean - exit 0;; + cd /usr/ports/$e && make install clean;; esac;; - *) cd /usr/ports/$e && make install clean - exit 0;; - esac - exit 0;; - + *) cd /usr/ports/$e && make install clean;; + esac;; esac done done @@ -650,6 +639,7 @@ 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 @@ -710,9 +700,9 @@ fi pkg_install=`pkg_info -xoQ $pkg | cut -d: -f1 | awk '{ORS=" " ; print}'` - echo "Creating backup package(s) "$pkg_install"in /usr/tmp/" + echo "Creating backup package(s) "$pkg_install"in /usr/obj/" for e in `pkg_info -xoq $pkg`; do - cd /usr/tmp/ && pkg_create -xb $e + cd /usr/obj/ && pkg_create -xb $e done echo "Done." exit 0 @@ -865,8 +855,8 @@ n) ;; *) if [ ! -z "$e_installed" ]; then - echo -n "Creating backup package in /usr/tmp/$e_installed.tbz... " - cd /usr/tmp/ && pkg_create -b $e_installed + echo -n "Creating backup package in /usr/obj/$e_installed.tbz... " + cd /usr/obj/ && pkg_create -b $e_installed echo "Done." fi --- bpkg-1.7.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071224203910.8B4296785D>