Update to 1.2.9.

10 files changed, 6 insertions, 158 deletions

diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index bdfd49b1b857..287acd956623 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gkrellm
-PORTVERSION=	1.2.8
+PORTVERSION=	1.2.9
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/ \
 		${MASTER_SITE_LOCAL}
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	ume
 
 MAINTAINER=	ume@FreeBSD.org
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_IMLIB=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index 460ed60af27d..d36ccd6d47d0 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1 +1 @@
-MD5 (gkrellm-1.2.8.tar.gz) = f0d2f3e1f02e35d7d7bede05dbbed158
+MD5 (gkrellm-1.2.9.tar.bz2) = 5984a2eceabe01a1f21b64eb209e054b
diff --git a/sysutils/gkrellm/files/patch-ba b/sysutils/gkrellm/files/patch-ba
deleted file mode 100644
index 5b707bd09cda..000000000000
--- a/sysutils/gkrellm/files/patch-ba
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: src/apm.c
-diff -u src/apm.c.orig src/apm.c
---- src/apm.c.orig	Wed Jan  2 06:06:27 2002
-+++ src/apm.c	Mon Feb 11 10:51:43 2002
-@@ -61,7 +61,7 @@
- 
- /* ------- FreeBSD ------------------------------------------------------- */
- 
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) && defined(__i386__)
- #include <osreldate.h>
- #include <machine/apm_bios.h>
- #define	APMDEV		"/dev/apm"
-@@ -206,7 +206,7 @@
- 		return TRUE;
- 		}
- 
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) && defined(__i386__)
- 	read_apm_data = read_freebsd_apm_data;
- 	available = TRUE;
- #endif
diff --git a/sysutils/gkrellm/files/patch-bb b/sysutils/gkrellm/files/patch-bb
deleted file mode 100644
index 8fb70debf0d6..000000000000
--- a/sysutils/gkrellm/files/patch-bb
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: src/sensors.c
-diff -u src/sensors.c.orig src/sensors.c
---- src/sensors.c.orig	Wed Jan  2 06:48:02 2002
-+++ src/sensors.c	Tue Feb 12 02:49:08 2002
-@@ -228,7 +228,7 @@
- /* ====== System dependent interface ====================================== */
- 
- /* ------- FreeBSD ------------------------------------------------------- */
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) && defined(__i386__)
- #include <osreldate.h>
- #include <machine/cpufunc.h>
- #if __FreeBSD_version >= 300000
-@@ -805,7 +805,8 @@
- 
- 
- /* ----- Other Systems -------------------------------------------------- */
--#if !defined(__FreeBSD__) && !defined(__linux__) && !defined(__NetBSD__)
-+#if !(defined(__FreeBSD__) && defined(__i386__)) && \
-+    !defined(__linux__) && !defined(__NetBSD__)
- 
- #define	SENSORS_DIR		""
- 
-@@ -817,7 +818,7 @@
- static gboolean
- setup_sensor_interface(void)
- 	{
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) && defined(__i386__)
- 	get_temperature = get_freebsd_sensor;
- 	get_fan = get_freebsd_sensor;
- 	get_voltage = get_freebsd_sensor;
diff --git a/sysutils/gkrellm/files/patch-bc b/sysutils/gkrellm/files/patch-bc
deleted file mode 100644
index fa62f0455b11..000000000000
--- a/sysutils/gkrellm/files/patch-bc
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: src/main.c
-diff -u src/main.c.orig src/main.c
---- src/main.c.orig	Wed Jan  2 06:10:49 2002
-+++ src/main.c	Tue Feb 12 10:06:21 2002
-@@ -37,7 +37,7 @@
- kvm_t	*kvmd = NULL;
- char	errbuf[_POSIX2_LINE_MAX];
- #endif
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) && defined(__i386__)
- extern void scan_for_sensors();
- #endif
- 
-@@ -1804,7 +1804,9 @@
- 		}
- #endif
- #if defined(__FreeBSD__)
-+#if defined(__i386__)
- 	scan_for_sensors();
-+#endif
- 	if (setuid(getuid()) != 0)
- 		{
- 		fprintf(stderr, "Can't drop setuid privileges.");
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index bdfd49b1b857..287acd956623 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gkrellm
-PORTVERSION=	1.2.8
+PORTVERSION=	1.2.9
 CATEGORIES=	sysutils ipv6
 MASTER_SITES=	http://web.wt.net/~billw/gkrellm/ \
 		${MASTER_SITE_LOCAL}
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	ume
 
 MAINTAINER=	ume@FreeBSD.org
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_IMLIB=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/gkrellm2/distinfo b/sysutils/gkrellm2/distinfo
index 460ed60af27d..d36ccd6d47d0 100644
--- a/sysutils/gkrellm2/distinfo
+++ b/sysutils/gkrellm2/distinfo
@@ -1 +1 @@
-MD5 (gkrellm-1.2.8.tar.gz) = f0d2f3e1f02e35d7d7bede05dbbed158
+MD5 (gkrellm-1.2.9.tar.bz2) = 5984a2eceabe01a1f21b64eb209e054b
diff --git a/sysutils/gkrellm2/files/patch-ba b/sysutils/gkrellm2/files/patch-ba
deleted file mode 100644
index 5b707bd09cda..000000000000
--- a/sysutils/gkrellm2/files/patch-ba
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: src/apm.c
-diff -u src/apm.c.orig src/apm.c
---- src/apm.c.orig	Wed Jan  2 06:06:27 2002
-+++ src/apm.c	Mon Feb 11 10:51:43 2002
-@@ -61,7 +61,7 @@
- 
- /* ------- FreeBSD ------------------------------------------------------- */
- 
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) && defined(__i386__)
- #include <osreldate.h>
- #include <machine/apm_bios.h>
- #define	APMDEV		"/dev/apm"
-@@ -206,7 +206,7 @@
- 		return TRUE;
- 		}
- 
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) && defined(__i386__)
- 	read_apm_data = read_freebsd_apm_data;
- 	available = TRUE;
- #endif
diff --git a/sysutils/gkrellm2/files/patch-bb b/sysutils/gkrellm2/files/patch-bb
deleted file mode 100644
index 8fb70debf0d6..000000000000
--- a/sysutils/gkrellm2/files/patch-bb
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: src/sensors.c
-diff -u src/sensors.c.orig src/sensors.c
---- src/sensors.c.orig	Wed Jan  2 06:48:02 2002
-+++ src/sensors.c	Tue Feb 12 02:49:08 2002
-@@ -228,7 +228,7 @@
- /* ====== System dependent interface ====================================== */
- 
- /* ------- FreeBSD ------------------------------------------------------- */
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) && defined(__i386__)
- #include <osreldate.h>
- #include <machine/cpufunc.h>
- #if __FreeBSD_version >= 300000
-@@ -805,7 +805,8 @@
- 
- 
- /* ----- Other Systems -------------------------------------------------- */
--#if !defined(__FreeBSD__) && !defined(__linux__) && !defined(__NetBSD__)
-+#if !(defined(__FreeBSD__) && defined(__i386__)) && \
-+    !defined(__linux__) && !defined(__NetBSD__)
- 
- #define	SENSORS_DIR		""
- 
-@@ -817,7 +818,7 @@
- static gboolean
- setup_sensor_interface(void)
- 	{
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) && defined(__i386__)
- 	get_temperature = get_freebsd_sensor;
- 	get_fan = get_freebsd_sensor;
- 	get_voltage = get_freebsd_sensor;
diff --git a/sysutils/gkrellm2/files/patch-bc b/sysutils/gkrellm2/files/patch-bc
deleted file mode 100644
index fa62f0455b11..000000000000
--- a/sysutils/gkrellm2/files/patch-bc
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: src/main.c
-diff -u src/main.c.orig src/main.c
---- src/main.c.orig	Wed Jan  2 06:10:49 2002
-+++ src/main.c	Tue Feb 12 10:06:21 2002
-@@ -37,7 +37,7 @@
- kvm_t	*kvmd = NULL;
- char	errbuf[_POSIX2_LINE_MAX];
- #endif
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) && defined(__i386__)
- extern void scan_for_sensors();
- #endif
- 
-@@ -1804,7 +1804,9 @@
- 		}
- #endif
- #if defined(__FreeBSD__)
-+#if defined(__i386__)
- 	scan_for_sensors();
-+#endif
- 	if (setuid(getuid()) != 0)
- 		{
- 		fprintf(stderr, "Can't drop setuid privileges.");