- Update to version 1.5pre1

- Remove 4.x patches
- Update WWW
- Pass maintainership to Mathieu Prevot who kindly volunteered to maintain
  this port

18 files changed, 284 insertions, 304 deletions

diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile
index eeb38c8454e3..22f8000ee235 100644
--- a/net-im/kmess-kde4/Makefile
+++ b/net-im/kmess-kde4/Makefile
@@ -6,21 +6,23 @@
 #
 
 PORTNAME=	kmess
-PORTVERSION=	1.4.3
+PORTVERSION=	1.5.p.1
 CATEGORIES=	net-im kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p./pre/}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd-ports@club-internet.fr
 COMMENT=	MSN Messenger Client for KDE3
 
-EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-configure
-
 USE_KDELIBS_VER=3
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 post-patch:
-	@${TOUCH} ${WRKSRC}/config.h.in
+	@${TOUCH} -t 200510070000 ${WRKSRC}/admin/cvs.sh
+	@${TOUCH} -t 200510070001 ${WRKSRC}/Makefile.am.in
+	@${TOUCH} -t 200510070002 ${WRKSRC}/subdirs
+	@${TOUCH} -t 200510070003 ${WRKSRC}/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/net-im/kmess-kde4/distinfo b/net-im/kmess-kde4/distinfo
index 38dff79b9352..b471e4068d12 100644
--- a/net-im/kmess-kde4/distinfo
+++ b/net-im/kmess-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (kmess-1.4.3.tar.gz) = 88c73b2223cbb0dc2b79023188fba64a
-SHA256 (kmess-1.4.3.tar.gz) = f571847704618c2d364dee731a8d3a5a59ff423b77e52160cb147ebec8ffd526
-SIZE (kmess-1.4.3.tar.gz) = 1869940
+MD5 (kmess-1.5pre1.tar.gz) = 176774205ca1ecb8bacd4cf0c01e266f
+SHA256 (kmess-1.5pre1.tar.gz) = 16caf1921ec55270b7edae2624f6c4c12d9d6db5fd8789a0dd9295fd6d374d57
+SIZE (kmess-1.5pre1.tar.gz) = 2129027
diff --git a/net-im/kmess-kde4/files/patch-kmess-crypt-bithelp.h b/net-im/kmess-kde4/files/patch-kmess-crypt-bithelp.h
deleted file mode 100644
index 5a20fc68d008..000000000000
--- a/net-im/kmess-kde4/files/patch-kmess-crypt-bithelp.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- kmess/crypt/bithelp.h.orig	Sun Jun  4 13:38:04 2006
-+++ kmess/crypt/bithelp.h	Sun Jun  4 13:39:09 2006
-@@ -20,8 +20,6 @@
- #ifndef G10_BITHELP_H
- #define G10_BITHELP_H
- 
--#include <stdint.h>
--
- /****************
-  * Rotate the 32 bit unsigned integer X by N bits left/right
-  */
diff --git a/net-im/kmess-kde4/files/patch-kmess-crypt-globalstuff.h b/net-im/kmess-kde4/files/patch-kmess-crypt-globalstuff.h
deleted file mode 100644
index 1d0262dde5da..000000000000
--- a/net-im/kmess-kde4/files/patch-kmess-crypt-globalstuff.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- kmess/crypt/globalstuff.h.orig	Fri May 21 04:00:44 2004
-+++ kmess/crypt/globalstuff.h	Sun Jun  4 13:48:21 2006
-@@ -16,9 +16,9 @@
- 
- #include "config.h"
- 
-+#include <sys/types.h>
- #include <string>
- #include <sstream>
--#include <stdint.h>
- 
- /** convert something to string using ostringstream */
- template <class T> inline
diff --git a/net-im/kmess-kde4/files/patch-kmess-kmessview.cpp b/net-im/kmess-kde4/files/patch-kmess-kmessview.cpp
deleted file mode 100644
index 4693121cec3a..000000000000
--- a/net-im/kmess-kde4/files/patch-kmess-kmessview.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- kmess/kmessview.cpp.orig	Sun Jun  4 15:13:33 2006
-+++ kmess/kmessview.cpp	Sun Jun  4 15:14:27 2006
-@@ -1058,7 +1058,7 @@
- {
-   Contact *contact    = getContactByItem( contactListView_->currentItem() );
-   Group   *oldGroup   = getGroupByItem( contactListView_->currentItem() );
--  QString  oldGroupId = (oldGroup != 0 ? oldGroup->getId() : "0");
-+  QString  oldGroupId = (oldGroup != 0 ? oldGroup->getId() : QString::fromLatin1("0"));
- 
-   if(contact != 0)
-   {
diff --git a/net-im/kmess-kde4/files/patch-kmess-kmessview.h b/net-im/kmess-kde4/files/patch-kmess-kmessview.h
deleted file mode 100644
index 7af92df09078..000000000000
--- a/net-im/kmess-kde4/files/patch-kmess-kmessview.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- kmess/kmessview.h.orig	Sun Jun  4 15:46:03 2006
-+++ kmess/kmessview.h	Sun Jun  4 15:59:14 2006
-@@ -187,6 +187,7 @@
-       private:
-         KMessView   *kmessView_;
-     };
-+    friend class ToolTip;
- 
-     // Reference to the current tooltip
-     ToolTip         *toolTip_;
diff --git a/net-im/kmess-kde4/files/patch-kmess-network-applications-p2papplication.cpp b/net-im/kmess-kde4/files/patch-kmess-network-applications-p2papplication.cpp
deleted file mode 100644
index d01924ba3a6a..000000000000
--- a/net-im/kmess-kde4/files/patch-kmess-network-applications-p2papplication.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- kmess/network/applications/p2papplication.cpp.orig	Sun Jun  4 15:00:05 2006
-+++ kmess/network/applications/p2papplication.cpp	Sun Jun  4 15:00:44 2006
-@@ -2056,7 +2056,7 @@
-   // Get message content and Content-Type
-   bool gotTransferInvitation = (invitationContentType_ == "application/x-msnmsgr-transreqbody");
-   QString content     = message.getFields();
--  QString contentType = (gotTransferInvitation ? "application/x-msnmsgr-transrespbody" : invitationContentType_);
-+  QString contentType = (gotTransferInvitation ? QString::fromLatin1("application/x-msnmsgr-transrespbody") : invitationContentType_);
- 
-   QString myHandle = CurrentAccount::instance()->getHandle();
- 
diff --git a/net-im/kmess-kde4/pkg-descr b/net-im/kmess-kde4/pkg-descr
index b263431acf70..aa27c3e23329 100644
--- a/net-im/kmess-kde4/pkg-descr
+++ b/net-im/kmess-kde4/pkg-descr
@@ -3,4 +3,4 @@ emoticons, and the ability to switch the contact list
 between "by group" and "by online/offline", among
 other things. 
  
-WWW: http://kmess.sourceforge.net/
+WWW: http://www.kmess.org/
diff --git a/net-im/kmess-kde4/pkg-plist b/net-im/kmess-kde4/pkg-plist
index 085b14d92203..6efdd402122e 100644
--- a/net-im/kmess-kde4/pkg-plist
+++ b/net-im/kmess-kde4/pkg-plist
@@ -1,90 +1,5 @@
 bin/kmess
 share/applications/kde/kmess.desktop
-share/apps/kmess/emoticons/airplane.png
-share/apps/kmess/emoticons/angel.png
-share/apps/kmess/emoticons/angry.png
-share/apps/kmess/emoticons/arrogant.png
-share/apps/kmess/emoticons/asl.png
-share/apps/kmess/emoticons/automobile.png
-share/apps/kmess/emoticons/bad.png
-share/apps/kmess/emoticons/baringteeth.png
-share/apps/kmess/emoticons/bat.png
-share/apps/kmess/emoticons/beer.png
-share/apps/kmess/emoticons/bowl.png
-share/apps/kmess/emoticons/boy.png
-share/apps/kmess/emoticons/brb.png
-share/apps/kmess/emoticons/cake.png
-share/apps/kmess/emoticons/camera.png
-share/apps/kmess/emoticons/cat.png
-share/apps/kmess/emoticons/cigarette.png
-share/apps/kmess/emoticons/clock.png
-share/apps/kmess/emoticons/cocktail.png
-share/apps/kmess/emoticons/computer.png
-share/apps/kmess/emoticons/confused.png
-share/apps/kmess/emoticons/cry.png
-share/apps/kmess/emoticons/cup.png
-share/apps/kmess/emoticons/devil.png
-share/apps/kmess/emoticons/dog.png
-share/apps/kmess/emoticons/dude_hug.png
-share/apps/kmess/emoticons/embarrassed.png
-share/apps/kmess/emoticons/emoticonrc
-share/apps/kmess/emoticons/envelope.png
-share/apps/kmess/emoticons/eyeroll.png
-share/apps/kmess/emoticons/film.png
-share/apps/kmess/emoticons/fingerscrossed.png
-share/apps/kmess/emoticons/gameconsole.png
-share/apps/kmess/emoticons/girl.png
-share/apps/kmess/emoticons/girl_hug.png
-share/apps/kmess/emoticons/handcuffs.png
-share/apps/kmess/emoticons/highfive.png
-share/apps/kmess/emoticons/huh.png
-share/apps/kmess/emoticons/island.png
-share/apps/kmess/emoticons/kiss.png
-share/apps/kmess/emoticons/lightbulb.png
-share/apps/kmess/emoticons/lightning.png
-share/apps/kmess/emoticons/love.png
-share/apps/kmess/emoticons/megasmile.png
-share/apps/kmess/emoticons/messenger.png
-share/apps/kmess/emoticons/mobilephone.png
-share/apps/kmess/emoticons/money.png
-share/apps/kmess/emoticons/moon.png
-share/apps/kmess/emoticons/nerd.png
-share/apps/kmess/emoticons/note.png
-share/apps/kmess/emoticons/omg.png
-share/apps/kmess/emoticons/party.png
-share/apps/kmess/emoticons/phone.png
-share/apps/kmess/emoticons/pizza.png
-share/apps/kmess/emoticons/plate.png
-share/apps/kmess/emoticons/present.png
-share/apps/kmess/emoticons/rainbow.png
-share/apps/kmess/emoticons/regular.png
-share/apps/kmess/emoticons/rose.png
-share/apps/kmess/emoticons/sad.png
-share/apps/kmess/emoticons/sarcastic.png
-share/apps/kmess/emoticons/secret.png
-share/apps/kmess/emoticons/shade.png
-share/apps/kmess/emoticons/sheep.png
-share/apps/kmess/emoticons/sick.png
-share/apps/kmess/emoticons/sleepy.png
-share/apps/kmess/emoticons/snail.png
-share/apps/kmess/emoticons/soccer.png
-share/apps/kmess/emoticons/sorry.png
-share/apps/kmess/emoticons/sshh.png
-share/apps/kmess/emoticons/star.png
-share/apps/kmess/emoticons/storm.png
-share/apps/kmess/emoticons/sun.png
-share/apps/kmess/emoticons/teeth.png
-share/apps/kmess/emoticons/thinking.png
-share/apps/kmess/emoticons/thumbs_down.png
-share/apps/kmess/emoticons/thumbs_up.png
-share/apps/kmess/emoticons/tongue.png
-share/apps/kmess/emoticons/turtle.png
-share/apps/kmess/emoticons/ugly.png
-share/apps/kmess/emoticons/umbrella.png
-share/apps/kmess/emoticons/unhappy.png
-share/apps/kmess/emoticons/unlove.png
-share/apps/kmess/emoticons/wilted_rose.png
-share/apps/kmess/emoticons/wink.png
 share/apps/kmess/eventsrc
 share/apps/kmess/icons/hicolor/16x16/apps/gnomemeeting.png
 share/apps/kmess/pics/away.png
@@ -94,6 +9,7 @@ share/apps/kmess/pics/blocked.png
 share/apps/kmess/pics/busy.png
 share/apps/kmess/pics/email.png
 share/apps/kmess/pics/emoticons.png
+share/apps/kmess/pics/empty.png
 share/apps/kmess/pics/invisible.png
 share/apps/kmess/pics/kmesslogo.png
 share/apps/kmess/pics/kmesspic.png
@@ -102,6 +18,36 @@ share/apps/kmess/pics/offline.png
 share/apps/kmess/pics/online.png
 share/apps/kmess/pics/onthephone.png
 share/apps/kmess/pics/unknown.png
+share/apps/kmess/styles/Colourful-Enclosed/Colourful-Enclosed.css
+share/apps/kmess/styles/Colourful-Enclosed/Colourful-Enclosed.xsl
+share/apps/kmess/styles/Default-compact/Default-compact.css
+share/apps/kmess/styles/Default-compact/Default-compact.xsl
+share/apps/kmess/styles/Default/Default.css
+share/apps/kmess/styles/Default/Default.xsl
+share/apps/kmess/styles/Dim/Dim.css
+share/apps/kmess/styles/Dim/Dim.xsl
+share/apps/kmess/styles/Efficient/Efficient.css
+share/apps/kmess/styles/Efficient/Efficient.xsl
+share/apps/kmess/styles/Fresh/Fresh.css
+share/apps/kmess/styles/Fresh/Fresh.xsl
+share/apps/kmess/styles/Fresh/bg_gravatar.gif
+share/apps/kmess/styles/Fresh/bg_gravatar_rtl.gif
+share/apps/kmess/styles/Fresh/buddy_icon.png
+share/apps/kmess/styles/Pure/Makefile.am
+share/apps/kmess/styles/Pure/Pure.css
+share/apps/kmess/styles/Pure/Pure.xsl
+share/apps/kmess/styles/Pure/arrow0.png
+share/apps/kmess/styles/Pure/arrow1.png
+share/apps/kmess/styles/Pure/clock.png
+share/apps/kmess/styles/Pure/contact.png
+share/apps/kmess/styles/Pure/corner-bl.png
+share/apps/kmess/styles/Pure/corner-br.png
+share/apps/kmess/styles/Pure/corner-tl.png
+share/apps/kmess/styles/Pure/corner-tr.png
+share/apps/kmess/styles/Pure/important.png
+share/apps/kmess/styles/Pure/myself.png
+share/apps/kmess/styles/Pure/system.png
+share/apps/kmess/styles/examplemessage.xml
 share/doc/HTML/en/kmess/common
 share/doc/HTML/en/kmess/index.cache.bz2
 share/doc/HTML/en/kmess/index.docbook
@@ -119,6 +65,92 @@ share/doc/HTML/en/kmess/kmesspopupbaloon.png
 share/doc/HTML/en/kmess/kmessrightclickmenucontact.png
 share/doc/HTML/en/kmess/kmessstartupscreen.png
 share/doc/HTML/en/kmess/kmesstimestamp.png
+share/emoticons/KMess-new/airplane.png
+share/emoticons/KMess-new/angel.png
+share/emoticons/KMess-new/angry.png
+share/emoticons/KMess-new/arrogant.png
+share/emoticons/KMess-new/asl.png
+share/emoticons/KMess-new/automobile.png
+share/emoticons/KMess-new/bad.png
+share/emoticons/KMess-new/baringteeth.png
+share/emoticons/KMess-new/bat.png
+share/emoticons/KMess-new/beer.png
+share/emoticons/KMess-new/bowl.png
+share/emoticons/KMess-new/boy.png
+share/emoticons/KMess-new/brb.png
+share/emoticons/KMess-new/cake.png
+share/emoticons/KMess-new/camera.png
+share/emoticons/KMess-new/cat.png
+share/emoticons/KMess-new/cigarette.png
+share/emoticons/KMess-new/clock.png
+share/emoticons/KMess-new/cocktail.png
+share/emoticons/KMess-new/computer.png
+share/emoticons/KMess-new/confused.png
+share/emoticons/KMess-new/cry.png
+share/emoticons/KMess-new/cup.png
+share/emoticons/KMess-new/devil.png
+share/emoticons/KMess-new/dog.png
+share/emoticons/KMess-new/dude_hug.png
+share/emoticons/KMess-new/embarrassed.png
+share/emoticons/KMess-new/emoticons.xml
+share/emoticons/KMess-new/envelope.png
+share/emoticons/KMess-new/eyeroll.png
+share/emoticons/KMess-new/film.png
+share/emoticons/KMess-new/fingerscrossed.png
+share/emoticons/KMess-new/gameconsole.png
+share/emoticons/KMess-new/girl.png
+share/emoticons/KMess-new/girl_hug.png
+share/emoticons/KMess-new/handcuffs.png
+share/emoticons/KMess-new/highfive.png
+share/emoticons/KMess-new/huh.png
+share/emoticons/KMess-new/island.png
+share/emoticons/KMess-new/kiss.png
+share/emoticons/KMess-new/lightbulb.png
+share/emoticons/KMess-new/lightning.png
+share/emoticons/KMess-new/love.png
+share/emoticons/KMess-new/megasmile.png
+share/emoticons/KMess-new/messenger.png
+share/emoticons/KMess-new/mobilephone.png
+share/emoticons/KMess-new/money.png
+share/emoticons/KMess-new/moon.png
+share/emoticons/KMess-new/nerd.png
+share/emoticons/KMess-new/note.png
+share/emoticons/KMess-new/omg.png
+share/emoticons/KMess-new/party.png
+share/emoticons/KMess-new/phone.png
+share/emoticons/KMess-new/pizza.png
+share/emoticons/KMess-new/plate.png
+share/emoticons/KMess-new/present.png
+share/emoticons/KMess-new/rainbow.png
+share/emoticons/KMess-new/regular.png
+share/emoticons/KMess-new/rose.png
+share/emoticons/KMess-new/sad.png
+share/emoticons/KMess-new/sarcastic.png
+share/emoticons/KMess-new/secret.png
+share/emoticons/KMess-new/shade.png
+share/emoticons/KMess-new/sheep.png
+share/emoticons/KMess-new/sick.png
+share/emoticons/KMess-new/sleepy.png
+share/emoticons/KMess-new/smile.png
+share/emoticons/KMess-new/snail.png
+share/emoticons/KMess-new/soccer.png
+share/emoticons/KMess-new/sorry.png
+share/emoticons/KMess-new/sshh.png
+share/emoticons/KMess-new/star.png
+share/emoticons/KMess-new/storm.png
+share/emoticons/KMess-new/sun.png
+share/emoticons/KMess-new/teeth.png
+share/emoticons/KMess-new/thinking.png
+share/emoticons/KMess-new/thumbs_down.png
+share/emoticons/KMess-new/thumbs_up.png
+share/emoticons/KMess-new/tongue.png
+share/emoticons/KMess-new/turtle.png
+share/emoticons/KMess-new/ugly.png
+share/emoticons/KMess-new/umbrella.png
+share/emoticons/KMess-new/unhappy.png
+share/emoticons/KMess-new/unlove.png
+share/emoticons/KMess-new/wilted_rose.png
+share/emoticons/KMess-new/wink.png
 share/icons/hicolor/128x128/apps/kmess.png
 share/icons/hicolor/16x16/apps/kmess.png
 share/icons/hicolor/22x22/apps/kmess.png
@@ -130,10 +162,11 @@ share/icons/locolor/22x22/apps/kmess.png
 share/icons/locolor/32x32/apps/kmess.png
 share/locale/ar/LC_MESSAGES/kmess.mo
 share/locale/ca/LC_MESSAGES/kmess.mo
+share/locale/da/LC_MESSAGES/kmess.mo
 share/locale/de/LC_MESSAGES/kmess.mo
-share/locale/dk/LC_MESSAGES/kmess.mo
 share/locale/ee/LC_MESSAGES/kmess.mo
 share/locale/es/LC_MESSAGES/kmess.mo
+share/locale/fi/LC_MESSAGES/kmess.mo
 share/locale/fr/LC_MESSAGES/kmess.mo
 share/locale/it/LC_MESSAGES/kmess.mo
 share/locale/ko/LC_MESSAGES/kmess.mo
@@ -162,14 +195,25 @@ share/sounds/kmess_msg.ogg
 @dirrmtry share/locale/sl
 @dirrmtry share/locale/ko/LC_MESSAGES
 @dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
 @dirrmtry share/locale/ca/LC_MESSAGES
 @dirrmtry share/locale/ca
+@dirrm share/emoticons/KMess-new
+@dirrmtry share/emoticons
 @dirrm share/doc/HTML/en/kmess
+@dirrm share/apps/kmess/styles/Pure
+@dirrm share/apps/kmess/styles/Fresh
+@dirrm share/apps/kmess/styles/Efficient
+@dirrm share/apps/kmess/styles/Dim
+@dirrm share/apps/kmess/styles/Default-compact
+@dirrm share/apps/kmess/styles/Default
+@dirrm share/apps/kmess/styles/Colourful-Enclosed
+@dirrm share/apps/kmess/styles
 @dirrm share/apps/kmess/pics
 @dirrm share/apps/kmess/icons/hicolor/16x16/apps
 @dirrm share/apps/kmess/icons/hicolor/16x16
 @dirrm share/apps/kmess/icons/hicolor
 @dirrm share/apps/kmess/icons
-@dirrm share/apps/kmess/emoticons
 @dirrm share/apps/kmess
 @dirrmtry share/applications/kde
diff --git a/net-im/kmess/Makefile b/net-im/kmess/Makefile
index eeb38c8454e3..22f8000ee235 100644
--- a/net-im/kmess/Makefile
+++ b/net-im/kmess/Makefile
@@ -6,21 +6,23 @@
 #
 
 PORTNAME=	kmess
-PORTVERSION=	1.4.3
+PORTVERSION=	1.5.p.1
 CATEGORIES=	net-im kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p./pre/}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	freebsd-ports@club-internet.fr
 COMMENT=	MSN Messenger Client for KDE3
 
-EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-configure
-
 USE_KDELIBS_VER=3
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
 post-patch:
-	@${TOUCH} ${WRKSRC}/config.h.in
+	@${TOUCH} -t 200510070000 ${WRKSRC}/admin/cvs.sh
+	@${TOUCH} -t 200510070001 ${WRKSRC}/Makefile.am.in
+	@${TOUCH} -t 200510070002 ${WRKSRC}/subdirs
+	@${TOUCH} -t 200510070003 ${WRKSRC}/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/net-im/kmess/distinfo b/net-im/kmess/distinfo
index 38dff79b9352..b471e4068d12 100644
--- a/net-im/kmess/distinfo
+++ b/net-im/kmess/distinfo
@@ -1,3 +1,3 @@
-MD5 (kmess-1.4.3.tar.gz) = 88c73b2223cbb0dc2b79023188fba64a
-SHA256 (kmess-1.4.3.tar.gz) = f571847704618c2d364dee731a8d3a5a59ff423b77e52160cb147ebec8ffd526
-SIZE (kmess-1.4.3.tar.gz) = 1869940
+MD5 (kmess-1.5pre1.tar.gz) = 176774205ca1ecb8bacd4cf0c01e266f
+SHA256 (kmess-1.5pre1.tar.gz) = 16caf1921ec55270b7edae2624f6c4c12d9d6db5fd8789a0dd9295fd6d374d57
+SIZE (kmess-1.5pre1.tar.gz) = 2129027
diff --git a/net-im/kmess/files/patch-kmess-crypt-bithelp.h b/net-im/kmess/files/patch-kmess-crypt-bithelp.h
deleted file mode 100644
index 5a20fc68d008..000000000000
--- a/net-im/kmess/files/patch-kmess-crypt-bithelp.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- kmess/crypt/bithelp.h.orig	Sun Jun  4 13:38:04 2006
-+++ kmess/crypt/bithelp.h	Sun Jun  4 13:39:09 2006
-@@ -20,8 +20,6 @@
- #ifndef G10_BITHELP_H
- #define G10_BITHELP_H
- 
--#include <stdint.h>
--
- /****************
-  * Rotate the 32 bit unsigned integer X by N bits left/right
-  */
diff --git a/net-im/kmess/files/patch-kmess-crypt-globalstuff.h b/net-im/kmess/files/patch-kmess-crypt-globalstuff.h
deleted file mode 100644
index 1d0262dde5da..000000000000
--- a/net-im/kmess/files/patch-kmess-crypt-globalstuff.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- kmess/crypt/globalstuff.h.orig	Fri May 21 04:00:44 2004
-+++ kmess/crypt/globalstuff.h	Sun Jun  4 13:48:21 2006
-@@ -16,9 +16,9 @@
- 
- #include "config.h"
- 
-+#include <sys/types.h>
- #include <string>
- #include <sstream>
--#include <stdint.h>
- 
- /** convert something to string using ostringstream */
- template <class T> inline
diff --git a/net-im/kmess/files/patch-kmess-kmessview.cpp b/net-im/kmess/files/patch-kmess-kmessview.cpp
deleted file mode 100644
index 4693121cec3a..000000000000
--- a/net-im/kmess/files/patch-kmess-kmessview.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- kmess/kmessview.cpp.orig	Sun Jun  4 15:13:33 2006
-+++ kmess/kmessview.cpp	Sun Jun  4 15:14:27 2006
-@@ -1058,7 +1058,7 @@
- {
-   Contact *contact    = getContactByItem( contactListView_->currentItem() );
-   Group   *oldGroup   = getGroupByItem( contactListView_->currentItem() );
--  QString  oldGroupId = (oldGroup != 0 ? oldGroup->getId() : "0");
-+  QString  oldGroupId = (oldGroup != 0 ? oldGroup->getId() : QString::fromLatin1("0"));
- 
-   if(contact != 0)
-   {
diff --git a/net-im/kmess/files/patch-kmess-kmessview.h b/net-im/kmess/files/patch-kmess-kmessview.h
deleted file mode 100644
index 7af92df09078..000000000000
--- a/net-im/kmess/files/patch-kmess-kmessview.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- kmess/kmessview.h.orig	Sun Jun  4 15:46:03 2006
-+++ kmess/kmessview.h	Sun Jun  4 15:59:14 2006
-@@ -187,6 +187,7 @@
-       private:
-         KMessView   *kmessView_;
-     };
-+    friend class ToolTip;
- 
-     // Reference to the current tooltip
-     ToolTip         *toolTip_;
diff --git a/net-im/kmess/files/patch-kmess-network-applications-p2papplication.cpp b/net-im/kmess/files/patch-kmess-network-applications-p2papplication.cpp
deleted file mode 100644
index d01924ba3a6a..000000000000
--- a/net-im/kmess/files/patch-kmess-network-applications-p2papplication.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- kmess/network/applications/p2papplication.cpp.orig	Sun Jun  4 15:00:05 2006
-+++ kmess/network/applications/p2papplication.cpp	Sun Jun  4 15:00:44 2006
-@@ -2056,7 +2056,7 @@
-   // Get message content and Content-Type
-   bool gotTransferInvitation = (invitationContentType_ == "application/x-msnmsgr-transreqbody");
-   QString content     = message.getFields();
--  QString contentType = (gotTransferInvitation ? "application/x-msnmsgr-transrespbody" : invitationContentType_);
-+  QString contentType = (gotTransferInvitation ? QString::fromLatin1("application/x-msnmsgr-transrespbody") : invitationContentType_);
- 
-   QString myHandle = CurrentAccount::instance()->getHandle();
- 
diff --git a/net-im/kmess/pkg-descr b/net-im/kmess/pkg-descr
index b263431acf70..aa27c3e23329 100644
--- a/net-im/kmess/pkg-descr
+++ b/net-im/kmess/pkg-descr
@@ -3,4 +3,4 @@ emoticons, and the ability to switch the contact list
 between "by group" and "by online/offline", among
 other things. 
  
-WWW: http://kmess.sourceforge.net/
+WWW: http://www.kmess.org/
diff --git a/net-im/kmess/pkg-plist b/net-im/kmess/pkg-plist
index 085b14d92203..6efdd402122e 100644
--- a/net-im/kmess/pkg-plist
+++ b/net-im/kmess/pkg-plist
@@ -1,90 +1,5 @@
 bin/kmess
 share/applications/kde/kmess.desktop
-share/apps/kmess/emoticons/airplane.png
-share/apps/kmess/emoticons/angel.png
-share/apps/kmess/emoticons/angry.png
-share/apps/kmess/emoticons/arrogant.png
-share/apps/kmess/emoticons/asl.png
-share/apps/kmess/emoticons/automobile.png
-share/apps/kmess/emoticons/bad.png
-share/apps/kmess/emoticons/baringteeth.png
-share/apps/kmess/emoticons/bat.png
-share/apps/kmess/emoticons/beer.png
-share/apps/kmess/emoticons/bowl.png
-share/apps/kmess/emoticons/boy.png
-share/apps/kmess/emoticons/brb.png
-share/apps/kmess/emoticons/cake.png
-share/apps/kmess/emoticons/camera.png
-share/apps/kmess/emoticons/cat.png
-share/apps/kmess/emoticons/cigarette.png
-share/apps/kmess/emoticons/clock.png
-share/apps/kmess/emoticons/cocktail.png
-share/apps/kmess/emoticons/computer.png
-share/apps/kmess/emoticons/confused.png
-share/apps/kmess/emoticons/cry.png
-share/apps/kmess/emoticons/cup.png
-share/apps/kmess/emoticons/devil.png
-share/apps/kmess/emoticons/dog.png
-share/apps/kmess/emoticons/dude_hug.png
-share/apps/kmess/emoticons/embarrassed.png
-share/apps/kmess/emoticons/emoticonrc
-share/apps/kmess/emoticons/envelope.png
-share/apps/kmess/emoticons/eyeroll.png
-share/apps/kmess/emoticons/film.png
-share/apps/kmess/emoticons/fingerscrossed.png
-share/apps/kmess/emoticons/gameconsole.png
-share/apps/kmess/emoticons/girl.png
-share/apps/kmess/emoticons/girl_hug.png
-share/apps/kmess/emoticons/handcuffs.png
-share/apps/kmess/emoticons/highfive.png
-share/apps/kmess/emoticons/huh.png
-share/apps/kmess/emoticons/island.png
-share/apps/kmess/emoticons/kiss.png
-share/apps/kmess/emoticons/lightbulb.png
-share/apps/kmess/emoticons/lightning.png
-share/apps/kmess/emoticons/love.png
-share/apps/kmess/emoticons/megasmile.png
-share/apps/kmess/emoticons/messenger.png
-share/apps/kmess/emoticons/mobilephone.png
-share/apps/kmess/emoticons/money.png
-share/apps/kmess/emoticons/moon.png
-share/apps/kmess/emoticons/nerd.png
-share/apps/kmess/emoticons/note.png
-share/apps/kmess/emoticons/omg.png
-share/apps/kmess/emoticons/party.png
-share/apps/kmess/emoticons/phone.png
-share/apps/kmess/emoticons/pizza.png
-share/apps/kmess/emoticons/plate.png
-share/apps/kmess/emoticons/present.png
-share/apps/kmess/emoticons/rainbow.png
-share/apps/kmess/emoticons/regular.png
-share/apps/kmess/emoticons/rose.png
-share/apps/kmess/emoticons/sad.png
-share/apps/kmess/emoticons/sarcastic.png
-share/apps/kmess/emoticons/secret.png
-share/apps/kmess/emoticons/shade.png
-share/apps/kmess/emoticons/sheep.png
-share/apps/kmess/emoticons/sick.png
-share/apps/kmess/emoticons/sleepy.png
-share/apps/kmess/emoticons/snail.png
-share/apps/kmess/emoticons/soccer.png
-share/apps/kmess/emoticons/sorry.png
-share/apps/kmess/emoticons/sshh.png
-share/apps/kmess/emoticons/star.png
-share/apps/kmess/emoticons/storm.png
-share/apps/kmess/emoticons/sun.png
-share/apps/kmess/emoticons/teeth.png
-share/apps/kmess/emoticons/thinking.png
-share/apps/kmess/emoticons/thumbs_down.png
-share/apps/kmess/emoticons/thumbs_up.png
-share/apps/kmess/emoticons/tongue.png
-share/apps/kmess/emoticons/turtle.png
-share/apps/kmess/emoticons/ugly.png
-share/apps/kmess/emoticons/umbrella.png
-share/apps/kmess/emoticons/unhappy.png
-share/apps/kmess/emoticons/unlove.png
-share/apps/kmess/emoticons/wilted_rose.png
-share/apps/kmess/emoticons/wink.png
 share/apps/kmess/eventsrc
 share/apps/kmess/icons/hicolor/16x16/apps/gnomemeeting.png
 share/apps/kmess/pics/away.png
@@ -94,6 +9,7 @@ share/apps/kmess/pics/blocked.png
 share/apps/kmess/pics/busy.png
 share/apps/kmess/pics/email.png
 share/apps/kmess/pics/emoticons.png
+share/apps/kmess/pics/empty.png
 share/apps/kmess/pics/invisible.png
 share/apps/kmess/pics/kmesslogo.png
 share/apps/kmess/pics/kmesspic.png
@@ -102,6 +18,36 @@ share/apps/kmess/pics/offline.png
 share/apps/kmess/pics/online.png
 share/apps/kmess/pics/onthephone.png
 share/apps/kmess/pics/unknown.png
+share/apps/kmess/styles/Colourful-Enclosed/Colourful-Enclosed.css
+share/apps/kmess/styles/Colourful-Enclosed/Colourful-Enclosed.xsl
+share/apps/kmess/styles/Default-compact/Default-compact.css
+share/apps/kmess/styles/Default-compact/Default-compact.xsl
+share/apps/kmess/styles/Default/Default.css
+share/apps/kmess/styles/Default/Default.xsl
+share/apps/kmess/styles/Dim/Dim.css
+share/apps/kmess/styles/Dim/Dim.xsl
+share/apps/kmess/styles/Efficient/Efficient.css
+share/apps/kmess/styles/Efficient/Efficient.xsl
+share/apps/kmess/styles/Fresh/Fresh.css
+share/apps/kmess/styles/Fresh/Fresh.xsl
+share/apps/kmess/styles/Fresh/bg_gravatar.gif
+share/apps/kmess/styles/Fresh/bg_gravatar_rtl.gif
+share/apps/kmess/styles/Fresh/buddy_icon.png
+share/apps/kmess/styles/Pure/Makefile.am
+share/apps/kmess/styles/Pure/Pure.css
+share/apps/kmess/styles/Pure/Pure.xsl
+share/apps/kmess/styles/Pure/arrow0.png
+share/apps/kmess/styles/Pure/arrow1.png
+share/apps/kmess/styles/Pure/clock.png
+share/apps/kmess/styles/Pure/contact.png
+share/apps/kmess/styles/Pure/corner-bl.png
+share/apps/kmess/styles/Pure/corner-br.png
+share/apps/kmess/styles/Pure/corner-tl.png
+share/apps/kmess/styles/Pure/corner-tr.png
+share/apps/kmess/styles/Pure/important.png
+share/apps/kmess/styles/Pure/myself.png
+share/apps/kmess/styles/Pure/system.png
+share/apps/kmess/styles/examplemessage.xml
 share/doc/HTML/en/kmess/common
 share/doc/HTML/en/kmess/index.cache.bz2
 share/doc/HTML/en/kmess/index.docbook
@@ -119,6 +65,92 @@ share/doc/HTML/en/kmess/kmesspopupbaloon.png
 share/doc/HTML/en/kmess/kmessrightclickmenucontact.png
 share/doc/HTML/en/kmess/kmessstartupscreen.png
 share/doc/HTML/en/kmess/kmesstimestamp.png
+share/emoticons/KMess-new/airplane.png
+share/emoticons/KMess-new/angel.png
+share/emoticons/KMess-new/angry.png
+share/emoticons/KMess-new/arrogant.png
+share/emoticons/KMess-new/asl.png
+share/emoticons/KMess-new/automobile.png
+share/emoticons/KMess-new/bad.png
+share/emoticons/KMess-new/baringteeth.png
+share/emoticons/KMess-new/bat.png
+share/emoticons/KMess-new/beer.png
+share/emoticons/KMess-new/bowl.png
+share/emoticons/KMess-new/boy.png
+share/emoticons/KMess-new/brb.png
+share/emoticons/KMess-new/cake.png
+share/emoticons/KMess-new/camera.png
+share/emoticons/KMess-new/cat.png
+share/emoticons/KMess-new/cigarette.png
+share/emoticons/KMess-new/clock.png
+share/emoticons/KMess-new/cocktail.png
+share/emoticons/KMess-new/computer.png
+share/emoticons/KMess-new/confused.png
+share/emoticons/KMess-new/cry.png
+share/emoticons/KMess-new/cup.png
+share/emoticons/KMess-new/devil.png
+share/emoticons/KMess-new/dog.png
+share/emoticons/KMess-new/dude_hug.png
+share/emoticons/KMess-new/embarrassed.png
+share/emoticons/KMess-new/emoticons.xml
+share/emoticons/KMess-new/envelope.png
+share/emoticons/KMess-new/eyeroll.png
+share/emoticons/KMess-new/film.png
+share/emoticons/KMess-new/fingerscrossed.png
+share/emoticons/KMess-new/gameconsole.png
+share/emoticons/KMess-new/girl.png
+share/emoticons/KMess-new/girl_hug.png
+share/emoticons/KMess-new/handcuffs.png
+share/emoticons/KMess-new/highfive.png
+share/emoticons/KMess-new/huh.png
+share/emoticons/KMess-new/island.png
+share/emoticons/KMess-new/kiss.png
+share/emoticons/KMess-new/lightbulb.png
+share/emoticons/KMess-new/lightning.png
+share/emoticons/KMess-new/love.png
+share/emoticons/KMess-new/megasmile.png
+share/emoticons/KMess-new/messenger.png
+share/emoticons/KMess-new/mobilephone.png
+share/emoticons/KMess-new/money.png
+share/emoticons/KMess-new/moon.png
+share/emoticons/KMess-new/nerd.png
+share/emoticons/KMess-new/note.png
+share/emoticons/KMess-new/omg.png
+share/emoticons/KMess-new/party.png
+share/emoticons/KMess-new/phone.png
+share/emoticons/KMess-new/pizza.png
+share/emoticons/KMess-new/plate.png
+share/emoticons/KMess-new/present.png
+share/emoticons/KMess-new/rainbow.png
+share/emoticons/KMess-new/regular.png
+share/emoticons/KMess-new/rose.png
+share/emoticons/KMess-new/sad.png
+share/emoticons/KMess-new/sarcastic.png
+share/emoticons/KMess-new/secret.png
+share/emoticons/KMess-new/shade.png
+share/emoticons/KMess-new/sheep.png
+share/emoticons/KMess-new/sick.png
+share/emoticons/KMess-new/sleepy.png
+share/emoticons/KMess-new/smile.png
+share/emoticons/KMess-new/snail.png
+share/emoticons/KMess-new/soccer.png
+share/emoticons/KMess-new/sorry.png
+share/emoticons/KMess-new/sshh.png
+share/emoticons/KMess-new/star.png
+share/emoticons/KMess-new/storm.png
+share/emoticons/KMess-new/sun.png
+share/emoticons/KMess-new/teeth.png
+share/emoticons/KMess-new/thinking.png
+share/emoticons/KMess-new/thumbs_down.png
+share/emoticons/KMess-new/thumbs_up.png
+share/emoticons/KMess-new/tongue.png
+share/emoticons/KMess-new/turtle.png
+share/emoticons/KMess-new/ugly.png
+share/emoticons/KMess-new/umbrella.png
+share/emoticons/KMess-new/unhappy.png
+share/emoticons/KMess-new/unlove.png
+share/emoticons/KMess-new/wilted_rose.png
+share/emoticons/KMess-new/wink.png
 share/icons/hicolor/128x128/apps/kmess.png
 share/icons/hicolor/16x16/apps/kmess.png
 share/icons/hicolor/22x22/apps/kmess.png
@@ -130,10 +162,11 @@ share/icons/locolor/22x22/apps/kmess.png
 share/icons/locolor/32x32/apps/kmess.png
 share/locale/ar/LC_MESSAGES/kmess.mo
 share/locale/ca/LC_MESSAGES/kmess.mo
+share/locale/da/LC_MESSAGES/kmess.mo
 share/locale/de/LC_MESSAGES/kmess.mo
-share/locale/dk/LC_MESSAGES/kmess.mo
 share/locale/ee/LC_MESSAGES/kmess.mo
 share/locale/es/LC_MESSAGES/kmess.mo
+share/locale/fi/LC_MESSAGES/kmess.mo
 share/locale/fr/LC_MESSAGES/kmess.mo
 share/locale/it/LC_MESSAGES/kmess.mo
 share/locale/ko/LC_MESSAGES/kmess.mo
@@ -162,14 +195,25 @@ share/sounds/kmess_msg.ogg
 @dirrmtry share/locale/sl
 @dirrmtry share/locale/ko/LC_MESSAGES
 @dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
 @dirrmtry share/locale/ca/LC_MESSAGES
 @dirrmtry share/locale/ca
+@dirrm share/emoticons/KMess-new
+@dirrmtry share/emoticons
 @dirrm share/doc/HTML/en/kmess
+@dirrm share/apps/kmess/styles/Pure
+@dirrm share/apps/kmess/styles/Fresh
+@dirrm share/apps/kmess/styles/Efficient
+@dirrm share/apps/kmess/styles/Dim
+@dirrm share/apps/kmess/styles/Default-compact
+@dirrm share/apps/kmess/styles/Default
+@dirrm share/apps/kmess/styles/Colourful-Enclosed
+@dirrm share/apps/kmess/styles
 @dirrm share/apps/kmess/pics
 @dirrm share/apps/kmess/icons/hicolor/16x16/apps
 @dirrm share/apps/kmess/icons/hicolor/16x16
 @dirrm share/apps/kmess/icons/hicolor
 @dirrm share/apps/kmess/icons
-@dirrm share/apps/kmess/emoticons
 @dirrm share/apps/kmess
 @dirrmtry share/applications/kde