ports/59974: Maintainer update of kmerlin to 1.4

[Cedric Lamalle]

>Number:         59974
>Category:       ports
>Synopsis:       Maintainer update of kmerlin to 1.4
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 05 05:00:36 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Cedric Lamalle
>Release:        FreeBSD 5.2-BETA i386
>Organization:
-
>Environment:
System: FreeBSD maloobr 5.2-BETA FreeBSD 5.2-BETA #6: Fri Nov 28 13:03:54 BRST 2003 cedric at maloobr:/usr/obj/usr/src/sys/MALOOBR i386

>Description:
	Update of kmerlin from 1.3Beta3 to 1.4
>How-To-Repeat:
	
>Fix:
here's unified diff :


diff -ruN kmerlin.old/Makefile kmerlin/Makefile
--- kmerlin.old/Makefile	Fri Oct  3 19:34:44 2003
+++ kmerlin/Makefile	Fri Dec  5 10:42:18 2003
@@ -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 at cedric.trix.net
 COMMENT=	An IM (Instant Messenger) KDE client for the Microsoft MSN Network
diff -ruN kmerlin.old/distinfo kmerlin/distinfo
--- kmerlin.old/distinfo	Fri Aug  8 17:26:29 2003
+++ kmerlin/distinfo	Fri Dec  5 10:42:18 2003
@@ -1 +1 @@
-MD5 (kmerlin-1.3Beta3.tar.gz) = bef6cb2a7f953a12f212151ae80699a2
+MD5 (kmerlin-1.4.tar.gz) = e8ab854c9ba24ae8d0e39bddac29f323
diff -ruN kmerlin.old/pkg-plist kmerlin/pkg-plist
--- kmerlin.old/pkg-plist	Fri Aug  8 17:26:29 2003
+++ kmerlin/pkg-plist	Fri Dec  5 10:42:18 2003
@@ -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/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/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/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/nl/LC_MESSAGES/kmerlin.mo
 share/locale/zh-CN/LC_MESSAGES/kmerlin.mo
 share/locale/zh-TW/LC_MESSAGES/kmerlin.mo
- at 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 @@
 @dirrm share/apps/kmerlin/smilies
 @dirrm share/apps/kmerlin/pics
 @dirrm share/apps/kmerlin
- at unexec rmdir %D/share/applnk/Internet 2>/dev/null || true


>Release-Note:
>Audit-Trail:
>Unformatted: