diff options
| author | Bill Fenner <fenner@FreeBSD.org> | 1997-11-06 02:20:27 +0000 |
|---|---|---|
| committer | Bill Fenner <fenner@FreeBSD.org> | 1997-11-06 02:20:27 +0000 |
| commit | 0ca0d9ae7bd7298ccdcd1d3873c46d5e5384401f (patch) | |
| tree | dd82e9b5477010709857232882b8a423330bb7e3 /Mk | |
| parent | 186ce4ad838049c8983578e4963c019de5aae0f1 (diff) | |
| download | ports-0ca0d9ae7bd7298ccdcd1d3873c46d5e5384401f.tar.gz ports-0ca0d9ae7bd7298ccdcd1d3873c46d5e5384401f.zip | |
Convert <, > and & into <, > and & in port names, COMMENT and
DESCR files when building README.html .
Don't use control characters in sed statement.
Problems reported by "Chris G. Demetriou" <cgd@pa.dec.com> in NetBSD PR
pkg/4341.
Notes
Notes:
svn path=/head/; revision=8508
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.subdir.mk | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk index f580c0509bca..f494c459526e 100644 --- a/Mk/bsd.port.subdir.mk +++ b/Mk/bsd.port.subdir.mk @@ -1,5 +1,5 @@ # from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 -# $Id: bsd.port.subdir.mk,v 1.19 1997/03/09 23:10:56 wosch Exp $ +# $Id: bsd.port.subdir.mk,v 1.20 1997/08/22 11:16:15 asami Exp $ # # The include file <bsd.port.subdir.mk> contains the default targets # for building ports subdirectories. @@ -119,27 +119,34 @@ README= ${TEMPLATES}/README.top README= ${TEMPLATES}/README.category .endif +HTMLIFY= sed -e 's/&/\&/g' -e 's/>/\>/g' -e 's/</\</g' + README.html: @echo "===> Creating README.html" @> $@.tmp .for entry in ${SUBDIR} .if defined(PORTSTOP) - @echo -n '<a href="'${entry}/README.html'">${entry}</a>: ' >> $@.tmp + @echo -n '<a href="'${entry}/README.html'">'"`echo ${entry} | ${HTMLIFY}`"'</a>: ' >> $@.tmp .else - @echo -n '<a href="'${entry}/README.html'">'"`cd ${entry}; make package-name`</a>: " >> $@.tmp + @echo -n '<a href="'${entry}/README.html'">'"`cd ${entry}; make package-name | ${HTMLIFY}`</a>: " >> $@.tmp .endif .if exists(${entry}/pkg/COMMENT) - @cat ${entry}/pkg/COMMENT >> $@.tmp + @${HTMLIFY} ${entry}/pkg/COMMENT >> $@.tmp .else @echo "(no description)" >> $@.tmp .endif .endfor @sort -t '>' +1 -2 $@.tmp > $@.tmp2 +.if exists(${.CURDIR}/pkg/DESCR) + @${HTMLIFY} ${.CURDIR}/pkg/DESCR > $@.tmp3 +.else + @> $@.tmp3 +.endif @cat ${README} | \ - sed -e 's%%CATEGORY%%'`echo ${.CURDIR} | sed -e 's.*/\([^/]*\)$$\1'`'g' \ - -e '/%%DESCR%%/r${.CURDIR}/pkg/DESCR' \ + sed -e 's/%%CATEGORY%%/'"`basename ${.CURDIR}`"'/g' \ + -e '/%%DESCR%%/r$@.tmp3' \ -e '/%%DESCR%%/d' \ -e '/%%SUBDIR%%/r$@.tmp2' \ -e '/%%SUBDIR%%/d' \ > $@ - @rm -f $@.tmp $@.tmp2 + @rm -f $@.tmp $@.tmp2 $@.tmp3 |