Update to 2.1.5.

5 files changed, 5 insertions, 127 deletions

diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 1151f2069aa5..d5320bbbdd9d 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gkrellm
-PORTVERSION=	2.1.4
-PORTREVISION=	1
+PORTVERSION=	2.1.5
+#PORTREVISION=	0
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/ \
 		${MASTER_SITE_LOCAL}
diff --git a/sysutils/gkrellm2/distinfo b/sysutils/gkrellm2/distinfo
index e45dfe30e955..b298c68f4456 100644
--- a/sysutils/gkrellm2/distinfo
+++ b/sysutils/gkrellm2/distinfo
@@ -1 +1 @@
-MD5 (gkrellm-2.1.4.tar.bz2) = e3130e8d6487642c2eb3e68b8d2ee8b0
+MD5 (gkrellm-2.1.5.tar.bz2) = 95dfe8ef1bf4f0eb20a44d60aa9ff2ad
diff --git a/sysutils/gkrellm2/files/patch-src::sysdeps::bsd-common.c b/sysutils/gkrellm2/files/patch-src::sysdeps::bsd-common.c
deleted file mode 100644
index f7b8f2d41a88..000000000000
--- a/sysutils/gkrellm2/files/patch-src::sysdeps::bsd-common.c
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: src/sysdeps/bsd-common.c
-diff -u src/sysdeps/bsd-common.c.orig src/sysdeps/bsd-common.c
---- src/sysdeps/bsd-common.c.orig	Sun Oct 13 12:26:29 2002
-+++ src/sysdeps/bsd-common.c	Fri Jan  3 19:15:29 2003
-@@ -22,6 +22,45 @@
- |  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
- 
-+#if !(defined(__FreeBSD__) && __FreeBSD_version < 410000) && \
-+    !(defined(__NetBSD__) && __NetBSD_version < 105000000) && \
-+    !(defined(__OpenBSD__) && OpenBSD < 200006)
-+#define HAVE_GETIFADDRS	1
-+#endif
-+
-+#if defined(HAVE_GETIFADDRS)
-+
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <net/if.h>
-+#include <ifaddrs.h>
-+
-+void
-+gkrellm_sys_net_read_data(void)
-+	{
-+	struct ifaddrs		*ifap, *ifa;
-+	struct if_data		*ifd;
-+
-+	if (getifaddrs(&ifap) < 0)
-+		return;
-+
-+	for (ifa = ifap; ifa; ifa = ifa->ifa_next)
-+		{
-+		if (ifa->ifa_flags & IFF_UP)
-+			{
-+			if (ifa->ifa_addr->sa_family != AF_LINK)
-+				continue;
-+			ifd = (struct if_data *)ifa->ifa_data;
-+			gkrellm_net_assign_data(ifa->ifa_name,
-+					ifd->ifi_ibytes, ifd->ifi_obytes);
-+			}
-+		}
-+
-+	freeifaddrs(ifap);
-+	}
-+
-+#else /* HAVE_GETIFADDRS */
-+
- #include <sys/sysctl.h>
- #include <sys/socket.h> // For PF_ROUTE, etc
- #include <net/if.h>
-@@ -86,6 +125,8 @@
- 			}
- 		}
- 	}
-+
-+#endif /* HAVE_GETIFADDRS */
- 
-   /* This would be needed only if net up (or routed) state is available in
-   |  a different way than for reading net stats.
diff --git a/sysutils/gkrellm2/files/patch-src::sysdeps::freebsd.c b/sysutils/gkrellm2/files/patch-src::sysdeps::freebsd.c
deleted file mode 100644
index 21e8b312a46d..000000000000
--- a/sysutils/gkrellm2/files/patch-src::sysdeps::freebsd.c
+++ /dev/null
@@ -1,65 +0,0 @@
-Index: src/sysdeps/freebsd.c
-diff -u src/sysdeps/freebsd.c.orig src/sysdeps/freebsd.c
---- src/sysdeps/freebsd.c.orig	Wed Oct  2 05:17:59 2002
-+++ src/sysdeps/freebsd.c	Tue Dec 31 15:47:32 2002
-@@ -1181,6 +1181,8 @@
- /* ===================================================================== */
- /* Sensor monitor interface */
- 
-+#if defined(__i386__)
-+
- typedef struct
- 	{
- 	gchar	*name;
-@@ -1206,11 +1208,12 @@
- 	{ "-5V",	-1.667, 0, NULL }		/* in6 -(100/60)*@		*/
- 	};
- 
--#if defined(__i386__)
- #include <dirent.h>
- #include <osreldate.h>
- #include <machine/cpufunc.h>
--#if __FreeBSD_version >= 300000
-+#if __FreeBSD_version >= 500042
-+#include <dev/smbus/smb.h>
-+#elif __FreeBSD_version >= 300000
- #include <machine/smb.h>
- #endif
- 
-@@ -1439,6 +1442,36 @@
- 			}
- 		}
- 	return (found_sensors | found_acpi_sensors);
-+	}
-+
-+#else
-+
-+gboolean
-+gkrellm_sys_sensors_get_temperature(gchar *path, gint id,
-+		gint iodev, gint interface, gfloat *temp)
-+
-+	{
-+	return FALSE;
-+	}
-+
-+gboolean
-+gkrellm_sys_sensors_get_fan(gchar *path, gint id,
-+		gint iodev, gint interface, gfloat *fan)
-+	{
-+	return FALSE;
-+	}
-+
-+gboolean
-+gkrellm_sys_sensors_get_voltage(gchar *path, gint id,
-+		gint iodev, gint interface, gfloat *volt)
-+	{
-+	return FALSE;
-+	}
-+
-+gboolean
-+gkrellm_sys_sensors_init(void)
-+	{
-+	return FALSE;
- 	}
- 
- #endif
diff --git a/sysutils/gkrellm2/pkg-plist b/sysutils/gkrellm2/pkg-plist
index ce5fd325dd8e..816ee78acb51 100644
--- a/sysutils/gkrellm2/pkg-plist
+++ b/sysutils/gkrellm2/pkg-plist
@@ -13,9 +13,11 @@ etc/rc.d/gkrellmd.sh.sample
 %%CLIENT%%bin/gkrellm
 %%CLIENT%%include/gkrellm2/gkrellm.h
 %%CLIENT%%include/gkrellm2/gkrellm-public-proto.h
+%%CLIENT%%share/locale/cs/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%share/locale/de/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%share/locale/es/LC_MESSAGES/gkrellm.mo
 %%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/pl/LC_MESSAGES/gkrellm.mo
 %%CLIENT%%share/locale/ru/LC_MESSAGES/gkrellm.mo