- We don't install README anymore.
- Fix a bug when :map was used on a string.
This commit is contained in:
parent
176cbcd157
commit
788e0ebba7
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=280248
4 changed files with 34 additions and 2 deletions
|
@ -7,7 +7,7 @@
|
|||
|
||||
PORTNAME= portupgrade
|
||||
PORTVERSION= 2.4.9.2
|
||||
PORTREVISION= 1
|
||||
PORTREVISION= 2
|
||||
PORTEPOCH= 2
|
||||
CATEGORIES= ports-mgmt
|
||||
MASTER_SITES= ftp://ftp.SpringDaemons.com/soft/
|
||||
|
|
19
ports-mgmt/portupgrade/files/patch-bin_pkgdb
Normal file
19
ports-mgmt/portupgrade/files/patch-bin_pkgdb
Normal file
|
@ -0,0 +1,19 @@
|
|||
diff --git a/bin/pkgdb b/bin/pkgdb
|
||||
index 34530fe..eae46fa 100755
|
||||
--- bin/pkgdb
|
||||
+++ bin/pkgdb
|
||||
@@ -294,10 +294,11 @@ def get_real_run_deps(pkgname)
|
||||
puts "Disclose depends for #{pkgname}" if $verbose
|
||||
|
||||
$origins[pkgname] = Hash.new
|
||||
- `cd #{$portsdb.portdir(origin)} && #{shelljoin(*make_env)} make #{shelljoin(*make_args)} package-depends-list`.map { |line|
|
||||
+ `cd #{$portsdb.portdir(origin)} && #{shelljoin(*make_env)} make #{shelljoin(*make_args)} package-depends-list`.each_line { |line|
|
||||
+ next if line.empty?
|
||||
a = line.chomp.split(/ /)
|
||||
- $origins[pkgname].store(a[0], a[2])
|
||||
- }.compact
|
||||
+ $origins[pkgname].store(a[0], a[2]) unless a[0].nil? or a[1].nil?
|
||||
+ }
|
||||
end
|
||||
$origins[pkgname]
|
||||
end
|
13
ports-mgmt/portupgrade/files/patch-lib_portsdb.rb
Normal file
13
ports-mgmt/portupgrade/files/patch-lib_portsdb.rb
Normal file
|
@ -0,0 +1,13 @@
|
|||
diff --git a/lib/portsdb.rb b/lib/portsdb.rb
|
||||
index 3d1d757..95ba620 100644
|
||||
--- lib/portsdb.rb
|
||||
+++ lib/portsdb.rb
|
||||
@@ -185,7 +185,7 @@ class PortsDB
|
||||
def make_var(var, dir = ports_dir())
|
||||
if var.is_a?(Array)
|
||||
vars = var.join(' -V ')
|
||||
- `cd #{dir} && make -V #{vars} 2>/dev/null`.map { |val|
|
||||
+ `cd #{dir} && make -V #{vars} 2>/dev/null`.lines.map { |val|
|
||||
val.strip!
|
||||
if val.empty?
|
||||
nil
|
|
@ -36,7 +36,7 @@ share/zsh/site-functions/_pkgtools
|
|||
%%EXAMPLESDIR%%/bash/complete.sample
|
||||
%%EXAMPLESDIR%%/tcsh/complete.sample
|
||||
%%PORTDOCS%%%%DOCSDIR%%/NEWS
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README
|
||||
%%PORTDOCS%%%%DOCSDIR%%/README.md
|
||||
@dirrm %%EXAMPLESDIR%%/bash
|
||||
@dirrm %%EXAMPLESDIR%%/tcsh
|
||||
@dirrm %%EXAMPLESDIR%%
|
||||
|
|
Loading…
Reference in a new issue