Here is an update to automake 1.11.3. Tested with everything in the tree using 1.11.
Index: Makefile =================================================================== RCS file: /home/cvs/ports/devel/automake/1.11/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- Makefile 20 Jun 2011 20:28:44 -0000 1.5 +++ Makefile 17 Feb 2012 06:37:39 -0000 @@ -3,8 +3,7 @@ COMMENT= GNU standards-compliant Makefile generator VERSION= 1.11 -DISTNAME= automake-${VERSION}.1 -REVISION= 2 +DISTNAME= automake-${VERSION}.3 PKGSPEC= automake->=${VERSION},<1.12 CATEGORIES= devel @@ -23,7 +22,7 @@ MODULES= lang/python MODPY_BUILDDEP= No MODPY_RUNDEP= No -AUTOCONF_VERSION= 2.65 +AUTOCONF_VERSION= 2.68 BUILD_DEPENDS = ${RUN_DEPENDS} RUN_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} @@ -48,14 +47,13 @@ REGRESS_DEPENDS= ${BASE_PKGPATH} \ editors/emacs21 \ devel/dejagnu -TESTS_ENVIRONMENT= AUTOCONF_VERSION=${AUTOCONF_VERSION} \ +REGRESS_ENV= AUTOCONF_VERSION=${AUTOCONF_VERSION} \ MAKE=${GMAKE} do-regress: ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python @cd ${WRKBUILD} && \ - exec ${SETENV} ${MAKE_ENV} \ - TESTS_ENVIRONMENT="${TESTS_ENVIRONMENT}" \ + exec ${SETENV} ${MAKE_ENV} ${REGRESS_ENV} \ ${MAKE_PROGRAM} ${ALL_REGRESS_FLAGS} \ -f ${MAKE_FILE} ${REGRESS_TARGET} @@ -69,7 +67,7 @@ post-install: perl -pi -e "s,aclocal\: \(automake\),aclocal: \(automake-1\.11\)," \ ${PREFIX}/info/automake${SUFFIX}.info -.for f in info-1 info-2 +.for f in info-1 info-2 info-3 cd ${PREFIX}/info && mv automake.${f} automake${SUFFIX}.${f} \ && perl -pi -e "s,automake.${f},automake${SUFFIX}.${f}," \ ${PREFIX}/info/automake${SUFFIX}.info Index: distinfo =================================================================== RCS file: /home/cvs/ports/devel/automake/1.11/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 5 May 2011 18:55:34 -0000 1.1.1.1 +++ distinfo 13 Feb 2012 00:49:25 -0000 @@ -1,5 +1,5 @@ -MD5 (automake-1.11.1.tar.gz) = Tufw/18ORn1Ytr1dqWscdA== -RMD160 (automake-1.11.1.tar.gz) = Ovo77cMb5Jn5PZz4xiLYSvqff+c= -SHA1 (automake-1.11.1.tar.gz) = 3GC4fXIM0mafPi4WWdkEs4MUnEA= -SHA256 (automake-1.11.1.tar.gz) = t7N8DA8JoobPVcrUCNdK75d3TXPXRMiMOW/3lXBF1Ms= -SIZE (automake-1.11.1.tar.gz) = 1383931 +MD5 (automake-1.11.3.tar.gz) = k+yzGfA2XLgBmQsA9ljQJg== +RMD160 (automake-1.11.3.tar.gz) = vUuJgbRaaacCvQ+VC/zsBxfP9FU= +SHA1 (automake-1.11.3.tar.gz) = U39ZZLt+x9DfZUTj0Q2WMf50YPA= +SHA256 (automake-1.11.3.tar.gz) = khtRiAV+V73ZwLoG4h0LDqfa+mGpvQiisEEhW8/xL1U= +SIZE (automake-1.11.3.tar.gz) = 1620860 Index: patches/patch-automake_in =================================================================== RCS file: /home/cvs/ports/devel/automake/1.11/patches/patch-automake_in,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-automake_in --- patches/patch-automake_in 5 May 2011 18:55:34 -0000 1.1.1.1 +++ patches/patch-automake_in 17 Feb 2012 03:28:21 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-automake_in,v 1.1.1.1 2011/05/05 18:55:34 jasper Exp $ ---- automake.in.orig Tue Dec 8 19:15:40 2009 -+++ automake.in Thu May 5 19:57:31 2011 -@@ -4337,7 +4337,7 @@ sub handle_configure ($$$@) +--- automake.in.orig Wed Feb 1 05:31:13 2012 ++++ automake.in Thu Feb 16 22:24:10 2012 +@@ -4384,7 +4384,7 @@ sub handle_configure ($$$@) # Use $(install_sh), not $(MKDIR_P) because the latter requires # at least one argument, and $(mkinstalldirs) used to work # even without arguments (e.g. $(mkinstalldirs) $(conditional_dir)). @@ -10,7 +10,7 @@ $OpenBSD: patch-automake_in,v 1.1.1.1 20 } reject_var ('CONFIG_HEADER', -@@ -5240,6 +5240,7 @@ sub scan_autoconf_traces ($) +@@ -5337,6 +5337,7 @@ sub scan_autoconf_traces ($) _LT_AC_TAGCONFIG => 0, m4_include => 1, m4_sinclude => 1, @@ -18,7 +18,7 @@ $OpenBSD: patch-automake_in,v 1.1.1.1 20 sinclude => 1, ); -@@ -5263,6 +5264,7 @@ sub scan_autoconf_traces ($) +@@ -5360,6 +5361,7 @@ sub scan_autoconf_traces ($) my ($here, $depth, @args) = split (/::/); $where = new Automake::Location $here; my $macro = $args[0]; Index: patches/patch-doc_automake_texi =================================================================== RCS file: /home/cvs/ports/devel/automake/1.11/patches/patch-doc_automake_texi,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-doc_automake_texi --- patches/patch-doc_automake_texi 5 May 2011 18:55:34 -0000 1.1.1.1 +++ patches/patch-doc_automake_texi 17 Feb 2012 03:28:30 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-doc_automake_texi,v 1.1.1.1 2011/05/05 18:55:34 jasper Exp $ ---- doc/automake.texi.orig Tue Dec 8 19:15:40 2009 -+++ doc/automake.texi Thu May 5 19:57:31 2011 +--- doc/automake.texi.orig Wed Feb 1 05:40:23 2012 ++++ doc/automake.texi Thu Feb 16 22:28:14 2012 @@ -1,7 +1,8 @@ \input texinfo @c -*-texinfo-*- @c %**start of header @@ -12,8 +12,8 @@ $OpenBSD: patch-doc_automake_texi,v 1.1. @setchapternewpage off @c %**end of header -@@ -40,13 +41,13 @@ section entitled ``@acronym{GNU} Free Documentation Li - @c (Autoconf has a similar setup.) +@@ -40,13 +41,13 @@ section entitled ``GNU Free Documentation License.'' + @dircategory Software development @direntry -* Automake: (automake). Making GNU standards-compliant Makefiles. @@ -22,10 +22,10 @@ $OpenBSD: patch-doc_automake_texi,v 1.1. @dircategory Individual utilities @direntry --* aclocal: (automake)Invoking aclocal. Generating aclocal.m4. --* automake: (automake)Invoking Automake. Generating Makefile.in. -+* aclocal${SUFFIX}: (automake${SUFFIX})Invoking aclocal. Generating aclocal.m4. -+* automake${SUFFIX}: (automake${SUFFIX})Invoking automake. Generating Makefile.in. +-* aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4. +-* automake-invocation: (automake)automake Invocation. Generating Makefile.in. ++* aclocal${SUFFIX}: (automake${SUFFIX})aclocal Invocation. Generating aclocal.m4. ++* automake${SUFFIX}: (automake${SUFFIX})automake Invocation. Generating Makefile.in. @end direntry @titlepage Index: patches/patch-m4_python_m4 =================================================================== RCS file: patches/patch-m4_python_m4 diff -N patches/patch-m4_python_m4 --- patches/patch-m4_python_m4 20 Jun 2011 20:28:44 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-m4_python_m4,v 1.1 2011/06/20 20:28:44 robert Exp $ ---- m4/python.m4.orig Tue Dec 8 13:02:32 2009 -+++ m4/python.m4 Wed Jun 15 15:46:57 2011 -@@ -37,7 +37,7 @@ AC_DEFUN([AM_PATH_PYTHON], - dnl Find a Python interpreter. Python versions prior to 2.0 are not - dnl supported. (2.0 was released on October 16, 2000). - m4_define_default([_AM_PYTHON_INTERPRETER_LIST], -- [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl -+ [python python2 python3 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 dnl - python2.1 python2.0]) - - m4_if([$1],[],[ Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/devel/automake/1.11/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 5 May 2011 18:55:34 -0000 1.1.1.1 +++ pkg/PLIST 17 Feb 2012 03:31:19 -0000 @@ -6,9 +6,12 @@ bin/aclocal${SUFFIX} bin/automake${SUFFIX} @info info/automake${SUFFIX}.info @man man/man1/aclocal${SUFFIX}.1 +@comment @man man/man1/aclocal.1 @man man/man1/automake${SUFFIX}.1 +@comment @man man/man1/automake.1 share/aclocal${SUFFIX}/ share/aclocal${SUFFIX}/amversion.m4 +share/aclocal${SUFFIX}/ar-lib.m4 share/aclocal${SUFFIX}/as.m4 share/aclocal${SUFFIX}/auxdir.m4 share/aclocal${SUFFIX}/ccstdc.m4 @@ -55,6 +58,7 @@ share/automake${SUFFIX}/Automake/Configu share/automake${SUFFIX}/Automake/DisjConditions.pm share/automake${SUFFIX}/Automake/FileUtils.pm share/automake${SUFFIX}/Automake/General.pm +share/automake${SUFFIX}/Automake/Getopt.pm share/automake${SUFFIX}/Automake/Item.pm share/automake${SUFFIX}/Automake/ItemDef.pm share/automake${SUFFIX}/Automake/Location.pm @@ -72,6 +76,7 @@ share/automake${SUFFIX}/INSTALL share/automake${SUFFIX}/acinstall share/automake${SUFFIX}/am/ share/automake${SUFFIX}/am/ansi2knr.am +share/automake${SUFFIX}/am/check-html.am share/automake${SUFFIX}/am/check.am share/automake${SUFFIX}/am/check2.am share/automake${SUFFIX}/am/clean-hdr.am @@ -114,6 +119,7 @@ share/automake${SUFFIX}/am/vala.am share/automake${SUFFIX}/am/yacc.am share/automake${SUFFIX}/ansi2knr.1 share/automake${SUFFIX}/ansi2knr.c +share/automake${SUFFIX}/ar-lib share/automake${SUFFIX}/compile share/automake${SUFFIX}/config-ml.in share/automake${SUFFIX}/config.guess -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.