From 9b66de56fbdb3a6a59b676bd265215b081ac9a20 Mon Sep 17 00:00:00 2001 From: zhuk Date: Fri, 26 May 2017 20:40:31 +0000 Subject: [PATCH] Use dumb Makefile pipe trick from DPB/Vars.pm instead of trying to access an existing port (devel/quirks) which could be broken, resulting in strange errors on portcheck side. Prompted and solution provided by espie@, thanks! --- infrastructure/bin/portcheck | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/infrastructure/bin/portcheck b/infrastructure/bin/portcheck index a536285c884..374546be1bc 100755 --- a/infrastructure/bin/portcheck +++ b/infrastructure/bin/portcheck @@ -1,6 +1,6 @@ #!/bin/ksh # -# $OpenBSD: portcheck,v 1.110 2016/04/28 17:30:28 zhuk Exp $ +# $OpenBSD: portcheck,v 1.111 2017/05/26 20:40:31 zhuk Exp $ # Copyright (c) 2013 Vadim Zhukov # # Permission to use, copy, modify, and distribute this software for any @@ -129,10 +129,23 @@ shift $(($OPTIND - 1)) pkgpath= if [[ -z $portsdir ]]; then + # idea from DPB/Vars.pm + test_mf=$(cat < +SIGNING_PARAMETERS ?= +EOF + ) IFS=: - testp=/usr/ports/devel/quirks set -A portsdir_path -- \ - $( (cd $testp && make show=PORTSDIR_PATH 2>/dev/null) || true) + $( (echo "$test_mf" | make -C / -f - show=PORTSDIR_PATH 2>/dev/null) || true) unset IFS if ((${#portsdir_path[@]} > 0)); then for p in "${portsdir_path[@]}"; do