From df6377894486ad4dc45b50862883e0f7919dfcd0 Mon Sep 17 00:00:00 2001 From: brad Date: Thu, 23 Aug 2001 19:33:20 +0000 Subject: [PATCH] upgrade to automake 1.5 --- devel/automake/Makefile | 6 +- devel/automake/files/md5 | 6 +- devel/automake/patches/patch-Makefile_in | 20 ++--- devel/automake/patches/patch-aclocal_in | 14 ---- devel/automake/patches/patch-automake_in | 12 --- devel/automake/patches/patch-automake_texi | 8 +- devel/automake/patches/patch-subdirs_am | 11 --- devel/automake/patches/patch-texi-vers_am | 12 --- devel/automake/pkg/DESCR | 3 +- devel/automake/pkg/PLIST | 97 ++++++++++++---------- 10 files changed, 76 insertions(+), 113 deletions(-) delete mode 100644 devel/automake/patches/patch-aclocal_in delete mode 100644 devel/automake/patches/patch-automake_in delete mode 100644 devel/automake/patches/patch-subdirs_am delete mode 100644 devel/automake/patches/patch-texi-vers_am diff --git a/devel/automake/Makefile b/devel/automake/Makefile index 29888532577..e24450c3af0 100644 --- a/devel/automake/Makefile +++ b/devel/automake/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.19 2001/08/17 17:05:48 brad Exp $ +# $OpenBSD: Makefile,v 1.20 2001/08/23 19:33:20 brad Exp $ COMMENT= "GNU Standards-compliant Makefile generator" -DISTNAME= automake-1.4-p5 +DISTNAME= automake-1.5 CATEGORIES= devel NEED_VERSION= 1.435 MASTER_SITES= ${MASTER_SITE_GNU} @@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR= automake HOMEPAGE= http://www.gnu.org/software/automake/ -MAINTAINER= Jason Ish +MAINTAINER= Brad Smith PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes diff --git a/devel/automake/files/md5 b/devel/automake/files/md5 index f12f1945168..902629fd8de 100644 --- a/devel/automake/files/md5 +++ b/devel/automake/files/md5 @@ -1,3 +1,3 @@ -MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3 -RMD160 (automake-1.4-p5.tar.gz) = 8fc4f00f407c62afe6d7270e2893d141fa2af59d -SHA1 (automake-1.4-p5.tar.gz) = f8368e47a7b8f879aaa0c828664b680efd9e455f +MD5 (automake-1.5.tar.gz) = 74a22ac0581378e807ecb334a55c5bab +RMD160 (automake-1.5.tar.gz) = 5c5310c3923a8bfb1c94d77c7c53c593552e0464 +SHA1 (automake-1.5.tar.gz) = 9c426ac75e514dc214dea6309b07c5d9cb95002c diff --git a/devel/automake/patches/patch-Makefile_in b/devel/automake/patches/patch-Makefile_in index 6fcb800aa41..6d290a7b0a3 100644 --- a/devel/automake/patches/patch-Makefile_in +++ b/devel/automake/patches/patch-Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-Makefile_in,v 1.2 2001/06/30 17:49:59 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 = : +$OpenBSD: patch-Makefile_in,v 1.3 2001/08/23 19:33:20 brad Exp $ +--- Makefile.in.orig Thu Aug 23 01:49:54 2001 ++++ Makefile.in Thu Aug 23 13:52:39 2001 +@@ -194,7 +194,7 @@ automake.dvi: automake.texi $(srcdir)/ve + && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ + `echo $< | sed 's,.*/,,'` + -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split - PACKAGE = @PACKAGE@ - PERL = @PERL@ - TAR = @TAR@ + TEXI2DVI = texi2dvi + DVIPS = dvips + .dvi.ps: diff --git a/devel/automake/patches/patch-aclocal_in b/devel/automake/patches/patch-aclocal_in deleted file mode 100644 index 73fa2d2b71b..00000000000 --- a/devel/automake/patches/patch-aclocal_in +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-aclocal_in,v 1.4 2001/08/17 17:05:48 brad Exp $ ---- aclocal.in.orig Sun Jul 15 06:52:18 2001 -+++ aclocal.in Fri Aug 17 12:47:24 2001 -@@ -359,6 +359,10 @@ sub add_file - push (@rlist, $1); - } - -+ # Remove comments from current line. -+ s/\bdnl\b.*$//; -+ s/\#.*$//; -+ - # This function constructed dynamically. - if (! &search && /(^|\s+)(AM_[A-Z0-9_]+)/) - { diff --git a/devel/automake/patches/patch-automake_in b/devel/automake/patches/patch-automake_in deleted file mode 100644 index 22c4c43a6fd..00000000000 --- a/devel/automake/patches/patch-automake_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-automake_in,v 1.6 2001/08/17 17:05:48 brad Exp $ ---- automake.in.orig Sun Jul 15 12:47:28 2001 -+++ automake.in Fri Aug 17 12:47:25 2001 -@@ -2012,7 +2012,7 @@ sub handle_texinfo - # dependency list. - @texi_deps = (); - push (@texi_deps, $info_cursor); -- push (@texi_deps, $vtexi) if $vtexi; -+ push (@texi_deps, '$(srcdir)/'.$vtexi) if $vtexi; - - # Canonicalize name first. - ($canonical = $infobase) =~ tr/A-Za-z0-9_/_/c; diff --git a/devel/automake/patches/patch-automake_texi b/devel/automake/patches/patch-automake_texi index 63b3456b78d..51e93a06255 100644 --- a/devel/automake/patches/patch-automake_texi +++ b/devel/automake/patches/patch-automake_texi @@ -1,6 +1,6 @@ -$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 +$OpenBSD: patch-automake_texi,v 1.2 2001/08/23 19:33:20 brad Exp $ +--- automake.texi.orig Thu Aug 23 13:55:57 2001 ++++ automake.texi Thu Aug 23 13:57:10 2001 @@ -1,6 +1,7 @@ \input texinfo @c -*-texinfo-*- @c %**start of header @@ -11,7 +11,7 @@ $OpenBSD: patch-automake_texi,v 1.1 2001/06/07 18:23:22 brad Exp $ @c %**end of header @@ -9,12 +10,12 @@ - @dircategory GNU admin + @dircategory GNU programming tools @direntry -* automake: (automake). Making Makefile.in's +* Automake: (automake). Making Makefile.in's diff --git a/devel/automake/patches/patch-subdirs_am b/devel/automake/patches/patch-subdirs_am deleted file mode 100644 index 09483c9363f..00000000000 --- a/devel/automake/patches/patch-subdirs_am +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-subdirs_am,v 1.2 2001/08/17 17:05:48 brad Exp $ ---- subdirs.am.orig Sun Jul 15 11:44:42 2001 -+++ subdirs.am Fri Aug 17 12:50:33 2001 -@@ -60,6 +60,7 @@ maintainer-clean-recursive: - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" != "." || dot_seen=yes; \ -+ true; \ - done; \ - ## If we haven't seen `.', then add it at the beginning. - test "$$dot_seen" = "no" && rev=". $$rev"; \ diff --git a/devel/automake/patches/patch-texi-vers_am b/devel/automake/patches/patch-texi-vers_am deleted file mode 100644 index 38d54f9a808..00000000000 --- a/devel/automake/patches/patch-texi-vers_am +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-texi-vers_am,v 1.2 2001/06/30 17:50:00 brad Exp $ ---- texi-vers.am.orig Sun Jun 10 05:46:36 2001 -+++ texi-vers.am Sat Jun 30 13:41:22 2001 -@@ -15,7 +15,7 @@ - ## along with this program; if not, write to the Free Software - ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - ## 02111-1307, USA. --$(srcdir)/@VTEXI@: @MAINTAINER_MODE_TRUE@stamp-@VTI@ -+$(srcdir)/@VTEXI@: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-@VTI@ - @: - - ## Depend on configure.ac so that version number updates cause a diff --git a/devel/automake/pkg/DESCR b/devel/automake/pkg/DESCR index 888f7cb2475..5ea013b9d39 100644 --- a/devel/automake/pkg/DESCR +++ b/devel/automake/pkg/DESCR @@ -2,7 +2,6 @@ Automake is an experimental Makefile generator. It was inspired by the 4.4BSD make and include files, but aims to be portable and to conform to the GNU standards for Makefile variables and targets. -Automake assumes the project uses autoconf. If you want automatic -dependency tracking support, the use of GNU make is also required. +Automake assumes the project uses Autoconf. WWW: ${HOMEPAGE} diff --git a/devel/automake/pkg/PLIST b/devel/automake/pkg/PLIST index 864097960c4..625e69ad40e 100644 --- a/devel/automake/pkg/PLIST +++ b/devel/automake/pkg/PLIST @@ -1,81 +1,94 @@ -@comment $OpenBSD: PLIST,v 1.9 2001/06/07 18:23:22 brad Exp $ +@comment $OpenBSD: PLIST,v 1.10 2001/08/23 19:33:20 brad Exp $ bin/aclocal bin/automake @unexec install-info --delete --info-dir=%D/info %D/info/automake.info info/automake.info @exec install-info --info-dir=%D/info %D/info/automake.info +share/aclocal/as.m4 +share/aclocal/auxdir.m4 share/aclocal/ccstdc.m4 share/aclocal/cond.m4 +share/aclocal/depend.m4 +share/aclocal/depout.m4 share/aclocal/dmalloc.m4 share/aclocal/error.m4 +share/aclocal/gcj.m4 share/aclocal/header.m4 share/aclocal/init.m4 +share/aclocal/install-sh.m4 share/aclocal/lex.m4 share/aclocal/lispdir.m4 share/aclocal/maintainer.m4 +share/aclocal/make.m4 +share/aclocal/minuso.m4 share/aclocal/missing.m4 -share/aclocal/mktime.m4 share/aclocal/multi.m4 share/aclocal/obstack.m4 share/aclocal/protos.m4 share/aclocal/ptrdiff.m4 +share/aclocal/python.m4 share/aclocal/regex.m4 share/aclocal/sanity.m4 +share/aclocal/strip.m4 share/aclocal/strtod.m4 share/aclocal/termios.m4 share/aclocal/winsz.m4 +share/automake/Automake/Struct.pm share/automake/COPYING share/automake/INSTALL share/automake/acinstall +share/automake/am/ansi2knr.am +share/automake/am/check.am +share/automake/am/clean-hdr.am +share/automake/am/clean.am +share/automake/am/compile.am +share/automake/am/configure.am +share/automake/am/data.am +share/automake/am/dejagnu.am +share/automake/am/depend.am +share/automake/am/depend2.am +share/automake/am/distdir.am +share/automake/am/footer.am +share/automake/am/header-vars.am +share/automake/am/header.am +share/automake/am/install.am +share/automake/am/java.am +share/automake/am/lang-compile.am +share/automake/am/lex.am +share/automake/am/library.am +share/automake/am/libs.am +share/automake/am/libtool.am +share/automake/am/lisp.am +share/automake/am/ltlib.am +share/automake/am/ltlibrary.am +share/automake/am/mans-vars.am +share/automake/am/mans.am +share/automake/am/multilib.am +share/automake/am/program.am +share/automake/am/progs.am +share/automake/am/python.am +share/automake/am/remake-hdr.am +share/automake/am/scripts.am +share/automake/am/subdirs.am +share/automake/am/tags.am +share/automake/am/texi-vers.am +share/automake/am/texibuild.am +share/automake/am/texinfos.am +share/automake/am/yacc.am 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/compile 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/depcomp 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/py-compile share/automake/texinfo.tex -share/automake/texinfos.am share/automake/ylwrap +@dirrm share/automake/am +@dirrm share/automake/Automake @dirrm share/automake