Conversion to a single libtool environment.

Approved by:	portmgr (kris)

48 files changed, 241 insertions, 54 deletions

diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index 9d157cb8f675..7d40079f522a 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -34,7 +34,6 @@ USE_AUTOTOOLS=	libltdl:15
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-LIBTOOLFLAGS=	# none
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-smtp --enable-jasper-filter
 
diff --git a/net-im/eva/Makefile b/net-im/eva/Makefile
index 734afc27a322..c832d0e018d6 100644
--- a/net-im/eva/Makefile
+++ b/net-im/eva/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	hamigua@cuc.cn
 COMMENT=	QQ IM Client for KDE3
 
 USE_KDELIBS_VER=3
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
diff --git a/net-im/gaim-bangexec/Makefile b/net-im/gaim-bangexec/Makefile
index 1947d087321a..59cb4a53fc52 100644
--- a/net-im/gaim-bangexec/Makefile
+++ b/net-im/gaim-bangexec/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bangexec
 PORTVERSION=	1.3.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ignorance
@@ -23,10 +23,10 @@ DEPRECATED=	The author has taken down his site and has ceased developing this pr
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
-PLIST_FILES=	lib/gaim/bangexec.so
+PLIST_FILES=	lib/gaim/bangexec.la lib/gaim/bangexec.so
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-g3||' ${WRKSRC}/configure
diff --git a/net-im/gaim-extprefs/Makefile b/net-im/gaim-extprefs/Makefile
index 39f2e8a8f4d0..3060f53969c1 100644
--- a/net-im/gaim-extprefs/Makefile
+++ b/net-im/gaim-extprefs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gaim-extprefs
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gaim-extprefs
@@ -18,14 +19,13 @@ BUILD_DEPENDS=	${X11BASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
 RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=--enable-static=no
 CFLAGS+=	"-fPIC"
 
-PLIST_FILES=	lib/gaim/libextprefs.so
+PLIST_FILES=	lib/gaim/libextprefs.la lib/gaim/libextprefs.so
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/-g3//' ${WRKSRC}/configure
diff --git a/net-im/gaim-guifications/Makefile b/net-im/gaim-guifications/Makefile
index 9cf63bd8af9b..8c6b3a4fad08 100644
--- a/net-im/gaim-guifications/Makefile
+++ b/net-im/gaim-guifications/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	guifications
 PORTVERSION=	2.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,7 +22,7 @@ RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
 .if !defined(WITHOUT_NLS)
diff --git a/net-im/gaim-guifications/pkg-plist b/net-im/gaim-guifications/pkg-plist
index aa4ef595da35..5a0c0a907be8 100644
--- a/net-im/gaim-guifications/pkg-plist
+++ b/net-im/gaim-guifications/pkg-plist
@@ -1,3 +1,4 @@
+lib/gaim/guifications.la
 lib/gaim/guifications.so
 share/gnome/pixmaps/gaim/guifications/conf/item_icon_size_big.png
 share/gnome/pixmaps/gaim/guifications/conf/item_icon_size_huge.png
diff --git a/net-im/gaim-ignorance/Makefile b/net-im/gaim-ignorance/Makefile
index 0af1c5694a93..83e5e9cacee8 100644
--- a/net-im/gaim-ignorance/Makefile
+++ b/net-im/gaim-ignorance/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ignorance
 PORTVERSION=	2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -23,7 +23,7 @@ DEPRECATED=	The author has taken down his site and has ceased developing this pr
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
 SUB_FILES=	pkg-message
diff --git a/net-im/gaim-ignorance/pkg-plist b/net-im/gaim-ignorance/pkg-plist
index 9c10225f4401..043765b164d5 100644
--- a/net-im/gaim-ignorance/pkg-plist
+++ b/net-im/gaim-ignorance/pkg-plist
@@ -1,4 +1,5 @@
 @comment $FreeBSD$
+lib/gaim/ignorance.la
 lib/gaim/ignorance.so
 %%EXAMPLESDIR%%/ignorance
 @unexec if cmp -s %D/etc/gaim/ignorance.conf %D/etc/gaim/ignorance.conf.sample; then rm -f %D/etc/gaim/ignorance.conf;fi
diff --git a/net-im/gaim-openq/Makefile b/net-im/gaim-openq/Makefile
index 5565cc0a4e2d..41af896100bb 100644
--- a/net-im/gaim-openq/Makefile
+++ b/net-im/gaim-openq/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openq
 PORTVERSION=	0.3.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,7 +22,7 @@ RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/net-im/gaim-openq/pkg-plist b/net-im/gaim-openq/pkg-plist
index 5e5095092eb8..9c1104fd2fef 100644
--- a/net-im/gaim-openq/pkg-plist
+++ b/net-im/gaim-openq/pkg-plist
@@ -1,3 +1,5 @@
+lib/gaim/libqq.a
+lib/gaim/libqq.la
 lib/gaim/libqq.so
 share/gnome/gaim/QQWry.dat
 share/gnome/pixmaps/gaim/smileys/2003iii/angel.png
diff --git a/net-im/gaim-rss-reader/Makefile b/net-im/gaim-rss-reader/Makefile
index b2b5cfb749e2..11ce019ed83c 100644
--- a/net-im/gaim-rss-reader/Makefile
+++ b/net-im/gaim-rss-reader/Makefile
@@ -25,7 +25,7 @@ IGNORE=	Requires update to work with Gaim 0.82.1
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 libxml2
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--with-gaim=${X11BASE}/include/gaim"
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net-im/gaim-slashexec/Makefile b/net-im/gaim-slashexec/Makefile
index c58b4a8bb145..1cde7870f5d4 100644
--- a/net-im/gaim-slashexec/Makefile
+++ b/net-im/gaim-slashexec/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	slashexec
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	guifications
@@ -19,9 +20,9 @@ BUILD_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 
 USE_X_PREFIX=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
-PLIST_FILES=	lib/gaim/se.so
+PLIST_FILES=	lib/gaim/se.la lib/gaim/se.so
 
 .include <bsd.port.mk>
diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 04c02ba2b699..ebe0434f4c04 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gaim
 PORTVERSION=	1.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -26,7 +26,7 @@ USE_GNOME=	gnomeprefix gnomehack gtk20
 WANT_GNOME=	yes
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" \
diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist
index bf778e510884..3273a6cf9720 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -70,37 +70,98 @@ include/gaim/util.h
 include/gaim/value.h
 include/gaim/version.h
 include/gaim/xmlnode.h
+lib/gaim/autorecon.a
+lib/gaim/autorecon.la
 lib/gaim/autorecon.so
+lib/gaim/docklet.a
+lib/gaim/docklet.la
 lib/gaim/docklet.so
+lib/gaim/extplacement.a
+lib/gaim/extplacement.la
 lib/gaim/extplacement.so
+lib/gaim/gaim-remote.a
+lib/gaim/gaim-remote.la
 lib/gaim/gaim-remote.so
+lib/gaim/gestures.a
+lib/gaim/gestures.la
 lib/gaim/gestures.so
+%%EVO%%lib/gaim/gevolution.a
+%%EVO%%lib/gaim/gevolution.la
 %%EVO%%lib/gaim/gevolution.so
+lib/gaim/history.a
+lib/gaim/history.la
 lib/gaim/history.so
+lib/gaim/iconaway.a
+lib/gaim/iconaway.la
 lib/gaim/iconaway.so
+lib/gaim/idle.a
+lib/gaim/idle.la
 lib/gaim/idle.so
+lib/gaim/libgg.a
+lib/gaim/libgg.la
 lib/gaim/libgg.so
+lib/gaim/libirc.a
+lib/gaim/libirc.la
 lib/gaim/libirc.so
+lib/gaim/libjabber.a
+lib/gaim/libjabber.la
 lib/gaim/libjabber.so
+lib/gaim/libmsn.a
+lib/gaim/libmsn.la
 lib/gaim/libmsn.so
+lib/gaim/libnapster.a
+lib/gaim/libnapster.la
 lib/gaim/libnapster.so
+lib/gaim/libnovell.a
+lib/gaim/libnovell.la
 lib/gaim/libnovell.so
+lib/gaim/liboscar.a
+lib/gaim/liboscar.la
 lib/gaim/liboscar.so
+%%SILC%%lib/gaim/libsilcgaim.a
+%%SILC%%lib/gaim/libsilcgaim.la
 %%SILC%%lib/gaim/libsilcgaim.so
+lib/gaim/libyahoo.a
+lib/gaim/libyahoo.la
 lib/gaim/libyahoo.so
+lib/gaim/libzephyr.a
+lib/gaim/libzephyr.la
 lib/gaim/libzephyr.so
+lib/gaim/notify.a
+lib/gaim/notify.la
 lib/gaim/notify.so
+%%PERL:%%lib/gaim/perl.a
+%%PERL:%%lib/gaim/perl.la
 %%PERL:%%lib/gaim/perl.so
+lib/gaim/spellchk.a
+lib/gaim/spellchk.la
 lib/gaim/spellchk.so
+lib/gaim/relnot.a
+lib/gaim/relnot.la
 lib/gaim/relnot.so
+lib/gaim/ssl-gnutls.a
+lib/gaim/ssl-gnutls.la
 lib/gaim/ssl-gnutls.so
+lib/gaim/ssl-nss.a
+lib/gaim/ssl-nss.la
 lib/gaim/ssl-nss.so
+lib/gaim/ssl.a
+lib/gaim/ssl.la
 lib/gaim/ssl.so
+lib/gaim/statenotify.a
+lib/gaim/statenotify.la
 lib/gaim/statenotify.so
+%%TCL:%%lib/gaim/tcl.a
+%%TCL:%%lib/gaim/tcl.la
 %%TCL:%%lib/gaim/tcl.so
+lib/gaim/ticker.a
+lib/gaim/ticker.la
 lib/gaim/ticker.so
+lib/gaim/timestamp.a
+lib/gaim/timestamp.la
 lib/gaim/timestamp.so
 lib/libgaim-remote.a
+lib/libgaim-remote.la
 lib/libgaim-remote.so
 lib/libgaim-remote.so.0
 libdata/pkgconfig/gaim.pc
diff --git a/net-im/gossip/Makefile b/net-im/gossip/Makefile
index 9c5184f3797a..6e0aa41969d4 100644
--- a/net-im/gossip/Makefile
+++ b/net-im/gossip/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	loudmouth-1.0:${PORTSDIR}/net-im/loudmouth
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui
diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile
index f7304491eadc..6157351a0cba 100644
--- a/net-im/ickle/Makefile
+++ b/net-im/ickle/Makefile
@@ -16,16 +16,15 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ICQ2000 protocol implementation
 
-LIB_DEPENDS=	gtkmm:${PORTSDIR}/x11-toolkits/gtk-- \
+LIB_DEPENDS=	gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtk-- \
 		icq2000.5:${PORTSDIR}/net-im/libicq2000
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 WANT_GNOME=	yes
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-sigc-prefix=${LOCALBASE} \
 		--with-gtkmm-prefix=${X11BASE}
diff --git a/net-im/icqlib/Makefile b/net-im/icqlib/Makefile
index 0e30799a3f9a..2c90552b55c5 100644
--- a/net-im/icqlib/Makefile
+++ b/net-im/icqlib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	icqlib
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library required by kicq (not libicq)
 
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/net-im/icqlib/pkg-plist b/net-im/icqlib/pkg-plist
index 84adb0ec1023..48671138bb3f 100644
--- a/net-im/icqlib/pkg-plist
+++ b/net-im/icqlib/pkg-plist
@@ -1,4 +1,5 @@
+include/icq.h
 lib/libicq.a
+lib/libicq.la
 lib/libicq.so
 lib/libicq.so.1
-include/icq.h
diff --git a/net-im/kf/Makefile b/net-im/kf/Makefile
index c9a2f64a30e4..d62b67619fa2 100644
--- a/net-im/kf/Makefile
+++ b/net-im/kf/Makefile
@@ -19,7 +19,7 @@ USE_X_PREFIX=	yes
 USE_GNOME=	libglade2
 USE_GETOPT_LONG=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net-im/kmerlin/Makefile b/net-im/kmerlin/Makefile
index a1036a2c2ffd..204138e6c9cb 100644
--- a/net-im/kmerlin/Makefile
+++ b/net-im/kmerlin/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An IM (Instant Messenger) KDE client for the Microsoft MSN Network
 
 USE_KDELIBS_VER=3
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile
index 43c79adc895b..d305a91707a1 100644
--- a/net-im/kmess-kde4/Makefile
+++ b/net-im/kmess-kde4/Makefile
@@ -17,7 +17,7 @@ COMMENT=	MSN Messenger Client for KDE3
 LIB_DEPENDS=	mimelib.1:${PORTSDIR}/deskutils/kdepim3
 
 USE_KDELIBS_VER=3
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 
diff --git a/net-im/kmess/Makefile b/net-im/kmess/Makefile
index 43c79adc895b..d305a91707a1 100644
--- a/net-im/kmess/Makefile
+++ b/net-im/kmess/Makefile
@@ -17,7 +17,7 @@ COMMENT=	MSN Messenger Client for KDE3
 LIB_DEPENDS=	mimelib.1:${PORTSDIR}/deskutils/kdepim3
 
 USE_KDELIBS_VER=3
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 
diff --git a/net-im/konverse/Makefile b/net-im/konverse/Makefile
index f0faab6bcb98..f1af4af15423 100644
--- a/net-im/konverse/Makefile
+++ b/net-im/konverse/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	KDE Jabber Client
 
 USE_KDELIBS_VER=3
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
diff --git a/net-im/konverse/files/patch-configure b/net-im/konverse/files/patch-configure
new file mode 100644
index 000000000000..a38283ade11c
--- /dev/null
+++ b/net-im/konverse/files/patch-configure
@@ -0,0 +1,33 @@
+--- configure.orig	Tue May 29 22:38:27 2001
++++ configure	Sat Feb 18 22:54:14 2006
+@@ -2845,13 +2845,2 @@
+ 
+-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
+-AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+-MAGIC="$MAGIC" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
+-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
+-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
+-deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $lt_target \
+-|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+-
+ # Reload cache, that may have been modified by ltconfig
+@@ -2880,16 +2869,2 @@
+ LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh"
+-lt_save_CC="$CC"
+-lt_save_CFLAGS="$CFLAGS"
+-AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \
+-MAGIC="$MAGIC" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \
+-AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \
+-objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
+-deplibs_check_method="$deplibs_check_method" \
+-file_magic_cmd="$file_magic_cmd" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
+---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $lt_target \
+-|| { echo "configure: error: libtool tag configuration failed" 1>&2; exit 1; }
+-CC="$lt_save_CC"
+-CFLAGS="$lt_save_CFLAGS"
+ 
diff --git a/net-im/kpopup/Makefile b/net-im/kpopup/Makefile
index af0cf0978022..e81e9da99a1f 100644
--- a/net-im/kpopup/Makefile
+++ b/net-im/kpopup/Makefile
@@ -22,7 +22,7 @@ SUB_FILES=	pkg-message
 
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=
 
 KPOPUP_DIR=	/var/tmp/kpopup
diff --git a/net-im/kpopup/pkg-message b/net-im/kpopup/pkg-message
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/net-im/kpopup/pkg-message
+++ /dev/null
diff --git a/net-im/libicq/Makefile b/net-im/libicq/Makefile
index 447be3ac200c..e681068c3cfc 100644
--- a/net-im/libicq/Makefile
+++ b/net-im/libicq/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libicq
 PORTVERSION=	0.33
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://download.sourceforge.net/libicq/ \
 		${MASTER_SITE_LOCAL}
diff --git a/net-im/libicq/pkg-plist b/net-im/libicq/pkg-plist
index c5b2f94bc6bd..8a7c3f64488a 100644
--- a/net-im/libicq/pkg-plist
+++ b/net-im/libicq/pkg-plist
@@ -1,4 +1,5 @@
 include/libicq.h
 lib/libicq.a
+lib/libicq.la
 lib/libicq.so
 lib/libicq.so.0.3
diff --git a/net-im/libicq2000/Makefile b/net-im/libicq2000/Makefile
index 01b5baff2a03..4b93ebb48ae0 100644
--- a/net-im/libicq2000/Makefile
+++ b/net-im/libicq2000/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libicq2000
 PORTVERSION=	0.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +17,7 @@ COMMENT=	An opensource C++ library to support icq2000/2001 protocol
 
 LIB_DEPENDS=	sigc.1:${PORTSDIR}/devel/libsigc++
 
-USE_AUTOTOOLS=	libtool:15:inc
+USE_AUTOTOOLS=	libtool: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..089a959b6bdd 100644
--- a/net-im/libicq2000/pkg-plist
+++ b/net-im/libicq2000/pkg-plist
@@ -39,6 +39,8 @@ include/libicq2000/time_extra.h
 include/libicq2000/userinfoconstants.h
 include/libicq2000/userinfohelpers.h
 include/libicq2000/version.h
+lib/libicq2000.a
+lib/libicq2000.la
 lib/libicq2000.so
 lib/libicq2000.so.5
 share/aclocal/libicq2000.m4
diff --git a/net-im/libmsn/Makefile b/net-im/libmsn/Makefile
index 114e7ddfd529..d0577c3d71e0 100644
--- a/net-im/libmsn/Makefile
+++ b/net-im/libmsn/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libmsn
 PORTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://libmsn.bdash.net.nz/files/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -18,7 +19,6 @@ COMMENT=	A library for connecting to MSN Messenger service
 
 LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
-USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/net-im/libmsn/pkg-plist b/net-im/libmsn/pkg-plist
index 1a150b8bac90..43200dcdd7b9 100644
--- a/net-im/libmsn/pkg-plist
+++ b/net-im/libmsn/pkg-plist
@@ -16,5 +16,6 @@ include/msn/switchboardserver.h
 include/msn/util.h
 @dirrm include/msn
 lib/libmsn.a
+lib/libmsn.la
 lib/libmsn.so
 lib/libmsn.so.0
diff --git a/net-im/libyahoo2/Makefile b/net-im/libyahoo2/Makefile
index 3a79ce614ea5..422743a79640 100644
--- a/net-im/libyahoo2/Makefile
+++ b/net-im/libyahoo2/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libyahoo2
 PORTVERSION=	0.7.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +18,7 @@ COMMENT=	A C library that handles the new Yahoo! Messenger protocol
 
 USE_BZIP2=	yes
 USE_GNOME=	glib20 gnomehack gnometarget
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 post-patch:
diff --git a/net-im/libyahoo2/pkg-plist b/net-im/libyahoo2/pkg-plist
index 5997151dc685..8ae5b09e9059 100644
--- a/net-im/libyahoo2/pkg-plist
+++ b/net-im/libyahoo2/pkg-plist
@@ -6,6 +6,7 @@ include/yahoo_fn.h
 include/yahoo_httplib.h
 include/yahoo_list.h
 lib/libyahoo2.a
+lib/libyahoo2.la
 lib/libyahoo2.so
 lib/libyahoo2.so.9
 libdata/pkgconfig/libyahoo2.pc
diff --git a/net-im/licq-console/Makefile b/net-im/licq-console/Makefile
index 25c6ceaa2715..8b8bef4e0b77 100644
--- a/net-im/licq-console/Makefile
+++ b/net-im/licq-console/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	console
 PORTVERSION=	${CONSOLE_LICQ_VER}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 
 LIB_DEPENDS=	cdk.5:${PORTSDIR}/devel/cdk
@@ -15,7 +15,7 @@ LIB_DEPENDS=	cdk.5:${PORTSDIR}/devel/cdk
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Ncurses-based console plugin for Licq
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
 		LIBS="${PTHREAD_LIBS}"
@@ -24,7 +24,8 @@ CPPFLAGS+=	${PTHREAD_CFLAGS}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-PLIST_FILES=	lib/licq/licq_console.so
+PLIST_FILES=	lib/licq/licq_console.la \
+		lib/licq/licq_console.so
 
 .include <bsd.port.pre.mk>
 
diff --git a/net-im/licq-osd/Makefile b/net-im/licq-osd/Makefile
index 996f84053e57..4ca33a9de840 100644
--- a/net-im/licq-osd/Makefile
+++ b/net-im/licq-osd/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	osd
 PORTVERSION=	${OSD_LICQ_VER}
+PORTREVISION=	1
 CATEGORIES=	net-im
 
 MAINTAINER=	ports@FreeBSD.org
@@ -19,12 +20,13 @@ RUN_DEPENDS=	${LOCALBASE}/lib/licq/licq_qt-gui.so:${PORTSDIR}/net-im/licq-qt-gui
 # plugin (gtk+) and wish run osd with it. i've not tested with
 # plugins other than qt-gui
 
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 
 LICQ_PORT?=	net-im/licq
 
 LOCALES=	de cs es fr pt pt_BR ro ru sv sk
-PLIST_FILES=	lib/licq/licq_osd.so \
+PLIST_FILES=	lib/licq/licq_osd.la \
+		lib/licq/licq_osd.so \
 		${LOCALES:C+^.*$+share/locale/&/LC_MESSAGES/licq_osd_plugin.mo+}
 
 .include <bsd.port.pre.mk>
diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile
index 81a014d15380..763d8b50b365 100644
--- a/net-im/loudmouth/Makefile
+++ b/net-im/loudmouth/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	loudmouth
 PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
@@ -17,7 +17,7 @@ COMMENT=	Lightweight Jabber client library
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_GNOME=	gnomehack glib20
 CONFIGURE_ARGS=	--disable-gtk-doc
diff --git a/net-im/loudmouth/pkg-plist b/net-im/loudmouth/pkg-plist
index 0fac6ae742fb..ef3d459456ac 100644
--- a/net-im/loudmouth/pkg-plist
+++ b/net-im/loudmouth/pkg-plist
@@ -8,6 +8,7 @@ include/loudmouth-1.0/loudmouth/lm-ssl.h
 include/loudmouth-1.0/loudmouth/lm-utils.h
 include/loudmouth-1.0/loudmouth/loudmouth.h
 lib/libloudmouth-1.a
+lib/libloudmouth-1.la
 lib/libloudmouth-1.so
 lib/libloudmouth-1.so.0
 libdata/pkgconfig/loudmouth-1.0.pc
diff --git a/net-im/meanwhile-gaim/Makefile b/net-im/meanwhile-gaim/Makefile
index cdbffcb00a8c..cc504888bb21 100644
--- a/net-im/meanwhile-gaim/Makefile
+++ b/net-im/meanwhile-gaim/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	meanwhile
 PORTVERSION=	1.2.8
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -23,7 +24,7 @@ RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/net-im/meanwhile-gaim/pkg-plist b/net-im/meanwhile-gaim/pkg-plist
index 2455b4060590..4830ebbc6b04 100644
--- a/net-im/meanwhile-gaim/pkg-plist
+++ b/net-im/meanwhile-gaim/pkg-plist
@@ -1,3 +1,4 @@
+lib/gaim/libmwgaim.la
 lib/gaim/libmwgaim.so
 share/gnome/pixmaps/gaim/status/default/external.png
 share/gnome/pixmaps/gaim/status/default/meanwhile.png
diff --git a/net-im/meanwhile/Makefile b/net-im/meanwhile/Makefile
index 376f1ba0e723..8a6cc5bf64d6 100644
--- a/net-im/meanwhile/Makefile
+++ b/net-im/meanwhile/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	meanwhile
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +18,7 @@ COMMENT=	Open Source implementation of the Lotus Sametime protocol
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-doxygen=no \
 		--with-gmp-prefix=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net-im/meanwhile/pkg-plist b/net-im/meanwhile/pkg-plist
index 6fb0fcf53415..3e1d858e7ecc 100644
--- a/net-im/meanwhile/pkg-plist
+++ b/net-im/meanwhile/pkg-plist
@@ -15,6 +15,7 @@ include/meanwhile/mw_srvc_resolve.h
 include/meanwhile/mw_srvc_store.h
 include/meanwhile/mw_st_list.h
 lib/libmeanwhile.a
+lib/libmeanwhile.la
 lib/libmeanwhile.so
 lib/libmeanwhile.so.1
 libdata/pkgconfig/meanwhile.pc
diff --git a/net-im/pidgin-guifications/Makefile b/net-im/pidgin-guifications/Makefile
index 9cf63bd8af9b..8c6b3a4fad08 100644
--- a/net-im/pidgin-guifications/Makefile
+++ b/net-im/pidgin-guifications/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	guifications
 PORTVERSION=	2.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,7 +22,7 @@ RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
 .if !defined(WITHOUT_NLS)
diff --git a/net-im/pidgin-guifications/pkg-plist b/net-im/pidgin-guifications/pkg-plist
index aa4ef595da35..5a0c0a907be8 100644
--- a/net-im/pidgin-guifications/pkg-plist
+++ b/net-im/pidgin-guifications/pkg-plist
@@ -1,3 +1,4 @@
+lib/gaim/guifications.la
 lib/gaim/guifications.so
 share/gnome/pixmaps/gaim/guifications/conf/item_icon_size_big.png
 share/gnome/pixmaps/gaim/guifications/conf/item_icon_size_huge.png
diff --git a/net-im/sim-im/Makefile b/net-im/sim-im/Makefile
index 8ed3b2952967..93796a33beb1 100644
--- a/net-im/sim-im/Makefile
+++ b/net-im/sim-im/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	simicq
 PORTVERSION=	0.9.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-im kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/mi/m-i/}
