- Upgrade both ports to 2.4.3

  * Change a legacy part of code for gathering dependecies. It fixes
    situation when some depends ports could be updated even when it
    was up-to-date. As a result I added another check for -R option.
  * Fix a wrong condition in portsclean. Now -L option works again.
  * Change a semantic for -q option. Now it means 'quiet'. Don't
    show a message when -N specified and there is an already installed
    package. (Made for DesktopBSD).

Reported by:	pav, Peter Hofer (DesktopBSD)

5 files changed, 8 insertions, 41 deletions

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 9e4f482c7d0..8d532e4072f 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	portupgrade-devel
-PORTVERSION=	2.4.2
+PORTVERSION=	2.4.3
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	portupgrade
diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo
index d5d0493eb16..057f8e50731 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (pkgtools-2.4.2.tar.bz2) = b812cc55ed3adb681ef93ff5d4674fbd
-SHA256 (pkgtools-2.4.2.tar.bz2) = c04943949eee29d1ae3a180bd9925889974d1fb4c908545f009065770abd2d34
-SIZE (pkgtools-2.4.2.tar.bz2) = 112921
+MD5 (pkgtools-2.4.3.tar.bz2) = ad834bac92a2e3f2a0cfbf899e267c0c
+SHA256 (pkgtools-2.4.3.tar.bz2) = 5060f4c38a8e6728eae450a46ecdf9ec4971c70b5b731f82e824a4b7fdbdf259
+SIZE (pkgtools-2.4.3.tar.bz2) = 113215
diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index a7fbbc1dda1..64e4ba54c4a 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	2.4.2
-PORTREVISION=	1
+PORTVERSION=	2.4.3
 PORTEPOCH=	2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
diff --git a/ports-mgmt/portupgrade/distinfo b/ports-mgmt/portupgrade/distinfo
index d5d0493eb16..057f8e50731 100644
--- a/ports-mgmt/portupgrade/distinfo
+++ b/ports-mgmt/portupgrade/distinfo
@@ -1,3 +1,3 @@
-MD5 (pkgtools-2.4.2.tar.bz2) = b812cc55ed3adb681ef93ff5d4674fbd
-SHA256 (pkgtools-2.4.2.tar.bz2) = c04943949eee29d1ae3a180bd9925889974d1fb4c908545f009065770abd2d34
-SIZE (pkgtools-2.4.2.tar.bz2) = 112921
+MD5 (pkgtools-2.4.3.tar.bz2) = ad834bac92a2e3f2a0cfbf899e267c0c
+SHA256 (pkgtools-2.4.3.tar.bz2) = 5060f4c38a8e6728eae450a46ecdf9ec4971c70b5b731f82e824a4b7fdbdf259
+SIZE (pkgtools-2.4.3.tar.bz2) = 113215
diff --git a/ports-mgmt/portupgrade/files/patch-bin-portupgrade b/ports-mgmt/portupgrade/files/patch-bin-portupgrade
deleted file mode 100644
index 57abf029ebd..00000000000
--- a/ports-mgmt/portupgrade/files/patch-bin-portupgrade
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: bin/portupgrade
-===================================================================
-RCS file: /cvsroot/portupgrade/pkgtools/bin/portupgrade,v
-retrieving revision 1.49
-retrieving revision 1.50
-diff -u -r1.49 -r1.50
---- bin/portupgrade	4 Feb 2008 11:34:20 -0000	1.49
-+++ bin/portupgrade	10 Feb 2008 12:04:39 -0000	1.50
-@@ -617,7 +617,11 @@
- 	    not_need_upgrade = []
- 	    upgrade_tasks.each do |task|
- 	      pkg = PkgInfo.new(task)
--	      origin = $pkgdb.origin(task)
-+	      if task == first && $origin
-+		origin = $origin
-+	      else
-+		origin = $pkgdb.origin(task)
-+	      end
- 	      if !origin.nil?
- 		begin
- 		  name = get_pkgname(origin)
-@@ -625,6 +629,10 @@
- 		  $results << PkgResult.new(origin, :ignored, e.message)
- 		  not_need_upgrade << task
- 		  next
-+		rescue PortDirError => e
-+		  $results << PkgResult.new(origin, :ignored, e.message)
-+		  not_need_upgrade << task
-+		  next
- 		end
- 		if name == ''
- 		  warning_message "There are errors in a meta info for #{task}"