mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-11 07:22:22 +00:00
Code Issues Releases Activity

[Re]Update to version 1.5.

Browse Source 
The legacy version is known as 'automake14' for those that find automake 1.5
incompatible.
This commit is contained in:
David E. O'Brien 2001-10-29 01:46:00 +00:00
parent eec70b011f
commit 254d293472
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=49303
32 changed files with 136 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/automake/Makefile
View File

@ -6,13 +6,10 @@
# #
PORTNAME= automake PORTNAME= automake
PORTVERSION= 1.4.5 PORTVERSION= 1.5
PORTEPOCH= 1
PORTREVISION= 1
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake MASTER_SITE_SUBDIR= automake
DISTNAME= ${PORTNAME}-1.4-p5
MAINTAINER= portmgr@FreeBSD.org MAINTAINER= portmgr@FreeBSD.org

2
devel/automake/distinfo
View File

@ -1 +1 @@
MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3 MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab

12
devel/automake/files/patch-ab
View File

@ -1,11 +1,11 @@
--- Makefile.in.orig Mon May 4 10:42:08 1998 --- Makefile.in.orig Sun Sep 9 11:42:15 2001
+++ Makefile.in Mon May 4 10:42:34 1998 +++ Makefile.in Sun Sep 9 11:42:51 2001
@@ -204,7 +204,7 @@ @@ -180,7 +180,7 @@
.texi.info: .texi.info:
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
cd $(srcdir) \ cd $(srcdir) \
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'` - && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+ && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'` + && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
`echo $< | sed 's,.*/,,'`
.texi.dvi: .texi.dvi:
TEXINPUTS=$(srcdir):$$TEXINPUTS \

31
devel/automake/files/patch-ad
View File

@ -1,8 +1,5 @@
--- aclocal.in.orig Sun Sep 9 11:31:39 2001
$FreeBSD$ +++ aclocal.in Sun Sep 9 11:37:54 2001
--- aclocal.in.orig Sun Jul 15 13:52:18 2001
+++ aclocal.in Sat Aug 11 12:28:32 2001
@@ -34,6 +34,8 @@ @@ -34,6 +34,8 @@
# Note that this isn't pkgdatadir, but a separate directory. # Note that this isn't pkgdatadir, but a separate directory.
$acdir = "@datadir@/aclocal"; $acdir = "@datadir@/aclocal";
@ -12,17 +9,17 @@ $FreeBSD$
# Some globals. # Some globals.
# Exit status. # Exit status.
@@ -106,6 +108,9 @@ @@ -115,6 +117,9 @@
local (@dirlist) = &parse_arguments (@ARGV); local (@dirlist) = &parse_arguments (@ARGV);
+ +
+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/."; +unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
+ +
&scan_m4_files ($acdir, @dirlist); &scan_m4_files (@dirlist);
&scan_configure; &scan_configure;
if (! $exit_status) if (! $exit_status)
@@ -279,12 +284,13 @@ @@ -299,11 +304,13 @@
$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4'); $file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
} }
@ -31,13 +28,12 @@ $FreeBSD$
foreach $m4dir (@dirlist) foreach $m4dir (@dirlist)
{ {
opendir (DIR, $m4dir) opendir (DIR, $m4dir)
|| die "aclocal: couldn't open directory \`$m4dir': $!\n"; || die "aclocal: couldn't open directory `$m4dir': $!\n";
- local ($file, $fullfile, $expr); + local ($file, $fullfile, $expr);
+ local ($file, $fullfile, $ino, $expr); local ($file, $fullfile);
foreach $file (sort grep (! /^\./, readdir (DIR))) foreach $file (sort grep (! /^\./, readdir (DIR)))
{ {
# Only examine .m4 files. @@ -314,6 +321,12 @@
@@ -294,6 +300,12 @@
next if $file eq 'aclocal.m4'; next if $file eq 'aclocal.m4';
$fullfile = $m4dir . '/' . $file; $fullfile = $m4dir . '/' . $file;
@ -50,12 +46,3 @@ $FreeBSD$
$file_contents{$fullfile} = &scan_file ($fullfile); $file_contents{$fullfile} = &scan_file ($fullfile);
} }
closedir (DIR); 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;
}

