svn commit: r549578 - in head/sysutils/xsysstats: . files
Stefan Eßer
se at FreeBSD.org
Tue Sep 22 11:56:28 UTC 2020
Author: se
Date: Tue Sep 22 11:56:27 2020
New Revision: 549578
URL: https://svnweb.freebsd.org/changeset/ports/549578
Log:
Fix build with -fno-common
While here add a license (extracted from the README file).
Redistribution is only allowed free of charge.
Added:
head/sysutils/xsysstats/files/LICENSE (contents, props changed)
head/sysutils/xsysstats/files/patch-porting.c (contents, props changed)
Modified:
head/sysutils/xsysstats/Makefile
head/sysutils/xsysstats/files/patch-Makefile.in
head/sysutils/xsysstats/files/patch-xsysstats.c
head/sysutils/xsysstats/files/patch-xsysstats.h
Modified: head/sysutils/xsysstats/Makefile
==============================================================================
--- head/sysutils/xsysstats/Makefile Tue Sep 22 11:54:33 2020 (r549577)
+++ head/sysutils/xsysstats/Makefile Tue Sep 22 11:56:27 2020 (r549578)
@@ -2,13 +2,18 @@
PORTNAME= xsysstats
PORTVERSION= 1.51
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= XCONTRIB/utilities
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports at FreeBSD.org
COMMENT= System information display tool
+
+LICENSE= MWEDEL
+LICENSE_NAME= Marc Wedel non-commercial open source license
+LICENSE_FILE= ${PATCHDIR}/LICENSE
+LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
GNU_CONFIGURE= yes
USES= gmake xorg
Added: head/sysutils/xsysstats/files/LICENSE
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/xsysstats/files/LICENSE Tue Sep 22 11:56:27 2020 (r549578)
@@ -0,0 +1,15 @@
+LICENSE:
+
+XSysStats is Copyright (C) 1993, 1994, 1995, 1997, 2000 by Mark Wedel
+(mwedel at scruz.net)
+
+XSysStats can be redistributed provided it is done free of charge.
+XSysStats can also be modified, but original credit must be given to
+Mark Wedel.
+
+XSysStats is provided as is. I take no responsibility for damage
+or problems caused by the use of XSysStats.
+
+XSysStats was developed as a personal project on my home system. This is
+not a product of my employer, Pyramid Technology, and they take no
+responsibility of its use.
Modified: head/sysutils/xsysstats/files/patch-Makefile.in
==============================================================================
--- head/sysutils/xsysstats/files/patch-Makefile.in Tue Sep 22 11:54:33 2020 (r549577)
+++ head/sysutils/xsysstats/files/patch-Makefile.in Tue Sep 22 11:56:27 2020 (r549578)
@@ -1,5 +1,5 @@
---- Makefile.in.orig 2000-05-30 14:07:38.000000000 +0800
-+++ Makefile.in 2013-11-16 23:47:26.000000000 +0800
+--- Makefile.in.orig 2000-05-30 06:07:38 UTC
++++ Makefile.in
@@ -1,6 +1,6 @@
-CC = @CC@
-CFLAGS = @CFLAGS@
@@ -10,7 +10,7 @@
LIBS = @LIBS@
LDFLAGS = @LDFLAGS@
-@@ -31,10 +31,8 @@ xysstats.o: xsysstats.c xsysstats.h conf
+@@ -31,10 +31,8 @@ xysstats.o: xsysstats.c xsysstats.h config.h headers.h
porting.o: xsysstats.c xsysstats.h config.h headers.h
install:
Added: head/sysutils/xsysstats/files/patch-porting.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/xsysstats/files/patch-porting.c Tue Sep 22 11:56:27 2020 (r549578)
@@ -0,0 +1,12 @@
+--- porting.c.orig 2000-05-30 06:50:24 UTC
++++ porting.c
+@@ -26,6 +26,9 @@ int rstat(char *host, struct statstime *stats)
+
+ #ifdef USE_NEW_RSTAT
+ #include <rpc/rpc.h>
++
++int open_host(struct Host_Info *host);
++
+ int
+ rstat_local(struct Host_Info *host, struct statstime *statval)
+ {
Modified: head/sysutils/xsysstats/files/patch-xsysstats.c
==============================================================================
--- head/sysutils/xsysstats/files/patch-xsysstats.c Tue Sep 22 11:54:33 2020 (r549577)
+++ head/sysutils/xsysstats/files/patch-xsysstats.c Tue Sep 22 11:56:27 2020 (r549578)
@@ -1,8 +1,16 @@
---- xsysstats.c.orig Sat Nov 9 08:44:11 2002
-+++ xsysstats.c Sat Nov 9 08:44:45 2002
+--- xsysstats.c.orig 2000-05-30 06:39:48 UTC
++++ xsysstats.c
@@ -1,5 +1,4 @@
#include "xsysstats.h"
-#include "headers.h"
#include "patchlevel.h"
struct base_types {
+@@ -48,6 +47,7 @@ struct base_types types[NUM_TYPES] = {
+ {"icpu", "icpu", 100},
+ };
+
++struct graph_info *graphs;
+
+ /* Various notes:
+ * we store the values in the 'points' variable. They are stored in the
Modified: head/sysutils/xsysstats/files/patch-xsysstats.h
==============================================================================
--- head/sysutils/xsysstats/files/patch-xsysstats.h Tue Sep 22 11:54:33 2020 (r549577)
+++ head/sysutils/xsysstats/files/patch-xsysstats.h Tue Sep 22 11:56:27 2020 (r549578)
@@ -1,5 +1,5 @@
---- xsysstats.h.orig Tue May 30 08:46:20 2000
-+++ xsysstats.h Sat Nov 9 08:43:29 2002
+--- xsysstats.h.orig 2000-05-30 06:46:20 UTC
++++ xsysstats.h
@@ -15,12 +15,9 @@
#include <stdio.h>
#include <sys/param.h>
@@ -13,7 +13,19 @@
#include <netdb.h>
#include <rpcsvc/rstat.h>
-@@ -138,7 +135,7 @@
+@@ -115,8 +112,10 @@ struct graph_info {
+ short host_offset;
+ short window; /* What window to put this graph in */
+ int max_val; /* maximum value this graph ever reached */
+-} *graphs;
++};
+
++extern struct graph_info *graphs;
++
+ struct Xss_Window {
+ short x, y; /* Upper left corner of window */
+ short width,height; /* width and height of the window. height
+@@ -138,7 +137,7 @@ struct Host_Info {
char *name; /*Name of the host */
#ifdef USE_NEW_RSTAT
CLIENT *client; /* client connection for rstat */
More information about the svn-ports-head
mailing list