Conversion to a single libtool environment.

Approved by:	portmgr (kris)

15 files changed, 155 insertions, 31 deletions

diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile
index 6f67724746c9..aae00458678d 100644
--- a/irc/irssi-devel/Makefile
+++ b/irc/irssi-devel/Makefile
@@ -17,10 +17,8 @@ COMMENT=	A modular IRC client with many features
 
 CONFLICTS=	irssi-0.8*
 
-GNU_CONFIGURE=	yes
-
 USE_GNOME=	glib20
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 
diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index d6c0bb476265..6ff173f4a66b 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -16,10 +16,9 @@ COMMENT?=	A modular IRC client with many features
 
 CONFLICTS=	irssi-devel-[0-9]*
 
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	glib20
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--with-module
 
diff --git a/irc/kmyirc/Makefile b/irc/kmyirc/Makefile
index 9124c6234c98..98a33b4ce6af 100644
--- a/irc/kmyirc/Makefile
+++ b/irc/kmyirc/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		kmyirc
 PORTVERSION=		0.2.9
-PORTREVISION=		4
+PORTREVISION=		5
 CATEGORIES=		irc kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=		laszlof@vonostingroup.com
 COMMENT=		Easy to use IRC client for KDE
 
-GNU_CONFIGURE=		yes
+USE_AUTOTOOLS=		libtool:15
 USE_KDELIBS_VER=	3
 USE_GMAKE=		yes
 USE_REINPLACE=		yes
diff --git a/irc/kmyirc/pkg-plist b/irc/kmyirc/pkg-plist
index 1e0972297016..df752a3769dc 100644
--- a/irc/kmyirc/pkg-plist
+++ b/irc/kmyirc/pkg-plist
@@ -1,19 +1,24 @@
 bin/kmyirc
-lib/libnetwork.so.0
-lib/libnetwork.so
+lib/libnetwork.a
 lib/libnetwork.la
-lib/libircgui.so.0
-lib/libircgui.so
+lib/libnetwork.so
+lib/libnetwork.so.0
+lib/libircgui.a
 lib/libircgui.la
-lib/liblogic.so.0
-lib/liblogic.so
+lib/libircgui.so
+lib/libircgui.so.0
+lib/liblogic.a
 lib/liblogic.la
-lib/libkmyircqextmdi.so.3
-lib/libkmyircqextmdi.so
+lib/liblogic.so
+lib/liblogic.so.0
+lib/libkmyircqextmdi.a
 lib/libkmyircqextmdi.la
-lib/libkmiwidgets.so.0
-lib/libkmiwidgets.so
+lib/libkmyircqextmdi.so
+lib/libkmyircqextmdi.so.3
+lib/libkmiwidgets.a
 lib/libkmiwidgets.la
+lib/libkmiwidgets.so
+lib/libkmiwidgets.so.0
 share/config/kmyircrc
 share/apps/kmyirc/icons/filenew.xpm
 share/apps/kmyirc/icons/kde2_closebutton.xpm
diff --git a/irc/konversation-kde4/Makefile b/irc/konversation-kde4/Makefile
index b0412dc77633..4208a3299d5c 100644
--- a/irc/konversation-kde4/Makefile
+++ b/irc/konversation-kde4/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	markus@FreeBSD.org
 COMMENT=	A user friendly IRC client for KDE
 
 USE_KDELIBS_VER=3
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/irc/konversation/Makefile b/irc/konversation/Makefile
index b0412dc77633..4208a3299d5c 100644
--- a/irc/konversation/Makefile
+++ b/irc/konversation/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	markus@FreeBSD.org
 COMMENT=	A user friendly IRC client for KDE
 
 USE_KDELIBS_VER=3
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/irc/kvirc-devel/Makefile b/irc/kvirc-devel/Makefile
index 49e07643722a..3cae87f13b43 100644
--- a/irc/kvirc-devel/Makefile
+++ b/irc/kvirc-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kvirc
 PORTVERSION=	3.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc kde
 MASTER_SITES=	ftp://ftp.kvirc.net/pub/%SUBDIR%/ \
 		ftp://ftp.kvirc.de/pub/%SUBDIR%/ \
@@ -20,13 +20,12 @@ COMMENT=	IRC client for QT and KDE
 
 CONFLICTS=	kdenetwork-3.5.[0-9]*
 
-GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=		yes
+USE_AUTOTOOLS=	libtool:15
+INSTALLS_SHLIB=	yes
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:15:inc
 CONFIGURE_TARGET=
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
 PLIST_SUB=		VER=${PORTVERSION}