5
devel/automake110/Makefile
View File

@ -6,13 +6,10 @@
# #
PORTNAME= automake PORTNAME= automake
PORTVERSION= 1.4.5 PORTVERSION= 1.5
PORTEPOCH= 1
PORTREVISION= 1
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake MASTER_SITE_SUBDIR= automake
DISTNAME= ${PORTNAME}-1.4-p5
MAINTAINER= portmgr@FreeBSD.org MAINTAINER= portmgr@FreeBSD.org

2
devel/automake110/distinfo
View File

@ -1 +1 @@
MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3 MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab

12
devel/automake110/files/patch-ab
View File

@ -1,11 +1,11 @@
--- Makefile.in.orig Mon May 4 10:42:08 1998 --- Makefile.in.orig Sun Sep 9 11:42:15 2001
+++ Makefile.in Mon May 4 10:42:34 1998 +++ Makefile.in Sun Sep 9 11:42:51 2001
@@ -204,7 +204,7 @@ @@ -180,7 +180,7 @@
.texi.info: .texi.info:
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
cd $(srcdir) \ cd $(srcdir) \
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'` - && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+ && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'` + && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
`echo $< | sed 's,.*/,,'`
.texi.dvi: .texi.dvi:
TEXINPUTS=$(srcdir):$$TEXINPUTS \

31
devel/automake110/files/patch-ad
View File

@ -1,8 +1,5 @@
--- aclocal.in.orig Sun Sep 9 11:31:39 2001
$FreeBSD$ +++ aclocal.in Sun Sep 9 11:37:54 2001
--- aclocal.in.orig Sun Jul 15 13:52:18 2001
+++ aclocal.in Sat Aug 11 12:28:32 2001
@@ -34,6 +34,8 @@ @@ -34,6 +34,8 @@
# Note that this isn't pkgdatadir, but a separate directory. # Note that this isn't pkgdatadir, but a separate directory.
$acdir = "@datadir@/aclocal"; $acdir = "@datadir@/aclocal";
@ -12,17 +9,17 @@ $FreeBSD$
# Some globals. # Some globals.
# Exit status. # Exit status.
@@ -106,6 +108,9 @@ @@ -115,6 +117,9 @@
local (@dirlist) = &parse_arguments (@ARGV); local (@dirlist) = &parse_arguments (@ARGV);
+ +
+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/."; +unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
+ +
&scan_m4_files ($acdir, @dirlist); &scan_m4_files (@dirlist);
&scan_configure; &scan_configure;
if (! $exit_status) if (! $exit_status)
@@ -279,12 +284,13 @@ @@ -299,11 +304,13 @@
$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4'); $file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
} }
@ -31,13 +28,12 @@ $FreeBSD$
foreach $m4dir (@dirlist) foreach $m4dir (@dirlist)
{ {
opendir (DIR, $m4dir) opendir (DIR, $m4dir)
|| die "aclocal: couldn't open directory \`$m4dir': $!\n"; || die "aclocal: couldn't open directory `$m4dir': $!\n";
- local ($file, $fullfile, $expr); + local ($file, $fullfile, $expr);
+ local ($file, $fullfile, $ino, $expr); local ($file, $fullfile);
foreach $file (sort grep (! /^\./, readdir (DIR))) foreach $file (sort grep (! /^\./, readdir (DIR)))
{ {
# Only examine .m4 files. @@ -314,6 +321,12 @@
@@ -294,6 +300,12 @@
next if $file eq 'aclocal.m4'; next if $file eq 'aclocal.m4';
$fullfile = $m4dir . '/' . $file; $fullfile = $m4dir . '/' . $file;
@ -50,12 +46,3 @@ $FreeBSD$
$file_contents{$fullfile} = &scan_file ($fullfile); $file_contents{$fullfile} = &scan_file ($fullfile);
} }
closedir (DIR); 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;
}

