>Number:         23084
>Category:       pkg
>Synopsis:       update net/slurm (0.2.1 - 0.3.1)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Oct 07 19:39:01 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     
>Release:        NetBSD 1.6.1
>Organization:
Hendrik Scholz - <hscholz@raisdorf.net> - http://raisdorf.net/

drag me, drop me - treat me like an object 
>Environment:
	
	
System: NetBSD phobos.raisdorf.net 1.6.1 NetBSD 1.6.1 (PHOBOS) #7: Wed Apr 16 14:33:53 CEST 2003 hscholz@phobos.raisdorf.net:/usr/src/sys/arch/sgimips/compile/PHOBOS sgimips
Architecture: mipseb
Machine: sgimips
>Description:
Update slurm 0.2.1 to 0.3.1 which now comes with auto* and theme support :)
>How-To-Repeat:
http://www.raisdorf.net/files/misc/slurm-0.3.1.diff
http://www.raisdorf.net/files/misc/slurm-0.3.1.shar
>Fix:
diff -urP slurm-0.2.1/Makefile slurm/Makefile
--- slurm-0.2.1/Makefile    Mon Oct  6 22:58:40 2003
+++ slurm/Makefile  Tue Oct  7 01:18:16 2003
@@ -1,23 +1,25 @@
 # $NetBSD: Makefile,v 1.4 2003/09/28 09:13:58 jlam Exp $
 #
 
-DISTNAME=  slurm-0.2.1
-PKGREVISION=   1
+DISTNAME=  slurm-0.3.1
 CATEGORIES=    net
-MASTER_SITES=  http://www.raisdorf.net/files/code/
+MASTER_SITES=  http://www.raisdorf.net/files/code/ \
+                http://download.raisdorf.net/slurm/
 
 MAINTAINER=    mail@eckigesauge.de
 HOMEPAGE=  http://www.raisdorf.net/projects/slurm/
-COMMENT=   Realtime traffic statistics
+COMMENT=   Realtime network traffic statistics
 
-USE_BUILDLINK2=    YES
-NO_CONFIGURE=  YES
-
-USE_NCURSES=   # use_default_colors
+USE_NCURSES=    # use_default_colors
+GNU_CONFIGURE=  YES
 
 do-install:
    ${INSTALL_PROGRAM} ${WRKSRC}/slurm ${PREFIX}/bin
    ${INSTALL_MAN} ${WRKSRC}/slurm.1 ${PREFIX}/man/man1
+   ${MKDIR} ${PREFIX}/share/slurm
+   ${INSTALL_DATA} ${WRKSRC}/themes/blue.theme ${PREFIX}/share/slurm
+   ${INSTALL_DATA} ${WRKSRC}/themes/cyan.theme ${PREFIX}/share/slurm
+   ${INSTALL_DATA} ${WRKSRC}/themes/foo.theme ${PREFIX}/share/slurm
 
 .include "../../devel/ncurses/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff -urP slurm-0.2.1/PLIST slurm/PLIST
--- slurm-0.2.1/PLIST   Mon Oct  6 22:58:40 2003
+++ slurm/PLIST Tue Oct  7 21:10:33 2003
@@ -1,3 +1,6 @@
 @comment $NetBSD: PLIST,v 1.1.1.1 2003/03/04 16:22:06 hubertf Exp $
 bin/slurm
 man/man1/slurm.1
+share/slurm/blue.theme
+share/slurm/cyan.theme
+share/slurm/foo.theme
diff -urP slurm-0.2.1/distinfo slurm/distinfo
--- slurm-0.2.1/distinfo    Mon Oct  6 22:58:40 2003
+++ slurm/distinfo  Tue Oct  7 01:13:24 2003
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/03/04 16:22:06 hubertf Exp $
+$NetBSD$
 