diff --git a/irc/kvirc-devel/pkg-plist b/irc/kvirc-devel/pkg-plist
index 6900708b505c..bce387641946 100644
--- a/irc/kvirc-devel/pkg-plist
+++ b/irc/kvirc-devel/pkg-plist
@@ -255,6 +255,7 @@ include/kvirc/%%VER%%/kvi_userlistview.h
 include/kvirc/%%VER%%/kvi_wincfg.h
 include/kvirc/%%VER%%/kvi_window.h
 include/kvirc/%%VER%%/kvi_xlib.h
+lib/libkvilib.a
 lib/libkvilib.la
 lib/libkvilib.so
 lib/libkvilib.so.3
@@ -1314,116 +1315,172 @@ share/mimelnk/text/x-kvs.desktop
 %%DATADIR%%/%%VER%%/modules/caps/tool/filetransferwindow
 %%DATADIR%%/%%VER%%/modules/caps/tool/logview
 %%DATADIR%%/%%VER%%/modules/caps/tool/sharedfileswindow
+%%DATADIR%%/%%VER%%/modules/libkviabout.a
 %%DATADIR%%/%%VER%%/modules/libkviabout.la
 %%DATADIR%%/%%VER%%/modules/libkviabout.so
+%%DATADIR%%/%%VER%%/modules/libkviaction.a
 %%DATADIR%%/%%VER%%/modules/libkviaction.la
 %%DATADIR%%/%%VER%%/modules/libkviaction.so
+%%DATADIR%%/%%VER%%/modules/libkviactioneditor.a
 %%DATADIR%%/%%VER%%/modules/libkviactioneditor.la
 %%DATADIR%%/%%VER%%/modules/libkviactioneditor.so
+%%DATADIR%%/%%VER%%/modules/libkvialiaseditor.a
 %%DATADIR%%/%%VER%%/modules/libkvialiaseditor.la
 %%DATADIR%%/%%VER%%/modules/libkvialiaseditor.so
+%%DATADIR%%/%%VER%%/modules/libkviavatar.a
 %%DATADIR%%/%%VER%%/modules/libkviavatar.la
 %%DATADIR%%/%%VER%%/modules/libkviavatar.so
+%%DATADIR%%/%%VER%%/modules/libkvichan.a
 %%DATADIR%%/%%VER%%/modules/libkvichan.la
 %%DATADIR%%/%%VER%%/modules/libkvichan.so
+%%DATADIR%%/%%VER%%/modules/libkvichannelsjoin.a
 %%DATADIR%%/%%VER%%/modules/libkvichannelsjoin.la
 %%DATADIR%%/%%VER%%/modules/libkvichannelsjoin.so
+%%DATADIR%%/%%VER%%/modules/libkviclock.a
 %%DATADIR%%/%%VER%%/modules/libkviclock.la
 %%DATADIR%%/%%VER%%/modules/libkviclock.so
+%%DATADIR%%/%%VER%%/modules/libkvicodetester.a
 %%DATADIR%%/%%VER%%/modules/libkvicodetester.la
 %%DATADIR%%/%%VER%%/modules/libkvicodetester.so
+%%DATADIR%%/%%VER%%/modules/libkviconfig.a
 %%DATADIR%%/%%VER%%/modules/libkviconfig.la
 %%DATADIR%%/%%VER%%/modules/libkviconfig.so
+%%DATADIR%%/%%VER%%/modules/libkvidcc.a
 %%DATADIR%%/%%VER%%/modules/libkvidcc.la
 %%DATADIR%%/%%VER%%/modules/libkvidcc.so
+%%DATADIR%%/%%VER%%/modules/libkvidialog.a
 %%DATADIR%%/%%VER%%/modules/libkvidialog.la
 %%DATADIR%%/%%VER%%/modules/libkvidialog.so
+%%DATADIR%%/%%VER%%/modules/libkvidockwidget.a
 %%DATADIR%%/%%VER%%/modules/libkvidockwidget.la
 %%DATADIR%%/%%VER%%/modules/libkvidockwidget.so
+%%DATADIR%%/%%VER%%/modules/libkvieditor.a
 %%DATADIR%%/%%VER%%/modules/libkvieditor.la
 %%DATADIR%%/%%VER%%/modules/libkvieditor.so
+%%DATADIR%%/%%VER%%/modules/libkvieventeditor.a
 %%DATADIR%%/%%VER%%/modules/libkvieventeditor.la
 %%DATADIR%%/%%VER%%/modules/libkvieventeditor.so