5
devel/automake15/Makefile
View File

@ -6,13 +6,10 @@
# #
PORTNAME= automake PORTNAME= automake
PORTVERSION= 1.4.5 PORTVERSION= 1.5
PORTEPOCH= 1
PORTREVISION= 1
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake MASTER_SITE_SUBDIR= automake
DISTNAME= ${PORTNAME}-1.4-p5
MAINTAINER= portmgr@FreeBSD.org MAINTAINER= portmgr@FreeBSD.org

2
devel/automake15/distinfo
View File

@ -1 +1 @@
MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3 MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab

12
devel/automake15/files/patch-ab
View File

@ -1,11 +1,11 @@
--- Makefile.in.orig Mon May 4 10:42:08 1998 --- Makefile.in.orig Sun Sep 9 11:42:15 2001
+++ Makefile.in Mon May 4 10:42:34 1998 +++ Makefile.in Sun Sep 9 11:42:51 2001
@@ -204,7 +204,7 @@ @@ -180,7 +180,7 @@
.texi.info: .texi.info:
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
cd $(srcdir) \ cd $(srcdir) \
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'` - && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+ && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'` + && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
`echo $< | sed 's,.*/,,'`
.texi.dvi: .texi.dvi:
TEXINPUTS=$(srcdir):$$TEXINPUTS \

31
devel/automake15/files/patch-ad
View File

@ -1,8 +1,5 @@
--- aclocal.in.orig Sun Sep 9 11:31:39 2001
$FreeBSD$ +++ aclocal.in Sun Sep 9 11:37:54 2001
--- aclocal.in.orig Sun Jul 15 13:52:18 2001
+++ aclocal.in Sat Aug 11 12:28:32 2001
@@ -34,6 +34,8 @@ @@ -34,6 +34,8 @@
# Note that this isn't pkgdatadir, but a separate directory. # Note that this isn't pkgdatadir, but a separate directory.
$acdir = "@datadir@/aclocal"; $acdir = "@datadir@/aclocal";
@ -12,17 +9,17 @@ $FreeBSD$
# Some globals. # Some globals.
# Exit status. # Exit status.
@@ -106,6 +108,9 @@ @@ -115,6 +117,9 @@
local (@dirlist) = &parse_arguments (@ARGV); local (@dirlist) = &parse_arguments (@ARGV);
+ +
+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/."; +unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
+ +
&scan_m4_files ($acdir, @dirlist); &scan_m4_files (@dirlist);
&scan_configure; &scan_configure;
if (! $exit_status) if (! $exit_status)
@@ -279,12 +284,13 @@ @@ -299,11 +304,13 @@
$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4'); $file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
} }
@ -31,13 +28,12 @@ $FreeBSD$
foreach $m4dir (@dirlist) foreach $m4dir (@dirlist)
{ {
opendir (DIR, $m4dir) opendir (DIR, $m4dir)
|| die "aclocal: couldn't open directory \`$m4dir': $!\n"; || die "aclocal: couldn't open directory `$m4dir': $!\n";
- local ($file, $fullfile, $expr); + local ($file, $fullfile, $expr);
+ local ($file, $fullfile, $ino, $expr); local ($file, $fullfile);
foreach $file (sort grep (! /^\./, readdir (DIR))) foreach $file (sort grep (! /^\./, readdir (DIR)))
{ {
# Only examine .m4 files. @@ -314,6 +321,12 @@
@@ -294,6 +300,12 @@
next if $file eq 'aclocal.m4'; next if $file eq 'aclocal.m4';
$fullfile = $m4dir . '/' . $file; $fullfile = $m4dir . '/' . $file;
@ -50,12 +46,3 @@ $FreeBSD$
$file_contents{$fullfile} = &scan_file ($fullfile); $file_contents{$fullfile} = &scan_file ($fullfile);
} }
closedir (DIR); 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;
}