@@ -20,8 +20,8 @@ LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-2//}
 USE_GMAKE=	yes
 USE_QT_VER=	3
-USE_PERL5_BUILD=	yes
-GNU_CONFIGURE=	yes
+USE_PERL5_BUILD=yes
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/net-im/sim-im/pkg-plist b/net-im/sim-im/pkg-plist
index 6bcdfbcf88f7..9b7073417bf3 100644
--- a/net-im/sim-im/pkg-plist
+++ b/net-im/sim-im/pkg-plist
@@ -1,46 +1,83 @@
 bin/sim
 bin/simctrl
+lib/libsimapi.a
 lib/libsimapi.la
 lib/libsimapi.so
 lib/libsimapi.so.0
+lib/libsimui.a
 lib/libsimui.la
 lib/libsimui.so
 lib/libsimui.so.0
 lib/menu/sim-kde.menu
+lib/sim/__homedir.a
 lib/sim/__homedir.so
+lib/sim/__migrate.a
 lib/sim/__migrate.so
+lib/sim/_core.a
 lib/sim/_core.so
+lib/sim/about.a
 lib/sim/about.so
+lib/sim/action.a
 lib/sim/action.so
+lib/sim/autoaway.a
 lib/sim/autoaway.so
+lib/sim/background.a
 lib/sim/background.so
