cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use dumb Makefile pipe trick from DPB/Vars.pm instead of trying to access

Browse Source 
an existing port (devel/quirks) which could be broken, resulting in strange
errors on portcheck side.

Prompted and solution provided by espie@, thanks!
This commit is contained in:
zhuk 2017-05-26 20:40:31 +00:00
parent 4d1a0d330c
commit 9b66de56fb
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
infrastructure/bin/portcheck
View File

@ -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 <<EOF
COMMENT = test
CATEGORIES = test
PKGPATH = test/a
DISTNAME = test
PERMIT_PACKAGE_CDROM=Yes
IGNORE=Yes
_MAKEFILE_INC_DONE=Yes
ECHO_MSG=:
.include <bsd.port.mk>
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