10 files changed, 118 insertions, 38 deletions

diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile
index 0416f27e7abe..43c79adc895b 100644
--- a/net-im/kmess-kde4/Makefile
+++ b/net-im/kmess-kde4/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kmess
-PORTVERSION=	1.3
-PORTREVISION=	5
+PORTVERSION=	1.4.2
 CATEGORIES=	net-im kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/kmess-kde4/distinfo b/net-im/kmess-kde4/distinfo
index 3cc6dfb9f734..34504d8d5bca 100644
--- a/net-im/kmess-kde4/distinfo
+++ b/net-im/kmess-kde4/distinfo
@@ -1,2 +1,3 @@
-MD5 (kmess-1.3.tar.gz) = 3b482eddcfb89139131dccbfd4b08212
-SIZE (kmess-1.3.tar.gz) = 1597249
+MD5 (kmess-1.4.2.tar.gz) = e3d368ffbce6ee629e900d4a1134752e
+SHA256 (kmess-1.4.2.tar.gz) = 864dae86f5fc4a2d40698b382b4f6642c5d0e3d111a3c4732374dc7226f942d6
+SIZE (kmess-1.4.2.tar.gz) = 2336147
diff --git a/net-im/kmess-kde4/files/patch-kmess-network-msnconnection.cpp b/net-im/kmess-kde4/files/patch-kmess-network-msnconnection.cpp
deleted file mode 100644
index b48e264a071b..000000000000
--- a/net-im/kmess-kde4/files/patch-kmess-network-msnconnection.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- kmess/network/msnconnection.cpp.orig	Fri Aug 20 22:18:48 2004
-+++ kmess/network/msnconnection.cpp	Fri Aug 20 22:22:17 2004
-@@ -40,6 +40,7 @@
-    ack_(0),
-    identifier_(identifier),
-    initialized_(false),
-+   kStringHandler_(),
-    missedPings_(0),
-    sendPings_(false),
-    writeLocked_(false)
diff --git a/net-im/kmess-kde4/files/patch-kmess_network_msnconnection.h b/net-im/kmess-kde4/files/patch-kmess_network_msnconnection.h
new file mode 100644
index 000000000000..2c26626107fa
--- /dev/null
+++ b/net-im/kmess-kde4/files/patch-kmess_network_msnconnection.h
@@ -0,0 +1,10 @@
+--- /work/a/ports/net-im/kmess/work/kmess-1.4.2/kmess/network/msnconnection.h.orig	Tue Nov 15 04:03:10 2005
++++ /work/a/ports/net-im/kmess/work/kmess-1.4.2/kmess/network/msnconnection.h	Tue Nov 15 04:04:04 2005
+@@ -29,6 +29,7 @@
+ 
+ #include <stdlib.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ #include <sys/types.h>
diff --git a/net-im/kmess-kde4/pkg-plist b/net-im/kmess-kde4/pkg-plist
index d9dd7a8a5ac3..4040d262620a 100644
--- a/net-im/kmess-kde4/pkg-plist
+++ b/net-im/kmess-kde4/pkg-plist
@@ -1,5 +1,38 @@
 bin/kmess
-share/applnk/Internet/kmess.desktop
+share/applications/kde/kmess.desktop
+share/apps/kmess/emoticons/airplane.png
+share/apps/kmess/emoticons/automobile.png
+share/apps/kmess/emoticons/baringteeth.png
+share/apps/kmess/emoticons/bowl.png
+share/apps/kmess/emoticons/brb.png
+share/apps/kmess/emoticons/cigarette.png
+share/apps/kmess/emoticons/computer.png
+share/apps/kmess/emoticons/eyeroll.png
+share/apps/kmess/emoticons/fingerscrossed.png
+share/apps/kmess/emoticons/gameconsole.png
+share/apps/kmess/emoticons/highfive.png
+share/apps/kmess/emoticons/huh.png
+share/apps/kmess/emoticons/island.png
+share/apps/kmess/emoticons/lightning.png
+share/apps/kmess/emoticons/mobilephone.png
+share/apps/kmess/emoticons/money.png
+share/apps/kmess/emoticons/nerd.png
+share/apps/kmess/emoticons/party.png
+share/apps/kmess/emoticons/pizza.png
+share/apps/kmess/emoticons/plate.png
+share/apps/kmess/emoticons/sarcastic.png
+share/apps/kmess/emoticons/secret.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/sshh.png
+share/apps/kmess/emoticons/storm.png
+share/apps/kmess/emoticons/thinking.png
+share/apps/kmess/emoticons/turtle.png
+share/apps/kmess/emoticons/umbrella.png
+share/apps/kmess/emoticons/unhappy.png
 share/apps/kmess/emoticons/angel.png
 share/apps/kmess/emoticons/angry.png
 share/apps/kmess/emoticons/arrogant.png
