[pkgsrc/trunk]: pkgsrc/sysutils Update GKrellM packages to version 2.2.10. B...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/sysutils Update GKrellM packages to version 2.2.10. B...
From: cube <cube%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 04:51:07 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/fae52c732579
branches:  trunk
changeset: 528445:fae52c732579
user:      cube <cube%pkgsrc.org@localhost>
date:      Thu May 03 20:21:27 2007 +0000

description:
Update GKrellM packages to version 2.2.10.  Better late than never.

2.2.10 - Thu Oct 26, 2006
-------------------------
        * Hans de Goede patches: 1) handle sysfs sensors which represent themselves
          as platform drivers (/sys/class/hwmon). 2) Add a libsensors sensor
          monitor interface which will be used preferentially over sysfs if
          libsensors is installed and sensors_init() on /etc/sensors.conf succeeds.
        * Add --without-libsensors command line option to force using /sysfs
          instead of libsensors for cases when running a new Linux sensor kernel
          module that is not yet supported by libsensors.  A fallback to /sysfs is
          automatic when libsensors detects zero sensors.
        * Linux sensor config names change with migration to libsensors, so attempt
          to automatically do a conversion so user won't have to redo sensor
          config.  But this doesn't handle client/server runs so for these
          sensor configs must be redone.
        * Michael Buesch patch: Add PowerMac G5 Windfarm sensor monitor interface.
        * David G. North patch: Add content length check to mbox mail checking to
          get good mail counts even if there's a mal-formed mime content package.
        * New Translation
          o pt_BR.po from Insigne Free Software (traducao--at--insignelinux.org)
        * Translation updates
          o de.po
          o it.po from Vincenzo Reale
        * Bugfixes
          o Christian Schmidt patch: add -pci- to sensor config compatibility fix.
          o gkrellmd plugins didn't get initial update data.
          o Don't limit mbmon detection to i386 architectures.
          o Flush gtk events pending between closing and moving gkrellm so
            window managers can get width updates before the move.
          o Fix warnings from newer gcc.

diffstat:

 sysutils/gkrellm-share/PLIST            |   3 ++-
 sysutils/gkrellm/Makefile               |   3 +--
 sysutils/gkrellm/Makefile.common        |   4 ++--
 sysutils/gkrellm/distinfo               |  12 ++++++------
 sysutils/gkrellm/files/server.Makefile  |  22 +++++++++++++++++++++-
 sysutils/gkrellm/files/src.Makefile     |  19 ++++++++++++++++++-
 sysutils/gkrellm/files/top.Makefile.inc |   2 +-
 sysutils/gkrellm/patches/patch-ad       |  10 +++++-----
 sysutils/gkrellm/patches/patch-ae       |  20 ++++++++++----------
 9 files changed, 66 insertions(+), 29 deletions(-)

diffs (256 lines):

diff -r 0fd4f9d4b183 -r fae52c732579 sysutils/gkrellm-share/PLIST
--- a/sysutils/gkrellm-share/PLIST      Thu May 03 19:13:34 2007 +0000
+++ b/sysutils/gkrellm-share/PLIST      Thu May 03 20:21:27 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/17 07:07:34 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/05/03 20:21:27 cube Exp $
 share/gkrellm2/COPYRIGHT
 share/gkrellm2/README
 share/locale/bg/LC_MESSAGES/gkrellm.mo
@@ -11,6 +11,7 @@
 share/locale/ja/LC_MESSAGES/gkrellm.mo
 share/locale/nl/LC_MESSAGES/gkrellm.mo
 share/locale/pl/LC_MESSAGES/gkrellm.mo
+share/locale/pt_BR/LC_MESSAGES/gkrellm.mo
 share/locale/ru/LC_MESSAGES/gkrellm.mo
 share/locale/sl/LC_MESSAGES/gkrellm.mo
 share/locale/sv/LC_MESSAGES/gkrellm.mo
diff -r 0fd4f9d4b183 -r fae52c732579 sysutils/gkrellm/Makefile
--- a/sysutils/gkrellm/Makefile Thu May 03 19:13:34 2007 +0000
+++ b/sysutils/gkrellm/Makefile Thu May 03 20:21:27 2007 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2007/02/15 21:29:13 rillig Exp $
+# $NetBSD: Makefile,v 1.56 2007/05/03 20:21:27 cube Exp $
 .include "Makefile.common"
 
 GKRELLM_PKGBASE=       gkrellm
