6 files changed, 27 insertions, 72 deletions

diff --git a/ports-mgmt/portupgrade-devel/Makefile b/ports-mgmt/portupgrade-devel/Makefile
index b9995529b308..f8985a3f7cec 100644
--- a/ports-mgmt/portupgrade-devel/Makefile
+++ b/ports-mgmt/portupgrade-devel/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	portupgrade
-PORTVERSION=	2.1.4
-PORTREVISION=	5
-PORTEPOCH=	1
+PORTVERSION=	2.1.1
+PORTEPOCH=	2
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://sunner.elcomnet.ru/~sem/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITE_SUBDIR=	sem
 DISTNAME=	pkgtools-${DISTVERSION}
 
 MAINTAINER=	sem@FreeBSD.org
diff --git a/ports-mgmt/portupgrade-devel/distinfo b/ports-mgmt/portupgrade-devel/distinfo
index acca13c8fdd9..96b8f1d92784 100644
--- a/ports-mgmt/portupgrade-devel/distinfo
+++ b/ports-mgmt/portupgrade-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (pkgtools-2.1.4.tar.bz2) = 981140075b6937dca9439336815f4d41
-SHA256 (pkgtools-2.1.4.tar.bz2) = 8579915de00efa0bb13385f3bf7e4198e73d28d16a6e01a906583386e90c18f4
-SIZE (pkgtools-2.1.4.tar.bz2) = 110722
+MD5 (pkgtools-2.1.1.tar.bz2) = a3848cf5cffedf196a28b4c3b20746cb
+SHA256 (pkgtools-2.1.1.tar.bz2) = 6b6369fe18a9a2fdb1062361d4211a2e31e49999a0c037f963c7e781af7c1d4c
+SIZE (pkgtools-2.1.1.tar.bz2) = 108685
diff --git a/ports-mgmt/portupgrade-devel/files/patch-bin-portsclean b/ports-mgmt/portupgrade-devel/files/patch-bin-portsclean
deleted file mode 100644
index dd2c4d0de811..000000000000
--- a/ports-mgmt/portupgrade-devel/files/patch-bin-portsclean
+++ /dev/null
@@ -1,11 +0,0 @@
---- bin/portsclean.orig	Sun Jun 18 20:02:01 2006
-+++ bin/portsclean	Mon Jun 19 11:50:54 2006
-@@ -141,6 +141,8 @@
- 
-       dry_parse = false
- 
-+      $distclean = 0
-+      $pkgclean = 0
-       opts.order!(argv)
- 
-       if !$workclean && $distclean.zero? && $pkgclean.zero? && !$libclean
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 9f86ece3736f..000000000000
--- a/ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade
+++ /dev/null
@@ -1,28 +0,0 @@
---- bin/portupgrade.orig	Sun Jun 18 19:14:02 2006
-+++ bin/portupgrade	Mon Jun 19 11:49:42 2006
-@@ -513,6 +513,7 @@
- 
-       dry_parse = false
- 
-+      $distclean = 0
-       opts.order!(argv)
- 
-       if envopt = config_value(:PORTUPGRADE_ARGS)
-@@ -716,7 +717,7 @@
-     ntasks = upgrade_tasks.size + install_tasks.size
-     ctask = 0
- 
--    if ! $jet_mode
-+    if false
-       config_tasks = upgrade_tasks.dup
-       config_tasks.concat(install_tasks)
- 
-@@ -774,7 +775,7 @@
-     cmdargs << 'ECHO_MSG=/usr/bin/true'
-   end
- 
--  cmdargs << 'config'
-+  cmdargs << 'config-conditional'
- 
-   progress_message "Run 'make config' for #{origin}"
-   if ! system "cd #{portdir} && #{shelljoin(*cmdargs)}"
diff --git a/ports-mgmt/portupgrade-devel/files/patch-lib-pkgdb.rb b/ports-mgmt/portupgrade-devel/files/patch-lib-pkgdb.rb
deleted file mode 100644
index ae6a8eb1f95d..000000000000
--- a/ports-mgmt/portupgrade-devel/files/patch-lib-pkgdb.rb
+++ /dev/null
@@ -1,25 +0,0 @@
---- lib/pkgdb.rb.orig	Mon Jun 19 13:50:29 2006
-+++ lib/pkgdb.rb	Mon Jun 19 13:51:35 2006
-@@ -606,17 +606,17 @@
-   def get_db(mode, perm)
-     case db_driver
-     when :bdb_btree
--      db = BDB::Btree.open @db_file, nil, mode, perm, *@db_params
-+      db = BDB::Btree.open @db_file, nil, mode.to_i, perm, *@db_params
-     when :bdb_hash
--      db = BDB::Hash.open @db_file, nil, mode, perm, *@db_params
-+      db = BDB::Hash.open @db_file, nil, mode.to_i, perm, *@db_params
-     when :bdb1_btree
--      db = BDB1::Btree.open @db_file, mode, perm, *@db_params
-+      db = BDB1::Btree.open @db_file, mode.to_i, perm, *@db_params
-     when :bdb1_hash
--      db = BDB1::Hash.open @db_file, mode, perm, *@db_params
-+      db = BDB1::Hash.open @db_file, mode.to_i, perm, *@db_params
-     else
-       if mode == 'w+'
- 	File.unlink(@db_file) if File.exist?(@db_file)
--	db = DBM.open(@db_filebase, mode)
-+	db = DBM.open(@db_filebase, mode.to_i)
-       else
- 	db = DBM.open(@db_filebase)
-       end
diff --git a/ports-mgmt/portupgrade-devel/files/patch-lib-pkgtools.rb b/ports-mgmt/portupgrade-devel/files/patch-lib-pkgtools.rb
new file mode 100644
index 000000000000..87dcfe5ff3a8
--- /dev/null
+++ b/ports-mgmt/portupgrade-devel/files/patch-lib-pkgtools.rb
@@ -0,0 +1,20 @@
+--- lib/pkgtools.rb.orig	Sat Jun  3 10:05:09 2006
++++ lib/pkgtools.rb	Mon Jun 19 16:36:55 2006
+@@ -1048,7 +1048,7 @@
+ 
+     pkg = PkgInfo.new(pkgname)
+ 
+-    re = %r"^((?:#{Regexp.quote(localbase())}|#{Regexp.quote(x11base())})/etc/rc\.d/[^/]+(\.sh))(\.\w+)?$"
++    re = %r"^((?:#{Regexp.quote(localbase())}|#{Regexp.quote(x11base())})/etc/rc\.d/[^/]+(\.sh)?)(\.\w+)?$"
+ 
+     ret = []
+     pkg.files.each { |file|
+@@ -1066,7 +1066,7 @@
+ 
+     pkg = PkgInfo.new(pkgname)
+ 
+-    re = %r"^((?:#{Regexp.quote(localbase())}|#{Regexp.quote(x11base())})/etc/rc\.d/[^/]+\.sh)(\.\w+)$"
++    re = %r"^((?:#{Regexp.quote(localbase())}|#{Regexp.quote(x11base())})/etc/rc\.d/[^/]+(\.sh)?)(\.\w+)$"
+ 
+     pkg.files.select { |file|
+       re =~ file && File.executable?(file)