summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-04-01 00:38:18 +0800
committerzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-04-01 00:38:18 +0800
commit2d3b8a53a2d228344377b8b48538c9e37ec5d6cb (patch)
tree022e0e45274bad4acd73a85e1d9c3be7d0a1a9e7
parenta7f88990f9ec3b8ccd8387c122f9265418bcd57c (diff)
downloadxorg-devel-ports-2d3b8a53a2d228344377b8b48538c9e37ec5d6cb.tar
xorg-devel-ports-2d3b8a53a2d228344377b8b48538c9e37ec5d6cb.tar.gz
xorg-devel-ports-2d3b8a53a2d228344377b8b48538c9e37ec5d6cb.tar.bz2
xorg-devel-ports-2d3b8a53a2d228344377b8b48538c9e37ec5d6cb.tar.lz
xorg-devel-ports-2d3b8a53a2d228344377b8b48538c9e37ec5d6cb.tar.xz
xorg-devel-ports-2d3b8a53a2d228344377b8b48538c9e37ec5d6cb.tar.zst
xorg-devel-ports-2d3b8a53a2d228344377b8b48538c9e37ec5d6cb.zip
Sync with ports.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@781 058c260c-8361-11dd-a0ac-aa2bafec7d09
-rw-r--r--Mk/bsd.port.mk11
1 files changed, 9 insertions, 2 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 32683ef..e5d542a 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1,7 +1,7 @@
#-*- tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: head/Mk/bsd.port.mk 315309 2013-03-26 15:55:59Z bapt $
+# $FreeBSD: head/Mk/bsd.port.mk 315599 2013-03-30 05:31:29Z bdrewery $
# $NetBSD: $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -3427,7 +3427,14 @@ check-vulnerable:
.if !defined(DISABLE_VULNERABILITIES) && !defined(PACKAGE_BUILDING)
@if [ -f "${AUDITFILE}" ]; then \
if [ -n "${WITH_PKGNG}" ]; then \
- vlist=`${PKG_BIN} audit "${PKGNAME}"`; \
+ if [ -x "${PKG_BIN}" ]; then \
+ vlist=`${PKG_BIN} audit "${PKGNAME}"`; \
+ elif [ "${PORTNAME}" = "pkg" ]; then \
+ vlist=""; \
+ else \
+ ${ECHO_MSG} "===> Unable to check vuln database as pkg(8) is missing"; \
+ exit 1; \
+ fi; \
elif [ -x "${LOCALBASE}/sbin/portaudit" ]; then \
vlist=`${LOCALBASE}/sbin/portaudit -X 14 "${PKGNAME}" \
2>&1 | grep -vE '^[0-9]+ problem\(s\) found.' \