6 files changed, 86 insertions, 52 deletions

diff --git a/sysutils/krename-kde4/Makefile b/sysutils/krename-kde4/Makefile
index e2c2414eb95e..15d3f7238d7d 100644
--- a/sysutils/krename-kde4/Makefile
+++ b/sysutils/krename-kde4/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	krename
-PORTVERSION=	2.8.5
-PORTREVISION=	2
+PORTVERSION=	3.0.0
 CATEGORIES=	sysutils kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	markus@FreeBSD.org
@@ -19,9 +18,8 @@ USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
- 
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|-O2||g; s|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 .include <bsd.port.mk>
diff --git a/sysutils/krename-kde4/distinfo b/sysutils/krename-kde4/distinfo
index c991c55b5ea7..81d42ac194b0 100644
--- a/sysutils/krename-kde4/distinfo
+++ b/sysutils/krename-kde4/distinfo
@@ -1,2 +1,2 @@
-MD5 (krename-2.8.5.tar.bz2) = 4cc4d8917e2fe2e5a592b5b04a5a5ab1
-SIZE (krename-2.8.5.tar.bz2) = 567922
+MD5 (krename-3.0.0.tar.bz2) = c8e3dc74589bb8a37b2b6635e9d3d78f
+SIZE (krename-3.0.0.tar.bz2) = 595798
diff --git a/sysutils/krename-kde4/pkg-plist b/sysutils/krename-kde4/pkg-plist
index 29e98eebe2f7..fce359bb970d 100644
--- a/sysutils/krename-kde4/pkg-plist
+++ b/sysutils/krename-kde4/pkg-plist
@@ -1,22 +1,22 @@
 bin/krename
 share/applnk/Utilities/krename.desktop
-share/apps/krename/krename_dir.desktop
-share/apps/krename/krenameservicemenu.desktop
+share/apps/konqueror/servicemenus/krename_dir.desktop
+share/apps/konqueror/servicemenus/krenameservicemenu.desktop
 share/apps/krename/logo.png
-%%PORTDOCS%%share/doc/HTML/de/krename/changes.html
-%%PORTDOCS%%share/doc/HTML/de/krename/compilation.html
-%%PORTDOCS%%share/doc/HTML/de/krename/credits.html
-%%PORTDOCS%%share/doc/HTML/de/krename/faq.html
-%%PORTDOCS%%share/doc/HTML/de/krename/index.html
-%%PORTDOCS%%share/doc/HTML/de/krename/introduction.html
-%%PORTDOCS%%share/doc/HTML/de/krename/using-krename.html
-%%PORTDOCS%%share/doc/HTML/en/krename/changes.html
-%%PORTDOCS%%share/doc/HTML/en/krename/compilation.html
-%%PORTDOCS%%share/doc/HTML/en/krename/credits.html
-%%PORTDOCS%%share/doc/HTML/en/krename/faq.html
-%%PORTDOCS%%share/doc/HTML/en/krename/index.html
-%%PORTDOCS%%share/doc/HTML/en/krename/introduction.html
-%%PORTDOCS%%share/doc/HTML/en/krename/using-krename.html
+share/doc/HTML/de/krename/changes.html
+share/doc/HTML/de/krename/compilation.html
+share/doc/HTML/de/krename/credits.html
+share/doc/HTML/de/krename/faq.html
+share/doc/HTML/de/krename/index.html
+share/doc/HTML/de/krename/introduction.html
+share/doc/HTML/de/krename/using-krename.html
+share/doc/HTML/en/krename/changes.html
+share/doc/HTML/en/krename/compilation.html
+share/doc/HTML/en/krename/credits.html
+share/doc/HTML/en/krename/faq.html
+share/doc/HTML/en/krename/index.html
+share/doc/HTML/en/krename/introduction.html
+share/doc/HTML/en/krename/using-krename.html
 share/icons/hicolor/32x32/apps/krename.png
 share/icons/hicolor/48x48/apps/krename.png
 share/icons/locolor/16x16/apps/krename.png
@@ -24,12 +24,31 @@ share/icons/locolor/32x32/apps/krename.png
 share/locale/de/LC_MESSAGES/krename.mo
 share/locale/es/LC_MESSAGES/krename.mo
 share/locale/fr/LC_MESSAGES/krename.mo
+share/locale/hu/LC_MESSAGES/krename.mo
 share/locale/it/LC_MESSAGES/krename.mo
 share/locale/ja/LC_MESSAGES/krename.mo
 share/locale/nl/LC_MESSAGES/krename.mo
+share/locale/pl/LC_MESSAGES/krename.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/krename.mo
+@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/48x48 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
+@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrm share/doc/HTML/en/krename
+@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrm share/doc/HTML/de/krename
+@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true
+@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
 @dirrm share/apps/krename
-%%PORTDOCS%%@dirrm share/doc/HTML/de/krename
-%%PORTDOCS%%@dirrm share/doc/HTML/en/krename
+@unexec rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || true
+@unexec rmdir %D/share/apps/konqueror 2>/dev/null || true
+@unexec rmdir %D/share/apps 2>/dev/null || true
 @unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
 @unexec rmdir %D/share/applnk 2>/dev/null || true
