Update to version 1.1

Submitted by:	makc

8 files changed, 50 insertions, 84 deletions

diff --git a/irc/konversation-kde4/Makefile b/irc/konversation-kde4/Makefile
index c714fdf8be5f..420f44058118 100644
--- a/irc/konversation-kde4/Makefile
+++ b/irc/konversation-kde4/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	konversation
-PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTVERSION=	1.1
 CATEGORIES=	irc kde
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/irc/konversation-kde4/distinfo b/irc/konversation-kde4/distinfo
index 8ea08ba1ba91..64d53d04111f 100644
--- a/irc/konversation-kde4/distinfo
+++ b/irc/konversation-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (konversation-1.0.1.tar.bz2) = 60c2c5f94d4a916055db09728304b19f
-SHA256 (konversation-1.0.1.tar.bz2) = 8be736289c52c21fe5ada7dd153767abd5155424a510ab9781b9d2f585cc00fd
-SIZE (konversation-1.0.1.tar.bz2) = 5848563
+MD5 (konversation-1.1.tar.bz2) = 0d38a16747ab4f6549863de385cb551c
+SHA256 (konversation-1.1.tar.bz2) = 3ef15e7a46c10a11aa369ff80dd33b3e2feb54834dfc036d3609c1ed94476d33
+SIZE (konversation-1.1.tar.bz2) = 5468714
diff --git a/irc/konversation-kde4/files/patch-konversation-src-dcccommon.cpp b/irc/konversation-kde4/files/patch-konversation-src-dcccommon.cpp
new file mode 100644
index 000000000000..6ad5249fe594
--- /dev/null
+++ b/irc/konversation-kde4/files/patch-konversation-src-dcccommon.cpp
@@ -0,0 +1,10 @@
+--- ./konversation/src/dcccommon.cpp.orig	2008-08-06 19:56:27.000000000 +0400
++++ ./konversation/src/dcccommon.cpp	2008-08-16 21:11:14.000000000 +0400
+@@ -15,6 +15,7 @@
+ #include "server.h"
+ 
+ #include <arpa/inet.h>
++#include <netinet/in.h>
+ 
+ #include <qhostaddress.h>
+ 
diff --git a/irc/konversation-kde4/pkg-plist b/irc/konversation-kde4/pkg-plist
index 5842f7597c78..db6005c47bd0 100644
--- a/irc/konversation-kde4/pkg-plist
+++ b/irc/konversation-kde4/pkg-plist
@@ -1,5 +1,4 @@
 bin/konversation
-bin/konversationircprotocolhandler
 share/applications/kde/konversation.desktop
 share/apps/kconf_update/konversation-0.19-appearance.pl
 share/apps/kconf_update/konversation-0.19-colorcodes.pl
@@ -18,13 +17,12 @@ share/apps/konversation/scripts/cmd
 share/apps/konversation/scripts/fortune
 share/apps/konversation/scripts/fortunes.dat
 share/apps/konversation/scripts/gauge
-share/apps/konversation/scripts/google
 share/apps/konversation/scripts/kdeversion
 share/apps/konversation/scripts/mail
 share/apps/konversation/scripts/media
-share/apps/konversation/scripts/qurl
 share/apps/konversation/scripts/sayclip
 share/apps/konversation/scripts/sysinfo
+share/apps/konversation/scripts/tinyurl
 share/apps/konversation/scripts/uptime
 share/apps/konversation/scripts/weather
 share/apps/konversation/themes/alternative/index.desktop
@@ -59,6 +57,14 @@ share/apps/konversation/themes/default/irc_normal.png
 share/apps/konversation/themes/default/irc_op.png
 share/apps/konversation/themes/default/irc_owner.png
 share/apps/konversation/themes/default/irc_voice.png
