Turn famous `duplicated macro ...' into a warning rather than an error.

18 files changed, 162 insertions, 45 deletions

diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 0862b307db76..940618519106 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	automake
 PORTVERSION=	1.4.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
diff --git a/devel/automake/files/patch-ad b/devel/automake/files/patch-ad
index ef9a6f42c14b..ddf7317ff655 100644
--- a/devel/automake/files/patch-ad
+++ b/devel/automake/files/patch-ad
@@ -1,5 +1,8 @@
---- aclocal.in.orig	Mon Jan 11 11:35:27 1999
-+++ aclocal.in	Wed Jul 19 19:13:05 2000
+
+$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,7 +12,7 @@
  # Some globals.
  
  # Exit status.
-@@ -103,6 +105,9 @@
+@@ -106,6 +108,9 @@
  
  
  local (@dirlist) = &parse_arguments (@ARGV);
@@ -19,7 +22,7 @@
  &scan_m4_files ($acdir, @dirlist);
  &scan_configure;
  if (! $exit_status)
-@@ -266,12 +271,13 @@
+@@ -279,12 +284,13 @@
  	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
      }
  
@@ -34,7 +37,7 @@
  	foreach $file (sort grep (! /^\./, readdir (DIR)))
  	{
  	    # Only examine .m4 files.
-@@ -281,6 +287,12 @@
+@@ -294,6 +300,12 @@
  	    next if $file eq 'aclocal.m4';
  
  	    $fullfile = $m4dir . '/' . $file;
@@ -47,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;
+ 	}
diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile
index 0862b307db76..940618519106 100644
--- a/devel/automake110/Makefile
+++ b/devel/automake110/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	automake
 PORTVERSION=	1.4.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
diff --git a/devel/automake110/files/patch-ad b/devel/automake110/files/patch-ad
index ef9a6f42c14b..ddf7317ff655 100644
--- a/devel/automake110/files/patch-ad
+++ b/devel/automake110/files/patch-ad
@@ -1,5 +1,8 @@
---- aclocal.in.orig	Mon Jan 11 11:35:27 1999
-+++ aclocal.in	Wed Jul 19 19:13:05 2000
+
+$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,7 +12,7 @@
  # Some globals.
  
  # Exit status.
-@@ -103,6 +105,9 @@
+@@ -106,6 +108,9 @@
  
  
  local (@dirlist) = &parse_arguments (@ARGV);
@@ -19,7 +22,7 @@
  &scan_m4_files ($acdir, @dirlist);
  &scan_configure;
  if (! $exit_status)
-@@ -266,12 +271,13 @@
+@@ -279,12 +284,13 @@
  	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
      }
  
@@ -34,7 +37,7 @@
  	foreach $file (sort grep (! /^\./, readdir (DIR)))
  	{
  	    # Only examine .m4 files.
-@@ -281,6 +287,12 @@
+@@ -294,6 +300,12 @@
  	    next if $file eq 'aclocal.m4';
  
  	    $fullfile = $m4dir . '/' . $file;
@@ -47,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;
+ 	}
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index 0862b307db76..940618519106 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	automake
 PORTVERSION=	1.4.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
diff --git a/devel/automake14/files/patch-ad b/devel/automake14/files/patch-ad
index ef9a6f42c14b..ddf7317ff655 100644
--- a/devel/automake14/files/patch-ad
+++ b/devel/automake14/files/patch-ad
@@ -1,5 +1,8 @@
---- aclocal.in.orig	Mon Jan 11 11:35:27 1999
-+++ aclocal.in	Wed Jul 19 19:13:05 2000
+
+$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,7 +12,7 @@
  # Some globals.
  
  # Exit status.
-@@ -103,6 +105,9 @@
+@@ -106,6 +108,9 @@
  
  
  local (@dirlist) = &parse_arguments (@ARGV);
@@ -19,7 +22,7 @@
  &scan_m4_files ($acdir, @dirlist);
  &scan_configure;
  if (! $exit_status)
-@@ -266,12 +271,13 @@
+@@ -279,12 +284,13 @@
  	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
      }
  
@@ -34,7 +37,7 @@
  	foreach $file (sort grep (! /^\./, readdir (DIR)))
  	{
  	    # Only examine .m4 files.
-@@ -281,6 +287,12 @@
+@@ -294,6 +300,12 @@
  	    next if $file eq 'aclocal.m4';
  
  	    $fullfile = $m4dir . '/' . $file;
@@ -47,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;
+ 	}
diff --git a/devel/automake15/Makefile b/devel/automake15/Makefile
index 0862b307db76..940618519106 100644
--- a/devel/automake15/Makefile
+++ b/devel/automake15/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	automake
 PORTVERSION=	1.4.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
diff --git a/devel/automake15/files/patch-ad b/devel/automake15/files/patch-ad
index ef9a6f42c14b..ddf7317ff655 100644
--- a/devel/automake15/files/patch-ad
+++ b/devel/automake15/files/patch-ad
@@ -1,5 +1,8 @@
---- aclocal.in.orig	Mon Jan 11 11:35:27 1999
-+++ aclocal.in	Wed Jul 19 19:13:05 2000
+
+$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,7 +12,7 @@
  # Some globals.
  
  # Exit status.
-@@ -103,6 +105,9 @@
+@@ -106,6 +108,9 @@
  
  
  local (@dirlist) = &parse_arguments (@ARGV);
@@ -19,7 +22,7 @@
  &scan_m4_files ($acdir, @dirlist);
  &scan_configure;
  if (! $exit_status)
-@@ -266,12 +271,13 @@
+@@ -279,12 +284,13 @@
  	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
      }
  
@@ -34,7 +37,7 @@
  	foreach $file (sort grep (! /^\./, readdir (DIR)))
  	{
  	    # Only examine .m4 files.
-@@ -281,6 +287,12 @@
+@@ -294,6 +300,12 @@
  	    next if $file eq 'aclocal.m4';
  
  	    $fullfile = $m4dir . '/' . $file;
@@ -47,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;
+ 	}
diff --git a/devel/automake16/Makefile b/devel/automake16/Makefile
index 0862b307db76..940618519106 100644
--- a/devel/automake16/Makefile
+++ b/devel/automake16/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	automake
 PORTVERSION=	1.4.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
diff --git a/devel/automake16/files/patch-ad b/devel/automake16/files/patch-ad
index ef9a6f42c14b..ddf7317ff655 100644
--- a/devel/automake16/files/patch-ad
+++ b/devel/automake16/files/patch-ad
@@ -1,5 +1,8 @@
---- aclocal.in.orig	Mon Jan 11 11:35:27 1999
-+++ aclocal.in	Wed Jul 19 19:13:05 2000
+
+$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,7 +12,7 @@
  # Some globals.
  
  # Exit status.
-@@ -103,6 +105,9 @@
+@@ -106,6 +108,9 @@
  
  
  local (@dirlist) = &parse_arguments (@ARGV);
@@ -19,7 +22,7 @@
  &scan_m4_files ($acdir, @dirlist);
  &scan_configure;
  if (! $exit_status)
-@@ -266,12 +271,13 @@
+@@ -279,12 +284,13 @@
  	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
      }
  
@@ -34,7 +37,7 @@
  	foreach $file (sort grep (! /^\./, readdir (DIR)))
  	{
  	    # Only examine .m4 files.
-@@ -281,6 +287,12 @@
+@@ -294,6 +300,12 @@
  	    next if $file eq 'aclocal.m4';
  
  	    $fullfile = $m4dir . '/' . $file;
@@ -47,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;
+ 	}
diff --git a/devel/automake17/Makefile b/devel/automake17/Makefile
index 0862b307db76..940618519106 100644
--- a/devel/automake17/Makefile
+++ b/devel/automake17/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	automake
 PORTVERSION=	1.4.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
diff --git a/devel/automake17/files/patch-ad b/devel/automake17/files/patch-ad
index ef9a6f42c14b..ddf7317ff655 100644
--- a/devel/automake17/files/patch-ad
+++ b/devel/automake17/files/patch-ad
@@ -1,5 +1,8 @@
---- aclocal.in.orig	Mon Jan 11 11:35:27 1999
-+++ aclocal.in	Wed Jul 19 19:13:05 2000
+
+$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,7 +12,7 @@
  # Some globals.
  
  # Exit status.
-@@ -103,6 +105,9 @@
+@@ -106,6 +108,9 @@
  
  
  local (@dirlist) = &parse_arguments (@ARGV);
@@ -19,7 +22,7 @@
  &scan_m4_files ($acdir, @dirlist);
  &scan_configure;
  if (! $exit_status)
-@@ -266,12 +271,13 @@
+@@ -279,12 +284,13 @@
  	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
      }
  
@@ -34,7 +37,7 @@
  	foreach $file (sort grep (! /^\./, readdir (DIR)))
  	{
  	    # Only examine .m4 files.
-@@ -281,6 +287,12 @@
+@@ -294,6 +300,12 @@
  	    next if $file eq 'aclocal.m4';
  
  	    $fullfile = $m4dir . '/' . $file;
@@ -47,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;
+ 	}
diff --git a/devel/automake18/Makefile b/devel/automake18/Makefile
index 0862b307db76..940618519106 100644
--- a/devel/automake18/Makefile
+++ b/devel/automake18/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	automake
 PORTVERSION=	1.4.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
diff --git a/devel/automake18/files/patch-ad b/devel/automake18/files/patch-ad
index ef9a6f42c14b..ddf7317ff655 100644
--- a/devel/automake18/files/patch-ad
+++ b/devel/automake18/files/patch-ad
@@ -1,5 +1,8 @@
---- aclocal.in.orig	Mon Jan 11 11:35:27 1999
-+++ aclocal.in	Wed Jul 19 19:13:05 2000
+
+$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,7 +12,7 @@
  # Some globals.
  
  # Exit status.
-@@ -103,6 +105,9 @@
+@@ -106,6 +108,9 @@
  
  
  local (@dirlist) = &parse_arguments (@ARGV);
@@ -19,7 +22,7 @@
  &scan_m4_files ($acdir, @dirlist);
  &scan_configure;
  if (! $exit_status)
-@@ -266,12 +271,13 @@
+@@ -279,12 +284,13 @@
  	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
      }
  
@@ -34,7 +37,7 @@
  	foreach $file (sort grep (! /^\./, readdir (DIR)))
  	{
  	    # Only examine .m4 files.
-@@ -281,6 +287,12 @@
+@@ -294,6 +300,12 @@
  	    next if $file eq 'aclocal.m4';
  
  	    $fullfile = $m4dir . '/' . $file;
@@ -47,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;
+ 	}
diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile
index 0862b307db76..940618519106 100644
--- a/devel/automake19/Makefile
+++ b/devel/automake19/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	automake
 PORTVERSION=	1.4.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
diff --git a/devel/automake19/files/patch-ad b/devel/automake19/files/patch-ad
index ef9a6f42c14b..ddf7317ff655 100644
--- a/devel/automake19/files/patch-ad
+++ b/devel/automake19/files/patch-ad
@@ -1,5 +1,8 @@
---- aclocal.in.orig	Mon Jan 11 11:35:27 1999
-+++ aclocal.in	Wed Jul 19 19:13:05 2000
+
+$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,7 +12,7 @@
  # Some globals.
  
  # Exit status.
-@@ -103,6 +105,9 @@
+@@ -106,6 +108,9 @@
  
  
  local (@dirlist) = &parse_arguments (@ARGV);
@@ -19,7 +22,7 @@
  &scan_m4_files ($acdir, @dirlist);
  &scan_configure;
  if (! $exit_status)
-@@ -266,12 +271,13 @@
+@@ -279,12 +284,13 @@
  	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
      }
  
@@ -34,7 +37,7 @@
  	foreach $file (sort grep (! /^\./, readdir (DIR)))
  	{
  	    # Only examine .m4 files.
-@@ -281,6 +287,12 @@
+@@ -294,6 +300,12 @@
  	    next if $file eq 'aclocal.m4';
  
  	    $fullfile = $m4dir . '/' . $file;
@@ -47,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;
+ 	}
diff --git a/devel/gnu-automake/Makefile b/devel/gnu-automake/Makefile
index 0862b307db76..940618519106 100644
--- a/devel/gnu-automake/Makefile
+++ b/devel/gnu-automake/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	automake
 PORTVERSION=	1.4.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
diff --git a/devel/gnu-automake/files/patch-ad b/devel/gnu-automake/files/patch-ad
index ef9a6f42c14b..ddf7317ff655 100644
--- a/devel/gnu-automake/files/patch-ad
+++ b/devel/gnu-automake/files/patch-ad
@@ -1,5 +1,8 @@
---- aclocal.in.orig	Mon Jan 11 11:35:27 1999
-+++ aclocal.in	Wed Jul 19 19:13:05 2000
+
+$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,7 +12,7 @@
  # Some globals.
  
  # Exit status.
-@@ -103,6 +105,9 @@
+@@ -106,6 +108,9 @@
  
  
  local (@dirlist) = &parse_arguments (@ARGV);
@@ -19,7 +22,7 @@
  &scan_m4_files ($acdir, @dirlist);
  &scan_configure;
  if (! $exit_status)
-@@ -266,12 +271,13 @@
+@@ -279,12 +284,13 @@
  	$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
      }
  
@@ -34,7 +37,7 @@
  	foreach $file (sort grep (! /^\./, readdir (DIR)))
  	{
  	    # Only examine .m4 files.
-@@ -281,6 +287,12 @@
+@@ -294,6 +300,12 @@
  	    next if $file eq 'aclocal.m4';
  
  	    $fullfile = $m4dir . '/' . $file;
@@ -47,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;
+ 	}