Update to 0.9, from Leonardo Taccari in PR 49624:

Changes:
estd-r9
* Improve SMP support on NetBSD.
  Submitted by: vincent@labri.fr

estd-r8
* Add Intrepid support.
  Submitted by: Michael <macallan@netbsd.org>

4 files changed, 48 insertions, 48 deletions

diff --git a/sysutils/estd/Makefile b/sysutils/estd/Makefile
index 3fc5d73bfb9..a2c97ec8ec3 100644
--- a/sysutils/estd/Makefile
+++ b/sysutils/estd/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2015/01/04 18:42:49 jmcneill Exp $
+# $NetBSD: Makefile,v 1.24 2015/02/01 18:59:05 wiz Exp $
 
-DISTNAME=	estd-r7
-PKGNAME=	estd-0.7
-PKGREVISION=	2
+DISTNAME=	estd-r9
+PKGNAME=	estd-0.9
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.ecademix.com/JohannesHofmann/
 
diff --git a/sysutils/estd/distinfo b/sysutils/estd/distinfo
index e24d7d284dd..b7132dbdab4 100644
--- a/sysutils/estd/distinfo
+++ b/sysutils/estd/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2015/01/04 18:42:49 jmcneill Exp $
+$NetBSD: distinfo,v 1.17 2015/02/01 18:59:05 wiz Exp $
 
-SHA1 (estd-r7.tar.gz) = 41186b82fe2a71a4436e01805522b60d100f84d4
-RMD160 (estd-r7.tar.gz) = c91dad3c74ef099d54e546ac0cdf7a4a29c4a4f3
-Size (estd-r7.tar.gz) = 8712 bytes
-SHA1 (patch-aa) = 539b1bdcfab5815edec76277ee1be9fa9c762323
-SHA1 (patch-ab) = 5dce228d8b2bb52db8dee45f48e0d4702d4358ed
+SHA1 (estd-r9.tar.gz) = ce5540cc62f5da6f9e29bffccab27c6dd96b4ec2
+RMD160 (estd-r9.tar.gz) = 37ab01c6ad20ad43816305b4b7a0e26ccee89271
+Size (estd-r9.tar.gz) = 8947 bytes
+SHA1 (patch-aa) = b11bdf62b5a1e5d70198f86ad322796ea44c0f10
+SHA1 (patch-ab) = ec4ad031c1d8e53e35e961d89b785dc5a2e3bc34
diff --git a/sysutils/estd/patches/patch-aa b/sysutils/estd/patches/patch-aa
index cfc2523b205..98d13aa3909 100644
--- a/sysutils/estd/patches/patch-aa
+++ b/sysutils/estd/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.7 2011/03/16 05:09:16 macallan Exp $
+$NetBSD: patch-aa,v 1.8 2015/02/01 18:59:05 wiz Exp $
 
---- Makefile.orig	2007-12-15 15:51:02.000000000 +0000
+--- Makefile.orig	2013-03-24 19:14:06.000000000 +0000
 +++ Makefile
 @@ -19,7 +19,8 @@ estd:	estd.c
  all: estd
diff --git a/sysutils/estd/patches/patch-ab b/sysutils/estd/patches/patch-ab
index 73fc296eee1..852cc5c131b 100644
--- a/sysutils/estd/patches/patch-ab
+++ b/sysutils/estd/patches/patch-ab
@@ -1,53 +1,52 @@
-$NetBSD: patch-ab,v 1.10 2015/01/04 18:42:50 jmcneill Exp $
+$NetBSD: patch-ab,v 1.11 2015/02/01 18:59:05 wiz Exp $
 
---- estd.c.orig	2009-10-20 16:18:28.000000000 +0000
+--- estd.c.orig	2013-03-24 19:14:06.000000000 +0000
 +++ estd.c
-@@ -55,7 +55,11 @@
- #define TECH_EST 1
+@@ -56,8 +56,11 @@
  #define TECH_POWERNOW 2
  #define TECH_ACPI 3
--#define TECH_MAX 3
-+#define TECH_INTREPID 4
+ #define TECH_INTREPID 4
+-#define TECH_MAX 4
+-
 +#define TECH_LOONGSON 5
 +#define TECH_ROCKCHIP 6
 +#define TECH_GENERIC 7
 +#define TECH_MAX 7
- 
++ 
  /* this is ugly, but... <shrug> */
  #define MAX_FREQS 32
-@@ -116,26 +120,38 @@ int             ndomains;
-  static size_t cp_time_size = sizeof(cp_time[0]) * CPUSTATES;
+ #define SYSCTLBUF 255
+@@ -118,29 +121,38 @@ int             ndomains;
+  static const size_t cp_time_max_size = sizeof(cp_time[0]) * MAX_CPUS;
  #endif
  
