aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2013-10-27 22:22:02 +0800
committerbdrewery <bdrewery@FreeBSD.org>2013-10-27 22:22:02 +0800
commit31d3dfdd836c51060659b520b34b8daa260bd8fd (patch)
tree311afefe38aaf8e81c6a4000e4b622ddb019c8f1
parentbf146bee10e13dd725ae41080631d75db6898e0a (diff)
downloadfreebsd-ports-gnome-31d3dfdd836c51060659b520b34b8daa260bd8fd.tar.gz
freebsd-ports-gnome-31d3dfdd836c51060659b520b34b8daa260bd8fd.tar.zst
freebsd-ports-gnome-31d3dfdd836c51060659b520b34b8daa260bd8fd.zip
- Revert r329851 and again allow using portsnap's make_index by default,
if available, for 'make index'. This removes the need to have perl installed. [1] - Fix output of the file to have the proper /usr/ports/ORIGIN regardless of real PORTSDIR or CURDIR [2] PR: ports/183095 [1] Submitted by: ak [2] With hat: portmgr
-rw-r--r--Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 4ae3d399850f..82a6cb9b37da 100644
--- a/Makefile
+++ b/Makefile
@@ -105,11 +105,11 @@ INDEX_SHELL= /bin/sh
INDEX_PORTS=.
.endif
-#.if exists(/usr/libexec/make_index)
-#MAKE_INDEX= /usr/libexec/make_index /dev/stdin
-#.else
+.if exists(/usr/libexec/make_index)
+MAKE_INDEX= /usr/libexec/make_index /dev/stdin
+.else
MAKE_INDEX= perl ${.CURDIR}/Tools/make_index
-#.endif
+.endif
${INDEXDIR}/${INDEXFILE}:
@${INDEX_ECHO_1ST} "Generating ${INDEXFILE} - please wait.."; \
@@ -144,7 +144,8 @@ ${INDEXDIR}/${INDEXFILE}:
cat $${tmpdir}/${INDEXFILE}.desc.* | (cd ${.CURDIR} ; ${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; \
+ sed -Ee 's../.g' -e ':a' -e 's|/[^/]+/\.\.||; ta' \
+ -e 's|${.CURDIR}|/usr/ports|g' > ${INDEXDIR}/${INDEXFILE}.tmp; \
if [ "${INDEX_PRISTINE}" != "" ]; then \
sed -e "s,$${LOCALBASE},/usr/local," ${INDEXDIR}/${INDEXFILE}.tmp > ${INDEXDIR}/${INDEXFILE}; \
else \