4 files changed, 48 insertions, 56 deletions

diff --git a/net/kmess/Makefile b/net/kmess/Makefile
index a4ddcc46acf2..cd69858386d2 100644
--- a/net/kmess/Makefile
+++ b/net/kmess/Makefile
@@ -6,21 +6,17 @@
 #
 
 PORTNAME=	kmess
-PORTVERSION=	0.9.6
-PORTREVISION=	1
+PORTVERSION=	0.9.7.2
 CATEGORIES=	net kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	kmess-0.9.7-2
 
 MAINTAINER=	perky@FreeBSD.org
 
 USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
-USE_REINPLACE=	yes
-
-post-patch:
-	${REINPLACE_CMD} -e 's/rightButtonClicked/contextMenuRequested/g' \
-		${WRKSRC}/kmess/kmessviewinterface.cpp
+USE_GMAKE=	yes
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/x11/kde3/Makefile.kde"
diff --git a/net/kmess/distinfo b/net/kmess/distinfo
index bebcff7d6712..8c5fc4848d77 100644
--- a/net/kmess/distinfo
+++ b/net/kmess/distinfo
@@ -1 +1 @@
-MD5 (kmess-0.9.6.tar.gz) = 1b5f47ff1075a8d8fcccf4a4817161db
+MD5 (kmess-0.9.7-2.tar.gz) = 44156176d73385810cfe194166008b23
diff --git a/net/kmess/files/patch-kmess::pics::blue::Makefile b/net/kmess/files/patch-kmess::pics::blue::Makefile
deleted file mode 100644
index f87656080bb0..000000000000
--- a/net/kmess/files/patch-kmess::pics::blue::Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
---- kmess/pics/blue/Makefile.in.orig	Wed Jun 19 20:57:57 2002
-+++ kmess/pics/blue/Makefile.in	Fri Jun 21 09:09:27 2002
-@@ -411,10 +411,10 @@
- 	$(INSTALL_DATA) $(srcdir)/teeth.png $(DESTDIR)$(kde_datadir)/kmess/emoticons/blue/teeth.png
- #>- 	$(mkinstalldirs) $(kde_datadir)/km$(kde_datadir)/kmess/emoticons/blue/angry.ss/emoticons/blue/
- #>+ 1
--	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/km$(kde_datadir)/kmess/emoticons/blue/angry.ss/emoticons/blue/
--#>- 	$(INSTALL_DATA) $(srcdir)/angry.png $(kde_datadir)/km$(kde_datadir)/kmess/emoticons/blue/angry.ss/emoticons/blue/angry.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kmess/emoticons/blue/
-+#>- 	$(INSTALL_DATA) $(srcdir)/angry.png $(kde_datadir)/kmess/emoticons/blue/
- #>+ 1
--	$(INSTALL_DATA) $(srcdir)/angry.png $(DESTDIR)$(kde_datadir)/km$(kde_datadir)/kmess/emoticons/blue/angry.ss/emoticons/blue/angry.png
-+	$(INSTALL_DATA) $(srcdir)/angry.png $(DESTDIR)$(kde_datadir)/kmess/emoticons/blue/
- #>- 	$(mkinstalldirs) $(kde_datadir)/kmess/emoticons/blue/
- #>+ 1
- 	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kmess/emoticons/blue/
-@@ -471,9 +471,9 @@
- #>- 	-rm -f $(kde_datadir)/kmess/emoticons/blue/teeth.png
- #>+ 1
- 	-rm -f $(DESTDIR)$(kde_datadir)/kmess/emoticons/blue/teeth.png
--#>- 	-rm -f $(kde_datadir)/km$(kde_datadir)/kmess/emoticons/blue/angry.ss/emoticons/blue/angry.png
-+#>- 	-rm -f $(kde_datadir)/kmess/emoticons/blue/angry.png
- #>+ 1
--	-rm -f $(DESTDIR)$(kde_datadir)/km$(kde_datadir)/kmess/emoticons/blue/angry.ss/emoticons/blue/angry.png
-+	-rm -f $(DESTDIR)$(kde_datadir)/kmess/emoticons/blue/angry.png
- #>- 	-rm -f $(kde_datadir)/kmess/emoticons/blue/tongue.png
- #>+ 1
- 	-rm -f $(DESTDIR)$(kde_datadir)/kmess/emoticons/blue/tongue.png
diff --git a/net/kmess/pkg-plist b/net/kmess/pkg-plist
index c99e45c6179d..4244534da798 100644
--- a/net/kmess/pkg-plist
+++ b/net/kmess/pkg-plist
@@ -2,18 +2,22 @@ bin/kmess
 share/applnk/Applications/kmess.desktop
 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/bad.png
 share/apps/kmess/emoticons/bat.png
 share/apps/kmess/emoticons/beer.png
 share/apps/kmess/emoticons/blue/angry.png
 share/apps/kmess/emoticons/blue/arrogant.png