5
devel/automake16/Makefile
View File

@ -6,13 +6,10 @@
# #
PORTNAME= automake PORTNAME= automake
PORTVERSION= 1.4.5 PORTVERSION= 1.5
PORTEPOCH= 1
PORTREVISION= 1
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake MASTER_SITE_SUBDIR= automake
DISTNAME= ${PORTNAME}-1.4-p5
MAINTAINER= portmgr@FreeBSD.org MAINTAINER= portmgr@FreeBSD.org

2
devel/automake16/distinfo
View File

@ -1 +1 @@
MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3 MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab

12
devel/automake16/files/patch-ab
View File

@ -1,11 +1,11 @@
--- Makefile.in.orig Mon May 4 10:42:08 1998 --- Makefile.in.orig Sun Sep 9 11:42:15 2001
+++ Makefile.in Mon May 4 10:42:34 1998 +++ Makefile.in Sun Sep 9 11:42:51 2001
@@ -204,7 +204,7 @@ @@ -180,7 +180,7 @@
.texi.info: .texi.info:
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
cd $(srcdir) \ cd $(srcdir) \
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'` - && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+ && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'` + && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
`echo $< | sed 's,.*/,,'`
.texi.dvi: .texi.dvi:
TEXINPUTS=$(srcdir):$$TEXINPUTS \

31
devel/automake16/files/patch-ad
View File

@ -1,8 +1,5 @@
--- aclocal.in.orig Sun Sep 9 11:31:39 2001
$FreeBSD$ +++ aclocal.in Sun Sep 9 11:37:54 2001
--- aclocal.in.orig Sun Jul 15 13:52:18 2001
+++ aclocal.in Sat Aug 11 12:28:32 2001
@@ -34,6 +34,8 @@ @@ -34,6 +34,8 @@
# Note that this isn't pkgdatadir, but a separate directory. # Note that this isn't pkgdatadir, but a separate directory.
$acdir = "@datadir@/aclocal"; $acdir = "@datadir@/aclocal";
@ -12,17 +9,17 @@ $FreeBSD$
# Some globals. # Some globals.
# Exit status. # Exit status.
@@ -106,6 +108,9 @@ @@ -115,6 +117,9 @@
local (@dirlist) = &parse_arguments (@ARGV); local (@dirlist) = &parse_arguments (@ARGV);
+ +
+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/."; +unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
+ +
&scan_m4_files ($acdir, @dirlist); &scan_m4_files (@dirlist);
&scan_configure; &scan_configure;
if (! $exit_status) if (! $exit_status)
@@ -279,12 +284,13 @@ @@ -299,11 +304,13 @@
$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4'); $file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
} }
@ -31,13 +28,12 @@ $FreeBSD$
foreach $m4dir (@dirlist) foreach $m4dir (@dirlist)
{ {
opendir (DIR, $m4dir) opendir (DIR, $m4dir)
|| die "aclocal: couldn't open directory \`$m4dir': $!\n"; || die "aclocal: couldn't open directory `$m4dir': $!\n";
- local ($file, $fullfile, $expr); + local ($file, $fullfile, $expr);
+ local ($file, $fullfile, $ino, $expr); local ($file, $fullfile);
foreach $file (sort grep (! /^\./, readdir (DIR))) foreach $file (sort grep (! /^\./, readdir (DIR)))
{ {
# Only examine .m4 files. @@ -314,6 +321,12 @@
@@ -294,6 +300,12 @@
next if $file eq 'aclocal.m4'; next if $file eq 'aclocal.m4';
$fullfile = $m4dir . '/' . $file; $fullfile = $m4dir . '/' . $file;
@ -50,12 +46,3 @@ $FreeBSD$
$file_contents{$fullfile} = &scan_file ($fullfile); $file_contents{$fullfile} = &scan_file ($fullfile);
} }
closedir (DIR); 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;
}

