upgrade to automake 1.4-p1

--
Ok'd by: espie@
This commit is contained in:
brad 2001-06-07 18:23:21 +00:00
parent 4e5584464c
commit 1efe97dd4f
7 changed files with 80 additions and 87 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.16 2001/05/06 00:12:52 lebel Exp $
# $OpenBSD: Makefile,v 1.17 2001/06/07 18:23:21 brad Exp $
COMMENT= "GNU Standards-compliant Makefile generator"
DISTNAME= automake-1.4
DISTNAME= automake-1.4-p1
CATEGORIES= devel
NEED_VERSION= 1.402
MASTER_SITES= ${MASTER_SITE_GNU}

View File

@ -1,3 +1,3 @@
SHA1 (automake-1.4.tar.gz) = 1741c9d73d36e37139adeab4d905049d509f9454
RMD160 (automake-1.4.tar.gz) = 4a6746c64d03ae100c31da99512fb5fc16da63c8
MD5 (automake-1.4.tar.gz) = 1d483ffa4349bfc9ab8ae0de0c617c7b
MD5 (automake-1.4-p1.tar.gz) = e08f40620447c6889d0e42098b08409a
RMD160 (automake-1.4-p1.tar.gz) = 69c01d378b56278745843b8f097fe223480e1358
SHA1 (automake-1.4-p1.tar.gz) = 96225bf2a97b5fecd179c91a8c85c8e1b1cb85b0

View File

@ -1,6 +1,7 @@
--- Makefile.in.orig Fri Jan 15 07:55:38 1999
+++ Makefile.in Sat Mar 18 23:43:54 2000
@@ -57,7 +57,7 @@
$OpenBSD: patch-Makefile_in,v 1.1 2001/06/07 18:23:22 brad Exp $
--- Makefile.in.orig Tue May 8 20:44:16 2001
+++ Makefile.in Thu May 10 12:33:10 2001
@@ -57,7 +57,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
@ -9,7 +10,7 @@
PACKAGE = @PACKAGE@
PERL = @PERL@
TAR = @TAR@
@@ -564,7 +564,7 @@
@@ -564,7 +564,7 @@ maintainer-clean
install-data-hook:
@for prog in $(script_DATA); do \

View File

@ -1,13 +1,13 @@
$OpenBSD: patch-aclocal_in,v 1.1 2001/04/21 14:13:23 espie Exp $
--- aclocal.in.orig Sat Apr 21 15:31:53 2001
+++ aclocal.in Sat Apr 21 16:10:27 2001
$OpenBSD: patch-aclocal_in,v 1.2 2001/06/07 18:23:22 brad Exp $
--- aclocal.in.orig Sun Jan 10 13:37:04 1999
+++ aclocal.in Thu May 10 12:26:54 2001
@@ -346,6 +346,10 @@ sub add_file
push (@rlist, $1);
}
+ # Remove comments from current line.
+ s/\bdnl\b.*$//;
+ s/\#.*$//;
+ # Remove comments from current line.
+ s/\bdnl\b.*$//;
+ s/\#.*$//;
+
# This function constructed dynamically.
if (! &search && /(^|\s+)(AM_[A-Z_]+)/)

View File

