Update to konversation 1.2.3

KDE4 version.

5 files changed, 77 insertions, 162 deletions

diff --git a/chat/konversation/Makefile b/chat/konversation/Makefile
index ef79dee3ba2..25c53dc0dba 100644
--- a/chat/konversation/Makefile
+++ b/chat/konversation/Makefile
@@ -1,33 +1,34 @@
-# $NetBSD: Makefile,v 1.22 2010/01/28 20:11:47 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2010/04/10 22:26:05 markd Exp $
 #
 
-DISTNAME=	konversation-1.1
-PKGREVISION=	4
+DISTNAME=	konversation-1.2.3
 CATEGORIES=	chat kde
-MASTER_SITES=	http://download.berlios.de/konversation/
+MASTER_SITES=	${MASTER_SITE_KDE:=konversation/1.2.3/src/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://konversation.kde.org/
 COMMENT=	KDE IRC Client
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-GNU_CONFIGURE=	YES
-USE_LIBTOOL=	YES
-USE_TOOLS+=	gmake perl msgfmt
+BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4
+
+USE_CMAKE=	yes
+USE_TOOLS+=	perl msgfmt
 USE_LANGUAGES=	c c++
 
-REPLACE_PERL+=		konversation/src/konversation-0.19-appearance.pl \
-			konversation/src/konversation-0.19-colorcodes.pl \
-			konversation/src/konversation-0.19-colors.pl \
-			konversation/src/konversation-0.19-custombrowser.pl \
-			konversation/src/konversation-0.19-notifylists.pl \
-			konversation/src/konversation-0.19-sortorder.pl \
-			konversation/src/konversation-0.19-tabplacement.pl \
-			konversation/src/konversation-0.20-customfonts.pl \
-			konversation/src/konversation-0.20-quickbuttons.pl
-REPLACE_BASH+=		konversation/scripts/mail
+REPLACE_PERL+=		data/updaters/konversation-0.19-appearance.pl \
+			data/updaters/konversation-0.19-colorcodes.pl \
+			data/updaters/konversation-0.19-colors.pl \
+			data/updaters/konversation-0.19-custombrowser.pl \
+			data/updaters/konversation-0.19-notifylists.pl \
+			data/updaters/konversation-0.19-sortorder.pl \
+			data/updaters/konversation-0.19-tabplacement.pl \
+			data/updaters/konversation-0.20-customfonts.pl \
+			data/updaters/konversation-0.20-quickbuttons.pl
+REPLACE_BASH+=		data/scripts/mail
 USE_TOOLS+=		bash:run
 
 .include "../../mk/bsd.prefs.mk"
@@ -36,16 +37,10 @@ USE_TOOLS+=		bash:run
 DEPENDS+=		psmisc>=20.1:../../sysutils/psmisc
 .endif
 
-.include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../meta-pkgs/kde4/kde4.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
-.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
-CONFIGURE_ARGS+=	--disable-threading
-.endif
-
+.include "../../misc/kdepimlibs4/buildlink3.mk"
+.include "../../security/qca2/buildlink3.mk"
+.include "../../x11/kdelibs4/buildlink3.mk"
+.include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/konversation/PLIST b/chat/konversation/PLIST
index f13991a64ce..95f07057b35 100644
--- a/chat/konversation/PLIST
+++ b/chat/konversation/PLIST
@@ -1,9 +1,6 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 17:37:47 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2010/04/10 22:26:05 markd Exp $
 bin/konversation
-share/applications/kde/konversation.desktop
-share/doc/kde/HTML/da/konversation/common
-share/doc/kde/HTML/da/konversation/index.cache.bz2
-share/doc/kde/HTML/da/konversation/index.docbook
+share/applications/kde4/konversation.desktop
 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
@@ -57,84 +54,15 @@ 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/es/konversation/addchannel.png
-share/doc/kde/HTML/es/konversation/addnetwork_co.png
-share/doc/kde/HTML/es/konversation/addserver_co.png
-share/doc/kde/HTML/es/konversation/channel_screen_tour_co.png
-share/doc/kde/HTML/es/konversation/channellist_screen_co.png
-share/doc/kde/HTML/es/konversation/checkidentities.png
-share/doc/kde/HTML/es/konversation/colorchooser_screen.png
-share/doc/kde/HTML/es/konversation/colorize.png
-share/doc/kde/HTML/es/konversation/configure.png
-share/doc/kde/HTML/es/konversation/dccstatus_screen_co.png
-share/doc/kde/HTML/es/konversation/first_channel_co.png
-share/doc/kde/HTML/es/konversation/first_serverlist_co.png
-share/doc/kde/HTML/es/konversation/highlighting_screen_co.png
-share/doc/kde/HTML/es/konversation/identities_adv_co.png
-share/doc/kde/HTML/es/konversation/identities_away_co.png
-share/doc/kde/HTML/es/konversation/identities_gen_co.png
-share/doc/kde/HTML/es/konversation/irc_admin.png
-share/doc/kde/HTML/es/konversation/irc_away.png
-share/doc/kde/HTML/es/konversation/irc_halfop.png
-share/doc/kde/HTML/es/konversation/irc_normal.png
-share/doc/kde/HTML/es/konversation/irc_op.png
-share/doc/kde/HTML/es/konversation/irc_owner.png
-share/doc/kde/HTML/es/konversation/irc_voice.png
-share/doc/kde/HTML/es/konversation/kaddressbook.png
-share/doc/kde/HTML/es/konversation/kimproxy_create_screen2.png
-share/doc/kde/HTML/es/konversation/kimproxy_create_screen_co.png
-share/doc/kde/HTML/es/konversation/led_blue_off.png
-share/doc/kde/HTML/es/konversation/led_blue_on.png
-share/doc/kde/HTML/es/konversation/led_green_off.png
-share/doc/kde/HTML/es/konversation/led_green_on.png
-share/doc/kde/HTML/es/konversation/led_red_off.png
-share/doc/kde/HTML/es/konversation/led_red_on.png
-share/doc/kde/HTML/es/konversation/led_yellow_off.png
-share/doc/kde/HTML/es/konversation/led_yellow_on.png
-share/doc/kde/HTML/es/konversation/logviewer_co.png
-share/doc/kde/HTML/es/konversation/nicksonline_co.png
-share/doc/kde/HTML/es/konversation/nickthemes_screen_co.png
-share/doc/kde/HTML/es/konversation/notification_screen_co.png
-share/doc/kde/HTML/es/konversation/notifylist_screen_co.png
-share/doc/kde/HTML/es/konversation/osd_demo.png
-share/doc/kde/HTML/es/konversation/osd_screen_co.png
-share/doc/kde/HTML/es/konversation/quickbuttons_screen.png
-share/doc/kde/HTML/es/konversation/quickconnect_screen.png
-share/doc/kde/HTML/es/konversation/serverlist_co.png
-share/doc/kde/HTML/es/konversation/urlcatcher_screen_co.png
-share/doc/kde/HTML/es/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/addchannel.png
-share/doc/kde/HTML/it/konversation/addnetwork_co.png
-share/doc/kde/HTML/it/konversation/addserver_co.png
-share/doc/kde/HTML/it/konversation/channel_screen_tour_co.png
-share/doc/kde/HTML/it/konversation/channellist_screen_co.png
-share/doc/kde/HTML/it/konversation/checkidentities.png
-share/doc/kde/HTML/it/konversation/colorchooser_screen.png
 share/doc/kde/HTML/it/konversation/common
-share/doc/kde/HTML/it/konversation/first_channel_co.png
-share/doc/kde/HTML/it/konversation/first_serverlist_co.png
-share/doc/kde/HTML/it/konversation/identities_adv_co.png
-share/doc/kde/HTML/it/konversation/identities_away_co.png
-share/doc/kde/HTML/it/konversation/identities_gen_co.png
 share/doc/kde/HTML/it/konversation/index.cache.bz2
 share/doc/kde/HTML/it/konversation/index.docbook
-share/doc/kde/HTML/it/konversation/nicksonline_co.png
-share/doc/kde/HTML/it/konversation/notification_screen_co.png
-share/doc/kde/HTML/it/konversation/notifylist_screen_co.png
-share/doc/kde/HTML/it/konversation/osd_demo.png
-share/doc/kde/HTML/it/konversation/osd_screen_co.png
-share/doc/kde/HTML/it/konversation/quickbuttons_screen.png
-share/doc/kde/HTML/it/konversation/quickconnect_screen.png
-share/doc/kde/HTML/it/konversation/serverlist_co.png
-share/doc/kde/HTML/pt/konversation/common
-share/doc/kde/HTML/pt/konversation/index.cache.bz2
-share/doc/kde/HTML/pt/konversation/index.docbook
-share/doc/kde/HTML/ru/konversation/common
-share/doc/kde/HTML/ru/konversation/index.cache.bz2
-share/doc/kde/HTML/ru/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
@@ -166,27 +94,29 @@ 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/icons/crystalsvg/16x16/actions/kimproxyaway.png
-share/icons/crystalsvg/16x16/actions/kimproxyoffline.png
-share/icons/crystalsvg/16x16/actions/kimproxyonline.png
-share/icons/crystalsvg/22x22/actions/char.png
-share/icons/crystalsvg/22x22/actions/kimproxyaway.png
-share/icons/crystalsvg/22x22/actions/kimproxyoffline.png
-share/icons/crystalsvg/22x22/actions/kimproxyonline.png
-share/icons/crystalsvg/22x22/actions/konv_message.png
-share/icons/crystalsvg/32x32/actions/kimproxyaway.png
-share/icons/crystalsvg/32x32/actions/kimproxyoffline.png
-share/icons/crystalsvg/32x32/actions/kimproxyonline.png
-share/icons/crystalsvg/scalable/actions/kimproxyaway.svgz
-share/icons/crystalsvg/scalable/actions/kimproxyoffline.svgz
-share/icons/crystalsvg/scalable/actions/kimproxyonline.svgz
-share/icons/crystalsvg/scalable/actions/konv_message.svgz
+share/doc/kde/HTML/uk/konversation/common
+share/doc/kde/HTML/uk/konversation/index.cache.bz2
+share/doc/kde/HTML/uk/konversation/index.docbook
 share/icons/hicolor/128x128/apps/konversation.png
+share/icons/hicolor/16x16/actions/kimproxyaway.png
+share/icons/hicolor/16x16/actions/kimproxyoffline.png
+share/icons/hicolor/16x16/actions/kimproxyonline.png
 share/icons/hicolor/16x16/apps/konversation.png
+share/icons/hicolor/22x22/actions/kimproxyaway.png
+share/icons/hicolor/22x22/actions/kimproxyoffline.png
+share/icons/hicolor/22x22/actions/kimproxyonline.png
+share/icons/hicolor/22x22/actions/konv_message.png
 share/icons/hicolor/22x22/apps/konversation.png
+share/icons/hicolor/32x32/actions/kimproxyaway.png
+share/icons/hicolor/32x32/actions/kimproxyoffline.png
+share/icons/hicolor/32x32/actions/kimproxyonline.png
 share/icons/hicolor/32x32/apps/konversation.png
 share/icons/hicolor/48x48/apps/konversation.png
 share/icons/hicolor/64x64/apps/konversation.png
+share/icons/hicolor/scalable/actions/kimproxyaway.svgz
+share/icons/hicolor/scalable/actions/kimproxyoffline.svgz
+share/icons/hicolor/scalable/actions/kimproxyonline.svgz
+share/icons/hicolor/scalable/actions/konv_message.svgz
 share/icons/hicolor/scalable/apps/konversation.svgz
 share/kde/apps/kconf_update/konversation-0.19-appearance.pl
 share/kde/apps/kconf_update/konversation-0.19-colorcodes.pl
@@ -198,7 +128,7 @@ share/kde/apps/kconf_update/konversation-0.19-tabplacement.pl
 share/kde/apps/kconf_update/konversation-0.20-customfonts.pl
 share/kde/apps/kconf_update/konversation-0.20-quickbuttons.pl
 share/kde/apps/kconf_update/konversation.upd
-share/kde/apps/konversation/eventsrc
+share/kde/apps/konversation/konversation.notifyrc
 share/kde/apps/konversation/konversationui.rc
 share/kde/apps/konversation/scripts/bug
 share/kde/apps/konversation/scripts/cmd
@@ -212,7 +142,6 @@ share/kde/apps/konversation/scripts/sayclip
 share/kde/apps/konversation/scripts/sysinfo
 share/kde/apps/konversation/scripts/tinyurl
 share/kde/apps/konversation/scripts/uptime
-share/kde/apps/konversation/scripts/weather
 share/kde/apps/konversation/themes/alternative/index.desktop
 share/kde/apps/konversation/themes/alternative/irc_admin.png
 share/kde/apps/konversation/themes/alternative/irc_away.png
@@ -245,14 +174,14 @@ share/kde/apps/konversation/themes/default/irc_normal.png
 share/kde/apps/konversation/themes/default/irc_op.png
 share/kde/apps/konversation/themes/default/irc_owner.png
 share/kde/apps/konversation/themes/default/irc_voice.png
-share/kde/apps/konversation/themes/oxygen/index.desktop
-share/kde/apps/konversation/themes/oxygen/irc_admin.png
-share/kde/apps/konversation/themes/oxygen/irc_away.png
-share/kde/apps/konversation/themes/oxygen/irc_halfop.png
-share/kde/apps/konversation/themes/oxygen/irc_normal.png
-share/kde/apps/konversation/themes/oxygen/irc_op.png
-share/kde/apps/konversation/themes/oxygen/irc_owner.png
-share/kde/apps/konversation/themes/oxygen/irc_voice.png
+share/kde/apps/konversation/themes/simplistic/index.desktop
+share/kde/apps/konversation/themes/simplistic/irc_admin.png
+share/kde/apps/konversation/themes/simplistic/irc_away.png
+share/kde/apps/konversation/themes/simplistic/irc_halfop.png
+share/kde/apps/konversation/themes/simplistic/irc_normal.png
+share/kde/apps/konversation/themes/simplistic/irc_op.png
+share/kde/apps/konversation/themes/simplistic/irc_owner.png
+share/kde/apps/konversation/themes/simplistic/irc_voice.png
 share/kde/apps/konversation/themes/smiling/index.desktop
 share/kde/apps/konversation/themes/smiling/irc_admin.png
 share/kde/apps/konversation/themes/smiling/irc_away.png
@@ -269,12 +198,11 @@ share/kde/apps/konversation/themes/square/irc_normal.png
 share/kde/apps/konversation/themes/square/irc_op.png
 share/kde/apps/konversation/themes/square/irc_owner.png
 share/kde/apps/konversation/themes/square/irc_voice.png
-share/kde/config.kcfg/konversation.kcfg
-share/kde/services/konvirc.protocol
-share/kde/services/konvirc6.protocol
-share/locale/ar/LC_MESSAGES/konversation.mo
+share/kde4/services/konvirc.protocol
+share/kde4/services/konvirc6.protocol
 share/locale/bg/LC_MESSAGES/konversation.mo
 share/locale/ca/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
@@ -288,14 +216,16 @@ share/locale/he/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/ka/LC_MESSAGES/konversation.mo
-share/locale/ko/LC_MESSAGES/konversation.mo
-share/locale/pa/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/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/sr/LC_MESSAGES/konversation.mo
-share/locale/sr@Latn/LC_MESSAGES/konversation.mo
+share/locale/sk/LC_MESSAGES/konversation.mo
 share/locale/sv/LC_MESSAGES/konversation.mo
 share/locale/tr/LC_MESSAGES/konversation.mo
+share/locale/uk/LC_MESSAGES/konversation.mo
 share/locale/zh_CN/LC_MESSAGES/konversation.mo
 share/locale/zh_TW/LC_MESSAGES/konversation.mo
diff --git a/chat/konversation/distinfo b/chat/konversation/distinfo
index 514d614681d..5868793dcfa 100644
--- a/chat/konversation/distinfo
+++ b/chat/konversation/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.10 2009/03/11 19:27:00 hasso Exp $
+$NetBSD: distinfo,v 1.11 2010/04/10 22:26:05 markd Exp $
 
-SHA1 (konversation-1.1.tar.bz2) = 9b2984a0535c9c148f62c9e4d651366e6e875bd9
-RMD160 (konversation-1.1.tar.bz2) = ce79f6ec97cc8d7b048b15898d02eb87b4ea02ce
-Size (konversation-1.1.tar.bz2) = 5468714 bytes
-SHA1 (patch-aa) = c65f7cac42af69a5a9f227c91befbe13f7d978a1
-SHA1 (patch-ab) = e31cc83d957babb6f002aa19efdc4ab314c5c970
+SHA1 (konversation-1.2.3.tar.bz2) = 792fa864fe3e0de0c0cb994ce97f68345f57d09f
+RMD160 (konversation-1.2.3.tar.bz2) = 87d03ec13d90f74d991ff139f9f2e7125c5dd0ef
+Size (konversation-1.2.3.tar.bz2) = 2997272 bytes
+SHA1 (patch-aa) = 7668c2c34c24506da8e92ca8fa4a3cbf501992e2
diff --git a/chat/konversation/patches/patch-aa b/chat/konversation/patches/patch-aa
index c484e769bce..451b0e02915 100644
--- a/chat/konversation/patches/patch-aa
+++ b/chat/konversation/patches/patch-aa
@@ -1,12 +1,15 @@
-$NetBSD: patch-aa,v 1.3 2008/06/08 01:21:37 tonnerre Exp $
+$NetBSD: patch-aa,v 1.4 2010/04/10 22:26:05 markd Exp $
 
---- konversation/scripts/media.orig	2006-10-06 18:43:29.000000000 +0200
-+++ konversation/scripts/media
-@@ -269,6 +269,7 @@ def playing(playerList, mode=None):
+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)
++            s=re.replace(r'[\r\n]', ' ', s)
              tell([IRC_SERVER, TARGET, s], 'say' )
              return 1
      return 0
diff --git a/chat/konversation/patches/patch-ab b/chat/konversation/patches/patch-ab
deleted file mode 100644
index 831dea3adaf..00000000000
--- a/chat/konversation/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2009/03/11 19:27:00 hasso Exp $
-
---- konversation/src/dcccommon.cpp.orig	2009-03-11 19:22:06 +0200
-+++ konversation/src/dcccommon.cpp	2009-03-11 19:22:36 +0200
-@@ -15,6 +15,7 @@
- #include "server.h"
- 
- #include <arpa/inet.h>
-+#include <netinet/in.h>
- 
- #include <qhostaddress.h>
-