+lib/sim/dock.a
 lib/sim/dock.so
+lib/sim/filter.a
 lib/sim/filter.so
+lib/sim/floaty.a
 lib/sim/floaty.so
+lib/sim/forward.a
 lib/sim/forward.so
+lib/sim/gpg.a
 lib/sim/gpg.so
+lib/sim/icons.a
 lib/sim/icons.so
+lib/sim/icq.a
 lib/sim/icq.so
+lib/sim/jabber.a
 lib/sim/jabber.so
+lib/sim/livejournal.a
 lib/sim/livejournal.so
+lib/sim/logger.a
 lib/sim/logger.so
+%%SSL%%lib/sim/msn.a
 %%SSL%%lib/sim/msn.so
+lib/sim/navigate.a
 lib/sim/navigate.so
+lib/sim/netmonitor.a
 lib/sim/netmonitor.so
+%%KDE%%lib/sim/ontop.a
 %%KDE%%lib/sim/ontop.so
+lib/sim/osd.a
 lib/sim/osd.so
+lib/sim/proxy.a
 lib/sim/proxy.so
+lib/sim/remote.a
 lib/sim/remote.so
+lib/sim/replace.a
 lib/sim/replace.so
+lib/sim/shortcuts.a
 lib/sim/shortcuts.so
+lib/sim/sound.a
 lib/sim/sound.so
+%%SPELL%%lib/sim/spell.a
 %%SPELL%%lib/sim/spell.so
+lib/sim/splash.a
 lib/sim/splash.so
+lib/sim/styles.a
 lib/sim/styles.so
+%%KDE%%lib/sim/transparent.a
 %%KDE%%lib/sim/transparent.so
+lib/sim/update.a
 lib/sim/update.so
+lib/sim/weather.a
 lib/sim/weather.so
+%%SSL%%lib/sim/yahoo.a
 %%SSL%%lib/sim/yahoo.so
+lib/sim/zodiak.a
 lib/sim/zodiak.so
 share/applnk/Internet/sim.desktop
 share/apps/sim/COPYING
diff --git a/net-im/simicq/Makefile b/net-im/simicq/Makefile
index 8ed3b2952967..93796a33beb1 100644
--- a/net-im/simicq/Makefile
+++ b/net-im/simicq/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	simicq
 PORTVERSION=	0.9.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-im kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/mi/m-i/}
@@ -20,8 +20,8 @@ LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-2//}
 USE_GMAKE=	yes
 USE_QT_VER=	3
-USE_PERL5_BUILD=	yes
-GNU_CONFIGURE=	yes
+USE_PERL5_BUILD=yes
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/net-im/simicq/pkg-plist b/net-im/simicq/pkg-plist
index 6bcdfbcf88f7..9b7073417bf3 100644
--- a/net-im/simicq/pkg-plist
+++ b/net-im/simicq/pkg-plist
@@ -1,46 +1,83 @@
 bin/sim
 bin/simctrl