+%%DATADIR%%/%%VER%%/modules/libkvifile.a
 %%DATADIR%%/%%VER%%/modules/libkvifile.la
 %%DATADIR%%/%%VER%%/modules/libkvifile.so
+%%DATADIR%%/%%VER%%/modules/libkvifiletransferwindow.a
 %%DATADIR%%/%%VER%%/modules/libkvifiletransferwindow.la
 %%DATADIR%%/%%VER%%/modules/libkvifiletransferwindow.so
+%%DATADIR%%/%%VER%%/modules/libkvihelp.a
 %%DATADIR%%/%%VER%%/modules/libkvihelp.la
 %%DATADIR%%/%%VER%%/modules/libkvihelp.so
+%%DATADIR%%/%%VER%%/modules/libkvihttp.a
 %%DATADIR%%/%%VER%%/modules/libkvihttp.la
 %%DATADIR%%/%%VER%%/modules/libkvihttp.so
+%%DATADIR%%/%%VER%%/modules/libkviident.a
 %%DATADIR%%/%%VER%%/modules/libkviident.la
 %%DATADIR%%/%%VER%%/modules/libkviident.so
+%%DATADIR%%/%%VER%%/modules/libkviiograph.a
 %%DATADIR%%/%%VER%%/modules/libkviiograph.la
 %%DATADIR%%/%%VER%%/modules/libkviiograph.so
+%%DATADIR%%/%%VER%%/modules/libkvilag.a
 %%DATADIR%%/%%VER%%/modules/libkvilag.la
 %%DATADIR%%/%%VER%%/modules/libkvilag.so
+%%DATADIR%%/%%VER%%/modules/libkvilamerizer.a
 %%DATADIR%%/%%VER%%/modules/libkvilamerizer.la
 %%DATADIR%%/%%VER%%/modules/libkvilamerizer.so
+%%DATADIR%%/%%VER%%/modules/libkvilinks.a
 %%DATADIR%%/%%VER%%/modules/libkvilinks.la
 %%DATADIR%%/%%VER%%/modules/libkvilinks.so
+%%DATADIR%%/%%VER%%/modules/libkvilist.a
 %%DATADIR%%/%%VER%%/modules/libkvilist.la
 %%DATADIR%%/%%VER%%/modules/libkvilist.so
+%%DATADIR%%/%%VER%%/modules/libkvilog.a
 %%DATADIR%%/%%VER%%/modules/libkvilog.la
 %%DATADIR%%/%%VER%%/modules/libkvilog.so
+%%DATADIR%%/%%VER%%/modules/libkvilogview.a
 %%DATADIR%%/%%VER%%/modules/libkvilogview.la
 %%DATADIR%%/%%VER%%/modules/libkvilogview.so
+%%DATADIR%%/%%VER%%/modules/libkvimask.a
 %%DATADIR%%/%%VER%%/modules/libkvimask.la
 %%DATADIR%%/%%VER%%/modules/libkvimask.so
+%%DATADIR%%/%%VER%%/modules/libkvimircimport.a
 %%DATADIR%%/%%VER%%/modules/libkvimircimport.la
 %%DATADIR%%/%%VER%%/modules/libkvimircimport.so
+%%DATADIR%%/%%VER%%/modules/libkvimp3player.a
 %%DATADIR%%/%%VER%%/modules/libkvimp3player.la
 %%DATADIR%%/%%VER%%/modules/libkvimp3player.so
+%%DATADIR%%/%%VER%%/modules/libkvimy.a
 %%DATADIR%%/%%VER%%/modules/libkvimy.la
 %%DATADIR%%/%%VER%%/modules/libkvimy.so
+%%DATADIR%%/%%VER%%/modules/libkvinotifier.a
 %%DATADIR%%/%%VER%%/modules/libkvinotifier.la
 %%DATADIR%%/%%VER%%/modules/libkvinotifier.so
+%%DATADIR%%/%%VER%%/modules/libkviobjects.a
 %%DATADIR%%/%%VER%%/modules/libkviobjects.la
 %%DATADIR%%/%%VER%%/modules/libkviobjects.so
+%%DATADIR%%/%%VER%%/modules/libkvioptions.a
 %%DATADIR%%/%%VER%%/modules/libkvioptions.la
 %%DATADIR%%/%%VER%%/modules/libkvioptions.so
+%%DATADIR%%/%%VER%%/modules/libkviperl.a
 %%DATADIR%%/%%VER%%/modules/libkviperl.la
 %%DATADIR%%/%%VER%%/modules/libkviperl.so
