add NetBSD/arm (am335x) support, bump pkgrevision

3 files changed, 41 insertions, 16 deletions

diff --git a/sysutils/estd/Makefile b/sysutils/estd/Makefile
index e7b5ae9af91..c11b187a396 100644
--- a/sysutils/estd/Makefile
+++ b/sysutils/estd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2012/12/12 10:44:11 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2014/10/01 01:17:33 jmcneill Exp $
 
 DISTNAME=	estd-r7
 PKGNAME=	estd-0.7
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.ecademix.com/JohannesHofmann/
 
@@ -15,7 +16,8 @@ INSTALLATION_DIRS=	share/examples/rc.d
 ONLY_FOR_PLATFORM=	NetBSD-2.99.*-i386 NetBSD-[3-9]*-i386 \
 			NetBSD-[4-9]*-x86_64 DragonFly-*-i386 \
 			NetBSD-5.99.*-powerpc \
-			NetBSD-5.99.*-mips64el
+			NetBSD-5.99.*-mips64el \
+			NetBSD-[7-9]*-earm* NetBSD-[7-9]*-arm*
 
 RCD_SCRIPTS=		estd
 RCD_SCRIPT_SRC.estd=	${WRKSRC}/estd.sh
diff --git a/sysutils/estd/distinfo b/sysutils/estd/distinfo
index 503d1a9492f..04892c06bb2 100644
--- a/sysutils/estd/distinfo
+++ b/sysutils/estd/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2011/12/14 21:44:32 macallan Exp $
+$NetBSD: distinfo,v 1.15 2014/10/01 01:17:33 jmcneill 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) = f0df22cee99f5750875cbbd2e050cc0302ac0348
+SHA1 (patch-ab) = 1fc49206f6a9add634bb7ab1d363d9318530e1e9
diff --git a/sysutils/estd/patches/patch-ab b/sysutils/estd/patches/patch-ab
index 8299ef1f386..9f5914e8cac 100644
--- a/sysutils/estd/patches/patch-ab
+++ b/sysutils/estd/patches/patch-ab
@@ -1,52 +1,72 @@
-$NetBSD: patch-ab,v 1.8 2011/12/14 21:44:32 macallan Exp $
+$NetBSD: patch-ab,v 1.9 2014/10/01 01:17:33 jmcneill Exp $
 
 --- estd.c.orig	2009-10-20 16:18:28.000000000 +0000
-+++ estd.c
-@@ -55,7 +55,9 @@
++++ estd.c	2014-09-30 11:10:54.000000000 +0000
+@@ -55,7 +55,10 @@
  #define TECH_EST 1
  #define TECH_POWERNOW 2
  #define TECH_ACPI 3
 -#define TECH_MAX 3
 +#define TECH_INTREPID 4
 +#define TECH_LOONGSON 5
-+#define TECH_MAX 5
++#define TECH_GENERIC 6
++#define TECH_MAX 6
  
  /* this is ugly, but... <shrug> */
  #define MAX_FREQS 32
-@@ -116,20 +118,26 @@ int             ndomains;
+@@ -116,26 +119,35 @@ int             ndomains;
   static size_t cp_time_size = sizeof(cp_time[0]) * CPUSTATES;
  #endif
  
 -static char	*techdesc[4] = {"Unknown",
-+static char	*techdesc[6] = {"Unknown",
++static char	*techdesc[7] = {"Unknown",
  				"Enhanced SpeedStep",
  				"PowerNow",
 -				"ACPI P-States"
 +				"ACPI P-States",
 +				"Intrepid",
-+				"Loongson"
++				"Loongson",
++				"Generic"
  				};
 -static char	*freqctl[4] = {	"",	
-+static char	*freqctl[6] = {	"",	
++static char	*freqctl[7] = {	"",	
  				"machdep.est.frequency.available",
  				"machdep.powernow.frequency.available",
 -				"hw.acpi.cpu.px_dom0.available"
 +				"hw.acpi.cpu.px_dom0.available",
 +				"machdep.intrepid.frequency.available",
-+				"machdep.loongson.frequency.available"
++				"machdep.loongson.frequency.available",
++				"machdep.frequency.available"
  				};
 -static char	*setctl[4] = {	"",
-+static char	*setctl[6] = {	"",
++static char	*setctl[7] = {	"",
  				"machdep.est.frequency.target",
  				"machdep.powernow.frequency.target",
 -				"hw.acpi.cpu.px_dom0.select"
 +				"hw.acpi.cpu.px_dom0.select",
 +				"machdep.intrepid.frequency.target",
-+				"machdep.loongson.frequency.target"
++				"machdep.loongson.frequency.target",
++				"machdep.frequency.current"
  				};
  
  void
-@@ -400,6 +408,13 @@ main(int argc, char *argv[])
+ 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] [-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 +379,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)
+ 		switch (ch) {
+ 		case 'v':
+ 			version();
+@@ -400,6 +412,16 @@ main(int argc, char *argv[])
  			break;
  		case 'P':
  			tech = TECH_POWERNOW;
@@ -57,6 +77,9 @@ $NetBSD: patch-ab,v 1.8 2011/12/14 21:44:32 macallan Exp $
 +                case 'L':
 +                        tech = TECH_LOONGSON;
 +                        break;
++		case 'G':
++			tech = TECH_GENERIC;
++			break;
  		case 'a':
  			strategy = AGGRESSIVE;
  			break;