diff options
Diffstat (limited to 'devel/automake14/files/patch-ad')
| -rw-r--r-- | devel/automake14/files/patch-ad | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/devel/automake14/files/patch-ad b/devel/automake14/files/patch-ad index 3cd773443ae..ddf7317ff65 100644 --- a/devel/automake14/files/patch-ad +++ b/devel/automake14/files/patch-ad @@ -1,5 +1,8 @@ ---- aclocal.in.orig Sun Sep 9 11:31:39 2001 -+++ aclocal.in Sun Sep 9 11:37:54 2001 + +$FreeBSD$ + +--- aclocal.in.orig Sun Jul 15 13:52:18 2001 ++++ aclocal.in Sat Aug 11 12:28:32 2001 @@ -34,6 +34,8 @@ # Note that this isn't pkgdatadir, but a separate directory. $acdir = "@datadir@/aclocal"; @@ -9,17 +12,17 @@ # Some globals. # Exit status. -@@ -115,6 +117,9 @@ +@@ -106,6 +108,9 @@ local (@dirlist) = &parse_arguments (@ARGV); + +unshift @dirlist, $acdir_x11 if -d "$acdir_x11/."; + - &scan_m4_files (@dirlist); + &scan_m4_files ($acdir, @dirlist); &scan_configure; if (! $exit_status) -@@ -299,11 +304,13 @@ +@@ -279,12 +284,13 @@ $file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4'); } @@ -28,12 +31,13 @@ foreach $m4dir (@dirlist) { opendir (DIR, $m4dir) - || die "aclocal: couldn't open directory `$m4dir': $!\n"; -+ local ($file, $fullfile, $expr); - local ($file, $fullfile); + || die "aclocal: couldn't open directory \`$m4dir': $!\n"; +- local ($file, $fullfile, $expr); ++ local ($file, $fullfile, $ino, $expr); foreach $file (sort grep (! /^\./, readdir (DIR))) { -@@ -314,6 +321,12 @@ + # Only examine .m4 files. +@@ -294,6 +300,12 @@ next if $file eq 'aclocal.m4'; $fullfile = $m4dir . '/' . $file; @@ -46,3 +50,12 @@ $file_contents{$fullfile} = &scan_file ($fullfile); } closedir (DIR); +@@ -400,7 +412,7 @@ + elsif ($map{$1} ne 'acinclude.m4' || $file eq 'acinclude.m4') + { + warn "aclocal: $file: $.: duplicated macro \`$1'\n"; +- $exit_status = 1; ++ # $exit_status = 1; + } + print STDERR "Found macro $1 in $file: $.\n" if $verbosity; + } |