- Update to 2.1.8a.

- Follow devstat API change on 5-CURRENT.

4 files changed, 22 insertions, 25 deletions

diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 97d4eff7cc4a..8953950f81fc 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gkrellm
-PORTVERSION=	2.1.7a
-PORTREVISION=	1
+PORTVERSION=	2.1.8a
+#PORTREVISION=	0
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/ \
 		${MASTER_SITE_LOCAL}
@@ -16,6 +16,8 @@ MASTER_SITE_SUBDIR=	ume
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	A GTK based system monitor
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-2.1.8
+
 .if defined(GKRELLM_SERVER_ONLY)
 BUILD_WRKSRC=	${WRKSRC}/server
 INSTALL_WRKSRC=	${WRKSRC}/server
@@ -74,7 +76,9 @@ post-install:
 	@${MKDIR} ${X11BASE}/libexec/gkrellm2/plugins
 	@${MKDIR} ${X11BASE}/share/gkrellm2/themes
 	@${GZIP_CMD} ${MAN1PREFIX}/man/man1/gkrellm.1
+	@${CHMOD} 2511 ${X11BASE}/bin/gkrellm
 .endif
+	@${CHMOD} 2511 ${PREFIX}/sbin/gkrellmd
 	@${SED} -e "s;%%PREFIX%%;${PREFIX};g" \
 		${FILESDIR}/gkrellmd.sh > ${PREFIX}/etc/rc.d/gkrellmd.sh.sample
 	@${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/gkrellmd.sh.sample
diff --git a/sysutils/gkrellm2/distinfo b/sysutils/gkrellm2/distinfo
index 19c5baac6d12..36f7459e39c2 100644
--- a/sysutils/gkrellm2/distinfo
+++ b/sysutils/gkrellm2/distinfo
@@ -1 +1 @@
-MD5 (gkrellm-2.1.7a.tar.bz2) = cc1a6c7d70e7c310292737c08d32cd5d
+MD5 (gkrellm-2.1.8a.tar.bz2) = 5d9112c82b9cd4aae28a00325e2369ec
diff --git a/sysutils/gkrellm2/files/patch-src::sysdeps::freebsd.c b/sysutils/gkrellm2/files/patch-src::sysdeps::freebsd.c
index 56dcfb0715e7..03b4bc760a8f 100644
--- a/sysutils/gkrellm2/files/patch-src::sysdeps::freebsd.c
+++ b/sysutils/gkrellm2/files/patch-src::sysdeps::freebsd.c
@@ -1,26 +1,18 @@
 Index: src/sysdeps/freebsd.c
 diff -u src/sysdeps/freebsd.c.orig src/sysdeps/freebsd.c
---- src/sysdeps/freebsd.c.orig	Wed Jan 22 00:17:21 2003
-+++ src/sysdeps/freebsd.c	Thu Feb 20 19:29:34 2003
-@@ -81,7 +81,12 @@
- /* ===================================================================== */
- /* CPU monitor interface */
- 
-+#include <osreldate.h>
-+#if __FreeBSD_version >= 500101
-+#include <sys/resource.h>
-+#else
- #include <sys/dkstat.h>
-+#endif
- #include <kvm.h>
+--- src/sysdeps/freebsd.c.orig	Wed Mar  5 13:14:38 2003
++++ src/sysdeps/freebsd.c	Sat Mar 22 13:58:33 2003
+@@ -372,6 +372,13 @@
  
+ #else
  
-@@ -301,8 +306,6 @@
- /* ===================================================================== */
- /* Disk monitor interface */
- 
--#include <osreldate.h>
--#include <sys/dkstat.h>
- #if __FreeBSD_version >= 300000
- #include <devstat.h>
- static struct statinfo	statinfo_cur;
++#if __FreeBSD_version >= 500107
++#define getdevs(stats)	devstat_getdevs(NULL, stats)
++#define selectdevs	devstat_selectdevs
++#define bytes_read	bytes[DEVSTAT_READ]
++#define bytes_written	bytes[DEVSTAT_WRITE]
++#endif
++
+ gint
+ gkrellm_sys_disk_order_from_name(gchar *name)
+ 	{
diff --git a/sysutils/gkrellm2/pkg-plist b/sysutils/gkrellm2/pkg-plist
index 816ee78acb51..ace303d1b48c 100644
--- a/sysutils/gkrellm2/pkg-plist
+++ b/sysutils/gkrellm2/pkg-plist
@@ -19,6 +19,7 @@ etc/rc.d/gkrellmd.sh.sample
 %%CLIENT%%share/locale/fr/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%share/locale/it/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%share/locale/ja/LC_MESSAGES/gkrellm.mo
+%%CLIENT%%share/locale/nl/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%share/locale/pl/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%share/locale/ru/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%share/locale/sl/LC_MESSAGES/gkrellm.mo