+share/apps/kmess/emoticons/blue/confused.png
 share/apps/kmess/emoticons/blue/cry.png
 share/apps/kmess/emoticons/blue/embarrassed.png
 share/apps/kmess/emoticons/blue/omg.png
+share/apps/kmess/emoticons/blue/regular.png
 share/apps/kmess/emoticons/blue/sad.png
 share/apps/kmess/emoticons/blue/satisfied.png
 share/apps/kmess/emoticons/blue/shade.png
 share/apps/kmess/emoticons/blue/shout.png
-share/apps/kmess/emoticons/blue/smile.png
 share/apps/kmess/emoticons/blue/sorry.png
 share/apps/kmess/emoticons/blue/teeth.png
 share/apps/kmess/emoticons/blue/tongue.png
@@ -22,6 +26,21 @@ share/apps/kmess/emoticons/blue/wink.png
 share/apps/kmess/emoticons/boy.png
 share/apps/kmess/emoticons/cake.png
 share/apps/kmess/emoticons/camera.png
+share/apps/kmess/emoticons/cartoon/README
+share/apps/kmess/emoticons/cartoon/angel.png
+share/apps/kmess/emoticons/cartoon/angry.png
+share/apps/kmess/emoticons/cartoon/confused.png
+share/apps/kmess/emoticons/cartoon/cry.png
+share/apps/kmess/emoticons/cartoon/devil.png
+share/apps/kmess/emoticons/cartoon/omg.png
+share/apps/kmess/emoticons/cartoon/regular.png
+share/apps/kmess/emoticons/cartoon/sad.png
+share/apps/kmess/emoticons/cartoon/satisfied.png
+share/apps/kmess/emoticons/cartoon/shade.png
+share/apps/kmess/emoticons/cartoon/teeth.png
+share/apps/kmess/emoticons/cartoon/tongue.png
+share/apps/kmess/emoticons/cartoon/ugly.png
+share/apps/kmess/emoticons/cartoon/wink.png
 share/apps/kmess/emoticons/cat.png
 share/apps/kmess/emoticons/clock.png
 share/apps/kmess/emoticons/cocktail.png
@@ -30,23 +49,20 @@ 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/dog_realistic.png
 share/apps/kmess/emoticons/dude_hug.png
-share/apps/kmess/emoticons/e-mail.png
-share/apps/kmess/emoticons/email.png
 share/apps/kmess/emoticons/embarrassed.png
 share/apps/kmess/emoticons/emoticonrc
-share/apps/kmess/emoticons/emoticons_version.txt
 share/apps/kmess/emoticons/envelope.png
-share/apps/kmess/emoticons/filetypes.png
 share/apps/kmess/emoticons/film.png
 share/apps/kmess/emoticons/girl.png
 share/apps/kmess/emoticons/girl_hug.png
 share/apps/kmess/emoticons/handcuffs.png
 share/apps/kmess/emoticons/kiss.png
-share/apps/kmess/emoticons/kong.png
 share/apps/kmess/emoticons/lightbulb.png
 share/apps/kmess/emoticons/love.png
 share/apps/kmess/emoticons/mail.png
+share/apps/kmess/emoticons/megasmile.png
 share/apps/kmess/emoticons/messenger.png
 share/apps/kmess/emoticons/moon.png
 share/apps/kmess/emoticons/note.png
@@ -58,27 +74,29 @@ share/apps/kmess/emoticons/readme.txt
 share/apps/kmess/emoticons/regular.png
 share/apps/kmess/emoticons/rose.png
 share/apps/kmess/emoticons/sad.png
-share/apps/kmess/emoticons/satisfied.png
 share/apps/kmess/emoticons/shade.png
+share/apps/kmess/emoticons/shout.png
+share/apps/kmess/emoticons/shouting.png
+share/apps/kmess/emoticons/sorry.png
 share/apps/kmess/emoticons/star.png