+lib/libsimapi.a
 lib/libsimapi.la
 lib/libsimapi.so
 lib/libsimapi.so.0
+lib/libsimui.a
 lib/libsimui.la
 lib/libsimui.so
 lib/libsimui.so.0
 lib/menu/sim-kde.menu
+lib/sim/__homedir.a
 lib/sim/__homedir.so
+lib/sim/__migrate.a
 lib/sim/__migrate.so
+lib/sim/_core.a
 lib/sim/_core.so
+lib/sim/about.a
 lib/sim/about.so
+lib/sim/action.a
 lib/sim/action.so
+lib/sim/autoaway.a
 lib/sim/autoaway.so
+lib/sim/background.a
 lib/sim/background.so
+lib/sim/dock.a
 lib/sim/dock.so
+lib/sim/filter.a
 lib/sim/filter.so
+lib/sim/floaty.a
 lib/sim/floaty.so
+lib/sim/forward.a
 lib/sim/forward.so
+lib/sim/gpg.a
 lib/sim/gpg.so
+lib/sim/icons.a
 lib/sim/icons.so
+lib/sim/icq.a
 lib/sim/icq.so
+lib/sim/jabber.a
 lib/sim/jabber.so
+lib/sim/livejournal.a
 lib/sim/livejournal.so