-PKGREVISION=           1
 WRKSRC=                        ${GKRELLM_SRCDIR}
 
 COMMENT=               GTK2 based system monitor
diff -r 0fd4f9d4b183 -r fae52c732579 sysutils/gkrellm/Makefile.common
--- a/sysutils/gkrellm/Makefile.common  Thu May 03 19:13:34 2007 +0000
+++ b/sysutils/gkrellm/Makefile.common  Thu May 03 20:21:27 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2006/04/13 19:14:44 cube Exp $
+# $NetBSD: Makefile.common,v 1.16 2007/05/03 20:21:27 cube Exp $
 
 DISTNAME=      ${GKRELLM_DISTBASE}
 PKGNAME=       ${GKRELLM_PKGBASE}-${GKRELLM_VERSION}
@@ -21,7 +21,7 @@
 MAKE_ENV+=             DEBUG=yes
 .endif
 
-GKRELLM_VERSION=       2.2.9
+GKRELLM_VERSION=       2.2.10
 GKRELLM_DISTBASE=      gkrellm-${GKRELLM_VERSION}
 GKRELLM_SRCDIR=                ${WRKDIR}/${GKRELLM_DISTBASE}
 
diff -r 0fd4f9d4b183 -r fae52c732579 sysutils/gkrellm/distinfo
--- a/sysutils/gkrellm/distinfo Thu May 03 19:13:34 2007 +0000
+++ b/sysutils/gkrellm/distinfo Thu May 03 20:21:27 2007 +0000
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.37 2006/08/13 07:33:37 xtraeme Exp $
+$NetBSD: distinfo,v 1.38 2007/05/03 20:21:27 cube Exp $
 
-SHA1 (gkrellm-2.2.9.tar.bz2) = 114c09c78ae27bbb1b2f4c2edb346800831f2cef
-RMD160 (gkrellm-2.2.9.tar.bz2) = e6de12774ec85c51dce18e3208340d1a080a6398
-Size (gkrellm-2.2.9.tar.bz2) = 691133 bytes
+SHA1 (gkrellm-2.2.10.tar.bz2) = 329d0ba5600998f21b75491937c3c2924ab6ed40
+RMD160 (gkrellm-2.2.10.tar.bz2) = 6694838015716c09291887ae598daceb4f4b440f
+Size (gkrellm-2.2.10.tar.bz2) = 718894 bytes
 SHA1 (patch-aa) = bc07107ed828a5a86012cae39316c1d35d2d7a4d
 SHA1 (patch-ab) = e900c811ddea106efee5cbfc04d0cf14cc6e6451
 SHA1 (patch-ac) = 8890d5a5e8eaf21508a1bf91de788183fd6f7a75
-SHA1 (patch-ad) = 18218e5e9e7a8cfaabb20ec03865670ae66a15bd
-SHA1 (patch-ae) = e7c85ed5985bffd4cc2528b8c9fe258436257f75
+SHA1 (patch-ad) = 2a12402c941a5a197aa58e711e254ae2c91dfb10
+SHA1 (patch-ae) = 7ebbdd1dddb87f84f6e9e7ae316af18b316d4ddf
 SHA1 (patch-ag) = 6791436e17fccd7265cda8b4e3da229c4937c20f
 SHA1 (patch-ah) = 2018be5c2dd11c22c6d3f7c7fc8607e2c63123f3
 SHA1 (patch-ai) = 234e3e1e458e5709157668cf7d18faabdd076071
diff -r 0fd4f9d4b183 -r fae52c732579 sysutils/gkrellm/files/server.Makefile
--- a/sysutils/gkrellm/files/server.Makefile    Thu May 03 19:13:34 2007 +0000
+++ b/sysutils/gkrellm/files/server.Makefile    Thu May 03 20:21:27 2007 +0000
@@ -49,6 +49,26 @@
     FLAGS += -DHAVE_GETADDRINFO
 endif
 