@@ -53,7 +86,7 @@ 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/kmesspic.png
 share/apps/kmess/pics/away.png
 share/apps/kmess/pics/background.png
 share/apps/kmess/pics/berightback.png
@@ -85,12 +118,16 @@ 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/apps/kmess/icons/hicolor/16x16/apps/gnomemeeting.png
 share/icons/hicolor/16x16/apps/kmess.png
 share/icons/hicolor/32x32/apps/kmess.png
 share/icons/hicolor/48x48/apps/kmess.png
 share/icons/locolor/16x16/apps/kmess.png
 share/icons/locolor/32x32/apps/kmess.png
-share/icons/locolor/48x48/apps/kmess.png
+share/icons/hicolor/128x128/apps/kmess.png
+share/icons/hicolor/22x22/apps/kmess.png
+share/icons/hicolor/64x64/apps/kmess.png
+share/icons/locolor/22x22/apps/kmess.png
 share/locale/ar/LC_MESSAGES/kmess.mo
 share/locale/ca/LC_MESSAGES/kmess.mo
 share/locale/de/LC_MESSAGES/kmess.mo
@@ -103,6 +140,9 @@ share/locale/ko/LC_MESSAGES/kmess.mo
 share/locale/nb/LC_MESSAGES/kmess.mo
 share/locale/nl/LC_MESSAGES/kmess.mo
 share/locale/pt_BR/LC_MESSAGES/kmess.mo
+share/locale/sv/LC_MESSAGES/kmess.mo
+share/locale/sl/LC_MESSAGES/kmess.mo
+share/locale/zh_TW/LC_MESSAGES/kmess.mo
 share/locale/th/LC_MESSAGES/kmess.mo
 share/locale/tr/LC_MESSAGES/kmess.mo
 share/locale/zh_CN.GB18030/LC_MESSAGES/kmess.mo
@@ -112,9 +152,9 @@ share/sounds/kmess_chat.ogg
 share/sounds/kmess_logoff.ogg
 share/sounds/kmess_logon.ogg
 share/sounds/kmess_msg.ogg
-@unexec rmdir %D/share/locale/zh_CN.GB18030/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_CN.GB18030 2> /dev/null || true
 @dirrm share/doc/HTML/en/kmess
+@dirrm share/locale/zh_CN.GB18030/LC_MESSAGES
+@dirrm share/locale/zh_CN.GB18030
 @dirrm share/apps/kmess/pics
 @dirrm share/apps/kmess/icons/hicolor/16x16/apps
 @dirrm share/apps/kmess/icons/hicolor/16x16
diff --git a/net-im/kmess/Makefile b/net-im/kmess/Makefile
index 0416f27e7abe..43c79adc895b 100644
--- a/net-im/kmess/Makefile
+++ b/net-im/kmess/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kmess
-PORTVERSION=	1.3
-PORTREVISION=	5
+PORTVERSION=	1.4.2
 CATEGORIES=	net-im kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/kmess/distinfo b/net-im/kmess/distinfo
index 3cc6dfb9f734..34504d8d5bca 100644
--- a/net-im/kmess/distinfo
+++ b/net-im/kmess/distinfo
@@ -1,2 +1,3 @@
-MD5 (kmess-1.3.tar.gz) = 3b482eddcfb89139131dccbfd4b08212
-SIZE (kmess-1.3.tar.gz) = 1597249
+MD5 (kmess-1.4.2.tar.gz) = e3d368ffbce6ee629e900d4a1134752e
+SHA256 (kmess-1.4.2.tar.gz) = 864dae86f5fc4a2d40698b382b4f6642c5d0e3d111a3c4732374dc7226f942d6
+SIZE (kmess-1.4.2.tar.gz) = 2336147
diff --git a/net-im/kmess/files/patch-kmess-network-msnconnection.cpp b/net-im/kmess/files/patch-kmess-network-msnconnection.cpp
deleted file mode 100644
index b48e264a071b..000000000000
--- a/net-im/kmess/files/patch-kmess-network-msnconnection.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- kmess/network/msnconnection.cpp.orig	Fri Aug 20 22:18:48 2004
-+++ kmess/network/msnconnection.cpp	Fri Aug 20 22:22:17 2004
-@@ -40,6 +40,7 @@
-    ack_(0),
-    identifier_(identifier),
-    initialized_(false),
-+   kStringHandler_(),
-    missedPings_(0),
-    sendPings_(false),
-    writeLocked_(false)
diff --git a/net-im/kmess/files/patch-kmess_network_msnconnection.h b/net-im/kmess/files/patch-kmess_network_msnconnection.h
new file mode 100644
index 000000000000..2c26626107fa
--- /dev/null
+++ b/net-im/kmess/files/patch-kmess_network_msnconnection.h
@@ -0,0 +1,10 @@
+--- /work/a/ports/net-im/kmess/work/kmess-1.4.2/kmess/network/msnconnection.h.orig	Tue Nov 15 04:03:10 2005
++++ /work/a/ports/net-im/kmess/work/kmess-1.4.2/kmess/network/msnconnection.h	Tue Nov 15 04:04:04 2005
+@@ -29,6 +29,7 @@
+ 
+ #include <stdlib.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ #include <sys/types.h>
diff --git a/net-im/kmess/pkg-plist b/net-im/kmess/pkg-plist
index d9dd7a8a5ac3..4040d262620a 100644
--- a/net-im/kmess/pkg-plist
+++ b/net-im/kmess/pkg-plist
@@ -1,5 +1,38 @@
 bin/kmess
