Update to 1.4

A brief selection of highlights since v1.3.1:
* URL and email detection in text views has been rewritten from scratch, greatly
  improving the handling of various types of URLs and the contexts they might
  appear in.
* Extensive improvements to IRC formatting code handling, including the return
  of background color support.
* Extensive, sometimes full rewrites of user interface elements such as nearly
  all context menus, the URL Catcher and the Warning Dialogs system for a long
  list of user interface improvements and bug fixes.
* Improved SSL connection behavior.
* Translation support and various other improvements in several bundled scripts.
* Expanded Python scripting support via the introduction of an API support
  package.
* Support for more IRC numerics.
* Various bugfixes to input line command handling and connection behavior.

4 files changed, 24 insertions, 71 deletions

diff --git a/chat/konversation/Makefile b/chat/konversation/Makefile
index 4e14d4d15e0..bf685ca0449 100644
--- a/chat/konversation/Makefile
+++ b/chat/konversation/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.39 2012/03/15 11:53:21 obache Exp $
+# $NetBSD: Makefile,v 1.40 2012/03/20 10:36:40 markd Exp $
 #
 
-DISTNAME=	konversation-1.3.1
-PKGREVISION=	11
+DISTNAME=	konversation-1.4
 CATEGORIES=	chat kde
-MASTER_SITES=	${MASTER_SITE_KDE:=konversation/1.3.1/src/}
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_KDE:=konversation/1.4/src/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://konversation.kde.org/
@@ -16,7 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4
 
-USE_CMAKE=	yes
 USE_TOOLS+=	perl msgfmt
 USE_LANGUAGES=	c c++
 
