Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 7 Mar 2021 22:10:27 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r567612 - in head/devel/autogen: . files
Message-ID:  <202103072210.127MARqO027603@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sun Mar  7 22:10:26 2021
New Revision: 567612
URL: https://svnweb.freebsd.org/changeset/ports/567612

Log:
  Convert REINPLACE_CMD to patch files

Added:
  head/devel/autogen/files/
  head/devel/autogen/files/patch-agen5-mk-stamps.sh   (contents, props changed)
  head/devel/autogen/files/patch-build-aux-run-ag.sh   (contents, props changed)
  head/devel/autogen/files/patch-config-mk-shdefs.in   (contents, props changed)
  head/devel/autogen/files/patch-configure   (contents, props changed)
Modified:
  head/devel/autogen/Makefile

Modified: head/devel/autogen/Makefile
==============================================================================
--- head/devel/autogen/Makefile	Sun Mar  7 22:10:20 2021	(r567611)
+++ head/devel/autogen/Makefile	Sun Mar  7 22:10:26 2021	(r567612)
@@ -38,8 +38,4 @@ INFO=		autogen
 
 SHEBANG_FILES=	autoopts/tpl/*.pl
 
-post-patch:
-	@${REINPLACE_CMD} -e '/CFLAGS=/ s| -Wno-format-contains-nul||; /WARN_CFLAGS=/ s| -Werror||' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|mktemp --suffix=|g&|' ${WRKSRC}/agen5/mk-stamps.sh ${WRKSRC}/build-aux/run-ag.sh ${WRKSRC}/config/mk-shdefs.in
-
 .include <bsd.port.mk>

Added: head/devel/autogen/files/patch-agen5-mk-stamps.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/autogen/files/patch-agen5-mk-stamps.sh	Sun Mar  7 22:10:26 2021	(r567612)
@@ -0,0 +1,11 @@
+--- agen5/mk-stamps.sh.orig	2018-08-04 20:22:34 UTC
++++ agen5/mk-stamps.sh
+@@ -28,7 +28,7 @@
+ #  because some of the rules are complex and we don't want to
+ #  deal with the dual update problem.
+ 
+-STAMP_TEMP_DIR=$(mktemp --suffix=.tdir -d /tmp/mk-stamps-XXXXXXXX)
++STAMP_TEMP_DIR=$(gmktemp --suffix=.tdir -d /tmp/mk-stamps-XXXXXXXX)
+ exec 9>&2 2>> ${STAMP_TEMP_DIR}/mk-stamps.log
+ stop_tracing=:
+ if (shopt -qo xtrace)

Added: head/devel/autogen/files/patch-build-aux-run-ag.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/autogen/files/patch-build-aux-run-ag.sh	Sun Mar  7 22:10:26 2021	(r567612)
@@ -0,0 +1,11 @@
+--- build-aux/run-ag.sh.orig	2018-08-14 23:53:31 UTC
++++ build-aux/run-ag.sh
+@@ -45,7 +45,7 @@ find_exe() {
+   return 0
+ }
+ 
+-STAMP_TEMP_DIR=$(mktemp --suffix=.tdir -d /tmp/run-ag-XXXXXXXX)
++STAMP_TEMP_DIR=$(gmktemp --suffix=.tdir -d /tmp/run-ag-XXXXXXXX)
+ exec 9>&2 2>> ${STAMP_TEMP_DIR}/mk-stamps.log
+ VERBOSE=1
+ 

Added: head/devel/autogen/files/patch-config-mk-shdefs.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/autogen/files/patch-config-mk-shdefs.in	Sun Mar  7 22:10:26 2021	(r567612)
@@ -0,0 +1,11 @@
+--- config/mk-shdefs.in.orig	2018-08-03 21:26:38 UTC
++++ config/mk-shdefs.in
+@@ -130,7 +130,7 @@ configure() {
+ 
+ set -x
+ exec 9>&2
+-tmp=$(mktemp --suffix=.tdir -d /tmp/shdefs-XXXXXXXXX)
++tmp=$(gmktemp --suffix=.tdir -d /tmp/shdefs-XXXXXXXXX)
+ exec 2>> $tmp/mk-shdef.log
+ init $0 $1
+ mk_config

Added: head/devel/autogen/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/autogen/files/patch-configure	Sun Mar  7 22:10:26 2021	(r567612)
@@ -0,0 +1,13 @@
+--- configure.orig	2018-08-26 17:44:54 UTC
++++ configure
+@@ -18923,8 +18923,8 @@ fi
+ 
+ WARN_CFLAGS=
+ test "X${GCC}" = Xyes && {
+-  CFLAGS="$CFLAGS -Wno-format-contains-nul -fno-strict-aliasing"
+-  WARN_CFLAGS="$CFLAGS "`echo -Wall -Werror -Wcast-align -Wmissing-prototypes \
++  CFLAGS="$CFLAGS -fno-strict-aliasing"
++  WARN_CFLAGS="$CFLAGS "`echo -Wall -Wcast-align -Wmissing-prototypes \
+ 	-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
+ 	-Wstrict-aliasing=3 -Wextra -Wno-cast-qual`
+ }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103072210.127MARqO027603>