[95386] trunk/dports/devel/acpica

jmr at macports.org jmr at macports.org
Wed Jul 11 12:08:14 PDT 2012


Revision: 95386
          https://trac.macports.org/changeset/95386
Author:   jmr at macports.org
Date:     2012-07-11 12:08:13 -0700 (Wed, 11 Jul 2012)
Log Message:
-----------
acpica: update to 20120111 (#32856), set license

Modified Paths:
--------------
    trunk/dports/devel/acpica/Portfile

Added Paths:
-----------
    trunk/dports/devel/acpica/files/remove-Werror.patch

Removed Paths:
-------------
    trunk/dports/devel/acpica/files/compiler_Makefile.patch

Modified: trunk/dports/devel/acpica/Portfile
===================================================================
--- trunk/dports/devel/acpica/Portfile	2012-07-11 17:46:42 UTC (rev 95385)
+++ trunk/dports/devel/acpica/Portfile	2012-07-11 19:08:13 UTC (rev 95386)
@@ -4,8 +4,12 @@
 PortSystem          1.0
 
 name                acpica
-version             20101209
+version             20120111
 categories          devel
+# Comes with a restrictive Intel license in the source files, but the included 
+# acpisrc tool replaces them with an open source dual license.
+# Why not just indicate triple licensing to start with? Who knows.
+license             {Permissive GPL-2}
 platforms           darwin
 maintainers         coresystems.de:stepan
 
@@ -17,12 +21,12 @@
 
 distname            acpica-unix-${version}
 
-checksums           sha1    d15e7f4b6c35c6d5d0b178690456f03bc8fb0fe5 \
-                    rmd160  e99631fe25ae5f7dee7bc314803782394b58d16c 
+checksums           sha1   af77be2a7640c44e885c55083ae6faaa0ce8c248 \
+                    rmd160 c4b132f99c1d330a11705945259e024b5203c1a9 
 
 depends_build       port:bison
 
-patchfiles          compiler_Makefile.patch
+patchfiles          remove-Werror.patch
 
 post-patch {
     reinplace "s,-lrt,,g" ${worksrcpath}/tools/acpiexec/Makefile \

Deleted: trunk/dports/devel/acpica/files/compiler_Makefile.patch
===================================================================
--- trunk/dports/devel/acpica/files/compiler_Makefile.patch	2012-07-11 17:46:42 UTC (rev 95385)
+++ trunk/dports/devel/acpica/files/compiler_Makefile.patch	2012-07-11 19:08:13 UTC (rev 95386)
@@ -1,15 +0,0 @@
---- compiler/Makefile.orig	2011-08-04 23:50:11.000000000 +1000
-+++ compiler/Makefile	2011-08-04 23:52:39.000000000 +1000
-@@ -188,10 +188,10 @@
- # by the utilities above and they are not necessarily ANSI C, etc.
- #
- aslcompilerlex.o :   aslcompilerlex.c
--	$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $?
-+	$(CC) -c $(CFLAGS) -Wall -o$@ $?
- 
- aslcompilerparse.o : aslcompilerparse.c
--	$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $?
-+	$(CC) -c $(CFLAGS) -Wall -o$@ $?
- 
- 
- #

Copied: trunk/dports/devel/acpica/files/remove-Werror.patch (from rev 95382, trunk/dports/devel/acpica/files/compiler_Makefile.patch)
===================================================================
--- trunk/dports/devel/acpica/files/remove-Werror.patch	                        (rev 0)
+++ trunk/dports/devel/acpica/files/remove-Werror.patch	2012-07-11 19:08:13 UTC (rev 95386)
@@ -0,0 +1,175 @@
+--- compiler/Makefile.orig	2012-01-12 05:23:14.000000000 +1100
++++ compiler/Makefile	2012-07-12 04:57:45.000000000 +1000
+@@ -230,7 +230,6 @@
+     -Wall \
+     -Wbad-function-cast \
+     -Wdeclaration-after-statement \
+-    -Werror \
+     -Wformat=2 \
+     -Wmissing-declarations \
+     -Wmissing-prototypes \
+@@ -248,15 +247,11 @@
+     -Waggregate-return \
+     -Wchar-subscripts \
+     -Wempty-body \
+-    -Wlogical-op \
+     -Wmissing-declarations \
+     -Wmissing-field-initializers \
+-    -Wmissing-parameter-type \
+     -Wnested-externs \
+-    -Wold-style-declaration \
+     -Wold-style-definition \
+-    -Wredundant-decls \
+-    -Wtype-limits
++    -Wredundant-decls
+ 
+ #
+ # Bison/Flex configuration
+@@ -306,16 +301,16 @@
+ # by the utilities above and they are not necessarily ANSI C, etc.
+ #
+ aslcompilerlex.o :   aslcompilerlex.c
+-	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $?
++	$(CC) -c $(CFLAGS) -Wall -Wstrict-aliasing=0 -o$@ $?
+ 
+ aslcompilerparse.o : aslcompilerparse.c
+-	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $?
++	$(CC) -c $(CFLAGS) -Wall -Wstrict-aliasing=0 -o$@ $?
+ 
+ dtparserlex.o :      dtparserlex.c
+-	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $?
++	$(CC) -c $(CFLAGS) -Wall -Wstrict-aliasing=0 -o$@ $?
+ 
+ dtparserparse.o :    dtparserparse.c
+-	$(CC) -c $(CFLAGS) -Wall -Werror -Wstrict-aliasing=0 -o$@ $?
++	$(CC) -c $(CFLAGS) -Wall -Wstrict-aliasing=0 -o$@ $?
+ 
+ 
+ %.o : %.c $(HEADERS) $(ACPICA_HEADERS)
+--- generate/unix/iasl/Makefile.orig	2012-01-12 05:23:17.000000000 +1100
++++ generate/unix/iasl/Makefile	2012-07-12 04:34:52.000000000 +1000
+@@ -235,16 +235,16 @@
+ # by the utilities above and they are not necessarily ANSI C, etc.
+ #
+ $(OBJDIR)/aslcompilerlex.o :   $(OBJDIR)/aslcompilerlex.c
+-	$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $?
++	$(CC) -c $(CFLAGS) -Wall -o$@ $?
+ 
+ $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c
+-	$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $?
++	$(CC) -c $(CFLAGS) -Wall -o$@ $?
+ 
+ $(OBJDIR)/dtparserlex.o :      $(OBJDIR)/dtparserlex.c
+-	$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $?
++	$(CC) -c $(CFLAGS) -Wall -o$@ $?
+ 
+ $(OBJDIR)/dtparserparse.o :    $(OBJDIR)/dtparserparse.c
+-	$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $?
++	$(CC) -c $(CFLAGS) -Wall -o$@ $?
+ 
+ 
+ $(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS)
+--- generate/unix/Makefile.config.orig	2012-01-12 05:23:17.000000000 +1100
++++ generate/unix/Makefile.config	2012-07-12 04:35:40.000000000 +1000
+@@ -101,7 +101,6 @@
+     -Wall \
+     -Wbad-function-cast \
+     -Wdeclaration-after-statement \
+-    -Werror \
+     -Wformat=2 \
+     -Wmissing-declarations \
+     -Wmissing-prototypes \
+--- tools/acpibin/Makefile.orig	2012-01-12 05:23:21.000000000 +1100
++++ tools/acpibin/Makefile	2012-07-12 04:36:12.000000000 +1000
+@@ -77,7 +77,6 @@
+     -Wall \
+     -Wbad-function-cast \
+     -Wdeclaration-after-statement \
+-    -Werror \
+     -Wformat=2 \
+     -Wmissing-declarations \
+     -Wmissing-prototypes \
+--- tools/acpiexec/Makefile.orig	2012-01-12 05:23:22.000000000 +1100
++++ tools/acpiexec/Makefile	2012-07-12 05:01:31.000000000 +1000
+@@ -241,7 +241,6 @@
+     -Wall \
+     -Wbad-function-cast \
+     -Wdeclaration-after-statement \
+-    -Werror \
+     -Wformat=2 \
+     -Wmissing-declarations \
+     -Wmissing-prototypes \
+@@ -259,15 +258,11 @@
+     -Waggregate-return \
+     -Wchar-subscripts \
+     -Wempty-body \
+-    -Wlogical-op \
+     -Wmissing-declarations \
+     -Wmissing-field-initializers \
+-    -Wmissing-parameter-type \
+     -Wnested-externs \
+-    -Wold-style-declaration \
+     -Wold-style-definition \
+-    -Wredundant-decls \
+-    -Wtype-limits
++    -Wredundant-decls
+ 
+ #
+ # Rules
+--- tools/acpihelp/Makefile.orig	2012-01-12 05:23:22.000000000 +1100
++++ tools/acpihelp/Makefile	2012-07-12 04:37:08.000000000 +1000
+@@ -68,7 +68,6 @@
+     -Wall \
+     -Wbad-function-cast \
+     -Wdeclaration-after-statement \
+-    -Werror \
+     -Wformat=2 \
+     -Wmissing-declarations \
+     -Wmissing-prototypes \
+--- tools/acpinames/Makefile.orig	2012-01-12 05:23:22.000000000 +1100
++++ tools/acpinames/Makefile	2012-07-12 04:37:37.000000000 +1000
+@@ -141,7 +141,6 @@
+     -Wall \
+     -Wbad-function-cast \
+     -Wdeclaration-after-statement \
+-    -Werror \
+     -Wformat=2 \
+     -Wmissing-declarations \
+     -Wmissing-prototypes \
+--- tools/acpisrc/Makefile.orig	2012-01-12 05:23:22.000000000 +1100
++++ tools/acpisrc/Makefile	2012-07-12 04:38:06.000000000 +1000
+@@ -70,7 +70,6 @@
+     -Wall \
+     -Wbad-function-cast \
+     -Wdeclaration-after-statement \
+-    -Werror \
+     -Wformat=2 \
+     -Wmissing-declarations \
+     -Wmissing-prototypes \
+--- tools/acpixtract/Makefile.orig	2012-01-12 05:23:22.000000000 +1100
++++ tools/acpixtract/Makefile	2012-07-12 05:05:36.000000000 +1000
+@@ -61,7 +61,6 @@
+     -Wall \
+     -Wbad-function-cast \
+     -Wdeclaration-after-statement \
+-    -Werror \
+     -Wformat=2 \
+     -Wmissing-declarations \
+     -Wmissing-prototypes \
+@@ -79,15 +78,11 @@
+     -Waggregate-return \
+     -Wchar-subscripts \
+     -Wempty-body \
+-    -Wlogical-op \
+     -Wmissing-declarations \
+     -Wmissing-field-initializers \
+-    -Wmissing-parameter-type \
+     -Wnested-externs \
+-    -Wold-style-declaration \
+     -Wold-style-definition \
+-    -Wredundant-decls \
+-    -Wtype-limits
++    -Wredundant-decls
+ 
+ #
+ # Rules
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120711/48406d08/attachment.html>


More information about the macports-changes mailing list