mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

* Switch back to .tgz packages for 4.x (5.0 still uses .tbz packages) [1]

Browse Source 
* 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
This commit is contained in:
Kris Kennaway 2002-09-25 17:50:03 +00:00
parent 456c93a6b2
commit 12c14e0bf7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=67139
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Mk/bsd.port.mk
View File

@ -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 \