7 files changed, 16 insertions, 25 deletions

diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index 0740cc687f68..c4f23f511ccd 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -33,7 +33,7 @@ USE_GETOPT_LONG=	yes
 USE_LIBLTDL=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=15
 LIBTOOLFLAGS=	# none
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-smtp --enable-jasper-filter
diff --git a/net-im/ayttm/pkg-plist b/net-im/ayttm/pkg-plist
index b8565309a5f3..3335060c874b 100644
--- a/net-im/ayttm/pkg-plist
+++ b/net-im/ayttm/pkg-plist
@@ -1,45 +1,25 @@
 bin/ayttm
 bin/ayttm_streamer_wrapper.sh
 etc/ayttmrc
-lib/ayttm/aim-toc.la
 lib/ayttm/aim-toc.so
-lib/ayttm/autotrans.la
 lib/ayttm/autotrans.so
-lib/ayttm/aycryption.la
 lib/ayttm/aycryption.so
-lib/ayttm/icq-toc.la
 lib/ayttm/icq-toc.so
-lib/ayttm/img2jpc.la
 lib/ayttm/img2jpc.so
-lib/ayttm/import_everybuddy.la
 lib/ayttm/import_everybuddy.so
-lib/ayttm/import_gaim.la
 lib/ayttm/import_gaim.so
-lib/ayttm/import_gnomeicu.la
 lib/ayttm/import_gnomeicu.so
-lib/ayttm/importicq.la
 lib/ayttm/importicq.so
-lib/ayttm/importlicq.la
 lib/ayttm/importlicq.so
-lib/ayttm/irc.la
 lib/ayttm/irc.so
-lib/ayttm/jabber.la
 lib/ayttm/jabber.so
-lib/ayttm/middle.la
 lib/ayttm/middle.so
-lib/ayttm/msn2.la
 lib/ayttm/msn2.so
-lib/ayttm/notes.la
 lib/ayttm/notes.so
-lib/ayttm/rainbow.la
 lib/ayttm/rainbow.so
-lib/ayttm/smiley-themer.la
 lib/ayttm/smiley-themer.so
-lib/ayttm/smtp.la
 lib/ayttm/smtp.so
-lib/ayttm/video_capture.la
 lib/ayttm/video_capture.so
-lib/ayttm/yahoo2.la
 lib/ayttm/yahoo2.so
 %%DATADIR%%/smileys/Console Smileys/aysmile.rc
 %%DATADIR%%/smileys/Console Smileys/blank.xpm
diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile
index 9fceddda87a3..0c8bf9253b08 100644
--- a/net-im/ickle/Makefile
+++ b/net-im/ickle/Makefile
@@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 WANT_GNOME=	yes
 USE_ICONV=	yes
-USE_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/net-im/icqlib/Makefile b/net-im/icqlib/Makefile
index 2b77effbf240..86a4c5e9dc9a 100644
--- a/net-im/icqlib/Makefile
+++ b/net-im/icqlib/Makefile
@@ -16,7 +16,12 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library required by kicq (not libicq)
 
 INSTALLS_SHLIB=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/net-im/libicq/Makefile b/net-im/libicq/Makefile
index 3bca75346245..c089a700b808 100644
--- a/net-im/libicq/Makefile
+++ b/net-im/libicq/Makefile
@@ -16,7 +16,12 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library to add ICQ communication support to your software
 
 USE_GNOME=	glib12
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/net-im/libicq2000/Makefile b/net-im/libicq2000/Makefile
index 2720961dafe3..fd8dad7fa2ba 100644
--- a/net-im/libicq2000/Makefile
+++ b/net-im/libicq2000/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An opensource C++ library to support icq2000/2001 protocol
 
 LIB_DEPENDS=	sigc.1:${PORTSDIR}/devel/libsigc++
 
-USE_INC_LIBTOOL_VER=15
+USE_LIBTOOL_VER=15
 CONFIGURE_ARGS=	--disable-static
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/net-im/libicq2000/pkg-plist b/net-im/libicq2000/pkg-plist
index fe33bf5d601e..d3192506735f 100644
--- a/net-im/libicq2000/pkg-plist
+++ b/net-im/libicq2000/pkg-plist
@@ -39,6 +39,7 @@ include/libicq2000/time_extra.h
 include/libicq2000/userinfoconstants.h
 include/libicq2000/userinfohelpers.h
 include/libicq2000/version.h
+lib/libicq2000.a
 lib/libicq2000.so
 lib/libicq2000.so.5
 share/aclocal/libicq2000.m4