summaryrefslogtreecommitdiffstats
path: root/devel/gnu-automake
diff options
context:
space:
mode:
authorsobomax <sobomax@FreeBSD.org>2001-08-11 09:32:09 +0000
committersobomax <sobomax@FreeBSD.org>2001-08-11 09:32:09 +0000
commitd1a39f075fbf96ec45a95fb88cadc7b8af90de3c (patch)
tree0cfb0523d341d7f004caf380ba6929edaa60b50a /devel/gnu-automake
parent28296f8d4207849ca58168d0d64f20cd1855f06e (diff)
downloadFreeBSD-ports-d1a39f075fbf96ec45a95fb88cadc7b8af90de3c.zip
FreeBSD-ports-d1a39f075fbf96ec45a95fb88cadc7b8af90de3c.tar.gz
Turn famous `duplicated macro ...' into a warning rather than an error.
Diffstat (limited to 'devel/gnu-automake')
-rw-r--r--devel/gnu-automake/Makefile1
-rw-r--r--devel/gnu-automake/files/patch-ad22
2 files changed, 18 insertions, 5 deletions
diff --git a/devel/gnu-automake/Makefile b/devel/gnu-automake/Makefile
index 0862b30..9406185 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 ef9a6f4..ddf7317 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;
+ }
OpenPOWER on IntegriCloud