mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-12 07:27:57 +00:00
Code Issues Releases Activity

- Unbreak handling of updated pkgdb.db so it is not regenerated for

Browse Source 
every run, which also makes portversion(1) works for non-root users
  again.  This is done by simply having the flag file in /var/db/
  (thanks to pav for the suggestion).
- While here anyway, fix some make warnings during install on FreeBSD 6.

PR:		ports/81088
Reported by:	many
Tested by:	Yoshiaki Kasahara <kasahara@nc.kyushu-u.ac.jp>
Approved by:	erwin (mentor)
This commit is contained in:
Simon L. B. Nielsen 2005-05-23 11:30:17 +00:00
parent 1a967958cb
commit 13dbf6a820
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=135953
12 changed files with 220 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports-mgmt/portupgrade-devel/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= portupgrade PORTNAME= portupgrade
PORTVERSION= 20041226 PORTVERSION= 20041226
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
${MASTER_SITE_LOCAL} ${MASTER_SITE_LOCAL}

79
ports-mgmt/portupgrade-devel/files/patch-CAN-2005-0610
View File

@ -1,46 +1,29 @@
diff -ru ../orig.pkgtools-20041224/lib/pkgdb.rb ./lib/pkgdb.rb diff -ur ../orig.pkgtools-20041224/lib/pkgdb.rb ./lib/pkgdb.rb
--- ../orig.pkgtools-20041224/lib/pkgdb.rb Wed Mar 23 21:37:47 2005 --- ../orig.pkgtools-20041224/lib/pkgdb.rb Wed Mar 23 21:37:47 2005
+++ ./lib/pkgdb.rb Tue Mar 29 00:27:02 2005 +++ ./lib/pkgdb.rb Sun May 22 00:39:38 2005
@@ -97,7 +97,7 @@ @@ -96,8 +96,7 @@
@db_dir = File.expand_path(new_db_dir || ENV['PKG_DBDIR'] || '/var/db/pkg')
@db_file = File.join(@db_dir, 'pkgdb.db') @db_file = File.join(@db_dir, 'pkgdb.db')
@tmp_dir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp' - @tmp_dir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp'
- @fixme_file = File.join(@tmp_dir, 'pkgdb.fixme') - @fixme_file = File.join(@tmp_dir, 'pkgdb.fixme')
+ @fixme_file = File.join(@db_dir, 'pkgdb.fixme') + @fixme_file = ENV['PKG_FIXME_FILE'] || "/var/db/pkgdb.fixme"
@db_filebase = @db_file.sub(/\.db$/, '') @db_filebase = @db_file.sub(/\.db$/, '')
close_db close_db
diff -ru ../orig.pkgtools-20041224/lib/pkgsqldb.rb ./lib/pkgsqldb.rb Only in ./lib: pkgdb.rb~
--- ../orig.pkgtools-20041224/lib/pkgsqldb.rb Wed Mar 23 21:37:47 2005 diff -ur ../orig.pkgtools-20041224/lib/pkgmisc.rb ./lib/pkgmisc.rb
+++ ./lib/pkgsqldb.rb Tue Mar 29 00:29:51 2005 --- ../orig.pkgtools-20041224/lib/pkgmisc.rb Wed Mar 23 21:37:47 2005
@@ -74,7 +74,7 @@ +++ ./lib/pkgmisc.rb Thu May 5 14:09:37 2005
@@ -95,3 +95,31 @@
@db_file = File.join(@db_dir, 'pkgdb.sqldb') end
@tmp_dir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp' end
- @fixme_file = File.join(@tmp_dir, 'pkgdb.fixme') end
+ @fixme_file = File.join(@db_dir, 'pkgdb.fixme')
close_db
@db_dir
diff -ru ../orig.pkgtools-20041224/lib/pkgtools.rb ./lib/pkgtools.rb
--- ../orig.pkgtools-20041224/lib/pkgtools.rb Wed Mar 23 21:37:47 2005
+++ ./lib/pkgtools.rb Wed Mar 30 23:51:50 2005
@@ -204,7 +204,7 @@
$ports_dir = $portsdb.ports_dir
$packages_base = ENV['PACKAGES'] || File.join($ports_dir, 'packages')
$packages_dir = File.join($packages_base, 'All')
- $tmpdir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp'
+ init_tmpdir
$pkg_path = ENV['PKG_PATH'] || $packages_dir
$pkg_sites = (ENV['PKG_SITES'] || '').split
@@ -222,6 +222,31 @@
$portsdb.ignore_categories = config_value(:IGNORE_CATEGORIES) || []
$portsdb.extra_categories = config_value(:EXTRA_CATEGORIES) || []
+end
+ +
+def init_tmpdir +def init_tmpdir
+ if ! $tmpdir.nil? && $tmpdir != "" then
+ return
+ end
+ maintmpdir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp' + maintmpdir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp'
+ if !FileTest.directory?(maintmpdir) + if !FileTest.directory?(maintmpdir)
+ raise "Temporary directory #{maintmpdir} does not exist" + raise "Temporary directory #{maintmpdir} does not exist"
@ -63,6 +46,30 @@ diff -ru ../orig.pkgtools-20041224/lib/pkgtools.rb ./lib/pkgtools.rb
+ end + end
+ } + }
+ $tmpdir=tmpdir + $tmpdir=tmpdir
end +end
diff -ur ../orig.pkgtools-20041224/lib/pkgsqldb.rb ./lib/pkgsqldb.rb
--- ../orig.pkgtools-20041224/lib/pkgsqldb.rb Wed Mar 23 21:37:47 2005
+++ ./lib/pkgsqldb.rb Sun May 22 00:42:04 2005
@@ -73,8 +73,7 @@
@db_dir = File.expand_path(new_db_dir || ENV['PKG_DBDIR'] || '/var/db/pkg')
def parse_pattern(str, regex = false) @db_file = File.join(@db_dir, 'pkgdb.sqldb')
- @tmp_dir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp'
- @fixme_file = File.join(@tmp_dir, 'pkgdb.fixme')
+ @fixme_file = ENV['PKG_FIXME_FILE'] || "/var/db/pkgdb.fixme"
close_db
@db_dir
Only in ./lib: pkgsqldb.rb~
diff -ur ../orig.pkgtools-20041224/lib/pkgtools.rb ./lib/pkgtools.rb
--- ../orig.pkgtools-20041224/lib/pkgtools.rb Wed Mar 23 21:37:47 2005
+++ ./lib/pkgtools.rb Tue May 3 19:29:59 2005
@@ -204,7 +204,7 @@
$ports_dir = $portsdb.ports_dir
$packages_base = ENV['PACKAGES'] || File.join($ports_dir, 'packages')
$packages_dir = File.join($packages_base, 'All')
- $tmpdir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp'
+ init_tmpdir
$pkg_path = ENV['PKG_PATH'] || $packages_dir
$pkg_sites = (ENV['PKG_SITES'] || '').split

11
ports-mgmt/portupgrade-devel/files/patch-Makefile.compat Normal file
View File

@ -0,0 +1,11 @@
--- ../orig.pkgtools-20041224/Makefile.compat Wed Mar 23 21:37:47 2005
+++ Makefile.compat Sun May 22 00:46:39 2005
@@ -89,7 +89,7 @@
.endif
.endif
-.endif defined(${group}) && !empty(${group})
+.endif # defined(${group}) && !empty(${group})
.endfor
.endif

2
ports-mgmt/portupgrade/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= portupgrade PORTNAME= portupgrade
PORTVERSION= 20041226 PORTVERSION= 20041226
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
${MASTER_SITE_LOCAL} ${MASTER_SITE_LOCAL}

79
ports-mgmt/portupgrade/files/patch-CAN-2005-0610
View File

@ -1,46 +1,29 @@
diff -ru ../orig.pkgtools-20041224/lib/pkgdb.rb ./lib/pkgdb.rb diff -ur ../orig.pkgtools-20041224/lib/pkgdb.rb ./lib/pkgdb.rb
--- ../orig.pkgtools-20041224/lib/pkgdb.rb Wed Mar 23 21:37:47 2005 --- ../orig.pkgtools-20041224/lib/pkgdb.rb Wed Mar 23 21:37:47 2005
+++ ./lib/pkgdb.rb Tue Mar 29 00:27:02 2005 +++ ./lib/pkgdb.rb Sun May 22 00:39:38 2005
@@ -97,7 +97,7 @@ @@ -96,8 +96,7 @@
@db_dir = File.expand_path(new_db_dir || ENV['PKG_DBDIR'] || '/var/db/pkg')
@db_file = File.join(@db_dir, 'pkgdb.db') @db_file = File.join(@db_dir, 'pkgdb.db')
@tmp_dir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp' - @tmp_dir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp'
- @fixme_file = File.join(@tmp_dir, 'pkgdb.fixme') - @fixme_file = File.join(@tmp_dir, 'pkgdb.fixme')
+ @fixme_file = File.join(@db_dir, 'pkgdb.fixme') + @fixme_file = ENV['PKG_FIXME_FILE'] || "/var/db/pkgdb.fixme"
@db_filebase = @db_file.sub(/\.db$/, '') @db_filebase = @db_file.sub(/\.db$/, '')
close_db close_db
diff -ru ../orig.pkgtools-20041224/lib/pkgsqldb.rb ./lib/pkgsqldb.rb Only in ./lib: pkgdb.rb~
--- ../orig.pkgtools-20041224/lib/pkgsqldb.rb Wed Mar 23 21:37:47 2005 diff -ur ../orig.pkgtools-20041224/lib/pkgmisc.rb ./lib/pkgmisc.rb
+++ ./lib/pkgsqldb.rb Tue Mar 29 00:29:51 2005 --- ../orig.pkgtools-20041224/lib/pkgmisc.rb Wed Mar 23 21:37:47 2005
@@ -74,7 +74,7 @@ +++ ./lib/pkgmisc.rb Thu May 5 14:09:37 2005
@@ -95,3 +95,31 @@
@db_file = File.join(@db_dir, 'pkgdb.sqldb') end
@tmp_dir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp' end
- @fixme_file = File.join(@tmp_dir, 'pkgdb.fixme') end
+ @fixme_file = File.join(@db_dir, 'pkgdb.fixme')
close_db
@db_dir
diff -ru ../orig.pkgtools-20041224/lib/pkgtools.rb ./lib/pkgtools.rb
--- ../orig.pkgtools-20041224/lib/pkgtools.rb Wed Mar 23 21:37:47 2005
+++ ./lib/pkgtools.rb Wed Mar 30 23:51:50 2005
@@ -204,7 +204,7 @@
$ports_dir = $portsdb.ports_dir
$packages_base = ENV['PACKAGES'] || File.join($ports_dir, 'packages')
$packages_dir = File.join($packages_base, 'All')
- $tmpdir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp'
+ init_tmpdir
$pkg_path = ENV['PKG_PATH'] || $packages_dir
$pkg_sites = (ENV['PKG_SITES'] || '').split
@@ -222,6 +222,31 @@
$portsdb.ignore_categories = config_value(:IGNORE_CATEGORIES) || []
$portsdb.extra_categories = config_value(:EXTRA_CATEGORIES) || []
+end
+ +
+def init_tmpdir +def init_tmpdir
+ if ! $tmpdir.nil? && $tmpdir != "" then
+ return
+ end
+ maintmpdir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp' + maintmpdir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp'
+ if !FileTest.directory?(maintmpdir) + if !FileTest.directory?(maintmpdir)
+ raise "Temporary directory #{maintmpdir} does not exist" + raise "Temporary directory #{maintmpdir} does not exist"
@ -63,6 +46,30 @@ diff -ru ../orig.pkgtools-20041224/lib/pkgtools.rb ./lib/pkgtools.rb
+ end + end
+ } + }
+ $tmpdir=tmpdir + $tmpdir=tmpdir
end +end
diff -ur ../orig.pkgtools-20041224/lib/pkgsqldb.rb ./lib/pkgsqldb.rb
--- ../orig.pkgtools-20041224/lib/pkgsqldb.rb Wed Mar 23 21:37:47 2005
+++ ./lib/pkgsqldb.rb Sun May 22 00:42:04 2005
@@ -73,8 +73,7 @@
@db_dir = File.expand_path(new_db_dir || ENV['PKG_DBDIR'] || '/var/db/pkg')
def parse_pattern(str, regex = false) @db_file = File.join(@db_dir, 'pkgdb.sqldb')
- @tmp_dir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp'
- @fixme_file = File.join(@tmp_dir, 'pkgdb.fixme')
+ @fixme_file = ENV['PKG_FIXME_FILE'] || "/var/db/pkgdb.fixme"
close_db
@db_dir
Only in ./lib: pkgsqldb.rb~
diff -ur ../orig.pkgtools-20041224/lib/pkgtools.rb ./lib/pkgtools.rb
--- ../orig.pkgtools-20041224/lib/pkgtools.rb Wed Mar 23 21:37:47 2005
+++ ./lib/pkgtools.rb Tue May 3 19:29:59 2005
@@ -204,7 +204,7 @@
$ports_dir = $portsdb.ports_dir
$packages_base = ENV['PACKAGES'] || File.join($ports_dir, 'packages')
$packages_dir = File.join($packages_base, 'All')
- $tmpdir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp'
+ init_tmpdir
$pkg_path = ENV['PKG_PATH'] || $packages_dir
$pkg_sites = (ENV['PKG_SITES'] || '').split

11
ports-mgmt/portupgrade/files/patch-Makefile.compat Normal file
View File

@ -0,0 +1,11 @@
--- ../orig.pkgtools-20041224/Makefile.compat Wed Mar 23 21:37:47 2005
+++ Makefile.compat Sun May 22 00:46:39 2005
@@ -89,7 +89,7 @@
.endif
.endif
-.endif defined(${group}) && !empty(${group})
+.endif # defined(${group}) && !empty(${group})
.endfor
.endif

2
sysutils/portupgrade-devel/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= portupgrade PORTNAME= portupgrade
PORTVERSION= 20041226 PORTVERSION= 20041226
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
${MASTER_SITE_LOCAL} ${MASTER_SITE_LOCAL}

79
sysutils/portupgrade-devel/files/patch-CAN-2005-0610
View File

@ -1,46 +1,29 @@
diff -ru ../orig.pkgtools-20041224/lib/pkgdb.rb ./lib/pkgdb.rb diff -ur ../orig.pkgtools-20041224/lib/pkgdb.rb ./lib/pkgdb.rb
--- ../orig.pkgtools-20041224/lib/pkgdb.rb Wed Mar 23 21:37:47 2005 --- ../orig.pkgtools-20041224/lib/pkgdb.rb Wed Mar 23 21:37:47 2005
+++ ./lib/pkgdb.rb Tue Mar 29 00:27:02 2005 +++ ./lib/pkgdb.rb Sun May 22 00:39:38 2005
@@ -97,7 +97,7 @@ @@ -96,8 +96,7 @@
@db_dir = File.expand_path(new_db_dir || ENV['PKG_DBDIR'] || '/var/db/pkg')
@db_file = File.join(@db_dir, 'pkgdb.db') @db_file = File.join(@db_dir, 'pkgdb.db')
@tmp_dir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp' - @tmp_dir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp'
- @fixme_file = File.join(@tmp_dir, 'pkgdb.fixme') - @fixme_file = File.join(@tmp_dir, 'pkgdb.fixme')
+ @fixme_file = File.join(@db_dir, 'pkgdb.fixme') + @fixme_file = ENV['PKG_FIXME_FILE'] || "/var/db/pkgdb.fixme"
@db_filebase = @db_file.sub(/\.db$/, '') @db_filebase = @db_file.sub(/\.db$/, '')
close_db close_db
diff -ru ../orig.pkgtools-20041224/lib/pkgsqldb.rb ./lib/pkgsqldb.rb Only in ./lib: pkgdb.rb~
--- ../orig.pkgtools-20041224/lib/pkgsqldb.rb Wed Mar 23 21:37:47 2005 diff -ur ../orig.pkgtools-20041224/lib/pkgmisc.rb ./lib/pkgmisc.rb
+++ ./lib/pkgsqldb.rb Tue Mar 29 00:29:51 2005 --- ../orig.pkgtools-20041224/lib/pkgmisc.rb Wed Mar 23 21:37:47 2005
@@ -74,7 +74,7 @@ +++ ./lib/pkgmisc.rb Thu May 5 14:09:37 2005
@@ -95,3 +95,31 @@
@db_file = File.join(@db_dir, 'pkgdb.sqldb') end
@tmp_dir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp' end
- @fixme_file = File.join(@tmp_dir, 'pkgdb.fixme') end
+ @fixme_file = File.join(@db_dir, 'pkgdb.fixme')
close_db
@db_dir
diff -ru ../orig.pkgtools-20041224/lib/pkgtools.rb ./lib/pkgtools.rb
--- ../orig.pkgtools-20041224/lib/pkgtools.rb Wed Mar 23 21:37:47 2005
+++ ./lib/pkgtools.rb Wed Mar 30 23:51:50 2005
@@ -204,7 +204,7 @@
$ports_dir = $portsdb.ports_dir
$packages_base = ENV['PACKAGES'] || File.join($ports_dir, 'packages')
$packages_dir = File.join($packages_base, 'All')
- $tmpdir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp'
+ init_tmpdir
$pkg_path = ENV['PKG_PATH'] || $packages_dir
$pkg_sites = (ENV['PKG_SITES'] || '').split
@@ -222,6 +222,31 @@
$portsdb.ignore_categories = config_value(:IGNORE_CATEGORIES) || []
$portsdb.extra_categories = config_value(:EXTRA_CATEGORIES) || []
+end
+ +
+def init_tmpdir +def init_tmpdir
+ if ! $tmpdir.nil? && $tmpdir != "" then
+ return
+ end
+ maintmpdir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp' + maintmpdir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp'
+ if !FileTest.directory?(maintmpdir) + if !FileTest.directory?(maintmpdir)
+ raise "Temporary directory #{maintmpdir} does not exist" + raise "Temporary directory #{maintmpdir} does not exist"
@ -63,6 +46,30 @@ diff -ru ../orig.pkgtools-20041224/lib/pkgtools.rb ./lib/pkgtools.rb
+ end + end
+ } + }
+ $tmpdir=tmpdir + $tmpdir=tmpdir
end +end
diff -ur ../orig.pkgtools-20041224/lib/pkgsqldb.rb ./lib/pkgsqldb.rb
--- ../orig.pkgtools-20041224/lib/pkgsqldb.rb Wed Mar 23 21:37:47 2005
+++ ./lib/pkgsqldb.rb Sun May 22 00:42:04 2005
@@ -73,8 +73,7 @@
@db_dir = File.expand_path(new_db_dir || ENV['PKG_DBDIR'] || '/var/db/pkg')
def parse_pattern(str, regex = false) @db_file = File.join(@db_dir, 'pkgdb.sqldb')
- @tmp_dir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp'
- @fixme_file = File.join(@tmp_dir, 'pkgdb.fixme')
+ @fixme_file = ENV['PKG_FIXME_FILE'] || "/var/db/pkgdb.fixme"
close_db
@db_dir
Only in ./lib: pkgsqldb.rb~
diff -ur ../orig.pkgtools-20041224/lib/pkgtools.rb ./lib/pkgtools.rb
--- ../orig.pkgtools-20041224/lib/pkgtools.rb Wed Mar 23 21:37:47 2005
+++ ./lib/pkgtools.rb Tue May 3 19:29:59 2005
@@ -204,7 +204,7 @@
$ports_dir = $portsdb.ports_dir
$packages_base = ENV['PACKAGES'] || File.join($ports_dir, 'packages')
$packages_dir = File.join($packages_base, 'All')
- $tmpdir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp'
+ init_tmpdir
$pkg_path = ENV['PKG_PATH'] || $packages_dir
$pkg_sites = (ENV['PKG_SITES'] || '').split

11
sysutils/portupgrade-devel/files/patch-Makefile.compat Normal file
View File

@ -0,0 +1,11 @@
--- ../orig.pkgtools-20041224/Makefile.compat Wed Mar 23 21:37:47 2005
+++ Makefile.compat Sun May 22 00:46:39 2005
@@ -89,7 +89,7 @@
.endif
.endif
-.endif defined(${group}) && !empty(${group})
+.endif # defined(${group}) && !empty(${group})
.endfor
.endif

2
sysutils/portupgrade/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= portupgrade PORTNAME= portupgrade
PORTVERSION= 20041226 PORTVERSION= 20041226
PORTREVISION= 2 PORTREVISION= 3
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \ MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
${MASTER_SITE_LOCAL} ${MASTER_SITE_LOCAL}

79
sysutils/portupgrade/files/patch-CAN-2005-0610
View File

@ -1,46 +1,29 @@
diff -ru ../orig.pkgtools-20041224/lib/pkgdb.rb ./lib/pkgdb.rb diff -ur ../orig.pkgtools-20041224/lib/pkgdb.rb ./lib/pkgdb.rb
--- ../orig.pkgtools-20041224/lib/pkgdb.rb Wed Mar 23 21:37:47 2005 --- ../orig.pkgtools-20041224/lib/pkgdb.rb Wed Mar 23 21:37:47 2005
+++ ./lib/pkgdb.rb Tue Mar 29 00:27:02 2005 +++ ./lib/pkgdb.rb Sun May 22 00:39:38 2005
@@ -97,7 +97,7 @@ @@ -96,8 +96,7 @@
@db_dir = File.expand_path(new_db_dir || ENV['PKG_DBDIR'] || '/var/db/pkg')
@db_file = File.join(@db_dir, 'pkgdb.db') @db_file = File.join(@db_dir, 'pkgdb.db')
@tmp_dir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp' - @tmp_dir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp'
- @fixme_file = File.join(@tmp_dir, 'pkgdb.fixme') - @fixme_file = File.join(@tmp_dir, 'pkgdb.fixme')
+ @fixme_file = File.join(@db_dir, 'pkgdb.fixme') + @fixme_file = ENV['PKG_FIXME_FILE'] || "/var/db/pkgdb.fixme"
@db_filebase = @db_file.sub(/\.db$/, '') @db_filebase = @db_file.sub(/\.db$/, '')
close_db close_db
diff -ru ../orig.pkgtools-20041224/lib/pkgsqldb.rb ./lib/pkgsqldb.rb Only in ./lib: pkgdb.rb~
--- ../orig.pkgtools-20041224/lib/pkgsqldb.rb Wed Mar 23 21:37:47 2005 diff -ur ../orig.pkgtools-20041224/lib/pkgmisc.rb ./lib/pkgmisc.rb
+++ ./lib/pkgsqldb.rb Tue Mar 29 00:29:51 2005 --- ../orig.pkgtools-20041224/lib/pkgmisc.rb Wed Mar 23 21:37:47 2005
@@ -74,7 +74,7 @@ +++ ./lib/pkgmisc.rb Thu May 5 14:09:37 2005
@@ -95,3 +95,31 @@
@db_file = File.join(@db_dir, 'pkgdb.sqldb') end
@tmp_dir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp' end
- @fixme_file = File.join(@tmp_dir, 'pkgdb.fixme') end
+ @fixme_file = File.join(@db_dir, 'pkgdb.fixme')
close_db
@db_dir
diff -ru ../orig.pkgtools-20041224/lib/pkgtools.rb ./lib/pkgtools.rb
--- ../orig.pkgtools-20041224/lib/pkgtools.rb Wed Mar 23 21:37:47 2005
+++ ./lib/pkgtools.rb Wed Mar 30 23:51:50 2005
@@ -204,7 +204,7 @@
$ports_dir = $portsdb.ports_dir
$packages_base = ENV['PACKAGES'] || File.join($ports_dir, 'packages')
$packages_dir = File.join($packages_base, 'All')
- $tmpdir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp'
+ init_tmpdir
$pkg_path = ENV['PKG_PATH'] || $packages_dir
$pkg_sites = (ENV['PKG_SITES'] || '').split
@@ -222,6 +222,31 @@
$portsdb.ignore_categories = config_value(:IGNORE_CATEGORIES) || []
$portsdb.extra_categories = config_value(:EXTRA_CATEGORIES) || []
+end
+ +
+def init_tmpdir +def init_tmpdir
+ if ! $tmpdir.nil? && $tmpdir != "" then
+ return
+ end
+ maintmpdir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp' + maintmpdir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp'
+ if !FileTest.directory?(maintmpdir) + if !FileTest.directory?(maintmpdir)
+ raise "Temporary directory #{maintmpdir} does not exist" + raise "Temporary directory #{maintmpdir} does not exist"
@ -63,6 +46,30 @@ diff -ru ../orig.pkgtools-20041224/lib/pkgtools.rb ./lib/pkgtools.rb
+ end + end
+ } + }
+ $tmpdir=tmpdir + $tmpdir=tmpdir
end +end
diff -ur ../orig.pkgtools-20041224/lib/pkgsqldb.rb ./lib/pkgsqldb.rb
--- ../orig.pkgtools-20041224/lib/pkgsqldb.rb Wed Mar 23 21:37:47 2005
+++ ./lib/pkgsqldb.rb Sun May 22 00:42:04 2005
@@ -73,8 +73,7 @@
@db_dir = File.expand_path(new_db_dir || ENV['PKG_DBDIR'] || '/var/db/pkg')
def parse_pattern(str, regex = false) @db_file = File.join(@db_dir, 'pkgdb.sqldb')
- @tmp_dir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp'
- @fixme_file = File.join(@tmp_dir, 'pkgdb.fixme')
+ @fixme_file = ENV['PKG_FIXME_FILE'] || "/var/db/pkgdb.fixme"
close_db
@db_dir
Only in ./lib: pkgsqldb.rb~
diff -ur ../orig.pkgtools-20041224/lib/pkgtools.rb ./lib/pkgtools.rb
--- ../orig.pkgtools-20041224/lib/pkgtools.rb Wed Mar 23 21:37:47 2005
+++ ./lib/pkgtools.rb Tue May 3 19:29:59 2005
@@ -204,7 +204,7 @@
$ports_dir = $portsdb.ports_dir
$packages_base = ENV['PACKAGES'] || File.join($ports_dir, 'packages')
$packages_dir = File.join($packages_base, 'All')
- $tmpdir = ENV['PKG_TMPDIR'] || ENV['TMPDIR'] || '/var/tmp'
+ init_tmpdir
$pkg_path = ENV['PKG_PATH'] || $packages_dir
$pkg_sites = (ENV['PKG_SITES'] || '').split

11
sysutils/portupgrade/files/patch-Makefile.compat Normal file
View File

@ -0,0 +1,11 @@
--- ../orig.pkgtools-20041224/Makefile.compat Wed Mar 23 21:37:47 2005
+++ Makefile.compat Sun May 22 00:46:39 2005
@@ -89,7 +89,7 @@
.endif
.endif
-.endif defined(${group}) && !empty(${group})
+.endif # defined(${group}) && !empty(${group})
.endfor
.endif