From 12b8e35ea99586fbd2fd5945a72adf53eab7d1bb Mon Sep 17 00:00:00 2001 From: Alan Eldridge Date: Tue, 15 Oct 2002 06:52:34 +0000 Subject: Renamed patch files to sensible names. --- devel/automake/files/patch-Makefile.in | 11 +++++++ devel/automake/files/patch-aa | 25 ---------------- devel/automake/files/patch-ab | 11 ------- devel/automake/files/patch-aclocal.in | 48 ++++++++++++++++++++++++++++++ devel/automake/files/patch-ad | 48 ------------------------------ devel/automake/files/patch-automake.texi | 25 ++++++++++++++++ devel/automake15/files/patch-Makefile.in | 11 +++++++ devel/automake15/files/patch-aa | 25 ---------------- devel/automake15/files/patch-ab | 11 ------- devel/automake15/files/patch-aclocal.in | 48 ++++++++++++++++++++++++++++++ devel/automake15/files/patch-ad | 48 ------------------------------ devel/automake15/files/patch-automake.texi | 25 ++++++++++++++++ 12 files changed, 168 insertions(+), 168 deletions(-) create mode 100644 devel/automake/files/patch-Makefile.in delete mode 100644 devel/automake/files/patch-aa delete mode 100644 devel/automake/files/patch-ab create mode 100644 devel/automake/files/patch-aclocal.in delete mode 100644 devel/automake/files/patch-ad create mode 100644 devel/automake/files/patch-automake.texi create mode 100644 devel/automake15/files/patch-Makefile.in delete mode 100644 devel/automake15/files/patch-aa delete mode 100644 devel/automake15/files/patch-ab create mode 100644 devel/automake15/files/patch-aclocal.in delete mode 100644 devel/automake15/files/patch-ad create mode 100644 devel/automake15/files/patch-automake.texi diff --git a/devel/automake/files/patch-Makefile.in b/devel/automake/files/patch-Makefile.in new file mode 100644 index 000000000000..5f1a7a86a4c2 --- /dev/null +++ b/devel/automake/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- 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) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ ++ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \ + `echo $< | sed 's,.*/,,'` + + .texi.dvi: diff --git a/devel/automake/files/patch-aa b/devel/automake/files/patch-aa deleted file mode 100644 index a63884c48187..000000000000 --- a/devel/automake/files/patch-aa +++ /dev/null @@ -1,25 +0,0 @@ ---- automake.texi.orig Sat Apr 4 04:04:07 1998 -+++ automake.texi Wed Sep 23 23:34:15 1998 -@@ -1,6 +1,7 @@ - \input texinfo @c -*-texinfo-*- - @c %**start of header - @setfilename automake.info -+@dircategory Programming & development tools - @settitle automake - @setchapternewpage off - @c %**end of header -@@ -9,12 +10,12 @@ - - @dircategory GNU admin - @direntry --* automake: (automake). Making Makefile.in's -+* Automake: (automake). Making Makefile.in's - @end direntry - - @dircategory Individual utilities - @direntry --* aclocal: (automake)Invoking aclocal. Generating aclocal.m4 -+* Aclocal: (automake) Invoking aclocal. Generating aclocal.m4 - @end direntry - - @ifinfo diff --git a/devel/automake/files/patch-ab b/devel/automake/files/patch-ab deleted file mode 100644 index 5f1a7a86a4c2..000000000000 --- a/devel/automake/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- 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) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ -+ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \ - `echo $< | sed 's,.*/,,'` - - .texi.dvi: diff --git a/devel/automake/files/patch-aclocal.in b/devel/automake/files/patch-aclocal.in new file mode 100644 index 000000000000..3cd773443ae7 --- /dev/null +++ b/devel/automake/files/patch-aclocal.in @@ -0,0 +1,48 @@ +--- 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"; + ++$acdir_x11 = '%%X11BASE%%/share/aclocal'; ++ + # Some globals. + + # Exit status. +@@ -115,6 +117,9 @@ + + + local (@dirlist) = &parse_arguments (@ARGV); ++ ++unshift @dirlist, $acdir_x11 if -d "$acdir_x11/."; ++ + &scan_m4_files (@dirlist); + &scan_configure; + if (! $exit_status) +@@ -299,11 +304,13 @@ + $file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4'); + } + ++ local (@skipinolist) = (); + local ($m4dir); + foreach $m4dir (@dirlist) + { + opendir (DIR, $m4dir) + || die "aclocal: couldn't open directory `$m4dir': $!\n"; ++ local ($file, $fullfile, $expr); + local ($file, $fullfile); + foreach $file (sort grep (! /^\./, readdir (DIR))) + { +@@ -314,6 +321,12 @@ + next if $file eq 'aclocal.m4'; + + $fullfile = $m4dir . '/' . $file; ++ ++ # Do not scan a file more than once. ++ $ino = (stat($fullfile))[1]; ++ next if grep($ino eq $_, @skipinolist); ++ push @skipinolist, $ino; ++ + $file_contents{$fullfile} = &scan_file ($fullfile); + } + closedir (DIR); diff --git a/devel/automake/files/patch-ad b/devel/automake/files/patch-ad deleted file mode 100644 index 3cd773443ae7..000000000000 --- a/devel/automake/files/patch-ad +++ /dev/null @@ -1,48 +0,0 @@ ---- 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"; - -+$acdir_x11 = '%%X11BASE%%/share/aclocal'; -+ - # Some globals. - - # Exit status. -@@ -115,6 +117,9 @@ - - - local (@dirlist) = &parse_arguments (@ARGV); -+ -+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/."; -+ - &scan_m4_files (@dirlist); - &scan_configure; - if (! $exit_status) -@@ -299,11 +304,13 @@ - $file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4'); - } - -+ local (@skipinolist) = (); - local ($m4dir); - foreach $m4dir (@dirlist) - { - opendir (DIR, $m4dir) - || die "aclocal: couldn't open directory `$m4dir': $!\n"; -+ local ($file, $fullfile, $expr); - local ($file, $fullfile); - foreach $file (sort grep (! /^\./, readdir (DIR))) - { -@@ -314,6 +321,12 @@ - next if $file eq 'aclocal.m4'; - - $fullfile = $m4dir . '/' . $file; -+ -+ # Do not scan a file more than once. -+ $ino = (stat($fullfile))[1]; -+ next if grep($ino eq $_, @skipinolist); -+ push @skipinolist, $ino; -+ - $file_contents{$fullfile} = &scan_file ($fullfile); - } - closedir (DIR); diff --git a/devel/automake/files/patch-automake.texi b/devel/automake/files/patch-automake.texi new file mode 100644 index 000000000000..a63884c48187 --- /dev/null +++ b/devel/automake/files/patch-automake.texi @@ -0,0 +1,25 @@ +--- automake.texi.orig Sat Apr 4 04:04:07 1998 ++++ automake.texi Wed Sep 23 23:34:15 1998 +@@ -1,6 +1,7 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header + @setfilename automake.info ++@dircategory Programming & development tools + @settitle automake + @setchapternewpage off + @c %**end of header +@@ -9,12 +10,12 @@ + + @dircategory GNU admin + @direntry +-* automake: (automake). Making Makefile.in's ++* Automake: (automake). Making Makefile.in's + @end direntry + + @dircategory Individual utilities + @direntry +-* aclocal: (automake)Invoking aclocal. Generating aclocal.m4 ++* Aclocal: (automake) Invoking aclocal. Generating aclocal.m4 + @end direntry + + @ifinfo diff --git a/devel/automake15/files/patch-Makefile.in b/devel/automake15/files/patch-Makefile.in new file mode 100644 index 000000000000..5f1a7a86a4c2 --- /dev/null +++ b/devel/automake15/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- 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) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ ++ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \ + `echo $< | sed 's,.*/,,'` + + .texi.dvi: diff --git a/devel/automake15/files/patch-aa b/devel/automake15/files/patch-aa deleted file mode 100644 index a63884c48187..000000000000 --- a/devel/automake15/files/patch-aa +++ /dev/null @@ -1,25 +0,0 @@ ---- automake.texi.orig Sat Apr 4 04:04:07 1998 -+++ automake.texi Wed Sep 23 23:34:15 1998 -@@ -1,6 +1,7 @@ - \input texinfo @c -*-texinfo-*- - @c %**start of header - @setfilename automake.info -+@dircategory Programming & development tools - @settitle automake - @setchapternewpage off - @c %**end of header -@@ -9,12 +10,12 @@ - - @dircategory GNU admin - @direntry --* automake: (automake). Making Makefile.in's -+* Automake: (automake). Making Makefile.in's - @end direntry - - @dircategory Individual utilities - @direntry --* aclocal: (automake)Invoking aclocal. Generating aclocal.m4 -+* Aclocal: (automake) Invoking aclocal. Generating aclocal.m4 - @end direntry - - @ifinfo diff --git a/devel/automake15/files/patch-ab b/devel/automake15/files/patch-ab deleted file mode 100644 index 5f1a7a86a4c2..000000000000 --- a/devel/automake15/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- 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) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ -+ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --no-split \ - `echo $< | sed 's,.*/,,'` - - .texi.dvi: diff --git a/devel/automake15/files/patch-aclocal.in b/devel/automake15/files/patch-aclocal.in new file mode 100644 index 000000000000..3cd773443ae7 --- /dev/null +++ b/devel/automake15/files/patch-aclocal.in @@ -0,0 +1,48 @@ +--- 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"; + ++$acdir_x11 = '%%X11BASE%%/share/aclocal'; ++ + # Some globals. + + # Exit status. +@@ -115,6 +117,9 @@ + + + local (@dirlist) = &parse_arguments (@ARGV); ++ ++unshift @dirlist, $acdir_x11 if -d "$acdir_x11/."; ++ + &scan_m4_files (@dirlist); + &scan_configure; + if (! $exit_status) +@@ -299,11 +304,13 @@ + $file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4'); + } + ++ local (@skipinolist) = (); + local ($m4dir); + foreach $m4dir (@dirlist) + { + opendir (DIR, $m4dir) + || die "aclocal: couldn't open directory `$m4dir': $!\n"; ++ local ($file, $fullfile, $expr); + local ($file, $fullfile); + foreach $file (sort grep (! /^\./, readdir (DIR))) + { +@@ -314,6 +321,12 @@ + next if $file eq 'aclocal.m4'; + + $fullfile = $m4dir . '/' . $file; ++ ++ # Do not scan a file more than once. ++ $ino = (stat($fullfile))[1]; ++ next if grep($ino eq $_, @skipinolist); ++ push @skipinolist, $ino; ++ + $file_contents{$fullfile} = &scan_file ($fullfile); + } + closedir (DIR); diff --git a/devel/automake15/files/patch-ad b/devel/automake15/files/patch-ad deleted file mode 100644 index 3cd773443ae7..000000000000 --- a/devel/automake15/files/patch-ad +++ /dev/null @@ -1,48 +0,0 @@ ---- 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"; - -+$acdir_x11 = '%%X11BASE%%/share/aclocal'; -+ - # Some globals. - - # Exit status. -@@ -115,6 +117,9 @@ - - - local (@dirlist) = &parse_arguments (@ARGV); -+ -+unshift @dirlist, $acdir_x11 if -d "$acdir_x11/."; -+ - &scan_m4_files (@dirlist); - &scan_configure; - if (! $exit_status) -@@ -299,11 +304,13 @@ - $file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4'); - } - -+ local (@skipinolist) = (); - local ($m4dir); - foreach $m4dir (@dirlist) - { - opendir (DIR, $m4dir) - || die "aclocal: couldn't open directory `$m4dir': $!\n"; -+ local ($file, $fullfile, $expr); - local ($file, $fullfile); - foreach $file (sort grep (! /^\./, readdir (DIR))) - { -@@ -314,6 +321,12 @@ - next if $file eq 'aclocal.m4'; - - $fullfile = $m4dir . '/' . $file; -+ -+ # Do not scan a file more than once. -+ $ino = (stat($fullfile))[1]; -+ next if grep($ino eq $_, @skipinolist); -+ push @skipinolist, $ino; -+ - $file_contents{$fullfile} = &scan_file ($fullfile); - } - closedir (DIR); diff --git a/devel/automake15/files/patch-automake.texi b/devel/automake15/files/patch-automake.texi new file mode 100644 index 000000000000..a63884c48187 --- /dev/null +++ b/devel/automake15/files/patch-automake.texi @@ -0,0 +1,25 @@ +--- automake.texi.orig Sat Apr 4 04:04:07 1998 ++++ automake.texi Wed Sep 23 23:34:15 1998 +@@ -1,6 +1,7 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header + @setfilename automake.info ++@dircategory Programming & development tools + @settitle automake + @setchapternewpage off + @c %**end of header +@@ -9,12 +10,12 @@ + + @dircategory GNU admin + @direntry +-* automake: (automake). Making Makefile.in's ++* Automake: (automake). Making Makefile.in's + @end direntry + + @dircategory Individual utilities + @direntry +-* aclocal: (automake)Invoking aclocal. Generating aclocal.m4 ++* Aclocal: (automake) Invoking aclocal. Generating aclocal.m4 + @end direntry + + @ifinfo -- cgit v1.2.3