pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/acpica-utils Fix ~6 month breakage: update as...
details: https://anonhg.NetBSD.org/pkgsrc/rev/84fc6368c1d9
branches: trunk
changeset: 393241:84fc6368c1d9
user: rumble <rumble%pkgsrc.org@localhost>
date: Mon May 18 18:18:03 2009 +0000
description:
Fix ~6 month breakage: update aslcompiler.y to work with new versions of
bison.
Should close pkg/39970.
diffstat:
sysutils/acpica-utils/Makefile | 3 +-
sysutils/acpica-utils/distinfo | 3 +-
sysutils/acpica-utils/patches/patch-aa | 1114 ++++++++++++++++++++++++++++++++
3 files changed, 1118 insertions(+), 2 deletions(-)
diffs (truncated from 1143 to 300 lines):
diff -r 63f7a32c56f0 -r 84fc6368c1d9 sysutils/acpica-utils/Makefile
--- a/sysutils/acpica-utils/Makefile Mon May 18 18:18:02 2009 +0000
+++ b/sysutils/acpica-utils/Makefile Mon May 18 18:18:03 2009 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/08/07 00:12:06 obache Exp $
+# $NetBSD: Makefile,v 1.3 2009/05/18 18:18:03 rumble Exp $
#
DISTNAME= acpica-unix-${ACPICA_UTILS_VERSION}
PKGNAME= acpica-utils-${ACPICA_UTILS_VERSION}
+PKGREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://www.acpica.org/download/
diff -r 63f7a32c56f0 -r 84fc6368c1d9 sysutils/acpica-utils/distinfo
--- a/sysutils/acpica-utils/distinfo Mon May 18 18:18:02 2009 +0000
+++ b/sysutils/acpica-utils/distinfo Mon May 18 18:18:03 2009 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2008/08/07 00:12:06 obache Exp $
+$NetBSD: distinfo,v 1.3 2009/05/18 18:18:03 rumble Exp $
SHA1 (acpica-unix-20080729.tar.gz) = 34a17148c259c8c798b19f679966ba66d847916a
RMD160 (acpica-unix-20080729.tar.gz) = 3f85ebf2a10de750e2d755355bc8a7a45d995d28
Size (acpica-unix-20080729.tar.gz) = 897283 bytes
+SHA1 (patch-aa) = 621b81265d71df42fe7fc1c0f7f437c691ef340d
diff -r 63f7a32c56f0 -r 84fc6368c1d9 sysutils/acpica-utils/patches/patch-aa
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/acpica-utils/patches/patch-aa Mon May 18 18:18:03 2009 +0000
@@ -0,0 +1,1114 @@
+--- compiler/aslcompiler.y.orig 2008-07-29 10:26:13.000000000 -0700
++++ compiler/aslcompiler.y 2009-04-22 12:39:19.000000000 -0700
+@@ -3,7 +3,6 @@
+ /******************************************************************************
+ *
+ * Module Name: aslcompiler.y - Bison input file (ASL grammar and actions)
+- * $Revision: 1.1 $
+ *
+ *****************************************************************************/
+
+@@ -11,7 +10,7 @@
+ *
+ * 1. Copyright Notice
+ *
+- * Some or all of this work - Copyright (c) 1999 - 2008, Intel Corp.
++ * Some or all of this work - Copyright (c) 1999 - 2009, Intel Corp.
+ * All rights reserved.
+ *
+ * 2. License
+@@ -188,10 +188,10 @@
+ /*! [Begin] no source code translation */
+
+ /*
+- * These shift/reduce conflicts are expected. There should be zer0
++ * These shift/reduce conflicts are expected. There should be zero
+ * reduce/reduce conflicts.
+ */
+-%expect 64
++%expect 60
+
+
+ /*
+@@ -794,7 +794,7 @@
+ ;
+
+ DefinitionBlockTerm
+- : PARSEOP_DEFINITIONBLOCK '(' {$$ = TrCreateLeafNode (PARSEOP_DEFINITIONBLOCK);}
++ : PARSEOP_DEFINITIONBLOCK '(' {$<n>$ = TrCreateLeafNode (PARSEOP_DEFINITIONBLOCK);}
+ String ','
+ String ','
+ ByteConst ','
+@@ -1111,7 +1111,7 @@
+ ;
+
+ IncludeTerm
+- : PARSEOP_INCLUDE '(' {$$ = TrCreateLeafNode (PARSEOP_INCLUDE);}
++ : PARSEOP_INCLUDE '(' {$<n>$ = TrCreateLeafNode (PARSEOP_INCLUDE);}
+ String ')' {TrLinkChildren ($<n>3,1,$4);FlOpenIncludeFile ($4);}
+ TermList
+ IncludeEndTerm {$$ = TrLinkPeerNodes (3,$<n>3,$7,$8);}
+@@ -1147,7 +1147,7 @@
+
+
+ BankFieldTerm
+- : PARSEOP_BANKFIELD '(' {$$ = TrCreateLeafNode (PARSEOP_BANKFIELD);}
++ : PARSEOP_BANKFIELD '(' {$<n>$ = TrCreateLeafNode (PARSEOP_BANKFIELD);}
+ NameString
+ NameStringItem
+ TermArgItem
+@@ -1198,7 +1198,7 @@
+ ;
+
+ CreateBitFieldTerm
+- : PARSEOP_CREATEBITFIELD '(' {$$ = TrCreateLeafNode (PARSEOP_CREATEBITFIELD);}
++ : PARSEOP_CREATEBITFIELD '(' {$<n>$ = TrCreateLeafNode (PARSEOP_CREATEBITFIELD);}
+ TermArg
+ TermArgItem
+ NameStringItem
+@@ -1208,7 +1208,7 @@
+ ;
+
+ CreateByteFieldTerm
+- : PARSEOP_CREATEBYTEFIELD '(' {$$ = TrCreateLeafNode (PARSEOP_CREATEBYTEFIELD);}
++ : PARSEOP_CREATEBYTEFIELD '(' {$<n>$ = TrCreateLeafNode (PARSEOP_CREATEBYTEFIELD);}
+ TermArg
+ TermArgItem
+ NameStringItem
+@@ -1218,7 +1218,7 @@
+ ;
+
+ CreateDWordFieldTerm
+- : PARSEOP_CREATEDWORDFIELD '(' {$$ = TrCreateLeafNode (PARSEOP_CREATEDWORDFIELD);}
++ : PARSEOP_CREATEDWORDFIELD '(' {$<n>$ = TrCreateLeafNode (PARSEOP_CREATEDWORDFIELD);}
+ TermArg
+ TermArgItem
+ NameStringItem
+@@ -1228,7 +1228,7 @@
+ ;
+
+ CreateFieldTerm
+- : PARSEOP_CREATEFIELD '(' {$$ = TrCreateLeafNode (PARSEOP_CREATEFIELD);}
++ : PARSEOP_CREATEFIELD '(' {$<n>$ = TrCreateLeafNode (PARSEOP_CREATEFIELD);}
+ TermArg
+ TermArgItem
+ TermArgItem
+@@ -1239,7 +1239,7 @@
+ ;
+
+ CreateQWordFieldTerm
+- : PARSEOP_CREATEQWORDFIELD '(' {$$ = TrCreateLeafNode (PARSEOP_CREATEQWORDFIELD);}
++ : PARSEOP_CREATEQWORDFIELD '(' {$<n>$ = TrCreateLeafNode (PARSEOP_CREATEQWORDFIELD);}
+ TermArg
+ TermArgItem
+ NameStringItem
+@@ -1249,7 +1249,7 @@
+ ;
+
+ CreateWordFieldTerm
+- : PARSEOP_CREATEWORDFIELD '(' {$$ = TrCreateLeafNode (PARSEOP_CREATEWORDFIELD);}
++ : PARSEOP_CREATEWORDFIELD '(' {$<n>$ = TrCreateLeafNode (PARSEOP_CREATEWORDFIELD);}
+ TermArg
+ TermArgItem
+ NameStringItem
+@@ -1259,7 +1259,7 @@
+ ;
+
+ DataRegionTerm
+- : PARSEOP_DATATABLEREGION '(' {$$ = TrCreateLeafNode (PARSEOP_DATATABLEREGION);}
++ : PARSEOP_DATATABLEREGION '(' {$<n>$ = TrCreateLeafNode (PARSEOP_DATATABLEREGION);}
+ NameString
+ TermArgItem
+ TermArgItem
+@@ -1270,7 +1270,7 @@
+ ;
+
+ DeviceTerm
+- : PARSEOP_DEVICE '(' {$$ = TrCreateLeafNode (PARSEOP_DEVICE);}
++ : PARSEOP_DEVICE '(' {$<n>$ = TrCreateLeafNode (PARSEOP_DEVICE);}
+ NameString
+ ')' '{'
+ ObjectList '}' {$$ = TrLinkChildren ($<n>3,2,TrSetNodeFlags ($4, NODE_IS_NAME_DECLARATION),$7);}
+@@ -1279,7 +1279,7 @@
+ ;
+
+ EventTerm
+- : PARSEOP_EVENT '(' {$$ = TrCreateLeafNode (PARSEOP_EVENT);}
++ : PARSEOP_EVENT '(' {$<n>$ = TrCreateLeafNode (PARSEOP_EVENT);}
+ NameString
+ ')' {$$ = TrLinkChildren ($<n>3,1,TrSetNodeFlags ($4, NODE_IS_NAME_DECLARATION));}
+ | PARSEOP_EVENT '('
+@@ -1287,7 +1287,7 @@
+ ;
+
+ FieldTerm
+- : PARSEOP_FIELD '(' {$$ = TrCreateLeafNode (PARSEOP_FIELD);}
++ : PARSEOP_FIELD '(' {$<n>$ = TrCreateLeafNode (PARSEOP_FIELD);}
+ NameString
+ ',' AccessTypeKeyword
+ ',' LockRuleKeyword
+@@ -1299,7 +1299,7 @@
+ ;
+
+ FunctionTerm
+- : PARSEOP_FUNCTION '(' {$$ = TrCreateLeafNode (PARSEOP_METHOD);}
++ : PARSEOP_FUNCTION '(' {$<n>$ = TrCreateLeafNode (PARSEOP_METHOD);}
+ NameString
+ OptionalParameterTypePackage
+ OptionalParameterTypesPackage
+@@ -1313,7 +1313,7 @@
+ ;
+
+ IndexFieldTerm
+- : PARSEOP_INDEXFIELD '(' {$$ = TrCreateLeafNode (PARSEOP_INDEXFIELD);}
++ : PARSEOP_INDEXFIELD '(' {$<n>$ = TrCreateLeafNode (PARSEOP_INDEXFIELD);}
+ NameString
+ NameStringItem
+ ',' AccessTypeKeyword
+@@ -1326,7 +1326,7 @@
+ ;
+
+ MethodTerm
+- : PARSEOP_METHOD '(' {$$ = TrCreateLeafNode (PARSEOP_METHOD);}
++ : PARSEOP_METHOD '(' {$<n>$ = TrCreateLeafNode (PARSEOP_METHOD);}
+ NameString
+ OptionalByteConstExpr {UtCheckIntegerRange ($5, 0, 7);}
+ OptionalSerializeRuleKeyword
+@@ -1340,7 +1340,7 @@
+ ;
+
+ MutexTerm
+- : PARSEOP_MUTEX '(' {$$ = TrCreateLeafNode (PARSEOP_MUTEX);}
++ : PARSEOP_MUTEX '(' {$<n>$ = TrCreateLeafNode (PARSEOP_MUTEX);}
+ NameString
+ ',' ByteConstExpr
+ ')' {$$ = TrLinkChildren ($<n>3,2,TrSetNodeFlags ($4, NODE_IS_NAME_DECLARATION),$6);}
+@@ -1349,7 +1349,7 @@
+ ;
+
+ OpRegionTerm
+- : PARSEOP_OPERATIONREGION '(' {$$ = TrCreateLeafNode (PARSEOP_OPERATIONREGION);}
++ : PARSEOP_OPERATIONREGION '(' {$<n>$ = TrCreateLeafNode (PARSEOP_OPERATIONREGION);}
+ NameString
+ ',' OpRegionSpaceIdTerm
+ TermArgItem
+@@ -1365,7 +1365,7 @@
+ ;
+
+ PowerResTerm
+- : PARSEOP_POWERRESOURCE '(' {$$ = TrCreateLeafNode (PARSEOP_POWERRESOURCE);}
++ : PARSEOP_POWERRESOURCE '(' {$<n>$ = TrCreateLeafNode (PARSEOP_POWERRESOURCE);}
+ NameString
+ ',' ByteConstExpr
+ ',' WordConstExpr
+@@ -1376,7 +1376,7 @@
+ ;
+
+ ProcessorTerm
+- : PARSEOP_PROCESSOR '(' {$$ = TrCreateLeafNode (PARSEOP_PROCESSOR);}
++ : PARSEOP_PROCESSOR '(' {$<n>$ = TrCreateLeafNode (PARSEOP_PROCESSOR);}
+ NameString
+ ',' ByteConstExpr
+ OptionalDWordConstExpr
+@@ -1388,7 +1388,7 @@
+ ;
+
+ ThermalZoneTerm
+- : PARSEOP_THERMALZONE '(' {$$ = TrCreateLeafNode (PARSEOP_THERMALZONE);}
++ : PARSEOP_THERMALZONE '(' {$<n>$ = TrCreateLeafNode (PARSEOP_THERMALZONE);}
+ NameString
+ ')' '{'
+ ObjectList '}' {$$ = TrLinkChildren ($<n>3,2,TrSetNodeFlags ($4, NODE_IS_NAME_DECLARATION),$7);}
+@@ -1401,7 +1401,7 @@
+
+
+ AliasTerm
+- : PARSEOP_ALIAS '(' {$$ = TrCreateLeafNode (PARSEOP_ALIAS);}
++ : PARSEOP_ALIAS '(' {$<n>$ = TrCreateLeafNode (PARSEOP_ALIAS);}
+ NameString
+ NameStringItem
+ ')' {$$ = TrLinkChildren ($<n>3,2,$4,TrSetNodeFlags ($5, NODE_IS_NAME_DECLARATION));}
+@@ -1410,7 +1410,7 @@
+ ;
+
+ NameTerm
+- : PARSEOP_NAME '(' {$$ = TrCreateLeafNode (PARSEOP_NAME);}
++ : PARSEOP_NAME '(' {$<n>$ = TrCreateLeafNode (PARSEOP_NAME);}
+ NameString
+ ',' DataObject
+ ')' {$$ = TrLinkChildren ($<n>3,2,TrSetNodeFlags ($4, NODE_IS_NAME_DECLARATION),$6);}
+@@ -1419,7 +1419,7 @@
+ ;
+
+ ScopeTerm
+- : PARSEOP_SCOPE '(' {$$ = TrCreateLeafNode (PARSEOP_SCOPE);}
++ : PARSEOP_SCOPE '(' {$<n>$ = TrCreateLeafNode (PARSEOP_SCOPE);}
+ NameString
+ ')' '{'
+ ObjectList '}' {$$ = TrLinkChildren ($<n>3,2,TrSetNodeFlags ($4, NODE_IS_NAME_DECLARATION),$7);}
+@@ -1444,7 +1444,7 @@
+ ;
+
+ FatalTerm
+- : PARSEOP_FATAL '(' {$$ = TrCreateLeafNode (PARSEOP_FATAL);}
++ : PARSEOP_FATAL '(' {$<n>$ = TrCreateLeafNode (PARSEOP_FATAL);}
+ ByteConstExpr
+ ',' DWordConstExpr
+ TermArgItem
+@@ -1458,7 +1458,7 @@
+ ;
+
+ IfTerm
+- : PARSEOP_IF '(' {$$ = TrCreateLeafNode (PARSEOP_IF);}
++ : PARSEOP_IF '(' {$<n>$ = TrCreateLeafNode (PARSEOP_IF);}
+ TermArg
+ ')' '{'
+ TermList '}' {$$ = TrLinkChildren ($<n>3,2,$4,$7);}
+@@ -1469,7 +1469,7 @@
+
+ ElseTerm
+ : {$$ = NULL;}
+- | PARSEOP_ELSE '{' {$$ = TrCreateLeafNode (PARSEOP_ELSE);}
Home |
Main Index |
Thread Index |
Old Index