diff --git a/sysutils/krename/Makefile b/sysutils/krename/Makefile
index e2c2414eb95e..15d3f7238d7d 100644
--- a/sysutils/krename/Makefile
+++ b/sysutils/krename/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	krename
-PORTVERSION=	2.8.5
-PORTREVISION=	2
+PORTVERSION=	3.0.0
 CATEGORIES=	sysutils kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	markus@FreeBSD.org
@@ -19,9 +18,8 @@ USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
- 
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|-O2||g; s|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 .include <bsd.port.mk>
diff --git a/sysutils/krename/distinfo b/sysutils/krename/distinfo
index c991c55b5ea7..81d42ac194b0 100644
--- a/sysutils/krename/distinfo
+++ b/sysutils/krename/distinfo
@@ -1,2 +1,2 @@
-MD5 (krename-2.8.5.tar.bz2) = 4cc4d8917e2fe2e5a592b5b04a5a5ab1
-SIZE (krename-2.8.5.tar.bz2) = 567922
+MD5 (krename-3.0.0.tar.bz2) = c8e3dc74589bb8a37b2b6635e9d3d78f
+SIZE (krename-3.0.0.tar.bz2) = 595798
diff --git a/sysutils/krename/pkg-plist b/sysutils/krename/pkg-plist
index 29e98eebe2f7..fce359bb970d 100644
--- a/sysutils/krename/pkg-plist
+++ b/sysutils/krename/pkg-plist
@@ -1,22 +1,22 @@
 bin/krename
 share/applnk/Utilities/krename.desktop
-share/apps/krename/krename_dir.desktop
-share/apps/krename/krenameservicemenu.desktop
+share/apps/konqueror/servicemenus/krename_dir.desktop
+share/apps/konqueror/servicemenus/krenameservicemenu.desktop
 share/apps/krename/logo.png
-%%PORTDOCS%%share/doc/HTML/de/krename/changes.html
-%%PORTDOCS%%share/doc/HTML/de/krename/compilation.html
-%%PORTDOCS%%share/doc/HTML/de/krename/credits.html
-%%PORTDOCS%%share/doc/HTML/de/krename/faq.html
-%%PORTDOCS%%share/doc/HTML/de/krename/index.html
-%%PORTDOCS%%share/doc/HTML/de/krename/introduction.html
-%%PORTDOCS%%share/doc/HTML/de/krename/using-krename.html
-%%PORTDOCS%%share/doc/HTML/en/krename/changes.html
-%%PORTDOCS%%share/doc/HTML/en/krename/compilation.html
-%%PORTDOCS%%share/doc/HTML/en/krename/credits.html
-%%PORTDOCS%%share/doc/HTML/en/krename/faq.html
-%%PORTDOCS%%share/doc/HTML/en/krename/index.html
-%%PORTDOCS%%share/doc/HTML/en/krename/introduction.html
-%%PORTDOCS%%share/doc/HTML/en/krename/using-krename.html
+share/doc/HTML/de/krename/changes.html
+share/doc/HTML/de/krename/compilation.html
+share/doc/HTML/de/krename/credits.html
+share/doc/HTML/de/krename/faq.html
+share/doc/HTML/de/krename/index.html
+share/doc/HTML/de/krename/introduction.html
+share/doc/HTML/de/krename/using-krename.html
+share/doc/HTML/en/krename/changes.html
+share/doc/HTML/en/krename/compilation.html
+share/doc/HTML/en/krename/credits.html
+share/doc/HTML/en/krename/faq.html
+share/doc/HTML/en/krename/index.html
+share/doc/HTML/en/krename/introduction.html
+share/doc/HTML/en/krename/using-krename.html
 share/icons/hicolor/32x32/apps/krename.png
 share/icons/hicolor/48x48/apps/krename.png
 share/icons/locolor/16x16/apps/krename.png
@@ -24,12 +24,31 @@ share/icons/locolor/32x32/apps/krename.png
 share/locale/de/LC_MESSAGES/krename.mo
 share/locale/es/LC_MESSAGES/krename.mo
 share/locale/fr/LC_MESSAGES/krename.mo
+share/locale/hu/LC_MESSAGES/krename.mo
 share/locale/it/LC_MESSAGES/krename.mo
 share/locale/ja/LC_MESSAGES/krename.mo
 share/locale/nl/LC_MESSAGES/krename.mo
+share/locale/pl/LC_MESSAGES/krename.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/krename.mo
+@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/48x48 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
+@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrm share/doc/HTML/en/krename
+@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@dirrm share/doc/HTML/de/krename
+@unexec rmdir %D/share/doc/HTML/de 2>/dev/null || true
+@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
 @dirrm share/apps/krename
-%%PORTDOCS%%@dirrm share/doc/HTML/de/krename
-%%PORTDOCS%%@dirrm share/doc/HTML/en/krename
+@unexec rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || true
+@unexec rmdir %D/share/apps/konqueror 2>/dev/null || true
+@unexec rmdir %D/share/apps 2>/dev/null || true
 @unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
 @unexec rmdir %D/share/applnk 2>/dev/null || true