From vs@foldr.org  Sat Nov  9 00:10:16 2002
Return-Path: <vs@foldr.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 585B637B401; Sat,  9 Nov 2002 00:10:16 -0800 (PST)
Received: from lambda.foldr.org (lambda.foldr.org [198.78.66.36])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 4D2F643E3B; Sat,  9 Nov 2002 00:10:10 -0800 (PST)
	(envelope-from vs@foldr.org)
Received: from theater.dyndns.org (pD9008CC4.dip.t-dialin.net [217.0.140.196])
	by lambda.foldr.org (8.12.3/8.11.6) with ESMTP id gA989ojN068899
	(using TLSv1/SSLv3 with cipher EDH-RSA-DES-CBC3-SHA (168 bits) verified OK);
	Sat, 9 Nov 2002 09:09:58 +0100 (CET)
	(envelope-from vs@foldr.org)
Received: from monster.ikea.net (monster.ikea.net [IPv6:3ffe:b80:2de:3:2e0:29ff:fe98:abca])
	by theater.dyndns.org (8.12.5/8.12.5) with ESMTP id gA989gBO000515
	(version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=OK);
	Sat, 9 Nov 2002 09:09:43 +0100 (CET)
	(envelope-from vs@monster.ikea.net)
Received: (from vs@localhost)
	by monster.ikea.net (8.12.6/8.12.6/Submit) id gA989fdW007826;
	Sat, 9 Nov 2002 09:09:41 +0100 (CET)
	(envelope-from vs)
Message-Id: <200211090809.gA989fdW007826@monster.ikea.net>
Date: Sat, 9 Nov 2002 09:09:41 +0100 (CET)
From: Volker Stolz <vs@foldr.org>
Reply-To: Volker Stolz <vs@foldr.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: obraun@freebsd.org
Subject: [patch] Update sysutils/xsysstats 1.34 -> 1.51
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         45155
>Category:       ports
>Synopsis:       [patch] Update sysutils/xsysstats 1.34 -> 1.51
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 09 00:20:01 PST 2002
>Closed-Date:    Tue Nov 12 15:27:47 PST 2002
>Last-Modified:  Tue Nov 12 15:27:47 PST 2002
>Originator:     Volker Stolz
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
Lambda Core Research Facility
>Environment:
System: FreeBSD monster.ikea.net 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Sat Oct 26 17:47:39 CEST 2002 root@monster.ikea.net:/usr/obj/usr/src/sys/MONSTER i386


>Description:
sysutils/xsysstats breaks on -CURRENT, update to 1.51 fixes this.

>How-To-Repeat:
>Fix:
Removed files:
 - files/patch-aa
 - files/patch-ab

diff -urN xsysstats-1.34/Makefile xsysstats/Makefile
--- xsysstats-1.34/Makefile	Wed Nov  6 23:47:02 2002
+++ xsysstats/Makefile	Sat Nov  9 08:52:46 2002
@@ -3,11 +3,11 @@
 # Date created:			  12 December 1994
 # Whom:				  asami
 #
-# $FreeBSD: ports/sysutils/xsysstats/Makefile,v 1.22 2002/11/06 22:47:02 adamw Exp $
+# $FreeBSD: ports/sysutils/xsysstats/Makefile,v 1.21 2002/05/08 20:57:35 obrien Exp $
 #
 
 PORTNAME=	xsysstats
-PORTVERSION=	1.34
+PORTVERSION=	1.51
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
@@ -15,9 +15,13 @@
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	A system information display tool
-
-USE_IMAKE=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_XLIB=	yes
 MAN1=		xsysstats.1
 
+ALL_TARGET=	xsysstats
+
+pre-patch:
+	${RM} ${WRKSRC}/headers.h && ${TOUCH} ${WRKSRC}/headers.h
 .include <bsd.port.mk>
diff -urN xsysstats-1.34/distinfo xsysstats/distinfo
--- xsysstats-1.34/distinfo	Sat Apr  1 00:17:13 1995
+++ xsysstats/distinfo	Sat Nov  9 08:33:15 2002
@@ -1 +1 @@
-MD5 (xsysstats1.34.tar.gz) = 6f8a5a27805bca2a1571cbd5fe816a03
+MD5 (xsysstats1.51.tar.gz) = 90996162e16b45c2e8ae2fd1d8fd4ad3
diff -urN xsysstats-1.34/files/patch-Makefile.in xsysstats/files/patch-Makefile.in
--- xsysstats-1.34/files/patch-Makefile.in	Thu Jan  1 01:00:00 1970
+++ xsysstats/files/patch-Makefile.in	Sat Nov  9 08:50:58 2002
@@ -0,0 +1,12 @@
+--- Makefile.in.orig	Tue May 30 08:07:38 2000
++++ Makefile.in	Sat Nov  9 08:50:56 2002
+@@ -1,6 +1,6 @@
+-CC = @CC@
+-CFLAGS = @CFLAGS@
+-CPPFLAGS = @CPPFLAGS@
++#CC = @CC@
++CFLAGS = -I@x_includes@
++#CPPFLAGS = @CPPFLAGS@
+ LIBS = @LIBS@
+ LDFLAGS = @LDFLAGS@
+ 
diff -urN xsysstats-1.34/files/patch-aa xsysstats/files/patch-aa
--- xsysstats-1.34/files/patch-aa	Tue Mar 28 07:58:17 1995
+++ xsysstats/files/patch-aa	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- ./headers.h.org	Thu Dec  1 18:06:22 1994
-+++ ./headers.h	Mon Mar 27 21:53:02 1995
-@@ -9,7 +9,7 @@
-  * prototypes, this is unneeded.
-  */
- 
--#if !defined(__NetBSD__) && !defined(linux)
-+#if !defined(__NetBSD__) && !defined (__FreeBSD__) && !defined(linux)
- #ifdef __GNUC__
- /* These do not seem to be needed with gcc-2.5.0.  In fact, having
-  * them declared causes errors.
diff -urN xsysstats-1.34/files/patch-ab xsysstats/files/patch-ab
--- xsysstats-1.34/files/patch-ab	Wed Jul 25 19:40:24 2001
+++ xsysstats/files/patch-ab	Thu Jan  1 01:00:00 1970
@@ -1,12 +0,0 @@
---- porting.c.orig	Sun Jul 22 11:19:14 2001
-+++ porting.c	Sun Jul 22 11:23:38 2001
-@@ -33,7 +33,9 @@
- #endif
- #include <rpcsvc/rstat.h>
- 
-+#if !defined(__FreeBSD__) || !defined(__alpha__)
- extern int callrpc(char *, u_long, u_long, u_long, xdrproc_t, char *, xdrproc_t, char *);
-+#endif
- 
- int rstat(char *host, struct statstime *stats)
- {
diff -urN xsysstats-1.34/files/patch-xsysstats.c xsysstats/files/patch-xsysstats.c
--- xsysstats-1.34/files/patch-xsysstats.c	Thu Jan  1 01:00:00 1970
+++ xsysstats/files/patch-xsysstats.c	Sat Nov  9 08:45:17 2002
@@ -0,0 +1,8 @@
+--- xsysstats.c.orig	Sat Nov  9 08:44:11 2002
++++ xsysstats.c	Sat Nov  9 08:44:45 2002
+@@ -1,5 +1,4 @@
+ #include "xsysstats.h"
+-#include "headers.h"
+ #include "patchlevel.h"
+ 
+ struct base_types {
diff -urN xsysstats-1.34/files/patch-xsysstats.h xsysstats/files/patch-xsysstats.h
--- xsysstats-1.34/files/patch-xsysstats.h	Thu Jan  1 01:00:00 1970
+++ xsysstats/files/patch-xsysstats.h	Sat Nov  9 08:43:58 2002
@@ -0,0 +1,24 @@
+--- xsysstats.h.orig	Tue May 30 08:46:20 2000
++++ xsysstats.h	Sat Nov  9 08:43:29 2002
+@@ -15,12 +15,9 @@
+ #include <stdio.h>
+ #include <sys/param.h>
+ 
+-#include <stdio.h>
+-#include <sys/param.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+-#include <malloc.h>
+ #include <netdb.h>
+ #include <rpcsvc/rstat.h>
+ 
+@@ -138,7 +135,7 @@
+     char    *name;	/*Name of the host */
+ #ifdef USE_NEW_RSTAT
+     CLIENT  *client;	/* client connection for rstat */
+-#endif USE_NEW_RSTAT
++#endif /* USE_NEW_RSTAT */
+ };
+ 
+ extern struct Xss_Window **windows;
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: obraun 
State-Changed-When: Tue Nov 12 15:19:27 PST 2002 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=45155 
>Unformatted:
