- Update to version 2.4.0

- take maintainership [1]
- respect CFLAGS and PTHREAD_LIBS
- sort pkg-plist

Approved by:	Stefan Jahn <stefan.jahn@nemesis-sektor.de> (maintainer) [1]
		arved (mentor)

4 files changed, 32 insertions, 31 deletions

diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile
index 035e09813b91..daa12777e0ed 100644
--- a/sysutils/kdirstat/Makefile
+++ b/sysutils/kdirstat/Makefile
@@ -6,20 +6,22 @@
 #
 
 PORTNAME=	kdirstat
-PORTVERSION=	2.3.7
-PORTREVISION=	1
+PORTVERSION=	2.4.0
 CATEGORIES=	sysutils kde
 MASTER_SITES=	http://kdirstat.sourceforge.net/download/
 
-MAINTAINER=	stefan.jahn@nemesis-sektor.de
+MAINTAINER=	markus@FreeBSD.org
 COMMENT=	A small KDE utility that sums up disk usage for direcory trees
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 
-CONFIGURE_TARGET=
-CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+post-patch:
+	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11/kde3/Makefile.kde"
+.include <bsd.port.post.mk>
diff --git a/sysutils/kdirstat/distinfo b/sysutils/kdirstat/distinfo
index d2c57554a698..ac2dc0ce6a85 100644
--- a/sysutils/kdirstat/distinfo
+++ b/sysutils/kdirstat/distinfo
@@ -1,2 +1,2 @@
-MD5 (kdirstat-2.3.7.tar.bz2) = 987b523c5b112c697aaec0b4d8cb636a
-SIZE (kdirstat-2.3.7.tar.bz2) = 633379
+MD5 (kdirstat-2.4.0.tar.bz2) = b8e368621ed11b046c30a6498e00d75e
+SIZE (kdirstat-2.4.0.tar.bz2) = 639990
diff --git a/sysutils/kdirstat/pkg-descr b/sysutils/kdirstat/pkg-descr
index 210f23e48b44..d63899f90f5e 100644
--- a/sysutils/kdirstat/pkg-descr
+++ b/sysutils/kdirstat/pkg-descr
@@ -8,6 +8,3 @@ the ability to include your own cleanup commands
 or scripts.
 
 WWW: http://kdirstat.sourceforge.net
-
-- Stefan Jahn
-stefan.jahn@nemesis-sektor.de
diff --git a/sysutils/kdirstat/pkg-plist b/sysutils/kdirstat/pkg-plist
index 1ff04d0c4e00..6460a588aa17 100644
--- a/sysutils/kdirstat/pkg-plist
+++ b/sysutils/kdirstat/pkg-plist
@@ -16,33 +16,35 @@ share/icons/hicolor/16x16/apps/kdirstat.png
 share/icons/hicolor/32x32/apps/kdirstat.png
 share/icons/locolor/16x16/apps/kdirstat.png
 share/icons/locolor/32x32/apps/kdirstat.png
+share/locale/de/LC_MESSAGES/kdirstat.mo
 share/locale/fr/LC_MESSAGES/kdirstat.mo
 share/locale/ja/LC_MESSAGES/kdirstat.mo
-@dirrm share/apps/kdirstat/icons/hicolor/16x16/actions
-@dirrm share/apps/kdirstat/icons/hicolor/16x16
-@dirrm share/apps/kdirstat/icons/hicolor/32x32/actions
-@dirrm share/apps/kdirstat/icons/hicolor/32x32
-@dirrm share/apps/kdirstat/icons/hicolor/48x48/actions
-@dirrm share/apps/kdirstat/icons/hicolor/48x48
+@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/32x32/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/32x32 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 2>/dev/null || true
+@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrm share/doc/HTML/en/kdirstat
+@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
 @dirrm share/apps/kdirstat/icons/locolor/16x16/actions
 @dirrm share/apps/kdirstat/icons/locolor/16x16
-@dirrm share/apps/kdirstat/icons/hicolor
 @dirrm share/apps/kdirstat/icons/locolor
+@dirrm share/apps/kdirstat/icons/hicolor/48x48/actions
+@dirrm share/apps/kdirstat/icons/hicolor/48x48
+@dirrm share/apps/kdirstat/icons/hicolor/32x32/actions
+@dirrm share/apps/kdirstat/icons/hicolor/32x32
+@dirrm share/apps/kdirstat/icons/hicolor/16x16/actions
+@dirrm share/apps/kdirstat/icons/hicolor/16x16
+@dirrm share/apps/kdirstat/icons/hicolor
 @dirrm share/apps/kdirstat/icons
 @dirrm share/apps/kdirstat
 @unexec rmdir %D/share/apps 2>/dev/null || true
-@dirrm share/doc/HTML/en/kdirstat
-@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
-@unexec rmdir %D/share/doc/HTML 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
-@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/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
 @unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
 @unexec rmdir %D/share/applnk 2>/dev/null || true