5
devel/automake17/Makefile
View File

@ -6,13 +6,10 @@
# #
PORTNAME= automake PORTNAME= automake
PORTVERSION= 1.4.5 PORTVERSION= 1.5
PORTEPOCH= 1
PORTREVISION= 1
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake MASTER_SITE_SUBDIR= automake
DISTNAME= ${PORTNAME}-1.4-p5
MAINTAINER= portmgr@FreeBSD.org MAINTAINER= portmgr@FreeBSD.org

2
devel/automake17/distinfo
View File

@ -1 +1 @@
MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3 MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab

12
devel/automake17/files/patch-ab
View File

@ -1,11 +1,11 @@
--- Makefile.in.orig Mon May 4 10:42:08 1998 --- Makefile.in.orig Sun Sep 9 11:42:15 2001
+++ Makefile.in Mon May 4 10:42:34 1998 +++ Makefile.in Sun Sep 9 11:42:51 2001
@@ -204,7 +204,7 @@ @@ -180,7 +180,7 @@
.texi.info: .texi.info:
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
cd $(srcdir) \ cd $(srcdir) \
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'` - && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+ && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'` + && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
`echo $< | sed 's,.*/,,'`
.texi.dvi: .texi.dvi:
TEXINPUTS=$(srcdir):$$TEXINPUTS \

31
devel/automake17/files/patch-ad
View File

@ -1,8 +1,5 @@
--- aclocal.in.orig Sun Sep 9 11:31:39 2001
$FreeBSD$ +++ aclocal.in Sun Sep 9 11:37:54 2001
--- aclocal.in.orig Sun Jul 15 13:52:18 2001
+++ aclocal.in Sat Aug 11 12:28:32 2001
@@ -34,6 +34,8 @@ @@ -34,6 +34,8 @@
# Note that this isn't pkgdatadir, but a separate directory. # Note that this isn't pkgdatadir, but a separate directory.
$acdir = "@datadir@/aclocal"; $acdir = "@datadir@/aclocal";
@ -12,17 +9,17 @@ $FreeBSD$
# Some globals. # Some globals.
# Exit status. # Exit status.
@@ -106,6 +108,9 @@ @@ -115,6 +117,9 @@
local (@dirlist) = &parse_arguments (@ARGV); local (@dirlist) = &parse_arguments (@ARGV);
+ +
+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/."; +unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
+ +
&scan_m4_files ($acdir, @dirlist); &scan_m4_files (@dirlist);
&scan_configure; &scan_configure;
if (! $exit_status) if (! $exit_status)
@@ -279,12 +284,13 @@ @@ -299,11 +304,13 @@
$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4'); $file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
} }
@ -31,13 +28,12 @@ $FreeBSD$
foreach $m4dir (@dirlist) foreach $m4dir (@dirlist)
{ {
opendir (DIR, $m4dir) opendir (DIR, $m4dir)
|| die "aclocal: couldn't open directory \`$m4dir': $!\n"; || die "aclocal: couldn't open directory `$m4dir': $!\n";
- local ($file, $fullfile, $expr); + local ($file, $fullfile, $expr);
+ local ($file, $fullfile, $ino, $expr); local ($file, $fullfile);
foreach $file (sort grep (! /^\./, readdir (DIR))) foreach $file (sort grep (! /^\./, readdir (DIR)))
{ {
# Only examine .m4 files. @@ -314,6 +321,12 @@
@@ -294,6 +300,12 @@
next if $file eq 'aclocal.m4'; next if $file eq 'aclocal.m4';
$fullfile = $m4dir . '/' . $file; $fullfile = $m4dir . '/' . $file;
@ -50,12 +46,3 @@ $FreeBSD$
$file_contents{$fullfile} = &scan_file ($fullfile); $file_contents{$fullfile} = &scan_file ($fullfile);
} }
closedir (DIR); 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;
}