+USE_LIBSENSORS?=       yes
+ifeq ($(without-libsensors),yes)
+USE_LIBSENSORS=                no
+endif
+ifeq ($(without-libsensors),1)
+USE_LIBSENSORS=                no
+endif
+ifeq ($(USE_LIBSENSORS),no)
+CONFIGURE_ARGS+=       --without-libsensors
+endif
+
+GREP?=         grep
+
+DUMMY_VAR:=    $(shell ./configure $(CONFIGURE_ARGS))
+HAVE_LIBSENSORS=       $(shell $(GREP) -c HAVE_LIBSENSORS configure.h)
+
+ifeq ($(HAVE_LIBSENSORS),1)
+SENSORS_LIBS?= -lsensors
+LIBS+= $(SENSORS_LIBS)
+endif
 
 override CFLAGS += -Wall $(FLAGS)
 
@@ -74,7 +94,7 @@
        rm -f $(SMANDIR)/$(PACKAGE_D).1
 
 clean:
-       rm -f *.o *~ *.bak gkrellmd core
+       rm -f *.o *~ *.bak configure.h configure.log gkrellmd core
 
 SYSDEPS = ../src/sysdeps/bsd-common.c ../src/sysdeps/bsd-net-open.c \
        ../src/sysdeps/freebsd.c ../src/sysdeps/gtop.c \
diff -r 0fd4f9d4b183 -r fae52c732579 sysutils/gkrellm/files/src.Makefile
--- a/sysutils/gkrellm/files/src.Makefile       Thu May 03 19:13:34 2007 +0000
+++ b/sysutils/gkrellm/files/src.Makefile       Thu May 03 20:21:27 2007 +0000
@@ -48,11 +48,23 @@
 CONFIGURE_ARGS+=       --without-openssl
 endif
 
+USE_LIBSENSORS?=       yes
+ifeq ($(without-libsensors),yes)
+USE_LIBSENSORS=                no
+endif
+ifeq ($(without-libsensors),1)
+USE_LIBSENSORS=                no
+endif
+ifeq ($(USE_LIBSENSORS),no)
+CONFIGURE_ARGS+=       --without-libsensors
+endif
+
 GREP?=         grep
 
 DUMMY_VAR:=    $(shell ./configure $(CONFIGURE_ARGS))
 HAVE_GNUTLS=   $(shell $(GREP) -c HAVE_GNUTLS configure.h)
 HAVE_SSL=      $(shell $(GREP) -c HAVE_SSL configure.h)
+HAVE_LIBSENSORS=       $(shell $(GREP) -c HAVE_LIBSENSORS configure.h)
 
 ifeq ($(HAVE_GNUTLS),1)
 SSL_LIBS?=     -lgnutls-openssl
@@ -64,7 +76,12 @@
 endif
 endif
 
-LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(MD5_LIBS) $(SSL_LIBS)
+ifeq ($(HAVE_LIBSENSORS),1)
+SENSORS_LIBS?= -lsensors
+endif
+
+LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(MD5_LIBS) $(SSL_LIBS) \
+       $(SENSORS_LIBS)
 
 override CFLAGS += -Wall $(FLAGS)
 
diff -r 0fd4f9d4b183 -r fae52c732579 sysutils/gkrellm/files/top.Makefile.inc
--- a/sysutils/gkrellm/files/top.Makefile.inc   Thu May 03 19:13:34 2007 +0000
+++ b/sysutils/gkrellm/files/top.Makefile.inc   Thu May 03 20:21:27 2007 +0000
@@ -1,4 +1,4 @@
-VERSION=       2.2.9
+VERSION=       2.2.10
 
 # Path options
 PREFIX?=       /usr/local
diff -r 0fd4f9d4b183 -r fae52c732579 sysutils/gkrellm/patches/patch-ad
--- a/sysutils/gkrellm/patches/patch-ad Thu May 03 19:13:34 2007 +0000
+++ b/sysutils/gkrellm/patches/patch-ad Thu May 03 20:21:27 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.2 2005/09/08 13:19:56 cube Exp $
+$NetBSD: patch-ad,v 1.3 2007/05/03 20:21:27 cube Exp $
 
