[pkgsrc/trunk]: pkgsrc/sysutils Update gkrellm to version 2.2.7.

[cube <cube%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f64ca6593000
branches:  trunk
changeset: 499047:f64ca6593000
user:      cube <cube%pkgsrc.org@localhost>
date:      Thu Sep 08 13:19:56 2005 +0000

description:
Update gkrellm to version 2.2.7.

pkgsrc changes:
  - use REQD_DIRS where appropriate
  - add a patch to allow gkrellm to read everything off sysctl() and thus
    don't install it setgid kem on NetBSD 3.99.1+
  - use options framework to choose between OpenSSL and gnutls
  - minor nits

gkrellm changes:

2.2.7 - Tue May 24, 2005
------------------------
        * gkrellmd can send a network interface connect time to be displayed
          on client timer button panels by configuring a net-timer in gkrellmd.conf.
        * Don't add virtual disk (/dev/mdX) stats to composite disk.
        * Bugfixes:
          o server/main.c inet6 compile error on machines with old libc.
          o Philipp Hartmann patch: add gnutls multithread initialization to mail.c
          o While mixing draw_decal_text and decal_scroll_text calls on transparent
            panels the text layer pixmap was not cleanup up properly.
        * Translation updates

2.2.6 - Fri May 13, 2005
------------------------
        * Stanislav Likavcan patch: add monitoring of ibm acpi sensors to linux.c.
        * UI improvement in fs.c and mail.c config button sensitivities and labels.
        * Bugfixes:
          o Test for not force creating user mailbox did not consider a configured
            mail fetch.
          o gkrellmd server mail check was missing the gkrellmd_need_serve() call
            and server/mail.c mailbox code needed syncing with src/mail.c.
          o gkrellmd glib 1.2 g_file_test compatibility was broken.
          o gkrellmd debug-level option was missing.
          o Darwin Makefile: add HAVE_GETADDRINFO=1
          o Don Bostrom patch: when remote mail checking, handle select() EINTR.
          o Charles Bailey patches:
            1) darwin.c and Makefile tweaks for building on OS X 10.3.8.
            2) darwin.c prevent left bit sign extension when shifting memory
               monitor data.
          o Don't read disabled sensors in the sensors thread.
        * Translation updates

diffstat:

 sysutils/gkrellm-share/Makefile         |   5 +-
 sysutils/gkrellm/Makefile               |  17 +++--
 sysutils/gkrellm/Makefile.common        |   5 +-
 sysutils/gkrellm/PLIST                  |   9 +--
 sysutils/gkrellm/distinfo               |  17 +++--
 sysutils/gkrellm/files/src.Makefile     |  27 +++++++--
 sysutils/gkrellm/files/top.Makefile.inc |   5 +-
 sysutils/gkrellm/options.mk             |  19 ++++++
 sysutils/gkrellm/patches/patch-ab       |  94 ++++++++++++++++++++++++++++++--
 sysutils/gkrellm/patches/patch-ad       |  22 +++++-
 sysutils/gkrellm/patches/patch-aq       |  18 +++++-
 sysutils/gkrellm/patches/patch-ar       |  25 +++++---
 sysutils/gkrellm/patches/patch-as       |  14 ++++
 13 files changed, 217 insertions(+), 60 deletions(-)

diffs (truncated from 519 to 300 lines):

diff -r 07e646a4bed9 -r f64ca6593000 sysutils/gkrellm-share/Makefile
--- a/sysutils/gkrellm-share/Makefile   Thu Sep 08 10:37:15 2005 +0000
+++ b/sysutils/gkrellm-share/Makefile   Thu Sep 08 13:19:56 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/02/24 22:27:27 cube Exp $
+# $NetBSD: Makefile,v 1.2 2005/09/08 13:19:56 cube Exp $
 .include "../../sysutils/gkrellm/Makefile.common"
 
 GKRELLM_PKGBASE=       gkrellm-share
@@ -9,8 +9,9 @@
 
 MAKE_ENV+=             MODULES=po
 
+INSTALLATION_DIRS=     share/gkrellm2
+
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/gkrellm2
        ${INSTALL_DATA} ${GKRELLM_SRCDIR}/README ${GKRELLM_SRCDIR}/COPYRIGHT ${PREFIX}/share/gkrellm2
 
 .include "../../mk/bsd.pkg.mk"
diff -r 07e646a4bed9 -r f64ca6593000 sysutils/gkrellm/Makefile
--- a/sysutils/gkrellm/Makefile Thu Sep 08 10:37:15 2005 +0000
+++ b/sysutils/gkrellm/Makefile Thu Sep 08 13:19:56 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/08/10 20:56:23 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2005/09/08 13:19:56 cube Exp $
 .include "Makefile.common"
 
 PKGREVISION=           # empty1
