6 files changed, 115 insertions, 103 deletions

diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile
index eeb3b8eb0987..3755593836fc 100644
--- a/net-im/kmess-kde4/Makefile
+++ b/net-im/kmess-kde4/Makefile
@@ -6,23 +6,26 @@
 #
 
 PORTNAME=	kmess
-PORTVERSION=	1.5.p.1
-PORTREVISION=	3
+PORTVERSION=	2.0.2
 CATEGORIES=	net-im kde
-MASTER_SITES=	SF/${PORTNAME}/Older%20versions/1.5pre1
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p./pre/}
+MASTER_SITES=	SF/${PORTNAME}/Latest%20versions/${PORTVERSION}/
 
-MAINTAINER=	freebsd-ports@club-internet.fr
-COMMENT=	MSN Messenger Client for KDE3
+MAINTAINER=	syncer@gmail.com
+COMMENT=	MSN Messenger client for KDE
 
-USE_KDELIBS_VER=3
-USE_AUTOTOOLS=	libtool:22
-USE_GMAKE=	yes
+LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
+		qca.2:${PORTSDIR}/devel/qca
+BUILD_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
+RUN_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
 
-post-patch:
-	@${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
+LATEST_LINK=	${PORTNAME}-kde4
+MAKE_JOBS_SAFE=	yes
+USE_GNOME=	libxml2 libxslt
+USE_KDE4=	kdehier kdeprefix kdebase automoc4
+USE_QT_VER=	4
+QT_COMPONENTS=	corelib gui network opengl script svg webkit \
+		qmake_build moc_build rcc_build uic_build phonon
+USE_CMAKE=	yes
+USE_GETTEXT=	yes
 
 .include <bsd.port.mk>
diff --git a/net-im/kmess-kde4/distinfo b/net-im/kmess-kde4/distinfo
index b471e4068d12..1b9ead5607ae 100644
--- a/net-im/kmess-kde4/distinfo
+++ b/net-im/kmess-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (kmess-1.5pre1.tar.gz) = 176774205ca1ecb8bacd4cf0c01e266f
-SHA256 (kmess-1.5pre1.tar.gz) = 16caf1921ec55270b7edae2624f6c4c12d9d6db5fd8789a0dd9295fd6d374d57
-SIZE (kmess-1.5pre1.tar.gz) = 2129027
+MD5 (kmess-2.0.2.tar.gz) = b46e39f2b7b4d1ba32800b48c027603c
+SHA256 (kmess-2.0.2.tar.gz) = 9b7ae8380c0d629ac14cf9db3adc190a1d270427b1a7a42c633b3565f8071695
+SIZE (kmess-2.0.2.tar.gz) = 3483795
diff --git a/net-im/kmess-kde4/files/patch-kmess-Makefile.in b/net-im/kmess-kde4/files/patch-kmess-Makefile.in
deleted file mode 100644
index 17a9da05f3fd..000000000000
--- a/net-im/kmess-kde4/files/patch-kmess-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- kmess/Makefile.in.orig	Sun Jun  4 16:44:43 2006
-+++ kmess/Makefile.in	Sun Jun  4 16:45:06 2006
-@@ -470,7 +470,7 @@
- 
- # the library search path.
- # the -lpthread is required for Autopackage/BinReloc
--kmess_LDFLAGS = $(KDE_RPATH) $(all_libraries) -lpthread
-+kmess_LDFLAGS = $(KDE_RPATH) $(all_libraries)
- AM_CXXFLAGS = -ggdb
- #>- all: all-recursive
- #>+ 1
diff --git a/net-im/kmess-kde4/files/patch-kmess_network_msnconnection.h b/net-im/kmess-kde4/files/patch-kmess_network_msnconnection.h
deleted file mode 100644
index f9c9edb3c1a5..000000000000
--- a/net-im/kmess-kde4/files/patch-kmess_network_msnconnection.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- kmess/network/msnconnection.h.orig	Tue Nov 15 04:03:10 2005
-+++ 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-descr b/net-im/kmess-kde4/pkg-descr
index aa27c3e23329..751b8a2aab22 100644
--- a/net-im/kmess-kde4/pkg-descr
+++ b/net-im/kmess-kde4/pkg-descr
@@ -1,6 +1,17 @@
-An MSN Messenger clone for KDE. Includes font support,
-emoticons, and the ability to switch the contact list
-between "by group" and "by online/offline", among
-other things. 
- 
-WWW: http://www.kmess.org/
+Kmess, the Live Messenger alternative!
+
+With KMess, chatting with friends using Live Messenger
+has never been so good - enjoy our great features:
+* Display picture transfers
+* Fast file transfers
+* Custom emoticons, nudges and winks
+* Offline messaging and chatting while invisible
+* Rich and colorful chat styles and logs
+* Chat logging and logs browsing
+* Messenger Plus Live text coloring and formatting
+* Live Mail notifications
+* Block annoying custom emoticons
+* Connectivity from behind firewalls and proxies
+* Good-looking and friendly user interface
+
+WWW:	http://www.kmess.org
diff --git a/net-im/kmess-kde4/pkg-plist b/net-im/kmess-kde4/pkg-plist
index 3d62f3f320c2..007afe2e93a9 100644
--- a/net-im/kmess-kde4/pkg-plist
+++ b/net-im/kmess-kde4/pkg-plist
@@ -1,39 +1,53 @@
 bin/kmess
-share/applications/kde/kmess.desktop
-share/apps/kmess/eventsrc
-share/apps/kmess/icons/hicolor/16x16/apps/gnomemeeting.png
+lib/kde4/libkmesssendplugin.so
+share/applications/kde4/kmess.desktop
+share/apps/kmess/chatwindowui.rc
+share/apps/kmess/icons/hicolor/16x16/actions/likeback_bug.png
+share/apps/kmess/icons/hicolor/16x16/actions/likeback_dislike.png
+share/apps/kmess/icons/hicolor/16x16/actions/likeback_feature.png
+share/apps/kmess/icons/hicolor/16x16/actions/likeback_like.png
+share/apps/kmess/icons/hicolor/16x16/apps/kmess-shadow.png
+share/apps/kmess/kmess.notifyrc
+share/apps/kmess/kmessinterfaceui.rc
 share/apps/kmess/pics/away.png
 share/apps/kmess/pics/background.png
 share/apps/kmess/pics/berightback.png
 share/apps/kmess/pics/blocked.png
 share/apps/kmess/pics/busy.png
-share/apps/kmess/pics/email.png
+share/apps/kmess/pics/contact_busy_overlay.png
+share/apps/kmess/pics/contact_food_overlay.png
+share/apps/kmess/pics/contact_phone_overlay.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
+share/apps/kmess/pics/kmessstrip1.png
+share/apps/kmess/pics/kmessstrip2.png
 share/apps/kmess/pics/lunch.png
 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/Classic-compact/Classic-compact.css
+share/apps/kmess/styles/Classic-compact/Classic-compact.xsl
+share/apps/kmess/styles/Classic/Classic.css
+share/apps/kmess/styles/Classic/Classic.xsl
 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-dark/Fresh-dark.css
+share/apps/kmess/styles/Fresh-dark/Fresh-dark.xsl
+share/apps/kmess/styles/Fresh-dark/bg_gravatar.gif
+share/apps/kmess/styles/Fresh-dark/bg_gravatar_rtl.gif
+share/apps/kmess/styles/Fresh-dark/buddy_icon.png
 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
@@ -48,30 +62,44 @@ 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/config/kmesschatstyles.knsrc
+share/doc/HTML/en/kmess/chathistorydialog.png
+share/doc/HTML/en/kmess/chatwindow-contextmenu.png
+share/doc/HTML/en/kmess/chatwindow-custom-emoticons-add.png
+share/doc/HTML/en/kmess/chatwindow-emoticons.png
+share/doc/HTML/en/kmess/chatwindow.png
 share/doc/HTML/en/kmess/common
+share/doc/HTML/en/kmess/contactlist-contextmenu.png
+share/doc/HTML/en/kmess/contactlist-states.png
+share/doc/HTML/en/kmess/contactlist.png
+share/doc/HTML/en/kmess/exportlist-dialog.png
 share/doc/HTML/en/kmess/index.cache.bz2
 share/doc/HTML/en/kmess/index.docbook
-share/doc/HTML/en/kmess/kmesschatwindow.png
-share/doc/HTML/en/kmess/kmesschatwindowcontactsidebaremailbutton.png
-share/doc/HTML/en/kmess/kmesschatwindowcontactsidebarprofilebutton.png
-share/doc/HTML/en/kmess/kmesschatwindowwithsidebar.png
-share/doc/HTML/en/kmess/kmesscompactchat.png
-share/doc/HTML/en/kmess/kmesscontactsidebarbutton.png
-share/doc/HTML/en/kmess/kmesscontactwindowwithsidebar.png
-share/doc/HTML/en/kmess/kmessemoticonbutton.png
-share/doc/HTML/en/kmess/kmessemoticonchooser.png
-share/doc/HTML/en/kmess/kmessmainwindow.png
-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/doc/HTML/en/kmess/settings-account-chat-behavior.png
+share/doc/HTML/en/kmess/settings-account-chat-text.png
+share/doc/HTML/en/kmess/settings-account-chat.png
+share/doc/HTML/en/kmess/settings-account-contactlist.png
+share/doc/HTML/en/kmess/settings-account-emoticons-custom-add.png
+share/doc/HTML/en/kmess/settings-account-emoticons-custom.png
+share/doc/HTML/en/kmess/settings-account-emoticons.png
+share/doc/HTML/en/kmess/settings-account-logging.png
+share/doc/HTML/en/kmess/settings-account.png
+share/doc/HTML/en/kmess/settings-contact.png
+share/doc/HTML/en/kmess/settings-kmess-accounts.png
+share/doc/HTML/en/kmess/settings-kmess-notifications.png
+share/doc/HTML/en/kmess/settings-kmess-settings-email.png
+share/doc/HTML/en/kmess/settings-kmess-settings-filetransfers.png
+share/doc/HTML/en/kmess/settings-kmess-settings-web.png
+share/doc/HTML/en/kmess/startupscreen.png
+share/doc/HTML/en/kmess/styles-classic-compact.png
+share/doc/HTML/en/kmess/styles-classic.png
+share/doc/HTML/en/kmess/styles-fresh.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
@@ -134,7 +162,6 @@ 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
@@ -157,51 +184,43 @@ share/icons/hicolor/22x22/apps/kmess.png
 share/icons/hicolor/32x32/apps/kmess.png
 share/icons/hicolor/48x48/apps/kmess.png
 share/icons/hicolor/64x64/apps/kmess.png
-share/icons/locolor/16x16/apps/kmess.png
-share/icons/locolor/22x22/apps/kmess.png
-share/icons/locolor/32x32/apps/kmess.png
+share/icons/hicolor/scalable/apps/kmess.svgz
+share/kde4/services/kmesssendplugin.desktop
 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/ee/LC_MESSAGES/kmess.mo
+share/locale/el/LC_MESSAGES/kmess.mo
 share/locale/es/LC_MESSAGES/kmess.mo
+share/locale/et/LC_MESSAGES/kmess.mo
 share/locale/fi/LC_MESSAGES/kmess.mo
 share/locale/fr/LC_MESSAGES/kmess.mo
+share/locale/hu/LC_MESSAGES/kmess.mo
 share/locale/it/LC_MESSAGES/kmess.mo
-share/locale/ko/LC_MESSAGES/kmess.mo
-share/locale/nb/LC_MESSAGES/kmess.mo
+share/locale/ja/LC_MESSAGES/kmess.mo
 share/locale/nl/LC_MESSAGES/kmess.mo
 share/locale/pt_BR/LC_MESSAGES/kmess.mo
-share/locale/sl/LC_MESSAGES/kmess.mo
-share/locale/sv/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
-share/locale/zh_CN.GB2312/LC_MESSAGES/kmess.mo
+share/locale/sk/LC_MESSAGES/kmess.mo
 share/locale/zh_CN/LC_MESSAGES/kmess.mo
 share/locale/zh_TW/LC_MESSAGES/kmess.mo
 share/sounds/kmess_chat.ogg
 share/sounds/kmess_logoff.ogg
 share/sounds/kmess_logon.ogg
 share/sounds/kmess_msg.ogg
-@dirrmtry share/locale/zh_CN.GB18030/LC_MESSAGES
-@dirrmtry share/locale/zh_CN.GB18030
-@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
-@dirrmtry share/applications/kde
+@dirrm share/emoticons/KMess-new/
+@dirrm share/doc/HTML/en/kmess/
+@dirrm share/apps/kmess/styles/Pure/
+@dirrm share/apps/kmess/styles/Fresh/
+@dirrm share/apps/kmess/styles/Fresh-dark/
+@dirrm share/apps/kmess/styles/Efficient/
+@dirrm share/apps/kmess/styles/Dim/
+@dirrm share/apps/kmess/styles/Colourful-Enclosed/
+@dirrm share/apps/kmess/styles/Classic/
+@dirrm share/apps/kmess/styles/Classic-compact/
+@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/actions/
+@dirrm share/apps/kmess/icons/hicolor/16x16/
+@dirrm share/apps/kmess/icons/hicolor/
+@dirrm share/apps/kmess/icons/
+@dirrm share/apps/kmess/