View | Details | Raw Unified | Return to bug 177180 | Differences between
and this patch

Collapse All | Expand All

(-)./portshaker.subr.in (-4 / +5 lines)
Lines 39-49 Link Here
39
PB="${PB:=/usr/local/tinderbox}"
39
PB="${PB:=/usr/local/tinderbox}"
40
TC="${TC:=${PB}/tc}"
40
TC="${TC:=${PB}/tc}"
41
41
42
# Use pkg(8) if WITH_PKGNG is defined in make.conf
42
# Use pkg(8) if main package system or WITH_PKGNG defined in make.conf
43
if [ -f "/etc/make.conf" ]; then
43
if [ -z `/usr/bin/whereis -q -b pkg_version` ]; then
44
    PKG_VERSION="pkg version"
45
elif [ -f "/etc/make.conf" ]; then
44
    case `make -f "/etc/make.conf" -V WITH_PKGNG` in
46
    case `make -f "/etc/make.conf" -V WITH_PKGNG` in
45
    [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
47
    	[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) PKG_VERSION="pkg version" ;;
46
	PKG_VERSION="pkg version"
47
    esac
48
    esac
48
fi
49
fi
49
PKG_VERSION="${PKG_VERSION:=pkg_version}"
50
PKG_VERSION="${PKG_VERSION:=pkg_version}"

Return to bug 177180