+%%DATADIR%%/%%VER%%/modules/libkviperlcore.a
 %%DATADIR%%/%%VER%%/modules/libkviperlcore.la
 %%DATADIR%%/%%VER%%/modules/libkviperlcore.so
+%%DATADIR%%/%%VER%%/modules/libkvipopupeditor.a
 %%DATADIR%%/%%VER%%/modules/libkvipopupeditor.la
 %%DATADIR%%/%%VER%%/modules/libkvipopupeditor.so
+%%DATADIR%%/%%VER%%/modules/libkviraweditor.a
 %%DATADIR%%/%%VER%%/modules/libkviraweditor.la
 %%DATADIR%%/%%VER%%/modules/libkviraweditor.so
+%%DATADIR%%/%%VER%%/modules/libkviregchan.a
 %%DATADIR%%/%%VER%%/modules/libkviregchan.la
 %%DATADIR%%/%%VER%%/modules/libkviregchan.so
+%%DATADIR%%/%%VER%%/modules/libkvireguser.a
 %%DATADIR%%/%%VER%%/modules/libkvireguser.la
 %%DATADIR%%/%%VER%%/modules/libkvireguser.so
+%%DATADIR%%/%%VER%%/modules/libkvirijndael.a
 %%DATADIR%%/%%VER%%/modules/libkvirijndael.la
 %%DATADIR%%/%%VER%%/modules/libkvirijndael.so
+%%DATADIR%%/%%VER%%/modules/libkvisetup.a
 %%DATADIR%%/%%VER%%/modules/libkvisetup.la
 %%DATADIR%%/%%VER%%/modules/libkvisetup.so
+%%DATADIR%%/%%VER%%/modules/libkvisharedfile.a
 %%DATADIR%%/%%VER%%/modules/libkvisharedfile.la
 %%DATADIR%%/%%VER%%/modules/libkvisharedfile.so
+%%DATADIR%%/%%VER%%/modules/libkvisharedfileswindow.a
 %%DATADIR%%/%%VER%%/modules/libkvisharedfileswindow.la
 %%DATADIR%%/%%VER%%/modules/libkvisharedfileswindow.so
+%%DATADIR%%/%%VER%%/modules/libkvisnd.a
 %%DATADIR%%/%%VER%%/modules/libkvisnd.la
 %%DATADIR%%/%%VER%%/modules/libkvisnd.so
+%%DATADIR%%/%%VER%%/modules/libkvisocketspy.a
 %%DATADIR%%/%%VER%%/modules/libkvisocketspy.la
 %%DATADIR%%/%%VER%%/modules/libkvisocketspy.so
+%%DATADIR%%/%%VER%%/modules/libkvispaste.a
 %%DATADIR%%/%%VER%%/modules/libkvispaste.la
 %%DATADIR%%/%%VER%%/modules/libkvispaste.so
+%%DATADIR%%/%%VER%%/modules/libkvistr.a
 %%DATADIR%%/%%VER%%/modules/libkvistr.la
 %%DATADIR%%/%%VER%%/modules/libkvistr.so
+%%DATADIR%%/%%VER%%/modules/libkvisystem.a
 %%DATADIR%%/%%VER%%/modules/libkvisystem.la
 %%DATADIR%%/%%VER%%/modules/libkvisystem.so
+%%DATADIR%%/%%VER%%/modules/libkviterm.a
 %%DATADIR%%/%%VER%%/modules/libkviterm.la
 %%DATADIR%%/%%VER%%/modules/libkviterm.so
+%%DATADIR%%/%%VER%%/modules/libkvitip.a
 %%DATADIR%%/%%VER%%/modules/libkvitip.la
 %%DATADIR%%/%%VER%%/modules/libkvitip.so
+%%DATADIR%%/%%VER%%/modules/libkvitmphighlight.a
 %%DATADIR%%/%%VER%%/modules/libkvitmphighlight.la
 %%DATADIR%%/%%VER%%/modules/libkvitmphighlight.so
+%%DATADIR%%/%%VER%%/modules/libkvitoolbar.a
 %%DATADIR%%/%%VER%%/modules/libkvitoolbar.la
 %%DATADIR%%/%%VER%%/modules/libkvitoolbar.so
+%%DATADIR%%/%%VER%%/modules/libkvitoolbareditor.a
 %%DATADIR%%/%%VER%%/modules/libkvitoolbareditor.la
 %%DATADIR%%/%%VER%%/modules/libkvitoolbareditor.so
+%%DATADIR%%/%%VER%%/modules/libkviurl.a
 %%DATADIR%%/%%VER%%/modules/libkviurl.la
 %%DATADIR%%/%%VER%%/modules/libkviurl.so
