From b86b559ef10362e608d76eda27e8fc554b2c18c3 Mon Sep 17 00:00:00 2001
From: asami <asami@FreeBSD.org>
Date: Tue, 28 Mar 1995 05:58:18 +0000
Subject: Upgrade, 1.32 -> 1.34

---
 sysutils/xsysstats/Makefile       |  6 ++--
 sysutils/xsysstats/files/patch-aa | 72 +++------------------------------------
 sysutils/xsysstats/pkg-comment    |  2 +-
 3 files changed, 8 insertions(+), 72 deletions(-)

(limited to 'sysutils/xsysstats')

diff --git a/sysutils/xsysstats/Makefile b/sysutils/xsysstats/Makefile
index 36e22b7ee08..e8224ccdcac 100644
--- a/sysutils/xsysstats/Makefile
+++ b/sysutils/xsysstats/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xsysstats
-# Version required:	1.32
+# Version required:	1.34
 # Date created:		12 December 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.2 1995/02/11 13:51:07 asami Exp $
+# $Id: Makefile,v 1.3 1995/03/24 11:11:29 asami Exp $
 #
 
-DISTNAME=	xsysstats1.32
+DISTNAME=	xsysstats1.34
 USE_IMAKE=	yes
 MASTER_SITES=	ftp://crl.dec.com/pub/X11/contrib/utilities/
 MAINTAINER=	asami@FreeBSD.ORG
diff --git a/sysutils/xsysstats/files/patch-aa b/sysutils/xsysstats/files/patch-aa
index 3ea1ef546d2..f2b42522f67 100644
--- a/sysutils/xsysstats/files/patch-aa
+++ b/sysutils/xsysstats/files/patch-aa
@@ -1,75 +1,11 @@
---- ./headers.h.org	Mon Nov 21 19:57:57 1994
-+++ ./headers.h	Tue Dec 13 00:49:58 1994
+--- ./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.
   */
  
--#ifndef __NetBSD__
-+#if !(defined(__NetBSD__) || defined(__FreeBSD__))
+-#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.
---- ./porting.c.org	Tue Nov 22 13:21:16 1994
-+++ ./porting.c	Tue Dec 13 00:49:58 1994
-@@ -1,4 +1,4 @@
--#ifndef __NetBSD__
-+#if !(defined(__NetBSD__) || defined(__FreeBSD__))
- #include <rpcsvc/rstat.h>
- #endif
- #include "xsysstats.h"
-@@ -10,10 +10,13 @@
- #define FSCALE (1<<FSHIFT)
- #endif
- 
--#ifdef __NetBSD__
-+#if (defined(__NetBSD__) || defined(__FreeBSD__))
- #include <rpc/rpc.h>
- #undef FSHIFT
- #undef FSCALE
-+#ifdef __FreeBSD__
-+#include <rpc/types.h>
-+#endif
- #include <rpcsvc/rstat.h>
- 
- #ifdef ultrix
---- ./Imakefile.org	Mon Nov 21 19:47:44 1994
-+++ ./Imakefile	Tue Dec 13 00:57:57 1994
-@@ -9,7 +9,7 @@
-  */
- 
- 
--CFLAGS = -I/usr/X11R6/include  -g -Wall
-+CFLAGS = -I/usr/X11R6/include  -O2 -Wall
- CC = gcc
- 
- /* If using Solaris 2, uncomment the line below *
-@@ -20,7 +20,7 @@
- 	DEFINES = -DSOLARIS2
- 	LIBS = -lrpcsvc -lnsl
- #else
--	LIBS = -lrpcsvc
-+        LIBS = -lrpcsvc
- #endif
- 
-         DEPLIBS = $(DEPXLIB)
---- ./xsysstats.h.org	Mon Nov 21 20:57:47 1994
-+++ ./xsysstats.h	Tue Dec 13 00:49:58 1994
-@@ -2,9 +2,17 @@
- #include <X11/Xutil.h>
- #include <stdio.h>
- #include <sys/param.h>
-+#include <sys/types.h>
-+#if defined(BSD) && (BSD >= 199306)
-+#include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
- 
--#ifdef SOLARIS2
-+#include <string.h>
-+#include <unistd.h>
-+
-+#if (defined(SOLARIS2) || defined(__FreeBSD__))
- #include <netdb.h>
- #endif
- 
diff --git a/sysutils/xsysstats/pkg-comment b/sysutils/xsysstats/pkg-comment
index 19e34075850..1f79fe6f798 100644
--- a/sysutils/xsysstats/pkg-comment
+++ b/sysutils/xsysstats/pkg-comment
@@ -1 +1 @@
-xsysstats-1.32, a system information display tool
+xsysstats-1.34, a system information display tool
-- 
cgit