+share/apps/konversation/themes/oxygen/index.desktop
+share/apps/konversation/themes/oxygen/irc_admin.png
+share/apps/konversation/themes/oxygen/irc_away.png
+share/apps/konversation/themes/oxygen/irc_halfop.png
+share/apps/konversation/themes/oxygen/irc_normal.png
+share/apps/konversation/themes/oxygen/irc_op.png
+share/apps/konversation/themes/oxygen/irc_owner.png
+share/apps/konversation/themes/oxygen/irc_voice.png
 share/apps/konversation/themes/smiling/index.desktop
 share/apps/konversation/themes/smiling/irc_admin.png
 share/apps/konversation/themes/smiling/irc_away.png
@@ -204,34 +210,6 @@ share/doc/HTML/it/konversation/osd_screen_co.png
 share/doc/HTML/it/konversation/quickbuttons_screen.png
 share/doc/HTML/it/konversation/quickconnect_screen.png
 share/doc/HTML/it/konversation/serverlist_co.png
-share/doc/HTML/nl/konversation/addchannel.png
-share/doc/HTML/nl/konversation/addnetwork_co.png
-share/doc/HTML/nl/konversation/addserver_co.png
-share/doc/HTML/nl/konversation/channel_screen_tour_co.png
-share/doc/HTML/nl/konversation/channellist_screen_co.png
-share/doc/HTML/nl/konversation/checkidentities.png
-share/doc/HTML/nl/konversation/colorchooser_screen.png
-share/doc/HTML/nl/konversation/common
-share/doc/HTML/nl/konversation/dccstatus_screen_co.png
-share/doc/HTML/nl/konversation/first_channel_co.png
-share/doc/HTML/nl/konversation/first_serverlist_co.png
-share/doc/HTML/nl/konversation/identities_adv_co.png
-share/doc/HTML/nl/konversation/identities_away_co.png
-share/doc/HTML/nl/konversation/identities_gen_co.png
-share/doc/HTML/nl/konversation/index.cache.bz2
-share/doc/HTML/nl/konversation/index.docbook
-share/doc/HTML/nl/konversation/kimproxy_create_screen2.png
-share/doc/HTML/nl/konversation/kimproxy_create_screen_co.png
-share/doc/HTML/nl/konversation/logviewer_co.png
-share/doc/HTML/nl/konversation/nicksonline_co.png
-share/doc/HTML/nl/konversation/notification_screen_co.png
-share/doc/HTML/nl/konversation/notifylist_screen_co.png
-share/doc/HTML/nl/konversation/osd_screen_co.png
-share/doc/HTML/nl/konversation/quickbuttons_screen.png
-share/doc/HTML/nl/konversation/quickconnect_screen.png
-share/doc/HTML/nl/konversation/serverlist_co.png
-share/doc/HTML/nl/konversation/urlcatcher_screen_co.png
-share/doc/HTML/nl/konversation/webbrowser_screen_co.png
 share/doc/HTML/pt/konversation/common
 share/doc/HTML/pt/konversation/index.cache.bz2
 share/doc/HTML/pt/konversation/index.docbook
@@ -294,7 +272,6 @@ share/icons/hicolor/scalable/apps/konversation.svgz
 share/locale/ar/LC_MESSAGES/konversation.mo
 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
@@ -310,24 +287,20 @@ 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/lt/LC_MESSAGES/konversation.mo
-share/locale/nl/LC_MESSAGES/konversation.mo
 share/locale/pa/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/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/locale/zh_TW/LC_MESSAGES/konversation.mo
 share/services/konvirc.protocol
 share/services/konvirc6.protocol
 @dirrm share/doc/HTML/sv/konversation
 @dirrm share/doc/HTML/ru/konversation
 @dirrm share/doc/HTML/pt/konversation
-@dirrm share/doc/HTML/nl/konversation
 @dirrm share/doc/HTML/it/konversation
 @dirrm share/doc/HTML/et/konversation
 @dirrm share/doc/HTML/es/konversation
@@ -338,6 +311,7 @@ share/services/konvirc6.protocol
 @dirrm share/doc/HTML/da/konversation
 @dirrm share/apps/konversation/themes/square
 @dirrm share/apps/konversation/themes/smiling
+@dirrm share/apps/konversation/themes/oxygen
 @dirrm share/apps/konversation/themes/default
 @dirrm share/apps/konversation/themes/classic
 @dirrm share/apps/konversation/themes/christmas
