From 37da8ea4e26652627d23d1f96bb98099abedf73a Mon Sep 17 00:00:00 2001
From: cube <cube>
Date: Mon, 29 Mar 2004 06:47:30 +0000
Subject: Update to 2.1.28.

pkgsrc changes:
  o provide GKRELLM_DEBUG to easily build a debug version (should help with
    the spinning gkrellm issue)
  o don't strip binaries in debug mode
  o small gkrellm Makefiles fixes

GKrellM changes (from Changelog):
  o Stephan Kapfinger <s.kapfinger--at--gmx.de> mail.c patch fixes bug
    I introduced into the last release where parsing of the mail reader
    command could fail.
---
 sysutils/gkrellm/Makefile               | 4 ++--
 sysutils/gkrellm/Makefile.common        | 8 ++++++--
 sysutils/gkrellm/distinfo               | 6 +++---
 sysutils/gkrellm/files/src.Makefile     | 4 ++--
 sysutils/gkrellm/files/top.Makefile.inc | 7 ++++++-
 5 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'sysutils')

diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 1090ce6ea0b..a77a6082f6c 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2004/03/26 02:27:54 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2004/03/29 06:47:30 cube Exp $
 .include "Makefile.common"
 
-PKGREVISION=		2
+PKGREVISION=		# defined
 
 GKRELLM_PKGBASE=	gkrellm
 WRKSRC=			${GKRELLM_SRCDIR}
diff --git a/sysutils/gkrellm/Makefile.common b/sysutils/gkrellm/Makefile.common
index dd99f45b61a..3f014eac67c 100644
--- a/sysutils/gkrellm/Makefile.common
+++ b/sysutils/gkrellm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2004/02/28 23:04:43 cube Exp $
+# $NetBSD: Makefile.common,v 1.4 2004/03/29 06:47:30 cube Exp $
 
 DISTNAME=	${GKRELLM_DISTBASE}
 PKGNAME=	${GKRELLM_PKGBASE}-${GKRELLM_VERSION}
@@ -16,7 +16,11 @@ USE_PKGLOCALEDIR=	YES
 
 MAKE_ENV+=		LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale
 
-GKRELLM_VERSION=	2.1.27
+.if defined(GKRELLM_DEBUG)
+MAKE_ENV+=		DEBUG=yes
+.endif
+
+GKRELLM_VERSION=	2.1.28
 GKRELLM_DISTBASE=	gkrellm-${GKRELLM_VERSION}
 GKRELLM_SRCDIR=		${WRKDIR}/${GKRELLM_DISTBASE}
 
diff --git a/sysutils/gkrellm/distinfo b/sysutils/gkrellm/distinfo
index 918cd857083..af5b92ee01f 100644
--- a/sysutils/gkrellm/distinfo
+++ b/sysutils/gkrellm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2004/02/28 23:04:43 cube Exp $
+$NetBSD: distinfo,v 1.19 2004/03/29 06:47:30 cube Exp $
 
-SHA1 (gkrellm-2.1.27.tar.bz2) = cfffcb9d3045253174d87e4bf99981694a8b3a12
-Size (gkrellm-2.1.27.tar.bz2) = 633394 bytes
+SHA1 (gkrellm-2.1.28.tar.bz2) = 3c02b156b1218ba6d164ec652b4dec47f33f88b4
+Size (gkrellm-2.1.28.tar.bz2) = 633487 bytes
diff --git a/sysutils/gkrellm/files/src.Makefile b/sysutils/gkrellm/files/src.Makefile
index 43c754af5f5..2cf8a5822d1 100644
--- a/sysutils/gkrellm/files/src.Makefile
+++ b/sysutils/gkrellm/files/src.Makefile
@@ -13,7 +13,7 @@ CFLAGS?=	-O2
 FLAGS = -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE)
 FLAGS+= $(PTHREAD_INC)
 
-ifeq ($(debug),yes)
+ifeq ($(DEBUG),yes)
     FLAGS += -g
 endif
 
@@ -74,7 +74,7 @@ install: gkrellm
 	$(INSTALL_DIR) $(INSTALLDIR)
 	$(INSTALL_DIR) $(INCLUDEDIR)/gkrellm2
 	$(INSTALL_DIR) $(MANDIR)
-	$(INSTALL_BIN) gkrellm $(INSTALLDIR)/$(PACKAGE)
+	$(INSTALL_BIN) $(STRIP) gkrellm $(INSTALLDIR)/$(PACKAGE)
 	$(INSTALL_DATA) $(GKRELLM_INCLUDES) $(INCLUDEDIR)/gkrellm2
 	$(INSTALL_DATA) ../gkrellm.1 $(MANDIR)/$(PACKAGE).1
 
diff --git a/sysutils/gkrellm/files/top.Makefile.inc b/sysutils/gkrellm/files/top.Makefile.inc
index 087b5374822..0aa5e12e87d 100644
--- a/sysutils/gkrellm/files/top.Makefile.inc
+++ b/sysutils/gkrellm/files/top.Makefile.inc
@@ -1,4 +1,4 @@
-VERSION=	2.1.27
+VERSION=	2.1.28
 
 # Path options
 PREFIX?=	/usr/local
@@ -59,6 +59,11 @@ ifeq ($(profile),yes)
 PROFILE=	yes
 endif
 
+# Don't strip binaries if in DEBUG mode
+ifeq ($(DEBUG),yes)
+STRIP=
+endif
+
 ifeq ($(GTOP),)
 # OS-specific overrides
 SUPPORTED_OSES=	Linux NetBSD FreeBSD OpenBSD Darwin Solaris
-- 
cgit v1.2.3