diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-10-17 06:37:35 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2004-10-17 06:37:35 +0000 |
commit | 94f9acd994fe8f3d1e1d7f854bd7e775d92022d9 (patch) | |
tree | c0ea038e8ed7cd0bf93b7f4118bc345c1c5b3b82 /devel/gnu-automake/files | |
parent | 3149844a48dfe367568c7781bbb3ba25de673547 (diff) |
Notes
Diffstat (limited to 'devel/gnu-automake/files')
-rw-r--r-- | devel/gnu-automake/files/patch-Makefile.in | 27 | ||||
-rw-r--r-- | devel/gnu-automake/files/patch-aclocal.in | 28 | ||||
-rw-r--r-- | devel/gnu-automake/files/patch-automake.in | 12 | ||||
-rw-r--r-- | devel/gnu-automake/files/patch-configure | 20 | ||||
-rw-r--r-- | devel/gnu-automake/files/patch-doc::Makefile.in | 35 | ||||
-rw-r--r-- | devel/gnu-automake/files/patch-doc::automake.texi | 24 | ||||
-rw-r--r-- | devel/gnu-automake/files/patch-lib::Automake::Config.in | 18 | ||||
-rw-r--r-- | devel/gnu-automake/files/patch-lib::Automake::Makefile.in | 10 | ||||
-rw-r--r-- | devel/gnu-automake/files/patch-m4-Makefile.in | 11 |
9 files changed, 0 insertions, 185 deletions
diff --git a/devel/gnu-automake/files/patch-Makefile.in b/devel/gnu-automake/files/patch-Makefile.in deleted file mode 100644 index f24ffdd88721..000000000000 --- a/devel/gnu-automake/files/patch-Makefile.in +++ /dev/null @@ -1,27 +0,0 @@ ---- Makefile.in.orig Sun Mar 7 09:04:32 2004 -+++ Makefile.in Sun Mar 14 17:07:15 2004 -@@ -82,2 +82,3 @@ - APIVERSION = @APIVERSION@ -+APIPVERSION = @APIPVERSION@ - AUTOCONF = @AUTOCONF@ -@@ -154,2 +155,3 @@ - -e 's,[@]APIVERSION[@],$(APIVERSION),g' \ -+ -e 's,[@]APIPVERSION[@],$(APIPVERSION),g' \ - -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ -@@ -590,16 +592,4 @@ - @$(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 - diff --git a/devel/gnu-automake/files/patch-aclocal.in b/devel/gnu-automake/files/patch-aclocal.in deleted file mode 100644 index 0745a4e187a7..000000000000 --- a/devel/gnu-automake/files/patch-aclocal.in +++ /dev/null @@ -1,28 +0,0 @@ ---- aclocal.in.orig Sat Apr 10 10:15:32 2004 -+++ aclocal.in Wed May 26 14:33:27 2004 -@@ -31,3 +31,3 @@ - { -- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; -+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@'; - unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir); -@@ -47,4 +47,5 @@ - # 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 -@@ -411,3 +412,3 @@ - -- my $traces = ($ENV{AUTOM4TE} || 'autom4te'); -+ my $traces = ($ENV{AUTOM4TE} || 'autom4te259'); - $traces .= " --language Autoconf-without-aclocal-m4 "; -@@ -622,7 +623,3 @@ - -- # 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/."; - diff --git a/devel/gnu-automake/files/patch-automake.in b/devel/gnu-automake/files/patch-automake.in deleted file mode 100644 index de0b9c2f2026..000000000000 --- a/devel/gnu-automake/files/patch-automake.in +++ /dev/null @@ -1,12 +0,0 @@ ---- automake.in.orig Sat Apr 10 10:15:32 2004 -+++ automake.in Wed May 26 14:34:15 2004 -@@ -33,3 +33,3 @@ - { -- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@-@APIVERSION@'; -+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@@APIPVERSION@'; - unshift @INC, (split '@PATH_SEPARATOR@', $perllibdir); -@@ -4440,3 +4440,3 @@ - -- my $traces = ($ENV{AUTOCONF} || 'autoconf') . " "; -+ my $traces = ($ENV{AUTOCONF} || 'autoconf259') . " "; - diff --git a/devel/gnu-automake/files/patch-configure b/devel/gnu-automake/files/patch-configure deleted file mode 100644 index 3839ef905c74..000000000000 --- a/devel/gnu-automake/files/patch-configure +++ /dev/null @@ -1,20 +0,0 @@ ---- configure.orig Wed Aug 11 14:37:35 2004 -+++ configure Mon Aug 16 10:29:22 2004 -@@ -276,3 +276,3 @@ - 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 build build_cpu build_vendor build_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar APIVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY 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 build build_cpu build_vendor build_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar APIVERSION APIPVERSION pkgvdatadir PERL TEX LN MODIFICATION_DELAY EGREP FGREP LIBOBJS LTLIBOBJS' - ac_subst_files='' -@@ -1727,6 +1727,6 @@ - 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}/$PACKAGE-$APIVERSION" -+pkgvdatadir="\${datadir}/automake${APIPVERSION}" - -@@ -2666,2 +2666,3 @@ - s,@APIVERSION@,$APIVERSION,;t t -+s,@APIPVERSION@,$APIPVERSION,;t t - s,@pkgvdatadir@,$pkgvdatadir,;t t diff --git a/devel/gnu-automake/files/patch-doc::Makefile.in b/devel/gnu-automake/files/patch-doc::Makefile.in deleted file mode 100644 index b3c320a7de74..000000000000 --- a/devel/gnu-automake/files/patch-doc::Makefile.in +++ /dev/null @@ -1,35 +0,0 @@ ---- doc/Makefile.in.orig Sun Mar 7 09:04:33 2004 -+++ doc/Makefile.in Sun Mar 14 17:12:32 2004 -@@ -53,3 +53,3 @@ - DIST_SOURCES = --INFO_DEPS = $(srcdir)/automake.info -+INFO_DEPS = $(srcdir)/automake${APIPVERSION}.info - TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex -@@ -73,2 +73,3 @@ - APIVERSION = @APIVERSION@ -+APIPVERSION = @APIPVERSION@ - AUTOCONF = @AUTOCONF@ -@@ -93,3 +94,3 @@ - LTLIBOBJS = @LTLIBOBJS@ --MAKEINFO = @MAKEINFO@ -+MAKEINFO = @MAKEINFO@ --no-split - MODIFICATION_DELAY = @MODIFICATION_DELAY@ -@@ -135,3 +136,3 @@ - target_alias = @target_alias@ --info_TEXINFOS = automake.texi -+info_TEXINFOS = automake${APIPVERSION}.texi - automake_TEXINFOS = fdl.texi -@@ -142,3 +143,3 @@ - --TAGS_DEPENDENCIES = automake.texi -+TAGS_DEPENDENCIES = automake${APIPVERSION}.texi - all: all-am -@@ -222,5 +223,5 @@ - $(srcdir)/version.texi: $(srcdir)/stamp-vti --$(srcdir)/stamp-vti: automake.texi $(top_srcdir)/configure -- @(dir=.; test -f ./automake.texi || dir=$(srcdir); \ -- set `$(SHELL) $(top_srcdir)/lib/mdate-sh $$dir/automake.texi`; \ -+$(srcdir)/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"; \ diff --git a/devel/gnu-automake/files/patch-doc::automake.texi b/devel/gnu-automake/files/patch-doc::automake.texi deleted file mode 100644 index a29474dadf45..000000000000 --- a/devel/gnu-automake/files/patch-doc::automake.texi +++ /dev/null @@ -1,24 +0,0 @@ ---- doc/automake.texi.orig Sun Sep 19 21:28:46 2004 -+++ doc/automake.texi Thu Oct 14 20:38:54 2004 -@@ -2,4 +2,4 @@ - @c %**start of header --@setfilename automake.info --@settitle automake -+@setfilename automake19.info -+@settitle automake19 - @setchapternewpage off -@@ -36,8 +36,3 @@ - @direntry --* automake: (automake). Making Makefile.in's. --@end direntry -- --@dircategory Individual utilities --@direntry --* aclocal: (automake)Invoking aclocal. Generating aclocal.m4. -+* automake19: (automake19). Making Makefile.in's. - @end direntry -@@ -8915,3 +8910,3 @@ - @multitable {8888-88-88} {8.8-p8} {8888} {888} {8888} {8888 (88)} {8888 (88)} {888} {888} --@headitem Date @tab Rel @tab am @tab acl @tab pm @tab @file{*.am} @tab m4 @tab doc @tab t -+@item Date @tab Rel @tab am @tab acl @tab pm @tab @file{*.am} @tab m4 @tab doc @tab t - @item 1994-09-19 @tab CVS @tab 141 @tab @tab @tab 299 (24) @tab @tab @tab diff --git a/devel/gnu-automake/files/patch-lib::Automake::Config.in b/devel/gnu-automake/files/patch-lib::Automake::Config.in deleted file mode 100644 index c9c17688d004..000000000000 --- a/devel/gnu-automake/files/patch-lib::Automake::Config.in +++ /dev/null @@ -1,18 +0,0 @@ ---- lib/Automake/Config.in.orig Thu Dec 25 10:00:29 2003 -+++ lib/Automake/Config.in Mon Mar 29 20:23:13 2004 -@@ -25,5 +25,5 @@ - @ISA = qw (Exporter); --@EXPORT = qw ($APIVERSION $PACKAGE $VERSION $libdir); -+@EXPORT = qw ($APIVERSION $APIPVERSION $PACKAGE $VERSION $libdir); - --use vars qw ($APIVERSION $PACKAGE $VERSION $libdir); -+use vars qw ($APIVERSION $APIPVERSION $PACKAGE $VERSION $libdir); - -@@ -32,5 +32,6 @@ - $APIVERSION = '@APIVERSION@'; -+$APIPVERSION = '@APIPVERSION@'; - $PACKAGE = '@PACKAGE@'; - $VERSION = '@VERSION@'; --$libdir = '@datadir@/@PACKAGE@-@APIVERSION@'; -+$libdir = '@datadir@/@PACKAGE@@APIPVERSION@'; - diff --git a/devel/gnu-automake/files/patch-lib::Automake::Makefile.in b/devel/gnu-automake/files/patch-lib::Automake::Makefile.in deleted file mode 100644 index a1ae8ffe243e..000000000000 --- a/devel/gnu-automake/files/patch-lib::Automake::Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/Automake/Makefile.in.orig Sun Mar 7 09:04:33 2004 -+++ lib/Automake/Makefile.in Mon Mar 29 20:22:26 2004 -@@ -70,2 +70,3 @@ - APIVERSION = @APIVERSION@ -+APIPVERSION = @APIPVERSION@ - AUTOCONF = @AUTOCONF@ -@@ -161,2 +162,3 @@ - -e 's,[@]APIVERSION[@],$(APIVERSION),g' \ -+ -e 's,[@]APIPVERSION[@],$(APIPVERSION),g' \ - -e 's,[@]PACKAGE[@],$(PACKAGE),g' \ diff --git a/devel/gnu-automake/files/patch-m4-Makefile.in b/devel/gnu-automake/files/patch-m4-Makefile.in deleted file mode 100644 index 5125e696ab2c..000000000000 --- a/devel/gnu-automake/files/patch-m4-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- m4/Makefile.in.orig Sun Mar 7 09:04:33 2004 -+++ m4/Makefile.in Sun Mar 14 17:09:37 2004 -@@ -60,2 +60,3 @@ - APIVERSION = @APIVERSION@ -+APIPVERSION = @APIPVERSION@ - AUTOCONF = @AUTOCONF@ -@@ -122,3 +123,3 @@ - target_alias = @target_alias@ --m4datadir = $(datadir)/aclocal-$(APIVERSION) -+m4datadir = $(datadir)/aclocal$(APIPVERSION) - dist_m4data_DATA = \ |