add Loongson support, allow build on mips64el

3 files changed, 24 insertions, 16 deletions

diff --git a/sysutils/estd/Makefile b/sysutils/estd/Makefile
index 16a4a8e3132..df909cb719c 100644
--- a/sysutils/estd/Makefile
+++ b/sysutils/estd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2011/03/16 05:09:16 macallan Exp $
+# $NetBSD: Makefile,v 1.19 2011/12/14 21:44:32 macallan Exp $
 
 DISTNAME=	estd-r7
 PKGNAME=	estd-0.7
@@ -16,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.*-powerpc \
+			NetBSD-5.99.*-mips64el
 
 RCD_SCRIPTS=		estd
 RCD_SCRIPT_SRC.estd=	${WRKSRC}/estd.sh
diff --git a/sysutils/estd/distinfo b/sysutils/estd/distinfo
index 01ebea83466..503d1a9492f 100644
--- a/sysutils/estd/distinfo
+++ b/sysutils/estd/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2011/03/16 05:09:16 macallan Exp $
+$NetBSD: distinfo,v 1.14 2011/12/14 21:44:32 macallan 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) = 9e7923a7604e4081822cb7b7a1fb6df5468e45cb
+SHA1 (patch-ab) = f0df22cee99f5750875cbbd2e050cc0302ac0348
diff --git a/sysutils/estd/patches/patch-ab b/sysutils/estd/patches/patch-ab
index 0e49a1af856..8299ef1f386 100644
--- a/sysutils/estd/patches/patch-ab
+++ b/sysutils/estd/patches/patch-ab
@@ -1,48 +1,52 @@
-$NetBSD: patch-ab,v 1.7 2011/03/16 05:09:16 macallan Exp $
+$NetBSD: patch-ab,v 1.8 2011/12/14 21:44:32 macallan Exp $
 
---- estd.c.orig	2011-03-16 04:50:26.000000000 +0000
+--- estd.c.orig	2009-10-20 16:18:28.000000000 +0000
 +++ estd.c
-@@ -55,7 +55,8 @@
+@@ -55,7 +55,9 @@
  #define TECH_EST 1
  #define TECH_POWERNOW 2
  #define TECH_ACPI 3
 -#define TECH_MAX 3
 +#define TECH_INTREPID 4
-+#define TECH_MAX 4
++#define TECH_LOONGSON 5
++#define TECH_MAX 5
  
  /* this is ugly, but... <shrug> */
  #define MAX_FREQS 32
-@@ -116,20 +117,23 @@ int             ndomains;
+@@ -116,20 +118,26 @@ int             ndomains;
   static size_t cp_time_size = sizeof(cp_time[0]) * CPUSTATES;
  #endif
  
 -static char	*techdesc[4] = {"Unknown",
-+static char	*techdesc[5] = {"Unknown",
++static char	*techdesc[6] = {"Unknown",
  				"Enhanced SpeedStep",
  				"PowerNow",
 -				"ACPI P-States"
 +				"ACPI P-States",
-+				"Intrepid"
++				"Intrepid",
++				"Loongson"
  				};
 -static char	*freqctl[4] = {	"",	
-+static char	*freqctl[5] = {	"",	
++static char	*freqctl[6] = {	"",	
  				"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.intrepid.frequency.available",
++				"machdep.loongson.frequency.available"
  				};
 -static char	*setctl[4] = {	"",
-+static char	*setctl[5] = {	"",
++static char	*setctl[6] = {	"",
  				"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.intrepid.frequency.target",
++				"machdep.loongson.frequency.target"
  				};
  
  void
-@@ -400,6 +404,10 @@ main(int argc, char *argv[])
+@@ -400,6 +408,13 @@ main(int argc, char *argv[])
  			break;
  		case 'P':
  			tech = TECH_POWERNOW;
@@ -50,6 +54,9 @@ $NetBSD: patch-ab,v 1.7 2011/03/16 05:09:16 macallan Exp $
 +		case 'I':
 +			tech = TECH_INTREPID;
 +			break;
++                case 'L':
++                        tech = TECH_LOONGSON;
++                        break;
  		case 'a':
  			strategy = AGGRESSIVE;
  			break;