D22174.id64024.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D22174.id64024.diff
View Options

	Index: Mk/bsd.port.mk
	===================================================================
	--- Mk/bsd.port.mk
	+++ Mk/bsd.port.mk
	@@ -1030,6 +1030,7 @@
	FLAVORS?=
	FLAVOR?=
	OVERLAYS?=
	+REWARNFILE=? ${WRKDIR}/reinplace_warnings.txt
	# Disallow forced FLAVOR as make argument since we cannot change it to the
	# proper default.
	.if empty(FLAVOR) && !empty(.MAKEOVERRIDES:MFLAVOR)
	@@ -1610,6 +1611,7 @@
	PREFIX=${PREFIX} \
	LINUXBASE=${LINUXBASE} \
	LOCALBASE=${LOCALBASE} \
	+ REWARNFILE=${REWARNFILE} \
	"STRIP=${STRIP}" \
	TMPPLIST=${TMPPLIST} \
	CURDIR='${.CURDIR}' \
	@@ -1998,7 +2000,12 @@

	# Macro for doing in-place file editing using regexps
	REINPLACE_ARGS?= -i.bak
	+.if defined(DEVELOPER)
	+REINPLACE_CMD?= ${SETENV} REWARNFILE=${REWARNFILE} ${PORTSDIR}/Tools/scripts/sed_checked.sh
	+.else
	REINPLACE_CMD?= ${SED} ${REINPLACE_ARGS}
	+.endif
	+FRAMEWORK_REINPLACE_CMD?= ${SED} ${REINPLACE_ARGS}

	# Names of cookies used to skip already completed stages
	EXTRACT_COOKIE?= ${WRKDIR}/.extract_done.${PORTNAME}.${PREFIX:S/\//_/g}