-share/applnk/Internet/kmess.desktop
+share/applications/kde/kmess.desktop
+share/apps/kmess/emoticons/airplane.png
+share/apps/kmess/emoticons/automobile.png
+share/apps/kmess/emoticons/baringteeth.png
+share/apps/kmess/emoticons/bowl.png
+share/apps/kmess/emoticons/brb.png
+share/apps/kmess/emoticons/cigarette.png
+share/apps/kmess/emoticons/computer.png
+share/apps/kmess/emoticons/eyeroll.png
+share/apps/kmess/emoticons/fingerscrossed.png
+share/apps/kmess/emoticons/gameconsole.png
+share/apps/kmess/emoticons/highfive.png
+share/apps/kmess/emoticons/huh.png
+share/apps/kmess/emoticons/island.png
+share/apps/kmess/emoticons/lightning.png
+share/apps/kmess/emoticons/mobilephone.png
+share/apps/kmess/emoticons/money.png
+share/apps/kmess/emoticons/nerd.png
+share/apps/kmess/emoticons/party.png
+share/apps/kmess/emoticons/pizza.png
+share/apps/kmess/emoticons/plate.png
+share/apps/kmess/emoticons/sarcastic.png
+share/apps/kmess/emoticons/secret.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/sshh.png
+share/apps/kmess/emoticons/storm.png
+share/apps/kmess/emoticons/thinking.png
+share/apps/kmess/emoticons/turtle.png
+share/apps/kmess/emoticons/umbrella.png
+share/apps/kmess/emoticons/unhappy.png
 share/apps/kmess/emoticons/angel.png
 share/apps/kmess/emoticons/angry.png
 share/apps/kmess/emoticons/arrogant.png
@@ -53,7 +86,7 @@ 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/kmesspic.png
 share/apps/kmess/pics/away.png
 share/apps/kmess/pics/background.png
 share/apps/kmess/pics/berightback.png
@@ -85,12 +118,16 @@ 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/apps/kmess/icons/hicolor/16x16/apps/gnomemeeting.png
 share/icons/hicolor/16x16/apps/kmess.png
 share/icons/hicolor/32x32/apps/kmess.png
 share/icons/hicolor/48x48/apps/kmess.png
 share/icons/locolor/16x16/apps/kmess.png
 share/icons/locolor/32x32/apps/kmess.png
-share/icons/locolor/48x48/apps/kmess.png
+share/icons/hicolor/128x128/apps/kmess.png
+share/icons/hicolor/22x22/apps/kmess.png
+share/icons/hicolor/64x64/apps/kmess.png
+share/icons/locolor/22x22/apps/kmess.png
 share/locale/ar/LC_MESSAGES/kmess.mo
 share/locale/ca/LC_MESSAGES/kmess.mo
 share/locale/de/LC_MESSAGES/kmess.mo
@@ -103,6 +140,9 @@ share/locale/ko/LC_MESSAGES/kmess.mo
 share/locale/nb/LC_MESSAGES/kmess.mo
 share/locale/nl/LC_MESSAGES/kmess.mo
 share/locale/pt_BR/LC_MESSAGES/kmess.mo
+share/locale/sv/LC_MESSAGES/kmess.mo
+share/locale/sl/LC_MESSAGES/kmess.mo
+share/locale/zh_TW/LC_MESSAGES/kmess.mo
 share/locale/th/LC_MESSAGES/kmess.mo
 share/locale/tr/LC_MESSAGES/kmess.mo
 share/locale/zh_CN.GB18030/LC_MESSAGES/kmess.mo
@@ -112,9 +152,9 @@ share/sounds/kmess_chat.ogg
 share/sounds/kmess_logoff.ogg
 share/sounds/kmess_logon.ogg
 share/sounds/kmess_msg.ogg
-@unexec rmdir %D/share/locale/zh_CN.GB18030/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zh_CN.GB18030 2> /dev/null || true
 @dirrm share/doc/HTML/en/kmess
+@dirrm share/locale/zh_CN.GB18030/LC_MESSAGES
+@dirrm share/locale/zh_CN.GB18030
 @dirrm share/apps/kmess/pics
 @dirrm share/apps/kmess/icons/hicolor/16x16/apps
 @dirrm share/apps/kmess/icons/hicolor/16x16