diff --git a/irc/konversation/Makefile b/irc/konversation/Makefile
index c714fdf8be5f..420f44058118 100644
--- a/irc/konversation/Makefile
+++ b/irc/konversation/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	konversation
-PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTVERSION=	1.1
 CATEGORIES=	irc kde
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/irc/konversation/distinfo b/irc/konversation/distinfo
index 8ea08ba1ba91..64d53d04111f 100644
--- a/irc/konversation/distinfo
+++ b/irc/konversation/distinfo
@@ -1,3 +1,3 @@
-MD5 (konversation-1.0.1.tar.bz2) = 60c2c5f94d4a916055db09728304b19f
-SHA256 (konversation-1.0.1.tar.bz2) = 8be736289c52c21fe5ada7dd153767abd5155424a510ab9781b9d2f585cc00fd
-SIZE (konversation-1.0.1.tar.bz2) = 5848563
+MD5 (konversation-1.1.tar.bz2) = 0d38a16747ab4f6549863de385cb551c
+SHA256 (konversation-1.1.tar.bz2) = 3ef15e7a46c10a11aa369ff80dd33b3e2feb54834dfc036d3609c1ed94476d33
+SIZE (konversation-1.1.tar.bz2) = 5468714
diff --git a/irc/konversation/files/patch-konversation-src-dcccommon.cpp b/irc/konversation/files/patch-konversation-src-dcccommon.cpp
new file mode 100644
index 000000000000..6ad5249fe594
--- /dev/null
+++ b/irc/konversation/files/patch-konversation-src-dcccommon.cpp
@@ -0,0 +1,10 @@
+--- ./konversation/src/dcccommon.cpp.orig	2008-08-06 19:56:27.000000000 +0400
++++ ./konversation/src/dcccommon.cpp	2008-08-16 21:11:14.000000000 +0400
+@@ -15,6 +15,7 @@
+ #include "server.h"
+ 
+ #include <arpa/inet.h>
++#include <netinet/in.h>
+ 
+ #include <qhostaddress.h>
+ 
diff --git a/irc/konversation/pkg-plist b/irc/konversation/pkg-plist
index 5842f7597c78..db6005c47bd0 100644
--- a/irc/konversation/pkg-plist
+++ b/irc/konversation/pkg-plist
@@ -1,5 +1,4 @@
 bin/konversation
-bin/konversationircprotocolhandler
 share/applications/kde/konversation.desktop
 share/apps/kconf_update/konversation-0.19-appearance.pl
 share/apps/kconf_update/konversation-0.19-colorcodes.pl
@@ -18,13 +17,12 @@ share/apps/konversation/scripts/cmd
 share/apps/konversation/scripts/fortune
 share/apps/konversation/scripts/fortunes.dat
 share/apps/konversation/scripts/gauge
-share/apps/konversation/scripts/google
 share/apps/konversation/scripts/kdeversion
 share/apps/konversation/scripts/mail
 share/apps/konversation/scripts/media
-share/apps/konversation/scripts/qurl
 share/apps/konversation/scripts/sayclip
 share/apps/konversation/scripts/sysinfo
+share/apps/konversation/scripts/tinyurl
 share/apps/konversation/scripts/uptime
 share/apps/konversation/scripts/weather
 share/apps/konversation/themes/alternative/index.desktop
@@ -59,6 +57,14 @@ share/apps/konversation/themes/default/irc_normal.png
 share/apps/konversation/themes/default/irc_op.png
 share/apps/konversation/themes/default/irc_owner.png
 share/apps/konversation/themes/default/irc_voice.png
+share/apps/konversation/themes/oxygen/index.desktop
+share/apps/konversation/themes/oxygen/irc_admin.png
+share/apps/konversation/themes/oxygen/irc_away.png
+share/apps/konversation/themes/oxygen/irc_halfop.png
+share/apps/konversation/themes/oxygen/irc_normal.png
+share/apps/konversation/themes/oxygen/irc_op.png
+share/apps/konversation/themes/oxygen/irc_owner.png
+share/apps/konversation/themes/oxygen/irc_voice.png
 share/apps/konversation/themes/smiling/index.desktop
 share/apps/konversation/themes/smiling/irc_admin.png
 share/apps/konversation/themes/smiling/irc_away.png
