Page MenuHomeFreeBSD
Files F147770159

D22174.1784325265.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D22174.1784325265.diff
View Options

Index: Mk/Scripts/qa.sh
===================================================================
--- Mk/Scripts/qa.sh
+++ Mk/Scripts/qa.sh
@@ -2,8 +2,8 @@
# MAINTAINER: portmgr@FreeBSD.org
# $FreeBSD$
-if [ -z "${STAGEDIR}" -o -z "${PREFIX}" -o -z "${LOCALBASE}" ]; then
- echo "STAGEDIR, PREFIX, LOCALBASE required in environment." >&2
+if [ -z "${STAGEDIR}" -o -z "${PREFIX}" -o -z "${LOCALBASE}" -o -z "${REWARNFILE}" ]; then
+ echo "STAGEDIR, PREFIX, LOCALBASE, REWARNFILE required in environment." >&2
exit 1
fi
@@ -1006,10 +1006,18 @@
return 0
}
+reinplace()
+{
+ if [ -f ${REWARNFILE} ]; then
+ warn "Possible REINPLACE_CMD issues"
+ cat ${REWARNFILE}
+ fi
+}
+
checks="shebang symlinks paths stripped desktopfileutils sharedmimeinfo"
checks="$checks suidfiles libtool libperl prefixvar baselibs terminfo"
checks="$checks proxydeps sonames perlcore no_arch gemdeps gemfiledeps flavors"
-checks="$checks license depends_blacklist pkgmessage"
+checks="$checks license depends_blacklist pkgmessage reinplace"
ret=0
cd ${STAGEDIR} || exit 1
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}
Index: Tools/scripts/sed_checked.sh
===================================================================
--- /dev/null
+++ Tools/scripts/sed_checked.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+/usr/bin/sed -i.bak "$@"
+for x in "${@}" ; do
+ if [ -f "${x}" ]; then
+ if cmp "${x}" "${x}".bak > /dev/null 2>&1 ; then
+ if [ ! -z "${REWARNFILE}" ]; then
+ echo sed failed: backup file same as original: ${x} >> ${REWARNFILE}
+ fi
+ fi
+ fi
+done

File Metadata

Mime Type
text/plain
Expires
Fri, Jul 17, 9:54 PM (35 m, 11 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29174174
Default Alt Text
D22174.1784325265.diff (2 KB)

Event Timeline