@@ -24,6 +22,7 @@ REPLACE_BASH+=		data/scripts/*
 REPLACE_PERL+=		data/updaters/konversation-*.pl
 REPLACE_PERL+=		data/scripts/*
 REPLACE_PYTHON+=	data/scripts/*
+REPLACE_PYTHON+=	data/scripting_support/python/konversation/dbus.py 
 
 USE_TOOLS+=		bash:run
 
diff --git a/chat/konversation/PLIST b/chat/konversation/PLIST
index f4f9863c625..633a75567fb 100644
--- a/chat/konversation/PLIST
+++ b/chat/konversation/PLIST
@@ -1,21 +1,21 @@
-@comment $NetBSD: PLIST,v 1.10 2010/10/27 06:35:59 markd Exp $
+@comment $NetBSD: PLIST,v 1.11 2012/03/20 10:36:40 markd Exp $
 bin/konversation
 share/applications/kde4/konversation.desktop
+share/doc/kde/HTML/de/konversation/common
+share/doc/kde/HTML/de/konversation/index.cache.bz2
+share/doc/kde/HTML/de/konversation/index.docbook
 share/doc/kde/HTML/en/konversation/addchannel.png
 share/doc/kde/HTML/en/konversation/addnetwork_co.png
 share/doc/kde/HTML/en/konversation/addserver_co.png
-share/doc/kde/HTML/en/konversation/channel_screen_co.png
 share/doc/kde/HTML/en/konversation/channel_screen_tour_co.png
 share/doc/kde/HTML/en/konversation/channellist_screen_co.png
 share/doc/kde/HTML/en/konversation/checkidentities.png
 share/doc/kde/HTML/en/konversation/colorchooser_screen.png
-share/doc/kde/HTML/en/konversation/colorize.png
 share/doc/kde/HTML/en/konversation/common
-share/doc/kde/HTML/en/konversation/configure.png
 share/doc/kde/HTML/en/konversation/dccstatus_screen_co.png
-share/doc/kde/HTML/en/konversation/editserver_screen_co.png
 share/doc/kde/HTML/en/konversation/first_channel_co.png
 share/doc/kde/HTML/en/konversation/first_serverlist_co.png
+share/doc/kde/HTML/en/konversation/format-text-color.png
 share/doc/kde/HTML/en/konversation/highlighting_screen_co.png
 share/doc/kde/HTML/en/konversation/identities_adv_co.png
 share/doc/kde/HTML/en/konversation/identities_away_co.png
@@ -32,13 +32,9 @@ share/doc/kde/HTML/en/konversation/irc_voice.png
 share/doc/kde/HTML/en/konversation/kaddressbook.png
 share/doc/kde/HTML/en/konversation/kimproxy_create_screen2.png
 share/doc/kde/HTML/en/konversation/kimproxy_create_screen_co.png
-share/doc/kde/HTML/en/konversation/led_blue_off.png
 share/doc/kde/HTML/en/konversation/led_blue_on.png
-share/doc/kde/HTML/en/konversation/led_green_off.png
 share/doc/kde/HTML/en/konversation/led_green_on.png
-share/doc/kde/HTML/en/konversation/led_red_off.png
 share/doc/kde/HTML/en/konversation/led_red_on.png
-share/doc/kde/HTML/en/konversation/led_yellow_off.png
 share/doc/kde/HTML/en/konversation/led_yellow_on.png
 share/doc/kde/HTML/en/konversation/logviewer_co.png
 share/doc/kde/HTML/en/konversation/nicksonline_co.png
@@ -47,53 +43,23 @@ share/doc/kde/HTML/en/konversation/notification_screen_co.png
 share/doc/kde/HTML/en/konversation/notifylist_screen_co.png
 share/doc/kde/HTML/en/konversation/osd_demo.png
 share/doc/kde/HTML/en/konversation/osd_screen_co.png
-share/doc/kde/HTML/en/konversation/prefs_identity_screen_co.png
 share/doc/kde/HTML/en/konversation/quickbuttons_screen.png
 share/doc/kde/HTML/en/konversation/quickconnect_screen.png
 share/doc/kde/HTML/en/konversation/serverlist_co.png
-share/doc/kde/HTML/en/konversation/serverlist_screen_co.png
 share/doc/kde/HTML/en/konversation/urlcatcher_screen_co.png
 share/doc/kde/HTML/en/konversation/webbrowser_screen_co.png
 share/doc/kde/HTML/et/konversation/common
 share/doc/kde/HTML/et/konversation/index.cache.bz2
 share/doc/kde/HTML/et/konversation/index.docbook
-share/doc/kde/HTML/it/konversation/common
-share/doc/kde/HTML/it/konversation/index.cache.bz2
-share/doc/kde/HTML/it/konversation/index.docbook
+share/doc/kde/HTML/nl/konversation/common
+share/doc/kde/HTML/nl/konversation/index.cache.bz2
+share/doc/kde/HTML/nl/konversation/index.docbook
 share/doc/kde/HTML/pt_BR/konversation/common
 share/doc/kde/HTML/pt_BR/konversation/index.cache.bz2
 share/doc/kde/HTML/pt_BR/konversation/index.docbook
-share/doc/kde/HTML/sv/konversation/addchannel.png
-share/doc/kde/HTML/sv/konversation/addnetwork_co.png
-share/doc/kde/HTML/sv/konversation/addserver_co.png
-share/doc/kde/HTML/sv/konversation/channel_screen_tour_co.png
-share/doc/kde/HTML/sv/konversation/channellist_screen_co.png
-share/doc/kde/HTML/sv/konversation/checkidentities.png
-share/doc/kde/HTML/sv/konversation/colorchooser_screen.png
 share/doc/kde/HTML/sv/konversation/common
-share/doc/kde/HTML/sv/konversation/dccstatus_screen_co.png
-share/doc/kde/HTML/sv/konversation/first_channel_co.png
-share/doc/kde/HTML/sv/konversation/first_serverlist_co.png
-share/doc/kde/HTML/sv/konversation/highlighting_screen_co.png
-share/doc/kde/HTML/sv/konversation/identities_adv_co.png
-share/doc/kde/HTML/sv/konversation/identities_away_co.png
-share/doc/kde/HTML/sv/konversation/identities_gen_co.png
 share/doc/kde/HTML/sv/konversation/index.cache.bz2
 share/doc/kde/HTML/sv/konversation/index.docbook
-share/doc/kde/HTML/sv/konversation/kimproxy_create_screen2.png
-share/doc/kde/HTML/sv/konversation/kimproxy_create_screen_co.png
-share/doc/kde/HTML/sv/konversation/logviewer_co.png
-share/doc/kde/HTML/sv/konversation/nicksonline_co.png
-share/doc/kde/HTML/sv/konversation/nickthemes_screen_co.png
-share/doc/kde/HTML/sv/konversation/notification_screen_co.png
-share/doc/kde/HTML/sv/konversation/notifylist_screen_co.png
-share/doc/kde/HTML/sv/konversation/osd_demo.png
-share/doc/kde/HTML/sv/konversation/osd_screen_co.png
-share/doc/kde/HTML/sv/konversation/quickbuttons_screen.png
-share/doc/kde/HTML/sv/konversation/quickconnect_screen.png
-share/doc/kde/HTML/sv/konversation/serverlist_co.png
-share/doc/kde/HTML/sv/konversation/urlcatcher_screen_co.png
-share/doc/kde/HTML/sv/konversation/webbrowser_screen_co.png
 share/doc/kde/HTML/uk/konversation/common
 share/doc/kde/HTML/uk/konversation/index.cache.bz2
 share/doc/kde/HTML/uk/konversation/index.docbook
@@ -130,6 +96,9 @@ share/kde/apps/kconf_update/konversation-0.20-quickbuttons.pl
 share/kde/apps/kconf_update/konversation.upd
 share/kde/apps/konversation/konversation.notifyrc
 share/kde/apps/konversation/konversationui.rc
+share/kde/apps/konversation/scripting_support/python/konversation/__init__.py
+share/kde/apps/konversation/scripting_support/python/konversation/dbus.py
+share/kde/apps/konversation/scripting_support/python/konversation/i18n.py
 share/kde/apps/konversation/scripts/bug
 share/kde/apps/konversation/scripts/cmd
 share/kde/apps/konversation/scripts/fortune
@@ -200,9 +169,12 @@ share/kde/apps/konversation/themes/square/irc_owner.png
 share/kde/apps/konversation/themes/square/irc_voice.png
 share/kde4/services/konvirc.protocol
 share/kde4/services/konvirc6.protocol
+share/kde4/services/konvircs.protocol
 share/locale/bg/LC_MESSAGES/konversation.mo
+share/locale/bs/LC_MESSAGES/konversation.mo
 share/locale/ca/LC_MESSAGES/konversation.mo
 share/locale/ca@valencia/LC_MESSAGES/konversation.mo
+share/locale/cs/LC_MESSAGES/konversation.mo
 share/locale/da/LC_MESSAGES/konversation.mo
 share/locale/de/LC_MESSAGES/konversation.mo
 share/locale/el/LC_MESSAGES/konversation.mo
@@ -215,16 +187,14 @@ share/locale/gl/LC_MESSAGES/konversation.mo
 share/locale/hu/LC_MESSAGES/konversation.mo
 share/locale/it/LC_MESSAGES/konversation.mo
 share/locale/ja/LC_MESSAGES/konversation.mo
-share/locale/lt/LC_MESSAGES/konversation.mo
 share/locale/nb/LC_MESSAGES/konversation.mo
 share/locale/nds/LC_MESSAGES/konversation.mo
 share/locale/nl/LC_MESSAGES/konversation.mo
-share/locale/pa/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/ru/LC_MESSAGES/konversation.mo
-share/locale/sk/LC_MESSAGES/konversation.mo
+share/locale/si/LC_MESSAGES/konversation.mo
 share/locale/sr/LC_MESSAGES/konversation.mo
 share/locale/sr@ijekavian/LC_MESSAGES/konversation.mo
 share/locale/sr@ijekavianlatin/LC_MESSAGES/konversation.mo
diff --git a/chat/konversation/distinfo b/chat/konversation/distinfo
index 00ce2ef15cf..425e8e47d1a 100644
--- a/chat/konversation/distinfo
+++ b/chat/konversation/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.12 2010/10/27 06:35:59 markd Exp $
+$NetBSD: distinfo,v 1.13 2012/03/20 10:36:40 markd Exp $
 
-SHA1 (konversation-1.3.1.tar.bz2) = dd3e1436b769cf11218859b851a0c9b9623dbb12
-RMD160 (konversation-1.3.1.tar.bz2) = ad02eea73eff28de2b25f4ba384b785dd75249c6
-Size (konversation-1.3.1.tar.bz2) = 3275849 bytes
-SHA1 (patch-aa) = 7668c2c34c24506da8e92ca8fa4a3cbf501992e2
+SHA1 (konversation-1.4.tar.xz) = 90741721f68a02d4345b9006a8ae53bc49ef3777
+RMD160 (konversation-1.4.tar.xz) = 63ea9d70521ed8f4e2f9de11696e9289703b65c6
+Size (konversation-1.4.tar.xz) = 2902368 bytes
diff --git a/chat/konversation/patches/patch-aa b/chat/konversation/patches/patch-aa
deleted file mode 100644
index 451b0e02915..00000000000
--- a/chat/konversation/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2010/04/10 22:26:05 markd Exp $
-
-Add patch for CVE-2007-4400 for Konversation to stop escape song names
-properly in the media script.
-
---- data/scripts/media.orig	2009-11-12 18:24:50.000000000 +1300
-+++ data/scripts/media
-@@ -414,6 +414,7 @@ def playing(playerList, mode=None):
-     for i in playerList:
-         s=i.get(mode)
-         if s:
-+            s=re.replace(r'[\r\n]', ' ', s)
-             tell([IRC_SERVER, TARGET, s], 'say' )
-             return 1
-     return 0