summaryrefslogtreecommitdiff
path: root/sysutils/gkrellm
diff options
context:
space:
mode:
authorcube <cube@pkgsrc.org>2004-06-05 18:57:37 +0000
committercube <cube@pkgsrc.org>2004-06-05 18:57:37 +0000
commit557e505beaa4732a5de50bcba7a698d8e395d65f (patch)
tree14b78466175f5085a81365684313b6c4810c30e6 /sysutils/gkrellm
parent163397dcaba79f6de5370f8e47cf8e61dc176919 (diff)
downloadpkgsrc-557e505beaa4732a5de50bcba7a698d8e395d65f.tar.gz
Update to version 2.2.1.
2.2.1 - Thu Jun 3, 2004 ----------------------- * Added markup text decal functions, see plugins changelog. * Use <small> markup in system name if it doesn't fit. * Try to trap out GdkFont font configs from < 2.2.0 versions. * Translation updates o de.po o fr.po from Jerome UZEL pkgsrc: * Add a patch to fix the "gkrellm spinning at start-up" bug. This will make gkrellm2 work on systems that export anything useful for gkrellm through sysmon. * Correct PLISTs
Diffstat (limited to 'sysutils/gkrellm')
-rw-r--r--sysutils/gkrellm/Makefile.common4
-rw-r--r--sysutils/gkrellm/PLIST4
-rw-r--r--sysutils/gkrellm/buildlink3.mk4
-rw-r--r--sysutils/gkrellm/distinfo7
-rw-r--r--sysutils/gkrellm/files/server.Makefile15
-rw-r--r--sysutils/gkrellm/files/top.Makefile.inc2
-rw-r--r--sysutils/gkrellm/patches/patch-ab13
7 files changed, 34 insertions, 15 deletions
diff --git a/sysutils/gkrellm/Makefile.common b/sysutils/gkrellm/Makefile.common
index 18fd0511576..4ba67d26cfd 100644
--- a/sysutils/gkrellm/Makefile.common
+++ b/sysutils/gkrellm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2004/05/15 23:42:24 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.6 2004/06/05 18:57:37 cube Exp $
DISTNAME= ${GKRELLM_DISTBASE}
PKGNAME= ${GKRELLM_PKGBASE}-${GKRELLM_VERSION}
@@ -20,7 +20,7 @@ MAKE_ENV+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale
MAKE_ENV+= DEBUG=yes
.endif
-GKRELLM_VERSION= 2.2.0
+GKRELLM_VERSION= 2.2.1
GKRELLM_DISTBASE= gkrellm-${GKRELLM_VERSION}
GKRELLM_SRCDIR= ${WRKDIR}/${GKRELLM_DISTBASE}
diff --git a/sysutils/gkrellm/PLIST b/sysutils/gkrellm/PLIST
index 729ddd35302..24c2a272fc0 100644
--- a/sysutils/gkrellm/PLIST
+++ b/sysutils/gkrellm/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.7 2004/03/05 21:01:54 cube Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/06/05 18:57:37 cube Exp $
bin/gkrellm
include/gkrellm2/gkrellm.h
include/gkrellm2/gkrellm-public-proto.h
lib/pkgconfig/gkrellm.pc
man/man1/gkrellm.1
-@dirrm include/gkrellm2
+@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
diff --git a/sysutils/gkrellm/buildlink3.mk b/sysutils/gkrellm/buildlink3.mk
index d1a7bf0cb2c..1aa4bda5e29 100644
--- a/sysutils/gkrellm/buildlink3.mk
+++ b/sysutils/gkrellm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/26 02:27:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/06/05 18:57:37 cube Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GKRELLM_BUILDLINK3_MK:= ${GKRELLM_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= gkrellm
.if !empty(GKRELLM_BUILDLINK3_MK:M+)
BUILDLINK_DEPENDS.gkrellm+= gkrellm>=2.1.22
-BUILDLINK_RECOMMENDED.gkrellm?= gkrellm>=2.1.27nb2
+BUILDLINK_RECOMMENDED.gkrellm?= gkrellm>=2.2.1
BUILDLINK_PKGSRCDIR.gkrellm?= ../../sysutils/gkrellm
.endif # GKRELLM_BUILDLINK3_MK
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index 370ba94e6b9..f4c862d727c 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.23 2004/05/15 23:42:24 xtraeme Exp $
+$NetBSD: distinfo,v 1.24 2004/06/05 18:57:37 cube Exp $
-SHA1 (gkrellm-2.2.0.tar.bz2) = ddd6a61e8b85d672d6f0d15871e32381deceb0a8
-Size (gkrellm-2.2.0.tar.bz2) = 663376 bytes
+SHA1 (gkrellm-2.2.1.tar.bz2) = 4a4d296a61307b3a0b93da035c07e301ed474dbc
+Size (gkrellm-2.2.1.tar.bz2) = 663952 bytes
SHA1 (patch-aa) = 6335a5cb00a535c34c35fad47db077cb8db51dfe
+SHA1 (patch-ab) = 000f1c383c6fa7d010cb22c8481130800d4375c6
diff --git a/sysutils/gkrellm/files/server.Makefile b/sysutils/gkrellm/files/server.Makefile
index 262a7f589ab..f938103404b 100644
--- a/sysutils/gkrellm/files/server.Makefile
+++ b/sysutils/gkrellm/files/server.Makefile
@@ -1,12 +1,13 @@
include ../Makefile.inc
PACKAGE_D ?= gkrellmd
+GKRELLMD_INCLUDES = gkrellmd.h
PKG_INCLUDE = `$(PKG_CONFIG) --cflags glib-2.0 gthread-2.0`
-PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gthread-2.0`
+PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0`
-GLIB12_INCLUDE = `glib-config --cflags gthread`
-GLIB12_LIB = `glib-config --libs gthread`
+GLIB12_INCLUDE = `glib-config --cflags`
+GLIB12_LIB = `glib-config --libs glib gmodule`
USE_GLIB12?= no
ifeq ($(glib12),1)
@@ -51,7 +52,7 @@ endif
override CFLAGS += -Wall $(FLAGS)
-OBJS = main.o monitor.o mail.o glib.o sysdeps-unix.o
+OBJS = main.o monitor.o mail.o plugins.o glib.o utils.o sysdeps-unix.o
all: build
@@ -62,9 +63,11 @@ gkrellmd static: $(OBJS)
install:
$(INSTALL_DIR) $(SINSTALLDIR)
- $(INSTALL_DIR) $(SMANDIR)
$(INSTALL_BIN) $(STRIP) gkrellmd $(SINSTALLDIR)/$(PACKAGE_D)
+ $(INSTALL_DIR) $(SMANDIR)
$(INSTALL_DATA) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).1
+ $(INSTALL_DIR) $(INCLUDEDIR)/gkrellm2
+ $(INSTALL_DATA) $(GKRELLMD_INCLUDES) $(INCLUDEDIR)/gkrellm2
uninstall:
rm -f $(SINSTALLDIR)/$(PACKAGE_D)
@@ -81,5 +84,7 @@ SYSDEPS = ../src/sysdeps/bsd-common.c ../src/sysdeps/bsd-net-open.c \
main.o: main.c gkrellmd.h
monitor.o: monitor.c gkrellmd.h
mail.o: mail.c gkrellmd.h
+plugins.o: plugins.c gkrellmd.h
glib.o: glib.c gkrellmd.h
+utils.o: utils.c gkrellmd.h
sysdeps-unix.o: sysdeps-unix.c gkrellmd.h ../src/gkrellm-sysdeps.h $(SYSDEPS)
diff --git a/sysutils/gkrellm/files/top.Makefile.inc b/sysutils/gkrellm/files/top.Makefile.inc
index 0aa5e12e87d..e63883e2462 100644
--- a/sysutils/gkrellm/files/top.Makefile.inc
+++ b/sysutils/gkrellm/files/top.Makefile.inc
@@ -1,4 +1,4 @@
-VERSION= 2.1.28
+VERSION= 2.2.1
# Path options
PREFIX?= /usr/local
diff --git a/sysutils/gkrellm/patches/patch-ab b/sysutils/gkrellm/patches/patch-ab
new file mode 100644
index 00000000000..b8eedc42737
--- /dev/null
+++ b/sysutils/gkrellm/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.10 2004/06/05 18:57:37 cube Exp $
+
+--- src/sysdeps/netbsd.c.orig 2004-05-01 19:46:38.000000000 +0200
++++ src/sysdeps/netbsd.c
+@@ -295,7 +295,7 @@ gkrellm_sys_sensors_init(void)
+ int fd; /* file desc. for /dev/sysmon */
+ int id = 0; /* incremented for each sensor */
+ int type;
+- char *s, base_name[32];
++ char *s, base_name[33];
+ gboolean found_sensors = FALSE;
+
+ /* check if some sensor is configured */