Update autoconf to 2.69 and automake to 1.12

PR:		166836
Tested by:	Multiple -exp runs (pav)

6 files changed, 36 insertions, 15 deletions

diff --git a/deskutils/kmatrix3d/Makefile b/deskutils/kmatrix3d/Makefile
index 2e97b169cb9d..614a194852c6 100644
--- a/deskutils/kmatrix3d/Makefile
+++ b/deskutils/kmatrix3d/Makefile
@@ -26,6 +26,8 @@ USE_KDELIBS_VER=	3
 USE_BZIP2=		yes
 USE_PERL5_BUILD=	yes
 
+AUTOTOOLSFILES=		admin/cvs.sh
+
 pre-configure:
 	cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${MAKE} -f admin/Makefile.common
 
diff --git a/deskutils/kmatrix3d/files/patch-admin__cvs.sh b/deskutils/kmatrix3d/files/patch-admin__cvs.sh
index 0846008c3eb0..02b9d2ec7ff1 100644
--- a/deskutils/kmatrix3d/files/patch-admin__cvs.sh
+++ b/deskutils/kmatrix3d/files/patch-admin__cvs.sh
@@ -1,7 +1,12 @@
---- admin/cvs.sh.orig	2007-01-27 02:25:03.000000000 -0600
-+++ admin/cvs.sh	2010-10-07 09:17:32.000000000 -0500
-@@ -70,3 +70,3 @@
-     ;;
+--- admin/cvs.sh.orig	2007-01-27 00:25:03.000000000 -0800
++++ admin/cvs.sh	2012-04-24 09:20:18.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.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.11* )
++  automake*%%AUTOMAKE_VERSION%%* )
      echo "*** $AUTOMAKE_STRING found."
diff --git a/deskutils/ksmoothdock/Makefile b/deskutils/ksmoothdock/Makefile
index ffe172521699..4d123b56d1bb 100644
--- a/deskutils/ksmoothdock/Makefile
+++ b/deskutils/ksmoothdock/Makefile
@@ -24,6 +24,8 @@ GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_PERL5_BUILD=yes
 
+AUTOTOOLSFILES=	admin/cvs.sh
+
 pre-configure:
 	@cd ${WRKSRC}/admin && ${RM} -f ltmain.sh && ${CP} -f ${LTMAIN} .
 	@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} -f admin/Makefile.common
diff --git a/deskutils/ksmoothdock/files/patch-admin__cvs.sh b/deskutils/ksmoothdock/files/patch-admin__cvs.sh
index 8b25d1c032d0..c9aa352b5735 100644
--- a/deskutils/ksmoothdock/files/patch-admin__cvs.sh
+++ b/deskutils/ksmoothdock/files/patch-admin__cvs.sh
@@ -1,7 +1,12 @@
---- admin/cvs.sh.orig	2007-04-16 18:39:49.000000000 -0500
-+++ admin/cvs.sh	2010-10-02 14:07:16.000000000 -0500
-@@ -70,3 +70,3 @@
-     ;;
+--- admin/cvs.sh.orig	2007-04-16 16:39:49.000000000 -0700
++++ admin/cvs.sh	2012-04-24 09:21:24.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/deskutils/taskjuggler/Makefile b/deskutils/taskjuggler/Makefile
index f07892490b25..8fc080741558 100644
--- a/deskutils/taskjuggler/Makefile
+++ b/deskutils/taskjuggler/Makefile
@@ -36,6 +36,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_CFLAGS}
 CONFIGURE_ARGS=	--with-docdir=${EXAMPLESDIR}/
 USE_LDCONFIG=	yes
 
+AUTOTOOLSFILES=	admin/cvs.sh
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITHOUT_DOCS)
diff --git a/deskutils/taskjuggler/files/patch-admin_cvs.sh b/deskutils/taskjuggler/files/patch-admin_cvs.sh
index f8a852bbab64..e29083c6402f 100644
--- a/deskutils/taskjuggler/files/patch-admin_cvs.sh
+++ b/deskutils/taskjuggler/files/patch-admin_cvs.sh
@@ -1,7 +1,12 @@
---- admin/cvs.sh.orig	2009-07-15 03:33:20.000000000 -0500
-+++ admin/cvs.sh	2010-10-02 14:13:26.000000000 -0500
-@@ -70,3 +70,3 @@
-     ;;
+--- admin/cvs.sh.orig	2009-07-15 01:33:20.000000000 -0700
++++ admin/cvs.sh	2012-04-24 09:22:32.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%%* ) : ;;
    "" )