diff options
| -rw-r--r-- | Mk/bsd.port.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index c06a282782b9..6cc856b5b722 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1277,7 +1277,11 @@ PKG_ARGS+= -o ${PKGORIGIN} .if defined(PKG_NOCOMPRESS) PKG_SUFX?= .tar .else +.if ${OSVERSION} >= 500039 PKG_SUFX?= .tbz +.else +PKG_SUFX?= .tgz +.endif .endif # where pkg_add records its dirty deeds. PKG_DBDIR?= /var/db/pkg @@ -2066,10 +2070,6 @@ pre-everything: .if !target(do-fetch) do-fetch: - @if [ ! -w ${DISTDIR} ]; then \ - ${ECHO_MSG} ">> ${DISTDIR} is not writable; cannot fetch."; \ - exit 1; \ - fi @${MKDIR} ${_DISTDIR} @(cd ${_DISTDIR}; \ ${_MASTER_SITES_ENV} ; \ @@ -2092,6 +2092,10 @@ do-fetch: fi; \ fi; \ ${ECHO_MSG} ">> $$file doesn't seem to exist in ${_DISTDIR}."; \ + if [ ! -w ${DISTDIR} ]; then \ + ${ECHO_MSG} ">> ${DISTDIR} is not writable by you; cannot fetch."; \ + exit 1; \ + fi; \ if [ ! -z "$$select" ] ; then \ __MASTER_SITES_TMP= ; \ for group in $$select; do \ |