diff options
| -rw-r--r-- | devel/automake14/Makefile | 7 | ||||
| -rw-r--r-- | devel/automake14/distinfo | 4 | ||||
| -rw-r--r-- | devel/automake14/files/patch-Makefile.in | 53 | ||||
| -rw-r--r-- | devel/automake14/files/patch-aclocal.in | 50 | ||||
| -rw-r--r-- | devel/automake14/files/patch-automake.in | 12 | ||||
| -rw-r--r-- | devel/automake14/files/patch-configure | 7 | ||||
| -rw-r--r-- | devel/automake14/files/patch-m4-Makefile.in | 14 | ||||
| -rw-r--r-- | devel/automake14/pkg-plist | 1 |
8 files changed, 47 insertions, 101 deletions
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile index 5bcea5514b3b..2c1771ed0444 100644 --- a/devel/automake14/Makefile +++ b/devel/automake14/Makefile @@ -6,14 +6,13 @@ # PORTNAME= automake -PORTVERSION= 1.4.5 -PORTREVISION= 9 +PORTVERSION= 1.4.6 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake -DISTNAME= automake-1.4-p5 +DISTNAME= automake-1.4-p6 -MAINTAINER= ade@FreeBSD.org +AINTAINER= ade@FreeBSD.org COMMENT= GNU Standards-compliant Makefile generator (legacy version 1.4) DEPRECATED= Please use devel/automake18 instead diff --git a/devel/automake14/distinfo b/devel/automake14/distinfo index 46d6d9947dae..18f6a7cb9aa9 100644 --- a/devel/automake14/distinfo +++ b/devel/automake14/distinfo @@ -1,2 +1,2 @@ -MD5 (automake-1.4-p5.tar.gz) = e10679bba411f8602eed004012d915e3 -SIZE (automake-1.4-p5.tar.gz) = 376992 +MD5 (automake-1.4-p6.tar.gz) = 24872b81b95d78d05834c39af2cfcf05 +SIZE (automake-1.4-p6.tar.gz) = 375060 diff --git a/devel/automake14/files/patch-Makefile.in b/devel/automake14/files/patch-Makefile.in index 449664acee7a..5008a3dc1339 100644 --- a/devel/automake14/files/patch-Makefile.in +++ b/devel/automake14/files/patch-Makefile.in @@ -1,8 +1,6 @@ ---- Makefile.in.orig Sun Jul 15 13:23:30 2001 -+++ Makefile.in Sun Oct 13 08:44:55 2002 -@@ -34,9 +34,9 @@ - - DESTDIR = +--- Makefile.in.orig Sat Jul 27 14:09:40 2002 ++++ Makefile.in Thu May 13 13:44:45 2004 +@@ -36,5 +36,5 @@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ @@ -11,20 +9,12 @@ +pkglibdir = $(libdir)/@PACKAGE@14 +pkgincludedir = $(includedir)/@PACKAGE@14 - top_builddir = . - -@@ -69,7 +69,7 @@ - SUBDIRS = . m4 tests - +@@ -74,3 +74,3 @@ bin_SCRIPTS = automake aclocal -info_TEXINFOS = automake.texi +info_TEXINFOS = automake14.texi - amfiles = clean-hdr.am clean-kr.am clean.am comp-vars.am compile.am data-clean.am data.am dejagnu.am depend.am depend2.am dist-vars.am footer.am header-vars.am header.am java-clean.am java.am kr-extra.am library.am libs-clean.am libs.am libtool.am lisp-clean.am lisp.am ltlib-clean.am ltlib.am ltlibrary.am mans-vars.am mans.am multilib.am program.am progs-clean.am progs.am remake-hdr.am remake.am scripts.am subdirs.am tags-clean.am tags.am texi-vers.am texinfos.am - -@@ -90,9 +90,9 @@ - SCRIPTS = $(bin_SCRIPTS) - +@@ -97,5 +97,5 @@ TEXI2DVI = texi2dvi -INFO_DEPS = automake.info -DVIS = automake.dvi @@ -32,46 +22,33 @@ +INFO_DEPS = automake14.info +DVIS = automake14.dvi +TEXINFOS = automake14.texi - DATA = $(pkgdata_DATA) $(script_DATA) - - DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ -@@ -149,8 +149,8 @@ - $(srcdir)/version.texi: stamp-vti - @: + DATA = $(pkgvdata_DATA) $(script_DATA) +@@ -156,4 +156,4 @@ -$(srcdir)/stamp-vti: automake.texi $(top_srcdir)/configure.in - @echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/automake.texi`" > vti.tmp +$(srcdir)/stamp-vti: automake14.texi $(top_srcdir)/configure.in + @echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/automake14.texi`" > vti.tmp @echo "@set EDITION $(VERSION)" >> vti.tmp - @echo "@set VERSION $(VERSION)" >> vti.tmp - @cmp -s vti.tmp $(srcdir)/version.texi \ -@@ -169,8 +169,8 @@ - maintainer-clean-vti: - -rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi +@@ -176,4 +176,4 @@ -automake.info: automake.texi version.texi -automake.dvi: automake.texi version.texi +automake14.info: automake14.texi version.texi +automake14.dvi: automake14.texi version.texi - - DVIPS = dvips -@@ -178,7 +178,7 @@ - .texi.info: - @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] +@@ -185,3 +185,3 @@ cd $(srcdir) \ - && $(MAKEINFO) `echo $< | sed 's,.*/,,'` + && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'` - .texi.dvi: - TEXINPUTS=.:$$TEXINPUTS \ -@@ -269,7 +269,7 @@ - done - +@@ -276,3 +276,3 @@ mostlyclean-aminfo: - -rm -f automake.aux automake.cp automake.cps automake.dvi automake.fn \ + -rm -f automake.aux automake.cp automake.cps automake14.dvi automake.fn \ automake.fns automake.ky automake.kys automake.ps \ - automake.log automake.pg automake.toc automake.tp \ - automake.tps automake.vr automake.vrs automake.op automake.tr \ +@@ -490,3 +490,3 @@ + @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook ++ $(MAKE) $(AM_MAKEFLAGS) + install-exec: install-exec-recursive diff --git a/devel/automake14/files/patch-aclocal.in b/devel/automake14/files/patch-aclocal.in index 595bc4835df1..0b216ab854ed 100644 --- a/devel/automake14/files/patch-aclocal.in +++ b/devel/automake14/files/patch-aclocal.in @@ -1,44 +1,25 @@ ---- aclocal.in.orig Sun Jul 15 06:52:18 2001 -+++ aclocal.in Sat Oct 19 12:28:09 2002 -@@ -32,7 +32,9 @@ - $PACKAGE = "@PACKAGE@"; - $prefix = "@prefix@"; - # Note that this isn't pkgdatadir, but a separate directory. +--- aclocal.in.orig Thu Jul 25 09:51:42 2002 ++++ aclocal.in Thu May 13 13:33:24 2004 +@@ -36,3 +36,4 @@ + # Note also that the versioned directory is handled later. -$acdir = "@datadir@/aclocal"; +$acdir = "@datadir@/aclocal14"; -+ +$acdir_x11 = '%%X11BASE%%/share/aclocal'; - - # Some globals. - -@@ -106,6 +108,9 @@ - - + $default_acdir = $acdir; +@@ -111,2 +112,3 @@ local (@dirlist) = &parse_arguments (@ARGV); -+ +unshift @dirlist, $acdir_x11 if -d "$acdir_x11/."; -+ - &scan_m4_files ($acdir, @dirlist); - &scan_configure; - if (! $exit_status) -@@ -279,12 +284,13 @@ - $file_contents{'acinclude.m4'} = &scan_file ('acinclude.m4'); - } + &scan_m4_files (@dirlist); +@@ -296,2 +298,3 @@ + local (@skipinolist) = (); local ($m4dir); - foreach $m4dir (@dirlist) - { - opendir (DIR, $m4dir) +@@ -301,3 +304,3 @@ || die "aclocal: couldn't open directory \`$m4dir': $!\n"; - local ($file, $fullfile, $expr); + local ($file, $fullfile, $ino, $expr); foreach $file (sort grep (! /^\./, readdir (DIR))) - { - # Only examine .m4 files. -@@ -294,6 +300,12 @@ - next if $file eq 'aclocal.m4'; - +@@ -311,2 +314,8 @@ $fullfile = $m4dir . '/' . $file; + + # Do not scan a file more than once. @@ -47,14 +28,3 @@ + push @skipinolist, $ino; + $file_contents{$fullfile} = &scan_file ($fullfile); - } - closedir (DIR); -@@ -400,7 +412,7 @@ - elsif ($map{$1} ne 'acinclude.m4' || $file eq 'acinclude.m4') - { - warn "aclocal: $file: $.: duplicated macro \`$1'\n"; -- $exit_status = 1; -+ # $exit_status = 1; - } - print STDERR "Found macro $1 in $file: $.\n" if $verbosity; - } diff --git a/devel/automake14/files/patch-automake.in b/devel/automake14/files/patch-automake.in index c0f0cc2a513f..f4111d489de3 100644 --- a/devel/automake14/files/patch-automake.in +++ b/devel/automake14/files/patch-automake.in @@ -1,11 +1,7 @@ ---- automake.in.orig Sun Jul 15 12:47:28 2001 -+++ automake.in Sun Oct 13 19:59:10 2002 -@@ -32,7 +32,7 @@ - $VERSION = "@VERSION@"; - $PACKAGE = "@PACKAGE@"; +--- automake.in.orig Sat Jul 27 13:55:58 2002 ++++ automake.in Thu May 13 13:34:28 2004 +@@ -34,3 +34,3 @@ $prefix = "@prefix@"; --$am_dir = "@datadir@/@PACKAGE@"; +-$am_dir = "@datadir@/@PACKAGE@-@APIVERSION@"; +$am_dir = "@datadir@/@PACKAGE@14"; $TAR = "@TAR@"; - - # String constants. diff --git a/devel/automake14/files/patch-configure b/devel/automake14/files/patch-configure new file mode 100644 index 000000000000..57dfa68f13c4 --- /dev/null +++ b/devel/automake14/files/patch-configure @@ -0,0 +1,7 @@ +--- configure.orig Sat Jul 27 13:43:07 2002 ++++ configure Thu May 13 13:39:30 2004 +@@ -867,3 +867,3 @@ + # A versioned directory, defined here for convenience. +-pkgvdatadir="\${datadir}/automake-${APIVERSION}" ++pkgvdatadir="\${datadir}/automake14" + diff --git a/devel/automake14/files/patch-m4-Makefile.in b/devel/automake14/files/patch-m4-Makefile.in index 871fa5969d1f..ef2f10aaef08 100644 --- a/devel/automake14/files/patch-m4-Makefile.in +++ b/devel/automake14/files/patch-m4-Makefile.in @@ -1,11 +1,7 @@ ---- m4/Makefile.in.orig Sun Jul 15 13:23:30 2001 -+++ m4/Makefile.in Sun Oct 13 08:42:46 2002 -@@ -65,7 +65,7 @@ +--- m4/Makefile.in.orig Sat Jul 27 14:09:41 2002 ++++ m4/Makefile.in Thu May 13 13:35:28 2004 +@@ -70,3 +70,3 @@ - MAINT_CHARSET = latin1 - --m4datadir = $(datadir)/aclocal +-m4datadir = $(datadir)/aclocal-$(APIVERSION) +m4datadir = $(datadir)/aclocal14 - m4data_DATA = ccstdc.m4 cond.m4 dmalloc.m4 error.m4 header.m4 init.m4 lex.m4 lispdir.m4 maintainer.m4 missing.m4 mktime.m4 multi.m4 obstack.m4 protos.m4 ptrdiff.m4 regex.m4 sanity.m4 strtod.m4 termios.m4 winsz.m4 - - + m4data_DATA = amversion.m4 ccstdc.m4 cond.m4 dmalloc.m4 error.m4 header.m4 init.m4 lex.m4 lispdir.m4 maintainer.m4 missing.m4 mktime.m4 multi.m4 obstack.m4 protos.m4 ptrdiff.m4 regex.m4 sanity.m4 strtod.m4 termios.m4 winsz.m4 diff --git a/devel/automake14/pkg-plist b/devel/automake14/pkg-plist index 10ba0b711736..1c9903f5a4e5 100644 --- a/devel/automake14/pkg-plist +++ b/devel/automake14/pkg-plist @@ -5,6 +5,7 @@ info/automake%%BUILD_VERSION%%.info @exec install-info %D/info/automake%%BUILD_VERSION%%.info %D/info/dir libexec/automake%%BUILD_VERSION%%/aclocal libexec/automake%%BUILD_VERSION%%/automake +share/aclocal%%BUILD_VERSION%%/amversion.m4 share/aclocal%%BUILD_VERSION%%/ccstdc.m4 share/aclocal%%BUILD_VERSION%%/cond.m4 share/aclocal%%BUILD_VERSION%%/dmalloc.m4 |