---- src/sysdeps/bsd-net-open.c.orig    2005-05-24 05:44:48.000000000 +0200
+--- src/sysdeps/bsd-net-open.c.orig    2006-07-20 23:38:57.000000000 +0200
 +++ src/sysdeps/bsd-net-open.c
 @@ -23,110 +23,10 @@
  
@@ -68,7 +68,7 @@
 -              /* Separate read/write stats were implemented in NetBSD 1.6K.
 -              */
 -
--#if __NetBSD_Version__ >= 106110000
+-#if (__NetBSD_Version__ >= 106110000) || defined(__OpenBSD__)
 -              rbytes = d.dk_rbytes;
 -              wbytes = d.dk_wbytes;
 -#else
@@ -115,7 +115,7 @@
  #include "../inet.h"
  
  /* NO IPv6 SUPPORT YET */
-@@ -191,6 +91,7 @@ gkrellm_sys_inet_read_tcp_data(void)
+@@ -193,6 +93,7 @@ gkrellm_sys_inet_read_tcp_data(void)
        next = (struct inpcb *)inpcb.inp_queue.cqe_next;
     }
  }
@@ -123,7 +123,7 @@
  
  gboolean
  gkrellm_sys_inet_init(void)
-@@ -199,95 +100,6 @@ gkrellm_sys_inet_init(void)
+@@ -201,95 +102,6 @@ gkrellm_sys_inet_init(void)
        }
  
  /* ===================================================================== */
diff -r 0fd4f9d4b183 -r fae52c732579 sysutils/gkrellm/patches/patch-ae
--- a/sysutils/gkrellm/patches/patch-ae Thu May 03 19:13:34 2007 +0000
+++ b/sysutils/gkrellm/patches/patch-ae Thu May 03 20:21:27 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2006/04/13 19:14:45 cube Exp $
+$NetBSD: patch-ae,v 1.4 2007/05/03 20:21:27 cube Exp $
 
---- server/gkrellmd-private.h.orig     2006-03-30 00:23:50.000000000 +0200
+--- server/gkrellmd-private.h.orig     2006-10-26 23:21:59.000000000 +0200
 +++ server/gkrellmd-private.h
-@@ -28,6 +28,10 @@
+@@ -29,6 +29,10 @@
  #endif
  #endif
  
@@ -13,7 +13,7 @@
  #if defined(__FreeBSD__)
  #include <sys/param.h>
  #if __FreeBSD_version >= 400000
-@@ -41,6 +45,7 @@
+@@ -42,6 +46,7 @@
  
  #if defined(__NetBSD__)
  #define HAVE_GETADDRINFO      1
@@ -21,7 +21,7 @@
  #  if __NetBSD_Version__ <= 105010000
  #    define sa_family_t unsigned char
  #  endif
-@@ -66,12 +71,10 @@
+@@ -67,12 +72,10 @@
  
  #if !defined(__FreeBSD__) && !defined(__linux__) && !defined(__NetBSD__) \
      && !defined(__OpenBSD__) && !defined(__solaris__) && !defined(WIN32) \
@@ -32,10 +32,10 @@
  
 -extern int    errno;
 -
- #define DEBUG_SYSDEP  0x1
- #define DEBUG_MAIL            0x10
- #define DEBUG_NET             0x20
-@@ -88,6 +91,7 @@ extern int   errno;
+ #define DEBUG_SYSDEP          0x1
+ #define DEBUG_MAIL                    0x10
+ #define DEBUG_NET                     0x20
+@@ -89,6 +92,7 @@ extern int   errno;
  #define       SENSOR_GROUP_MAINBOARD  0
  #define       SENSOR_GROUP_DISK               1
  
@@ -43,7 +43,7 @@
  
  struct GkrellmdConfig
        {
-@@ -142,3 +146,4 @@ void                       gkrellmd_serve_setup(GkrellmdClie
+@@ -145,3 +149,4 @@ void                       gkrellmd_serve_setup(GkrellmdClie
  
  GkrellmdMonitor *gkrellmd_init_mail_monitor(void);
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Note update of cgoban-java to 3.3.17
Next by Date: [pkgsrc/trunk]: pkgsrc/doc fix copy/pasto
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Note update of cgoban-java to 3.3.17
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc fix copy/pasto
Indexes:
Home | Main Index | Thread Index | Old Index