mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00
Code Issues Releases Activity

- Integrate last patches from stable

Browse Source
This commit is contained in:
Sergey Matveychuk 2007-03-02 20:18:34 +00:00
parent 9d08152322
commit 103cbbdd60
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=186371
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@
PORTNAME= portupgrade-devel
PORTVERSION= 2.3.0
PORTREVISION= 1
CATEGORIES= ports-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= portupgrade

20
ports-mgmt/portupgrade-devel/files/patch-bin-pkgdb Normal file
View File

@ -0,0 +1,20 @@
Index: bin/pkgdb
===================================================================
RCS file: /cvsroot/portupgrade/pkgtools/bin/pkgdb,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pkgdb 26 Feb 2007 16:00:25 -0000 1.16
+++ pkgdb 2 Mar 2007 07:48:18 -0000 1.17
@@ -310,6 +310,11 @@
puts "Look for lost dependencies:"
$pkgnames.each do |pkgname|
+ # Ignore bsdpan- pseudo ports
+ if /^bsdpan-/ =~ pkgname
+ puts "#{pkgname}: ignored"
+ next
+ end
deps = $pkgdb.pkgdep(pkgname, true) or return
real_deps = get_real_run_deps(pkgname)

17
ports-mgmt/portupgrade-devel/files/patch-lib-pkgmisc.rb Normal file
View File

@ -0,0 +1,17 @@
Index: lib/pkgmisc.rb
===================================================================
RCS file: /cvsroot/portupgrade/pkgtools/lib/pkgmisc.rb,v
retrieving revision 1.2.2.2
diff -u -r1.2.2.2 pkgmisc.rb
--- lib/pkgmisc.rb 24 Feb 2007 12:32:11 -0000 1.2.2.2
+++ lib/pkgmisc.rb 2 Mar 2007 19:59:30 -0000
@@ -93,7 +93,8 @@
def shelljoin(*args)
args.collect { |arg|
if /[*?{}\[\]<>()~&|\\$;\'\`\"\s]/ =~ arg
- '"' + arg.gsub(/([$\\\"\`])/, "\\\\\\1") + '"'
+ a = '"' + arg.gsub(/([$\\\"\`])/, "\\\\\\1") + '"'
+ a.gsub(/\s/, '" "')
else
arg
end