@ -1,6 +1,6 @@
--- automake.in.orig Fri Jan 15 07:42:36 1999
+++ automake.in Fri Dec 29 23:46:31 2000
@@ -1957,7 +1957,7 @@ sub handle_texinfo
--- automake.in.orig Thu May 10 12:27:15 2001
+++ automake.in Thu May 10 12:28:28 2001
@@ -1969,7 +1969,7 @@ sub handle_texinfo
# dependency list.
@texi_deps = ();
push (@texi_deps, $info_cursor);
@ -9,12 +9,3 @@
# Canonicalize name first.
($canonical = $infobase) =~ tr/A-Za-z0-9_/_/c;
@@ -2367,7 +2367,7 @@ sub handle_dist_worker
$output_rules .= "\t d=\$(srcdir); \\\n";
}
$output_rules .= ("\t if test -d \$\$d/\$\$file; then \\\n"
- . "\t cp -pr \$\$/\$\$file \$(distdir)/\$\$file; \\\n"
+ . "\t cp -pr \$\$d/\$\$file \$(distdir)/\$\$file; \\\n"
. "\t else \\\n"
. "\t test -f \$(distdir)/\$\$file \\\n"
. "\t || ln \$\$d/\$\$file \$(distdir)/\$\$file 2> /dev/null \\\n"

View File

@ -1,5 +1,6 @@
--- automake.texi.orig Wed Nov 24 18:04:08 1999
+++ automake.texi Wed Nov 24 18:05:53 1999
$OpenBSD: patch-automake_texi,v 1.1 2001/06/07 18:23:22 brad Exp $
--- automake.texi.orig Wed Jan 6 08:01:26 1999
+++ automake.texi Thu May 10 12:33:10 2001
@@ -1,6 +1,7 @@
\input texinfo @c -*-texinfo-*-
@c %**start of header

View File

@ -1,63 +1,9 @@
@comment $OpenBSD: PLIST,v 1.8 2000/06/25 07:31:11 brad Exp $
bin/automake
@comment $OpenBSD: PLIST,v 1.9 2001/06/07 18:23:22 brad Exp $
bin/aclocal
@unexec install-info --delete %D/info/automake.info %D/info/dir
bin/automake
@unexec install-info --delete --info-dir=%D/info %D/info/automake.info
info/automake.info
@exec install-info %D/info/automake.info %D/info/dir
share/automake/COPYING
share/automake/INSTALL
share/automake/texinfo.tex
share/automake/ansi2knr.c
share/automake/ansi2knr.1
share/automake/clean-hdr.am
share/automake/clean-kr.am
share/automake/clean.am
share/automake/comp-vars.am
share/automake/compile.am
share/automake/data-clean.am
share/automake/data.am
share/automake/dejagnu.am
share/automake/depend.am
share/automake/depend2.am
share/automake/dist-vars.am
share/automake/footer.am
share/automake/header-vars.am
share/automake/header.am
share/automake/java-clean.am
share/automake/java.am
share/automake/kr-extra.am
share/automake/library.am
share/automake/libs.am
share/automake/libs-clean.am
share/automake/libtool.am
share/automake/lisp-clean.am
share/automake/lisp.am
share/automake/ltlib-clean.am
share/automake/ltlib.am
share/automake/ltlibrary.am
share/automake/mans-vars.am
share/automake/mans.am
share/automake/multilib.am
share/automake/program.am
share/automake/progs-clean.am
share/automake/progs.am
share/automake/remake-hdr.am
share/automake/remake.am
share/automake/scripts.am
share/automake/subdirs.am
share/automake/tags-clean.am
share/automake/tags.am
share/automake/texi-vers.am
share/automake/texinfos.am
share/automake/config.guess
share/automake/config.sub
share/automake/install-sh
share/automake/mdate-sh
share/automake/missing
share/automake/mkinstalldirs
share/automake/elisp-comp
share/automake/ylwrap
share/automake/acinstall
@exec install-info --info-dir=%D/info %D/info/automake.info
share/aclocal/ccstdc.m4
share/aclocal/cond.m4
share/aclocal/dmalloc.m4
@ -78,4 +24,58 @@ share/aclocal/sanity.m4
share/aclocal/strtod.m4
share/aclocal/termios.m4
share/aclocal/winsz.m4
share/automake/COPYING
share/automake/INSTALL
share/automake/acinstall
share/automake/ansi2knr.1
share/automake/ansi2knr.c
share/automake/clean-hdr.am
share/automake/clean-kr.am
share/automake/clean.am
share/automake/comp-vars.am
share/automake/compile.am
share/automake/config.guess
share/automake/config.sub
share/automake/data-clean.am
share/automake/data.am
share/automake/dejagnu.am
share/automake/depend.am
share/automake/depend2.am
share/automake/dist-vars.am
share/automake/elisp-comp
share/automake/footer.am
share/automake/header-vars.am
share/automake/header.am
share/automake/install-sh
share/automake/java-clean.am
share/automake/java.am
share/automake/kr-extra.am
share/automake/library.am
share/automake/libs-clean.am
share/automake/libs.am
share/automake/libtool.am
share/automake/lisp-clean.am
share/automake/lisp.am
share/automake/ltlib-clean.am
share/automake/ltlib.am
share/automake/ltlibrary.am
share/automake/mans-vars.am
share/automake/mans.am
share/automake/mdate-sh
share/automake/missing
share/automake/mkinstalldirs
share/automake/multilib.am
share/automake/program.am
share/automake/progs-clean.am
share/automake/progs.am
share/automake/remake-hdr.am
share/automake/remake.am
share/automake/scripts.am
share/automake/subdirs.am
share/automake/tags-clean.am
share/automake/tags.am
share/automake/texi-vers.am
share/automake/texinfo.tex
share/automake/texinfos.am
share/automake/ylwrap
@dirrm share/automake