6 files changed, 36 insertions, 20 deletions

diff --git a/irc/konversation-kde4/Makefile b/irc/konversation-kde4/Makefile
index 6061903a3cc3..47d5be81ee59 100644
--- a/irc/konversation-kde4/Makefile
+++ b/irc/konversation-kde4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	konversation
-PORTVERSION=	0.12
+PORTVERSION=	0.13
 CATEGORIES=	irc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,10 +17,10 @@ COMMENT=	A user friendly IRC client for KDE
 USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
 
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure
 
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.mk>
diff --git a/irc/konversation-kde4/distinfo b/irc/konversation-kde4/distinfo
index 748193eec219..ab2da3ea9499 100644
--- a/irc/konversation-kde4/distinfo
+++ b/irc/konversation-kde4/distinfo
@@ -1 +1 @@
-MD5 (konversation-0.12.tar.gz) = 53ceb276f6ed54046f6809c20c521d95
+MD5 (konversation-0.13.tar.bz2) = 1b6d08358c9cd64a31acc3d43b4c0510
diff --git a/irc/konversation-kde4/pkg-plist b/irc/konversation-kde4/pkg-plist
index 9c7a519784dd..b5fe462da15f 100644
--- a/irc/konversation-kde4/pkg-plist
+++ b/irc/konversation-kde4/pkg-plist
@@ -1,6 +1,6 @@
 bin/konversation
-share/applnk/Internet/konversation.desktop
-share/apps/konversation/images/close_pane.png
+share/applications/kde/konversation.desktop
+share/apps/konversation/eventsrc
 share/apps/konversation/images/led_blue_off.png
 share/apps/konversation/images/led_blue_on.png
 share/apps/konversation/images/led_green_off.png
@@ -10,11 +10,19 @@ share/apps/konversation/images/led_red_on.png
 share/apps/konversation/images/led_yellow_off.png
 share/apps/konversation/images/led_yellow_on.png
 share/apps/konversation/konversationui.rc
+share/icons/hicolor/16x16/apps/konversation.png
+share/icons/hicolor/32x32/apps/konversation.png
 share/locale/de/LC_MESSAGES/konversation.mo
+share/locale/it/LC_MESSAGES/konversation.mo
+share/locale/ko/LC_MESSAGES/konversation.mo
 share/locale/ru/LC_MESSAGES/konversation.mo
+share/locale/sl/LC_MESSAGES/konversation.mo
 share/locale/sv/LC_MESSAGES/konversation.mo
+@unexec rmdir %D/share/applications/kde 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
 @dirrm share/apps/konversation/images
 @dirrm share/apps/konversation
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Internet 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
diff --git a/irc/konversation/Makefile b/irc/konversation/Makefile
index 6061903a3cc3..47d5be81ee59 100644
--- a/irc/konversation/Makefile
+++ b/irc/konversation/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	konversation
-PORTVERSION=	0.12
+PORTVERSION=	0.13
 CATEGORIES=	irc kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,10 +17,10 @@ COMMENT=	A user friendly IRC client for KDE
 USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
 
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure
 
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.mk>
diff --git a/irc/konversation/distinfo b/irc/konversation/distinfo
index 748193eec219..ab2da3ea9499 100644
--- a/irc/konversation/distinfo
+++ b/irc/konversation/distinfo
@@ -1 +1 @@
-MD5 (konversation-0.12.tar.gz) = 53ceb276f6ed54046f6809c20c521d95
+MD5 (konversation-0.13.tar.bz2) = 1b6d08358c9cd64a31acc3d43b4c0510
diff --git a/irc/konversation/pkg-plist b/irc/konversation/pkg-plist
index 9c7a519784dd..b5fe462da15f 100644
--- a/irc/konversation/pkg-plist
+++ b/irc/konversation/pkg-plist
@@ -1,6 +1,6 @@
 bin/konversation
-share/applnk/Internet/konversation.desktop
-share/apps/konversation/images/close_pane.png
+share/applications/kde/konversation.desktop
+share/apps/konversation/eventsrc
 share/apps/konversation/images/led_blue_off.png
 share/apps/konversation/images/led_blue_on.png
 share/apps/konversation/images/led_green_off.png
@@ -10,11 +10,19 @@ share/apps/konversation/images/led_red_on.png
 share/apps/konversation/images/led_yellow_off.png
 share/apps/konversation/images/led_yellow_on.png
 share/apps/konversation/konversationui.rc
+share/icons/hicolor/16x16/apps/konversation.png
+share/icons/hicolor/32x32/apps/konversation.png
 share/locale/de/LC_MESSAGES/konversation.mo
+share/locale/it/LC_MESSAGES/konversation.mo
+share/locale/ko/LC_MESSAGES/konversation.mo
 share/locale/ru/LC_MESSAGES/konversation.mo
+share/locale/sl/LC_MESSAGES/konversation.mo
 share/locale/sv/LC_MESSAGES/konversation.mo
+@unexec rmdir %D/share/applications/kde 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
 @dirrm share/apps/konversation/images
 @dirrm share/apps/konversation
-@unexec rmdir %D/share/apps 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Internet 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true