+%%DATADIR%%/%%VER%%/modules/libkviwindow.a
 %%DATADIR%%/%%VER%%/modules/libkviwindow.la
 %%DATADIR%%/%%VER%%/modules/libkviwindow.so
 %%DATADIR%%/%%VER%%/msgcolors/all-black.msgclr
diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile
index 49e07643722a..3cae87f13b43 100644
--- a/irc/kvirc/Makefile
+++ b/irc/kvirc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kvirc
 PORTVERSION=	3.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc kde
 MASTER_SITES=	ftp://ftp.kvirc.net/pub/%SUBDIR%/ \
 		ftp://ftp.kvirc.de/pub/%SUBDIR%/ \
@@ -20,13 +20,12 @@ COMMENT=	IRC client for QT and KDE
 
 CONFLICTS=	kdenetwork-3.5.[0-9]*
 
-GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=		yes
+USE_AUTOTOOLS=	libtool:15
+INSTALLS_SHLIB=	yes
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:15:inc
 CONFIGURE_TARGET=
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
 PLIST_SUB=		VER=${PORTVERSION}
diff --git a/irc/kvirc/pkg-plist b/irc/kvirc/pkg-plist
index 6900708b505c..bce387641946 100644
--- a/irc/kvirc/pkg-plist
+++ b/irc/kvirc/pkg-plist
@@ -255,6 +255,7 @@ include/kvirc/%%VER%%/kvi_userlistview.h
 include/kvirc/%%VER%%/kvi_wincfg.h
 include/kvirc/%%VER%%/kvi_window.h
 include/kvirc/%%VER%%/kvi_xlib.h
+lib/libkvilib.a
 lib/libkvilib.la
 lib/libkvilib.so
 lib/libkvilib.so.3
@@ -1314,116 +1315,172 @@ share/mimelnk/text/x-kvs.desktop
 %%DATADIR%%/%%VER%%/modules/caps/tool/filetransferwindow
 %%DATADIR%%/%%VER%%/modules/caps/tool/logview
 %%DATADIR%%/%%VER%%/modules/caps/tool/sharedfileswindow
+%%DATADIR%%/%%VER%%/modules/libkviabout.a
 %%DATADIR%%/%%VER%%/modules/libkviabout.la
 %%DATADIR%%/%%VER%%/modules/libkviabout.so
+%%DATADIR%%/%%VER%%/modules/libkviaction.a
 %%DATADIR%%/%%VER%%/modules/libkviaction.la
 %%DATADIR%%/%%VER%%/modules/libkviaction.so
+%%DATADIR%%/%%VER%%/modules/libkviactioneditor.a
 %%DATADIR%%/%%VER%%/modules/libkviactioneditor.la
 %%DATADIR%%/%%VER%%/modules/libkviactioneditor.so
+%%DATADIR%%/%%VER%%/modules/libkvialiaseditor.a
 %%DATADIR%%/%%VER%%/modules/libkvialiaseditor.la
 %%DATADIR%%/%%VER%%/modules/libkvialiaseditor.so
+%%DATADIR%%/%%VER%%/modules/libkviavatar.a
 %%DATADIR%%/%%VER%%/modules/libkviavatar.la
 %%DATADIR%%/%%VER%%/modules/libkviavatar.so
+%%DATADIR%%/%%VER%%/modules/libkvichan.a
 %%DATADIR%%/%%VER%%/modules/libkvichan.la
 %%DATADIR%%/%%VER%%/modules/libkvichan.so
+%%DATADIR%%/%%VER%%/modules/libkvichannelsjoin.a
 %%DATADIR%%/%%VER%%/modules/libkvichannelsjoin.la
 %%DATADIR%%/%%VER%%/modules/libkvichannelsjoin.so
+%%DATADIR%%/%%VER%%/modules/libkviclock.a
 %%DATADIR%%/%%VER%%/modules/libkviclock.la
 %%DATADIR%%/%%VER%%/modules/libkviclock.so
+%%DATADIR%%/%%VER%%/modules/libkvicodetester.a
 %%DATADIR%%/%%VER%%/modules/libkvicodetester.la
 %%DATADIR%%/%%VER%%/modules/libkvicodetester.so
+%%DATADIR%%/%%VER%%/modules/libkviconfig.a
 %%DATADIR%%/%%VER%%/modules/libkviconfig.la
 %%DATADIR%%/%%VER%%/modules/libkviconfig.so
