diff options
Diffstat (limited to 'devel/automake15/files')
-rw-r--r-- | devel/automake15/files/patch-Makefile.in | 26 | ||||
-rw-r--r-- | devel/automake15/files/patch-aclocal.in | 21 | ||||
-rw-r--r-- | devel/automake15/files/patch-automake.in | 12 | ||||
-rw-r--r-- | devel/automake15/files/patch-automake.texi | 18 | ||||
-rw-r--r-- | devel/automake15/files/patch-configure | 7 | ||||
-rw-r--r-- | devel/automake15/files/patch-m4::Makefile.in | 7 |
6 files changed, 51 insertions, 40 deletions
diff --git a/devel/automake15/files/patch-Makefile.in b/devel/automake15/files/patch-Makefile.in index 5f1a7a86a4c2..7e3d1c21d01e 100644 --- a/devel/automake15/files/patch-Makefile.in +++ b/devel/automake15/files/patch-Makefile.in @@ -1,11 +1,17 @@ ---- 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,.*/,,'` +--- Makefile.in.orig Wed Aug 22 22:49:54 2001 ++++ Makefile.in Thu Apr 5 02:38:15 2007 +@@ -98,5 +98,5 @@ + TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex +-INFO_DEPS = automake.info ++INFO_DEPS = automake-@VERSION@.info + DVIS = automake.dvi +-TEXINFOS = automake.texi ++TEXINFOS = automake-@VERSION@.texi - .texi.dvi: +@@ -158,4 +158,4 @@ + @: +-$(srcdir)/stamp-vti: automake.texi $(top_srcdir)/configure.in +- @(set `$(SHELL) $(top_srcdir)/lib/mdate-sh $(srcdir)/automake.texi`; \ ++$(srcdir)/stamp-vti: automake-@VERSION@.texi $(top_srcdir)/configure.in ++ @(set `$(SHELL) $(top_srcdir)/lib/mdate-sh $(srcdir)/automake-@VERSION@.texi`; \ + echo "@set UPDATED $$1 $$2 $$3"; \ diff --git a/devel/automake15/files/patch-aclocal.in b/devel/automake15/files/patch-aclocal.in index d72fe290f094..947ba7e01f19 100644 --- a/devel/automake15/files/patch-aclocal.in +++ b/devel/automake15/files/patch-aclocal.in @@ -1,10 +1,15 @@ --- aclocal.in.orig Mon Jul 16 22:36:23 2001 -+++ aclocal.in Sun May 6 13:52:34 2007 -@@ -35,2 +35,3 @@ - $acdir = "@datadir@/aclocal"; -+$acdir_ver = "@datadir@/aclocal%%BUILD_VERSION%%"; - -@@ -210,2 +211,3 @@ - push (@dirlist, $acdir); -+ push (@dirlist, $acdir_ver) if (-d "$acdir_ver/."); ++++ aclocal.in Thu Apr 5 03:19:44 2007 +@@ -34,3 +34,3 @@ + # Note that this isn't pkgdatadir, but a separate directory. +-$acdir = "@datadir@/aclocal"; ++$acdir = "@datadir@/aclocal-@VERSION@"; +@@ -117,2 +117,3 @@ + local (@dirlist) = &parse_arguments (@ARGV); ++push (@dirlist, "%%LOCALBASE%%/share/aclocal") if (!grep(/^--acdir/, @ARGV)); + &scan_m4_files (@dirlist); +@@ -205,2 +206,3 @@ + print $acdir, "\n"; ++ print "%%LOCALBASE%%/share/aclocal", "\n"; + exit 0; diff --git a/devel/automake15/files/patch-automake.in b/devel/automake15/files/patch-automake.in new file mode 100644 index 000000000000..1890b826646f --- /dev/null +++ b/devel/automake15/files/patch-automake.in @@ -0,0 +1,12 @@ +--- automake.in.orig Wed Aug 22 22:26:53 2001 ++++ automake.in Thu Apr 5 03:21:22 2007 +@@ -34,3 +34,3 @@ + my $prefix = "@prefix@"; +- my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@"; ++ my $perllibdir = $ENV{'perllibdir'} || "@datadir@/@PACKAGE@-@VERSION@"; + unshift @INC, "$perllibdir"; +@@ -129,3 +129,3 @@ + my $prefix = "@prefix@"; +-my $libdir = "@datadir@/@PACKAGE@"; ++my $libdir = "@datadir@/@PACKAGE@-@VERSION@"; + diff --git a/devel/automake15/files/patch-automake.texi b/devel/automake15/files/patch-automake.texi index ab8cc6955ff3..f5ff8df3d272 100644 --- a/devel/automake15/files/patch-automake.texi +++ b/devel/automake15/files/patch-automake.texi @@ -1,14 +1,16 @@ ---- automake.texi.orig Thu Aug 23 05:40:36 2001 -+++ automake.texi Thu Oct 14 20:29:56 2004 -@@ -2,4 +2,5 @@ +--- automake.texi.orig Wed Aug 22 22:40:36 2001 ++++ automake.texi Sat Apr 14 15:49:21 2007 +@@ -2,4 +2,4 @@ @c %**start of header -@setfilename automake.info -@settitle automake -+@setfilename automake15.info -+@dircategory Programming & development tools -+@settitle Automake15 ++@setfilename automake-1.5.info ++@settitle Automake-1.5 @setchapternewpage off -@@ -11,8 +12,3 @@ +@@ -9,10 +9,5 @@ + +-@dircategory GNU programming tools ++@dircategory Programming & development tools @direntry -* automake: (automake). Making Makefile.in's -@end direntry @@ -16,5 +18,5 @@ -@dircategory Individual utilities -@direntry -* aclocal: (automake)Invoking aclocal. Generating aclocal.m4 -+* Automake15: (automake15). Making Makefile.in's ++* Automake-1.5: (automake-1.5). Making Makefile.in's. @end direntry diff --git a/devel/automake15/files/patch-configure b/devel/automake15/files/patch-configure deleted file mode 100644 index 8161cf88af18..000000000000 --- a/devel/automake15/files/patch-configure +++ /dev/null @@ -1,7 +0,0 @@ ---- 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 deleted file mode 100644 index 0c0642b1da66..000000000000 --- a/devel/automake15/files/patch-m4::Makefile.in +++ /dev/null @@ -1,7 +0,0 @@ ---- 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 \ |