14 files changed, 53 insertions, 152 deletions

diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile
index ea3b529a59ab..3fa479c811b0 100644
--- a/irc/kvirc/Makefile
+++ b/irc/kvirc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kvirc
-PORTVERSION=	2.0.0
+PORTVERSION=	2.1.0
 CATEGORIES=	irc
 MASTER_SITES=	ftp://ftp.kvirc.net/kvirc/${PORTVERSION}/source/ \
 		ftp://ftp.kvirc.bz.nu/pub/mirror/kvirc/${PORTVERSION}/source/ \
@@ -17,6 +17,7 @@ MAINTAINER=	trevor@FreeBSD.org
 BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
 
 ALL_TARGET=	kvirc
+INSTALLS_SHLIB=	yes
 MAN1=		kvirc.1
 USE_LIBTOOL=	yes
 USE_AUTOMAKE=	yes
@@ -32,14 +33,9 @@ CONFIGURE_ARGS=	--x-includes=$(X11BASE)/include \
 		--with-qt-include-dir=${X11BASE}/include/qt2 \
 		--with-qt-library-dir=${X11BASE}/lib \
 		--without-kde-check \
-		--without-pthread-check \
-		--without-qt-check \
-		--without-plugin-support
-CONFIGURE_ENV+=	SS_X_EXTRA_LIBS=-lxpg4
+		--with-freebsd-pthread \
+		-with-qt-name=qt2
 
-pre-build:
-	@find ${WRKSRC} -name Makefile | xargs ${PERL} -pi -e \
-		"s@lqt @lqt2 @g ; \
-		 s@lpthread@pthread@g"
+CONFIGURE_ENV+=	SS_X_EXTRA_LIBS=-lxpg4
 
 .include <bsd.port.mk>