+%%DATADIR%%/%%VER%%/modules/libkvidcc.a
 %%DATADIR%%/%%VER%%/modules/libkvidcc.la
 %%DATADIR%%/%%VER%%/modules/libkvidcc.so
+%%DATADIR%%/%%VER%%/modules/libkvidialog.a
 %%DATADIR%%/%%VER%%/modules/libkvidialog.la
 %%DATADIR%%/%%VER%%/modules/libkvidialog.so
+%%DATADIR%%/%%VER%%/modules/libkvidockwidget.a
 %%DATADIR%%/%%VER%%/modules/libkvidockwidget.la
 %%DATADIR%%/%%VER%%/modules/libkvidockwidget.so
+%%DATADIR%%/%%VER%%/modules/libkvieditor.a
 %%DATADIR%%/%%VER%%/modules/libkvieditor.la
 %%DATADIR%%/%%VER%%/modules/libkvieditor.so
+%%DATADIR%%/%%VER%%/modules/libkvieventeditor.a
 %%DATADIR%%/%%VER%%/modules/libkvieventeditor.la
 %%DATADIR%%/%%VER%%/modules/libkvieventeditor.so
+%%DATADIR%%/%%VER%%/modules/libkvifile.a
 %%DATADIR%%/%%VER%%/modules/libkvifile.la
 %%DATADIR%%/%%VER%%/modules/libkvifile.so
+%%DATADIR%%/%%VER%%/modules/libkvifiletransferwindow.a
 %%DATADIR%%/%%VER%%/modules/libkvifiletransferwindow.la
 %%DATADIR%%/%%VER%%/modules/libkvifiletransferwindow.so
+%%DATADIR%%/%%VER%%/modules/libkvihelp.a
 %%DATADIR%%/%%VER%%/modules/libkvihelp.la
 %%DATADIR%%/%%VER%%/modules/libkvihelp.so
+%%DATADIR%%/%%VER%%/modules/libkvihttp.a
 %%DATADIR%%/%%VER%%/modules/libkvihttp.la
 %%DATADIR%%/%%VER%%/modules/libkvihttp.so
+%%DATADIR%%/%%VER%%/modules/libkviident.a
 %%DATADIR%%/%%VER%%/modules/libkviident.la
 %%DATADIR%%/%%VER%%/modules/libkviident.so
+%%DATADIR%%/%%VER%%/modules/libkviiograph.a
 %%DATADIR%%/%%VER%%/modules/libkviiograph.la
 %%DATADIR%%/%%VER%%/modules/libkviiograph.so
+%%DATADIR%%/%%VER%%/modules/libkvilag.a
 %%DATADIR%%/%%VER%%/modules/libkvilag.la
 %%DATADIR%%/%%VER%%/modules/libkvilag.so
+%%DATADIR%%/%%VER%%/modules/libkvilamerizer.a
 %%DATADIR%%/%%VER%%/modules/libkvilamerizer.la
 %%DATADIR%%/%%VER%%/modules/libkvilamerizer.so
+%%DATADIR%%/%%VER%%/modules/libkvilinks.a
 %%DATADIR%%/%%VER%%/modules/libkvilinks.la
 %%DATADIR%%/%%VER%%/modules/libkvilinks.so
+%%DATADIR%%/%%VER%%/modules/libkvilist.a
 %%DATADIR%%/%%VER%%/modules/libkvilist.la
 %%DATADIR%%/%%VER%%/modules/libkvilist.so
+%%DATADIR%%/%%VER%%/modules/libkvilog.a
 %%DATADIR%%/%%VER%%/modules/libkvilog.la
 %%DATADIR%%/%%VER%%/modules/libkvilog.so
+%%DATADIR%%/%%VER%%/modules/libkvilogview.a
 %%DATADIR%%/%%VER%%/modules/libkvilogview.la
 %%DATADIR%%/%%VER%%/modules/libkvilogview.so
+%%DATADIR%%/%%VER%%/modules/libkvimask.a
 %%DATADIR%%/%%VER%%/modules/libkvimask.la
 %%DATADIR%%/%%VER%%/modules/libkvimask.so
+%%DATADIR%%/%%VER%%/modules/libkvimircimport.a
 %%DATADIR%%/%%VER%%/modules/libkvimircimport.la
 %%DATADIR%%/%%VER%%/modules/libkvimircimport.so
+%%DATADIR%%/%%VER%%/modules/libkvimp3player.a
 %%DATADIR%%/%%VER%%/modules/libkvimp3player.la
 %%DATADIR%%/%%VER%%/modules/libkvimp3player.so
+%%DATADIR%%/%%VER%%/modules/libkvimy.a
 %%DATADIR%%/%%VER%%/modules/libkvimy.la
 %%DATADIR%%/%%VER%%/modules/libkvimy.so
+%%DATADIR%%/%%VER%%/modules/libkvinotifier.a
 %%DATADIR%%/%%VER%%/modules/libkvinotifier.la
 %%DATADIR%%/%%VER%%/modules/libkvinotifier.so
+%%DATADIR%%/%%VER%%/modules/libkviobjects.a
 %%DATADIR%%/%%VER%%/modules/libkviobjects.la
 %%DATADIR%%/%%VER%%/modules/libkviobjects.so
+%%DATADIR%%/%%VER%%/modules/libkvioptions.a
 %%DATADIR%%/%%VER%%/modules/libkvioptions.la
 %%DATADIR%%/%%VER%%/modules/libkvioptions.so
+%%DATADIR%%/%%VER%%/modules/libkviperl.a
 %%DATADIR%%/%%VER%%/modules/libkviperl.la
 %%DATADIR%%/%%VER%%/modules/libkviperl.so
+%%DATADIR%%/%%VER%%/modules/libkviperlcore.a
 %%DATADIR%%/%%VER%%/modules/libkviperlcore.la
 %%DATADIR%%/%%VER%%/modules/libkviperlcore.so
+%%DATADIR%%/%%VER%%/modules/libkvipopupeditor.a
 %%DATADIR%%/%%VER%%/modules/libkvipopupeditor.la
 %%DATADIR%%/%%VER%%/modules/libkvipopupeditor.so
+%%DATADIR%%/%%VER%%/modules/libkviraweditor.a
 %%DATADIR%%/%%VER%%/modules/libkviraweditor.la
 %%DATADIR%%/%%VER%%/modules/libkviraweditor.so
+%%DATADIR%%/%%VER%%/modules/libkviregchan.a
 %%DATADIR%%/%%VER%%/modules/libkviregchan.la
 %%DATADIR%%/%%VER%%/modules/libkviregchan.so
+%%DATADIR%%/%%VER%%/modules/libkvireguser.a
 %%DATADIR%%/%%VER%%/modules/libkvireguser.la
 %%DATADIR%%/%%VER%%/modules/libkvireguser.so
+%%DATADIR%%/%%VER%%/modules/libkvirijndael.a
 %%DATADIR%%/%%VER%%/modules/libkvirijndael.la
 %%DATADIR%%/%%VER%%/modules/libkvirijndael.so
+%%DATADIR%%/%%VER%%/modules/libkvisetup.a
 %%DATADIR%%/%%VER%%/modules/libkvisetup.la
 %%DATADIR%%/%%VER%%/modules/libkvisetup.so
+%%DATADIR%%/%%VER%%/modules/libkvisharedfile.a
 %%DATADIR%%/%%VER%%/modules/libkvisharedfile.la
 %%DATADIR%%/%%VER%%/modules/libkvisharedfile.so
+%%DATADIR%%/%%VER%%/modules/libkvisharedfileswindow.a
 %%DATADIR%%/%%VER%%/modules/libkvisharedfileswindow.la
 %%DATADIR%%/%%VER%%/modules/libkvisharedfileswindow.so
+%%DATADIR%%/%%VER%%/modules/libkvisnd.a
 %%DATADIR%%/%%VER%%/modules/libkvisnd.la
 %%DATADIR%%/%%VER%%/modules/libkvisnd.so
+%%DATADIR%%/%%VER%%/modules/libkvisocketspy.a
 %%DATADIR%%/%%VER%%/modules/libkvisocketspy.la
 %%DATADIR%%/%%VER%%/modules/libkvisocketspy.so
+%%DATADIR%%/%%VER%%/modules/libkvispaste.a
 %%DATADIR%%/%%VER%%/modules/libkvispaste.la
 %%DATADIR%%/%%VER%%/modules/libkvispaste.so
+%%DATADIR%%/%%VER%%/modules/libkvistr.a
 %%DATADIR%%/%%VER%%/modules/libkvistr.la
 %%DATADIR%%/%%VER%%/modules/libkvistr.so
+%%DATADIR%%/%%VER%%/modules/libkvisystem.a
 %%DATADIR%%/%%VER%%/modules/libkvisystem.la
 %%DATADIR%%/%%VER%%/modules/libkvisystem.so
+%%DATADIR%%/%%VER%%/modules/libkviterm.a
 %%DATADIR%%/%%VER%%/modules/libkviterm.la
 %%DATADIR%%/%%VER%%/modules/libkviterm.so