+lib/sim/logger.a
 lib/sim/logger.so
+%%SSL%%lib/sim/msn.a
 %%SSL%%lib/sim/msn.so
+lib/sim/navigate.a
 lib/sim/navigate.so
+lib/sim/netmonitor.a
 lib/sim/netmonitor.so
+%%KDE%%lib/sim/ontop.a
 %%KDE%%lib/sim/ontop.so
+lib/sim/osd.a
 lib/sim/osd.so
+lib/sim/proxy.a
 lib/sim/proxy.so
+lib/sim/remote.a
 lib/sim/remote.so
+lib/sim/replace.a
 lib/sim/replace.so
+lib/sim/shortcuts.a
 lib/sim/shortcuts.so
+lib/sim/sound.a
 lib/sim/sound.so
+%%SPELL%%lib/sim/spell.a
 %%SPELL%%lib/sim/spell.so
+lib/sim/splash.a
 lib/sim/splash.so
+lib/sim/styles.a
 lib/sim/styles.so
+%%KDE%%lib/sim/transparent.a
 %%KDE%%lib/sim/transparent.so
+lib/sim/update.a
 lib/sim/update.so
+lib/sim/weather.a
 lib/sim/weather.so
+%%SSL%%lib/sim/yahoo.a
 %%SSL%%lib/sim/yahoo.so
+lib/sim/zodiak.a
 lib/sim/zodiak.so
 share/applnk/Internet/sim.desktop
 share/apps/sim/COPYING