21 files changed, 32 insertions, 21 deletions

diff --git a/misc/bibletime-kde3/Makefile b/misc/bibletime-kde3/Makefile
index 229911b27d1f..5f55aeb458d4 100644
--- a/misc/bibletime-kde3/Makefile
+++ b/misc/bibletime-kde3/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ARGS= --with-sword-dir=${LOCALBASE} --with-clucene-dir=${LOCALBASE}
 PORTSCOUT=	ignore:1
 
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/misc/kaddressbook-plugins/Makefile b/misc/kaddressbook-plugins/Makefile
index 8149dfe34b8e..c62807413054 100644
--- a/misc/kaddressbook-plugins/Makefile
+++ b/misc/kaddressbook-plugins/Makefile
@@ -26,7 +26,7 @@ USE_KDELIBS_VER=3
 
 USE_BZIP2=	yes
 PREFIX=		${KDE_PREFIX}
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 USE_GMAKE=	yes
 
 USE_LDCONFIG=	yes
diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile
index 4c1aeed6d024..0709c172baa0 100644
--- a/misc/kdeedu3/Makefile
+++ b/misc/kdeedu3/Makefile
@@ -26,7 +26,7 @@ PREFIX=		${KDE_PREFIX}
 USE_BZIP2=	yes
 USE_XORG=	xpm
 USE_GMAKE=	yes
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 
 CONFIGURE_ARGS+=--enable-libusb=${LOCALBASE} \
 		--disable-ocamlsolver
diff --git a/misc/kdeedu3/files/patch-libtool22 b/misc/kdeedu3/files/patch-libtool22
new file mode 100644
index 000000000000..ab26e07869e3
--- /dev/null
+++ b/misc/kdeedu3/files/patch-libtool22
@@ -0,0 +1,11 @@
+--- kalzium/src/Makefile.in.orig	2009-07-01 22:47:40.000000000 -0500
++++ kalzium/src/Makefile.in	2009-07-01 22:49:40.000000000 -0500
+@@ -478,7 +478,7 @@
+ 			moleculeparser.cpp \
+ 			tempunit.cpp settings_colors.cpp settings_misc.cpp settings_units.cpp plotsetupwidget.cpp molcalcwidgetbase.cpp timewidget.cpp somwidget.cpp spectrumview.cpp prefs.cpp
+ 
+-kalzium_LDADD = ../../libkdeedu/kdeeduplot/libkdeeduplot.la ../../libkdeedu/kdeeduui/libkdeeduui.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML) -L$(OCAMLLIB) -L$(FACILELIB) $(EQCHEM_LDADD)
++kalzium_LDADD = ../../libkdeedu/kdeeduplot/libkdeeduplot.la ../../libkdeedu/kdeeduui/libkdeeduui.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML) $(EQCHEM_LDADD)
+ KDE_CXXFLAGS = -D_ISOC99_SOURCE
+ SUBDIRS = icons elementpics data $(EQCHEM_SUB)
+ EXTRA_DIST = main.cpp \
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 59a9536cf404..46f0caf26028 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -29,7 +29,7 @@ USE_KDEBASE_VER=3
 USE_PYTHON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 DO_NOT_COMPILE+=klaptopdaemon kmilo
 CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 CONFIGURE_ARGS+=--with-pythondir=${LOCALBASE}
diff --git a/misc/kfile-plugins/Makefile b/misc/kfile-plugins/Makefile
index 7b06a2c1f6a7..3636f675f521 100644
--- a/misc/kfile-plugins/Makefile
+++ b/misc/kfile-plugins/Makefile
@@ -23,7 +23,7 @@ USE_KDELIBS_VER=3
 
 USE_BZIP2=	yes
 PREFIX=		${KDE_PREFIX}
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 USE_GMAKE=	yes
 
 USE_LDCONFIG=	yes
diff --git a/misc/kicker-applets/Makefile b/misc/kicker-applets/Makefile
index 7d8c8de5fba4..9d075e609648 100644
--- a/misc/kicker-applets/Makefile
+++ b/misc/kicker-applets/Makefile
@@ -22,7 +22,7 @@ USE_KDELIBS_VER=3
 
 USE_BZIP2=	yes
 PREFIX=		${KDE_PREFIX}
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 USE_GMAKE=	yes
 
 USE_LDCONFIG=	yes
diff --git a/misc/knewsticker-scripts/Makefile b/misc/knewsticker-scripts/Makefile
index 158911961ada..5e0b8fdcd084 100644
--- a/misc/knewsticker-scripts/Makefile
+++ b/misc/knewsticker-scripts/Makefile
@@ -22,7 +22,7 @@ USE_KDELIBS_VER=3
 
 USE_BZIP2=	yes
 PREFIX=		${KDE_PREFIX}
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 USE_GMAKE=	yes
 
 USE_LDCONFIG=	yes
diff --git a/misc/konq-plugins/Makefile b/misc/konq-plugins/Makefile
index a32aeb109418..bdcec81050b7 100644
--- a/misc/konq-plugins/Makefile
+++ b/misc/konq-plugins/Makefile
@@ -22,7 +22,7 @@ USE_KDELIBS_VER=3
 
 USE_BZIP2=	yes
 PREFIX=		${KDE_PREFIX}
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 USE_GMAKE=	yes
 
 USE_LDCONFIG=	yes
