summaryrefslogtreecommitdiff
path: root/Mk
diff options
context:
space:
mode:
authorKris Kennaway <kris@FreeBSD.org>2002-09-25 17:50:03 +0000
committerKris Kennaway <kris@FreeBSD.org>2002-09-25 17:50:03 +0000
commit12c14e0bf7d3b14ffb8cbf1c9f137342afd1b261 (patch)
tree45a2199434f7c5500db53ec73d101fa40a47290f /Mk
parentCrypto-publish.org has finally put krb5-1.2.6 up on their site. The (diff)
* Switch back to .tgz packages for 4.x (5.0 still uses .tbz packages) [1]
* Fix some problems in previous revision relating to writability test of ${DISTDIR}, by moving the check a) after we have made the directory if it doesn't exist, and b) inside the loop that actually fetches files, so the check isn't performed with every port make operation that depends on the fetch target (this breaks non-fetch targets as a different user) [2] Submitted by: bmah [1] Reported by: ijliao [2] Tested on: bento
Notes
Notes: svn path=/head/; revision=67139
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.port.mk12
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 \