Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Jun 2005 01:00:22 +0900
From:      KATO Tsuguru <tkato432@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/81729: Update port: sysutils/slmon to 0.5.13
Message-ID:  <20050601010022.1768c211.tkato432@yahoo.com>
Resent-Message-ID: <200505311610.j4VGA5t0047063@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         81729
>Category:       ports
>Synopsis:       Update port: sysutils/slmon to 0.5.13
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 31 16:10:04 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.11-RELEASE-p7 i386
>Organization:
>Environment:
>Description:
- Update to version 0.5.13

Remove file:
files/patch-rc.c
files/patch-slmon.c

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/sysutils/slmon/Makefile sysutils/slmon/Makefile
--- /usr/ports/sysutils/slmon/Makefile	Sat Mar 12 20:30:38 2005
+++ sysutils/slmon/Makefile	Sun May 29 21:50:03 2005
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	slmon
-PORTVERSION=	0.5.12
-PORTREVISION=	3
+PORTVERSION=	0.5.13
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -23,6 +22,7 @@
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		slmon.1
@@ -36,8 +36,5 @@
 .if ${OSVERSION} < 400010
 LIB_DEPENDS+=	ncurses:${PORTSDIR}/devel/ncurses
 .endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's/glibtop_free/g_free/g' ${WRKSRC}/draw.c ${WRKSRC}/stat.c
 
 .include <bsd.port.post.mk>
diff -urN /usr/ports/sysutils/slmon/distinfo sysutils/slmon/distinfo
--- /usr/ports/sysutils/slmon/distinfo	Fri Jan 30 14:54:27 2004
+++ sysutils/slmon/distinfo	Sun May 29 21:43:11 2005
@@ -1,2 +1,2 @@
-MD5 (slmon-0.5.12.tar.gz) = 1b36e3d49038008cfec11b5820b77ac6
-SIZE (slmon-0.5.12.tar.gz) = 54257
+MD5 (slmon-0.5.13.tar.gz) = 9907c53e26b8dfb5d33af6da32ed89e3
+SIZE (slmon-0.5.13.tar.gz) = 103826
diff -urN /usr/ports/sysutils/slmon/files/patch-defines.h sysutils/slmon/files/patch-defines.h
--- /usr/ports/sysutils/slmon/files/patch-defines.h	Thu Jul 22 03:23:29 2004
+++ sysutils/slmon/files/patch-defines.h	Sun May 29 21:45:10 2005
@@ -1,5 +1,5 @@
---- defines.h.orig	Wed Sep 11 19:44:03 2002
-+++ defines.h	Wed Jul 21 14:12:16 2004
+--- defines.h.orig	Mon Jun 21 00:56:47 2004
++++ defines.h	Sun May 29 21:44:41 2005
 @@ -21,6 +21,7 @@
  #ifndef SLMON_DEFINES_H
  #define SLMON_DEFINES_H
@@ -8,11 +8,3 @@
  #include <stdlib.h>
  #include <time.h>
  #include <string.h>
-@@ -47,7 +48,6 @@
- #include <glibtop/procmap.h>
- #include <glibtop/mountlist.h>
- #include <glibtop/fsusage.h>
--#include <glibtop/xmalloc.h>
- 
- #ifndef PROFILE_COUNT
- #define PROFILE_COUNT   1000
diff -urN /usr/ports/sysutils/slmon/files/patch-draw.c sysutils/slmon/files/patch-draw.c
--- /usr/ports/sysutils/slmon/files/patch-draw.c	Wed Aug 18 02:51:48 2004
+++ sysutils/slmon/files/patch-draw.c	Sun May 29 21:47:08 2005
@@ -1,18 +1,12 @@
---- draw.c.orig	Tue Oct  1 20:32:27 2002
-+++ draw.c	Tue Aug 17 13:40:08 2004
-@@ -26,6 +26,7 @@
+--- draw.c.orig	Mon Jun 21 00:56:48 2004
++++ draw.c	Sun May 29 21:47:00 2005
+@@ -27,7 +27,9 @@
  #include <glibtop/netload.h>
  
  #include <sys/types.h>
 +#include <sys/socket.h>
  #include <netinet/in.h>
++#include <arpa/inet.h>
  
  /*
-@@ -314,6 +315,7 @@
- 	SLsmg_write_string("SPC,ENTER:  leave help");
- 	break;
-     default:
-+	break;
-     }
- }
- 
+  * Clear screen using color n. This should be used instead of SLsmg_cls() to
diff -urN /usr/ports/sysutils/slmon/files/patch-rc.c sysutils/slmon/files/patch-rc.c
--- /usr/ports/sysutils/slmon/files/patch-rc.c	Tue Aug 17 20:44:15 2004
+++ sysutils/slmon/files/patch-rc.c	Thu Jan  1 09:00:00 1970
@@ -1,34 +0,0 @@
---- rc.c.orig	Tue Aug 17 13:38:31 2004
-+++ rc.c	Tue Aug 17 13:39:32 2004
-@@ -109,6 +109,7 @@
- 			mode = MODE_H;
- 			break;
- 		    default:
-+			break;
- 		    }
- 		    break;
- 		case 'm':
-@@ -139,6 +140,7 @@
- 			conf.fs = 2;
- 			break;
- 		    default:
-+			break;
- 		    }
- 		    break;
- 		case 'n':
-@@ -156,6 +158,7 @@
- 			conf.net = 3;
- 			break;
- 		    default:
-+			break;
- 		    }
- 		    break;
- 		case 'v':
-@@ -166,6 +169,7 @@
- 		    update_time = (unsigned long) (atof(tmp + pos) * 1000000.0);
- 		    update_time -= (unsigned long) 10000;
- 		default:
-+		    break;
- 		}
- 		free(key);
- 	    }
diff -urN /usr/ports/sysutils/slmon/files/patch-slmon.c sysutils/slmon/files/patch-slmon.c
--- /usr/ports/sysutils/slmon/files/patch-slmon.c	Tue Aug 17 20:44:15 2004
+++ sysutils/slmon/files/patch-slmon.c	Thu Jan  1 09:00:00 1970
@@ -1,18 +0,0 @@
---- slmon.c.orig	Tue Aug 17 13:40:46 2004
-+++ slmon.c	Tue Aug 17 13:41:44 2004
-@@ -337,6 +337,7 @@
- 	conf.map = conf.map_x;
- 	break;
-     default:
-+	break;
-     }
- }
- 
-@@ -514,6 +515,7 @@
- 	conf.sort_func = slmon_cmp_user_asc;
- 	break;
-     default:
-+	break;
-     }
- }
- 
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050601010022.1768c211.tkato432>