- Fix the make_index script if PORTSDIR is a path which contains a
symlink. [1] - Allow use of alternate http download utilities with 'make fetchindex'. [2] PR: ports/35767 [1], ports/92588 [2] Submitted by: Peter Jeremy <PeterJeremy at optushome dot com dot au> [1], Alexander Logvinov <user at blg dot akavia dot ru> [2]
This commit is contained in:
parent
9390a0bd48
commit
e7a152f612
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=155689
6
Makefile
6
Makefile
@ -76,11 +76,11 @@ fetchindex: ${INDEXDIR}/{INDEXFILE}.bz2
|
||||
chmod a+r ${INDEXDIR}/${INDEXFILE}
|
||||
|
||||
${INDEXDIR}/{INDEXFILE}.bz2: .PHONY
|
||||
@${FETCHINDEX} -o ${INDEXDIR}/${INDEXFILE}.bz2 ${MASTER_SITE_INDEX}${INDEXFILE}.bz2
|
||||
@${FETCHINDEX} ${INDEXDIR}/${INDEXFILE}.bz2 ${MASTER_SITE_INDEX}${INDEXFILE}.bz2
|
||||
|
||||
MASTER_SITE_INDEX?= http://www.FreeBSD.org/ports/
|
||||
SETENV?= /usr/bin/env
|
||||
FETCHINDEX?= ${SETENV} ${FETCH_ENV} fetch -am
|
||||
FETCHINDEX?= ${SETENV} ${FETCH_ENV} fetch -am -o
|
||||
INDEX_JOBS?= 2
|
||||
|
||||
.if !defined(INDEX_VERBOSE)
|
||||
@ -122,7 +122,7 @@ ${INDEXDIR}/${INDEXFILE}:
|
||||
echo; \
|
||||
fi; \
|
||||
exit 1); \
|
||||
cat $${tmpdir}/${INDEXFILE}.desc.* | perl ${.CURDIR}/Tools/make_index | \
|
||||
cat $${tmpdir}/${INDEXFILE}.desc.* | (cd ${.CURDIR} ; perl ${.CURDIR}/Tools/make_index) | \
|
||||
sed -e 's/ */ /g' -e 's/| */|/g' -e 's/ *|/|/g' -e 's./..g' | \
|
||||
sort -t '|' +1 -2 | \
|
||||
sed -e 's../.g' > ${INDEXDIR}/${INDEXFILE}.tmp; \
|
||||
|
Loading…
Reference in New Issue
Block a user