pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update to version 2.2.1.
details: https://anonhg.NetBSD.org/pkgsrc/rev/bcf5cc47c612
branches: trunk
changeset: 476244:bcf5cc47c612
user: cube <cube%pkgsrc.org@localhost>
date: Sat Jun 05 18:57:37 2004 +0000
description:
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:
doc/CHANGES | 5 ++++-
sysutils/gkrellm-server/PLIST | 4 +++-
sysutils/gkrellm/Makefile.common | 4 ++--
sysutils/gkrellm/PLIST | 4 ++--
sysutils/gkrellm/buildlink3.mk | 4 ++--
sysutils/gkrellm/distinfo | 7 ++++---
sysutils/gkrellm/files/server.Makefile | 15 ++++++++++-----
sysutils/gkrellm/files/top.Makefile.inc | 2 +-
sysutils/gkrellm/patches/patch-ab | 13 +++++++++++++
9 files changed, 41 insertions(+), 17 deletions(-)
diffs (169 lines):
diff -r 1ed9afb11c0a -r bcf5cc47c612 doc/CHANGES
--- a/doc/CHANGES Sat Jun 05 18:55:39 2004 +0000
+++ b/doc/CHANGES Sat Jun 05 18:57:37 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6146 2004/06/05 18:50:59 xtraeme Exp $
+$NetBSD: CHANGES,v 1.6147 2004/06/05 18:57:37 cube Exp $
Changes to the packages collection and infrastructure in 2004:
@@ -2800,3 +2800,6 @@
Updated mew to 2.3nb1 [minskim 2004-06-05]
Added weechat-0.0.6 [xtraeme 2004-06-05]
Updated openmsx to 0.4.0nb1 [xtraeme 2004-06-05]
+ Updated gkrellm to 2.2.1 [cube 2004-06-05]
+ Updated gkrellm-server to 2.2.1 [cube 2004-06-05]
+ Updated gkrellm-share to 2.2.1 [cube 2004-06-05]
diff -r 1ed9afb11c0a -r bcf5cc47c612 sysutils/gkrellm-server/PLIST
--- a/sysutils/gkrellm-server/PLIST Sat Jun 05 18:55:39 2004 +0000
+++ b/sysutils/gkrellm-server/PLIST Sat Jun 05 18:57:37 2004 +0000
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2004/04/23 22:07:59 reed Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/06/05 18:57:37 cube Exp $
bin/gkrellmd
+include/gkrellm2/gkrellmd.h
man/man1/gkrellmd.1
share/examples/gkrellm-server/gkrellmd.conf
+@unexec ${RMDIR} %D/include/gkrellm2 2>/dev/null || ${TRUE}
@dirrm share/examples/gkrellm-server
diff -r 1ed9afb11c0a -r bcf5cc47c612 sysutils/gkrellm/Makefile.common
--- a/sysutils/gkrellm/Makefile.common Sat Jun 05 18:55:39 2004 +0000
+++ b/sysutils/gkrellm/Makefile.common Sat Jun 05 18:57:37 2004 +0000
@@ -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+= DEBUG=yes
.endif
-GKRELLM_VERSION= 2.2.0
+GKRELLM_VERSION= 2.2.1
GKRELLM_DISTBASE= gkrellm-${GKRELLM_VERSION}
GKRELLM_SRCDIR= ${WRKDIR}/${GKRELLM_DISTBASE}
diff -r 1ed9afb11c0a -r bcf5cc47c612 sysutils/gkrellm/PLIST
--- a/sysutils/gkrellm/PLIST Sat Jun 05 18:55:39 2004 +0000
+++ b/sysutils/gkrellm/PLIST Sat Jun 05 18:57:37 2004 +0000
@@ -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 -r 1ed9afb11c0a -r bcf5cc47c612 sysutils/gkrellm/buildlink3.mk
--- a/sysutils/gkrellm/buildlink3.mk Sat Jun 05 18:55:39 2004 +0000
+++ b/sysutils/gkrellm/buildlink3.mk Sat Jun 05 18:57:37 2004 +0000
@@ -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 @@
.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 -r 1ed9afb11c0a -r bcf5cc47c612 sysutils/gkrellm/distinfo
--- a/sysutils/gkrellm/distinfo Sat Jun 05 18:55:39 2004 +0000
+++ b/sysutils/gkrellm/distinfo Sat Jun 05 18:57:37 2004 +0000
@@ -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 -r 1ed9afb11c0a -r bcf5cc47c612 sysutils/gkrellm/files/server.Makefile
--- a/sysutils/gkrellm/files/server.Makefile Sat Jun 05 18:55:39 2004 +0000
+++ b/sysutils/gkrellm/files/server.Makefile Sat Jun 05 18:57:37 2004 +0000
@@ -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 @@
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 @@
install:
$(INSTALL_DIR) $(SINSTALLDIR)
+ $(INSTALL_BIN) $(STRIP) gkrellmd $(SINSTALLDIR)/$(PACKAGE_D)
$(INSTALL_DIR) $(SMANDIR)
- $(INSTALL_BIN) $(STRIP) gkrellmd $(SINSTALLDIR)/$(PACKAGE_D)
$(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 @@
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 -r 1ed9afb11c0a -r bcf5cc47c612 sysutils/gkrellm/files/top.Makefile.inc
--- a/sysutils/gkrellm/files/top.Makefile.inc Sat Jun 05 18:55:39 2004 +0000
+++ b/sysutils/gkrellm/files/top.Makefile.inc Sat Jun 05 18:57:37 2004 +0000
@@ -1,4 +1,4 @@
-VERSION= 2.1.28
+VERSION= 2.2.1
# Path options
PREFIX?= /usr/local
diff -r 1ed9afb11c0a -r bcf5cc47c612 sysutils/gkrellm/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/gkrellm/patches/patch-ab Sat Jun 05 18:57:37 2004 +0000
@@ -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 */
Home |
Main Index |
Thread Index |
Old Index