5 files changed, 63 insertions, 158 deletions
diff --git a/sysutils/acpica-utils/DESCR b/sysutils/acpica-utils/DESCR
index 8d8334de355..c00cd23c304 100644
--- a/sysutils/acpica-utils/DESCR
+++ b/sysutils/acpica-utils/DESCR
@@ -4,4 +4,7 @@ managing hardware and events. The following utilities are provided:
 
     * ASL Compiler & Disassembler
     * ACPI Simulator (AcpiExec)
-    * ACPI Table Extractor
+    * ACPI Table Extractor (AcpiXtract)
+    * ACPI Help (AcpiHelp)
+    * ACPI Source Code Converter (AcpiSrc)
+    * ACPI Example Namespace Dump (AcpiNames)
diff --git a/sysutils/acpica-utils/Makefile b/sysutils/acpica-utils/Makefile
index a2f9ed41a1e..23b9e361ea0 100644
--- a/sysutils/acpica-utils/Makefile
+++ b/sysutils/acpica-utils/Makefile
@@ -1,53 +1,54 @@
-# $NetBSD: Makefile,v 1.8 2014/10/09 14:06:56 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2015/04/16 14:21:01 wiz Exp $
 #
 
-DISTNAME=	acpica-unix-${ACPICA_UTILS_VERSION}
-PKGNAME=	acpica-utils-${ACPICA_UTILS_VERSION}
-PKGREVISION=	1
-CATEGORIES=	devel
-MASTER_SITES=	http://www.acpica.org/download/
+DISTNAME=	acpica-unix2-20150410
+PKGNAME=	${DISTNAME:S/-unix2-/-utils-/}
+CATEGORIES=	sysutils devel
+MASTER_SITES=	https://acpica.org/sites/acpica/files/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.acpica.org/
 COMMENT=	Intel ACPI CA Unix utilities
