Hackery after repo-copies from devel/autoconf and devel/automake

respectively to make these true versioned ports

4 files changed, 25 insertions, 64 deletions

diff --git a/devel/automake15/files/patch-aclocal.in b/devel/automake15/files/patch-aclocal.in
deleted file mode 100644
index 3cd773443ae7..000000000000
--- a/devel/automake15/files/patch-aclocal.in
+++ /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
index a63884c48187..76b62213929c 100644
--- a/devel/automake15/files/patch-automake.texi
+++ b/devel/automake15/files/patch-automake.texi
@@ -1,25 +1,20 @@
---- 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-*-
+--- automake.texi.orig	Wed Aug 22 22:40:36 2001
++++ automake.texi	Wed Feb 11 00:51:59 2004
+@@ -2,4 +2,5 @@
  @c %**start of header
- @setfilename automake.info
+-@setfilename automake.info
+-@settitle automake
++@setfilename automake15.info
 +@dircategory Programming & development tools
- @settitle automake
++@settitle Automake15
  @setchapternewpage off
- @c %**end of header
-@@ -9,12 +10,12 @@
- 
- @dircategory GNU admin
+@@ -11,3 +12,3 @@
  @direntry
 -* automake: (automake).		Making Makefile.in's
-+* Automake: (automake).		Making Makefile.in's
++* Automake15: (automake15).		Making Makefile.in's
  @end direntry
- 
- @dircategory Individual utilities
+@@ -16,3 +17,3 @@
  @direntry
 -* aclocal: (automake)Invoking aclocal.          Generating aclocal.m4
-+* Aclocal: (automake)		Invoking aclocal. Generating aclocal.m4
++* aclocal15: (automake15)Invoking aclocal.          Generating aclocal.m4
  @end direntry
- 
- @ifinfo
diff --git a/devel/automake15/files/patch-configure b/devel/automake15/files/patch-configure
new file mode 100644
index 000000000000..8161cf88af18
--- /dev/null
+++ b/devel/automake15/files/patch-configure
@@ -0,0 +1,7 @@
+--- configure.orig	Wed Aug 22 22:49:52 2001
++++ configure	Wed Feb 11 01:01:24 2004
+@@ -795,3 +795,3 @@
+ # Define the identity of the package.
+-PACKAGE=automake
++PACKAGE=automake15
+ VERSION=1.5
diff --git a/devel/automake15/files/patch-m4::Makefile.in b/devel/automake15/files/patch-m4::Makefile.in
new file mode 100644
index 000000000000..0c0642b1da66
--- /dev/null
+++ b/devel/automake15/files/patch-m4::Makefile.in
@@ -0,0 +1,7 @@
+--- m4/Makefile.in.orig	Wed Aug 22 22:49:56 2001
++++ m4/Makefile.in	Wed Feb 11 01:05:11 2004
+@@ -70,3 +70,3 @@
+ 
+-m4datadir = $(datadir)/aclocal
++m4datadir = $(datadir)/aclocal15
+ m4data_DATA = as.m4 auxdir.m4 ccstdc.m4 cond.m4 depend.m4 depout.m4 \