5
devel/automake18/Makefile
View File

@ -6,13 +6,10 @@
# #
PORTNAME= automake PORTNAME= automake
PORTVERSION= 1.4.5 PORTVERSION= 1.5
PORTEPOCH= 1
PORTREVISION= 1
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake MASTER_SITE_SUBDIR= automake
DISTNAME= ${PORTNAME}-1.4-p5
MAINTAINER= portmgr@FreeBSD.org MAINTAINER= portmgr@FreeBSD.org

2
devel/automake18/distinfo
View File

@ -1 +1 @@
MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3 MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab

12
devel/automake18/files/patch-ab
View File

@ -1,11 +1,11 @@
--- Makefile.in.orig Mon May 4 10:42:08 1998 --- Makefile.in.orig Sun Sep 9 11:42:15 2001
+++ Makefile.in Mon May 4 10:42:34 1998 +++ Makefile.in Sun Sep 9 11:42:51 2001
@@ -204,7 +204,7 @@ @@ -180,7 +180,7 @@
.texi.info: .texi.info:
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
cd $(srcdir) \ cd $(srcdir) \
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'` - && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+ && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'` + && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
`echo $< | sed 's,.*/,,'`
.texi.dvi: .texi.dvi:
TEXINPUTS=$(srcdir):$$TEXINPUTS \

31
devel/automake18/files/patch-ad
View File

@ -1,8 +1,5 @@
--- aclocal.in.orig Sun Sep 9 11:31:39 2001
$FreeBSD$ +++ aclocal.in Sun Sep 9 11:37:54 2001
--- aclocal.in.orig Sun Jul 15 13:52:18 2001
+++ aclocal.in Sat Aug 11 12:28:32 2001
@@ -34,6 +34,8 @@ @@ -34,6 +34,8 @@
# Note that this isn't pkgdatadir, but a separate directory. # Note that this isn't pkgdatadir, but a separate directory.
$acdir = "@datadir@/aclocal"; $acdir = "@datadir@/aclocal";
@ -12,17 +9,17 @@ $FreeBSD$
# Some globals. # Some globals.
# Exit status. # Exit status.
@@ -106,6 +108,9 @@ @@ -115,6 +117,9 @@
local (@dirlist) = &parse_arguments (@ARGV); local (@dirlist) = &parse_arguments (@ARGV);
+ +
+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/."; +unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
+ +
&scan_m4_files ($acdir, @dirlist); &scan_m4_files (@dirlist);
&scan_configure; &scan_configure;
if (! $exit_status) if (! $exit_status)
@@ -279,12 +284,13 @@ @@ -299,11 +304,13 @@
$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4'); $file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
} }
@ -31,13 +28,12 @@ $FreeBSD$
foreach $m4dir (@dirlist) foreach $m4dir (@dirlist)
{ {
opendir (DIR, $m4dir) opendir (DIR, $m4dir)
|| die "aclocal: couldn't open directory \`$m4dir': $!\n"; || die "aclocal: couldn't open directory `$m4dir': $!\n";
- local ($file, $fullfile, $expr); + local ($file, $fullfile, $expr);
+ local ($file, $fullfile, $ino, $expr); local ($file, $fullfile);
foreach $file (sort grep (! /^\./, readdir (DIR))) foreach $file (sort grep (! /^\./, readdir (DIR)))
{ {
# Only examine .m4 files. @@ -314,6 +321,12 @@
@@ -294,6 +300,12 @@
next if $file eq 'aclocal.m4'; next if $file eq 'aclocal.m4';
$fullfile = $m4dir . '/' . $file; $fullfile = $m4dir . '/' . $file;
@ -50,12 +46,3 @@ $FreeBSD$
$file_contents{$fullfile} = &scan_file ($fullfile); $file_contents{$fullfile} = &scan_file ($fullfile);
} }
closedir (DIR); 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;
}

5
devel/automake19/Makefile
View File