-
-ACPICA_UTILS_VERSION=	20090625
-
-INSTALLATION_DIRS=	bin share/doc/acpica-utils
-
-USE_TOOLS+=	bison flex gm4 gmake
-
-LICENSE=	gnu-gpl-v2 # OR intel-acpica-license
-# According to http://www.acpica.org/documentation/faq.php:
-#   "Under what licensing is the ACPICA source released?
-#      ACPICA can be licensed under the GNU General Public License or via a
-#      separate license that may be more favorable to commercial OSVs. Please
-#      see the source code license header for specifics.
-
-# Don't have sem_timedwait()
-CFLAGS.NetBSD+=	-DACPI_USE_ALTERNATE_TIMEOUT
-CFLAGS.DragonFly+=	-DACPI_USE_ALTERNATE_TIMEOUT
-
-do-build:
-	cd ${WRKSRC}/tools/acpiexec && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
-	cp -f ${WRKSRC}/tools/acpiexec/acpiexec ${WRKSRC}
-	cd ${WRKSRC}/tools/acpiexec && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} clean
-	cd ${WRKSRC}/compiler && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
-	cd ${WRKSRC}/tools/acpisrc && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
-	cd ${WRKSRC}/tools/acpixtract && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/compiler/iasl \
-		${DESTDIR}${PREFIX}/bin/iasl
-	ln -s iasl ${DESTDIR}${PREFIX}/bin/acpi-iasl
-	${INSTALL_PROGRAM} ${WRKSRC}/acpiexec ${DESTDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/tools/acpixtract/acpixtract \
-		${DESTDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/tools/acpisrc/acpisrc \
-		${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/README \
-		${DESTDIR}${PREFIX}/share/doc/acpica-utils
-	${INSTALL_DATA} ${FILESDIR}/LICENSE \
-		${DESTDIR}${PREFIX}/share/doc/acpica-utils
+LICENSE=	modified-bsd OR gnu-gpl-v2
+
+TESTS_DISTNAME=	${DISTNAME:S/acpica-unix2-/acpitests-unix-/}
+DISTFILES=	${DEFAULT_DISTFILES}
+DISTFILES+=	${TESTS_DISTNAME}${EXTRACT_SUFX}
+
+USE_TOOLS+=	bison flex gm4 gmake bash
+
+REPLACE_BASH+=	tests/aapits/bin/aapitsrun
+REPLACE_BASH+=	tests/aapits/bin/cadir
+REPLACE_BASH+=	tests/aapits/bin/run1
+REPLACE_BASH+=	tests/aslts.sh
+REPLACE_BASH+=	tests/aslts/bin/Do
+REPLACE_BASH+=	tests/aslts/bin/asltsdiffres
+REPLACE_BASH+=	tests/aslts/bin/asltsrun
+REPLACE_BASH+=	tests/aslts/bin/bugstate/bdemosconc
+REPLACE_BASH+=	tests/aslts/bin/bugstate/bdemossum
+REPLACE_BASH+=	tests/aslts/bin/bugstate/bdemostabs
+REPLACE_BASH+=	tests/aslts/bin/bugstate/parsebuglist
+REPLACE_BASH+=	tests/aslts/bin/common
+REPLACE_BASH+=	tests/aslts/bin/diffproc
+REPLACE_BASH+=	tests/aslts/bin/settings
+REPLACE_BASH+=	tests/templates/templates.sh
+
+post-extract:
+	${RUN}rm -rf ${WRKSRC}/tests
+	${RUN}mv ${WRKDIR}/${TESTS_DISTNAME}/tests ${WRKSRC}
+
+do-test:
+# ACPICA Tests rely on non-zero exit
+## ASL tests
+	cd ${WRKSRC}/tests && ./aslts.sh -u
+## API tests
+	cd ${WRKSRC}/tests/aapits && gmake
+	cd ${WRKSRC}/tests/aapits/asl && \
+	ASL=${WRKSRC}/generate/unix/bin/iasl gmake
+# This one needs to be fixed
+#	cd ${WRKSRC}/tests/aapits/bin && ./aapitsrun
+## Template tests
+# This test is broken too
+#	cd ${WRKSRC}/tests/templates && gmake
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/acpica-utils/PLIST b/sysutils/acpica-utils/PLIST
index e6d92364681..c18fd54cbdd 100644
--- a/sysutils/acpica-utils/PLIST
+++ b/sysutils/acpica-utils/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2010/10/19 14:33:19 jakllsch Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/04/16 14:21:01 wiz Exp $
+bin/acpibin
+bin/acpidump
+bin/acpiexamples
 bin/acpiexec
-bin/acpi-iasl
+bin/acpihelp
+bin/acpinames
 bin/acpisrc
 bin/acpixtract
 bin/iasl
-share/doc/acpica-utils/LICENSE
-share/doc/acpica-utils/README
diff --git a/sysutils/acpica-utils/distinfo b/sysutils/acpica-utils/distinfo
index 1f50c60ff65..7dfb910aa76 100644
--- a/sysutils/acpica-utils/distinfo
+++ b/sysutils/acpica-utils/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.6 2009/07/14 18:13:48 tnn Exp $
+$NetBSD: distinfo,v 1.7 2015/04/16 14:21:01 wiz Exp $
 
-SHA1 (acpica-unix-20090625.tar.gz) = d5906ce8695173916c1c586111fcc6b40ade60c2
-RMD160 (acpica-unix-20090625.tar.gz) = 5e5299f3d93e0259e16346861f0c66651f6fbfd9
-Size (acpica-unix-20090625.tar.gz) = 933277 bytes
+SHA1 (acpica-unix2-20150410.tar.gz) = aa1bd36272b9151bb19402dac9db72bcea5a95b0
+RMD160 (acpica-unix2-20150410.tar.gz) = 2b4186e1fd2697eb731f25dac311bc469d78b672
+Size (acpica-unix2-20150410.tar.gz) = 1337136 bytes
+SHA1 (acpitests-unix-20150410.tar.gz) = 28bfafa391c3d4daad9ce49e88cda3b16ace5897
+RMD160 (acpitests-unix-20150410.tar.gz) = 8fd7ef601b6abcfa79f5513cd3b8460954f80d31
+Size (acpitests-unix-20150410.tar.gz) = 2052271 bytes
diff --git a/sysutils/acpica-utils/files/LICENSE b/sysutils/acpica-utils/files/LICENSE
deleted file mode 100644
index 5e28a045b0b..00000000000
--- a/sysutils/acpica-utils/files/LICENSE
+++ /dev/null
@@ -1,104 +0,0 @@
- 1. Copyright Notice
-
- Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
- All rights reserved.
-
- 2. License
-
- 2.1. This is your license from Intel Corp. under its intellectual property
- rights.  You may have additional license terms from the party that provided
- you this software, covering your right to use that party's intellectual
- property rights.
-
- 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a
- copy of the source code appearing in this file ("Covered Code") an
- irrevocable, perpetual, worldwide license under Intel's copyrights in the
- base code distributed originally by Intel ("Original Intel Code") to copy,
- make derivatives, distribute, use and display any portion of the Covered
- Code in any form, with the right to sublicense such rights; and
-
- 2.3. Intel grants Licensee a non-exclusive and non-transferable patent
- license (with the right to sublicense), under only those claims of Intel
- patents that are infringed by the Original Intel Code, to make, use, sell,
- offer to sell, and import the Covered Code and derivative works thereof
- solely to the minimum extent necessary to exercise the above copyright
- license, and in no event shall the patent license extend to any additions
- to or modifications of the Original Intel Code.  No other license or right
- is granted directly or by implication, estoppel or otherwise;
-
- The above copyright and patent license is granted only if the following
- conditions are met:
-
- 3. Conditions
-
- 3.1. Redistribution of Source with Rights to Further Distribute Source.
- Redistribution of source code of any substantial portion of the Covered
- Code or modification with rights to further distribute source must include
- the above Copyright Notice, the above License, this list of Conditions,
- and the following Disclaimer and Export Compliance provision.  In addition,
- Licensee must cause all Covered Code to which Licensee contributes to
- contain a file documenting the changes Licensee made to create that Covered
- Code and the date of any change.  Licensee must include in that file the
- documentation of any changes made by any predecessor Licensee.  Licensee
- must include a prominent statement that the modification is derived,
- directly or indirectly, from Original Intel Code.
-
- 3.2. Redistribution of Source with no Rights to Further Distribute Source.
- Redistribution of source code of any substantial portion of the Covered
- Code or modification without rights to further distribute source must
- include the following Disclaimer and Export Compliance provision in the
- documentation and/or other materials provided with distribution.  In
- addition, Licensee may not authorize further sublicense of source of any
- portion of the Covered Code, and must include terms to the effect that the
- license from Licensee to its licensee is limited to the intellectual
- property embodied in the software Licensee provides to its licensee, and
- not to intellectual property embodied in modifications its licensee may
- make.
-
- 3.3. Redistribution of Executable. Redistribution in executable form of any
- substantial portion of the Covered Code or modification must reproduce the
- above Copyright Notice, and the following Disclaimer and Export Compliance
- provision in the documentation and/or other materials provided with the
- distribution.
-
- 3.4. Intel retains all right, title, and interest in and to the Original
- Intel Code.
-
- 3.5. Neither the name Intel nor any other trademark owned or controlled by
- Intel shall be used in advertising or otherwise to promote the sale, use or
- other dealings in products derived from or relating to the Covered Code
- without prior written authorization from Intel.
-
- 4. Disclaimer and Export Compliance
-
- 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED
- HERE.  ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE
- IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT,  ASSISTANCE,
- INSTALLATION, TRAINING OR OTHER SERVICES.  INTEL WILL NOT PROVIDE ANY
- UPDATES, ENHANCEMENTS OR EXTENSIONS.  INTEL SPECIFICALLY DISCLAIMS ANY
- IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A
- PARTICULAR PURPOSE.
-
- 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES
- OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR
- COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT,
- SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY
- CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL
- HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.  THESE LIMITATIONS
- SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY
- LIMITED REMEDY.
-
- 4.3. Licensee shall not export, either directly or indirectly, any of this
- software or system incorporating such software without first obtaining any
- required license or other approval from the U. S. Department of Commerce or
- any other agency or department of the United States Government.  In the
- event Licensee exports any such software from the United States or
- re-exports any such software from a foreign destination, Licensee shall
- ensure that the distribution and export/re-export of the software is in
- compliance with all laws, regulations, orders, or other restrictions of the
- U.S. Export Administration Regulations. Licensee agrees that neither it nor
- any of its subsidiaries will export/re-export any technical data, process,
- software, or service, directly or indirectly, to any country for which the
- United States government or any agency thereof requires an export license,
- other governmental approval, or letter of assurance, without first obtaining
- such license, approval or letter.