aboutsummaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2014-10-04 02:14:18 +0800
committerbdrewery <bdrewery@FreeBSD.org>2014-10-04 02:14:18 +0800
commit01c26d554399a297b30b79482e84fc2c332d5255 (patch)
tree91cc855088a9d6a7df97b4c916f96070ef54000f /Mk
parentb348781c3ce2afef21cf4d32a2834a529b57bf4f (diff)
downloadfreebsd-ports-gnome-01c26d554399a297b30b79482e84fc2c332d5255.tar.gz
freebsd-ports-gnome-01c26d554399a297b30b79482e84fc2c332d5255.tar.zst
freebsd-ports-gnome-01c26d554399a297b30b79482e84fc2c332d5255.zip
Garbage collect dependency mtree check removed in r368803
Diffstat (limited to 'Mk')
-rw-r--r--Mk/Scripts/check-stagedir.sh31
1 files changed, 0 insertions, 31 deletions
diff --git a/Mk/Scripts/check-stagedir.sh b/Mk/Scripts/check-stagedir.sh
index 9bb010d8f7c7..41e3d3e44beb 100644
--- a/Mk/Scripts/check-stagedir.sh
+++ b/Mk/Scripts/check-stagedir.sh
@@ -324,37 +324,6 @@ check_orphans_from_plist() {
return ${ret}
}
-# Check for directories being removed that are handled by MTREE files.
-check_invalid_directories_mtree() {
- local ret=0
- # Anything listed in plist and in restricted-dirs is a failure. I.e.,
- # it's owned by a run-time dependency or one of the MTREEs.
- echo "===> Checking for directories owned by MTREEs"
- cat ${WRKDIR}/.mtree | sort -u >${WRKDIR}/.restricted-dirs
- : >${WRKDIR}/.invalid-plist-mtree
- comm -12 ${WRKDIR}/.plist-dirs-sorted-no-comments \
- ${WRKDIR}/.restricted-dirs \
- | sort_dfs | sed "${sed_dirs}" \
- >>${WRKDIR}/.invalid-plist-mtree || :
- if [ -s "${WRKDIR}/.invalid-plist-mtree" ]; then
- while read line; do
- # Skip removal of PREFIX and PREFIX/info from
- # bsd.port.mk for now. The removal of info may
- # be a bug; it's part of BSD.local.dist.
- # See ports/74691
- if [ "${PREFIX}" != "${LOCALBASE}" ]; then
- case "${line}" in
- "@dirrmtry info") continue ;;
- "@dirrmtry ${PREFIX}") continue ;;
- esac
- fi
- ret=1
- echo "Error: Owned by MTREE: ${line}" >&2
- done < ${WRKDIR}/.invalid-plist-mtree
- fi
- return ${ret}
-}
-
# Check for directories in plist that dependencies already handle.
# XXX: This goes away when pkg learns auto dir tracking
check_invalid_directories_from_dependencies() {