@ -6,13 +6,10 @@
# #
PORTNAME= automake PORTNAME= automake
PORTVERSION= 1.4.5 PORTVERSION= 1.5
PORTEPOCH= 1
PORTREVISION= 1
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake MASTER_SITE_SUBDIR= automake
DISTNAME= ${PORTNAME}-1.4-p5
MAINTAINER= portmgr@FreeBSD.org MAINTAINER= portmgr@FreeBSD.org

2
devel/automake19/distinfo
View File

@ -1 +1 @@
MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3 MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab

12
devel/automake19/files/patch-ab
View File

@ -1,11 +1,11 @@
--- Makefile.in.orig Mon May 4 10:42:08 1998 --- Makefile.in.orig Sun Sep 9 11:42:15 2001
+++ Makefile.in Mon May 4 10:42:34 1998 +++ Makefile.in Sun Sep 9 11:42:51 2001
@@ -204,7 +204,7 @@ @@ -180,7 +180,7 @@
.texi.info: .texi.info:
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
cd $(srcdir) \ cd $(srcdir) \
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'` - && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+ && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'` + && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
`echo $< | sed 's,.*/,,'`
.texi.dvi: .texi.dvi:
TEXINPUTS=$(srcdir):$$TEXINPUTS \

31
devel/automake19/files/patch-ad
View File

@ -1,8 +1,5 @@
--- aclocal.in.orig Sun Sep 9 11:31:39 2001
$FreeBSD$ +++ aclocal.in Sun Sep 9 11:37:54 2001
--- aclocal.in.orig Sun Jul 15 13:52:18 2001
+++ aclocal.in Sat Aug 11 12:28:32 2001
@@ -34,6 +34,8 @@ @@ -34,6 +34,8 @@
# Note that this isn't pkgdatadir, but a separate directory. # Note that this isn't pkgdatadir, but a separate directory.
$acdir = "@datadir@/aclocal"; $acdir = "@datadir@/aclocal";
@ -12,17 +9,17 @@ $FreeBSD$
# Some globals. # Some globals.
# Exit status. # Exit status.
@@ -106,6 +108,9 @@ @@ -115,6 +117,9 @@
local (@dirlist) = &parse_arguments (@ARGV); local (@dirlist) = &parse_arguments (@ARGV);
+ +
+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/."; +unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
+ +
&scan_m4_files ($acdir, @dirlist); &scan_m4_files (@dirlist);
&scan_configure; &scan_configure;
if (! $exit_status) if (! $exit_status)
@@ -279,12 +284,13 @@ @@ -299,11 +304,13 @@
$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4'); $file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
} }
@ -31,13 +28,12 @@ $FreeBSD$
foreach $m4dir (@dirlist) foreach $m4dir (@dirlist)
{ {
opendir (DIR, $m4dir) opendir (DIR, $m4dir)
|| die "aclocal: couldn't open directory \`$m4dir': $!\n"; || die "aclocal: couldn't open directory `$m4dir': $!\n";
- local ($file, $fullfile, $expr); + local ($file, $fullfile, $expr);
+ local ($file, $fullfile, $ino, $expr); local ($file, $fullfile);
foreach $file (sort grep (! /^\./, readdir (DIR))) foreach $file (sort grep (! /^\./, readdir (DIR)))
{ {
# Only examine .m4 files. @@ -314,6 +321,12 @@
@@ -294,6 +300,12 @@
next if $file eq 'aclocal.m4'; next if $file eq 'aclocal.m4';
$fullfile = $m4dir . '/' . $file; $fullfile = $m4dir . '/' . $file;
@ -50,12 +46,3 @@ $FreeBSD$
$file_contents{$fullfile} = &scan_file ($fullfile); $file_contents{$fullfile} = &scan_file ($fullfile);
} }
closedir (DIR); 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;
}

5
devel/gnu-automake/Makefile
View File

