From owner-svn-ports-all@freebsd.org Tue Sep 22 11:56:28 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B30AB3E5EA4; Tue, 22 Sep 2020 11:56:28 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bwfsm4KSRz3dC8; Tue, 22 Sep 2020 11:56:28 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 77C2F1ECB4; Tue, 22 Sep 2020 11:56:28 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08MBuSM3059734; Tue, 22 Sep 2020 11:56:28 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08MBuRj3059728; Tue, 22 Sep 2020 11:56:27 GMT (envelope-from se@FreeBSD.org) Message-Id: <202009221156.08MBuRj3059728@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org using -f From: =?UTF-8?Q?Stefan_E=c3=9fer?= Date: Tue, 22 Sep 2020 11:56:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549578 - in head/sysutils/xsysstats: . files X-SVN-Group: ports-head X-SVN-Commit-Author: se X-SVN-Commit-Paths: in head/sysutils/xsysstats: . files X-SVN-Commit-Revision: 549578 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Sep 2020 11:56:28 -0000 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@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@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 ++ ++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 #include @@ -13,7 +13,19 @@ #include #include -@@ -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 */