@@ -204,34 +210,6 @@ share/doc/HTML/it/konversation/osd_screen_co.png
 share/doc/HTML/it/konversation/quickbuttons_screen.png
 share/doc/HTML/it/konversation/quickconnect_screen.png
 share/doc/HTML/it/konversation/serverlist_co.png
-share/doc/HTML/nl/konversation/addchannel.png
-share/doc/HTML/nl/konversation/addnetwork_co.png
-share/doc/HTML/nl/konversation/addserver_co.png
-share/doc/HTML/nl/konversation/channel_screen_tour_co.png
-share/doc/HTML/nl/konversation/channellist_screen_co.png
-share/doc/HTML/nl/konversation/checkidentities.png
-share/doc/HTML/nl/konversation/colorchooser_screen.png
-share/doc/HTML/nl/konversation/common
-share/doc/HTML/nl/konversation/dccstatus_screen_co.png
-share/doc/HTML/nl/konversation/first_channel_co.png
-share/doc/HTML/nl/konversation/first_serverlist_co.png
-share/doc/HTML/nl/konversation/identities_adv_co.png
-share/doc/HTML/nl/konversation/identities_away_co.png
-share/doc/HTML/nl/konversation/identities_gen_co.png
-share/doc/HTML/nl/konversation/index.cache.bz2
-share/doc/HTML/nl/konversation/index.docbook
-share/doc/HTML/nl/konversation/kimproxy_create_screen2.png
-share/doc/HTML/nl/konversation/kimproxy_create_screen_co.png
-share/doc/HTML/nl/konversation/logviewer_co.png
-share/doc/HTML/nl/konversation/nicksonline_co.png
-share/doc/HTML/nl/konversation/notification_screen_co.png
-share/doc/HTML/nl/konversation/notifylist_screen_co.png
-share/doc/HTML/nl/konversation/osd_screen_co.png
-share/doc/HTML/nl/konversation/quickbuttons_screen.png
-share/doc/HTML/nl/konversation/quickconnect_screen.png
-share/doc/HTML/nl/konversation/serverlist_co.png
-share/doc/HTML/nl/konversation/urlcatcher_screen_co.png
-share/doc/HTML/nl/konversation/webbrowser_screen_co.png
 share/doc/HTML/pt/konversation/common
 share/doc/HTML/pt/konversation/index.cache.bz2
 share/doc/HTML/pt/konversation/index.docbook
@@ -294,7 +272,6 @@ share/icons/hicolor/scalable/apps/konversation.svgz
 share/locale/ar/LC_MESSAGES/konversation.mo
 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
@@ -310,24 +287,20 @@ 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/lt/LC_MESSAGES/konversation.mo
-share/locale/nl/LC_MESSAGES/konversation.mo
 share/locale/pa/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/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/locale/zh_TW/LC_MESSAGES/konversation.mo
 share/services/konvirc.protocol
 share/services/konvirc6.protocol
 @dirrm share/doc/HTML/sv/konversation
 @dirrm share/doc/HTML/ru/konversation
 @dirrm share/doc/HTML/pt/konversation
-@dirrm share/doc/HTML/nl/konversation
 @dirrm share/doc/HTML/it/konversation
 @dirrm share/doc/HTML/et/konversation
 @dirrm share/doc/HTML/es/konversation
@@ -338,6 +311,7 @@ share/services/konvirc6.protocol
 @dirrm share/doc/HTML/da/konversation
 @dirrm share/apps/konversation/themes/square
 @dirrm share/apps/konversation/themes/smiling
+@dirrm share/apps/konversation/themes/oxygen
 @dirrm share/apps/konversation/themes/default
 @dirrm share/apps/konversation/themes/classic
 @dirrm share/apps/konversation/themes/christmas