--static char	*techdesc[4] = {"Unknown",
+-static char	*techdesc[5] = {"Unknown",
 +static char	*techdesc[8] = {"Unknown",
  				"Enhanced SpeedStep",
  				"PowerNow",
--				"ACPI P-States"
-+				"ACPI P-States",
+ 				"ACPI P-States",
+-				"Intrepid"
 +				"Intrepid",
 +				"Loongson",
 +				"Rockchip",
 +				"Generic"
  				};
--static char	*freqctl[4] = {	"",	
+-static char	*freqctl[5] = {	"",	
 +static char	*freqctl[8] = {	"",	
  				"machdep.est.frequency.available",
  				"machdep.powernow.frequency.available",
--				"hw.acpi.cpu.px_dom0.available"
-+				"hw.acpi.cpu.px_dom0.available",
-+				"machdep.intrepid.frequency.available",
+ 				"hw.acpi.cpu.px_dom0.available",
+ 				"machdep.intrepid.frequency.available"
 +				"machdep.loongson.frequency.available",
 +				"machdep.cpu.frequency.available",
 +				"machdep.frequency.available"
  				};
--static char	*setctl[4] = {	"",
+-static char	*setctl[5] = {	"",
 +static char	*setctl[8] = {	"",
  				"machdep.est.frequency.target",
  				"machdep.powernow.frequency.target",
--				"hw.acpi.cpu.px_dom0.select"
-+				"hw.acpi.cpu.px_dom0.select",
-+				"machdep.intrepid.frequency.target",
+ 				"hw.acpi.cpu.px_dom0.select",
+ 				"machdep.intrepid.frequency.target"
 +				"machdep.loongson.frequency.target",
 +				"machdep.cpu.frequency.target",
 +				"machdep.frequency.current"
@@ -56,41 +55,43 @@ $NetBSD: patch-ab,v 1.10 2015/01/04 18:42:50 jmcneill Exp $
  void
  usage()
  {
--	printf("usage: estd [-d] [-o] [-n] [-A] [-C] [-E] [-P] [-a] [-s] [-b] [-p poll interval in us] [-g grace period] [-l low watermark percentage] [-h high watermark percentage] [-m minimum MHz] [-M maximum MHz]\n");
-+	printf("usage: estd [-d] [-o] [-n] [-A] [-C] [-E] [-P] [-I] [-L] [-R] [-G] [-a] [-s] [-b] [-p poll interval in us] [-g grace period] [-l low watermark percentage] [-h high watermark percentage] [-m minimum MHz] [-M maximum MHz]\n");
+-	printf("usage: estd [-d] [-o] [-n] [-A] [-C] [-E] [-I] [-P] [-a] [-s] [-b] [-p poll interval in us] [-g grace period] [-l low watermark percentage] [-h high watermark percentage] [-m minimum MHz] [-M maximum MHz]\n");
++	printf("usage: estd [-d] [-o] [-n] [-A] [-C] [-E] [-I] [-L] [-R] [-P] [-G] [-a] [-s] [-b] [-p poll interval in us] [-g grace period] [-l low watermark percentage] [-h high watermark percentage] [-m minimum MHz] [-M maximum MHz]\n");
  	printf("       estd -v\n");
  	printf("       estd -f\n");
  	exit(1);
-@@ -367,7 +383,7 @@ main(int argc, char *argv[])
+@@ -395,7 +407,7 @@ main(int argc, char *argv[])
  	FILE           *fexists;
  
  	/* get command-line options */
--	while ((ch = getopt(argc, argv, "vfdonACEPasbp:h:l:g:m:M:")) != -1)
-+	while ((ch = getopt(argc, argv, "vfdonACEPILGasbp:h:l:g:m:M:")) != -1)
+-	while ((ch = getopt(argc, argv, "vfdonACEIPasbp:h:l:g:m:M:")) != -1)
++	while ((ch = getopt(argc, argv, "vfdonACEGILPasbp:h:l:g:m:M:")) != -1)
  		switch (ch) {
  		case 'v':
  			version();
-@@ -400,6 +416,19 @@ main(int argc, char *argv[])
+@@ -426,12 +438,21 @@ main(int argc, char *argv[])
+ 		case 'E':
+ 			tech = TECH_EST;
  			break;
- 		case 'P':
- 			tech = TECH_POWERNOW;
-+			break;
-+		case 'I':
-+			tech = TECH_INTREPID;
++		case 'G':
++			tech = TECH_GENERIC;
 +			break;
+ 		case 'I':
+ 			tech = TECH_INTREPID;
+ 			break;
 +                case 'L':
 +                        tech = TECH_LOONGSON;
 +                        break;
+ 		case 'P':
+ 			tech = TECH_POWERNOW;
+ 			break;
 +		case 'R':
 +			tech = TECH_ROCKCHIP;
 +			break;
-+		case 'G':
-+			tech = TECH_GENERIC;
-+			break;
  		case 'a':
  			strategy = AGGRESSIVE;
  			break;
-@@ -434,8 +463,9 @@ main(int argc, char *argv[])
+@@ -466,8 +487,9 @@ main(int argc, char *argv[])
  
  	ndomains = 1;
  	domain = ecalloc(ndomains, sizeof(struct domain));
@@ -102,7 +103,7 @@ $NetBSD: patch-ab,v 1.10 2015/01/04 18:42:50 jmcneill Exp $
  	if (kinfo_get_cpus(&ncpus)) {
  		fprintf(stderr, "estd: Cannot get number of cpus\n");
  		exit(1);
-@@ -443,11 +473,18 @@ main(int argc, char *argv[])
+@@ -475,11 +497,18 @@ main(int argc, char *argv[])
  	cp_time = ecalloc(ncpus, sizeof(struct kinfo_cputime));
  	cp_old  = ecalloc(ncpus, sizeof(struct kinfo_cputime));
  	cp_time_len = ncpus * sizeof(struct kinfo_cputime);