[csw-devel] SF.net SVN: gar:[2489] csw/mgar/pkg/sysstat/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Dec 9 15:19:37 CET 2008
Revision: 2489
http://gar.svn.sourceforge.net/gar/?rev=2489&view=rev
Author: dmichelsen
Date: 2008-12-09 14:19:37 +0000 (Tue, 09 Dec 2008)
Log Message:
-----------
sysstat: Update to 20081207 and latest mGAR v2 features
Modified Paths:
--------------
csw/mgar/pkg/sysstat/trunk/Makefile
csw/mgar/pkg/sysstat/trunk/checksums
csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.gspec
csw/mgar/pkg/sysstat/trunk/files/patch-onlyisaexec-sysstatd.diff
Removed Paths:
-------------
csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.depend
csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-i386
csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-sparc
csw/mgar/pkg/sysstat/trunk/files/patch-isaexec-compat.diff
csw/mgar/pkg/sysstat/trunk/files/patch-sysstat-shareman.diff
Modified: csw/mgar/pkg/sysstat/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sysstat/trunk/Makefile 2008-12-09 14:19:03 UTC (rev 2488)
+++ csw/mgar/pkg/sysstat/trunk/Makefile 2008-12-09 14:19:37 UTC (rev 2489)
@@ -1,5 +1,5 @@
GARNAME = sysstat
-GARVERSION = 20081125
+GARVERSION = 20081207
CATEGORIES = utils
DESCRIPTION = Key system statistics at a glance
@@ -18,8 +18,10 @@
MASTER_SITES = http://www.maier-komor.de/$(GARNAME)/
DISTFILES = $(GARNAME)-$(GARVERSION).tgz
-DISTFILES += $(call admfiles,CSWsysstat,prototype-sparc prototype-i386 depend)
+DISTFILES += $(call admfiles,CSWsysstat)
+REQUIRED_PKGS = CSWncurses
+
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
@@ -53,6 +55,8 @@
# only done via sysstatd which uses isaexec.
ISAEXEC_FILES = $(sbindir)/sysstatd
+PROTOTYPE_FILTER = awk '$$$$3 ~ /\/sysstatd$$$$/ { $$$$4 = "4755" } { print }'
+
include gar/category.mk
# We don't have a autoconf-style configure. The configure script
Modified: csw/mgar/pkg/sysstat/trunk/checksums
===================================================================
--- csw/mgar/pkg/sysstat/trunk/checksums 2008-12-09 14:19:03 UTC (rev 2488)
+++ csw/mgar/pkg/sysstat/trunk/checksums 2008-12-09 14:19:37 UTC (rev 2489)
@@ -1,6 +1,6 @@
-c634dc06c3c9211b1f63e0beeba7de64 download/sysstat-20081125.tgz
-465eb128e17cb36e0e904fa759972283 download/CSWsysstat.gspec
+7d5d5489a19119121b4bd53b85a91886 download/sysstat-20081207.tgz
+c2be614c9715a73b469173e9888f1826 download/CSWsysstat.gspec
e51f94d090618f19b854104291b10645 download/CSWsysstat.prototype-sparc
8c1dbc2e5fc16f16dbdfbe47b81e76f0 download/CSWsysstat.prototype-i386
2ba417371d006cee9ad62bf67252b05b download/CSWsysstat.depend
-6c8b6d3c4a5b15157f02216b4ad2b459 download/patch-onlyisaexec-sysstatd.diff
+7a7f0f67bb68484b56375d4a922fb63f download/patch-onlyisaexec-sysstatd.diff
Deleted: csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.depend
===================================================================
--- csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.depend 2008-12-09 14:19:03 UTC (rev 2488)
+++ csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.depend 2008-12-09 14:19:37 UTC (rev 2489)
@@ -1,2 +0,0 @@
-P CSWisaexec isaexec - sneaky wrapper around Sun isaexec
-P CSWncurses ncurses - ncurses library and utilities
Modified: csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.gspec
===================================================================
--- csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.gspec 2008-12-09 14:19:03 UTC (rev 2488)
+++ csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.gspec 2008-12-09 14:19:37 UTC (rev 2489)
@@ -1,4 +1,4 @@
%var bitname sysstat
%var pkgname CSWsysstat
%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/COPYING
+%copyright url file://%{WORKSRC_FIRSTMOD}/COPYING
Deleted: csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-i386
===================================================================
--- csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-i386 2008-12-09 14:19:03 UTC (rev 2488)
+++ csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-i386 2008-12-09 14:19:37 UTC (rev 2489)
@@ -1,12 +0,0 @@
-d none /opt/csw/bin 0755 root bin
-f none /opt/csw/bin/sysstat 0755 root bin
-d none /opt/csw/sbin 0755 root bin
-d none /opt/csw/sbin/amd64 0755 root bin
-f none /opt/csw/sbin/amd64/sysstatd 4755 root bin
-d none /opt/csw/sbin/i386 0755 root bin
-f none /opt/csw/sbin/i386/sysstatd=/opt/csw/sbin/sysstatd 4755 root bin
-l none /opt/csw/sbin/sysstatd=/opt/csw/bin/isaexec 0755 root bin
-d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/man 0755 root bin
-d none /opt/csw/share/man/man1 0755 root bin
-f none /opt/csw/share/man/man1/sysstat.1m 0755 root bin
Deleted: csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-sparc
===================================================================
--- csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-sparc 2008-12-09 14:19:03 UTC (rev 2488)
+++ csw/mgar/pkg/sysstat/trunk/files/CSWsysstat.prototype-sparc 2008-12-09 14:19:37 UTC (rev 2489)
@@ -1,12 +0,0 @@
-d none /opt/csw/bin 0755 root bin
-f none /opt/csw/bin/sysstat 0755 root bin
-d none /opt/csw/sbin 0755 root bin
-d none /opt/csw/sbin/sparcv9 0755 root bin
-f none /opt/csw/sbin/sparcv9/sysstatd 4755 root bin
-d none /opt/csw/sbin/sparcv8 0755 root bin
-f none /opt/csw/sbin/sparcv8/sysstatd=/opt/csw/sbin/sysstatd 4755 root bin
-l none /opt/csw/sbin/sysstatd=/opt/csw/bin/isaexec 0755 root bin
-d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/man 0755 root bin
-d none /opt/csw/share/man/man1 0755 root bin
-f none /opt/csw/share/man/man1/sysstat.1m 0755 root bin
Deleted: csw/mgar/pkg/sysstat/trunk/files/patch-isaexec-compat.diff
===================================================================
--- csw/mgar/pkg/sysstat/trunk/files/patch-isaexec-compat.diff 2008-12-09 14:19:03 UTC (rev 2488)
+++ csw/mgar/pkg/sysstat/trunk/files/patch-isaexec-compat.diff 2008-12-09 14:19:37 UTC (rev 2489)
@@ -1,24 +0,0 @@
-diff --speed-large-files --minimal -Nru sysstat-20080501.orig/client.c sysstat-20080501/client.c
---- sysstat-20080501.orig/client.c 2008-05-02 19:40:43.000000000 +0200
-+++ sysstat-20080501/client.c 2008-05-13 11:36:24.298053000 +0200
-@@ -71,7 +71,7 @@
- dbug("Execname %s\n",Execname);
- strcpy(bin,dirname(Execname));
- dbug("Execdir %s\n",bin);
-- strcat(bin,"/../sbin/sysstatd");
-+ strcat(bin,"/../../sbin/sysstatd");
- if (access(bin,X_OK) != 0) {
- error("cannot find sysstatd at %s",bin);
- return -1;
-diff --speed-large-files --minimal -Nru sysstat-20080501.orig/sysstat.c sysstat-20080501/sysstat.c
---- sysstat-20080501.orig/sysstat.c 2008-05-02 19:40:43.000000000 +0200
-+++ sysstat-20080501/sysstat.c 2008-05-13 11:36:40.025857000 +0200
-@@ -490,7 +490,7 @@
- char *args[16];
- int num = 0;
- strcpy(bin,dirname(Execname));
-- strcat(bin,"/../sbin/sysstatd");
-+ strcat(bin,"/../../sbin/sysstatd");
- args[num++] = bin;
- args[num++] = "-v";
- if (port) {
Modified: csw/mgar/pkg/sysstat/trunk/files/patch-onlyisaexec-sysstatd.diff
===================================================================
--- csw/mgar/pkg/sysstat/trunk/files/patch-onlyisaexec-sysstatd.diff 2008-12-09 14:19:03 UTC (rev 2488)
+++ csw/mgar/pkg/sysstat/trunk/files/patch-onlyisaexec-sysstatd.diff 2008-12-09 14:19:37 UTC (rev 2489)
@@ -1,7 +1,7 @@
-diff --speed-large-files --minimal -Nru sysstat-20080704.orig/client.c sysstat-20080704/client.c
---- sysstat-20080704.orig/client.c 2008-07-06 23:55:52.000000000 +0200
-+++ sysstat-20080704/client.c 2008-07-07 14:31:22.791155000 +0200
-@@ -71,7 +71,7 @@
+diff -Naur sysstat-20081207.orig/client.c sysstat-20081207.patched/client.c
+--- sysstat-20081207.orig/client.c 2008-12-07 23:24:38.000000000 +0100
++++ sysstat-20081207.patched/client.c 2008-12-09 14:37:26.459180110 +0100
+@@ -81,7 +81,7 @@
dbug("Execname %s\n",Execname);
strcpy(bin,dirname(Execname));
dbug("Execdir %s\n",bin);
@@ -10,24 +10,24 @@
if (access(bin,X_OK) != 0) {
error("cannot find sysstatd at %s",bin);
return -1;
-diff --speed-large-files --minimal -Nru sysstat-20080704.orig/sysstat.c sysstat-20080704/sysstat.c
---- sysstat-20080704.orig/sysstat.c 2008-07-06 23:55:52.000000000 +0200
-+++ sysstat-20080704/sysstat.c 2008-07-07 14:31:37.539418000 +0200
-@@ -485,7 +485,7 @@
+diff -Naur sysstat-20081207.orig/sysstat.c sysstat-20081207.patched/sysstat.c
+--- sysstat-20081207.orig/sysstat.c 2008-12-07 23:24:38.000000000 +0100
++++ sysstat-20081207.patched/sysstat.c 2008-12-09 14:37:51.199133788 +0100
+@@ -506,7 +506,7 @@
char cmd[PATH_MAX];
int ret = 0;
strcpy(cmd,dirname(Execname));
- strcat(cmd,"/../../sbin/sysstatd -k");
+ strcat(cmd,"/../sbin/sysstatd -k");
- if (verbose)
- strcat(cmd," -v");
ret = system(cmd);
-@@ -517,7 +517,7 @@
+ if (ret == -1) {
+ error("could not execute '%s': %s\n",cmd,strerror(errno));
+@@ -554,7 +554,7 @@
char *args[16];
int num = 0;
strcpy(bin,dirname(Execname));
- strcat(bin,"/../../sbin/sysstatd");
+ strcat(bin,"/../sbin/sysstatd");
args[num++] = bin;
- args[num++] = "-v";
- if (port) {
+ if (verbose)
+ args[num++] = "-v";
Deleted: csw/mgar/pkg/sysstat/trunk/files/patch-sysstat-shareman.diff
===================================================================
--- csw/mgar/pkg/sysstat/trunk/files/patch-sysstat-shareman.diff 2008-12-09 14:19:03 UTC (rev 2488)
+++ csw/mgar/pkg/sysstat/trunk/files/patch-sysstat-shareman.diff 2008-12-09 14:19:37 UTC (rev 2489)
@@ -1,18 +0,0 @@
-diff --speed-large-files --minimal -Nru sysstat-20080501.orig/Makefile sysstat-20080501/Makefile
---- sysstat-20080501.orig/Makefile 2008-05-02 19:40:43.000000000 +0200
-+++ sysstat-20080501/Makefile 2008-05-13 06:12:48.272325000 +0200
-@@ -68,10 +68,10 @@
- -$(MKDIR) $(PREFIX)/bin
- $(CP) $(CDIR)/sysstat $(PREFIX)/bin
- -$(CHOWN) root:bin $(PREFIX)/bin/sysstat
-- -$(MKDIR) $(PREFIX)/man/man1m
-- $(CP) sysstat.1m $(PREFIX)/man/man1m
-- -$(CHOWN) root:bin $(PREFIX)/man/man1m/sysstat.1m
-- -$(CHMOD) 0644 $(PREFIX)/man/man1m/sysstat.1m
-+ -$(MKDIR) $(PREFIX)/share/man/man1m
-+ $(CP) sysstat.1m $(PREFIX)/share/man/man1m
-+ -$(CHOWN) root:bin $(PREFIX)/share/man/man1m/sysstat.1m
-+ -$(CHMOD) 0644 $(PREFIX)/share/man/man1m/sysstat.1m
-
- install_sysstatd: $(DDIR)/sysstatd
- -$(MKDIR) $(PREFIX)/sbin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list