diff --git a/irc/kvirc/files/patch-aa b/irc/kvirc/files/patch-aa
deleted file mode 100644
index dec6a89ee7d2..000000000000
--- a/irc/kvirc/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/kvilib/kvi_thread.h	Sat Oct 30 20:18:28 1999
-+++ src/kvilib/kvi_thread.h.new	Sat Jan 29 18:29:32 2000
-@@ -24,7 +24,9 @@
- //
- 
- #include <pthread.h>
--
-+#undef connect
-+#undef read
-+#undef write
- #include <qsocketnotifier.h>
- #include <qlist.h>
- #include <qobject.h>
diff --git a/irc/kvirc/files/patch-ad b/irc/kvirc/files/patch-ad
deleted file mode 100644
index 386d7f4d8190..000000000000
--- a/irc/kvirc/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/kvirc/kvi_dcc_send.cpp	Sat Dec 18 08:29:12 1999
-+++ src/kvirc/kvi_dcc_send.cpp.new	Sat Jan 29 17:47:32 2000
-@@ -770,7 +770,7 @@
- 	kvi_threadTestCancel();
- 
- 	dcc->tmpBuffer.sprintf(__tr("Connected to %s on port %u"),dcc->szAddress.ptr(),dcc->uPort);
--	KviDccEvent * e = new KviDccEvent(KVI_DCC_EVENT_MSG,dcc->tmpBuffer.ptr());
-+	e = new KviDccEvent(KVI_DCC_EVENT_MSG,dcc->tmpBuffer.ptr());
- 	g_pThreadEventDispatcher->postEvent(e,dcc->dccSendParent);
- 
- 	kvi_threadTestCancel();
diff --git a/irc/kvirc/files/patch-ae b/irc/kvirc/files/patch-ae
deleted file mode 100644
index 4731b0a8c1ae..000000000000
--- a/irc/kvirc/files/patch-ae
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/kvirc/kvi_dcc_voice.cpp	Sat Dec 18 08:29:36 1999
-+++ src/kvirc/kvi_dcc_voice.cpp.new	Sat Jan 29 22:01:29 2000
-@@ -323,7 +323,7 @@
- 	static int fmt=KVI_FORMAT;
- 	if(ioctl(dcc->soundFd,SNDCTL_DSP_SETFMT,&fmt)<0)return KVI_ERROR_CanNotInitializeSoundCard;
- 	static int chans=KVI_NUM_CHANNELS;
--	if(ioctl(dcc->soundFd,SNDCTL_DSP_CHANNELS,&chans)<0)return KVI_ERROR_CanNotInitializeSoundCard;
-+	if (ioctl(dcc->soundFd, SNDCTL_DSP_STEREO, &chans)<0) return KVI_ERROR_CanNotInitializeSoundCard;
- 	static int speed=KVI_SPEED;
- 	if(ioctl(dcc->soundFd,SNDCTL_DSP_SPEED,&speed)<0)return KVI_ERROR_CanNotInitializeSoundCard;
- 	return KVI_ERROR_Success;
-@@ -905,7 +905,7 @@
- 	kvi_threadTestCancel();
- 
- 	dcc->tmpBuffer.sprintf(__tr("Connected to %s on port %u"),dcc->szAddress.ptr(),dcc->uPort);
--	KviDccEvent * e = new KviDccEvent(KVI_DCC_EVENT_MSG,dcc->tmpBuffer.ptr());
-+	e = new KviDccEvent(KVI_DCC_EVENT_MSG,dcc->tmpBuffer.ptr());
- 	g_pThreadEventDispatcher->postEvent(e,dcc->dccVoiceParent);
- 
- 	kvi_threadTestCancel();
diff --git a/irc/kvirc/files/patch-af b/irc/kvirc/files/patch-af
deleted file mode 100644
index 766254ebe6e6..000000000000
--- a/irc/kvirc/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/kvirc/kvi_frame.cpp	Mon Dec 20 19:07:31 1999
-+++ src/kvirc/kvi_frame.cpp.new	Sat Jan 29 17:58:45 2000
-@@ -80,6 +80,8 @@
- 
- #include "kvi_asyncwhois.h"
- 
-+#undef accept
-+
- #include <qcursor.h>
- #include <qclipboard.h>
- #include <qobjcoll.h>
diff --git a/irc/kvirc/files/patch-ag b/irc/kvirc/files/patch-ag
deleted file mode 100644
index 6dc2cdf37152..000000000000
--- a/irc/kvirc/files/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/kvirc/kvi_input.cpp	Sat Dec 11 08:09:57 1999
-+++ src/kvirc/kvi_input.cpp.new	Sat Jan 29 18:02:53 2000
-@@ -43,8 +43,8 @@
- #include "kvi_strsub.h"
- 
- #include <X11/Xlib.h>
--
- #include <ctype.h>
-+#undef accept
- 
- #include <qnamespace.h>
- #include <qpopupmenu.h>
diff --git a/irc/kvirc/files/patch-ah b/irc/kvirc/files/patch-ah
deleted file mode 100644
index d5dce296bbc6..000000000000
--- a/irc/kvirc/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/kvirc/kvi_dlgscript.cpp	Mon Dec 20 19:19:22 1999
-+++ src/kvirc/kvi_dlgscript.cpp.new	Sat Jan 29 17:56:01 2000
-@@ -45,6 +45,8 @@
- #include "kvi_varcache.h"
- #include "kvi_style.h"
- 
-+#undef accept
-+
- #include <qlayout.h>
- #include <qevent.h>
- #include <qsplitter.h>
diff --git a/irc/kvirc/files/patch-ai b/irc/kvirc/files/patch-ai
deleted file mode 100644
index 7125803900ef..000000000000
--- a/irc/kvirc/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/kvirc/kvi_listbox.cpp	Sat Dec 18 08:40:17 1999
-+++ src/kvirc/kvi_listbox.cpp.new	Sat Jan 29 18:22:23 2000
-@@ -38,6 +38,8 @@
- #include "kvi_query.h"
- #include "kvi_event.h"
- 
-+#undef accept
-+
- #include <qbitmap.h>
- 
- #include <X11/Xlib.h>
diff --git a/irc/kvirc/files/patch-aj b/irc/kvirc/files/patch-aj
deleted file mode 100644
index 4cad9e758d33..000000000000
--- a/irc/kvirc/files/patch-aj
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/kvirc/kvi_helpqml.cpp	Fri Nov 19 11:15:33 1999
-+++ src/kvirc/kvi_helpqml.cpp.new	Sat Jan 29 18:28:26 2000
-@@ -29,6 +29,8 @@
- #include "kvi_options.h"
- #include "kvi_fileutils.h"
- 
-+#undef read
-+
- #include <qfile.h>
- #include <qtextstream.h>
- #include <qnamespace.h>
diff --git a/irc/kvirc/files/patch-ak b/irc/kvirc/files/patch-ak
deleted file mode 100644
index 915317e97f1e..000000000000
--- a/irc/kvirc/files/patch-ak
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/kvirc/kvi_ircview.cpp.orig	Thu Sep 21 14:16:00 2000
-+++ src/kvirc/kvi_ircview.cpp	Thu Sep 21 14:16:50 2000
-@@ -64,6 +64,7 @@
- #include "kvi_statusbar.h"
- 
- #include <X11/Xlib.h>
-+#undef accept
- //#include <X11/X.h> // GCFunctions
- 
- #include <qbitmap.h>
diff --git a/irc/kvirc/files/patch-al b/irc/kvirc/files/patch-al
deleted file mode 100644
index 2c2cb0b9895d..000000000000
--- a/irc/kvirc/files/patch-al
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/kvirc/kvi_systray.h.orig	Thu May  4 00:33:56 2000
-+++ src/kvirc/kvi_systray.h	Thu Sep 21 14:18:52 2000
-@@ -27,6 +27,7 @@
- 
- #include <qwidget.h>
- #include <qpixmap.h>
-+#include <qlist.h>
- #include <qiconset.h>
- #include <qlist.h>
- //#warning "Check <time.h> localtime() gmtime() time() in configure"
diff --git a/irc/kvirc/files/patch-am b/irc/kvirc/files/patch-am
deleted file mode 100644
index 83eaa3322b01..000000000000
--- a/irc/kvirc/files/patch-am
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/kvirc/kvi_dlgoptions.h.orig	Sat May 27 11:12:24 2000
-+++ src/kvirc/kvi_dlgoptions.h	Sun Sep 24 19:28:09 2000
-@@ -31,6 +31,7 @@
- #include <qlabel.h>
- #include <qpushbutton.h>
- #include <qcheckbox.h>
-+#include <qsplitter.h>
- #include <qwidget.h>
- #include <qwidgetstack.h>
- #include <qtableview.h>
diff --git a/irc/kvirc/files/patch-an b/irc/kvirc/files/patch-an
deleted file mode 100644
index 9c35fe2da7af..000000000000
--- a/irc/kvirc/files/patch-an
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/kvirc/kvi_window.h.orig	Fri May 26 09:47:12 2000
-+++ src/kvirc/kvi_window.h	Sun Sep 24 19:48:24 2000
-@@ -74,8 +74,8 @@
- 	* Plugin that this window belongs to (usually 0)
- 	*/
- 	void              *m_pluginHandle;
--	QAccel            *m_pAccelerators;
- #endif //COMPILE_PLUGIN_SUPPORT
-+	QAccel            *m_pAccelerators;
- public:
- 	/**
- 	* The view splitter...
diff --git a/irc/kvirc/pkg-plist b/irc/kvirc/pkg-plist
index 3997d8100160..b136bd680189 100644
--- a/irc/kvirc/pkg-plist
+++ b/irc/kvirc/pkg-plist
@@ -8,7 +8,25 @@ lib/libkvicore.so.2
 lib/libkvilib.so
 lib/libkvilib.so.2
 share/applnk/Internet/kvirc.desktop
-share/icons/hicolor/48x48/kvirc.png
+share/icons/hicolor/16x16/apps/kvirc.png
+share/icons/hicolor/32x32/apps/kvirc.png
+share/icons/hicolor/48x48/apps/kvirc.png
+share/kvirc/charmaps/DANISH
+share/kvirc/charmaps/DUTCH
+share/kvirc/charmaps/FINNISH
+share/kvirc/charmaps/GERMAN
+share/kvirc/charmaps/JIS
+share/kvirc/charmaps/NORWEGIAN_1
+share/kvirc/charmaps/NORWEGIAN_2
+share/kvirc/charmaps/POLISH
+share/kvirc/charmaps/PORTUGUESE
+share/kvirc/charmaps/RUSSIAN
+share/kvirc/charmaps/RUSSIAN_ALT
+share/kvirc/charmaps/RUSSIAN_WIN
+share/kvirc/charmaps/SPANISH
+share/kvirc/charmaps/SWEDISH
+share/kvirc/charmaps/SWEDISH_NAMES
+share/kvirc/charmaps/SWISS
 share/kvirc/config/kvi.alias.conf
 share/kvirc/config/kvi.mime.conf
 share/kvirc/config/kvi.popup.conf
@@ -16,6 +34,7 @@ share/kvirc/config/kvi.server.conf
 share/kvirc/config/kvi.tip_en.conf
 share/kvirc/config/kvi.tip_it.conf
 share/kvirc/config/kvi.view.conf
+share/kvirc/config/plugins/kvi.speak.conf
 share/kvirc/help/en/dalNetWatchList.kvihelp
 share/kvirc/help/en/index.kvihelp
 share/kvirc/help/en/introdIRC.kvihelp
@@ -35,9 +54,12 @@ share/kvirc/help/en/syntax_variables.kvihelp
 share/kvirc/locale/de.mo
 share/kvirc/locale/es.mo
 share/kvirc/locale/it.mo
+share/kvirc/locale/pl.mo
+share/kvirc/locale/pt_br.mo
 share/kvirc/msgcolors/all-black.kviclr
 share/kvirc/msgcolors/all-white.kviclr
 share/kvirc/msgcolors/default.kviclr
+share/kvirc/pics/kvi_about_bg.png
 share/kvirc/pics/kvi_browser_icons.png
 share/kvirc/pics/kvi_connect_state.png
 share/kvirc/pics/kvi_dock.png
@@ -76,14 +98,39 @@ share/kvirc/pics/kvirc_7_32x32.xpm
 share/kvirc/pics/kvirc_7_48x48.xpm
 share/kvirc/pics/kvirc_8_32x32.xpm
 share/kvirc/pics/kvirc_8_48x48.xpm
+share/kvirc/plugins/libkviabout.so
+share/kvirc/plugins/libkviaway.so
+share/kvirc/plugins/libkvibiff.so
+share/kvirc/plugins/libkvicharpicker.so
+share/kvirc/plugins/libkvicountry.so
+share/kvirc/plugins/libkvieditor.so
+share/kvirc/plugins/libkvifserve.so
+share/kvirc/plugins/libkvihello.so
+share/kvirc/plugins/libkviimage.so
+share/kvirc/plugins/libkvimydialog.so
+share/kvirc/plugins/libkvimyplugin.so
+share/kvirc/plugins/libkvispeak.so
+share/kvirc/plugins/libkvistat.so
+share/kvirc/plugins/libkvistyle.so
+share/kvirc/plugins/libkvitkjb.so
+share/kvirc/plugins/libkviurl.so
+share/kvirc/plugins/libkvixmms.so
+@dirrm share/kvirc/plugins
 @dirrm share/kvirc/pics
 @dirrm share/kvirc/msgcolors
 @dirrm share/kvirc/locale
 @dirrm share/kvirc/help/en
 @dirrm share/kvirc/help
+@dirrm share/kvirc/config/plugins
 @dirrm share/kvirc/config
+@dirrm share/kvirc/charmaps
 @dirrm share/kvirc
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/16x16/apps
 @dirrm share/icons/hicolor/48x48
+@dirrm share/icons/hicolor/32x32
+@dirrm share/icons/hicolor/16x16
 @dirrm share/icons/hicolor
 @dirrm share/icons
 @dirrm share/applnk/Internet