summaryrefslogtreecommitdiff
path: root/sysutils/gkrellm/files
diff options
context:
space:
mode:
authorcube <cube>2004-06-05 18:57:37 +0000
committercube <cube>2004-06-05 18:57:37 +0000
commitd3a6ca3f268e7f411ff31c06a11f7e6b36d500c1 (patch)
tree14b78466175f5085a81365684313b6c4810c30e6 /sysutils/gkrellm/files
parent4652efe7bcd1c2a7006eea56d94d13fcd390837c (diff)
downloadpkgsrc-d3a6ca3f268e7f411ff31c06a11f7e6b36d500c1.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/files')
-rw-r--r--sysutils/gkrellm/files/server.Makefile15
-rw-r--r--sysutils/gkrellm/files/top.Makefile.inc2
2 files changed, 11 insertions, 6 deletions
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