diff options
Diffstat (limited to 'devel/automake110')
| -rw-r--r-- | devel/automake110/files/patch-Makefile.in | 124 | ||||
| -rw-r--r-- | devel/automake110/files/patch-aclocal.in | 63 | ||||
| -rw-r--r-- | devel/automake110/files/patch-automake.in | 20 | ||||
| -rw-r--r-- | devel/automake110/files/patch-automake.texi | 28 | ||||
| -rw-r--r-- | devel/automake110/files/patch-configure | 32 | ||||
| -rw-r--r-- | devel/automake110/files/patch-m4-Makefile.in | 19 |
6 files changed, 286 insertions, 0 deletions
diff --git a/devel/automake110/files/patch-Makefile.in b/devel/automake110/files/patch-Makefile.in new file mode 100644 index 000000000000..a36c0e6bba5d --- /dev/null +++ b/devel/automake110/files/patch-Makefile.in @@ -0,0 +1,124 @@ +--- Makefile.in.orig Wed Oct 16 20:14:22 2002 ++++ Makefile.in Thu Feb 13 15:10:25 2003 +@@ -38,6 +38,7 @@ + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + APIVERSION = @APIVERSION@ ++APIPVERSION = @APIPVERSION@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ +@@ -95,7 +96,7 @@ + SUBDIRS = . m4 lib tests + + bin_SCRIPTS = automake aclocal +-info_TEXINFOS = automake.texi ++info_TEXINFOS = automake${APIPVERSION}.texi + + CLEANFILES = $(bin_SCRIPTS) + AUTOMAKESOURCES = automake.in aclocal.in +@@ -106,7 +107,7 @@ + ETAGS_ARGS = --lang=none \ + --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake.texi + +-TAGS_DEPENDENCIES = automake.texi ++TAGS_DEPENDENCIES = automake${APIPVERSION}.texi + + EXTRA_DIST = ChangeLog.1996 ChangeLog.1998 ChangeLog.2000 ChangeLog.2001 \ + $(AUTOMAKESOURCES) +@@ -116,6 +117,7 @@ + -e 's,[@]configure_input[@],@configure_input@,g' \ + -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ + -e 's,[@]VERSION[@],$(VERSION),g' \ ++ -e 's,[@]APIPVERSION[@],$(APIPVERSION),g' \ + -e 's,[@]APIVERSION[@],$(APIVERSION),g' + + +@@ -138,11 +140,11 @@ + DIST_SOURCES = + TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex + am__TEXINFO_TEX_DIR = $(top_srcdir)/lib +-INFO_DEPS = automake.info ++INFO_DEPS = automake${APIPVERSION}.info + DVIS = automake.dvi + PDFS = automake.pdf + PSS = automake.ps +-TEXINFOS = automake.texi ++TEXINFOS = automake${APIPVERSION}.texi + + RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ + ps-recursive install-info-recursive uninstall-info-recursive \ +@@ -181,8 +183,8 @@ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \ +- $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \ ++ echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$${f}$(APIPVERSION)"; \ ++ $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$${f}$(APIPVERSION); \ + else :; fi; \ + done + +@@ -190,14 +192,14 @@ + @$(NORMAL_UNINSTALL) + @list='$(bin_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ +- echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ +- rm -f $(DESTDIR)$(bindir)/$$f; \ ++ echo " rm -f $(DESTDIR)$(bindir)/$${f}$(APIPVERSION)"; \ ++ rm -f $(DESTDIR)$(bindir)/$${f}$(APIPVERSION); \ + done + + .texi.info: + @rm -f $@ $@-[0-9] $@-[0-9][0-9] + $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ +- -o $@ `test -f '$<' || echo '$(srcdir)/'`$< ++ --no-split -o $@ `test -f '$<' || echo '$(srcdir)/'`$< + + .texi.dvi: + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ +@@ -208,13 +210,17 @@ + TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ + $(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$< +-automake.info: automake.texi version.texi +-automake.dvi: automake.texi version.texi +-automake.pdf: automake.texi version.texi ++ ++automake${APIPVERSION}.texi: automake.texi ++ @cp -p automake.texi $@ ++ ++automake${APIPVERSION}.info: automake${APIPVERSION}.texi version.texi ++automake${APIPVERSION}.dvi: automake${APIPVERSION}.texi version.texi ++automake${APIPVERSION}.pdf: automake${APIPVERSION}.texi version.texi + version.texi: stamp-vti +-stamp-vti: automake.texi $(top_srcdir)/configure +- @(dir=.; test -f ./automake.texi || dir=$(srcdir); \ +- set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake.texi`; \ ++stamp-vti: automake${APIPVERSION}.texi $(top_srcdir)/configure ++ @(dir=.; test -f ./automake${APIPVERSION}.texi || dir=$(srcdir); \ ++ set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake${APIPVERSION}.texi`; \ + echo "@set UPDATED $$1 $$2 $$3"; \ + echo "@set UPDATED-MONTH $$2 $$3"; \ + echo "@set EDITION $(VERSION)"; \ +@@ -662,20 +668,8 @@ + + install-exec-hook: + @$(POST_INSTALL) +- @for p in $(bin_SCRIPTS); do \ +- f="`echo $$p|sed '$(transform)'`"; \ +- fv="$$f-$(APIVERSION)"; \ +- rm -f $(DESTDIR)$(bindir)/$$fv; \ +- echo " $(LN) $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv"; \ +- $(LN) $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/$$fv; \ +- done + + uninstall-hook: +- @for p in $(bin_SCRIPTS); do \ +- f="`echo $$p|sed '$(transform)'`"; \ +- fv="$$f-$(APIVERSION)"; \ +- rm -f $(DESTDIR)$(bindir)/$$fv; \ +- done + + automake: automake.in Makefile + $(do_subst) < $(srcdir)/automake.in > automake diff --git a/devel/automake110/files/patch-aclocal.in b/devel/automake110/files/patch-aclocal.in new file mode 100644 index 000000000000..0740a6dda4f9 --- /dev/null +++ b/devel/automake110/files/patch-aclocal.in @@ -0,0 +1,63 @@ +--- aclocal.in.orig Sat Oct 12 23:14:57 2002 ++++ aclocal.in Thu Feb 13 14:57:16 2003 +@@ -29,7 +29,7 @@ + + BEGIN + { +- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; ++ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@'; + unshift @INC, $perllibdir; + } + +@@ -42,8 +42,9 @@ + $PACKAGE = '@PACKAGE@'; + # Note that this isn't pkgdatadir, but a separate directory. + # Note also that the versioned directory is handled later. +-$acdir = '@datadir@/aclocal'; ++$acdir = '@datadir@/aclocal@APIPVERSION@'; + $default_acdir = $acdir; ++$acdir_x11 = '%%X11BASE%%/share/aclocal'; + # contains a list of directories, one per line, to be added + # to the dirlist in addition to $acdir, as if -I had been + # added to the command line. If acdir has been redirected, +@@ -188,11 +189,7 @@ + $default_dirlist="$acdir/dirlist" + if $acdir ne $default_acdir; + +- # Search the versioned directory near the end, and then the +- # unversioned directory last. Only do this if the user didn't +- # override acdir. +- push (@dirlist, "$acdir-$APIVERSION") +- if $acdir eq $default_acdir; ++ unshift @dirlist, $acdir_x11 if -d "$acdir_x11/."; + + # By default $(datadir)/aclocal doesn't exist. We don't want to + # get an error in the case where we are searching the default +@@ -290,12 +287,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); ++ local ($file, $fullfile, $ino); + foreach $file (sort grep (! /^\./, readdir (DIR))) + { + # Only examine .m4 files. +@@ -305,6 +303,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/automake110/files/patch-automake.in b/devel/automake110/files/patch-automake.in new file mode 100644 index 000000000000..f9500dbe28a3 --- /dev/null +++ b/devel/automake110/files/patch-automake.in @@ -0,0 +1,20 @@ +--- automake.in.orig Wed Oct 16 20:33:56 2002 ++++ automake.in Thu Feb 13 14:05:50 2003 +@@ -31,7 +31,7 @@ + + BEGIN + { +- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; ++ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@'; + unshift @INC, $perllibdir; + } + +@@ -126,7 +126,7 @@ + # VERSION as string so that eg version 0.30 will print correctly. + my $VERSION = '@VERSION@'; + my $PACKAGE = '@PACKAGE@'; +-my $libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; ++my $libdir = '@datadir@/@PACKAGE@@APIPVERSION@'; + + # Some regular expressions. One reason to put them here is that it + # makes indentation work better in Emacs. diff --git a/devel/automake110/files/patch-automake.texi b/devel/automake110/files/patch-automake.texi new file mode 100644 index 000000000000..cce4740d30ae --- /dev/null +++ b/devel/automake110/files/patch-automake.texi @@ -0,0 +1,28 @@ +--- automake.texi.orig Wed Jan 6 08:01:26 1999 ++++ automake.texi Mon Mar 18 21:44:51 2002 +@@ -1,7 +1,8 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename automake.info +-@settitle automake ++@setfilename automake17.info ++@dircategory Programming & development tools ++@settitle Automake17 + @setchapternewpage off + @c %**end of header + +@@ -9,12 +10,12 @@ + + @dircategory GNU admin + @direntry +-* automake: (automake). Making Makefile.in's ++* Automake17: (automake17). Making Makefile.in's + @end direntry + + @dircategory Individual utilities + @direntry +-* aclocal: (automake)Invoking aclocal. Generating aclocal.m4 ++* Aclocal17: (automake17) Invoking aclocal. Generating aclocal.m4 + @end direntry + + @ifinfo diff --git a/devel/automake110/files/patch-configure b/devel/automake110/files/patch-configure new file mode 100644 index 000000000000..4d8692f078e3 --- /dev/null +++ b/devel/automake110/files/patch-configure @@ -0,0 +1,32 @@ +--- configure.orig Wed Oct 16 20:14:28 2002 ++++ configure Thu Feb 13 13:02:56 2003 +@@ -270,7 +270,7 @@ + PACKAGE_BUGREPORT='bug-automake@gnu.org' + + ac_unique_file="automake.in" +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE APIVERSION pkgvdatadir PERL TEX LN EGREP FGREP LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE APIPVERSION APIVERSION pkgvdatadir PERL TEX LN EGREP FGREP LIBOBJS LTLIBOBJS' + ac_subst_files='' + + # Initialize some variables set by options. +@@ -1571,10 +1571,11 @@ + # * Prereleases on the trunk are all incompatible -- 1.5b and 1.5c + # aren't the same. + APIVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\.[0-9]*[a-z]*\).*$/\1/'` ++APIPVERSION=`echo "$VERSION" | sed -e 's/^\([0-9]*\)\.\([0-9]*[a-z]*\).*$/\1\2/'` + + + # A versioned directory, defined here for convenience. +-pkgvdatadir="\${datadir}/automake-${APIVERSION}" ++pkgvdatadir="\${datadir}/automake${APIPVERSION}" + + + # $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir', +@@ -2381,6 +2382,7 @@ + s,@AWK@,$AWK,;t t + s,@SET_MAKE@,$SET_MAKE,;t t + s,@APIVERSION@,$APIVERSION,;t t ++s,@APIPVERSION@,$APIPVERSION,;t t + s,@pkgvdatadir@,$pkgvdatadir,;t t + s,@PERL@,$PERL,;t t + s,@TEX@,$TEX,;t t diff --git a/devel/automake110/files/patch-m4-Makefile.in b/devel/automake110/files/patch-m4-Makefile.in new file mode 100644 index 000000000000..4c336333e5e1 --- /dev/null +++ b/devel/automake110/files/patch-m4-Makefile.in @@ -0,0 +1,19 @@ +--- m4/Makefile.in.orig Wed Oct 16 20:14:23 2002 ++++ m4/Makefile.in Thu Feb 13 13:14:39 2003 +@@ -38,6 +38,7 @@ + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + APIVERSION = @APIVERSION@ ++APIPVERSION = @APIPVERSION@ + AUTOCONF = @AUTOCONF@ + AUTOHEADER = @AUTOHEADER@ + AUTOMAKE = @AUTOMAKE@ +@@ -92,7 +93,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + +-m4datadir = $(datadir)/aclocal-$(APIVERSION) ++m4datadir = $(datadir)/aclocal$(APIPVERSION) + + dist_m4data_DATA = \ + as.m4 \ |