Update to version 0.15

10 files changed, 204 insertions, 160 deletions

diff --git a/irc/konversation-kde4/Makefile b/irc/konversation-kde4/Makefile
index 76aeacedf1ac..5b4745df7e1f 100644
--- a/irc/konversation-kde4/Makefile
+++ b/irc/konversation-kde4/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	konversation
-PORTVERSION=	0.14
-PORTREVISION=	1
+PORTVERSION=	0.15
 CATEGORIES=	irc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -23,6 +22,5 @@ USE_GMAKE=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e 's|xx||g' ${WRKSRC}/po/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/irc/konversation-kde4/distinfo b/irc/konversation-kde4/distinfo
index 5ac154df8ffe..e510377562fc 100644
--- a/irc/konversation-kde4/distinfo
+++ b/irc/konversation-kde4/distinfo
@@ -1,2 +1,2 @@
-MD5 (konversation-0.14.tar.bz2) = 3a5b7e80276d4a21af728137f4848fb4
-SIZE (konversation-0.14.tar.bz2) = 1372852
+MD5 (konversation-0.15.tar.bz2) = bfe04391bf75da69fd5aa47464cffd6c
+SIZE (konversation-0.15.tar.bz2) = 2595304
diff --git a/irc/konversation-kde4/files/patch-Makefile.in b/irc/konversation-kde4/files/patch-Makefile.in
deleted file mode 100644
index 401480fa0c91..000000000000
--- a/irc/konversation-kde4/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- konversation/konversation/Makefile.in.orig	Tue Nov  9 12:53:32 2004
-+++ konversation/konversation/Makefile.in	Tue Nov  9 12:54:02 2004
-@@ -278,7 +278,7 @@
- #>- konversation_SOURCES = konviface.skel konversationmainwindow.cpp valuelistviewitem.cpp urlcatcher.cpp searchdialog.cpp prefspagehighlight.cpp scriptlauncher.cpp rawlog.cpp prefspagenotify.cpp prefspagedialogs.cpp prefspagecolorsimages.cpp prefspagebuttons.cpp konvdcop.cpp channellistpanel.cpp konsolepanel.cpp dcctransferhandler.cpp prefspageignore.cpp ircresolver.cpp identity.cpp statuspanel.cpp prefspageappearance.cpp dccrecipientdialog.cpp topiccombobox.cpp prefspagegeneralsettings.cpp prefspagelog.cpp prefspagedccsettings.cpp prefspagescripts.cpp nicksonline.cpp prefspageidentity.cpp prefspage.cpp prefspageserverlist.cpp dccpanel.cpp dcctransfer.cpp ledlistviewitem.cpp highlight.cpp highlightviewitem.cpp nickchangedialog.cpp modebutton.cpp ignorelistviewitem.cpp ignorecheckbox.cpp ignore.cpp nicklistview.cpp ircinput.cpp ledtabbar.cpp ledtab.cpp ledtabwidget.cpp images.cpp editserverdialog.cpp serverlistitem.cpp serverentry.cpp prefsdialog.cpp quickbutton.cpp preferences.cpp chatwindow.cpp outputfilter.cpp query.cpp konversationapplication.cpp nick.cpp inputfilter.cpp channel.cpp ircview.cpp server.cpp ircserversocket.cpp main.cpp prefspageirccolorsui.ui prefspageirccolors.cpp irccolorchooserui.ui irccolorchooser.cpp prefspagealiases.cpp channellistviewitem.cpp osd.cpp prefspageosd.cpp ircevent.cpp trayicon.cpp tabaction.cpp prefspagenickcompletion.cpp prefspagetabbehavior.cpp dccchat.cpp logfilereader.cpp prefspagewebbrowser.cpp multilineedit.cpp nickinfo.cpp dccresumedialog.cpp konversationsound.cpp quickconnectdialog.cpp
- #>+ 1
- konversation_SOURCES= konversationmainwindow.cpp valuelistviewitem.cpp urlcatcher.cpp searchdialog.cpp prefspagehighlight.cpp scriptlauncher.cpp rawlog.cpp prefspagenotify.cpp prefspagedialogs.cpp prefspagecolorsimages.cpp prefspagebuttons.cpp konvdcop.cpp channellistpanel.cpp konsolepanel.cpp dcctransferhandler.cpp prefspageignore.cpp ircresolver.cpp identity.cpp statuspanel.cpp prefspageappearance.cpp dccrecipientdialog.cpp topiccombobox.cpp prefspagegeneralsettings.cpp prefspagelog.cpp prefspagedccsettings.cpp prefspagescripts.cpp nicksonline.cpp prefspageidentity.cpp prefspage.cpp prefspageserverlist.cpp dccpanel.cpp dcctransfer.cpp ledlistviewitem.cpp highlight.cpp highlightviewitem.cpp nickchangedialog.cpp modebutton.cpp ignorelistviewitem.cpp ignorecheckbox.cpp ignore.cpp nicklistview.cpp ircinput.cpp ledtabbar.cpp ledtab.cpp ledtabwidget.cpp images.cpp editserverdialog.cpp serverlistitem.cpp serverentry.cpp prefsdialog.cpp quickbutton.cpp preferences.cpp chatwindow.cpp outputfilter.cpp query.cpp konversationapplication.cpp nick.cpp inputfilter.cpp channel.cpp ircview.cpp server.cpp ircserversocket.cpp main.cpp  prefspageirccolors.cpp  irccolorchooser.cpp prefspagealiases.cpp channellistviewitem.cpp osd.cpp prefspageosd.cpp ircevent.cpp trayicon.cpp tabaction.cpp prefspagenickcompletion.cpp prefspagetabbehavior.cpp dccchat.cpp logfilereader.cpp prefspagewebbrowser.cpp multilineedit.cpp nickinfo.cpp dccresumedialog.cpp konversationsound.cpp quickconnectdialog.cpp konviface_skel.cpp prefspageirccolorsui.cpp irccolorchooserui.cpp
--konversation_LDADD = $(LIB_KIO) -lm $(LIB_ARTS)
-+konversation_LDADD = $(LIB_KIO) -lm $(LIB_ARTS) $(LIBPTHREAD)
- 
- xdg_apps_DATA = konversation.desktop
- 
diff --git a/irc/konversation-kde4/files/patch-outputfilter.cpp b/irc/konversation-kde4/files/patch-outputfilter.cpp
deleted file mode 100644
index c49c639ef3f6..000000000000
--- a/irc/konversation-kde4/files/patch-outputfilter.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- konversation/konversation/outputfilter.cpp.orig	Mon Jul  5 00:37:19 2004
-+++ konversation/konversation/outputfilter.cpp	Mon Jul  5 00:37:43 2004
-@@ -1081,7 +1081,7 @@
-             break;
-           }
-         }
--        if (validGroup and splitted.count() > 1)
-+        if (validGroup && splitted.count() > 1)
-         {
-           QString option = splitted[1];
-           QMap<QString,QString> options = config->entryMap(group);
diff --git a/irc/konversation-kde4/pkg-plist b/irc/konversation-kde4/pkg-plist
index c74147f583ad..616d8b7d1047 100644
--- a/irc/konversation-kde4/pkg-plist
+++ b/irc/konversation-kde4/pkg-plist
@@ -4,7 +4,13 @@ share/applications/kde/konversation.desktop
 share/apps/kconf_update/konversation-0.14-mainwindow.pl
 share/apps/kconf_update/konversation.upd
 share/apps/konversation/eventsrc
-share/apps/konversation/icons/crystalsvg/22x22/actions/konv_message.png
+share/apps/konversation/icons/crystalsvg/16x16/actions/irc_admin.png
+share/apps/konversation/icons/crystalsvg/16x16/actions/irc_away.png
+share/apps/konversation/icons/crystalsvg/16x16/actions/irc_halfop.png
+share/apps/konversation/icons/crystalsvg/16x16/actions/irc_normal.png
+share/apps/konversation/icons/crystalsvg/16x16/actions/irc_op.png
+share/apps/konversation/icons/crystalsvg/16x16/actions/irc_owner.png
+share/apps/konversation/icons/crystalsvg/16x16/actions/irc_voice.png
 share/apps/konversation/images/led_blue_off.png
 share/apps/konversation/images/led_blue_on.png
 share/apps/konversation/images/led_green_off.png
@@ -17,76 +23,110 @@ share/apps/konversation/konversationui.rc
 share/apps/konversation/scripts/amarok
 share/apps/konversation/scripts/bug
 share/apps/konversation/scripts/cmd
+share/apps/konversation/scripts/colorizer
 share/apps/konversation/scripts/fortune
 share/apps/konversation/scripts/fortunes.dat
 share/apps/konversation/scripts/gauge
 share/apps/konversation/scripts/juk
+share/apps/konversation/scripts/kaffeine
 share/apps/konversation/scripts/kdeversion
 share/apps/konversation/scripts/noatun
 share/apps/konversation/scripts/sayclip
 share/apps/konversation/scripts/uptime
-share/doc/HTML/da/konversation/common
-share/doc/HTML/da/konversation/index.cache.bz2
-share/doc/HTML/da/konversation/index.docbook
-share/doc/HTML/en/konversation/channel_screen_co.png
-share/doc/HTML/en/konversation/channel_screen_tour_co.png
-share/doc/HTML/en/konversation/channellist_screen_co.png
-share/doc/HTML/en/konversation/colorchooser_screen.png
-share/doc/HTML/en/konversation/colorize.png
-share/doc/HTML/en/konversation/common
-share/doc/HTML/en/konversation/configure.png
-share/doc/HTML/en/konversation/dccstatus_screen_co.png
-share/doc/HTML/en/konversation/editserver_screen_co.png
-share/doc/HTML/en/konversation/index.cache.bz2
-share/doc/HTML/en/konversation/index.docbook
-share/doc/HTML/en/konversation/led_blue_off.png
-share/doc/HTML/en/konversation/led_blue_on.png
-share/doc/HTML/en/konversation/led_green_off.png
-share/doc/HTML/en/konversation/led_green_on.png
-share/doc/HTML/en/konversation/led_red_off.png
-share/doc/HTML/en/konversation/led_red_on.png
-share/doc/HTML/en/konversation/led_yellow_off.png
-share/doc/HTML/en/konversation/led_yellow_on.png
-share/doc/HTML/en/konversation/nicksonline_screen.png
-share/doc/HTML/en/konversation/notification_screen_co.png
-share/doc/HTML/en/konversation/notifylist_screen_co.png
-share/doc/HTML/en/konversation/osd_demo.png
-share/doc/HTML/en/konversation/osd_screen_co.png
-share/doc/HTML/en/konversation/prefs_identity_screen_co.png
-share/doc/HTML/en/konversation/quickbuttons_screen.png
-share/doc/HTML/en/konversation/quickconnect.png
-share/doc/HTML/en/konversation/quickconnect_screen.png
-share/doc/HTML/en/konversation/serverlist_screen_co.png
-share/doc/HTML/en/konversation/urlcatcher_screen_co.png
-share/doc/HTML/en/konversation/webbrowser_screen_co.png
-share/doc/HTML/et/konversation/common
-share/doc/HTML/et/konversation/index.cache.bz2
-share/doc/HTML/et/konversation/index.docbook
-share/doc/HTML/it/konversation/common
-share/doc/HTML/it/konversation/index.cache.bz2
-share/doc/HTML/it/konversation/index.docbook
-share/doc/HTML/sv/konversation/common
-share/doc/HTML/sv/konversation/index.cache.bz2
-share/doc/HTML/sv/konversation/index.docbook
+share/apps/konversation/scripts/weather
+share/doc/HTML/da/doc/common
+share/doc/HTML/da/doc/index.cache.bz2
+share/doc/HTML/da/doc/index.docbook
+share/doc/HTML/en/doc/addchannel.png
+share/doc/HTML/en/doc/addnetwork_co.png
+share/doc/HTML/en/doc/addserver_co.png
+share/doc/HTML/en/doc/channel_screen_co.png
+share/doc/HTML/en/doc/channel_screen_tour_co.png
+share/doc/HTML/en/doc/channellist_screen_co.png
+share/doc/HTML/en/doc/checkidentities.png
+share/doc/HTML/en/doc/colorchooser_screen.png
+share/doc/HTML/en/doc/colorize.png
+share/doc/HTML/en/doc/common
+share/doc/HTML/en/doc/configure.png
+share/doc/HTML/en/doc/cr16-action-irc_admin.png
+share/doc/HTML/en/doc/cr16-action-irc_away.png
+share/doc/HTML/en/doc/cr16-action-irc_halfop.png
+share/doc/HTML/en/doc/cr16-action-irc_normal.png
+share/doc/HTML/en/doc/cr16-action-irc_op.png
+share/doc/HTML/en/doc/cr16-action-irc_owner.png
+share/doc/HTML/en/doc/cr16-action-irc_voice.png
+share/doc/HTML/en/doc/dccstatus_screen_co.png
+share/doc/HTML/en/doc/editserver_screen_co.png
+share/doc/HTML/en/doc/first_channel_co.png
+share/doc/HTML/en/doc/first_serverlist_co.png
+share/doc/HTML/en/doc/identities_adv_co.png
+share/doc/HTML/en/doc/identities_away_co.png
+share/doc/HTML/en/doc/identities_gen_co.png
+share/doc/HTML/en/doc/index.cache.bz2
+share/doc/HTML/en/doc/index.docbook
+share/doc/HTML/en/doc/kaddressbook.png
+share/doc/HTML/en/doc/kimproxy_create_screen2.png
+share/doc/HTML/en/doc/kimproxy_create_screen_co.png
+share/doc/HTML/en/doc/led_blue_off.png
+share/doc/HTML/en/doc/led_blue_on.png
+share/doc/HTML/en/doc/led_green_off.png
+share/doc/HTML/en/doc/led_green_on.png
+share/doc/HTML/en/doc/led_red_off.png
+share/doc/HTML/en/doc/led_red_on.png
+share/doc/HTML/en/doc/led_yellow_off.png
+share/doc/HTML/en/doc/led_yellow_on.png
+share/doc/HTML/en/doc/logviewer_co.png
+share/doc/HTML/en/doc/nicksonline_co.png
+share/doc/HTML/en/doc/notification_screen_co.png
+share/doc/HTML/en/doc/notifylist_screen_co.png
+share/doc/HTML/en/doc/osd_demo.png
+share/doc/HTML/en/doc/osd_screen_co.png
+share/doc/HTML/en/doc/prefs_identity_screen_co.png
+share/doc/HTML/en/doc/quickbuttons_screen.png
+share/doc/HTML/en/doc/quickconnect_screen.png
+share/doc/HTML/en/doc/serverlist_co.png
+share/doc/HTML/en/doc/serverlist_screen_co.png
+share/doc/HTML/en/doc/urlcatcher_screen_co.png
+share/doc/HTML/en/doc/webbrowser_screen_co.png
+share/doc/HTML/et/doc/common
+share/doc/HTML/et/doc/index.cache.bz2
+share/doc/HTML/et/doc/index.docbook
+share/doc/HTML/it/doc/common
+share/doc/HTML/it/doc/index.cache.bz2
+share/doc/HTML/it/doc/index.docbook
+share/doc/HTML/pt/doc/common
+share/doc/HTML/pt/doc/index.cache.bz2
+share/doc/HTML/pt/doc/index.docbook
+share/doc/HTML/sv/doc/common
+share/doc/HTML/sv/doc/index.cache.bz2
+share/doc/HTML/sv/doc/index.docbook
 share/icons/crystalsvg/128x128/apps/konversation.png
 share/icons/crystalsvg/16x16/apps/konversation.png
+share/icons/crystalsvg/22x22/actions/konv_message.png
 share/icons/crystalsvg/22x22/apps/konversation.png
 share/icons/crystalsvg/32x32/apps/konversation.png
 share/icons/crystalsvg/48x48/apps/konversation.png
 share/icons/crystalsvg/64x64/apps/konversation.png
+share/icons/crystalsvg/scalable/actions/konv_message.svgz
+share/icons/crystalsvg/scalable/apps/konversation.svgz
+share/locale/br/LC_MESSAGES/konversation.mo
 share/locale/ca/LC_MESSAGES/konversation.mo
+share/locale/cy/LC_MESSAGES/konversation.mo
 share/locale/da/LC_MESSAGES/konversation.mo
 share/locale/de/LC_MESSAGES/konversation.mo
 share/locale/en_GB/LC_MESSAGES/konversation.mo
 share/locale/es/LC_MESSAGES/konversation.mo
 share/locale/et/LC_MESSAGES/konversation.mo
 share/locale/fi/LC_MESSAGES/konversation.mo
+share/locale/fr/LC_MESSAGES/konversation.mo
+share/locale/ga/LC_MESSAGES/konversation.mo
 share/locale/is/LC_MESSAGES/konversation.mo
 share/locale/it/LC_MESSAGES/konversation.mo
 share/locale/ja/LC_MESSAGES/konversation.mo
 share/locale/ko/LC_MESSAGES/konversation.mo
 share/locale/nb/LC_MESSAGES/konversation.mo
 share/locale/nl/LC_MESSAGES/konversation.mo
+share/locale/pl/LC_MESSAGES/konversation.mo
 share/locale/pt/LC_MESSAGES/konversation.mo
 share/locale/pt_BR/LC_MESSAGES/konversation.mo
 share/locale/ro/LC_MESSAGES/konversation.mo
@@ -97,9 +137,12 @@ share/locale/sv/LC_MESSAGES/konversation.mo
 share/locale/ta/LC_MESSAGES/konversation.mo
 share/locale/tr/LC_MESSAGES/konversation.mo
 share/locale/zh_CN/LC_MESSAGES/konversation.mo
-share/services/irc.protocol
-share/services/irc6.protocol
+share/services/konvirc.protocol
+share/services/konvirc6.protocol
 @unexec rmdir %D/share/services 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/scalable/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/scalable/actions 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/scalable 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/64x64/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/64x64 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/48x48/apps 2>/dev/null || true
@@ -107,6 +150,7 @@ share/services/irc6.protocol
 @unexec rmdir %D/share/icons/crystalsvg/32x32/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/22x22/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/22x22/actions 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/16x16/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true
@@ -114,21 +158,23 @@ share/services/irc6.protocol
 @unexec rmdir %D/share/icons/crystalsvg/128x128 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true
 @unexec rmdir %D/share/icons 2>/dev/null || true
-@dirrm share/doc/HTML/sv/konversation
+@dirrm share/doc/HTML/sv/doc
 @unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
-@dirrm share/doc/HTML/it/konversation
+@dirrm share/doc/HTML/pt/doc
+@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrm share/doc/HTML/it/doc
 @unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
-@dirrm share/doc/HTML/et/konversation
+@dirrm share/doc/HTML/et/doc
 @unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
-@dirrm share/doc/HTML/en/konversation
+@dirrm share/doc/HTML/en/doc
 @unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@dirrm share/doc/HTML/da/konversation
+@dirrm share/doc/HTML/da/doc
 @unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true
 @unexec rmdir %D/share/doc/HTML 2>/dev/null || true
 @dirrm share/apps/konversation/scripts
 @dirrm share/apps/konversation/images
-@dirrm share/apps/konversation/icons/crystalsvg/22x22/actions
-@dirrm share/apps/konversation/icons/crystalsvg/22x22
+@dirrm share/apps/konversation/icons/crystalsvg/16x16/actions
+@dirrm share/apps/konversation/icons/crystalsvg/16x16
 @dirrm share/apps/konversation/icons/crystalsvg
 @dirrm share/apps/konversation/icons
 @dirrm share/apps/konversation
diff --git a/irc/konversation/Makefile b/irc/konversation/Makefile
index 76aeacedf1ac..5b4745df7e1f 100644
--- a/irc/konversation/Makefile
+++ b/irc/konversation/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	konversation
-PORTVERSION=	0.14
-PORTREVISION=	1
+PORTVERSION=	0.15
 CATEGORIES=	irc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -23,6 +22,5 @@ USE_GMAKE=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e 's|xx||g' ${WRKSRC}/po/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/irc/konversation/distinfo b/irc/konversation/distinfo
index 5ac154df8ffe..e510377562fc 100644
--- a/irc/konversation/distinfo
+++ b/irc/konversation/distinfo
@@ -1,2 +1,2 @@
-MD5 (konversation-0.14.tar.bz2) = 3a5b7e80276d4a21af728137f4848fb4
-SIZE (konversation-0.14.tar.bz2) = 1372852
+MD5 (konversation-0.15.tar.bz2) = bfe04391bf75da69fd5aa47464cffd6c
+SIZE (konversation-0.15.tar.bz2) = 2595304
diff --git a/irc/konversation/files/patch-Makefile.in b/irc/konversation/files/patch-Makefile.in
deleted file mode 100644
index 401480fa0c91..000000000000
--- a/irc/konversation/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- konversation/konversation/Makefile.in.orig	Tue Nov  9 12:53:32 2004
-+++ konversation/konversation/Makefile.in	Tue Nov  9 12:54:02 2004
-@@ -278,7 +278,7 @@
- #>- konversation_SOURCES = konviface.skel konversationmainwindow.cpp valuelistviewitem.cpp urlcatcher.cpp searchdialog.cpp prefspagehighlight.cpp scriptlauncher.cpp rawlog.cpp prefspagenotify.cpp prefspagedialogs.cpp prefspagecolorsimages.cpp prefspagebuttons.cpp konvdcop.cpp channellistpanel.cpp konsolepanel.cpp dcctransferhandler.cpp prefspageignore.cpp ircresolver.cpp identity.cpp statuspanel.cpp prefspageappearance.cpp dccrecipientdialog.cpp topiccombobox.cpp prefspagegeneralsettings.cpp prefspagelog.cpp prefspagedccsettings.cpp prefspagescripts.cpp nicksonline.cpp prefspageidentity.cpp prefspage.cpp prefspageserverlist.cpp dccpanel.cpp dcctransfer.cpp ledlistviewitem.cpp highlight.cpp highlightviewitem.cpp nickchangedialog.cpp modebutton.cpp ignorelistviewitem.cpp ignorecheckbox.cpp ignore.cpp nicklistview.cpp ircinput.cpp ledtabbar.cpp ledtab.cpp ledtabwidget.cpp images.cpp editserverdialog.cpp serverlistitem.cpp serverentry.cpp prefsdialog.cpp quickbutton.cpp preferences.cpp chatwindow.cpp outputfilter.cpp query.cpp konversationapplication.cpp nick.cpp inputfilter.cpp channel.cpp ircview.cpp server.cpp ircserversocket.cpp main.cpp prefspageirccolorsui.ui prefspageirccolors.cpp irccolorchooserui.ui irccolorchooser.cpp prefspagealiases.cpp channellistviewitem.cpp osd.cpp prefspageosd.cpp ircevent.cpp trayicon.cpp tabaction.cpp prefspagenickcompletion.cpp prefspagetabbehavior.cpp dccchat.cpp logfilereader.cpp prefspagewebbrowser.cpp multilineedit.cpp nickinfo.cpp dccresumedialog.cpp konversationsound.cpp quickconnectdialog.cpp
- #>+ 1
- konversation_SOURCES= konversationmainwindow.cpp valuelistviewitem.cpp urlcatcher.cpp searchdialog.cpp prefspagehighlight.cpp scriptlauncher.cpp rawlog.cpp prefspagenotify.cpp prefspagedialogs.cpp prefspagecolorsimages.cpp prefspagebuttons.cpp konvdcop.cpp channellistpanel.cpp konsolepanel.cpp dcctransferhandler.cpp prefspageignore.cpp ircresolver.cpp identity.cpp statuspanel.cpp prefspageappearance.cpp dccrecipientdialog.cpp topiccombobox.cpp prefspagegeneralsettings.cpp prefspagelog.cpp prefspagedccsettings.cpp prefspagescripts.cpp nicksonline.cpp prefspageidentity.cpp prefspage.cpp prefspageserverlist.cpp dccpanel.cpp dcctransfer.cpp ledlistviewitem.cpp highlight.cpp highlightviewitem.cpp nickchangedialog.cpp modebutton.cpp ignorelistviewitem.cpp ignorecheckbox.cpp ignore.cpp nicklistview.cpp ircinput.cpp ledtabbar.cpp ledtab.cpp ledtabwidget.cpp images.cpp editserverdialog.cpp serverlistitem.cpp serverentry.cpp prefsdialog.cpp quickbutton.cpp preferences.cpp chatwindow.cpp outputfilter.cpp query.cpp konversationapplication.cpp nick.cpp inputfilter.cpp channel.cpp ircview.cpp server.cpp ircserversocket.cpp main.cpp  prefspageirccolors.cpp  irccolorchooser.cpp prefspagealiases.cpp channellistviewitem.cpp osd.cpp prefspageosd.cpp ircevent.cpp trayicon.cpp tabaction.cpp prefspagenickcompletion.cpp prefspagetabbehavior.cpp dccchat.cpp logfilereader.cpp prefspagewebbrowser.cpp multilineedit.cpp nickinfo.cpp dccresumedialog.cpp konversationsound.cpp quickconnectdialog.cpp konviface_skel.cpp prefspageirccolorsui.cpp irccolorchooserui.cpp
--konversation_LDADD = $(LIB_KIO) -lm $(LIB_ARTS)
-+konversation_LDADD = $(LIB_KIO) -lm $(LIB_ARTS) $(LIBPTHREAD)
- 
- xdg_apps_DATA = konversation.desktop
- 
diff --git a/irc/konversation/files/patch-outputfilter.cpp b/irc/konversation/files/patch-outputfilter.cpp
deleted file mode 100644
index c49c639ef3f6..000000000000
--- a/irc/konversation/files/patch-outputfilter.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- konversation/konversation/outputfilter.cpp.orig	Mon Jul  5 00:37:19 2004
-+++ konversation/konversation/outputfilter.cpp	Mon Jul  5 00:37:43 2004
-@@ -1081,7 +1081,7 @@
-             break;
-           }
-         }
--        if (validGroup and splitted.count() > 1)
-+        if (validGroup && splitted.count() > 1)
-         {
-           QString option = splitted[1];
-           QMap<QString,QString> options = config->entryMap(group);
diff --git a/irc/konversation/pkg-plist b/irc/konversation/pkg-plist
index c74147f583ad..616d8b7d1047 100644
--- a/irc/konversation/pkg-plist
+++ b/irc/konversation/pkg-plist
@@ -4,7 +4,13 @@ share/applications/kde/konversation.desktop
 share/apps/kconf_update/konversation-0.14-mainwindow.pl
 share/apps/kconf_update/konversation.upd
 share/apps/konversation/eventsrc
-share/apps/konversation/icons/crystalsvg/22x22/actions/konv_message.png
+share/apps/konversation/icons/crystalsvg/16x16/actions/irc_admin.png
+share/apps/konversation/icons/crystalsvg/16x16/actions/irc_away.png
+share/apps/konversation/icons/crystalsvg/16x16/actions/irc_halfop.png
+share/apps/konversation/icons/crystalsvg/16x16/actions/irc_normal.png
+share/apps/konversation/icons/crystalsvg/16x16/actions/irc_op.png
+share/apps/konversation/icons/crystalsvg/16x16/actions/irc_owner.png
+share/apps/konversation/icons/crystalsvg/16x16/actions/irc_voice.png
 share/apps/konversation/images/led_blue_off.png
 share/apps/konversation/images/led_blue_on.png
 share/apps/konversation/images/led_green_off.png
@@ -17,76 +23,110 @@ share/apps/konversation/konversationui.rc
 share/apps/konversation/scripts/amarok
 share/apps/konversation/scripts/bug
 share/apps/konversation/scripts/cmd
+share/apps/konversation/scripts/colorizer
 share/apps/konversation/scripts/fortune
 share/apps/konversation/scripts/fortunes.dat
 share/apps/konversation/scripts/gauge
 share/apps/konversation/scripts/juk
+share/apps/konversation/scripts/kaffeine
 share/apps/konversation/scripts/kdeversion
 share/apps/konversation/scripts/noatun
 share/apps/konversation/scripts/sayclip
 share/apps/konversation/scripts/uptime
-share/doc/HTML/da/konversation/common
-share/doc/HTML/da/konversation/index.cache.bz2
-share/doc/HTML/da/konversation/index.docbook
-share/doc/HTML/en/konversation/channel_screen_co.png
-share/doc/HTML/en/konversation/channel_screen_tour_co.png
-share/doc/HTML/en/konversation/channellist_screen_co.png
-share/doc/HTML/en/konversation/colorchooser_screen.png
-share/doc/HTML/en/konversation/colorize.png
-share/doc/HTML/en/konversation/common
-share/doc/HTML/en/konversation/configure.png
-share/doc/HTML/en/konversation/dccstatus_screen_co.png
-share/doc/HTML/en/konversation/editserver_screen_co.png
-share/doc/HTML/en/konversation/index.cache.bz2
-share/doc/HTML/en/konversation/index.docbook
-share/doc/HTML/en/konversation/led_blue_off.png
-share/doc/HTML/en/konversation/led_blue_on.png
-share/doc/HTML/en/konversation/led_green_off.png
-share/doc/HTML/en/konversation/led_green_on.png
-share/doc/HTML/en/konversation/led_red_off.png
-share/doc/HTML/en/konversation/led_red_on.png
-share/doc/HTML/en/konversation/led_yellow_off.png
-share/doc/HTML/en/konversation/led_yellow_on.png
-share/doc/HTML/en/konversation/nicksonline_screen.png
-share/doc/HTML/en/konversation/notification_screen_co.png
-share/doc/HTML/en/konversation/notifylist_screen_co.png
-share/doc/HTML/en/konversation/osd_demo.png
-share/doc/HTML/en/konversation/osd_screen_co.png
-share/doc/HTML/en/konversation/prefs_identity_screen_co.png
-share/doc/HTML/en/konversation/quickbuttons_screen.png
-share/doc/HTML/en/konversation/quickconnect.png
-share/doc/HTML/en/konversation/quickconnect_screen.png
-share/doc/HTML/en/konversation/serverlist_screen_co.png
-share/doc/HTML/en/konversation/urlcatcher_screen_co.png
-share/doc/HTML/en/konversation/webbrowser_screen_co.png
-share/doc/HTML/et/konversation/common
-share/doc/HTML/et/konversation/index.cache.bz2
-share/doc/HTML/et/konversation/index.docbook
-share/doc/HTML/it/konversation/common
-share/doc/HTML/it/konversation/index.cache.bz2
-share/doc/HTML/it/konversation/index.docbook
-share/doc/HTML/sv/konversation/common
-share/doc/HTML/sv/konversation/index.cache.bz2
-share/doc/HTML/sv/konversation/index.docbook
+share/apps/konversation/scripts/weather
+share/doc/HTML/da/doc/common
+share/doc/HTML/da/doc/index.cache.bz2
+share/doc/HTML/da/doc/index.docbook
+share/doc/HTML/en/doc/addchannel.png
+share/doc/HTML/en/doc/addnetwork_co.png
+share/doc/HTML/en/doc/addserver_co.png
+share/doc/HTML/en/doc/channel_screen_co.png
+share/doc/HTML/en/doc/channel_screen_tour_co.png
+share/doc/HTML/en/doc/channellist_screen_co.png
+share/doc/HTML/en/doc/checkidentities.png
+share/doc/HTML/en/doc/colorchooser_screen.png
+share/doc/HTML/en/doc/colorize.png
+share/doc/HTML/en/doc/common
+share/doc/HTML/en/doc/configure.png
+share/doc/HTML/en/doc/cr16-action-irc_admin.png
+share/doc/HTML/en/doc/cr16-action-irc_away.png
+share/doc/HTML/en/doc/cr16-action-irc_halfop.png
+share/doc/HTML/en/doc/cr16-action-irc_normal.png
+share/doc/HTML/en/doc/cr16-action-irc_op.png
+share/doc/HTML/en/doc/cr16-action-irc_owner.png
+share/doc/HTML/en/doc/cr16-action-irc_voice.png
+share/doc/HTML/en/doc/dccstatus_screen_co.png
+share/doc/HTML/en/doc/editserver_screen_co.png
+share/doc/HTML/en/doc/first_channel_co.png
+share/doc/HTML/en/doc/first_serverlist_co.png
+share/doc/HTML/en/doc/identities_adv_co.png
+share/doc/HTML/en/doc/identities_away_co.png
+share/doc/HTML/en/doc/identities_gen_co.png
+share/doc/HTML/en/doc/index.cache.bz2
+share/doc/HTML/en/doc/index.docbook
+share/doc/HTML/en/doc/kaddressbook.png
+share/doc/HTML/en/doc/kimproxy_create_screen2.png
+share/doc/HTML/en/doc/kimproxy_create_screen_co.png
+share/doc/HTML/en/doc/led_blue_off.png
+share/doc/HTML/en/doc/led_blue_on.png
+share/doc/HTML/en/doc/led_green_off.png
+share/doc/HTML/en/doc/led_green_on.png
+share/doc/HTML/en/doc/led_red_off.png
+share/doc/HTML/en/doc/led_red_on.png
+share/doc/HTML/en/doc/led_yellow_off.png
+share/doc/HTML/en/doc/led_yellow_on.png
+share/doc/HTML/en/doc/logviewer_co.png
+share/doc/HTML/en/doc/nicksonline_co.png
+share/doc/HTML/en/doc/notification_screen_co.png
+share/doc/HTML/en/doc/notifylist_screen_co.png
+share/doc/HTML/en/doc/osd_demo.png
+share/doc/HTML/en/doc/osd_screen_co.png
+share/doc/HTML/en/doc/prefs_identity_screen_co.png
+share/doc/HTML/en/doc/quickbuttons_screen.png
+share/doc/HTML/en/doc/quickconnect_screen.png
+share/doc/HTML/en/doc/serverlist_co.png
+share/doc/HTML/en/doc/serverlist_screen_co.png
+share/doc/HTML/en/doc/urlcatcher_screen_co.png
+share/doc/HTML/en/doc/webbrowser_screen_co.png
+share/doc/HTML/et/doc/common
+share/doc/HTML/et/doc/index.cache.bz2
+share/doc/HTML/et/doc/index.docbook
+share/doc/HTML/it/doc/common
+share/doc/HTML/it/doc/index.cache.bz2
+share/doc/HTML/it/doc/index.docbook
+share/doc/HTML/pt/doc/common
+share/doc/HTML/pt/doc/index.cache.bz2
+share/doc/HTML/pt/doc/index.docbook
+share/doc/HTML/sv/doc/common
+share/doc/HTML/sv/doc/index.cache.bz2
+share/doc/HTML/sv/doc/index.docbook
 share/icons/crystalsvg/128x128/apps/konversation.png
 share/icons/crystalsvg/16x16/apps/konversation.png
+share/icons/crystalsvg/22x22/actions/konv_message.png
 share/icons/crystalsvg/22x22/apps/konversation.png
 share/icons/crystalsvg/32x32/apps/konversation.png
 share/icons/crystalsvg/48x48/apps/konversation.png
 share/icons/crystalsvg/64x64/apps/konversation.png
+share/icons/crystalsvg/scalable/actions/konv_message.svgz
+share/icons/crystalsvg/scalable/apps/konversation.svgz
+share/locale/br/LC_MESSAGES/konversation.mo
 share/locale/ca/LC_MESSAGES/konversation.mo
+share/locale/cy/LC_MESSAGES/konversation.mo
 share/locale/da/LC_MESSAGES/konversation.mo
 share/locale/de/LC_MESSAGES/konversation.mo
 share/locale/en_GB/LC_MESSAGES/konversation.mo
 share/locale/es/LC_MESSAGES/konversation.mo
 share/locale/et/LC_MESSAGES/konversation.mo
 share/locale/fi/LC_MESSAGES/konversation.mo
+share/locale/fr/LC_MESSAGES/konversation.mo
+share/locale/ga/LC_MESSAGES/konversation.mo
 share/locale/is/LC_MESSAGES/konversation.mo
 share/locale/it/LC_MESSAGES/konversation.mo
 share/locale/ja/LC_MESSAGES/konversation.mo
 share/locale/ko/LC_MESSAGES/konversation.mo
 share/locale/nb/LC_MESSAGES/konversation.mo
 share/locale/nl/LC_MESSAGES/konversation.mo
+share/locale/pl/LC_MESSAGES/konversation.mo
 share/locale/pt/LC_MESSAGES/konversation.mo
 share/locale/pt_BR/LC_MESSAGES/konversation.mo
 share/locale/ro/LC_MESSAGES/konversation.mo
@@ -97,9 +137,12 @@ share/locale/sv/LC_MESSAGES/konversation.mo
 share/locale/ta/LC_MESSAGES/konversation.mo
 share/locale/tr/LC_MESSAGES/konversation.mo
 share/locale/zh_CN/LC_MESSAGES/konversation.mo
-share/services/irc.protocol
-share/services/irc6.protocol
+share/services/konvirc.protocol
+share/services/konvirc6.protocol
 @unexec rmdir %D/share/services 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/scalable/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/scalable/actions 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/scalable 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/64x64/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/64x64 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/48x48/apps 2>/dev/null || true
@@ -107,6 +150,7 @@ share/services/irc6.protocol
 @unexec rmdir %D/share/icons/crystalsvg/32x32/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/22x22/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/22x22/actions 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/16x16/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/16x16 2>/dev/null || true
@@ -114,21 +158,23 @@ share/services/irc6.protocol
 @unexec rmdir %D/share/icons/crystalsvg/128x128 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true
 @unexec rmdir %D/share/icons 2>/dev/null || true
-@dirrm share/doc/HTML/sv/konversation
+@dirrm share/doc/HTML/sv/doc
 @unexec rmdir %D/share/doc/HTML/sv 2>/dev/null || true
-@dirrm share/doc/HTML/it/konversation
+@dirrm share/doc/HTML/pt/doc
+@unexec rmdir %D/share/doc/HTML/pt 2>/dev/null || true
+@dirrm share/doc/HTML/it/doc
 @unexec rmdir %D/share/doc/HTML/it 2>/dev/null || true
-@dirrm share/doc/HTML/et/konversation
+@dirrm share/doc/HTML/et/doc
 @unexec rmdir %D/share/doc/HTML/et 2>/dev/null || true
-@dirrm share/doc/HTML/en/konversation
+@dirrm share/doc/HTML/en/doc
 @unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@dirrm share/doc/HTML/da/konversation
+@dirrm share/doc/HTML/da/doc
 @unexec rmdir %D/share/doc/HTML/da 2>/dev/null || true
 @unexec rmdir %D/share/doc/HTML 2>/dev/null || true
 @dirrm share/apps/konversation/scripts
 @dirrm share/apps/konversation/images
-@dirrm share/apps/konversation/icons/crystalsvg/22x22/actions
-@dirrm share/apps/konversation/icons/crystalsvg/22x22
+@dirrm share/apps/konversation/icons/crystalsvg/16x16/actions
+@dirrm share/apps/konversation/icons/crystalsvg/16x16
 @dirrm share/apps/konversation/icons/crystalsvg
 @dirrm share/apps/konversation/icons
 @dirrm share/apps/konversation