diff options
Diffstat (limited to 'devel')
49 files changed, 684 insertions, 2144 deletions
diff --git a/devel/automake/Makefile b/devel/automake/Makefile index cc2d68e63a8d..53ee1186cab1 100644 --- a/devel/automake/Makefile +++ b/devel/automake/Makefile @@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= automake MAINTAINER= ade@FreeBSD.org COMMENT= GNU Standards-compliant Makefile generator +LATEST_LINK= automake GNU_CONFIGURE= yes CONFIGURE_ENV= PERL=${PERL5} USE_PERL5= yes diff --git a/devel/automake110/Makefile b/devel/automake110/Makefile index bff17961e46e..babd4fff2357 100644 --- a/devel/automake110/Makefile +++ b/devel/automake110/Makefile @@ -5,9 +5,8 @@ # $FreeBSD$ # -PORTNAME= automake17 -PORTVERSION= 1.7.2 -PORTEPOCH= 1 +PORTNAME= automake +PORTVERSION= 1.7.5 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake @@ -16,15 +15,20 @@ DISTNAME= automake-${PORTVERSION} MAINTAINER= ade@FreeBSD.org COMMENT= GNU automake generates input files for GNU autoconf -BROKEN= Needs at least autoconf 254 to build. +BUILD_DEPENDS= autoconf257:${PORTSDIR}/devel/autoconf257 +RUN_DEPENDS= autoconf257:${PORTSDIR}/devel/autoconf257 +BUILD_VERSION= -1.7 +PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} +LATEST_LINK= automake${BUILD_VERSION} +USE_BZIP2= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= PERL=${PERL5} +CONFIGURE_ENV= AUTOCONF=autoconf257 AUTOHEADER=autoheader257 +CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes -STRIP= # none - .if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) pre-everything:: @${ECHO} =========================================================== @@ -35,20 +39,12 @@ pre-everything:: @${FALSE} .endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) -pre-configure: - @${REINPLACE_CMD} -i -e "s,%%X11BASE%%,${X11BASE}," \ - ${WRKSRC}/aclocal.in - -pre-install: - ${RM} -fr ${PREFIX}/libexec/automake17 - ${MKDIR} ${PREFIX}/libexec/automake17 - -post-install: -.for i in aclocal automake - ${LN} -sf ${PREFIX}/bin/${i}17 \ - ${PREFIX}/libexec/automake17/${i} -.endfor - @install-info ${PREFIX}/info/automake17.info \ - ${PREFIX}/info/dir +post-patch: + @(cd ${WRKSRC} && \ + ${RM} -f *.info && \ + ${MV} automake.texi automake${BUILD_VERSION}.texi && \ + ${REINPLACE_CMD} -E 's,(automake)\.(info),\1${BUILD_VERSION}\.\2,g' automake${BUILD_VERSION}.texi && \ + ${REINPLACE_CMD} -E 's,(automake)\.(info|texi),\1${BUILD_VERSION}\.\2,g ; \ + s,^.+ install-exec-hook$$,,' Makefile.in) .include <bsd.port.mk> diff --git a/devel/automake110/distinfo b/devel/automake110/distinfo index 6edacae01f05..e07b6fcf6a67 100644 --- a/devel/automake110/distinfo +++ b/devel/automake110/distinfo @@ -1 +1 @@ -MD5 (automake-1.7.2.tar.gz) = 753647afe9db0ec52c69c6b9bb7dd106 +MD5 (automake-1.7.5.tar.bz2) = 21c51ad339224c5862d5abd23121c362 diff --git a/devel/automake110/files/patch-Makefile.in b/devel/automake110/files/patch-Makefile.in deleted file mode 100644 index a36c0e6bba5d..000000000000 --- a/devel/automake110/files/patch-Makefile.in +++ /dev/null @@ -1,124 +0,0 @@ ---- 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 deleted file mode 100644 index 0740a6dda4f9..000000000000 --- a/devel/automake110/files/patch-aclocal.in +++ /dev/null @@ -1,63 +0,0 @@ ---- 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 deleted file mode 100644 index f9500dbe28a3..000000000000 --- a/devel/automake110/files/patch-automake.in +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 deleted file mode 100644 index cce4740d30ae..000000000000 --- a/devel/automake110/files/patch-automake.texi +++ /dev/null @@ -1,28 +0,0 @@ ---- 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 deleted file mode 100644 index 4d8692f078e3..000000000000 --- a/devel/automake110/files/patch-configure +++ /dev/null @@ -1,32 +0,0 @@ ---- 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 deleted file mode 100644 index 4c336333e5e1..000000000000 --- a/devel/automake110/files/patch-m4-Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 \ diff --git a/devel/automake110/pkg-plist b/devel/automake110/pkg-plist index e46339fdbef7..a7f80f4a2792 100644 --- a/devel/automake110/pkg-plist +++ b/devel/automake110/pkg-plist @@ -1,101 +1,98 @@ -@comment $FreeBSD$ -bin/aclocal17 -bin/automake17 -@unexec install-info --delete %D/info/automake17.info %D/info/dir -info/automake17.info -@exec install-info %D/info/automake17.info %D/info/dir -libexec/automake17/aclocal -libexec/automake17/automake -share/aclocal17/amversion.m4 -share/aclocal17/as.m4 -share/aclocal17/auxdir.m4 -share/aclocal17/ccstdc.m4 -share/aclocal17/cond.m4 -share/aclocal17/depend.m4 -share/aclocal17/depout.m4 -share/aclocal17/dmalloc.m4 -share/aclocal17/gcj.m4 -share/aclocal17/header.m4 -share/aclocal17/init.m4 -share/aclocal17/install-sh.m4 -share/aclocal17/lex.m4 -share/aclocal17/lispdir.m4 -share/aclocal17/maintainer.m4 -share/aclocal17/make.m4 -share/aclocal17/minuso.m4 -share/aclocal17/missing.m4 -share/aclocal17/multi.m4 -share/aclocal17/obsol-gt.m4 -share/aclocal17/obsol-lt.m4 -share/aclocal17/obsolete.m4 -share/aclocal17/options.m4 -share/aclocal17/protos.m4 -share/aclocal17/python.m4 -share/aclocal17/regex.m4 -share/aclocal17/runlog.m4 -share/aclocal17/sanity.m4 -share/aclocal17/strip.m4 -share/automake17/Automake/Channels.pm -share/automake17/Automake/General.pm -share/automake17/Automake/Struct.pm -share/automake17/Automake/XFile.pm -share/automake17/COPYING -share/automake17/INSTALL -share/automake17/acinstall -share/automake17/am/ansi2knr.am -share/automake17/am/check.am -share/automake17/am/clean-hdr.am -share/automake17/am/clean.am -share/automake17/am/compile.am -share/automake17/am/configure.am -share/automake17/am/data.am -share/automake17/am/dejagnu.am -share/automake17/am/depend.am -share/automake17/am/depend2.am -share/automake17/am/distdir.am -share/automake17/am/footer.am -share/automake17/am/header-vars.am -share/automake17/am/header.am -share/automake17/am/install.am -share/automake17/am/java.am -share/automake17/am/lang-compile.am -share/automake17/am/lex.am -share/automake17/am/library.am -share/automake17/am/libs.am -share/automake17/am/libtool.am -share/automake17/am/lisp.am -share/automake17/am/ltlib.am -share/automake17/am/ltlibrary.am -share/automake17/am/mans-vars.am -share/automake17/am/mans.am -share/automake17/am/multilib.am -share/automake17/am/program.am -share/automake17/am/progs.am -share/automake17/am/python.am -share/automake17/am/remake-hdr.am -share/automake17/am/scripts.am -share/automake17/am/subdirs.am -share/automake17/am/tags.am -share/automake17/am/texi-vers.am -share/automake17/am/texibuild.am -share/automake17/am/texinfos.am -share/automake17/am/yacc.am -share/automake17/ansi2knr.1 -share/automake17/ansi2knr.c -share/automake17/compile -share/automake17/config.guess -share/automake17/config.sub -share/automake17/depcomp -share/automake17/elisp-comp -share/automake17/install-sh -share/automake17/mdate-sh -share/automake17/missing -share/automake17/mkinstalldirs -share/automake17/py-compile -share/automake17/texinfo.tex -share/automake17/ylwrap -@dirrm libexec/automake17 -@dirrm share/aclocal17 -@dirrm share/automake17/Automake -@dirrm share/automake17/am -@dirrm share/automake17 +bin/aclocal%%BUILD_VERSION%% +bin/automake%%BUILD_VERSION%% +@unexec install-info --delete %D/info/automake%%BUILD_VERSION%%.info %D/info/dir +info/automake%%BUILD_VERSION%%.info +@exec install-info %D/info/automake%%BUILD_VERSION%%.info %D/info/dir +share/aclocal%%BUILD_VERSION%%/amversion.m4 +share/aclocal%%BUILD_VERSION%%/as.m4 +share/aclocal%%BUILD_VERSION%%/auxdir.m4 +share/aclocal%%BUILD_VERSION%%/ccstdc.m4 +share/aclocal%%BUILD_VERSION%%/cond.m4 +share/aclocal%%BUILD_VERSION%%/depend.m4 +share/aclocal%%BUILD_VERSION%%/depout.m4 +share/aclocal%%BUILD_VERSION%%/dmalloc.m4 +share/aclocal%%BUILD_VERSION%%/gcj.m4 +share/aclocal%%BUILD_VERSION%%/header.m4 +share/aclocal%%BUILD_VERSION%%/init.m4 +share/aclocal%%BUILD_VERSION%%/install-sh.m4 +share/aclocal%%BUILD_VERSION%%/lead-dot.m4 +share/aclocal%%BUILD_VERSION%%/lex.m4 +share/aclocal%%BUILD_VERSION%%/lispdir.m4 +share/aclocal%%BUILD_VERSION%%/maintainer.m4 +share/aclocal%%BUILD_VERSION%%/make.m4 +share/aclocal%%BUILD_VERSION%%/minuso.m4 +share/aclocal%%BUILD_VERSION%%/missing.m4 +share/aclocal%%BUILD_VERSION%%/multi.m4 +share/aclocal%%BUILD_VERSION%%/obsol-gt.m4 +share/aclocal%%BUILD_VERSION%%/obsol-lt.m4 +share/aclocal%%BUILD_VERSION%%/obsolete.m4 +share/aclocal%%BUILD_VERSION%%/options.m4 +share/aclocal%%BUILD_VERSION%%/protos.m4 +share/aclocal%%BUILD_VERSION%%/python.m4 +share/aclocal%%BUILD_VERSION%%/regex.m4 +share/aclocal%%BUILD_VERSION%%/runlog.m4 +share/aclocal%%BUILD_VERSION%%/sanity.m4 +share/aclocal%%BUILD_VERSION%%/strip.m4 +share/automake%%BUILD_VERSION%%/Automake/Channels.pm +share/automake%%BUILD_VERSION%%/Automake/General.pm +share/automake%%BUILD_VERSION%%/Automake/Struct.pm +share/automake%%BUILD_VERSION%%/Automake/XFile.pm +share/automake%%BUILD_VERSION%%/COPYING +share/automake%%BUILD_VERSION%%/INSTALL +share/automake%%BUILD_VERSION%%/acinstall +share/automake%%BUILD_VERSION%%/am/ansi2knr.am +share/automake%%BUILD_VERSION%%/am/check.am +share/automake%%BUILD_VERSION%%/am/clean-hdr.am +share/automake%%BUILD_VERSION%%/am/clean.am +share/automake%%BUILD_VERSION%%/am/compile.am +share/automake%%BUILD_VERSION%%/am/configure.am +share/automake%%BUILD_VERSION%%/am/data.am +share/automake%%BUILD_VERSION%%/am/dejagnu.am +share/automake%%BUILD_VERSION%%/am/depend.am +share/automake%%BUILD_VERSION%%/am/depend2.am +share/automake%%BUILD_VERSION%%/am/distdir.am +share/automake%%BUILD_VERSION%%/am/footer.am +share/automake%%BUILD_VERSION%%/am/header-vars.am +share/automake%%BUILD_VERSION%%/am/header.am +share/automake%%BUILD_VERSION%%/am/install.am +share/automake%%BUILD_VERSION%%/am/java.am +share/automake%%BUILD_VERSION%%/am/lang-compile.am +share/automake%%BUILD_VERSION%%/am/lex.am +share/automake%%BUILD_VERSION%%/am/library.am +share/automake%%BUILD_VERSION%%/am/libs.am +share/automake%%BUILD_VERSION%%/am/libtool.am +share/automake%%BUILD_VERSION%%/am/lisp.am +share/automake%%BUILD_VERSION%%/am/ltlib.am +share/automake%%BUILD_VERSION%%/am/ltlibrary.am +share/automake%%BUILD_VERSION%%/am/mans-vars.am +share/automake%%BUILD_VERSION%%/am/mans.am +share/automake%%BUILD_VERSION%%/am/multilib.am +share/automake%%BUILD_VERSION%%/am/program.am +share/automake%%BUILD_VERSION%%/am/progs.am +share/automake%%BUILD_VERSION%%/am/python.am +share/automake%%BUILD_VERSION%%/am/remake-hdr.am +share/automake%%BUILD_VERSION%%/am/scripts.am +share/automake%%BUILD_VERSION%%/am/subdirs.am +share/automake%%BUILD_VERSION%%/am/tags.am +share/automake%%BUILD_VERSION%%/am/texi-vers.am +share/automake%%BUILD_VERSION%%/am/texibuild.am +share/automake%%BUILD_VERSION%%/am/texinfos.am +share/automake%%BUILD_VERSION%%/am/yacc.am +share/automake%%BUILD_VERSION%%/ansi2knr.1 +share/automake%%BUILD_VERSION%%/ansi2knr.c +share/automake%%BUILD_VERSION%%/compile +share/automake%%BUILD_VERSION%%/config.guess +share/automake%%BUILD_VERSION%%/config.sub +share/automake%%BUILD_VERSION%%/depcomp +share/automake%%BUILD_VERSION%%/elisp-comp +share/automake%%BUILD_VERSION%%/install-sh +share/automake%%BUILD_VERSION%%/mdate-sh +share/automake%%BUILD_VERSION%%/missing +share/automake%%BUILD_VERSION%%/mkinstalldirs +share/automake%%BUILD_VERSION%%/py-compile +share/automake%%BUILD_VERSION%%/texinfo.tex +share/automake%%BUILD_VERSION%%/ylwrap +@dirrm share/aclocal%%BUILD_VERSION%% +@dirrm share/automake%%BUILD_VERSION%%/Automake +@dirrm share/automake%%BUILD_VERSION%%/am +@dirrm share/automake%%BUILD_VERSION%% diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile index 2a5fc0963c74..ccc29f88759a 100644 --- a/devel/automake14/Makefile +++ b/devel/automake14/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTNAME= automake14 +PORTNAME= automake PORTVERSION= 1.4.5 PORTREVISION= 9 CATEGORIES= devel @@ -16,9 +16,12 @@ DISTNAME= automake-1.4-p5 MAINTAINER= ade@FreeBSD.org COMMENT= GNU Standards-compliant Makefile generator (legacy version 1.4) +BUILD_VERSION= 14 +PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} +LATEST_LINK= automake${BUILD_VERSION} GNU_CONFIGURE= yes CONFIGURE_ENV= PERL=${PERL5} -CONFIGURE_ARGS= --program-suffix=14 +CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} USE_PERL5= yes USE_REINPLACE= yes @@ -35,7 +38,7 @@ pre-everything:: .endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) post-patch: - @${MV} ${WRKSRC}/automake.texi ${WRKSRC}/automake14.texi + @${MV} ${WRKSRC}/automake.texi ${WRKSRC}/automake${BUILD_VERSION}.texi @${RM} ${WRKSRC}/*.info* ${WRKSRC}/*.dvi >/dev/null 2>&1 || true pre-configure: @@ -43,17 +46,17 @@ pre-configure: ${WRKSRC}/aclocal.in pre-install: - ${RM} -fr ${PREFIX}/share/automake14 - ${MKDIR} ${PREFIX}/share/automake14 - ${MKDIR} ${PREFIX}/share/aclocal14 - ${MKDIR} ${PREFIX}/libexec/automake14 + ${RM} -fr ${PREFIX}/share/automake${BUILD_VERSION} + ${MKDIR} ${PREFIX}/share/automake${BUILD_VERSION} + ${MKDIR} ${PREFIX}/share/aclocal${BUILD_VERSION} + ${MKDIR} ${PREFIX}/libexec/automake${BUILD_VERSION} post-install: .for i in aclocal automake - ${LN} -sf ${PREFIX}/bin/${i}14 \ - ${PREFIX}/libexec/automake14/${i} + ${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} \ + ${PREFIX}/libexec/automake${BUILD_VERSION}/${i} .endfor - @install-info ${PREFIX}/info/automake14.info \ + @install-info ${PREFIX}/info/automake${BUILD_VERSION}.info \ ${PREFIX}/info/dir .include <bsd.port.mk> diff --git a/devel/automake14/pkg-plist b/devel/automake14/pkg-plist index 00506cacc6e9..10ba0b711736 100644 --- a/devel/automake14/pkg-plist +++ b/devel/automake14/pkg-plist @@ -1,84 +1,84 @@ -bin/aclocal14 -bin/automake14 -@unexec install-info --delete %D/info/automake14.info %D/info/dir -info/automake14.info -@exec install-info %D/info/automake14.info %D/info/dir -libexec/automake14/aclocal -libexec/automake14/automake -share/aclocal14/ccstdc.m4 -share/aclocal14/cond.m4 -share/aclocal14/dmalloc.m4 -share/aclocal14/error.m4 -share/aclocal14/header.m4 -share/aclocal14/init.m4 -share/aclocal14/lex.m4 -share/aclocal14/lispdir.m4 -share/aclocal14/maintainer.m4 -share/aclocal14/missing.m4 -share/aclocal14/mktime.m4 -share/aclocal14/multi.m4 -share/aclocal14/obstack.m4 -share/aclocal14/protos.m4 -share/aclocal14/ptrdiff.m4 -share/aclocal14/regex.m4 -share/aclocal14/sanity.m4 -share/aclocal14/strtod.m4 -share/aclocal14/termios.m4 -share/aclocal14/winsz.m4 -share/automake14/COPYING -share/automake14/INSTALL -share/automake14/acinstall -share/automake14/ansi2knr.1 -share/automake14/ansi2knr.c -share/automake14/clean-hdr.am -share/automake14/clean-kr.am -share/automake14/clean.am -share/automake14/comp-vars.am -share/automake14/compile.am -share/automake14/config.guess -share/automake14/config.sub -share/automake14/data-clean.am -share/automake14/data.am -share/automake14/dejagnu.am -share/automake14/depend.am -share/automake14/depend2.am -share/automake14/dist-vars.am -share/automake14/elisp-comp -share/automake14/footer.am -share/automake14/header-vars.am -share/automake14/header.am -share/automake14/install-sh -share/automake14/java-clean.am -share/automake14/java.am -share/automake14/kr-extra.am -share/automake14/library.am -share/automake14/libs-clean.am -share/automake14/libs.am -share/automake14/libtool.am -share/automake14/lisp-clean.am -share/automake14/lisp.am -share/automake14/ltlib-clean.am -share/automake14/ltlib.am -share/automake14/ltlibrary.am -share/automake14/mans-vars.am -share/automake14/mans.am -share/automake14/mdate-sh -share/automake14/missing -share/automake14/mkinstalldirs -share/automake14/multilib.am -share/automake14/program.am -share/automake14/progs-clean.am -share/automake14/progs.am -share/automake14/remake-hdr.am -share/automake14/remake.am -share/automake14/scripts.am -share/automake14/subdirs.am -share/automake14/tags-clean.am -share/automake14/tags.am -share/automake14/texi-vers.am -share/automake14/texinfo.tex -share/automake14/texinfos.am -share/automake14/ylwrap -@dirrm libexec/automake14 -@dirrm share/aclocal14 -@dirrm share/automake14 +bin/aclocal%%BUILD_VERSION%% +bin/automake%%BUILD_VERSION%% +@unexec install-info --delete %D/info/automake%%BUILD_VERSION%%.info %D/info/dir +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%%/ccstdc.m4 +share/aclocal%%BUILD_VERSION%%/cond.m4 +share/aclocal%%BUILD_VERSION%%/dmalloc.m4 +share/aclocal%%BUILD_VERSION%%/error.m4 +share/aclocal%%BUILD_VERSION%%/header.m4 +share/aclocal%%BUILD_VERSION%%/init.m4 +share/aclocal%%BUILD_VERSION%%/lex.m4 +share/aclocal%%BUILD_VERSION%%/lispdir.m4 +share/aclocal%%BUILD_VERSION%%/maintainer.m4 +share/aclocal%%BUILD_VERSION%%/missing.m4 +share/aclocal%%BUILD_VERSION%%/mktime.m4 +share/aclocal%%BUILD_VERSION%%/multi.m4 +share/aclocal%%BUILD_VERSION%%/obstack.m4 +share/aclocal%%BUILD_VERSION%%/protos.m4 +share/aclocal%%BUILD_VERSION%%/ptrdiff.m4 +share/aclocal%%BUILD_VERSION%%/regex.m4 +share/aclocal%%BUILD_VERSION%%/sanity.m4 +share/aclocal%%BUILD_VERSION%%/strtod.m4 +share/aclocal%%BUILD_VERSION%%/termios.m4 +share/aclocal%%BUILD_VERSION%%/winsz.m4 +share/automake%%BUILD_VERSION%%/COPYING +share/automake%%BUILD_VERSION%%/INSTALL +share/automake%%BUILD_VERSION%%/acinstall +share/automake%%BUILD_VERSION%%/ansi2knr.1 +share/automake%%BUILD_VERSION%%/ansi2knr.c +share/automake%%BUILD_VERSION%%/clean-hdr.am +share/automake%%BUILD_VERSION%%/clean-kr.am +share/automake%%BUILD_VERSION%%/clean.am +share/automake%%BUILD_VERSION%%/comp-vars.am +share/automake%%BUILD_VERSION%%/compile.am +share/automake%%BUILD_VERSION%%/config.guess +share/automake%%BUILD_VERSION%%/config.sub +share/automake%%BUILD_VERSION%%/data-clean.am +share/automake%%BUILD_VERSION%%/data.am +share/automake%%BUILD_VERSION%%/dejagnu.am +share/automake%%BUILD_VERSION%%/depend.am +share/automake%%BUILD_VERSION%%/depend2.am +share/automake%%BUILD_VERSION%%/dist-vars.am +share/automake%%BUILD_VERSION%%/elisp-comp +share/automake%%BUILD_VERSION%%/footer.am +share/automake%%BUILD_VERSION%%/header-vars.am +share/automake%%BUILD_VERSION%%/header.am +share/automake%%BUILD_VERSION%%/install-sh +share/automake%%BUILD_VERSION%%/java-clean.am +share/automake%%BUILD_VERSION%%/java.am +share/automake%%BUILD_VERSION%%/kr-extra.am +share/automake%%BUILD_VERSION%%/library.am +share/automake%%BUILD_VERSION%%/libs-clean.am +share/automake%%BUILD_VERSION%%/libs.am +share/automake%%BUILD_VERSION%%/libtool.am +share/automake%%BUILD_VERSION%%/lisp-clean.am +share/automake%%BUILD_VERSION%%/lisp.am +share/automake%%BUILD_VERSION%%/ltlib-clean.am +share/automake%%BUILD_VERSION%%/ltlib.am +share/automake%%BUILD_VERSION%%/ltlibrary.am +share/automake%%BUILD_VERSION%%/mans-vars.am +share/automake%%BUILD_VERSION%%/mans.am +share/automake%%BUILD_VERSION%%/mdate-sh +share/automake%%BUILD_VERSION%%/missing +share/automake%%BUILD_VERSION%%/mkinstalldirs +share/automake%%BUILD_VERSION%%/multilib.am +share/automake%%BUILD_VERSION%%/program.am +share/automake%%BUILD_VERSION%%/progs-clean.am +share/automake%%BUILD_VERSION%%/progs.am +share/automake%%BUILD_VERSION%%/remake-hdr.am +share/automake%%BUILD_VERSION%%/remake.am +share/automake%%BUILD_VERSION%%/scripts.am +share/automake%%BUILD_VERSION%%/subdirs.am +share/automake%%BUILD_VERSION%%/tags-clean.am +share/automake%%BUILD_VERSION%%/tags.am +share/automake%%BUILD_VERSION%%/texi-vers.am +share/automake%%BUILD_VERSION%%/texinfo.tex +share/automake%%BUILD_VERSION%%/texinfos.am +share/automake%%BUILD_VERSION%%/ylwrap +@dirrm libexec/automake%%BUILD_VERSION%% +@dirrm share/aclocal%%BUILD_VERSION%% +@dirrm share/automake%%BUILD_VERSION%% diff --git a/devel/automake15/Makefile b/devel/automake15/Makefile index cc2d68e63a8d..53ee1186cab1 100644 --- a/devel/automake15/Makefile +++ b/devel/automake15/Makefile @@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= automake MAINTAINER= ade@FreeBSD.org COMMENT= GNU Standards-compliant Makefile generator +LATEST_LINK= automake GNU_CONFIGURE= yes CONFIGURE_ENV= PERL=${PERL5} USE_PERL5= yes diff --git a/devel/automake17/Makefile b/devel/automake17/Makefile index bff17961e46e..babd4fff2357 100644 --- a/devel/automake17/Makefile +++ b/devel/automake17/Makefile @@ -5,9 +5,8 @@ # $FreeBSD$ # -PORTNAME= automake17 -PORTVERSION= 1.7.2 -PORTEPOCH= 1 +PORTNAME= automake +PORTVERSION= 1.7.5 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake @@ -16,15 +15,20 @@ DISTNAME= automake-${PORTVERSION} MAINTAINER= ade@FreeBSD.org COMMENT= GNU automake generates input files for GNU autoconf -BROKEN= Needs at least autoconf 254 to build. +BUILD_DEPENDS= autoconf257:${PORTSDIR}/devel/autoconf257 +RUN_DEPENDS= autoconf257:${PORTSDIR}/devel/autoconf257 +BUILD_VERSION= -1.7 +PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} +LATEST_LINK= automake${BUILD_VERSION} +USE_BZIP2= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= PERL=${PERL5} +CONFIGURE_ENV= AUTOCONF=autoconf257 AUTOHEADER=autoheader257 +CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes -STRIP= # none - .if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) pre-everything:: @${ECHO} =========================================================== @@ -35,20 +39,12 @@ pre-everything:: @${FALSE} .endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) -pre-configure: - @${REINPLACE_CMD} -i -e "s,%%X11BASE%%,${X11BASE}," \ - ${WRKSRC}/aclocal.in - -pre-install: - ${RM} -fr ${PREFIX}/libexec/automake17 - ${MKDIR} ${PREFIX}/libexec/automake17 - -post-install: -.for i in aclocal automake - ${LN} -sf ${PREFIX}/bin/${i}17 \ - ${PREFIX}/libexec/automake17/${i} -.endfor - @install-info ${PREFIX}/info/automake17.info \ - ${PREFIX}/info/dir +post-patch: + @(cd ${WRKSRC} && \ + ${RM} -f *.info && \ + ${MV} automake.texi automake${BUILD_VERSION}.texi && \ + ${REINPLACE_CMD} -E 's,(automake)\.(info),\1${BUILD_VERSION}\.\2,g' automake${BUILD_VERSION}.texi && \ + ${REINPLACE_CMD} -E 's,(automake)\.(info|texi),\1${BUILD_VERSION}\.\2,g ; \ + s,^.+ install-exec-hook$$,,' Makefile.in) .include <bsd.port.mk> diff --git a/devel/automake17/distinfo b/devel/automake17/distinfo index 6edacae01f05..e07b6fcf6a67 100644 --- a/devel/automake17/distinfo +++ b/devel/automake17/distinfo @@ -1 +1 @@ -MD5 (automake-1.7.2.tar.gz) = 753647afe9db0ec52c69c6b9bb7dd106 +MD5 (automake-1.7.5.tar.bz2) = 21c51ad339224c5862d5abd23121c362 diff --git a/devel/automake17/files/patch-Makefile.in b/devel/automake17/files/patch-Makefile.in deleted file mode 100644 index a36c0e6bba5d..000000000000 --- a/devel/automake17/files/patch-Makefile.in +++ /dev/null @@ -1,124 +0,0 @@ ---- 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/automake17/files/patch-aclocal.in b/devel/automake17/files/patch-aclocal.in deleted file mode 100644 index 0740a6dda4f9..000000000000 --- a/devel/automake17/files/patch-aclocal.in +++ /dev/null @@ -1,63 +0,0 @@ ---- 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/automake17/files/patch-automake.in b/devel/automake17/files/patch-automake.in deleted file mode 100644 index f9500dbe28a3..000000000000 --- a/devel/automake17/files/patch-automake.in +++ /dev/null @@ -1,20 +0,0 @@ ---- 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/automake17/files/patch-automake.texi b/devel/automake17/files/patch-automake.texi deleted file mode 100644 index cce4740d30ae..000000000000 --- a/devel/automake17/files/patch-automake.texi +++ /dev/null @@ -1,28 +0,0 @@ ---- 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/automake17/files/patch-configure b/devel/automake17/files/patch-configure deleted file mode 100644 index 4d8692f078e3..000000000000 --- a/devel/automake17/files/patch-configure +++ /dev/null @@ -1,32 +0,0 @@ ---- 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/automake17/files/patch-m4-Makefile.in b/devel/automake17/files/patch-m4-Makefile.in deleted file mode 100644 index 4c336333e5e1..000000000000 --- a/devel/automake17/files/patch-m4-Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 \ diff --git a/devel/automake17/pkg-plist b/devel/automake17/pkg-plist index e46339fdbef7..a7f80f4a2792 100644 --- a/devel/automake17/pkg-plist +++ b/devel/automake17/pkg-plist @@ -1,101 +1,98 @@ -@comment $FreeBSD$ -bin/aclocal17 -bin/automake17 -@unexec install-info --delete %D/info/automake17.info %D/info/dir -info/automake17.info -@exec install-info %D/info/automake17.info %D/info/dir -libexec/automake17/aclocal -libexec/automake17/automake -share/aclocal17/amversion.m4 -share/aclocal17/as.m4 -share/aclocal17/auxdir.m4 -share/aclocal17/ccstdc.m4 -share/aclocal17/cond.m4 -share/aclocal17/depend.m4 -share/aclocal17/depout.m4 -share/aclocal17/dmalloc.m4 -share/aclocal17/gcj.m4 -share/aclocal17/header.m4 -share/aclocal17/init.m4 -share/aclocal17/install-sh.m4 -share/aclocal17/lex.m4 -share/aclocal17/lispdir.m4 -share/aclocal17/maintainer.m4 -share/aclocal17/make.m4 -share/aclocal17/minuso.m4 -share/aclocal17/missing.m4 -share/aclocal17/multi.m4 -share/aclocal17/obsol-gt.m4 -share/aclocal17/obsol-lt.m4 -share/aclocal17/obsolete.m4 -share/aclocal17/options.m4 -share/aclocal17/protos.m4 -share/aclocal17/python.m4 -share/aclocal17/regex.m4 -share/aclocal17/runlog.m4 -share/aclocal17/sanity.m4 -share/aclocal17/strip.m4 -share/automake17/Automake/Channels.pm -share/automake17/Automake/General.pm -share/automake17/Automake/Struct.pm -share/automake17/Automake/XFile.pm -share/automake17/COPYING -share/automake17/INSTALL -share/automake17/acinstall -share/automake17/am/ansi2knr.am -share/automake17/am/check.am -share/automake17/am/clean-hdr.am -share/automake17/am/clean.am -share/automake17/am/compile.am -share/automake17/am/configure.am -share/automake17/am/data.am -share/automake17/am/dejagnu.am -share/automake17/am/depend.am -share/automake17/am/depend2.am -share/automake17/am/distdir.am -share/automake17/am/footer.am -share/automake17/am/header-vars.am -share/automake17/am/header.am -share/automake17/am/install.am -share/automake17/am/java.am -share/automake17/am/lang-compile.am -share/automake17/am/lex.am -share/automake17/am/library.am -share/automake17/am/libs.am -share/automake17/am/libtool.am -share/automake17/am/lisp.am -share/automake17/am/ltlib.am -share/automake17/am/ltlibrary.am -share/automake17/am/mans-vars.am -share/automake17/am/mans.am -share/automake17/am/multilib.am -share/automake17/am/program.am -share/automake17/am/progs.am -share/automake17/am/python.am -share/automake17/am/remake-hdr.am -share/automake17/am/scripts.am -share/automake17/am/subdirs.am -share/automake17/am/tags.am -share/automake17/am/texi-vers.am -share/automake17/am/texibuild.am -share/automake17/am/texinfos.am -share/automake17/am/yacc.am -share/automake17/ansi2knr.1 -share/automake17/ansi2knr.c -share/automake17/compile -share/automake17/config.guess -share/automake17/config.sub -share/automake17/depcomp -share/automake17/elisp-comp -share/automake17/install-sh -share/automake17/mdate-sh -share/automake17/missing -share/automake17/mkinstalldirs -share/automake17/py-compile -share/automake17/texinfo.tex -share/automake17/ylwrap -@dirrm libexec/automake17 -@dirrm share/aclocal17 -@dirrm share/automake17/Automake -@dirrm share/automake17/am -@dirrm share/automake17 +bin/aclocal%%BUILD_VERSION%% +bin/automake%%BUILD_VERSION%% +@unexec install-info --delete %D/info/automake%%BUILD_VERSION%%.info %D/info/dir +info/automake%%BUILD_VERSION%%.info +@exec install-info %D/info/automake%%BUILD_VERSION%%.info %D/info/dir +share/aclocal%%BUILD_VERSION%%/amversion.m4 +share/aclocal%%BUILD_VERSION%%/as.m4 +share/aclocal%%BUILD_VERSION%%/auxdir.m4 +share/aclocal%%BUILD_VERSION%%/ccstdc.m4 +share/aclocal%%BUILD_VERSION%%/cond.m4 +share/aclocal%%BUILD_VERSION%%/depend.m4 +share/aclocal%%BUILD_VERSION%%/depout.m4 +share/aclocal%%BUILD_VERSION%%/dmalloc.m4 +share/aclocal%%BUILD_VERSION%%/gcj.m4 +share/aclocal%%BUILD_VERSION%%/header.m4 +share/aclocal%%BUILD_VERSION%%/init.m4 +share/aclocal%%BUILD_VERSION%%/install-sh.m4 +share/aclocal%%BUILD_VERSION%%/lead-dot.m4 +share/aclocal%%BUILD_VERSION%%/lex.m4 +share/aclocal%%BUILD_VERSION%%/lispdir.m4 +share/aclocal%%BUILD_VERSION%%/maintainer.m4 +share/aclocal%%BUILD_VERSION%%/make.m4 +share/aclocal%%BUILD_VERSION%%/minuso.m4 +share/aclocal%%BUILD_VERSION%%/missing.m4 +share/aclocal%%BUILD_VERSION%%/multi.m4 +share/aclocal%%BUILD_VERSION%%/obsol-gt.m4 +share/aclocal%%BUILD_VERSION%%/obsol-lt.m4 +share/aclocal%%BUILD_VERSION%%/obsolete.m4 +share/aclocal%%BUILD_VERSION%%/options.m4 +share/aclocal%%BUILD_VERSION%%/protos.m4 +share/aclocal%%BUILD_VERSION%%/python.m4 +share/aclocal%%BUILD_VERSION%%/regex.m4 +share/aclocal%%BUILD_VERSION%%/runlog.m4 +share/aclocal%%BUILD_VERSION%%/sanity.m4 +share/aclocal%%BUILD_VERSION%%/strip.m4 +share/automake%%BUILD_VERSION%%/Automake/Channels.pm +share/automake%%BUILD_VERSION%%/Automake/General.pm +share/automake%%BUILD_VERSION%%/Automake/Struct.pm +share/automake%%BUILD_VERSION%%/Automake/XFile.pm +share/automake%%BUILD_VERSION%%/COPYING +share/automake%%BUILD_VERSION%%/INSTALL +share/automake%%BUILD_VERSION%%/acinstall +share/automake%%BUILD_VERSION%%/am/ansi2knr.am +share/automake%%BUILD_VERSION%%/am/check.am +share/automake%%BUILD_VERSION%%/am/clean-hdr.am +share/automake%%BUILD_VERSION%%/am/clean.am +share/automake%%BUILD_VERSION%%/am/compile.am +share/automake%%BUILD_VERSION%%/am/configure.am +share/automake%%BUILD_VERSION%%/am/data.am +share/automake%%BUILD_VERSION%%/am/dejagnu.am +share/automake%%BUILD_VERSION%%/am/depend.am +share/automake%%BUILD_VERSION%%/am/depend2.am +share/automake%%BUILD_VERSION%%/am/distdir.am +share/automake%%BUILD_VERSION%%/am/footer.am +share/automake%%BUILD_VERSION%%/am/header-vars.am +share/automake%%BUILD_VERSION%%/am/header.am +share/automake%%BUILD_VERSION%%/am/install.am +share/automake%%BUILD_VERSION%%/am/java.am +share/automake%%BUILD_VERSION%%/am/lang-compile.am +share/automake%%BUILD_VERSION%%/am/lex.am +share/automake%%BUILD_VERSION%%/am/library.am +share/automake%%BUILD_VERSION%%/am/libs.am +share/automake%%BUILD_VERSION%%/am/libtool.am +share/automake%%BUILD_VERSION%%/am/lisp.am +share/automake%%BUILD_VERSION%%/am/ltlib.am +share/automake%%BUILD_VERSION%%/am/ltlibrary.am +share/automake%%BUILD_VERSION%%/am/mans-vars.am +share/automake%%BUILD_VERSION%%/am/mans.am +share/automake%%BUILD_VERSION%%/am/multilib.am +share/automake%%BUILD_VERSION%%/am/program.am +share/automake%%BUILD_VERSION%%/am/progs.am +share/automake%%BUILD_VERSION%%/am/python.am +share/automake%%BUILD_VERSION%%/am/remake-hdr.am +share/automake%%BUILD_VERSION%%/am/scripts.am +share/automake%%BUILD_VERSION%%/am/subdirs.am +share/automake%%BUILD_VERSION%%/am/tags.am +share/automake%%BUILD_VERSION%%/am/texi-vers.am +share/automake%%BUILD_VERSION%%/am/texibuild.am +share/automake%%BUILD_VERSION%%/am/texinfos.am +share/automake%%BUILD_VERSION%%/am/yacc.am +share/automake%%BUILD_VERSION%%/ansi2knr.1 +share/automake%%BUILD_VERSION%%/ansi2knr.c +share/automake%%BUILD_VERSION%%/compile +share/automake%%BUILD_VERSION%%/config.guess +share/automake%%BUILD_VERSION%%/config.sub +share/automake%%BUILD_VERSION%%/depcomp +share/automake%%BUILD_VERSION%%/elisp-comp +share/automake%%BUILD_VERSION%%/install-sh +share/automake%%BUILD_VERSION%%/mdate-sh +share/automake%%BUILD_VERSION%%/missing +share/automake%%BUILD_VERSION%%/mkinstalldirs +share/automake%%BUILD_VERSION%%/py-compile +share/automake%%BUILD_VERSION%%/texinfo.tex +share/automake%%BUILD_VERSION%%/ylwrap +@dirrm share/aclocal%%BUILD_VERSION%% +@dirrm share/automake%%BUILD_VERSION%%/Automake +@dirrm share/automake%%BUILD_VERSION%%/am +@dirrm share/automake%%BUILD_VERSION%% diff --git a/devel/automake18/Makefile b/devel/automake18/Makefile index bff17961e46e..babd4fff2357 100644 --- a/devel/automake18/Makefile +++ b/devel/automake18/Makefile @@ -5,9 +5,8 @@ # $FreeBSD$ # -PORTNAME= automake17 -PORTVERSION= 1.7.2 -PORTEPOCH= 1 +PORTNAME= automake +PORTVERSION= 1.7.5 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake @@ -16,15 +15,20 @@ DISTNAME= automake-${PORTVERSION} MAINTAINER= ade@FreeBSD.org COMMENT= GNU automake generates input files for GNU autoconf -BROKEN= Needs at least autoconf 254 to build. +BUILD_DEPENDS= autoconf257:${PORTSDIR}/devel/autoconf257 +RUN_DEPENDS= autoconf257:${PORTSDIR}/devel/autoconf257 +BUILD_VERSION= -1.7 +PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} +LATEST_LINK= automake${BUILD_VERSION} +USE_BZIP2= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= PERL=${PERL5} +CONFIGURE_ENV= AUTOCONF=autoconf257 AUTOHEADER=autoheader257 +CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes -STRIP= # none - .if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) pre-everything:: @${ECHO} =========================================================== @@ -35,20 +39,12 @@ pre-everything:: @${FALSE} .endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) -pre-configure: - @${REINPLACE_CMD} -i -e "s,%%X11BASE%%,${X11BASE}," \ - ${WRKSRC}/aclocal.in - -pre-install: - ${RM} -fr ${PREFIX}/libexec/automake17 - ${MKDIR} ${PREFIX}/libexec/automake17 - -post-install: -.for i in aclocal automake - ${LN} -sf ${PREFIX}/bin/${i}17 \ - ${PREFIX}/libexec/automake17/${i} -.endfor - @install-info ${PREFIX}/info/automake17.info \ - ${PREFIX}/info/dir +post-patch: + @(cd ${WRKSRC} && \ + ${RM} -f *.info && \ + ${MV} automake.texi automake${BUILD_VERSION}.texi && \ + ${REINPLACE_CMD} -E 's,(automake)\.(info),\1${BUILD_VERSION}\.\2,g' automake${BUILD_VERSION}.texi && \ + ${REINPLACE_CMD} -E 's,(automake)\.(info|texi),\1${BUILD_VERSION}\.\2,g ; \ + s,^.+ install-exec-hook$$,,' Makefile.in) .include <bsd.port.mk> diff --git a/devel/automake18/distinfo b/devel/automake18/distinfo index 6edacae01f05..e07b6fcf6a67 100644 --- a/devel/automake18/distinfo +++ b/devel/automake18/distinfo @@ -1 +1 @@ -MD5 (automake-1.7.2.tar.gz) = 753647afe9db0ec52c69c6b9bb7dd106 +MD5 (automake-1.7.5.tar.bz2) = 21c51ad339224c5862d5abd23121c362 diff --git a/devel/automake18/files/patch-Makefile.in b/devel/automake18/files/patch-Makefile.in deleted file mode 100644 index a36c0e6bba5d..000000000000 --- a/devel/automake18/files/patch-Makefile.in +++ /dev/null @@ -1,124 +0,0 @@ ---- 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/automake18/files/patch-aclocal.in b/devel/automake18/files/patch-aclocal.in deleted file mode 100644 index 0740a6dda4f9..000000000000 --- a/devel/automake18/files/patch-aclocal.in +++ /dev/null @@ -1,63 +0,0 @@ ---- 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/automake18/files/patch-automake.in b/devel/automake18/files/patch-automake.in deleted file mode 100644 index f9500dbe28a3..000000000000 --- a/devel/automake18/files/patch-automake.in +++ /dev/null @@ -1,20 +0,0 @@ ---- 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/automake18/files/patch-automake.texi b/devel/automake18/files/patch-automake.texi deleted file mode 100644 index cce4740d30ae..000000000000 --- a/devel/automake18/files/patch-automake.texi +++ /dev/null @@ -1,28 +0,0 @@ ---- 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/automake18/files/patch-configure b/devel/automake18/files/patch-configure deleted file mode 100644 index 4d8692f078e3..000000000000 --- a/devel/automake18/files/patch-configure +++ /dev/null @@ -1,32 +0,0 @@ ---- 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/automake18/files/patch-m4-Makefile.in b/devel/automake18/files/patch-m4-Makefile.in deleted file mode 100644 index 4c336333e5e1..000000000000 --- a/devel/automake18/files/patch-m4-Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 \ diff --git a/devel/automake18/pkg-plist b/devel/automake18/pkg-plist index e46339fdbef7..a7f80f4a2792 100644 --- a/devel/automake18/pkg-plist +++ b/devel/automake18/pkg-plist @@ -1,101 +1,98 @@ -@comment $FreeBSD$ -bin/aclocal17 -bin/automake17 -@unexec install-info --delete %D/info/automake17.info %D/info/dir -info/automake17.info -@exec install-info %D/info/automake17.info %D/info/dir -libexec/automake17/aclocal -libexec/automake17/automake -share/aclocal17/amversion.m4 -share/aclocal17/as.m4 -share/aclocal17/auxdir.m4 -share/aclocal17/ccstdc.m4 -share/aclocal17/cond.m4 -share/aclocal17/depend.m4 -share/aclocal17/depout.m4 -share/aclocal17/dmalloc.m4 -share/aclocal17/gcj.m4 -share/aclocal17/header.m4 -share/aclocal17/init.m4 -share/aclocal17/install-sh.m4 -share/aclocal17/lex.m4 -share/aclocal17/lispdir.m4 -share/aclocal17/maintainer.m4 -share/aclocal17/make.m4 -share/aclocal17/minuso.m4 -share/aclocal17/missing.m4 -share/aclocal17/multi.m4 -share/aclocal17/obsol-gt.m4 -share/aclocal17/obsol-lt.m4 -share/aclocal17/obsolete.m4 -share/aclocal17/options.m4 -share/aclocal17/protos.m4 -share/aclocal17/python.m4 -share/aclocal17/regex.m4 -share/aclocal17/runlog.m4 -share/aclocal17/sanity.m4 -share/aclocal17/strip.m4 -share/automake17/Automake/Channels.pm -share/automake17/Automake/General.pm -share/automake17/Automake/Struct.pm -share/automake17/Automake/XFile.pm -share/automake17/COPYING -share/automake17/INSTALL -share/automake17/acinstall -share/automake17/am/ansi2knr.am -share/automake17/am/check.am -share/automake17/am/clean-hdr.am -share/automake17/am/clean.am -share/automake17/am/compile.am -share/automake17/am/configure.am -share/automake17/am/data.am -share/automake17/am/dejagnu.am -share/automake17/am/depend.am -share/automake17/am/depend2.am -share/automake17/am/distdir.am -share/automake17/am/footer.am -share/automake17/am/header-vars.am -share/automake17/am/header.am -share/automake17/am/install.am -share/automake17/am/java.am -share/automake17/am/lang-compile.am -share/automake17/am/lex.am -share/automake17/am/library.am -share/automake17/am/libs.am -share/automake17/am/libtool.am -share/automake17/am/lisp.am -share/automake17/am/ltlib.am -share/automake17/am/ltlibrary.am -share/automake17/am/mans-vars.am -share/automake17/am/mans.am -share/automake17/am/multilib.am -share/automake17/am/program.am -share/automake17/am/progs.am -share/automake17/am/python.am -share/automake17/am/remake-hdr.am -share/automake17/am/scripts.am -share/automake17/am/subdirs.am -share/automake17/am/tags.am -share/automake17/am/texi-vers.am -share/automake17/am/texibuild.am -share/automake17/am/texinfos.am -share/automake17/am/yacc.am -share/automake17/ansi2knr.1 -share/automake17/ansi2knr.c -share/automake17/compile -share/automake17/config.guess -share/automake17/config.sub -share/automake17/depcomp -share/automake17/elisp-comp -share/automake17/install-sh -share/automake17/mdate-sh -share/automake17/missing -share/automake17/mkinstalldirs -share/automake17/py-compile -share/automake17/texinfo.tex -share/automake17/ylwrap -@dirrm libexec/automake17 -@dirrm share/aclocal17 -@dirrm share/automake17/Automake -@dirrm share/automake17/am -@dirrm share/automake17 +bin/aclocal%%BUILD_VERSION%% +bin/automake%%BUILD_VERSION%% +@unexec install-info --delete %D/info/automake%%BUILD_VERSION%%.info %D/info/dir +info/automake%%BUILD_VERSION%%.info +@exec install-info %D/info/automake%%BUILD_VERSION%%.info %D/info/dir +share/aclocal%%BUILD_VERSION%%/amversion.m4 +share/aclocal%%BUILD_VERSION%%/as.m4 +share/aclocal%%BUILD_VERSION%%/auxdir.m4 +share/aclocal%%BUILD_VERSION%%/ccstdc.m4 +share/aclocal%%BUILD_VERSION%%/cond.m4 +share/aclocal%%BUILD_VERSION%%/depend.m4 +share/aclocal%%BUILD_VERSION%%/depout.m4 +share/aclocal%%BUILD_VERSION%%/dmalloc.m4 +share/aclocal%%BUILD_VERSION%%/gcj.m4 +share/aclocal%%BUILD_VERSION%%/header.m4 +share/aclocal%%BUILD_VERSION%%/init.m4 +share/aclocal%%BUILD_VERSION%%/install-sh.m4 +share/aclocal%%BUILD_VERSION%%/lead-dot.m4 +share/aclocal%%BUILD_VERSION%%/lex.m4 +share/aclocal%%BUILD_VERSION%%/lispdir.m4 +share/aclocal%%BUILD_VERSION%%/maintainer.m4 +share/aclocal%%BUILD_VERSION%%/make.m4 +share/aclocal%%BUILD_VERSION%%/minuso.m4 +share/aclocal%%BUILD_VERSION%%/missing.m4 +share/aclocal%%BUILD_VERSION%%/multi.m4 +share/aclocal%%BUILD_VERSION%%/obsol-gt.m4 +share/aclocal%%BUILD_VERSION%%/obsol-lt.m4 +share/aclocal%%BUILD_VERSION%%/obsolete.m4 +share/aclocal%%BUILD_VERSION%%/options.m4 +share/aclocal%%BUILD_VERSION%%/protos.m4 +share/aclocal%%BUILD_VERSION%%/python.m4 +share/aclocal%%BUILD_VERSION%%/regex.m4 +share/aclocal%%BUILD_VERSION%%/runlog.m4 +share/aclocal%%BUILD_VERSION%%/sanity.m4 +share/aclocal%%BUILD_VERSION%%/strip.m4 +share/automake%%BUILD_VERSION%%/Automake/Channels.pm +share/automake%%BUILD_VERSION%%/Automake/General.pm +share/automake%%BUILD_VERSION%%/Automake/Struct.pm +share/automake%%BUILD_VERSION%%/Automake/XFile.pm +share/automake%%BUILD_VERSION%%/COPYING +share/automake%%BUILD_VERSION%%/INSTALL +share/automake%%BUILD_VERSION%%/acinstall +share/automake%%BUILD_VERSION%%/am/ansi2knr.am +share/automake%%BUILD_VERSION%%/am/check.am +share/automake%%BUILD_VERSION%%/am/clean-hdr.am +share/automake%%BUILD_VERSION%%/am/clean.am +share/automake%%BUILD_VERSION%%/am/compile.am +share/automake%%BUILD_VERSION%%/am/configure.am +share/automake%%BUILD_VERSION%%/am/data.am +share/automake%%BUILD_VERSION%%/am/dejagnu.am +share/automake%%BUILD_VERSION%%/am/depend.am +share/automake%%BUILD_VERSION%%/am/depend2.am +share/automake%%BUILD_VERSION%%/am/distdir.am +share/automake%%BUILD_VERSION%%/am/footer.am +share/automake%%BUILD_VERSION%%/am/header-vars.am +share/automake%%BUILD_VERSION%%/am/header.am +share/automake%%BUILD_VERSION%%/am/install.am +share/automake%%BUILD_VERSION%%/am/java.am +share/automake%%BUILD_VERSION%%/am/lang-compile.am +share/automake%%BUILD_VERSION%%/am/lex.am +share/automake%%BUILD_VERSION%%/am/library.am +share/automake%%BUILD_VERSION%%/am/libs.am +share/automake%%BUILD_VERSION%%/am/libtool.am +share/automake%%BUILD_VERSION%%/am/lisp.am +share/automake%%BUILD_VERSION%%/am/ltlib.am +share/automake%%BUILD_VERSION%%/am/ltlibrary.am +share/automake%%BUILD_VERSION%%/am/mans-vars.am +share/automake%%BUILD_VERSION%%/am/mans.am +share/automake%%BUILD_VERSION%%/am/multilib.am +share/automake%%BUILD_VERSION%%/am/program.am +share/automake%%BUILD_VERSION%%/am/progs.am +share/automake%%BUILD_VERSION%%/am/python.am +share/automake%%BUILD_VERSION%%/am/remake-hdr.am +share/automake%%BUILD_VERSION%%/am/scripts.am +share/automake%%BUILD_VERSION%%/am/subdirs.am +share/automake%%BUILD_VERSION%%/am/tags.am +share/automake%%BUILD_VERSION%%/am/texi-vers.am +share/automake%%BUILD_VERSION%%/am/texibuild.am +share/automake%%BUILD_VERSION%%/am/texinfos.am +share/automake%%BUILD_VERSION%%/am/yacc.am +share/automake%%BUILD_VERSION%%/ansi2knr.1 +share/automake%%BUILD_VERSION%%/ansi2knr.c +share/automake%%BUILD_VERSION%%/compile +share/automake%%BUILD_VERSION%%/config.guess +share/automake%%BUILD_VERSION%%/config.sub +share/automake%%BUILD_VERSION%%/depcomp +share/automake%%BUILD_VERSION%%/elisp-comp +share/automake%%BUILD_VERSION%%/install-sh +share/automake%%BUILD_VERSION%%/mdate-sh +share/automake%%BUILD_VERSION%%/missing +share/automake%%BUILD_VERSION%%/mkinstalldirs +share/automake%%BUILD_VERSION%%/py-compile +share/automake%%BUILD_VERSION%%/texinfo.tex +share/automake%%BUILD_VERSION%%/ylwrap +@dirrm share/aclocal%%BUILD_VERSION%% +@dirrm share/automake%%BUILD_VERSION%%/Automake +@dirrm share/automake%%BUILD_VERSION%%/am +@dirrm share/automake%%BUILD_VERSION%% diff --git a/devel/automake19/Makefile b/devel/automake19/Makefile index bff17961e46e..babd4fff2357 100644 --- a/devel/automake19/Makefile +++ b/devel/automake19/Makefile @@ -5,9 +5,8 @@ # $FreeBSD$ # -PORTNAME= automake17 -PORTVERSION= 1.7.2 -PORTEPOCH= 1 +PORTNAME= automake +PORTVERSION= 1.7.5 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake @@ -16,15 +15,20 @@ DISTNAME= automake-${PORTVERSION} MAINTAINER= ade@FreeBSD.org COMMENT= GNU automake generates input files for GNU autoconf -BROKEN= Needs at least autoconf 254 to build. +BUILD_DEPENDS= autoconf257:${PORTSDIR}/devel/autoconf257 +RUN_DEPENDS= autoconf257:${PORTSDIR}/devel/autoconf257 +BUILD_VERSION= -1.7 +PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} +LATEST_LINK= automake${BUILD_VERSION} +USE_BZIP2= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= PERL=${PERL5} +CONFIGURE_ENV= AUTOCONF=autoconf257 AUTOHEADER=autoheader257 +CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes -STRIP= # none - .if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) pre-everything:: @${ECHO} =========================================================== @@ -35,20 +39,12 @@ pre-everything:: @${FALSE} .endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) -pre-configure: - @${REINPLACE_CMD} -i -e "s,%%X11BASE%%,${X11BASE}," \ - ${WRKSRC}/aclocal.in - -pre-install: - ${RM} -fr ${PREFIX}/libexec/automake17 - ${MKDIR} ${PREFIX}/libexec/automake17 - -post-install: -.for i in aclocal automake - ${LN} -sf ${PREFIX}/bin/${i}17 \ - ${PREFIX}/libexec/automake17/${i} -.endfor - @install-info ${PREFIX}/info/automake17.info \ - ${PREFIX}/info/dir +post-patch: + @(cd ${WRKSRC} && \ + ${RM} -f *.info && \ + ${MV} automake.texi automake${BUILD_VERSION}.texi && \ + ${REINPLACE_CMD} -E 's,(automake)\.(info),\1${BUILD_VERSION}\.\2,g' automake${BUILD_VERSION}.texi && \ + ${REINPLACE_CMD} -E 's,(automake)\.(info|texi),\1${BUILD_VERSION}\.\2,g ; \ + s,^.+ install-exec-hook$$,,' Makefile.in) .include <bsd.port.mk> diff --git a/devel/automake19/distinfo b/devel/automake19/distinfo index 6edacae01f05..e07b6fcf6a67 100644 --- a/devel/automake19/distinfo +++ b/devel/automake19/distinfo @@ -1 +1 @@ -MD5 (automake-1.7.2.tar.gz) = 753647afe9db0ec52c69c6b9bb7dd106 +MD5 (automake-1.7.5.tar.bz2) = 21c51ad339224c5862d5abd23121c362 diff --git a/devel/automake19/files/patch-Makefile.in b/devel/automake19/files/patch-Makefile.in deleted file mode 100644 index a36c0e6bba5d..000000000000 --- a/devel/automake19/files/patch-Makefile.in +++ /dev/null @@ -1,124 +0,0 @@ ---- 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/automake19/files/patch-aclocal.in b/devel/automake19/files/patch-aclocal.in deleted file mode 100644 index 0740a6dda4f9..000000000000 --- a/devel/automake19/files/patch-aclocal.in +++ /dev/null @@ -1,63 +0,0 @@ ---- 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/automake19/files/patch-automake.in b/devel/automake19/files/patch-automake.in deleted file mode 100644 index f9500dbe28a3..000000000000 --- a/devel/automake19/files/patch-automake.in +++ /dev/null @@ -1,20 +0,0 @@ ---- 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/automake19/files/patch-automake.texi b/devel/automake19/files/patch-automake.texi deleted file mode 100644 index cce4740d30ae..000000000000 --- a/devel/automake19/files/patch-automake.texi +++ /dev/null @@ -1,28 +0,0 @@ ---- 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/automake19/files/patch-configure b/devel/automake19/files/patch-configure deleted file mode 100644 index 4d8692f078e3..000000000000 --- a/devel/automake19/files/patch-configure +++ /dev/null @@ -1,32 +0,0 @@ ---- 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/automake19/files/patch-m4-Makefile.in b/devel/automake19/files/patch-m4-Makefile.in deleted file mode 100644 index 4c336333e5e1..000000000000 --- a/devel/automake19/files/patch-m4-Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 \ diff --git a/devel/automake19/pkg-plist b/devel/automake19/pkg-plist index e46339fdbef7..a7f80f4a2792 100644 --- a/devel/automake19/pkg-plist +++ b/devel/automake19/pkg-plist @@ -1,101 +1,98 @@ -@comment $FreeBSD$ -bin/aclocal17 -bin/automake17 -@unexec install-info --delete %D/info/automake17.info %D/info/dir -info/automake17.info -@exec install-info %D/info/automake17.info %D/info/dir -libexec/automake17/aclocal -libexec/automake17/automake -share/aclocal17/amversion.m4 -share/aclocal17/as.m4 -share/aclocal17/auxdir.m4 -share/aclocal17/ccstdc.m4 -share/aclocal17/cond.m4 -share/aclocal17/depend.m4 -share/aclocal17/depout.m4 -share/aclocal17/dmalloc.m4 -share/aclocal17/gcj.m4 -share/aclocal17/header.m4 -share/aclocal17/init.m4 -share/aclocal17/install-sh.m4 -share/aclocal17/lex.m4 -share/aclocal17/lispdir.m4 -share/aclocal17/maintainer.m4 -share/aclocal17/make.m4 -share/aclocal17/minuso.m4 -share/aclocal17/missing.m4 -share/aclocal17/multi.m4 -share/aclocal17/obsol-gt.m4 -share/aclocal17/obsol-lt.m4 -share/aclocal17/obsolete.m4 -share/aclocal17/options.m4 -share/aclocal17/protos.m4 -share/aclocal17/python.m4 -share/aclocal17/regex.m4 -share/aclocal17/runlog.m4 -share/aclocal17/sanity.m4 -share/aclocal17/strip.m4 -share/automake17/Automake/Channels.pm -share/automake17/Automake/General.pm -share/automake17/Automake/Struct.pm -share/automake17/Automake/XFile.pm -share/automake17/COPYING -share/automake17/INSTALL -share/automake17/acinstall -share/automake17/am/ansi2knr.am -share/automake17/am/check.am -share/automake17/am/clean-hdr.am -share/automake17/am/clean.am -share/automake17/am/compile.am -share/automake17/am/configure.am -share/automake17/am/data.am -share/automake17/am/dejagnu.am -share/automake17/am/depend.am -share/automake17/am/depend2.am -share/automake17/am/distdir.am -share/automake17/am/footer.am -share/automake17/am/header-vars.am -share/automake17/am/header.am -share/automake17/am/install.am -share/automake17/am/java.am -share/automake17/am/lang-compile.am -share/automake17/am/lex.am -share/automake17/am/library.am -share/automake17/am/libs.am -share/automake17/am/libtool.am -share/automake17/am/lisp.am -share/automake17/am/ltlib.am -share/automake17/am/ltlibrary.am -share/automake17/am/mans-vars.am -share/automake17/am/mans.am -share/automake17/am/multilib.am -share/automake17/am/program.am -share/automake17/am/progs.am -share/automake17/am/python.am -share/automake17/am/remake-hdr.am -share/automake17/am/scripts.am -share/automake17/am/subdirs.am -share/automake17/am/tags.am -share/automake17/am/texi-vers.am -share/automake17/am/texibuild.am -share/automake17/am/texinfos.am -share/automake17/am/yacc.am -share/automake17/ansi2knr.1 -share/automake17/ansi2knr.c -share/automake17/compile -share/automake17/config.guess -share/automake17/config.sub -share/automake17/depcomp -share/automake17/elisp-comp -share/automake17/install-sh -share/automake17/mdate-sh -share/automake17/missing -share/automake17/mkinstalldirs -share/automake17/py-compile -share/automake17/texinfo.tex -share/automake17/ylwrap -@dirrm libexec/automake17 -@dirrm share/aclocal17 -@dirrm share/automake17/Automake -@dirrm share/automake17/am -@dirrm share/automake17 +bin/aclocal%%BUILD_VERSION%% +bin/automake%%BUILD_VERSION%% +@unexec install-info --delete %D/info/automake%%BUILD_VERSION%%.info %D/info/dir +info/automake%%BUILD_VERSION%%.info +@exec install-info %D/info/automake%%BUILD_VERSION%%.info %D/info/dir +share/aclocal%%BUILD_VERSION%%/amversion.m4 +share/aclocal%%BUILD_VERSION%%/as.m4 +share/aclocal%%BUILD_VERSION%%/auxdir.m4 +share/aclocal%%BUILD_VERSION%%/ccstdc.m4 +share/aclocal%%BUILD_VERSION%%/cond.m4 +share/aclocal%%BUILD_VERSION%%/depend.m4 +share/aclocal%%BUILD_VERSION%%/depout.m4 +share/aclocal%%BUILD_VERSION%%/dmalloc.m4 +share/aclocal%%BUILD_VERSION%%/gcj.m4 +share/aclocal%%BUILD_VERSION%%/header.m4 +share/aclocal%%BUILD_VERSION%%/init.m4 +share/aclocal%%BUILD_VERSION%%/install-sh.m4 +share/aclocal%%BUILD_VERSION%%/lead-dot.m4 +share/aclocal%%BUILD_VERSION%%/lex.m4 +share/aclocal%%BUILD_VERSION%%/lispdir.m4 +share/aclocal%%BUILD_VERSION%%/maintainer.m4 +share/aclocal%%BUILD_VERSION%%/make.m4 +share/aclocal%%BUILD_VERSION%%/minuso.m4 +share/aclocal%%BUILD_VERSION%%/missing.m4 +share/aclocal%%BUILD_VERSION%%/multi.m4 +share/aclocal%%BUILD_VERSION%%/obsol-gt.m4 +share/aclocal%%BUILD_VERSION%%/obsol-lt.m4 +share/aclocal%%BUILD_VERSION%%/obsolete.m4 +share/aclocal%%BUILD_VERSION%%/options.m4 +share/aclocal%%BUILD_VERSION%%/protos.m4 +share/aclocal%%BUILD_VERSION%%/python.m4 +share/aclocal%%BUILD_VERSION%%/regex.m4 +share/aclocal%%BUILD_VERSION%%/runlog.m4 +share/aclocal%%BUILD_VERSION%%/sanity.m4 +share/aclocal%%BUILD_VERSION%%/strip.m4 +share/automake%%BUILD_VERSION%%/Automake/Channels.pm +share/automake%%BUILD_VERSION%%/Automake/General.pm +share/automake%%BUILD_VERSION%%/Automake/Struct.pm +share/automake%%BUILD_VERSION%%/Automake/XFile.pm +share/automake%%BUILD_VERSION%%/COPYING +share/automake%%BUILD_VERSION%%/INSTALL +share/automake%%BUILD_VERSION%%/acinstall +share/automake%%BUILD_VERSION%%/am/ansi2knr.am +share/automake%%BUILD_VERSION%%/am/check.am +share/automake%%BUILD_VERSION%%/am/clean-hdr.am +share/automake%%BUILD_VERSION%%/am/clean.am +share/automake%%BUILD_VERSION%%/am/compile.am +share/automake%%BUILD_VERSION%%/am/configure.am +share/automake%%BUILD_VERSION%%/am/data.am +share/automake%%BUILD_VERSION%%/am/dejagnu.am +share/automake%%BUILD_VERSION%%/am/depend.am +share/automake%%BUILD_VERSION%%/am/depend2.am +share/automake%%BUILD_VERSION%%/am/distdir.am +share/automake%%BUILD_VERSION%%/am/footer.am +share/automake%%BUILD_VERSION%%/am/header-vars.am +share/automake%%BUILD_VERSION%%/am/header.am +share/automake%%BUILD_VERSION%%/am/install.am +share/automake%%BUILD_VERSION%%/am/java.am +share/automake%%BUILD_VERSION%%/am/lang-compile.am +share/automake%%BUILD_VERSION%%/am/lex.am +share/automake%%BUILD_VERSION%%/am/library.am +share/automake%%BUILD_VERSION%%/am/libs.am +share/automake%%BUILD_VERSION%%/am/libtool.am +share/automake%%BUILD_VERSION%%/am/lisp.am +share/automake%%BUILD_VERSION%%/am/ltlib.am +share/automake%%BUILD_VERSION%%/am/ltlibrary.am +share/automake%%BUILD_VERSION%%/am/mans-vars.am +share/automake%%BUILD_VERSION%%/am/mans.am +share/automake%%BUILD_VERSION%%/am/multilib.am +share/automake%%BUILD_VERSION%%/am/program.am +share/automake%%BUILD_VERSION%%/am/progs.am +share/automake%%BUILD_VERSION%%/am/python.am +share/automake%%BUILD_VERSION%%/am/remake-hdr.am +share/automake%%BUILD_VERSION%%/am/scripts.am +share/automake%%BUILD_VERSION%%/am/subdirs.am +share/automake%%BUILD_VERSION%%/am/tags.am +share/automake%%BUILD_VERSION%%/am/texi-vers.am +share/automake%%BUILD_VERSION%%/am/texibuild.am +share/automake%%BUILD_VERSION%%/am/texinfos.am +share/automake%%BUILD_VERSION%%/am/yacc.am +share/automake%%BUILD_VERSION%%/ansi2knr.1 +share/automake%%BUILD_VERSION%%/ansi2knr.c +share/automake%%BUILD_VERSION%%/compile +share/automake%%BUILD_VERSION%%/config.guess +share/automake%%BUILD_VERSION%%/config.sub +share/automake%%BUILD_VERSION%%/depcomp +share/automake%%BUILD_VERSION%%/elisp-comp +share/automake%%BUILD_VERSION%%/install-sh +share/automake%%BUILD_VERSION%%/mdate-sh +share/automake%%BUILD_VERSION%%/missing +share/automake%%BUILD_VERSION%%/mkinstalldirs +share/automake%%BUILD_VERSION%%/py-compile +share/automake%%BUILD_VERSION%%/texinfo.tex +share/automake%%BUILD_VERSION%%/ylwrap +@dirrm share/aclocal%%BUILD_VERSION%% +@dirrm share/automake%%BUILD_VERSION%%/Automake +@dirrm share/automake%%BUILD_VERSION%%/am +@dirrm share/automake%%BUILD_VERSION%% diff --git a/devel/gnu-automake/Makefile b/devel/gnu-automake/Makefile index bff17961e46e..babd4fff2357 100644 --- a/devel/gnu-automake/Makefile +++ b/devel/gnu-automake/Makefile @@ -5,9 +5,8 @@ # $FreeBSD$ # -PORTNAME= automake17 -PORTVERSION= 1.7.2 -PORTEPOCH= 1 +PORTNAME= automake +PORTVERSION= 1.7.5 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= automake @@ -16,15 +15,20 @@ DISTNAME= automake-${PORTVERSION} MAINTAINER= ade@FreeBSD.org COMMENT= GNU automake generates input files for GNU autoconf -BROKEN= Needs at least autoconf 254 to build. +BUILD_DEPENDS= autoconf257:${PORTSDIR}/devel/autoconf257 +RUN_DEPENDS= autoconf257:${PORTSDIR}/devel/autoconf257 +BUILD_VERSION= -1.7 +PLIST_SUB= BUILD_VERSION=${BUILD_VERSION} +LATEST_LINK= automake${BUILD_VERSION} +USE_BZIP2= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= PERL=${PERL5} +CONFIGURE_ENV= AUTOCONF=autoconf257 AUTOHEADER=autoheader257 +CONFIGURE_ARGS= --program-suffix=${BUILD_VERSION} +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= yes -STRIP= # none - .if defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) pre-everything:: @${ECHO} =========================================================== @@ -35,20 +39,12 @@ pre-everything:: @${FALSE} .endif # defined(USE_AUTOMAKE) || defined(USE_AUTOMAKE_VER) -pre-configure: - @${REINPLACE_CMD} -i -e "s,%%X11BASE%%,${X11BASE}," \ - ${WRKSRC}/aclocal.in - -pre-install: - ${RM} -fr ${PREFIX}/libexec/automake17 - ${MKDIR} ${PREFIX}/libexec/automake17 - -post-install: -.for i in aclocal automake - ${LN} -sf ${PREFIX}/bin/${i}17 \ - ${PREFIX}/libexec/automake17/${i} -.endfor - @install-info ${PREFIX}/info/automake17.info \ - ${PREFIX}/info/dir +post-patch: + @(cd ${WRKSRC} && \ + ${RM} -f *.info && \ + ${MV} automake.texi automake${BUILD_VERSION}.texi && \ + ${REINPLACE_CMD} -E 's,(automake)\.(info),\1${BUILD_VERSION}\.\2,g' automake${BUILD_VERSION}.texi && \ + ${REINPLACE_CMD} -E 's,(automake)\.(info|texi),\1${BUILD_VERSION}\.\2,g ; \ + s,^.+ install-exec-hook$$,,' Makefile.in) .include <bsd.port.mk> diff --git a/devel/gnu-automake/distinfo b/devel/gnu-automake/distinfo index 6edacae01f05..e07b6fcf6a67 100644 --- a/devel/gnu-automake/distinfo +++ b/devel/gnu-automake/distinfo @@ -1 +1 @@ -MD5 (automake-1.7.2.tar.gz) = 753647afe9db0ec52c69c6b9bb7dd106 +MD5 (automake-1.7.5.tar.bz2) = 21c51ad339224c5862d5abd23121c362 diff --git a/devel/gnu-automake/files/patch-Makefile.in b/devel/gnu-automake/files/patch-Makefile.in deleted file mode 100644 index a36c0e6bba5d..000000000000 --- a/devel/gnu-automake/files/patch-Makefile.in +++ /dev/null @@ -1,124 +0,0 @@ ---- 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/gnu-automake/files/patch-aclocal.in b/devel/gnu-automake/files/patch-aclocal.in deleted file mode 100644 index 0740a6dda4f9..000000000000 --- a/devel/gnu-automake/files/patch-aclocal.in +++ /dev/null @@ -1,63 +0,0 @@ ---- 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/gnu-automake/files/patch-automake.in b/devel/gnu-automake/files/patch-automake.in deleted file mode 100644 index f9500dbe28a3..000000000000 --- a/devel/gnu-automake/files/patch-automake.in +++ /dev/null @@ -1,20 +0,0 @@ ---- 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/gnu-automake/files/patch-automake.texi b/devel/gnu-automake/files/patch-automake.texi deleted file mode 100644 index cce4740d30ae..000000000000 --- a/devel/gnu-automake/files/patch-automake.texi +++ /dev/null @@ -1,28 +0,0 @@ ---- 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/gnu-automake/files/patch-configure b/devel/gnu-automake/files/patch-configure deleted file mode 100644 index 4d8692f078e3..000000000000 --- a/devel/gnu-automake/files/patch-configure +++ /dev/null @@ -1,32 +0,0 @@ ---- 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/gnu-automake/files/patch-m4-Makefile.in b/devel/gnu-automake/files/patch-m4-Makefile.in deleted file mode 100644 index 4c336333e5e1..000000000000 --- a/devel/gnu-automake/files/patch-m4-Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 \ diff --git a/devel/gnu-automake/pkg-plist b/devel/gnu-automake/pkg-plist index e46339fdbef7..a7f80f4a2792 100644 --- a/devel/gnu-automake/pkg-plist +++ b/devel/gnu-automake/pkg-plist @@ -1,101 +1,98 @@ -@comment $FreeBSD$ -bin/aclocal17 -bin/automake17 -@unexec install-info --delete %D/info/automake17.info %D/info/dir -info/automake17.info -@exec install-info %D/info/automake17.info %D/info/dir -libexec/automake17/aclocal -libexec/automake17/automake -share/aclocal17/amversion.m4 -share/aclocal17/as.m4 -share/aclocal17/auxdir.m4 -share/aclocal17/ccstdc.m4 -share/aclocal17/cond.m4 -share/aclocal17/depend.m4 -share/aclocal17/depout.m4 -share/aclocal17/dmalloc.m4 -share/aclocal17/gcj.m4 -share/aclocal17/header.m4 -share/aclocal17/init.m4 -share/aclocal17/install-sh.m4 -share/aclocal17/lex.m4 -share/aclocal17/lispdir.m4 -share/aclocal17/maintainer.m4 -share/aclocal17/make.m4 -share/aclocal17/minuso.m4 -share/aclocal17/missing.m4 -share/aclocal17/multi.m4 -share/aclocal17/obsol-gt.m4 -share/aclocal17/obsol-lt.m4 -share/aclocal17/obsolete.m4 -share/aclocal17/options.m4 -share/aclocal17/protos.m4 -share/aclocal17/python.m4 -share/aclocal17/regex.m4 -share/aclocal17/runlog.m4 -share/aclocal17/sanity.m4 -share/aclocal17/strip.m4 -share/automake17/Automake/Channels.pm -share/automake17/Automake/General.pm -share/automake17/Automake/Struct.pm -share/automake17/Automake/XFile.pm -share/automake17/COPYING -share/automake17/INSTALL -share/automake17/acinstall -share/automake17/am/ansi2knr.am -share/automake17/am/check.am -share/automake17/am/clean-hdr.am -share/automake17/am/clean.am -share/automake17/am/compile.am -share/automake17/am/configure.am -share/automake17/am/data.am -share/automake17/am/dejagnu.am -share/automake17/am/depend.am -share/automake17/am/depend2.am -share/automake17/am/distdir.am -share/automake17/am/footer.am -share/automake17/am/header-vars.am -share/automake17/am/header.am -share/automake17/am/install.am -share/automake17/am/java.am -share/automake17/am/lang-compile.am -share/automake17/am/lex.am -share/automake17/am/library.am -share/automake17/am/libs.am -share/automake17/am/libtool.am -share/automake17/am/lisp.am -share/automake17/am/ltlib.am -share/automake17/am/ltlibrary.am -share/automake17/am/mans-vars.am -share/automake17/am/mans.am -share/automake17/am/multilib.am -share/automake17/am/program.am -share/automake17/am/progs.am -share/automake17/am/python.am -share/automake17/am/remake-hdr.am -share/automake17/am/scripts.am -share/automake17/am/subdirs.am -share/automake17/am/tags.am -share/automake17/am/texi-vers.am -share/automake17/am/texibuild.am -share/automake17/am/texinfos.am -share/automake17/am/yacc.am -share/automake17/ansi2knr.1 -share/automake17/ansi2knr.c -share/automake17/compile -share/automake17/config.guess -share/automake17/config.sub -share/automake17/depcomp -share/automake17/elisp-comp -share/automake17/install-sh -share/automake17/mdate-sh -share/automake17/missing -share/automake17/mkinstalldirs -share/automake17/py-compile -share/automake17/texinfo.tex -share/automake17/ylwrap -@dirrm libexec/automake17 -@dirrm share/aclocal17 -@dirrm share/automake17/Automake -@dirrm share/automake17/am -@dirrm share/automake17 +bin/aclocal%%BUILD_VERSION%% +bin/automake%%BUILD_VERSION%% +@unexec install-info --delete %D/info/automake%%BUILD_VERSION%%.info %D/info/dir +info/automake%%BUILD_VERSION%%.info +@exec install-info %D/info/automake%%BUILD_VERSION%%.info %D/info/dir +share/aclocal%%BUILD_VERSION%%/amversion.m4 +share/aclocal%%BUILD_VERSION%%/as.m4 +share/aclocal%%BUILD_VERSION%%/auxdir.m4 +share/aclocal%%BUILD_VERSION%%/ccstdc.m4 +share/aclocal%%BUILD_VERSION%%/cond.m4 +share/aclocal%%BUILD_VERSION%%/depend.m4 +share/aclocal%%BUILD_VERSION%%/depout.m4 +share/aclocal%%BUILD_VERSION%%/dmalloc.m4 +share/aclocal%%BUILD_VERSION%%/gcj.m4 +share/aclocal%%BUILD_VERSION%%/header.m4 +share/aclocal%%BUILD_VERSION%%/init.m4 +share/aclocal%%BUILD_VERSION%%/install-sh.m4 +share/aclocal%%BUILD_VERSION%%/lead-dot.m4 +share/aclocal%%BUILD_VERSION%%/lex.m4 +share/aclocal%%BUILD_VERSION%%/lispdir.m4 +share/aclocal%%BUILD_VERSION%%/maintainer.m4 +share/aclocal%%BUILD_VERSION%%/make.m4 +share/aclocal%%BUILD_VERSION%%/minuso.m4 +share/aclocal%%BUILD_VERSION%%/missing.m4 +share/aclocal%%BUILD_VERSION%%/multi.m4 +share/aclocal%%BUILD_VERSION%%/obsol-gt.m4 +share/aclocal%%BUILD_VERSION%%/obsol-lt.m4 +share/aclocal%%BUILD_VERSION%%/obsolete.m4 +share/aclocal%%BUILD_VERSION%%/options.m4 +share/aclocal%%BUILD_VERSION%%/protos.m4 +share/aclocal%%BUILD_VERSION%%/python.m4 +share/aclocal%%BUILD_VERSION%%/regex.m4 +share/aclocal%%BUILD_VERSION%%/runlog.m4 +share/aclocal%%BUILD_VERSION%%/sanity.m4 +share/aclocal%%BUILD_VERSION%%/strip.m4 +share/automake%%BUILD_VERSION%%/Automake/Channels.pm +share/automake%%BUILD_VERSION%%/Automake/General.pm +share/automake%%BUILD_VERSION%%/Automake/Struct.pm +share/automake%%BUILD_VERSION%%/Automake/XFile.pm +share/automake%%BUILD_VERSION%%/COPYING +share/automake%%BUILD_VERSION%%/INSTALL +share/automake%%BUILD_VERSION%%/acinstall +share/automake%%BUILD_VERSION%%/am/ansi2knr.am +share/automake%%BUILD_VERSION%%/am/check.am +share/automake%%BUILD_VERSION%%/am/clean-hdr.am +share/automake%%BUILD_VERSION%%/am/clean.am +share/automake%%BUILD_VERSION%%/am/compile.am +share/automake%%BUILD_VERSION%%/am/configure.am +share/automake%%BUILD_VERSION%%/am/data.am +share/automake%%BUILD_VERSION%%/am/dejagnu.am +share/automake%%BUILD_VERSION%%/am/depend.am +share/automake%%BUILD_VERSION%%/am/depend2.am +share/automake%%BUILD_VERSION%%/am/distdir.am +share/automake%%BUILD_VERSION%%/am/footer.am +share/automake%%BUILD_VERSION%%/am/header-vars.am +share/automake%%BUILD_VERSION%%/am/header.am +share/automake%%BUILD_VERSION%%/am/install.am +share/automake%%BUILD_VERSION%%/am/java.am +share/automake%%BUILD_VERSION%%/am/lang-compile.am +share/automake%%BUILD_VERSION%%/am/lex.am +share/automake%%BUILD_VERSION%%/am/library.am +share/automake%%BUILD_VERSION%%/am/libs.am +share/automake%%BUILD_VERSION%%/am/libtool.am +share/automake%%BUILD_VERSION%%/am/lisp.am +share/automake%%BUILD_VERSION%%/am/ltlib.am +share/automake%%BUILD_VERSION%%/am/ltlibrary.am +share/automake%%BUILD_VERSION%%/am/mans-vars.am +share/automake%%BUILD_VERSION%%/am/mans.am +share/automake%%BUILD_VERSION%%/am/multilib.am +share/automake%%BUILD_VERSION%%/am/program.am +share/automake%%BUILD_VERSION%%/am/progs.am +share/automake%%BUILD_VERSION%%/am/python.am +share/automake%%BUILD_VERSION%%/am/remake-hdr.am +share/automake%%BUILD_VERSION%%/am/scripts.am +share/automake%%BUILD_VERSION%%/am/subdirs.am +share/automake%%BUILD_VERSION%%/am/tags.am +share/automake%%BUILD_VERSION%%/am/texi-vers.am +share/automake%%BUILD_VERSION%%/am/texibuild.am +share/automake%%BUILD_VERSION%%/am/texinfos.am +share/automake%%BUILD_VERSION%%/am/yacc.am +share/automake%%BUILD_VERSION%%/ansi2knr.1 +share/automake%%BUILD_VERSION%%/ansi2knr.c +share/automake%%BUILD_VERSION%%/compile +share/automake%%BUILD_VERSION%%/config.guess +share/automake%%BUILD_VERSION%%/config.sub +share/automake%%BUILD_VERSION%%/depcomp +share/automake%%BUILD_VERSION%%/elisp-comp +share/automake%%BUILD_VERSION%%/install-sh +share/automake%%BUILD_VERSION%%/mdate-sh +share/automake%%BUILD_VERSION%%/missing +share/automake%%BUILD_VERSION%%/mkinstalldirs +share/automake%%BUILD_VERSION%%/py-compile +share/automake%%BUILD_VERSION%%/texinfo.tex +share/automake%%BUILD_VERSION%%/ylwrap +@dirrm share/aclocal%%BUILD_VERSION%% +@dirrm share/automake%%BUILD_VERSION%%/Automake +@dirrm share/automake%%BUILD_VERSION%%/am +@dirrm share/automake%%BUILD_VERSION%% |