kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Modification by Bill Fenner which removes the embedded control

Browse source 
characters, and avoids the wrong interpretation of magic HTML
characters in DESCR files or categories.

Forwarded to me by Chris Demetriou, and refers to PR 4341.
This commit is contained in:
agc 1997-11-21 16:01:54 +00:00
parent 4d2177b0f9
commit 41243ee1cb
2 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
mk/bsd.pkg.subdir.mk
View file

@ -1,6 +1,6 @@
# 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
# $NetBSD: bsd.pkg.subdir.mk,v 1.3 1997/09/25 19:09:35 thorpej Exp $
# $NetBSD: bsd.pkg.subdir.mk,v 1.4 1997/11/21 16:01:54 agc Exp $
#
# The include file <bsd.port.subdir.mk> contains the default targets
# for building ports subdirectories.
@ -120,27 +120,34 @@ README= ${TEMPLATES}/README.top
README= ${TEMPLATES}/README.category
.endif
HTMLIFY= sed -e 's/&/\&amp;/g' -e 's/>/\&gt;/g' -e 's/</\&lt;/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

21
mk/bsd.port.subdir.mk
View file

@ -1,6 +1,6 @@
# 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
# $NetBSD: bsd.port.subdir.mk,v 1.3 1997/09/25 19:09:35 thorpej Exp $
# $NetBSD: bsd.port.subdir.mk,v 1.4 1997/11/21 16:01:54 agc Exp $
#
# The include file <bsd.port.subdir.mk> contains the default targets
# for building ports subdirectories.
@ -120,27 +120,34 @@ README= ${TEMPLATES}/README.top
README= ${TEMPLATES}/README.category
.endif
HTMLIFY= sed -e 's/&/\&amp;/g' -e 's/>/\&gt;/g' -e 's/</\&lt;/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