mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-24 04:33:24 +00:00
[Re]Update to version 1.5.
The legacy version is known as 'automake14' for those that find automake 1.5 incompatible.
This commit is contained in:
parent
eec70b011f
commit
254d293472
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=49303
@ -6,13 +6,10 @@
|
||||
#
|
||||
|
||||
PORTNAME= automake
|
||||
PORTVERSION= 1.4.5
|
||||
PORTEPOCH= 1
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.5
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ${MASTER_SITE_GNU}
|
||||
MASTER_SITE_SUBDIR= automake
|
||||
DISTNAME= ${PORTNAME}-1.4-p5
|
||||
|
||||
MAINTAINER= portmgr@FreeBSD.org
|
||||
|
||||
|
@ -1 +1 @@
|
||||
MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3
|
||||
MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- Makefile.in.orig Mon May 4 10:42:08 1998
|
||||
+++ Makefile.in Mon May 4 10:42:34 1998
|
||||
@@ -204,7 +204,7 @@
|
||||
--- Makefile.in.orig Sun Sep 9 11:42:15 2001
|
||||
+++ Makefile.in Sun Sep 9 11:42:51 2001
|
||||
@@ -180,7 +180,7 @@
|
||||
.texi.info:
|
||||
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
|
||||
cd $(srcdir) \
|
||||
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
|
||||
+ && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
|
||||
- && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
|
||||
+ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
|
||||
`echo $< | sed 's,.*/,,'`
|
||||
|
||||
.texi.dvi:
|
||||
TEXINPUTS=$(srcdir):$$TEXINPUTS \
|
||||
|
@ -1,8 +1,5 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- aclocal.in.orig Sun Jul 15 13:52:18 2001
|
||||
+++ aclocal.in Sat Aug 11 12:28:32 2001
|
||||
--- aclocal.in.orig Sun Sep 9 11:31:39 2001
|
||||
+++ aclocal.in Sun Sep 9 11:37:54 2001
|
||||
@@ -34,6 +34,8 @@
|
||||
# Note that this isn't pkgdatadir, but a separate directory.
|
||||
$acdir = "@datadir@/aclocal";
|
||||
@ -12,17 +9,17 @@ $FreeBSD$
|
||||
# Some globals.
|
||||
|
||||
# Exit status.
|
||||
@@ -106,6 +108,9 @@
|
||||
@@ -115,6 +117,9 @@
|
||||
|
||||
|
||||
local (@dirlist) = &parse_arguments (@ARGV);
|
||||
+
|
||||
+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
|
||||
+
|
||||
&scan_m4_files ($acdir, @dirlist);
|
||||
&scan_m4_files (@dirlist);
|
||||
&scan_configure;
|
||||
if (! $exit_status)
|
||||
@@ -279,12 +284,13 @@
|
||||
@@ -299,11 +304,13 @@
|
||||
$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
|
||||
}
|
||||
|
||||
@ -31,13 +28,12 @@ $FreeBSD$
|
||||
foreach $m4dir (@dirlist)
|
||||
{
|
||||
opendir (DIR, $m4dir)
|
||||
|| die "aclocal: couldn't open directory \`$m4dir': $!\n";
|
||||
- local ($file, $fullfile, $expr);
|
||||
+ local ($file, $fullfile, $ino, $expr);
|
||||
|| die "aclocal: couldn't open directory `$m4dir': $!\n";
|
||||
+ local ($file, $fullfile, $expr);
|
||||
local ($file, $fullfile);
|
||||
foreach $file (sort grep (! /^\./, readdir (DIR)))
|
||||
{
|
||||
# Only examine .m4 files.
|
||||
@@ -294,6 +300,12 @@
|
||||
@@ -314,6 +321,12 @@
|
||||
next if $file eq 'aclocal.m4';
|
||||
|
||||
$fullfile = $m4dir . '/' . $file;
|
||||
@ -50,12 +46,3 @@ $FreeBSD$
|
||||
$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;
|
||||
}
|
||||
|
@ -6,13 +6,10 @@
|
||||
#
|
||||
|
||||
PORTNAME= automake
|
||||
PORTVERSION= 1.4.5
|
||||
PORTEPOCH= 1
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.5
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ${MASTER_SITE_GNU}
|
||||
MASTER_SITE_SUBDIR= automake
|
||||
DISTNAME= ${PORTNAME}-1.4-p5
|
||||
|
||||
MAINTAINER= portmgr@FreeBSD.org
|
||||
|
||||
|
@ -1 +1 @@
|
||||
MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3
|
||||
MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- Makefile.in.orig Mon May 4 10:42:08 1998
|
||||
+++ Makefile.in Mon May 4 10:42:34 1998
|
||||
@@ -204,7 +204,7 @@
|
||||
--- Makefile.in.orig Sun Sep 9 11:42:15 2001
|
||||
+++ Makefile.in Sun Sep 9 11:42:51 2001
|
||||
@@ -180,7 +180,7 @@
|
||||
.texi.info:
|
||||
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
|
||||
cd $(srcdir) \
|
||||
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
|
||||
+ && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
|
||||
- && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
|
||||
+ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
|
||||
`echo $< | sed 's,.*/,,'`
|
||||
|
||||
.texi.dvi:
|
||||
TEXINPUTS=$(srcdir):$$TEXINPUTS \
|
||||
|
@ -1,8 +1,5 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- aclocal.in.orig Sun Jul 15 13:52:18 2001
|
||||
+++ aclocal.in Sat Aug 11 12:28:32 2001
|
||||
--- aclocal.in.orig Sun Sep 9 11:31:39 2001
|
||||
+++ aclocal.in Sun Sep 9 11:37:54 2001
|
||||
@@ -34,6 +34,8 @@
|
||||
# Note that this isn't pkgdatadir, but a separate directory.
|
||||
$acdir = "@datadir@/aclocal";
|
||||
@ -12,17 +9,17 @@ $FreeBSD$
|
||||
# Some globals.
|
||||
|
||||
# Exit status.
|
||||
@@ -106,6 +108,9 @@
|
||||
@@ -115,6 +117,9 @@
|
||||
|
||||
|
||||
local (@dirlist) = &parse_arguments (@ARGV);
|
||||
+
|
||||
+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
|
||||
+
|
||||
&scan_m4_files ($acdir, @dirlist);
|
||||
&scan_m4_files (@dirlist);
|
||||
&scan_configure;
|
||||
if (! $exit_status)
|
||||
@@ -279,12 +284,13 @@
|
||||
@@ -299,11 +304,13 @@
|
||||
$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
|
||||
}
|
||||
|
||||
@ -31,13 +28,12 @@ $FreeBSD$
|
||||
foreach $m4dir (@dirlist)
|
||||
{
|
||||
opendir (DIR, $m4dir)
|
||||
|| die "aclocal: couldn't open directory \`$m4dir': $!\n";
|
||||
- local ($file, $fullfile, $expr);
|
||||
+ local ($file, $fullfile, $ino, $expr);
|
||||
|| die "aclocal: couldn't open directory `$m4dir': $!\n";
|
||||
+ local ($file, $fullfile, $expr);
|
||||
local ($file, $fullfile);
|
||||
foreach $file (sort grep (! /^\./, readdir (DIR)))
|
||||
{
|
||||
# Only examine .m4 files.
|
||||
@@ -294,6 +300,12 @@
|
||||
@@ -314,6 +321,12 @@
|
||||
next if $file eq 'aclocal.m4';
|
||||
|
||||
$fullfile = $m4dir . '/' . $file;
|
||||
@ -50,12 +46,3 @@ $FreeBSD$
|
||||
$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;
|
||||
}
|
||||
|
@ -6,13 +6,10 @@
|
||||
#
|
||||
|
||||
PORTNAME= automake
|
||||
PORTVERSION= 1.4.5
|
||||
PORTEPOCH= 1
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.5
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ${MASTER_SITE_GNU}
|
||||
MASTER_SITE_SUBDIR= automake
|
||||
DISTNAME= ${PORTNAME}-1.4-p5
|
||||
|
||||
MAINTAINER= portmgr@FreeBSD.org
|
||||
|
||||
|
@ -1 +1 @@
|
||||
MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3
|
||||
MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- Makefile.in.orig Mon May 4 10:42:08 1998
|
||||
+++ Makefile.in Mon May 4 10:42:34 1998
|
||||
@@ -204,7 +204,7 @@
|
||||
--- Makefile.in.orig Sun Sep 9 11:42:15 2001
|
||||
+++ Makefile.in Sun Sep 9 11:42:51 2001
|
||||
@@ -180,7 +180,7 @@
|
||||
.texi.info:
|
||||
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
|
||||
cd $(srcdir) \
|
||||
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
|
||||
+ && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
|
||||
- && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
|
||||
+ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
|
||||
`echo $< | sed 's,.*/,,'`
|
||||
|
||||
.texi.dvi:
|
||||
TEXINPUTS=$(srcdir):$$TEXINPUTS \
|
||||
|
@ -1,8 +1,5 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- aclocal.in.orig Sun Jul 15 13:52:18 2001
|
||||
+++ aclocal.in Sat Aug 11 12:28:32 2001
|
||||
--- aclocal.in.orig Sun Sep 9 11:31:39 2001
|
||||
+++ aclocal.in Sun Sep 9 11:37:54 2001
|
||||
@@ -34,6 +34,8 @@
|
||||
# Note that this isn't pkgdatadir, but a separate directory.
|
||||
$acdir = "@datadir@/aclocal";
|
||||
@ -12,17 +9,17 @@ $FreeBSD$
|
||||
# Some globals.
|
||||
|
||||
# Exit status.
|
||||
@@ -106,6 +108,9 @@
|
||||
@@ -115,6 +117,9 @@
|
||||
|
||||
|
||||
local (@dirlist) = &parse_arguments (@ARGV);
|
||||
+
|
||||
+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
|
||||
+
|
||||
&scan_m4_files ($acdir, @dirlist);
|
||||
&scan_m4_files (@dirlist);
|
||||
&scan_configure;
|
||||
if (! $exit_status)
|
||||
@@ -279,12 +284,13 @@
|
||||
@@ -299,11 +304,13 @@
|
||||
$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
|
||||
}
|
||||
|
||||
@ -31,13 +28,12 @@ $FreeBSD$
|
||||
foreach $m4dir (@dirlist)
|
||||
{
|
||||
opendir (DIR, $m4dir)
|
||||
|| die "aclocal: couldn't open directory \`$m4dir': $!\n";
|
||||
- local ($file, $fullfile, $expr);
|
||||
+ local ($file, $fullfile, $ino, $expr);
|
||||
|| die "aclocal: couldn't open directory `$m4dir': $!\n";
|
||||
+ local ($file, $fullfile, $expr);
|
||||
local ($file, $fullfile);
|
||||
foreach $file (sort grep (! /^\./, readdir (DIR)))
|
||||
{
|
||||
# Only examine .m4 files.
|
||||
@@ -294,6 +300,12 @@
|
||||
@@ -314,6 +321,12 @@
|
||||
next if $file eq 'aclocal.m4';
|
||||
|
||||
$fullfile = $m4dir . '/' . $file;
|
||||
@ -50,12 +46,3 @@ $FreeBSD$
|
||||
$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;
|
||||
}
|
||||
|
@ -6,13 +6,10 @@
|
||||
#
|
||||
|
||||
PORTNAME= automake
|
||||
PORTVERSION= 1.4.5
|
||||
PORTEPOCH= 1
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.5
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ${MASTER_SITE_GNU}
|
||||
MASTER_SITE_SUBDIR= automake
|
||||
DISTNAME= ${PORTNAME}-1.4-p5
|
||||
|
||||
MAINTAINER= portmgr@FreeBSD.org
|
||||
|
||||
|
@ -1 +1 @@
|
||||
MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3
|
||||
MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- Makefile.in.orig Mon May 4 10:42:08 1998
|
||||
+++ Makefile.in Mon May 4 10:42:34 1998
|
||||
@@ -204,7 +204,7 @@
|
||||
--- Makefile.in.orig Sun Sep 9 11:42:15 2001
|
||||
+++ Makefile.in Sun Sep 9 11:42:51 2001
|
||||
@@ -180,7 +180,7 @@
|
||||
.texi.info:
|
||||
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
|
||||
cd $(srcdir) \
|
||||
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
|
||||
+ && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
|
||||
- && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
|
||||
+ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
|
||||
`echo $< | sed 's,.*/,,'`
|
||||
|
||||
.texi.dvi:
|
||||
TEXINPUTS=$(srcdir):$$TEXINPUTS \
|
||||
|
@ -1,8 +1,5 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- aclocal.in.orig Sun Jul 15 13:52:18 2001
|
||||
+++ aclocal.in Sat Aug 11 12:28:32 2001
|
||||
--- aclocal.in.orig Sun Sep 9 11:31:39 2001
|
||||
+++ aclocal.in Sun Sep 9 11:37:54 2001
|
||||
@@ -34,6 +34,8 @@
|
||||
# Note that this isn't pkgdatadir, but a separate directory.
|
||||
$acdir = "@datadir@/aclocal";
|
||||
@ -12,17 +9,17 @@ $FreeBSD$
|
||||
# Some globals.
|
||||
|
||||
# Exit status.
|
||||
@@ -106,6 +108,9 @@
|
||||
@@ -115,6 +117,9 @@
|
||||
|
||||
|
||||
local (@dirlist) = &parse_arguments (@ARGV);
|
||||
+
|
||||
+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
|
||||
+
|
||||
&scan_m4_files ($acdir, @dirlist);
|
||||
&scan_m4_files (@dirlist);
|
||||
&scan_configure;
|
||||
if (! $exit_status)
|
||||
@@ -279,12 +284,13 @@
|
||||
@@ -299,11 +304,13 @@
|
||||
$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
|
||||
}
|
||||
|
||||
@ -31,13 +28,12 @@ $FreeBSD$
|
||||
foreach $m4dir (@dirlist)
|
||||
{
|
||||
opendir (DIR, $m4dir)
|
||||
|| die "aclocal: couldn't open directory \`$m4dir': $!\n";
|
||||
- local ($file, $fullfile, $expr);
|
||||
+ local ($file, $fullfile, $ino, $expr);
|
||||
|| die "aclocal: couldn't open directory `$m4dir': $!\n";
|
||||
+ local ($file, $fullfile, $expr);
|
||||
local ($file, $fullfile);
|
||||
foreach $file (sort grep (! /^\./, readdir (DIR)))
|
||||
{
|
||||
# Only examine .m4 files.
|
||||
@@ -294,6 +300,12 @@
|
||||
@@ -314,6 +321,12 @@
|
||||
next if $file eq 'aclocal.m4';
|
||||
|
||||
$fullfile = $m4dir . '/' . $file;
|
||||
@ -50,12 +46,3 @@ $FreeBSD$
|
||||
$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;
|
||||
}
|
||||
|
@ -6,13 +6,10 @@
|
||||
#
|
||||
|
||||
PORTNAME= automake
|
||||
PORTVERSION= 1.4.5
|
||||
PORTEPOCH= 1
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.5
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ${MASTER_SITE_GNU}
|
||||
MASTER_SITE_SUBDIR= automake
|
||||
DISTNAME= ${PORTNAME}-1.4-p5
|
||||
|
||||
MAINTAINER= portmgr@FreeBSD.org
|
||||
|
||||
|
@ -1 +1 @@
|
||||
MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3
|
||||
MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- Makefile.in.orig Mon May 4 10:42:08 1998
|
||||
+++ Makefile.in Mon May 4 10:42:34 1998
|
||||
@@ -204,7 +204,7 @@
|
||||
--- Makefile.in.orig Sun Sep 9 11:42:15 2001
|
||||
+++ Makefile.in Sun Sep 9 11:42:51 2001
|
||||
@@ -180,7 +180,7 @@
|
||||
.texi.info:
|
||||
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
|
||||
cd $(srcdir) \
|
||||
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
|
||||
+ && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
|
||||
- && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
|
||||
+ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
|
||||
`echo $< | sed 's,.*/,,'`
|
||||
|
||||
.texi.dvi:
|
||||
TEXINPUTS=$(srcdir):$$TEXINPUTS \
|
||||
|
@ -1,8 +1,5 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- aclocal.in.orig Sun Jul 15 13:52:18 2001
|
||||
+++ aclocal.in Sat Aug 11 12:28:32 2001
|
||||
--- aclocal.in.orig Sun Sep 9 11:31:39 2001
|
||||
+++ aclocal.in Sun Sep 9 11:37:54 2001
|
||||
@@ -34,6 +34,8 @@
|
||||
# Note that this isn't pkgdatadir, but a separate directory.
|
||||
$acdir = "@datadir@/aclocal";
|
||||
@ -12,17 +9,17 @@ $FreeBSD$
|
||||
# Some globals.
|
||||
|
||||
# Exit status.
|
||||
@@ -106,6 +108,9 @@
|
||||
@@ -115,6 +117,9 @@
|
||||
|
||||
|
||||
local (@dirlist) = &parse_arguments (@ARGV);
|
||||
+
|
||||
+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
|
||||
+
|
||||
&scan_m4_files ($acdir, @dirlist);
|
||||
&scan_m4_files (@dirlist);
|
||||
&scan_configure;
|
||||
if (! $exit_status)
|
||||
@@ -279,12 +284,13 @@
|
||||
@@ -299,11 +304,13 @@
|
||||
$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
|
||||
}
|
||||
|
||||
@ -31,13 +28,12 @@ $FreeBSD$
|
||||
foreach $m4dir (@dirlist)
|
||||
{
|
||||
opendir (DIR, $m4dir)
|
||||
|| die "aclocal: couldn't open directory \`$m4dir': $!\n";
|
||||
- local ($file, $fullfile, $expr);
|
||||
+ local ($file, $fullfile, $ino, $expr);
|
||||
|| die "aclocal: couldn't open directory `$m4dir': $!\n";
|
||||
+ local ($file, $fullfile, $expr);
|
||||
local ($file, $fullfile);
|
||||
foreach $file (sort grep (! /^\./, readdir (DIR)))
|
||||
{
|
||||
# Only examine .m4 files.
|
||||
@@ -294,6 +300,12 @@
|
||||
@@ -314,6 +321,12 @@
|
||||
next if $file eq 'aclocal.m4';
|
||||
|
||||
$fullfile = $m4dir . '/' . $file;
|
||||
@ -50,12 +46,3 @@ $FreeBSD$
|
||||
$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;
|
||||
}
|
||||
|
@ -6,13 +6,10 @@
|
||||
#
|
||||
|
||||
PORTNAME= automake
|
||||
PORTVERSION= 1.4.5
|
||||
PORTEPOCH= 1
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.5
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ${MASTER_SITE_GNU}
|
||||
MASTER_SITE_SUBDIR= automake
|
||||
DISTNAME= ${PORTNAME}-1.4-p5
|
||||
|
||||
MAINTAINER= portmgr@FreeBSD.org
|
||||
|
||||
|
@ -1 +1 @@
|
||||
MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3
|
||||
MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- Makefile.in.orig Mon May 4 10:42:08 1998
|
||||
+++ Makefile.in Mon May 4 10:42:34 1998
|
||||
@@ -204,7 +204,7 @@
|
||||
--- Makefile.in.orig Sun Sep 9 11:42:15 2001
|
||||
+++ Makefile.in Sun Sep 9 11:42:51 2001
|
||||
@@ -180,7 +180,7 @@
|
||||
.texi.info:
|
||||
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
|
||||
cd $(srcdir) \
|
||||
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
|
||||
+ && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
|
||||
- && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
|
||||
+ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
|
||||
`echo $< | sed 's,.*/,,'`
|
||||
|
||||
.texi.dvi:
|
||||
TEXINPUTS=$(srcdir):$$TEXINPUTS \
|
||||
|
@ -1,8 +1,5 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- aclocal.in.orig Sun Jul 15 13:52:18 2001
|
||||
+++ aclocal.in Sat Aug 11 12:28:32 2001
|
||||
--- aclocal.in.orig Sun Sep 9 11:31:39 2001
|
||||
+++ aclocal.in Sun Sep 9 11:37:54 2001
|
||||
@@ -34,6 +34,8 @@
|
||||
# Note that this isn't pkgdatadir, but a separate directory.
|
||||
$acdir = "@datadir@/aclocal";
|
||||
@ -12,17 +9,17 @@ $FreeBSD$
|
||||
# Some globals.
|
||||
|
||||
# Exit status.
|
||||
@@ -106,6 +108,9 @@
|
||||
@@ -115,6 +117,9 @@
|
||||
|
||||
|
||||
local (@dirlist) = &parse_arguments (@ARGV);
|
||||
+
|
||||
+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
|
||||
+
|
||||
&scan_m4_files ($acdir, @dirlist);
|
||||
&scan_m4_files (@dirlist);
|
||||
&scan_configure;
|
||||
if (! $exit_status)
|
||||
@@ -279,12 +284,13 @@
|
||||
@@ -299,11 +304,13 @@
|
||||
$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
|
||||
}
|
||||
|
||||
@ -31,13 +28,12 @@ $FreeBSD$
|
||||
foreach $m4dir (@dirlist)
|
||||
{
|
||||
opendir (DIR, $m4dir)
|
||||
|| die "aclocal: couldn't open directory \`$m4dir': $!\n";
|
||||
- local ($file, $fullfile, $expr);
|
||||
+ local ($file, $fullfile, $ino, $expr);
|
||||
|| die "aclocal: couldn't open directory `$m4dir': $!\n";
|
||||
+ local ($file, $fullfile, $expr);
|
||||
local ($file, $fullfile);
|
||||
foreach $file (sort grep (! /^\./, readdir (DIR)))
|
||||
{
|
||||
# Only examine .m4 files.
|
||||
@@ -294,6 +300,12 @@
|
||||
@@ -314,6 +321,12 @@
|
||||
next if $file eq 'aclocal.m4';
|
||||
|
||||
$fullfile = $m4dir . '/' . $file;
|
||||
@ -50,12 +46,3 @@ $FreeBSD$
|
||||
$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;
|
||||
}
|
||||
|
@ -6,13 +6,10 @@
|
||||
#
|
||||
|
||||
PORTNAME= automake
|
||||
PORTVERSION= 1.4.5
|
||||
PORTEPOCH= 1
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.5
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ${MASTER_SITE_GNU}
|
||||
MASTER_SITE_SUBDIR= automake
|
||||
DISTNAME= ${PORTNAME}-1.4-p5
|
||||
|
||||
MAINTAINER= portmgr@FreeBSD.org
|
||||
|
||||
|
@ -1 +1 @@
|
||||
MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3
|
||||
MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- Makefile.in.orig Mon May 4 10:42:08 1998
|
||||
+++ Makefile.in Mon May 4 10:42:34 1998
|
||||
@@ -204,7 +204,7 @@
|
||||
--- Makefile.in.orig Sun Sep 9 11:42:15 2001
|
||||
+++ Makefile.in Sun Sep 9 11:42:51 2001
|
||||
@@ -180,7 +180,7 @@
|
||||
.texi.info:
|
||||
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
|
||||
cd $(srcdir) \
|
||||
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
|
||||
+ && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
|
||||
- && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
|
||||
+ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
|
||||
`echo $< | sed 's,.*/,,'`
|
||||
|
||||
.texi.dvi:
|
||||
TEXINPUTS=$(srcdir):$$TEXINPUTS \
|
||||
|
@ -1,8 +1,5 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- aclocal.in.orig Sun Jul 15 13:52:18 2001
|
||||
+++ aclocal.in Sat Aug 11 12:28:32 2001
|
||||
--- aclocal.in.orig Sun Sep 9 11:31:39 2001
|
||||
+++ aclocal.in Sun Sep 9 11:37:54 2001
|
||||
@@ -34,6 +34,8 @@
|
||||
# Note that this isn't pkgdatadir, but a separate directory.
|
||||
$acdir = "@datadir@/aclocal";
|
||||
@ -12,17 +9,17 @@ $FreeBSD$
|
||||
# Some globals.
|
||||
|
||||
# Exit status.
|
||||
@@ -106,6 +108,9 @@
|
||||
@@ -115,6 +117,9 @@
|
||||
|
||||
|
||||
local (@dirlist) = &parse_arguments (@ARGV);
|
||||
+
|
||||
+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
|
||||
+
|
||||
&scan_m4_files ($acdir, @dirlist);
|
||||
&scan_m4_files (@dirlist);
|
||||
&scan_configure;
|
||||
if (! $exit_status)
|
||||
@@ -279,12 +284,13 @@
|
||||
@@ -299,11 +304,13 @@
|
||||
$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
|
||||
}
|
||||
|
||||
@ -31,13 +28,12 @@ $FreeBSD$
|
||||
foreach $m4dir (@dirlist)
|
||||
{
|
||||
opendir (DIR, $m4dir)
|
||||
|| die "aclocal: couldn't open directory \`$m4dir': $!\n";
|
||||
- local ($file, $fullfile, $expr);
|
||||
+ local ($file, $fullfile, $ino, $expr);
|
||||
|| die "aclocal: couldn't open directory `$m4dir': $!\n";
|
||||
+ local ($file, $fullfile, $expr);
|
||||
local ($file, $fullfile);
|
||||
foreach $file (sort grep (! /^\./, readdir (DIR)))
|
||||
{
|
||||
# Only examine .m4 files.
|
||||
@@ -294,6 +300,12 @@
|
||||
@@ -314,6 +321,12 @@
|
||||
next if $file eq 'aclocal.m4';
|
||||
|
||||
$fullfile = $m4dir . '/' . $file;
|
||||
@ -50,12 +46,3 @@ $FreeBSD$
|
||||
$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;
|
||||
}
|
||||
|
@ -6,13 +6,10 @@
|
||||
#
|
||||
|
||||
PORTNAME= automake
|
||||
PORTVERSION= 1.4.5
|
||||
PORTEPOCH= 1
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.5
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= ${MASTER_SITE_GNU}
|
||||
MASTER_SITE_SUBDIR= automake
|
||||
DISTNAME= ${PORTNAME}-1.4-p5
|
||||
|
||||
MAINTAINER= portmgr@FreeBSD.org
|
||||
|
||||
|
@ -1 +1 @@
|
||||
MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3
|
||||
MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab
|
||||
|
@ -1,11 +1,11 @@
|
||||
--- Makefile.in.orig Mon May 4 10:42:08 1998
|
||||
+++ Makefile.in Mon May 4 10:42:34 1998
|
||||
@@ -204,7 +204,7 @@
|
||||
--- Makefile.in.orig Sun Sep 9 11:42:15 2001
|
||||
+++ Makefile.in Sun Sep 9 11:42:51 2001
|
||||
@@ -180,7 +180,7 @@
|
||||
.texi.info:
|
||||
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
|
||||
cd $(srcdir) \
|
||||
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
|
||||
+ && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
|
||||
- && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
|
||||
+ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
|
||||
`echo $< | sed 's,.*/,,'`
|
||||
|
||||
.texi.dvi:
|
||||
TEXINPUTS=$(srcdir):$$TEXINPUTS \
|
||||
|
@ -1,8 +1,5 @@
|
||||
|
||||
$FreeBSD$
|
||||
|
||||
--- aclocal.in.orig Sun Jul 15 13:52:18 2001
|
||||
+++ aclocal.in Sat Aug 11 12:28:32 2001
|
||||
--- aclocal.in.orig Sun Sep 9 11:31:39 2001
|
||||
+++ aclocal.in Sun Sep 9 11:37:54 2001
|
||||
@@ -34,6 +34,8 @@
|
||||
# Note that this isn't pkgdatadir, but a separate directory.
|
||||
$acdir = "@datadir@/aclocal";
|
||||
@ -12,17 +9,17 @@ $FreeBSD$
|
||||
# Some globals.
|
||||
|
||||
# Exit status.
|
||||
@@ -106,6 +108,9 @@
|
||||
@@ -115,6 +117,9 @@
|
||||
|
||||
|
||||
local (@dirlist) = &parse_arguments (@ARGV);
|
||||
+
|
||||
+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
|
||||
+
|
||||
&scan_m4_files ($acdir, @dirlist);
|
||||
&scan_m4_files (@dirlist);
|
||||
&scan_configure;
|
||||
if (! $exit_status)
|
||||
@@ -279,12 +284,13 @@
|
||||
@@ -299,11 +304,13 @@
|
||||
$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
|
||||
}
|
||||
|
||||
@ -31,13 +28,12 @@ $FreeBSD$
|
||||
foreach $m4dir (@dirlist)
|
||||
{
|
||||
opendir (DIR, $m4dir)
|
||||
|| die "aclocal: couldn't open directory \`$m4dir': $!\n";
|
||||
- local ($file, $fullfile, $expr);
|
||||
+ local ($file, $fullfile, $ino, $expr);
|
||||
|| die "aclocal: couldn't open directory `$m4dir': $!\n";
|
||||
+ local ($file, $fullfile, $expr);
|
||||
local ($file, $fullfile);
|
||||
foreach $file (sort grep (! /^\./, readdir (DIR)))
|
||||
{
|
||||
# Only examine .m4 files.
|
||||
@@ -294,6 +300,12 @@
|
||||
@@ -314,6 +321,12 @@
|
||||
next if $file eq 'aclocal.m4';
|
||||
|
||||
$fullfile = $m4dir . '/' . $file;
|
||||
@ -50,12 +46,3 @@ $FreeBSD$
|
||||
$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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user