From 36eb147a1adb32c9e2660898119224e552880428 Mon Sep 17 00:00:00 2001 From: sthen Date: Mon, 2 Dec 2019 12:02:05 +0000 Subject: [PATCH] oops, adjust previous to unbreak (needed _BUILDLIB_DEPENDS in addition to BUILD_DEPENDS rather than replacing) --- infrastructure/mk/bsd.port.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/infrastructure/mk/bsd.port.mk b/infrastructure/mk/bsd.port.mk index 1cac623fcee..39817b1b03c 100644 --- a/infrastructure/mk/bsd.port.mk +++ b/infrastructure/mk/bsd.port.mk @@ -1,6 +1,6 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 sw=4 filetype=make: -# $OpenBSD: bsd.port.mk,v 1.1507 2019/12/02 11:38:22 sthen Exp $ +# $OpenBSD: bsd.port.mk,v 1.1508 2019/12/02 12:02:05 sthen Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -2607,8 +2607,9 @@ ${_WRKDIR_COOKIE}: @${_PBUILD} ln -sf ${WRKDIR} ${.CURDIR}/${WRKDIR_LINKNAME} .endif # poison some common gettext-tools binaries -.if !${_BUILDLIB_DEPENDS:Mdevel/gettext,-tools} && \ - !${_BUILDLIB_DEPENDS:M*textproc/intltool} +.if !defined(BUILD_DEPENDS) || !${BUILD_DEPENDS:Mdevel/gettext,-tools} && \ + !${BUILD_DEPENDS:M*textproc/intltool} && \ + !${_BUILDLIB_DEPENDS:Mdevel/gettext,-tools} @printf '#!/bin/sh\n\ echo "*** $$0 was called without gettext-tools dependency ***" >&2\n\ exit 1\n' ${_PREDIR} ${WRKDIR}/bin/msgfmt