@ -6,13 +6,10 @@
# #
PORTNAME= automake PORTNAME= automake
PORTVERSION= 1.4.5 PORTVERSION= 1.5
PORTEPOCH= 1
PORTREVISION= 1
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake MASTER_SITE_SUBDIR= automake
DISTNAME= ${PORTNAME}-1.4-p5
MAINTAINER= portmgr@FreeBSD.org MAINTAINER= portmgr@FreeBSD.org

2
devel/gnu-automake/distinfo
View File

@ -1 +1 @@
MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3 MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab

12
devel/gnu-automake/files/patch-ab
View File

@ -1,11 +1,11 @@
--- Makefile.in.orig Mon May 4 10:42:08 1998 --- Makefile.in.orig Sun Sep 9 11:42:15 2001
+++ Makefile.in Mon May 4 10:42:34 1998 +++ Makefile.in Sun Sep 9 11:42:51 2001
@@ -204,7 +204,7 @@ @@ -180,7 +180,7 @@
.texi.info: .texi.info:
@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
cd $(srcdir) \ cd $(srcdir) \
- && $(MAKEINFO) `echo $< | sed 's,.*/,,'` - && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \
+ && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'` + && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \
`echo $< | sed 's,.*/,,'`
.texi.dvi: .texi.dvi:
TEXINPUTS=$(srcdir):$$TEXINPUTS \

31
devel/gnu-automake/files/patch-ad
View File

@ -1,8 +1,5 @@
--- aclocal.in.orig Sun Sep 9 11:31:39 2001
$FreeBSD$ +++ aclocal.in Sun Sep 9 11:37:54 2001
--- aclocal.in.orig Sun Jul 15 13:52:18 2001
+++ aclocal.in Sat Aug 11 12:28:32 2001
@@ -34,6 +34,8 @@ @@ -34,6 +34,8 @@
# Note that this isn't pkgdatadir, but a separate directory. # Note that this isn't pkgdatadir, but a separate directory.
$acdir = "@datadir@/aclocal"; $acdir = "@datadir@/aclocal";
@ -12,17 +9,17 @@ $FreeBSD$
# Some globals. # Some globals.
# Exit status. # Exit status.
@@ -106,6 +108,9 @@ @@ -115,6 +117,9 @@
local (@dirlist) = &parse_arguments (@ARGV); local (@dirlist) = &parse_arguments (@ARGV);
+ +
+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/."; +unshift @dirlist, $acdir_x11 if -d "$acdir_x11/.";
+ +
&scan_m4_files ($acdir, @dirlist); &scan_m4_files (@dirlist);
&scan_configure; &scan_configure;
if (! $exit_status) if (! $exit_status)
@@ -279,12 +284,13 @@ @@ -299,11 +304,13 @@
$file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4'); $file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4');
} }
@ -31,13 +28,12 @@ $FreeBSD$
foreach $m4dir (@dirlist) foreach $m4dir (@dirlist)
{ {
opendir (DIR, $m4dir) opendir (DIR, $m4dir)
|| die "aclocal: couldn't open directory \`$m4dir': $!\n"; || die "aclocal: couldn't open directory `$m4dir': $!\n";
- local ($file, $fullfile, $expr); + local ($file, $fullfile, $expr);
+ local ($file, $fullfile, $ino, $expr); local ($file, $fullfile);
foreach $file (sort grep (! /^\./, readdir (DIR))) foreach $file (sort grep (! /^\./, readdir (DIR)))
{ {
# Only examine .m4 files. @@ -314,6 +321,12 @@
@@ -294,6 +300,12 @@
next if $file eq 'aclocal.m4'; next if $file eq 'aclocal.m4';
$fullfile = $m4dir . '/' . $file; $fullfile = $m4dir . '/' . $file;
@ -50,12 +46,3 @@ $FreeBSD$
$file_contents{$fullfile} = &scan_file ($fullfile); $file_contents{$fullfile} = &scan_file ($fullfile);
} }
closedir (DIR); 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;
}