kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Roll back to stable 2.1.1 version.

Browse source 
I'd like to wait a repocopy but marcus seems will unaccessible for a week.
This commit is contained in:
Sergey Matveychuk 2006-06-19 12:41:58 +00:00
parent 7d3eafbc27
commit e775e7e95c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=165774
24 changed files with 108 additions and 288 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ports-mgmt/portupgrade-devel/Makefile
View file

@ -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

6
ports-mgmt/portupgrade-devel/distinfo
View file

@ -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

11
ports-mgmt/portupgrade-devel/files/patch-bin-portsclean
View file

@ -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

28
ports-mgmt/portupgrade-devel/files/patch-bin-portupgrade
View file

@ -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)}"

25
ports-mgmt/portupgrade-devel/files/patch-lib-pkgdb.rb
View file

@ -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

20
ports-mgmt/portupgrade-devel/files/patch-lib-pkgtools.rb Normal file
View file

@ -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)

9
ports-mgmt/portupgrade/Makefile
View file

@ -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

6
ports-mgmt/portupgrade/distinfo
View file

@ -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

11
ports-mgmt/portupgrade/files/patch-bin-portsclean
View file

@ -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

28
ports-mgmt/portupgrade/files/patch-bin-portupgrade
View file

@ -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)}"

25
ports-mgmt/portupgrade/files/patch-lib-pkgdb.rb
View file

@ -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

20
ports-mgmt/portupgrade/files/patch-lib-pkgtools.rb Normal file
View file

@ -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)

9
sysutils/portupgrade-devel/Makefile
View file

@ -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

6
sysutils/portupgrade-devel/distinfo
View file

@ -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

11
sysutils/portupgrade-devel/files/patch-bin-portsclean
View file

@ -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

28
sysutils/portupgrade-devel/files/patch-bin-portupgrade
View file

@ -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)}"

25
sysutils/portupgrade-devel/files/patch-lib-pkgdb.rb
View file

@ -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

20
sysutils/portupgrade-devel/files/patch-lib-pkgtools.rb Normal file
View file

@ -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)

9
sysutils/portupgrade/Makefile
View file

@ -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

6
sysutils/portupgrade/distinfo
View file

@ -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

11
sysutils/portupgrade/files/patch-bin-portsclean
View file

@ -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

28
sysutils/portupgrade/files/patch-bin-portupgrade
View file

@ -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)}"

25
sysutils/portupgrade/files/patch-lib-pkgdb.rb
View file

@ -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

20
sysutils/portupgrade/files/patch-lib-pkgtools.rb Normal file
View file

@ -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)