+%%DATADIR%%/%%VER%%/modules/libkvitip.a
 %%DATADIR%%/%%VER%%/modules/libkvitip.la
 %%DATADIR%%/%%VER%%/modules/libkvitip.so
+%%DATADIR%%/%%VER%%/modules/libkvitmphighlight.a
 %%DATADIR%%/%%VER%%/modules/libkvitmphighlight.la
 %%DATADIR%%/%%VER%%/modules/libkvitmphighlight.so
+%%DATADIR%%/%%VER%%/modules/libkvitoolbar.a
 %%DATADIR%%/%%VER%%/modules/libkvitoolbar.la
 %%DATADIR%%/%%VER%%/modules/libkvitoolbar.so
+%%DATADIR%%/%%VER%%/modules/libkvitoolbareditor.a
 %%DATADIR%%/%%VER%%/modules/libkvitoolbareditor.la
 %%DATADIR%%/%%VER%%/modules/libkvitoolbareditor.so
+%%DATADIR%%/%%VER%%/modules/libkviurl.a
 %%DATADIR%%/%%VER%%/modules/libkviurl.la
 %%DATADIR%%/%%VER%%/modules/libkviurl.so
+%%DATADIR%%/%%VER%%/modules/libkviwindow.a
 %%DATADIR%%/%%VER%%/modules/libkviwindow.la
 %%DATADIR%%/%%VER%%/modules/libkviwindow.so
 %%DATADIR%%/%%VER%%/msgcolors/all-black.msgclr
diff --git a/irc/kwirc/Makefile b/irc/kwirc/Makefile
index 3d28695bf974..9d8d893a42d1 100644
--- a/irc/kwirc/Makefile
+++ b/irc/kwirc/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	markus@FreeBSD.org
 COMMENT=	IRC client for KDE
 
 USE_KDELIBS_VER=3
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_REINPLACE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index 1d3e57c4ecbe..bd3188475030 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xchat
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc gnome ipv6
 MASTER_SITES=	http://flapjack.navi.cx/releases/xchat-gnome/
 PKGNAMESUFFIX=	-gnome
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libgnomeui
 USE_REINPLACE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-nls \
diff --git a/irc/xchat-gnome/pkg-plist b/irc/xchat-gnome/pkg-plist
index f68a1b1bd321..c68800d193f5 100644
--- a/irc/xchat-gnome/pkg-plist
+++ b/irc/xchat-gnome/pkg-plist
@@ -1,9 +1,14 @@
 bin/xchat
 bin/xchat-gnome
+%%PERL%%lib/xchat/plugins/perl.la
 %%PERL%%lib/xchat/plugins/perl.so
+%%PYTHON%%lib/xchat/plugins/python.la
 %%PYTHON%%lib/xchat/plugins/python.so
+%%TCL%%lib/xchat/plugins/tcl.la
 %%TCL%%lib/xchat/plugins/tcl.so
+lib/xchat/plugins/notification.la
 lib/xchat/plugins/notification.so
+lib/xchat/plugins/urlscraper.la
 lib/xchat/plugins/urlscraper.so
 share/applications/xchat-gnome.desktop
 share/applications/xchat.desktop
diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile
index 7c94cb8ef4cd..d8de6073cfbc 100644
--- a/irc/xchat2/Makefile
+++ b/irc/xchat2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xchat2
 PORTVERSION=	2.6.1
+PORTREVISION=	1
 CATEGORIES=	irc gnome ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://xchat.org/files/source/2.6/
@@ -20,7 +21,7 @@ USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gtk20
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
diff --git a/irc/xchat2/pkg-plist b/irc/xchat2/pkg-plist
index 0c797be5d24a..5298b64477f5 100644
--- a/irc/xchat2/pkg-plist
+++ b/irc/xchat2/pkg-plist
@@ -1,8 +1,12 @@
 bin/xchat
 bin/xchat-remote
+%%DBUS%%lib/xchat/plugins/dbus.la
 %%DBUS%%lib/xchat/plugins/dbus.so
+%%PERL%%lib/xchat/plugins/perl.la
 %%PERL%%lib/xchat/plugins/perl.so
+%%PYTHON%%lib/xchat/plugins/python.la
 %%PYTHON%%lib/xchat/plugins/python.so
+%%TCL%%lib/xchat/plugins/tcl.la
 %%TCL%%lib/xchat/plugins/tcl.so
 share/applications/xchat.desktop
 share/locale/de/LC_MESSAGES/xchat.mo