diff --git a/misc/krecipes-kde4/Makefile b/misc/krecipes-kde4/Makefile
index 672f1041a7be..816ac0b079c5 100644
--- a/misc/krecipes-kde4/Makefile
+++ b/misc/krecipes-kde4/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	hank@millerfarm.com
 COMMENT=	Recipe database for cooks
 
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 OPTIONS=	SQLITE "Support for SQLite backend" on \
 		MYSQL "Support for MySQL backend" off \
diff --git a/misc/krecipes/Makefile b/misc/krecipes/Makefile
index 672f1041a7be..816ac0b079c5 100644
--- a/misc/krecipes/Makefile
+++ b/misc/krecipes/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	hank@millerfarm.com
 COMMENT=	Recipe database for cooks
 
 USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 
 OPTIONS=	SQLITE "Support for SQLite backend" on \
 		MYSQL "Support for MySQL backend" off \
diff --git a/misc/ksig/Makefile b/misc/ksig/Makefile
index a1203ed58d88..4c88cb57832b 100644
--- a/misc/ksig/Makefile
+++ b/misc/ksig/Makefile
@@ -22,7 +22,7 @@ USE_KDELIBS_VER=3
 
 USE_BZIP2=	yes
 PREFIX=		${KDE_PREFIX}
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 USE_GMAKE=	yes
 
 USE_LDCONFIG=	yes
diff --git a/misc/kwatch/Makefile b/misc/kwatch/Makefile
index 7597c2178c02..5627c330a29b 100644
--- a/misc/kwatch/Makefile
+++ b/misc/kwatch/Makefile
@@ -16,7 +16,7 @@ COMMENT=	KDE/Qt log file viewer
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GETTEXT=	yes
 INSTALLS_ICONS=	yes
 
diff --git a/misc/libmcal/Makefile b/misc/libmcal/Makefile
index 7d342af61d57..af85538fac66 100644
--- a/misc/libmcal/Makefile
+++ b/misc/libmcal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libmcal
 PORTVERSION=	0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} mcaldrivers-0.9.tar.gz
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Modular Calendar Access Library
 
-USE_AUTOTOOLS=	libltdl:15
+USE_AUTOTOOLS=	libltdl:22
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-mstore --with-icap \
diff --git a/misc/linm/Makefile b/misc/linm/Makefile
index 43f3f82c7555..61b6ea12e66e 100644
--- a/misc/linm/Makefile
+++ b/misc/linm/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Clone of Mdir, mc-style terminal file manager
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkg-config
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_ICONV=	yes
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
diff --git a/misc/renamedlgplugins/Makefile b/misc/renamedlgplugins/Makefile
index d80f5e2810e9..2a3b4453260a 100644
--- a/misc/renamedlgplugins/Makefile
+++ b/misc/renamedlgplugins/Makefile
@@ -22,7 +22,7 @@ USE_KDELIBS_VER=3
 
 USE_BZIP2=	yes
 PREFIX=		${KDE_PREFIX}
-USE_AUTOTOOLS=  libtool:15
+USE_AUTOTOOLS=  libtool:22
 USE_GMAKE=	yes
 
 USE_LDCONFIG=	yes
diff --git a/misc/skyutils/Makefile b/misc/skyutils/Makefile
index 04e885e7e3c9..f4e0b6f37a2a 100644
--- a/misc/skyutils/Makefile
+++ b/misc/skyutils/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library required by smssend (same author)
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	autoconf:262 libtool:15
+USE_AUTOTOOLS=	autoconf:262 libtool:22
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile
index 0278cde6146b..3bb1023516dc 100644
--- a/misc/tellico-kde4/Makefile
+++ b/misc/tellico-kde4/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib \
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_PYTHON=	yes
 
 CONFIGURE_ARGS+=	--disable-cdtext
diff --git a/misc/tellico/Makefile b/misc/tellico/Makefile
index 0278cde6146b..3bb1023516dc 100644
--- a/misc/tellico/Makefile
+++ b/misc/tellico/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib \
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_PYTHON=	yes
 
 CONFIGURE_ARGS+=	--disable-cdtext
diff --git a/misc/xdelta/Makefile b/misc/xdelta/Makefile
index 0553cf684004..d199f6501e5c 100644
--- a/misc/xdelta/Makefile
+++ b/misc/xdelta/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	A diff/patch utility for binary files
 
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/misc/xosd/Makefile b/misc/xosd/Makefile
index fffb44f1961f..ba84f84849ea 100644
--- a/misc/xosd/Makefile
+++ b/misc/xosd/Makefile
@@ -20,7 +20,7 @@ XMMS_CONFIG?=	${LOCALBASE}/bin/xmms-config
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_XORG=	x11 xext xt sm ice
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	LIBS=${PTHREAD_LIBS}' -L${LOCALBASE}/lib' \
 		CFLAGS='${CFLAGS}' LOCALBASE='${LOCALBASE}' \