-SHA1 (slurm-0.2.1.tar.gz) = b3ce3db52ae47c67a4271d9836b7a2841626ff3e
-Size (slurm-0.2.1.tar.gz) = 50168 bytes
-SHA1 (patch-aa) = a3ce73d3dda7c8d467d9dfee0199c9edae651227
-SHA1 (patch-ab) = 5aaa7dc60ff06bee2c750ba36ffdd454dabdf6f4
+SHA1 (slurm-0.3.1.tar.gz) = abadde89e6d9e0f2dca93a8354fbc7897ad1c94d
+Size (slurm-0.3.1.tar.gz) = 56048 bytes
+MD5 (patch-aa) = 4932e6e4fabbdf08e6870b02f92cd7a0
+MD5 (patch-ab) = a9bc5bd9823330fed59447ff65e34c94
Only in slurm-0.2.1/patches: CVS
diff -urP slurm-0.2.1/patches/patch-aa slurm/patches/patch-aa
--- slurm-0.2.1/patches/patch-aa    Mon Oct  6 22:58:40 2003
+++ slurm/patches/patch-aa  Tue Oct  7 00:57:29 2003
@@ -1,14 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/03/04 16:22:06 hubertf Exp $
-
---- Makefile.orig  Mon Feb 24 20:33:15 2003
-+++ Makefile
-@@ -1,7 +1,7 @@
- CC= gcc
- VERSION = "0.2.1"
--CFLAGS = -g -O2 -D_HAVE_NCURSES
--LIBS =  -lncurses
-+CFLAGS = -g -O2 -D_HAVE_NCURSES -I${LOCALBASE}/include
-+LIBS =  -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib  -lncurses
- LDFLAGS = 
- 
+--- Makefile.in.orig   Tue Oct  7 00:56:53 2003
++++ Makefile.in    Tue Oct  7 00:57:08 2003
+@@ -7,7 +7,7 @@
  all: slurm-bin
+ 
+ slurm-bin:    slurm.c
+-          $(CC) $(CFLAGS) -DVERSION='$(VERSION)' slurm.c $(LIBS) -o slurm
++          $(CC) $(CFLAGS) -DVERSION='$(VERSION)' slurm.c $(LIBS) $(LDFLAGS) -o slurm
+ debug:    slurm.c
+           $(CC) $(CFLAGS) -Wall -DVERSION='$(VERSION)' slurm.c $(LIBS) -o slurm
+ 
diff -urP slurm-0.2.1/patches/patch-ab slurm/patches/patch-ab
--- slurm-0.2.1/patches/patch-ab    Mon Oct  6 22:58:40 2003
+++ slurm/patches/patch-ab  Tue Oct  7 01:13:18 2003
@@ -1,17 +1,29 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/03/04 16:22:06 hubertf Exp $
-
---- slurm.c.orig   Mon Feb 24 19:57:27 2003
-+++ slurm.c
-@@ -107,7 +107,11 @@
- #include <time.h>
- #include <ctype.h>
- #include <signal.h>
--#include <curses.h>
-+#ifdef _HAVE_NCURSES
-+#  include <ncurses.h>
+Index: theme.c
+===================================================================
+RCS file: /home/cvs/slurm/slurm/theme.c,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- theme.c    9 Jul 2003 16:45:37 -0000   1.2
++++ theme.c    6 Oct 2003 23:04:55 -0000   1.3
+@@ -3,7 +3,7 @@
+  * theme.c - slurm theme engine
+  *
+  ******************************************************************************
+- * $Id: theme.c,v 1.2 2003/07/09 16:45:37 hscholz Exp $
++ * $Id: theme.c,v 1.3 2003/10/06 23:04:55 hscholz Exp $
+  *****************************************************************************/
+ 
+ #ifndef _THEME_C
+@@ -69,7 +69,11 @@
+       if ((f = fopen(filename, "r")) == NULL)
+       {
+           bzero(&filename, BUFSIZ);
++#ifdef __NetBSD__
++          snprintf(filename, BUFSIZ, "/usr/pkg/share/slurm/%s.theme", name);
 +#else
-+#  include <curses.h>
+           snprintf(filename, BUFSIZ, "/usr/local/share/slurm/%s.theme", name);
 +#endif
- #include <sys/wait.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
+           if ((f = fopen(filename, "r")) == NULL)
+               error(ERR_FATAL, "cannot find theme '%s'", name);
+       }

>Release-Note:
>Audit-Trail:
>Unformatted: