ports/115587: [MAINTAINER-UPDATE] ports-mgmt/bpkg: update to 1.4

[Andy Kosela]

>Number:         115587
>Category:       ports
>Synopsis:       [MAINTAINER-UPDATE] ports-mgmt/bpkg: update to 1.4
>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 Aug 16 20:40:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Andy Kosela
>Release:        FreeBSD 6.2-RELEASE-p2 i386
>Organization:
Protect Ya Neck Records/Wu-Tang Management
>Environment:
System: FreeBSD aegis.um.lublin.pl 6.2-RELEASE-p2 FreeBSD 6.2-RELEASE-p2 #0: Tue Feb 27 22:56:09 UTC 2007
>Description:
- Update to 1.4

>How-To-Repeat:
>Fix:

--- bpkg-1.4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/ports-mgmt/bpkg/Makefile /usr/home/spear/downloads/bpkg-1.4/Makefile
--- /usr/ports/ports-mgmt/bpkg/Makefile	Sat Aug 11 12:06:29 2007
+++ /usr/home/spear/downloads/bpkg-1.4/Makefile	Thu Aug 16 22:08:18 2007
@@ -2,13 +2,13 @@
 # Date created:				24 June 2007
 # Whom:					Andy Kosela <andy.kosela at gmail.com>
 #
-# $FreeBSD: ports/ports-mgmt/bpkg/Makefile,v 1.5 2007/08/11 10:06:29 rafan Exp $
+# $FreeBSD$
 #
 # This port is self contained in the files directory.
 #
 
 PORTNAME=	bpkg
-PORTVERSION=	1.3
+PORTVERSION=	1.4
 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.4/files/bpkg.8
--- /usr/ports/ports-mgmt/bpkg/files/bpkg.8	Sat Aug 11 12:06:30 2007
+++ /usr/home/spear/downloads/bpkg-1.4/files/bpkg.8	Thu Aug 16 22:29:25 2007
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"
-.Dd August 7, 2007
+.Dd August 16, 2007
 .Dt BPKG 8
 .Os
 .Sh NAME
@@ -60,7 +60,7 @@
 .It Fl A
 upgrade all installed packages (non-interactive mode). [no arguments]
 .It Fl b
-upgrade/install the specified ports.
+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.
 .It Fl c
diff -ruN --exclude=CVS /usr/ports/ports-mgmt/bpkg/files/bpkg.sh.in /usr/home/spear/downloads/bpkg-1.4/files/bpkg.sh.in
--- /usr/ports/ports-mgmt/bpkg/files/bpkg.sh.in	Sat Aug 11 12:06:30 2007
+++ /usr/home/spear/downloads/bpkg-1.4/files/bpkg.sh.in	Thu Aug 16 22:00:44 2007
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: ports/ports-mgmt/bpkg/files/bpkg.sh.in,v 1.4 2007/08/11 10:06:30 rafan Exp $
+# $FreeBSD$
 
 #  Copyright (c) 2007 Andy Kosela <andy.kosela at gmail.com>
 #  All rights reserved.
@@ -84,6 +84,18 @@
 
 				echo ""
 				if [ ! -z "$e_installed" ]; then
+					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 ;;
+							*) exit 0;;
+						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
@@ -193,6 +205,7 @@
 				echo ""
 				if [ ! -z "$e_installed" ]; then
 					echo "Upgrading installed port:"
+					[ -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 ***"
@@ -200,6 +213,7 @@
 					fi
 				else
 					echo "Installing new port:"
+					echo $e >> /root/ports.lst
 				fi
 
 				echo -n "Do you want to explicitly set config options now? [n] "
@@ -541,6 +555,9 @@
 
 	echo -e "\033[33m*** installed ***\033[0m"
 	pkg_info -xoQ $pkg | awk -F: '{OFS=": " ; print $2, $1}'
+	for e in $pkg; do 
+		sed -i '' s,.*$e,,g /root/ports.lst 
+	done
 	echo ""
 	echo -n "Do you want to use recursive removal? [n] "
 	read key
--- bpkg-1.4.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: