cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 20041224.

Browse Source 
portsdb(1):
- Add a -F flag, which calls make fetchindex internally to
  update the ports index file.

portupgrade(1):
- Make -fP properly reinstall an installed package using a binary
  package.

- Do not use a binary package when custom MAKE_ARGS or -m option is
  defined, unless -PP is specified.

portsclean(1):
- -L: Make sure that a library does not shadow itself.

misc.:
- RcNG'ify the startup script.

- Do not use Object#class which is obsolete in Ruby >=1.8.
This commit is contained in:
Akinori MUSHA 2004-12-23 20:18:12 +00:00
parent 3ecf6fe9c9
commit 05bc902eec
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=125007
20 changed files with 16 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,15 +6,14 @@
#
PORTNAME= portupgrade
PORTVERSION= 20040701
PORTREVISION= 3
PORTVERSION= 20041224
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= knu
DISTNAME= pkgtools-${DISTVERSION}
DISTVERSION= 20040701
DISTVERSION= 20041224
.if ${DISTVERSION} != ${PORTVERSION}
PATCH_SITES= ${MASTER_SITES}

4
ports-mgmt/portupgrade-devel/distinfo
View File

@ -1,2 +1,2 @@
MD5 (pkgtools-20040701.tar.bz2) = a6f5601c43bafa6ce5bb6108e74bc362
SIZE (pkgtools-20040701.tar.bz2) = 99351
MD5 (pkgtools-20041224.tar.bz2) = 1c69732e569fa423152cc792d2c40113
SIZE (pkgtools-20041224.tar.bz2) = 104308

16
ports-mgmt/portupgrade-devel/files/patch-pkgtools.rb
View File

@ -1,16 +0,0 @@
Index: lib/pkgtools.rb
===================================================================
RCS file: /home/cvs/pkgtools/lib/pkgtools.rb,v
retrieving revision 1.123
diff -u -r1.123 pkgtools.rb
--- lib/pkgtools.rb 30 Jun 2004 16:24:12 -0000 1.123
+++ lib/pkgtools.rb 2 Jul 2004 03:51:12 -0000
@@ -82,7 +82,7 @@
if !pattern.include?('/')
gtable[pattern] = value
end
- end
+ end if hash
table = [otable, gtable]
end

14
ports-mgmt/portupgrade-devel/files/patch-portsdb.rb
View File

@ -1,14 +0,0 @@
Index: lib/portsdb.rb
===================================================================
RCS file: /home/cvs/pkgtools/lib/portsdb.rb,v
retrieving revision 1.80
diff -u -2 -r1.80 portsdb.rb
--- lib/portsdb.rb 30 Jun 2004 16:22:35 -0000 1.80
+++ lib/portsdb.rb 12 Jul 2004 16:08:12 -0000
@@ -550,5 +550,5 @@
open_db_for_rebuild!
- File.open(index_file) do |f|
+ open("| sort #{shelljoin(index_file)}") do |f|
f.each_with_index do |line, i|
lineno = i + 1

16
ports-mgmt/portupgrade-devel/files/patch-portupgrade
View File

@ -1,16 +0,0 @@
Index: bin/portupgrade
===================================================================
RCS file: /home/cvs/pkgtools/bin/portupgrade,v
retrieving revision 1.226
diff -u -2 -r1.226 portupgrade
--- bin/portupgrade 30 Jun 2004 16:51:46 -0000 1.226
+++ bin/portupgrade 6 Jul 2004 19:18:10 -0000
@@ -1691,5 +1691,7 @@
end
- latest_pkg, pkgfile = *pkglist.max { |pkg, file| pkg }
+ latest_pkg, pkgfile = *pkglist.max { |(pkg1, file1), (pkg2, file2)|
+ pkg1 <=> pkg2
+ }
if latest_pkg

5
ports-mgmt/portupgrade/Makefile
View File

@ -6,15 +6,14 @@
#
PORTNAME= portupgrade
PORTVERSION= 20040701
PORTREVISION= 3
PORTVERSION= 20041224
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= knu
DISTNAME= pkgtools-${DISTVERSION}
DISTVERSION= 20040701
DISTVERSION= 20041224
.if ${DISTVERSION} != ${PORTVERSION}
PATCH_SITES= ${MASTER_SITES}

4
ports-mgmt/portupgrade/distinfo
View File

@ -1,2 +1,2 @@
MD5 (pkgtools-20040701.tar.bz2) = a6f5601c43bafa6ce5bb6108e74bc362
SIZE (pkgtools-20040701.tar.bz2) = 99351
MD5 (pkgtools-20041224.tar.bz2) = 1c69732e569fa423152cc792d2c40113
SIZE (pkgtools-20041224.tar.bz2) = 104308

16
ports-mgmt/portupgrade/files/patch-pkgtools.rb
View File

@ -1,16 +0,0 @@
Index: lib/pkgtools.rb
===================================================================
RCS file: /home/cvs/pkgtools/lib/pkgtools.rb,v
retrieving revision 1.123
diff -u -r1.123 pkgtools.rb
--- lib/pkgtools.rb 30 Jun 2004 16:24:12 -0000 1.123
+++ lib/pkgtools.rb 2 Jul 2004 03:51:12 -0000
@@ -82,7 +82,7 @@
if !pattern.include?('/')
gtable[pattern] = value
end
- end
+ end if hash
table = [otable, gtable]
end

14
ports-mgmt/portupgrade/files/patch-portsdb.rb
View File

@ -1,14 +0,0 @@
Index: lib/portsdb.rb
===================================================================
RCS file: /home/cvs/pkgtools/lib/portsdb.rb,v
retrieving revision 1.80
diff -u -2 -r1.80 portsdb.rb
--- lib/portsdb.rb 30 Jun 2004 16:22:35 -0000 1.80
+++ lib/portsdb.rb 12 Jul 2004 16:08:12 -0000
@@ -550,5 +550,5 @@
open_db_for_rebuild!
- File.open(index_file) do |f|
+ open("| sort #{shelljoin(index_file)}") do |f|
f.each_with_index do |line, i|
lineno = i + 1

16
ports-mgmt/portupgrade/files/patch-portupgrade
View File

@ -1,16 +0,0 @@
Index: bin/portupgrade
===================================================================
RCS file: /home/cvs/pkgtools/bin/portupgrade,v
retrieving revision 1.226
diff -u -2 -r1.226 portupgrade
--- bin/portupgrade 30 Jun 2004 16:51:46 -0000 1.226
+++ bin/portupgrade 6 Jul 2004 19:18:10 -0000
@@ -1691,5 +1691,7 @@
end
- latest_pkg, pkgfile = *pkglist.max { |pkg, file| pkg }
+ latest_pkg, pkgfile = *pkglist.max { |(pkg1, file1), (pkg2, file2)|
+ pkg1 <=> pkg2
+ }
if latest_pkg

5
sysutils/portupgrade-devel/Makefile
View File

@ -6,15 +6,14 @@
#
PORTNAME= portupgrade
PORTVERSION= 20040701
PORTREVISION= 3
PORTVERSION= 20041224
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= knu
DISTNAME= pkgtools-${DISTVERSION}
DISTVERSION= 20040701
DISTVERSION= 20041224
.if ${DISTVERSION} != ${PORTVERSION}
PATCH_SITES= ${MASTER_SITES}

4
sysutils/portupgrade-devel/distinfo
View File

@ -1,2 +1,2 @@
MD5 (pkgtools-20040701.tar.bz2) = a6f5601c43bafa6ce5bb6108e74bc362
SIZE (pkgtools-20040701.tar.bz2) = 99351
MD5 (pkgtools-20041224.tar.bz2) = 1c69732e569fa423152cc792d2c40113
SIZE (pkgtools-20041224.tar.bz2) = 104308

16
sysutils/portupgrade-devel/files/patch-pkgtools.rb
View File

@ -1,16 +0,0 @@
Index: lib/pkgtools.rb
===================================================================
RCS file: /home/cvs/pkgtools/lib/pkgtools.rb,v
retrieving revision 1.123
diff -u -r1.123 pkgtools.rb
--- lib/pkgtools.rb 30 Jun 2004 16:24:12 -0000 1.123
+++ lib/pkgtools.rb 2 Jul 2004 03:51:12 -0000
@@ -82,7 +82,7 @@
if !pattern.include?('/')
gtable[pattern] = value
end
- end
+ end if hash
table = [otable, gtable]
end

14
sysutils/portupgrade-devel/files/patch-portsdb.rb
View File

@ -1,14 +0,0 @@
Index: lib/portsdb.rb
===================================================================
RCS file: /home/cvs/pkgtools/lib/portsdb.rb,v
retrieving revision 1.80
diff -u -2 -r1.80 portsdb.rb
--- lib/portsdb.rb 30 Jun 2004 16:22:35 -0000 1.80
+++ lib/portsdb.rb 12 Jul 2004 16:08:12 -0000
@@ -550,5 +550,5 @@
open_db_for_rebuild!
- File.open(index_file) do |f|
+ open("| sort #{shelljoin(index_file)}") do |f|
f.each_with_index do |line, i|
lineno = i + 1

16
sysutils/portupgrade-devel/files/patch-portupgrade
View File

@ -1,16 +0,0 @@
Index: bin/portupgrade
===================================================================
RCS file: /home/cvs/pkgtools/bin/portupgrade,v
retrieving revision 1.226
diff -u -2 -r1.226 portupgrade
--- bin/portupgrade 30 Jun 2004 16:51:46 -0000 1.226
+++ bin/portupgrade 6 Jul 2004 19:18:10 -0000
@@ -1691,5 +1691,7 @@
end
- latest_pkg, pkgfile = *pkglist.max { |pkg, file| pkg }
+ latest_pkg, pkgfile = *pkglist.max { |(pkg1, file1), (pkg2, file2)|
+ pkg1 <=> pkg2
+ }
if latest_pkg

5
sysutils/portupgrade/Makefile
View File

@ -6,15 +6,14 @@
#
PORTNAME= portupgrade
PORTVERSION= 20040701
PORTREVISION= 3
PORTVERSION= 20041224
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iDaemons.org/pub/distfiles/ \
${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= knu
DISTNAME= pkgtools-${DISTVERSION}
DISTVERSION= 20040701
DISTVERSION= 20041224
.if ${DISTVERSION} != ${PORTVERSION}
PATCH_SITES= ${MASTER_SITES}

4
sysutils/portupgrade/distinfo
View File

@ -1,2 +1,2 @@
MD5 (pkgtools-20040701.tar.bz2) = a6f5601c43bafa6ce5bb6108e74bc362
SIZE (pkgtools-20040701.tar.bz2) = 99351
MD5 (pkgtools-20041224.tar.bz2) = 1c69732e569fa423152cc792d2c40113
SIZE (pkgtools-20041224.tar.bz2) = 104308

16
sysutils/portupgrade/files/patch-pkgtools.rb
View File

@ -1,16 +0,0 @@
Index: lib/pkgtools.rb
===================================================================
RCS file: /home/cvs/pkgtools/lib/pkgtools.rb,v
retrieving revision 1.123
diff -u -r1.123 pkgtools.rb
--- lib/pkgtools.rb 30 Jun 2004 16:24:12 -0000 1.123
+++ lib/pkgtools.rb 2 Jul 2004 03:51:12 -0000
@@ -82,7 +82,7 @@
if !pattern.include?('/')
gtable[pattern] = value
end
- end
+ end if hash
table = [otable, gtable]
end

14
sysutils/portupgrade/files/patch-portsdb.rb
View File

@ -1,14 +0,0 @@
Index: lib/portsdb.rb
===================================================================
RCS file: /home/cvs/pkgtools/lib/portsdb.rb,v
retrieving revision 1.80
diff -u -2 -r1.80 portsdb.rb
--- lib/portsdb.rb 30 Jun 2004 16:22:35 -0000 1.80
+++ lib/portsdb.rb 12 Jul 2004 16:08:12 -0000
@@ -550,5 +550,5 @@
open_db_for_rebuild!
- File.open(index_file) do |f|
+ open("| sort #{shelljoin(index_file)}") do |f|
f.each_with_index do |line, i|
lineno = i + 1

16
sysutils/portupgrade/files/patch-portupgrade
View File

@ -1,16 +0,0 @@
Index: bin/portupgrade
===================================================================
RCS file: /home/cvs/pkgtools/bin/portupgrade,v
retrieving revision 1.226
diff -u -2 -r1.226 portupgrade
--- bin/portupgrade 30 Jun 2004 16:51:46 -0000 1.226
+++ bin/portupgrade 6 Jul 2004 19:18:10 -0000
@@ -1691,5 +1691,7 @@
end
- latest_pkg, pkgfile = *pkglist.max { |pkg, file| pkg }
+ latest_pkg, pkgfile = *pkglist.max { |(pkg1, file1), (pkg2, file2)|
+ pkg1 <=> pkg2
+ }
if latest_pkg