@@ -15,27 +15,30 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if (${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "NetBSD")
+# NetBSD 3.99.1 and above don't have to be installed setgid.
+.if (${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || \
+    (${OPSYS} == "NetBSD" && (!empty(OS_VERSION:M[123]*) && empty(OS_VERSION:M3.99.*))))
 SPECIAL_PERMS+=                ${PREFIX}/bin/gkrellm ${ROOT_USER} kmem 2711
 .endif
 
 NOT_FOR_PLATFORM=      IRIX-*
 
+.include "options.mk"
+
 MAKE_ENV+=             MODULES=src LINK_FLAGS=${EXPORT_SYMBOLS_LDFLAGS}
 MAKE_ENV+=             BINOWNER=${BINOWN} BINGROUP=${BINGRP}
+MAKE_ENV+=             SSL_TYPE=${GKRELLM_SSL_TYPE}
+MAKE_ENV+=             PKG_INCLUDE=-I${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/include
+MAKE_ENV+=             PKG_LIBS="-L${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/lib -Wl,-R${BUILDLINK_PREFIX.${GKRELLM_SSL_TYPE}}/lib"
 
 SUBST_STAGE.gkprefix=  post-patch
 SUBST_FILES.gkprefix=  src/gkrellm.h
 SUBST_SED.gkprefix=    -e '/SYSTEM_/{s!/usr!${PREFIX}!;}'
 SUBST_CLASSES+=                gkprefix
 
-post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm2
-       ${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm2/plugins
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/gkrellm2/themes
+REQD_DIRS=     lib/gkrellm2/plugins lib/gkrellm2 include/gkrellm2
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 07e646a4bed9 -r f64ca6593000 sysutils/gkrellm/Makefile.common
--- a/sysutils/gkrellm/Makefile.common  Thu Sep 08 10:37:15 2005 +0000
+++ b/sysutils/gkrellm/Makefile.common  Thu Sep 08 13:19:56 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2005/05/22 20:08:32 jlam Exp $
+# $NetBSD: Makefile.common,v 1.12 2005/09/08 13:19:56 cube Exp $
 
 DISTNAME=      ${GKRELLM_DISTBASE}
 PKGNAME=       ${GKRELLM_PKGBASE}-${GKRELLM_VERSION}
@@ -15,12 +15,13 @@
 USE_PKGLOCALEDIR=      YES
 
 MAKE_ENV+=             LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale
+MAKE_ENV+=             GREP=${GREP}
 
 .if defined(GKRELLM_DEBUG)
 MAKE_ENV+=             DEBUG=yes
 .endif
 
-GKRELLM_VERSION=       2.2.5
+GKRELLM_VERSION=       2.2.7
 GKRELLM_DISTBASE=      gkrellm-${GKRELLM_VERSION}
 GKRELLM_SRCDIR=                ${WRKDIR}/${GKRELLM_DISTBASE}
 
diff -r 07e646a4bed9 -r f64ca6593000 sysutils/gkrellm/PLIST
--- a/sysutils/gkrellm/PLIST    Thu Sep 08 10:37:15 2005 +0000
+++ b/sysutils/gkrellm/PLIST    Thu Sep 08 13:19:56 2005 +0000
@@ -1,13 +1,6 @@
-@comment $NetBSD: PLIST,v 1.10 2005/07/06 17:00:12 cube Exp $
+@comment $NetBSD: PLIST,v 1.11 2005/09/08 13:19:56 cube Exp $
 bin/gkrellm
 include/gkrellm2/gkrellm.h
 include/gkrellm2/gkrellm-public-proto.h
 lib/pkgconfig/gkrellm.pc
 man/man1/gkrellm.1
-@unexec ${RMDIR} %D/include/gkrellm2 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/lib/gkrellm2 || ${TRUE}
-@exec ${MKDIR} %D/lib/gkrellm2/plugins || ${TRUE}
-@dirrm lib/gkrellm2/plugins
-@dirrm lib/gkrellm2
-@exec ${MKDIR} %D/share/gkrellm2/themes || ${TRUE}
-@dirrm share/gkrellm2/themes
diff -r 07e646a4bed9 -r f64ca6593000 sysutils/gkrellm/distinfo
--- a/sysutils/gkrellm/distinfo Thu Sep 08 10:37:15 2005 +0000
+++ b/sysutils/gkrellm/distinfo Thu Sep 08 13:19:56 2005 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.33 2005/09/06 08:10:59 abs Exp $
+$NetBSD: distinfo,v 1.34 2005/09/08 13:19:56 cube Exp $
 
-SHA1 (gkrellm-2.2.5.tar.bz2) = 4cbdf75828b3d8b216694c2e6978c29a4920595a
-RMD160 (gkrellm-2.2.5.tar.bz2) = 7755fa7bbf88dfd53185e76604981b2a5c81d74d
-Size (gkrellm-2.2.5.tar.bz2) = 668581 bytes
+SHA1 (gkrellm-2.2.7.tar.bz2) = a6910b6f843868b4d801f7f7873e1e85c4f2039c
+RMD160 (gkrellm-2.2.7.tar.bz2) = 5388e3fba604a7c4b99a9c134ab6526296fe70d8
+Size (gkrellm-2.2.7.tar.bz2) = 673728 bytes
 SHA1 (patch-aa) = 9dbffbc0bc95ea3fced7162da0ec55333396d256
-SHA1 (patch-ab) = de2ef6e1d083a32c274d2ec42fa1b9e9d3d65663
+SHA1 (patch-ab) = 015ed1c6b4d07d2da6aeefab2b746bff3fa1a88e
 SHA1 (patch-ac) = 8890d5a5e8eaf21508a1bf91de788183fd6f7a75
-SHA1 (patch-ad) = c33319783a40ad64f43015200047656efc1bcdb3
+SHA1 (patch-ad) = 18218e5e9e7a8cfaabb20ec03865670ae66a15bd
 SHA1 (patch-ae) = 5f7b1bdfa99bcec9cfdaee3a97b38b27581dd954
 SHA1 (patch-ag) = 6791436e17fccd7265cda8b4e3da229c4937c20f
 SHA1 (patch-ah) = 2018be5c2dd11c22c6d3f7c7fc8607e2c63123f3
@@ -18,5 +18,6 @@
 SHA1 (patch-an) = 1e63ce0e4fbe9bd22c46d00c6aeac6b3e7cda440
 SHA1 (patch-ao) = 63bf8657fa7707def41b13b3cc74c031098e070a
 SHA1 (patch-ap) = b3c89911085e73b8651e35f71b9561046b3cd073
-SHA1 (patch-aq) = 4cdf043e8cdabd8482705c80b9c06b416454b658
-SHA1 (patch-ar) = 8d672b33875186791dee2bfeea4d6cf10c3ee33c
+SHA1 (patch-aq) = 0799e334333ae072a40cdcb6ccd04ed6a2f52765
+SHA1 (patch-ar) = eae37435d69b277f2542ee5ff26cbc772272689b
+SHA1 (patch-as) = 3df33e28754cf1fee88717b431726bf090c15f70
diff -r 07e646a4bed9 -r f64ca6593000 sysutils/gkrellm/files/src.Makefile
--- a/sysutils/gkrellm/files/src.Makefile       Thu Sep 08 10:37:15 2005 +0000
+++ b/sysutils/gkrellm/files/src.Makefile       Thu Sep 08 13:19:56 2005 +0000
@@ -21,33 +21,48 @@
     FLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\"
 endif
 ifneq ($(PACKAGE),gkrellm)
-       FLAGS += -DPACKAGE=\"$(PACKAGE)\"
+    FLAGS += -DPACKAGE=\"$(PACKAGE)\"
 endif
 
 ifeq ($(HAVE_GETADDRINFO),1)
     FLAGS += -DHAVE_GETADDRINFO
 endif
 
-WITHOUT_SSL?=  no
+SSL_TYPE?=     gnutls openssl
+ifeq ($(without-gnutls),1)
+SSL_TYPE=      $(filter-out gnutls, $(SSL_TYPE))
+endif
+ifeq ($(without-gnutls),yes)
+SSL_TYPE=      $(filter-out gnutls, $(SSL_TYPE))
+endif
 ifeq ($(without-ssl),1)
-WITHOUT_SSL=   yes
+SSL_TYPE=      $(filter-out openssl, $(SSL_TYPE))
 endif
 ifeq ($(without-ssl),yes)
-WITHOUT_SSL=   yes
+SSL_TYPE=      $(filter-out openssl, $(SSL_TYPE))
+endif
+ifeq ($(filter gnutls, $(SSL_TYPE)),)
+CONFIGURE_ARGS+=       --without-gnutls
 endif
-ifeq ($(WITHOUT_SSL),yes)
-CONFIGURE_ARGS+=       --without-ssl
+ifeq ($(filter openssl, $(SSL_TYPE)),)
+CONFIGURE_ARGS+=       --without-openssl
 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)
 
+ifeq ($(HAVE_GNUTLS),1)
+SSL_LIBS?=     -lgnutls-openssl
+else
 ifeq ($(HAVE_SSL),1)
 SSL_LIBS?=     -lssl -lcrypto
 NEED_MD5=      no
 MD5_LIBS=
 endif
+endif
 
 LIBS = $(PKG_LIB) $(GTOP_LIBS) $(SMC_LIBS) $(SYS_LIBS) $(MD5_LIBS) $(SSL_LIBS)
 
diff -r 07e646a4bed9 -r f64ca6593000 sysutils/gkrellm/files/top.Makefile.inc
--- a/sysutils/gkrellm/files/top.Makefile.inc   Thu Sep 08 10:37:15 2005 +0000
+++ b/sysutils/gkrellm/files/top.Makefile.inc   Thu Sep 08 13:19:56 2005 +0000
@@ -1,4 +1,4 @@
-VERSION=       2.2.5
+VERSION=       2.2.7
 
 # Path options
 PREFIX?=       /usr/local
@@ -100,7 +100,8 @@
 GTK_CONFIG=    gtk-config
 STRIP=
 NEED_MD5=      no
-MD5_LIBS=      -lmd5
+MD5_LIBS=
+HAVE_GETADDRINFO=      1
     ifeq ($(MODULE),src)
 LINK_FLAGS+=   -lX11
     endif
diff -r 07e646a4bed9 -r f64ca6593000 sysutils/gkrellm/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/gkrellm/options.mk       Thu Sep 08 13:19:56 2005 +0000
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.1 2005/09/08 13:19:56 cube Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.${GKRELLM_PKGBASE}
+PKG_OPTIONS_REQUIRED_GROUPS=   tls
+PKG_OPTIONS_GROUP.tls=         gnutls ssl
+
+PKG_SUGGESTED_OPTIONS=         ssl
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mssl)
+.include "../../security/openssl/buildlink3.mk"
+GKRELLM_SSL_TYPE=      openssl
+.endif
+
+.if !empty(PKG_OPTIONS:Mgnutls)
+.include "../../security/gnutls/buildlink3.mk"
+GKRELLM_SSL_TYPE=      gnutls
+.endif
diff -r 07e646a4bed9 -r f64ca6593000 sysutils/gkrellm/patches/patch-ab
--- a/sysutils/gkrellm/patches/patch-ab Thu Sep 08 10:37:15 2005 +0000
+++ b/sysutils/gkrellm/patches/patch-ab Thu Sep 08 13:19:56 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.13 2004/07/05 08:42:27 cube Exp $
+$NetBSD: patch-ab,v 1.14 2005/09/08 13:19:56 cube Exp $
 
---- src/sysdeps/netbsd.c.orig  2004-05-01 19:46:38.000000000 +0200
+--- src/sysdeps/netbsd.c.orig  2005-05-24 05:45:10.000000000 +0200
 +++ src/sysdeps/netbsd.c
 @@ -63,7 +63,8 @@ gkrellm_sys_cpu_read_data(void)
  {
@@ -82,7 +82,7 @@
     if (getloadavg(&avenrun, 1) <= 0)
                avenrun = 0;
        gkrellm_proc_assign_data(n_processes, 0, n_forks, avenrun);
-@@ -183,6 +178,97 @@ gkrellm_sys_proc_init(void)
+@@ -183,6 +178,96 @@ gkrellm_sys_proc_init(void)
  
  
  /* ===================================================================== */
@@ -91,7 +91,6 @@
 +#include <sys/vmmeter.h>
 +#include <sys/sysctl.h>
 +#include <uvm/uvm_extern.h>
-+#include <kvm.h>
 +
 +
 +void
@@ -180,7 +179,7 @@
  /* Sensor monitor interface */
  
    /* Tables of voltage correction factors and offsets derived from the
-@@ -295,7 +381,7 @@ gkrellm_sys_sensors_init(void)
+@@ -295,7 +380,7 @@ gkrellm_sys_sensors_init(void)
     int fd;                    /* file desc. for /dev/sysmon */
     int id = 0;                        /* incremented for each sensor */
     int type;
@@ -189,7 +188,7 @@
     gboolean   found_sensors = FALSE;
  
     /* check if some sensor is configured */
-@@ -336,3 +422,68 @@ gkrellm_sys_sensors_init(void)
+@@ -336,3 +421,149 @@ gkrellm_sys_sensors_init(void)
     return found_sensors;
  }
  
@@ -240,7 +239,7 @@
 +              wbytes = 0;
 +#endif
 +
-+              gkrellm_disk_assign_data_by_name(dk_drives[i].dk_name, rbytes, wbytes);
++              gkrellm_disk_assign_data_by_name(dk_drives[i].dk_name, rbytes, wbytes, FALSE);
 +      }
 +
 +      free(dk_drives);
@@ -258,3 +257,84 @@
 +      {
 +      return -1;  /* append disk charts as added */
 +      }
++