Update to 1.2.2 (backported from KDE4)

4 files changed, 41 insertions, 7 deletions

diff --git a/x11-themes/kdmtheme/Makefile b/x11-themes/kdmtheme/Makefile
index 6e8a999b2fee..6656e7273796 100644
--- a/x11-themes/kdmtheme/Makefile
+++ b/x11-themes/kdmtheme/Makefile
@@ -6,20 +6,23 @@
 #
 
 PORTNAME=	kdmtheme
-PORTVERSION=	1.1.3
-PORTREVISION=	3
+PORTVERSION=	1.2.2
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://beta.smileaf.org/files/kdmtheme/ \
 		${MASTER_SITE_GENTOO:S/%SUBDIR%/distfiles/}
 
-MAINTAINER=	makc@issp.ac.ru
+MAINTAINER=	makc@FreeBSD.org
 COMMENT=	KDM Theme Manager
 
 USE_KDEBASE_VER=3
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_PERL5_BUILD=yes
+USE_AUTOTOOLS=	automake:19:env autoconf:262:env libtool:15
 USE_GMAKE=	yes
 
+pre-configure:
+	@(cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${SH} admin/cvs.sh dist)
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/x11-themes/kdmtheme/distinfo b/x11-themes/kdmtheme/distinfo
index a0603e9fd368..4b82d76f9240 100644
--- a/x11-themes/kdmtheme/distinfo
+++ b/x11-themes/kdmtheme/distinfo
@@ -1,3 +1,3 @@
-MD5 (kdmtheme-1.1.3.tar.bz2) = f49500529652a03701dff03ca54986c4
-SHA256 (kdmtheme-1.1.3.tar.bz2) = 955f8f2203d1acc3937fc7ece72486e0cea1779825338e34ba6c9ea861716ade
-SIZE (kdmtheme-1.1.3.tar.bz2) = 539822
+MD5 (kdmtheme-1.2.2.tar.bz2) = 292188b0a74b865ec7429077ff5e02b7
+SHA256 (kdmtheme-1.2.2.tar.bz2) = 0e8df5f9522ca4d863c0aa2d489d46c4cd34122dc581981162859f9fbae9629e
+SIZE (kdmtheme-1.2.2.tar.bz2) = 403355
diff --git a/x11-themes/kdmtheme/files/patch-admin__cvs.sh b/x11-themes/kdmtheme/files/patch-admin__cvs.sh
new file mode 100644
index 000000000000..c51ca1bf9dbe
--- /dev/null
+++ b/x11-themes/kdmtheme/files/patch-admin__cvs.sh
@@ -0,0 +1,20 @@
+--- ./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`
+ case $AUTOCONF_VERSION in
+-  Autoconf*2.5* | autoconf*2.5* ) : ;;
++  Autoconf*2.5* | autoconf*2.5* | 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`
+ case $AUTOHEADER_VERSION in
+-  Autoconf*2.5* | autoheader*2.5* ) : ;;
++  Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
+   "" )
+     echo "*** AUTOHEADER NOT FOUND!."
+     echo "*** KDE requires autoheader $required_autoconf_version"
diff --git a/x11-themes/kdmtheme/files/patch-admin__detect-autoconf.sh b/x11-themes/kdmtheme/files/patch-admin__detect-autoconf.sh
new file mode 100644
index 000000000000..8f48b6a81a11
--- /dev/null
+++ b/x11-themes/kdmtheme/files/patch-admin__detect-autoconf.sh
@@ -0,0 +1,11 @@
+--- ./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 #
+ # 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.62 -2.58 -2.57 257 -2.54 -2.53a -2.53 -2.52 -2.5x"
+ KDE_AUTOMAKE_VERS="-1.7 17 -1.6"
+ 
+ # We don't use variable here for remembering the type ... strings. Local