Date: Tue, 29 Mar 2016 17:47:18 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412125 - in head/sysutils/acpica-tools: . files Message-ID: <201603291747.u2THlI4u096936@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Tue Mar 29 17:47:18 2016 New Revision: 412125 URL: https://svnweb.freebsd.org/changeset/ports/412125 Log: - Prefer devel/byacc over devel/bison to reduce build dependencies between releases. It builds fine after r411933. - Replace the previous patch with the upstream submitted version. Modified: head/sysutils/acpica-tools/Makefile head/sysutils/acpica-tools/files/patch-generate_unix_iasl_Makefile Modified: head/sysutils/acpica-tools/Makefile ============================================================================== --- head/sysutils/acpica-tools/Makefile Tue Mar 29 16:17:59 2016 (r412124) +++ head/sysutils/acpica-tools/Makefile Tue Mar 29 17:47:18 2016 (r412125) @@ -29,10 +29,8 @@ MAKE_ARGS+= CC="${CC}" LEX="${FLEX}" YAC .include <bsd.port.pre.mk> .if ${OSVERSION} < 1001506 -BUILD_DEPENDS+= bison:${PORTSDIR}/devel/bison -BUILD_DEPENDS+= gm4:${PORTSDIR}/devel/m4 -MAKE_ARGS+= MACROPROC="${LOCALBASE}/bin/gm4" -YACC= ${LOCALBASE}/bin/bison +BUILD_DEPENDS+= byacc>=20160324_1:devel/byacc +YACC= ${LOCALBASE}/bin/yacc .endif do-install: Modified: head/sysutils/acpica-tools/files/patch-generate_unix_iasl_Makefile ============================================================================== --- head/sysutils/acpica-tools/files/patch-generate_unix_iasl_Makefile Tue Mar 29 16:17:59 2016 (r412124) +++ head/sysutils/acpica-tools/files/patch-generate_unix_iasl_Makefile Tue Mar 29 17:47:18 2016 (r412125) @@ -1,6 +1,6 @@ --- generate/unix/iasl/Makefile.orig 2016-03-18 16:25:41 UTC +++ generate/unix/iasl/Makefile -@@ -274,12 +274,11 @@ include ../Makefile.rules +@@ -274,12 +274,14 @@ include ../Makefile.rules # Function to safely execute yacc # safe_yacc = \ @@ -10,11 +10,14 @@ - $(YACC) $(YFLAGS) -p$(1) -o$$_d/$$_f.c -d $(2) &&\ - mv $$_d/$$_f.$${_t\#\#*.} $(3);\ - test -d $$_d && rm -fr $$_d -+ _d=$$(mktemp -d '$(abspath $(OBJDIR))/$(1).XXXXXX') &&\ -+ cd "$$_d" &&\ -+ $(YACC) $(YFLAGS) -p$(1) -o$(1).c -d '$(abspath $(2))' &&\ -+ mv $(1)$(suffix $(3)) '$(abspath $(3))' &&\ -+ rm -fr "$$_d" ++ _d=`mktemp -d $(OBJDIR)/$(1).XXXXXX` &&\ ++ cd $$_d &&\ ++ $(YACC) $(YFLAGS) -d -p$(1) $(abspath $(2)) &&\ ++ cd - &&\ ++ mv $$_d/y.tab$(suffix $(3)) $(3);\ ++ _r=$$?;\ ++ rm -fr $$_d;\ ++ exit $$_r # # Macro processing for iASL .y files
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603291747.u2THlI4u096936>