From 7df6b2f6d984824c2d2d37afe5746b41b7cbd7f1 Mon Sep 17 00:00:00 2001
From: Sergey Matveychuk <sem@FreeBSD.org>
Date: Mon, 4 Feb 2008 15:22:00 +0000
Subject: - Update to 2.4.2   Minor bugs was fixed. Thanks to all reporters!

---
 ports-mgmt/portupgrade-devel/Makefile              |  3 +-
 ports-mgmt/portupgrade-devel/distinfo              |  6 ++--
 .../portupgrade-devel/files/patch-bin-portupgrade  | 33 ----------------------
 3 files changed, 4 insertions(+), 38 deletions(-)
 delete mode 100644 ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index 263afc461776..9e4f482c7d0d 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	portupgrade-devel
-PORTVERSION=	2.4.1
-PORTREVISION=	1
+PORTVERSION=	2.4.2
 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 c968367c8c2a..d5d0493eb168 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (pkgtools-2.4.1.tar.bz2) = 948eef56de74207e14be0f4bb9ae1195
-SHA256 (pkgtools-2.4.1.tar.bz2) = f41a63448f2d59c538e9f721bae74d5d652361f474cc7f99763988c52722137c
-SIZE (pkgtools-2.4.1.tar.bz2) = 112846
+MD5 (pkgtools-2.4.2.tar.bz2) = b812cc55ed3adb681ef93ff5d4674fbd
+SHA256 (pkgtools-2.4.2.tar.bz2) = c04943949eee29d1ae3a180bd9925889974d1fb4c908545f009065770abd2d34
+SIZE (pkgtools-2.4.2.tar.bz2) = 112921
diff --git a/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade b/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade
deleted file mode 100644
index e95699d78806..000000000000
--- a/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade
+++ /dev/null
@@ -1,33 +0,0 @@
---- bin/portupgrade.orig	2008-01-31 19:14:25.000000000 +0300
-+++ bin/portupgrade	2008-01-31 19:14:32.000000000 +0300
-@@ -620,11 +620,20 @@
- 	      origin = $pkgdb.origin(task)
- 	      if !origin.nil?
- 		begin
-+		  if config_held?(task)
-+		    STDERR.puts "#{task} is in HOLD_PKG. Ignored."
-+		    $results << PkgResult.new(origin, :ignored, "is in HOLD_PKG")
-+		    not_need_upgrade << task
-+		    next
-+		  end
-+
- 		  name = get_pkgname(origin)
- 		rescue IgnoreMarkError => e
- 		  $results << PkgResult.new(origin, :ignored, e.message)
- 		  not_need_upgrade << task
- 		  next
-+		rescue PortDirError => e
-+		  #STDERR.puts "No port dir for #{task}"
- 		end
- 		name =~ /^(.+)-([^-]+)$/
- 		newversion = PkgVersion.new($2)
-@@ -640,6 +649,9 @@
- 		  upgrade_tasks |= depends
- 		end
- 		install_tasks |= get_notinstalled_depends(origin)
-+	      else
-+		# There is no origin for some reason
-+		not_need_upgrade << task
- 	      end
- 	    end
- 	    upgrade_tasks -= not_need_upgrade
-- 
cgit v1.2.3