From 6d726b6c09094afd97f1528cfff8b27850279b0d Mon Sep 17 00:00:00 2001 From: Ade Lovett Date: Fri, 11 May 2012 20:38:09 +0000 Subject: Update autoconf to 2.69 and automake to 1.12 PR: 166836 Tested by: Multiple -exp runs (pav) --- mail/kshowmail/Makefile | 2 ++ mail/kshowmail/files/patch-admin-cvs.sh | 15 ++++++++++----- mail/mutt-devel/files/patch-configure.ac | 9 +++++++++ mail/mutt/files/patch-configure.in | 17 ++++++++++------- mail/mutt14/files/patch-configure.in | 17 ++++++++++------- 5 files changed, 41 insertions(+), 19 deletions(-) create mode 100644 mail/mutt-devel/files/patch-configure.ac (limited to 'mail') diff --git a/mail/kshowmail/Makefile b/mail/kshowmail/Makefile index d5f9b4bb3f95..fbbb57117636 100644 --- a/mail/kshowmail/Makefile +++ b/mail/kshowmail/Makefile @@ -21,6 +21,8 @@ USE_GMAKE= yes USE_AUTOTOOLS= autoconf:env automake:env libtool:env GNU_CONFIGURE= yes +AUTOTOOLSFILES= admin/cvs.sh + .include pre-configure: diff --git a/mail/kshowmail/files/patch-admin-cvs.sh b/mail/kshowmail/files/patch-admin-cvs.sh index b62efbb3b767..465a8ff8a5a8 100644 --- a/mail/kshowmail/files/patch-admin-cvs.sh +++ b/mail/kshowmail/files/patch-admin-cvs.sh @@ -1,7 +1,12 @@ ---- admin/cvs.sh.orig 2007-05-17 13:12:38.000000000 -0500 -+++ admin/cvs.sh 2010-10-02 14:47:03.000000000 -0500 -@@ -70,3 +70,3 @@ - ;; +--- admin/cvs.sh.orig 2007-05-17 11:12:38.000000000 -0700 ++++ admin/cvs.sh 2012-04-24 09:23:49.000000000 -0700 +@@ -65,8 +65,3 @@ + case $AUTOMAKE_STRING in +- automake*1.5d* | automake*1.5* | automake*1.5-* ) +- echo "*** YOU'RE USING $AUTOMAKE_STRING." +- echo "*** KDE requires automake $required_automake_version" +- exit 1 +- ;; - automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) -+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* ) ++ automake*%%AUTOMAKE_VERSION%%* ) echo "*** $AUTOMAKE_STRING found." diff --git a/mail/mutt-devel/files/patch-configure.ac b/mail/mutt-devel/files/patch-configure.ac new file mode 100644 index 000000000000..993e53daf38d --- /dev/null +++ b/mail/mutt-devel/files/patch-configure.ac @@ -0,0 +1,9 @@ +--- configure.ac.orig 2010-08-24 09:34:21.000000000 -0700 ++++ configure.ac 2012-05-03 18:14:34.000000000 -0700 +@@ -29,6 +29,2 @@ + AC_ISC_POSIX +-AM_C_PROTOTYPES +-if test "x$U" != "x"; then +- AC_MSG_ERROR(Compiler not ANSI compliant) +-fi + AC_PROG_CPP diff --git a/mail/mutt/files/patch-configure.in b/mail/mutt/files/patch-configure.in index 4e27667bfdd9..e255741da094 100644 --- a/mail/mutt/files/patch-configure.in +++ b/mail/mutt/files/patch-configure.in @@ -1,11 +1,14 @@ ---- configure.in.orig Mon Nov 11 14:11:26 2002 -+++ configure.in Mon Nov 11 14:12:09 2002 -@@ -625,7 +625,7 @@ - fi]) - +--- configure.in.orig 2007-05-26 17:58:12.000000000 -0700 ++++ configure.in 2012-05-03 18:04:49.000000000 -0700 +@@ -31,6 +31,2 @@ + AC_ISC_POSIX +-AM_C_PROTOTYPES +-if test "x$U" != "x"; then +- AC_MSG_ERROR(Compiler not ANSI compliant) +-fi + AC_PROG_CPP +@@ -629,3 +625,3 @@ if test x$GCC = xyes -a $mutt_cv_warnings = yes; then - CFLAGS="-Wall -pedantic $CFLAGS" + CFLAGS="-Wall $CFLAGS" fi - - AC_ARG_ENABLE(nfs-fix, [ --enable-nfs-fix Work around an NFS with broken attributes caching ], diff --git a/mail/mutt14/files/patch-configure.in b/mail/mutt14/files/patch-configure.in index 4e27667bfdd9..e255741da094 100644 --- a/mail/mutt14/files/patch-configure.in +++ b/mail/mutt14/files/patch-configure.in @@ -1,11 +1,14 @@ ---- configure.in.orig Mon Nov 11 14:11:26 2002 -+++ configure.in Mon Nov 11 14:12:09 2002 -@@ -625,7 +625,7 @@ - fi]) - +--- configure.in.orig 2007-05-26 17:58:12.000000000 -0700 ++++ configure.in 2012-05-03 18:04:49.000000000 -0700 +@@ -31,6 +31,2 @@ + AC_ISC_POSIX +-AM_C_PROTOTYPES +-if test "x$U" != "x"; then +- AC_MSG_ERROR(Compiler not ANSI compliant) +-fi + AC_PROG_CPP +@@ -629,3 +625,3 @@ if test x$GCC = xyes -a $mutt_cv_warnings = yes; then - CFLAGS="-Wall -pedantic $CFLAGS" + CFLAGS="-Wall $CFLAGS" fi - - AC_ARG_ENABLE(nfs-fix, [ --enable-nfs-fix Work around an NFS with broken attributes caching ], -- cgit v1.2.3