Round one migration of ports from automake{19,110} to automake111

3 files changed, 18 insertions, 23 deletions

diff --git a/x11-themes/kdmtheme/Makefile b/x11-themes/kdmtheme/Makefile
index cf24dfcdb49c..e82a99d4ee5b 100644
--- a/x11-themes/kdmtheme/Makefile
+++ b/x11-themes/kdmtheme/Makefile
@@ -18,7 +18,7 @@ COMMENT=	KDM Theme Manager
 USE_KDEBASE_VER=3
 USE_BZIP2=	yes
 USE_PERL5_BUILD=yes
-USE_AUTOTOOLS=	automake:19:env autoconf:267:env libtool:22 autoheader:267:env
+USE_AUTOTOOLS=	automake:111:env autoconf:267:env libtool:22 autoheader:267:env
 USE_GMAKE=	yes
 
 pre-configure:
diff --git a/x11-themes/kdmtheme/files/patch-admin__cvs.sh b/x11-themes/kdmtheme/files/patch-admin__cvs.sh
index c51ca1bf9dbe..1847813fb3f8 100644
--- a/x11-themes/kdmtheme/files/patch-admin__cvs.sh
+++ b/x11-themes/kdmtheme/files/patch-admin__cvs.sh
@@ -1,20 +1,17 @@
---- ./admin/cvs.sh.orig	2006-11-10 01:42:52.000000000 +0300
-+++ ./admin/cvs.sh	2007-12-17 21:13:50.000000000 +0300
-@@ -32,7 +32,7 @@
- required_autoconf_version="2.53 or newer"
- AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
+--- admin/cvs.sh.orig	2006-11-09 16:42:52.000000000 -0600
++++ admin/cvs.sh	2010-09-28 11:40:53.000000000 -0500
+@@ -34,3 +34,3 @@
  case $AUTOCONF_VERSION in
 -  Autoconf*2.5* | autoconf*2.5* ) : ;;
-+  Autoconf*2.5* | autoconf*2.5* | autoconf*2.6*) : ;;
++  autoconf*2.6*) : ;;
    "" )
-     echo "*** AUTOCONF NOT FOUND!."
-     echo "*** KDE requires autoconf $required_autoconf_version"
-@@ -47,7 +47,7 @@
- 
- AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
+@@ -49,3 +49,3 @@
  case $AUTOHEADER_VERSION in
 -  Autoconf*2.5* | autoheader*2.5* ) : ;;
-+  Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
++  autoheader*2.6* ) : ;;
    "" )
-     echo "*** AUTOHEADER NOT FOUND!."
-     echo "*** KDE requires autoheader $required_autoconf_version"
+@@ -70,3 +70,3 @@
+     ;;
+-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*)
++  automake*1.11* )
+     echo "*** $AUTOMAKE_STRING found."
diff --git a/x11-themes/kdmtheme/files/patch-admin__detect-autoconf.sh b/x11-themes/kdmtheme/files/patch-admin__detect-autoconf.sh
index ff6bf4b82b82..824f0df462f7 100644
--- a/x11-themes/kdmtheme/files/patch-admin__detect-autoconf.sh
+++ b/x11-themes/kdmtheme/files/patch-admin__detect-autoconf.sh
@@ -1,11 +1,9 @@
---- ./admin/detect-autoconf.sh.orig	2006-11-10 01:42:52.000000000 +0300
-+++ ./admin/detect-autoconf.sh	2007-12-17 21:15:07.000000000 +0300
-@@ -10,7 +10,7 @@
- # Please add higher versions first. The last version number is the minimum
- # needed to compile KDE. Do not forget to include the name/version #
+--- admin/detect-autoconf.sh.orig	2006-11-09 16:42:52.000000000 -0600
++++ admin/detect-autoconf.sh	2010-09-28 11:41:11.000000000 -0500
+@@ -12,4 +12,4 @@
  # separator if one is present, e.g. -1.2 where - is the separator.
 -KDE_AUTOCONF_VERS="-2.58 -2.57 257 -2.54 -2.53a -2.53 -2.52 -2.5x"
-+KDE_AUTOCONF_VERS="-2.67 -2.58 -2.57 257 -2.54 -2.53a -2.53 -2.52 -2.5x"
- KDE_AUTOMAKE_VERS="-1.7 17 -1.6"
+-KDE_AUTOMAKE_VERS="-1.7 17 -1.6"
++KDE_AUTOCONF_VERS="-2.67"
++KDE_AUTOMAKE_VERS="-1.11"
  
- # We don't use variable here for remembering the type ... strings. Local