Update from 1.3Beta3 to 1.4. Parts of the fixes are from Kopete to get

MSNP9 working.

PR:		ports/59974
Submitted by:	Cedric Lamalle <cedric@cedric.trix.net> (maintainer)

3 files changed, 20 insertions, 21 deletions

diff --git a/net-im/kmerlin/Makefile b/net-im/kmerlin/Makefile
index d373f446d043..922291e6b72a 100644
--- a/net-im/kmerlin/Makefile
+++ b/net-im/kmerlin/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	kmerlin
-PORTVERSION=	1.3b3
+PORTVERSION=	1.4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-1.3Beta3
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	cedric@cedric.trix.net
 COMMENT=	An IM (Instant Messenger) KDE client for the Microsoft MSN Network
diff --git a/net-im/kmerlin/distinfo b/net-im/kmerlin/distinfo
index 4df20c6febee..33986d585392 100644
--- a/net-im/kmerlin/distinfo
+++ b/net-im/kmerlin/distinfo
@@ -1 +1 @@
-MD5 (kmerlin-1.3Beta3.tar.gz) = bef6cb2a7f953a12f212151ae80699a2
+MD5 (kmerlin-1.4.tar.gz) = e8ab854c9ba24ae8d0e39bddac29f323
diff --git a/net-im/kmerlin/pkg-plist b/net-im/kmerlin/pkg-plist
index 8c1ecaabbb33..986ac7fa2792 100644
--- a/net-im/kmerlin/pkg-plist
+++ b/net-im/kmerlin/pkg-plist
@@ -1,7 +1,9 @@
 bin/kmerlin
-bin/kmerlin_client
-share/applnk/Internet/kmerlin.desktop
-share/apps/kmerlin/icons/hicolor/16x16/actions/chat.png
+share/doc/HTML/en/kmerlin/index.cache.bz2
+share/doc/HTML/en/kmerlin/index.docbook
+share/doc/HTML/en/kmerlin/common
+share/nls/POSIX
+share/nls/en_US.US-ASCII
 share/apps/kmerlin/icons/hicolor/16x16/actions/hotmail.png
 share/apps/kmerlin/icons/hicolor/16x16/actions/kmaway.png
 share/apps/kmerlin/icons/hicolor/16x16/actions/kmback.png
@@ -10,17 +12,10 @@ share/apps/kmerlin/icons/hicolor/16x16/actions/kmlunch.png
 share/apps/kmerlin/icons/hicolor/16x16/actions/kmoffline.png
 share/apps/kmerlin/icons/hicolor/16x16/actions/kmonline.png
 share/apps/kmerlin/icons/hicolor/16x16/actions/kmphone.png
+share/apps/kmerlin/icons/hicolor/16x16/actions/chat.png
 share/apps/kmerlin/icons/hicolor/22x22/actions/hotmail.png
 share/apps/kmerlin/icons/hicolor/22x22/actions/kmaway.png
 share/apps/kmerlin/icons/hicolor/22x22/actions/kmoffline.png
-share/apps/kmerlin/kmerlinchatui.rc
-share/apps/kmerlin/kmerlinui.rc
-share/apps/kmerlin/pics/chat.png
-share/apps/kmerlin/pics/info.png
-share/apps/kmerlin/pics/network.png
-share/apps/kmerlin/pics/penguin.png
-share/apps/kmerlin/pics/top.png
-share/apps/kmerlin/smilies/README
 share/apps/kmerlin/smilies/angel.png
 share/apps/kmerlin/smilies/angry.png
 share/apps/kmerlin/smilies/bat.png
@@ -52,6 +47,7 @@ share/apps/kmerlin/smilies/musical_note.png
 share/apps/kmerlin/smilies/omg.png
 share/apps/kmerlin/smilies/phone.png
 share/apps/kmerlin/smilies/present.png
+share/apps/kmerlin/smilies/README
 share/apps/kmerlin/smilies/regular.png
 share/apps/kmerlin/smilies/rose.png
 share/apps/kmerlin/smilies/sad.png
@@ -67,11 +63,13 @@ share/apps/kmerlin/smilies/ugly.png
 share/apps/kmerlin/smilies/whatchutalkingabout_smile.png
 share/apps/kmerlin/smilies/wilted_rose.png
 share/apps/kmerlin/smilies/wink.png
-share/doc/HTML/en/kmerlin/common
-share/doc/HTML/en/kmerlin/index.cache.bz2
-share/doc/HTML/en/kmerlin/index.docbook
-share/icons/locolor/16x16/apps/kmerlin.png
-share/icons/locolor/32x32/apps/kmerlin.png
+share/apps/kmerlin/pics/info.png
+share/apps/kmerlin/pics/network.png
+share/apps/kmerlin/pics/top.png
+share/apps/kmerlin/pics/penguin.png
+share/apps/kmerlin/pics/chat.png
+share/apps/kmerlin/kmerlinui.rc
+share/apps/kmerlin/kmerlinchatui.rc
 share/locale/ar/LC_MESSAGES/kmerlin.mo
 share/locale/ca/LC_MESSAGES/kmerlin.mo
 share/locale/de/LC_MESSAGES/kmerlin.mo
@@ -82,7 +80,9 @@ share/locale/nb/LC_MESSAGES/kmerlin.mo
 share/locale/nl/LC_MESSAGES/kmerlin.mo
 share/locale/zh-CN/LC_MESSAGES/kmerlin.mo
 share/locale/zh-TW/LC_MESSAGES/kmerlin.mo
-@comment directories
+share/icons/locolor/32x32/apps/kmerlin.png
+share/icons/locolor/16x16/apps/kmerlin.png
+share/applnk/Internet/kmerlin.desktop
 @dirrm share/doc/HTML/en/kmerlin
 @dirrm share/apps/kmerlin/icons/hicolor/16x16/actions
 @dirrm share/apps/kmerlin/icons/hicolor/16x16
@@ -93,4 +93,3 @@ share/locale/zh-TW/LC_MESSAGES/kmerlin.mo
 @dirrm share/apps/kmerlin/smilies
 @dirrm share/apps/kmerlin/pics
 @dirrm share/apps/kmerlin
-@unexec rmdir %D/share/applnk/Internet 2>/dev/null || true