+share/apps/kmess/emoticons/sun.png
 share/apps/kmess/emoticons/teeth.png
-share/apps/kmess/emoticons/thumbd.png
-share/apps/kmess/emoticons/thumbu.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/ugly.png
 share/apps/kmess/emoticons/unlove.png
-share/apps/kmess/emoticons/user.png
 share/apps/kmess/emoticons/violet/angry.png
 share/apps/kmess/emoticons/violet/arrogant.png
 share/apps/kmess/emoticons/violet/confused.png
 share/apps/kmess/emoticons/violet/cry.png
 share/apps/kmess/emoticons/violet/embarrassed.png
 share/apps/kmess/emoticons/violet/omg.png
+share/apps/kmess/emoticons/violet/regular.png
 share/apps/kmess/emoticons/violet/sad.png
 share/apps/kmess/emoticons/violet/satisfied.png
 share/apps/kmess/emoticons/violet/shade.png
 share/apps/kmess/emoticons/violet/shout.png
-share/apps/kmess/emoticons/violet/smile.png
 share/apps/kmess/emoticons/violet/sorry.png
 share/apps/kmess/emoticons/violet/teeth.png
 share/apps/kmess/emoticons/violet/tongue.png
@@ -86,17 +104,19 @@ share/apps/kmess/emoticons/violet/ugly.png
 share/apps/kmess/emoticons/violet/wink.png
 share/apps/kmess/emoticons/wilted_rose.png
 share/apps/kmess/emoticons/wink.png
+share/apps/kmess/emoticons/yellow/angel.png
 share/apps/kmess/emoticons/yellow/angry.png
 share/apps/kmess/emoticons/yellow/arrogant.png
 share/apps/kmess/emoticons/yellow/confused.png
 share/apps/kmess/emoticons/yellow/cry.png
+share/apps/kmess/emoticons/yellow/devil.png
 share/apps/kmess/emoticons/yellow/embarrassed.png
 share/apps/kmess/emoticons/yellow/omg.png
+share/apps/kmess/emoticons/yellow/regular.png
 share/apps/kmess/emoticons/yellow/sad.png
 share/apps/kmess/emoticons/yellow/satisfied.png
 share/apps/kmess/emoticons/yellow/shade.png
 share/apps/kmess/emoticons/yellow/shout.png
-share/apps/kmess/emoticons/yellow/smile.png
 share/apps/kmess/emoticons/yellow/sorry.png
 share/apps/kmess/emoticons/yellow/teeth.png
 share/apps/kmess/emoticons/yellow/tongue.png
@@ -107,13 +127,17 @@ share/apps/kmess/pics/away.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/emoticons.png
-share/apps/kmess/pics/emoticons/confused.png
 share/apps/kmess/pics/invisible.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/useBlueSmilies
+share/apps/kmess/useCartoonSmilies
+share/apps/kmess/useVioletSmilies
+share/apps/kmess/useYellowSmilies
 share/doc/HTML/en/kmess/common
 share/doc/HTML/en/kmess/contactlistbygroup.png
 share/doc/HTML/en/kmess/index.cache.bz2
@@ -121,19 +145,19 @@ share/doc/HTML/en/kmess/index.docbook
 share/doc/HTML/en/kmess/popup.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/locale/de/LC_MESSAGES/kmess.mo
-share/locale/es/LC_MESSAGES/kmess.mo
-share/locale/it/LC_MESSAGES/kmess.mo
-share/locale/nl/LC_MESSAGES/kmess.mo
-share/locale/pt_BR/LC_MESSAGES/kmess.mo
-share/locale/tr/LC_MESSAGES/kmess.mo
+share/icons/locolor/48x48/apps/kmess.png
+share/sounds/kmess_chat.ogg
+share/sounds/kmess_logoff.ogg
+share/sounds/kmess_logon.ogg
+share/sounds/kmess_msg.ogg
 @dirrm share/doc/HTML/en/kmess
-@dirrm share/apps/kmess/pics/emoticons
 @dirrm share/apps/kmess/pics
 @dirrm share/apps/kmess/emoticons/yellow
 @dirrm share/apps/kmess/emoticons/violet
+@dirrm share/apps/kmess/emoticons/cartoon
 @dirrm share/apps/kmess/emoticons/blue
 @dirrm share/apps/kmess/emoticons
 @dirrm share/apps/kmess